From 008ab55d7ef4c7c87266ef8b2f93caa5d9776ba6 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 15 Aug 2025 14:53:50 -0700
Subject: [PATCH 1/2] Always have host

---
 internal/checker/nodebuilder.go               |  18 +-
 internal/checker/nodebuilderimpl.go           |   5 +-
 internal/checker/symboltracker.go             |  13 +-
 internal/fourslash/_scripts/manualTests.txt   |   2 +
 ...oduleReexportedIntoGlobalQuickInfo_test.go |   2 +-
 .../quickInfoImportNonunicodePath_test.go     |   2 +-
 internal/nodebuilder/types.go                 |   3 -
 internal/transformers/declarations/tracker.go |   6 -
 ...mitAugmentationUsesCorrectSourceFile.types |   4 +-
 ...inkDeclarationEmitModuleNamesRootDir.types |   4 +-
 ...mportsCanPaintCrossModuleDeclaration.types |   8 +-
 ...sCanPaintCrossModuleDeclaration.types.diff |  16 +
 .../compiler/ambientExportDefaultErrors.types |   2 +-
 .../ambientExportDefaultErrors.types.diff     |  11 +
 .../anonClassDeclarationEmitIsAnon.types      |   4 +-
 .../anonClassDeclarationEmitIsAnon.types.diff |   4 +-
 .../bundledDtsLateExportRenaming.types        |   8 +-
 .../bundledDtsLateExportRenaming.types.diff   |  21 +
 ...checkJsdocTypeTagOnExportAssignment1.types |   4 +-
 ...checkJsdocTypeTagOnExportAssignment2.types |   4 +-
 ...checkJsdocTypeTagOnExportAssignment5.types |   4 +-
 ...checkJsdocTypeTagOnExportAssignment6.types |   4 +-
 .../compiler/checkMergedGlobalUMDSymbol.types |   6 +-
 .../checkMergedGlobalUMDSymbol.types.diff     |  19 +
 .../compiler/checkerInitializationCrash.types |   2 +-
 .../checkerInitializationCrash.types.diff     |  10 +
 .../compiler/commonJsUnusedLocals.symbols     |   2 +-
 .../commonJsUnusedLocals.symbols.diff         |   2 +-
 .../compiler/commonJsUnusedLocals.types       |   2 +-
 .../compiler/commonjsAccessExports.symbols    |   8 +-
 .../commonjsAccessExports.symbols.diff        |  17 +-
 .../compiler/commonjsAccessExports.types      |   8 +-
 ...tingDeclarationsImportFromNamespace1.types |   6 +-
 ...eclarationsImportFromNamespace1.types.diff |  14 +
 ...tingDeclarationsImportFromNamespace2.types |   6 +-
 ...eclarationsImportFromNamespace2.types.diff |  14 +
 .../compiler/constEnumNoEmitReexport.types    |   6 +-
 .../constEnumNoEmitReexport.types.diff        |  18 +
 ...nstEnumNoPreserveDeclarationReexport.types |   4 +-
 ...umNoPreserveDeclarationReexport.types.diff |  13 +
 .../constEnumPreserveEmitReexport.types       |   4 +-
 .../constEnumPreserveEmitReexport.types.diff  |  10 +
 ...eclFileImportChainInExportAssignment.types |   2 +-
 ...leImportChainInExportAssignment.types.diff |   2 +-
 ...FileImportModuleWithExportAssignment.types |   8 +-
 ...mportModuleWithExportAssignment.types.diff |   8 +-
 ...declarationEmitAliasFromIndirectFile.types |   4 +-
 ...rationEmitAliasFromIndirectFile.types.diff |  11 +
 .../declarationEmitAliasInlineing.types       |   6 +-
 .../declarationEmitAliasInlineing.types.diff  |   6 +-
 ...tionEmitCommonJsModuleReferencedType.types |  16 +-
 ...mitCommonJsModuleReferencedType.types.diff |  28 +
 ...itCrossFileCopiedGeneratedImportType.types |  14 +-
 ...ssFileCopiedGeneratedImportType.types.diff |  27 +-
 ...esNotUseReexportedNamespaceAsLocal.symbols |   2 +-
 ...UseReexportedNamespaceAsLocal.symbols.diff |  11 +
 ...DoesNotUseReexportedNamespaceAsLocal.types |   8 +-
 ...otUseReexportedNamespaceAsLocal.types.diff |  21 +
 ...nEmitExportAliasVisibiilityMarking.symbols |   2 +-
 ...ExportAliasVisibiilityMarking.symbols.diff |  11 +
 ...ionEmitExportAliasVisibiilityMarking.types |  22 +-
 ...itExportAliasVisibiilityMarking.types.diff |  32 ++
 ...NamespaceNoTripleSlashTypesReference.types |  12 +-
 ...paceNoTripleSlashTypesReference.types.diff |  26 +-
 ...tionEmitForGlobalishSpecifierSymlink.types |  10 +-
 ...mitForGlobalishSpecifierSymlink.types.diff |  22 +
 ...ionEmitForGlobalishSpecifierSymlink2.types |  10 +-
 ...itForGlobalishSpecifierSymlink2.types.diff |  22 +
 ...ingModuleAugmentationRetainsImport.symbols |   2 +-
 ...duleAugmentationRetainsImport.symbols.diff |  11 +
 ...rtingModuleAugmentationRetainsImport.types |   2 +-
 ...ModuleAugmentationRetainsImport.types.diff |  11 +
 ...tionEmitForTypesWhichNeedImportTypes.types |   8 +-
 ...mitForTypesWhichNeedImportTypes.types.diff |  16 +
 ...onEmitImportInExportAssignmentModule.types |   2 +-
 ...tImportInExportAssignmentModule.types.diff |   2 +-
 ...onEmitInlinedDistributiveConditional.types |  14 +-
 ...tInlinedDistributiveConditional.types.diff |  39 ++
 ...tionErrorNotEmittedForNonEmittedFile.types |  26 +-
 ...rrorNotEmittedForNonEmittedFile.types.diff |  45 +-
 .../declarationEmitNameConflicts.types        |   6 +-
 .../declarationEmitNameConflicts.types.diff   |   6 +-
 ...ationEmitObjectAssignedDefaultExport.types |  42 +-
 ...EmitObjectAssignedDefaultExport.types.diff |  68 ++-
 ...onEmitPrefersPathKindBasedOnBundling.types |  10 +-
 ...tPrefersPathKindBasedOnBundling.types.diff |  25 +
 ...rationEmitQualifiedAliasTypeArgument.types |  14 +-
 ...nEmitQualifiedAliasTypeArgument.types.diff |  24 +
 ...larationEmitReadonlyComputedProperty.types |   6 +-
 ...ionEmitReadonlyComputedProperty.types.diff |  19 +
 ...rationEmitReexportedSymlinkReference.types |   8 +-
 ...nEmitReexportedSymlinkReference.types.diff |  18 +
 ...ationEmitReexportedSymlinkReference2.types |  10 +-
 ...EmitReexportedSymlinkReference2.types.diff |  27 +
 ...ationEmitReexportedSymlinkReference3.types |  10 +-
 ...EmitReexportedSymlinkReference3.types.diff |  24 +
 ...rationEmitReusesLambdaParameterNodes.types |  10 +-
 ...nEmitReusesLambdaParameterNodes.types.diff |  12 +-
 .../declarationEmitScopeConsistency.types     |   6 +-
 ...declarationEmitScopeConsistency.types.diff |  17 +
 ...onEmitStringEnumUsedInNonlocalSpread.types |   6 +-
 ...tStringEnumUsedInNonlocalSpread.types.diff |  16 +
 .../declarationEmitSymlinkPaths.types         |   8 +-
 .../declarationEmitSymlinkPaths.types.diff    |  21 +
 ...rationEmitTopLevelNodeFromCrossFile2.types |  10 +-
 ...nEmitTopLevelNodeFromCrossFile2.types.diff |  24 +-
 ...ransitiveImportOfHtmlDeclarationItem.types |   8 +-
 ...tiveImportOfHtmlDeclarationItem.types.diff |  16 +
 ...EmitUnnessesaryTypeReferenceNotAdded.types |   4 +-
 ...nnessesaryTypeReferenceNotAdded.types.diff |   4 +-
 ...itUsingAlternativeContainingModules1.types |  12 +-
 ...ngAlternativeContainingModules1.types.diff |  35 +-
 ...itUsingAlternativeContainingModules2.types |  14 +-
 ...ngAlternativeContainingModules2.types.diff |  37 +-
 .../declarationEmitUsingTypeAlias1.types      |  24 +-
 .../declarationEmitUsingTypeAlias1.types.diff |  42 +-
 .../declarationEmitUsingTypeAlias2.types      |   4 +-
 .../declarationEmitUsingTypeAlias2.types.diff |   4 +-
 ...ionEmitWithInvalidPackageJsonTypings.types |  10 +-
 ...itWithInvalidPackageJsonTypings.types.diff |  23 +
 ...nImportTypeAliasInferredAndEmittable.types |  10 +-
 ...rtTypeAliasInferredAndEmittable.types.diff |  35 ++
 .../submodule/compiler/declarationMaps.types  |   8 +-
 .../compiler/declarationMaps.types.diff       |   8 +-
 .../declarationMapsWithoutDeclaration.types   |   8 +-
 ...clarationMapsWithoutDeclaration.types.diff |   8 +-
 ...arationsForInferredTypeFromOtherFile.types |  10 +-
 ...onsForInferredTypeFromOtherFile.types.diff |  22 +-
 ...tionsIndirectGeneratedAliasReference.types |  18 +-
 ...IndirectGeneratedAliasReference.types.diff |  37 ++
 .../declareFileExportAssignment.types         |   8 +-
 .../declareFileExportAssignment.types.diff    |   8 +-
 ...signmentWithVarFromVariableStatement.types |   8 +-
 ...entWithVarFromVariableStatement.types.diff |   8 +-
 ...ierRelatedSpans_moduleAugmentation.symbols |   4 +-
 ...latedSpans_moduleAugmentation.symbols.diff |  19 +
 ...ifierRelatedSpans_moduleAugmentation.types |   4 +-
 ...RelatedSpans_moduleAugmentation.types.diff |  20 +
 .../submodule/compiler/duplicatePackage.types |  10 +-
 .../compiler/duplicatePackage.types.diff      |  25 +-
 .../duplicatePackage_referenceTypes.types     |   4 +-
 ...duplicatePackage_referenceTypes.types.diff |   4 +-
 ...ePackage_relativeImportWithinPackage.types |   8 +-
 ...age_relativeImportWithinPackage.types.diff |  15 +-
 ...e_relativeImportWithinPackage_scoped.types |   8 +-
 ...ativeImportWithinPackage_scoped.types.diff |  15 +-
 .../compiler/duplicatePackage_subModule.types |   4 +-
 .../duplicatePackage_subModule.types.diff     |   4 +-
 .../dynamicImportsDeclaration.symbols         |   6 +-
 .../dynamicImportsDeclaration.symbols.diff    |  20 +
 .../compiler/dynamicImportsDeclaration.types  |  22 +-
 .../dynamicImportsDeclaration.types.diff      |  48 ++
 ...nmentDefineProperrtyPotentialMerge.symbols |   2 +-
 ...DefineProperrtyPotentialMerge.symbols.diff |   8 +-
 .../compiler/enumAssignmentCompat6.types      |   6 +-
 .../compiler/enumAssignmentCompat6.types.diff |  18 +
 ...rorForConflictingExportEqualsValue.symbols |   2 +-
 ...rConflictingExportEqualsValue.symbols.diff |   8 +
 .../compiler/es5ExportEqualsDts.types         |   6 +-
 .../compiler/es5ExportEqualsDts.types.diff    |   6 +-
 ...ortClauseWithoutModuleSpecifierInEs5.types |  10 +-
 ...auseWithoutModuleSpecifierInEs5.types.diff |  24 +
 .../esModuleInteropImportCall.symbols         |   2 +-
 .../esModuleInteropImportCall.symbols.diff    |  10 +
 .../compiler/esModuleIntersectionCrash.types  |   4 +-
 .../esModuleIntersectionCrash.types.diff      |   4 +-
 ...oSynthesizedDefault(module=esnext).symbols |   2 +-
 ...hesizedDefault(module=esnext).symbols.diff |  11 +
 ...mNoSynthesizedDefault(module=esnext).types |  10 +-
 ...nthesizedDefault(module=esnext).types.diff |  26 +
 ...ynthesizedDefault(module=preserve).symbols |   2 +-
 ...sizedDefault(module=preserve).symbols.diff |  11 +
 ...oSynthesizedDefault(module=preserve).types |  10 +-
 ...hesizedDefault(module=preserve).types.diff |  26 +
 .../expandoFunctionSymbolPropertyJs.types     |   2 +-
 .../compiler/exportAsNamespace.d.types        |   2 +-
 .../compiler/exportAsNamespace.d.types.diff   |   8 +
 .../compiler/exportAsNamespace_augment.types  |   2 +-
 .../exportAsNamespace_augment.types.diff      |  11 +
 .../compiler/exportAssignClassAndModule.types |   2 +-
 .../exportAssignClassAndModule.types.diff     |   2 +-
 ...dNamespaceIsVisibleInDeclarationEmit.types |   8 +-
 ...spaceIsVisibleInDeclarationEmit.types.diff |  16 +
 ...signmentMembersVisibleInAugmentation.types |   2 +-
 ...entMembersVisibleInAugmentation.types.diff |   2 +-
 .../exportClassExtendingIntersection.types    |  12 +-
 ...xportClassExtendingIntersection.types.diff |  37 +-
 .../compiler/exportDefaultProperty.types      |   4 +-
 .../compiler/exportDefaultProperty.types.diff |   4 +-
 .../compiler/exportDefaultWithJSDoc1.types    |   6 +-
 .../compiler/exportDefaultWithJSDoc2.types    |   6 +-
 .../compiler/exportEqualMemberMissing.types   |   4 +-
 .../exportEqualMemberMissing.types.diff       |   4 +-
 .../compiler/exportEqualsProperty.types       |   4 +-
 .../compiler/exportEqualsProperty.types.diff  |   4 +-
 .../exportInterfaceClassAndValue.types        |   2 +-
 .../exportInterfaceClassAndValue.types.diff   |  10 +
 .../compiler/exportStarNotElided.types        |   2 +-
 .../compiler/exportStarNotElided.types.diff   |   8 +
 ...nsForbiddenInParameterInitializers.symbols |   2 +-
 ...biddenInParameterInitializers.symbols.diff |  11 +
 ...ionsForbiddenInParameterInitializers.types |   8 +-
 ...orbiddenInParameterInitializers.types.diff |  16 +
 .../compiler/functionExpressionNames.symbols  |   4 +-
 .../functionExpressionNames.symbols.diff      |   8 +-
 .../compiler/functionExpressionNames.types    |   4 +-
 ...moduleinterop=false,module=commonjs).types |   2 +-
 ...einterop=false,module=commonjs).types.diff |  11 +
 ...esmoduleinterop=false,module=es2015).types |   2 +-
 ...uleinterop=false,module=es2015).types.diff |  11 +
 ...esmoduleinterop=false,module=es2020).types |   2 +-
 ...uleinterop=false,module=es2020).types.diff |  11 +
 ...smoduleinterop=true,module=commonjs).types |   2 +-
 ...leinterop=true,module=commonjs).types.diff |  11 +
 ...(esmoduleinterop=true,module=es2015).types |   2 +-
 ...duleinterop=true,module=es2015).types.diff |  11 +
 ...(esmoduleinterop=true,module=es2020).types |   2 +-
 ...duleinterop=true,module=es2020).types.diff |  11 +
 .../importPropertyFromMappedType.types        |   4 +-
 .../importPropertyFromMappedType.types.diff   |   4 +-
 ...rtShouldNotBeElidedInDeclarationEmit.types |  10 +-
 ...uldNotBeElidedInDeclarationEmit.types.diff |  25 +
 .../importTypeResolutionJSDocEOF.types        |   2 +-
 .../importUsedInGenericImportResolves.types   |   2 +-
 ...portUsedInGenericImportResolves.types.diff |   6 +-
 ...MemberMergedWithExportedAliasIsError.types |   2 +-
 ...rMergedWithExportedAliasIsError.types.diff |   8 +
 .../inferrenceInfiniteLoopWithSubtyping.types |   4 +-
 ...rrenceInfiniteLoopWithSubtyping.types.diff |  14 +-
 ...latedDeclarationErrorsAugmentation.symbols |   2 +-
 ...DeclarationErrorsAugmentation.symbols.diff |  11 +
 ...solatedDeclarationErrorsAugmentation.types |   2 +-
 ...edDeclarationErrorsAugmentation.types.diff |  11 +
 .../isolatedModulesReExportType.types         |   2 +-
 .../isolatedModulesReExportType.types.diff    |   8 +
 ...jsDeclarationEmitDoesNotRenameImport.types |  12 +-
 ...tionsWithDefaultAsNamespaceLikeMerge.types |  18 +-
 ...oesNotUseNodeModulesPathWithoutError.types |   6 +-
 .../compiler/jsEnumTagOnObjectFrozen.symbols  |   8 +-
 .../jsEnumTagOnObjectFrozen.symbols.diff      |  17 +-
 .../compiler/jsEnumTagOnObjectFrozen.types    |   8 +-
 ...ExportAssignmentNonMutableLocation.symbols |   2 +-
 ...tAssignmentNonMutableLocation.symbols.diff |   2 +-
 ...jsExportAssignmentNonMutableLocation.types |   2 +-
 ...tMemberMergedWithModuleAugmentation3.types |  16 +-
 ...ileCompilationExternalPackageError.symbols |   2 +-
 ...mpilationExternalPackageError.symbols.diff |   2 +-
 ...sFileCompilationExternalPackageError.types |   2 +-
 .../compiler/jsdocPropertyTagInvalid.types    |   4 +-
 ...jsdocReferenceGlobalTypeInCommonJs.symbols |   2 +-
 ...ReferenceGlobalTypeInCommonJs.symbols.diff |  11 +
 .../jsdocReferenceGlobalTypeInCommonJs.types  |   2 +-
 ...xNamespaceImplicitImportJSXNamespace.types |   6 +-
 ...spaceImplicitImportJSXNamespace.types.diff |  10 +-
 ...figPickedOverGlobalOne(jsx=preserve).types |   6 +-
 ...ckedOverGlobalOne(jsx=preserve).types.diff |  14 +
 ...igPickedOverGlobalOne(jsx=react-jsx).types |   6 +-
 ...kedOverGlobalOne(jsx=react-jsx).types.diff |  14 +
 ...mespaceFromPragmaPickedOverGlobalOne.types |   6 +-
 ...ceFromPragmaPickedOverGlobalOne.types.diff |  14 +
 .../jsxRuntimePragma(jsx=preserve).types      |   8 +-
 .../jsxRuntimePragma(jsx=preserve).types.diff |  20 +
 .../jsxRuntimePragma(jsx=react).types         |   8 +-
 .../jsxRuntimePragma(jsx=react).types.diff    |  20 +
 .../jsxRuntimePragma(jsx=react-jsx).types     |   8 +-
 ...jsxRuntimePragma(jsx=react-jsx).types.diff |  20 +
 .../jsxRuntimePragma(jsx=react-jsxdev).types  |   8 +-
 ...RuntimePragma(jsx=react-jsxdev).types.diff |  20 +
 .../mergeMultipleInterfacesReexported.symbols |   4 +-
 ...eMultipleInterfacesReexported.symbols.diff |  20 +
 .../mergeMultipleInterfacesReexported.types   |   4 +-
 ...rgeMultipleInterfacesReexported.types.diff |  20 +
 .../mergeSymbolReexportInterface.symbols      |   2 +-
 .../mergeSymbolReexportInterface.symbols.diff |   6 +-
 .../mergeSymbolReexportInterface.types        |   4 +-
 .../mergeSymbolReexportInterface.types.diff   |  20 +
 ...olReexportedTypeAliasInstantiation.symbols |   2 +-
 ...xportedTypeAliasInstantiation.symbols.diff |   6 +-
 ...mbolReexportedTypeAliasInstantiation.types |   4 +-
 ...eexportedTypeAliasInstantiation.types.diff |  19 +
 .../mergeSymbolRexportFunction.symbols        |   2 +-
 .../mergeSymbolRexportFunction.symbols.diff   |   6 +-
 .../compiler/mergeSymbolRexportFunction.types |   2 +-
 .../mergeSymbolRexportFunction.types.diff     |  11 +
 .../compiler/mergedDeclarationExports.types   |   2 +-
 .../mergedDeclarationExports.types.diff       |  11 +
 .../missingFunctionImplementation2.symbols    |   2 +-
 ...issingFunctionImplementation2.symbols.diff |  11 +
 .../missingFunctionImplementation2.types      |   2 +-
 .../missingFunctionImplementation2.types.diff |  11 +
 ...moduleAugmentationDeclarationEmit1.symbols |   2 +-
 ...eAugmentationDeclarationEmit1.symbols.diff |  11 +
 .../moduleAugmentationDeclarationEmit1.types  |   2 +-
 ...uleAugmentationDeclarationEmit1.types.diff |  11 +
 ...moduleAugmentationDeclarationEmit2.symbols |   2 +-
 ...eAugmentationDeclarationEmit2.symbols.diff |  11 +
 .../moduleAugmentationDeclarationEmit2.types  |   2 +-
 ...uleAugmentationDeclarationEmit2.types.diff |  11 +
 ...leAugmentationDisallowedExtensions.symbols |   4 +-
 ...mentationDisallowedExtensions.symbols.diff |  20 +
 ...duleAugmentationDisallowedExtensions.types |   4 +-
 ...ugmentationDisallowedExtensions.types.diff |  20 +
 ...mentationDuringSyntheticDefaultCheck.types |   4 +-
 ...tionDuringSyntheticDefaultCheck.types.diff |   4 +-
 ...oduleAugmentationExtendFileModule1.symbols |   2 +-
 ...AugmentationExtendFileModule1.symbols.diff |  11 +
 .../moduleAugmentationExtendFileModule1.types |   2 +-
 ...leAugmentationExtendFileModule1.types.diff |  11 +
 ...oduleAugmentationExtendFileModule2.symbols |   2 +-
 ...AugmentationExtendFileModule2.symbols.diff |  11 +
 .../moduleAugmentationExtendFileModule2.types |   2 +-
 ...leAugmentationExtendFileModule2.types.diff |  11 +
 ...duleAugmentationImportsAndExports1.symbols |   2 +-
 ...ugmentationImportsAndExports1.symbols.diff |  11 +
 ...moduleAugmentationImportsAndExports1.types |   8 +-
 ...eAugmentationImportsAndExports1.types.diff |  23 +
 ...duleAugmentationImportsAndExports2.symbols |   2 +-
 ...ugmentationImportsAndExports2.symbols.diff |  11 +
 ...moduleAugmentationImportsAndExports2.types |   2 +-
 ...eAugmentationImportsAndExports2.types.diff |  11 +
 ...duleAugmentationImportsAndExports3.symbols |   2 +-
 ...ugmentationImportsAndExports3.symbols.diff |  11 +
 ...moduleAugmentationImportsAndExports3.types |   2 +-
 ...eAugmentationImportsAndExports3.types.diff |  11 +
 ...duleAugmentationImportsAndExports4.symbols |   2 +-
 ...ugmentationImportsAndExports4.symbols.diff |  11 +
 ...moduleAugmentationImportsAndExports4.types |   8 +-
 ...eAugmentationImportsAndExports4.types.diff |  25 +
 ...duleAugmentationImportsAndExports5.symbols |   2 +-
 ...ugmentationImportsAndExports5.symbols.diff |  11 +
 ...moduleAugmentationImportsAndExports5.types |   8 +-
 ...eAugmentationImportsAndExports5.types.diff |  25 +
 ...duleAugmentationImportsAndExports6.symbols |   2 +-
 ...ugmentationImportsAndExports6.symbols.diff |  11 +
 ...moduleAugmentationImportsAndExports6.types |  20 +-
 ...eAugmentationImportsAndExports6.types.diff |  47 ++
 .../moduleAugmentationNoNewNames.symbols      |   2 +-
 .../moduleAugmentationNoNewNames.symbols.diff |  11 +
 .../moduleAugmentationNoNewNames.types        |   2 +-
 .../moduleAugmentationNoNewNames.types.diff   |  11 +
 .../moduleAugmentationOfAlias.symbols         |   2 +-
 .../moduleAugmentationOfAlias.symbols.diff    |  11 +
 .../compiler/moduleAugmentationOfAlias.types  |   2 +-
 .../moduleAugmentationOfAlias.types.diff      |  11 +
 .../compiler/moduleDuplicateIdentifiers.types |   2 +-
 .../moduleDuplicateIdentifiers.types.diff     |  11 +
 ...sPropertyCheckFromContainedLiteral.symbols |   4 +-
 ...ertyCheckFromContainedLiteral.symbols.diff |  12 +-
 ...essPropertyCheckFromContainedLiteral.types |  10 +-
 ...leNoneDynamicImport(target=es2015).symbols |   2 +-
 ...eDynamicImport(target=es2015).symbols.diff |  10 +
 ...duleNoneDynamicImport(target=es2015).types |   4 +-
 ...leNoneDynamicImport(target=es2020).symbols |   2 +-
 ...eDynamicImport(target=es2020).symbols.diff |  10 +
 ...duleNoneDynamicImport(target=es2020).types |   4 +-
 .../compiler/modulePreserve2.symbols          |   2 +-
 .../compiler/modulePreserve2.symbols.diff     |  11 +
 .../compiler/modulePreserve4.symbols          |  16 +-
 .../compiler/modulePreserve4.symbols.diff     |  48 +-
 .../submodule/compiler/modulePreserve4.types  |  18 +-
 ...PackageIdWithRelativeAndAbsolutePath.types |   2 +-
 ...geIdWithRelativeAndAbsolutePath.types.diff |  11 +
 ...moduleResolutionWithRequireAndImport.types |   2 +-
 ...eResolutionWithRequireAndImport.types.diff |  11 +
 ...esolutionWithSuffixes_one_jsModule.symbols |   8 +-
 ...tionWithSuffixes_one_jsModule.symbols.diff |   8 +-
 ...eResolutionWithSuffixes_one_jsModule.types |   8 +-
 ...solution_explicitNodeModulesImport.symbols |   2 +-
 ...ion_explicitNodeModulesImport.symbols.diff |   2 +-
 ...Resolution_explicitNodeModulesImport.types |   2 +-
 ...eSameValueDuplicateExportedBindings2.types |   2 +-
 ...ValueDuplicateExportedBindings2.types.diff |  11 +
 .../module_augmentUninstantiatedModule2.types |   4 +-
 ...le_augmentUninstantiatedModule2.types.diff |   4 +-
 .../compiler/multiImportExport.types          |  14 +-
 .../compiler/multiImportExport.types.diff     |  27 +
 ...MergedWithFunctionWithOverloadsUsage.types |  10 +-
 ...dWithFunctionWithOverloadsUsage.types.diff |  10 +-
 .../noCrashUMDMergedWithGlobalValue.types     |   4 +-
 ...noCrashUMDMergedWithGlobalValue.types.diff |  17 +
 .../nodeModuleReexportFromDottedPath.types    |   2 +-
 ...odeModuleReexportFromDottedPath.types.diff |   9 +
 .../compiler/parseAssertEntriesError.symbols  |   2 +-
 .../parseAssertEntriesError.symbols.diff      |  11 +
 .../compiler/parseAssertEntriesError.types    |   2 +-
 .../parseAssertEntriesError.types.diff        |  11 +
 .../parseImportAttributesError.symbols        |   2 +-
 .../parseImportAttributesError.symbols.diff   |  11 +
 .../compiler/parseImportAttributesError.types |   2 +-
 .../parseImportAttributesError.types.diff     |  11 +
 .../privacyCannotNameAccessorDeclFile.types   |  96 ++--
 ...ivacyCannotNameAccessorDeclFile.types.diff | 178 +++++++
 .../privacyCannotNameVarTypeDeclFile.types    | 128 ++---
 ...rivacyCannotNameVarTypeDeclFile.types.diff | 213 ++++++++
 ...ssignmentOnExportedGenericInterface1.types |   2 +-
 ...mentOnExportedGenericInterface1.types.diff |   2 +-
 ...ctionCannotNameParameterTypeDeclFile.types | 256 ++++-----
 ...CannotNameParameterTypeDeclFile.types.diff | 373 +++++++++++++
 ...FunctionCannotNameReturnTypeDeclFile.types | 128 ++---
 ...ionCannotNameReturnTypeDeclFile.types.diff | 245 +++++++++
 .../compiler/privacyImportParseErrors.types   |   2 +-
 .../privacyImportParseErrors.types.diff       |  11 +
 .../compiler/pushTypeGetTypeOfAlias.symbols   |   4 +-
 .../pushTypeGetTypeOfAlias.symbols.diff       |   5 +-
 .../compiler/pushTypeGetTypeOfAlias.types     |   4 +-
 .../compiler/reactImportDropped.types         |  12 +-
 ...tTransitiveImportHasValidDeclaration.types |  16 +-
 ...sitiveImportHasValidDeclaration.types.diff |  32 +-
 .../compiler/reexportDefaultIsCallable.types  |   2 +-
 .../reexportDefaultIsCallable.types.diff      |  11 +
 .../compiler/reexportMissingDefault4.types    |   2 +-
 .../reexportMissingDefault4.types.diff        |   2 +-
 ...eexportWrittenCorrectlyInDeclaration.types |   4 +-
 ...rtWrittenCorrectlyInDeclaration.types.diff |  15 +
 .../requireOfJsonFileInJsFile.symbols         |   2 +-
 .../requireOfJsonFileInJsFile.symbols.diff    |  11 +-
 .../compiler/resolveNameWithNamspace.symbols  |   4 +-
 .../resolveNameWithNamspace.symbols.diff      |   8 +-
 .../compiler/resolveNameWithNamspace.types    |   4 +-
 .../spuriousCircularityOnTypeImport.types     |   4 +-
 ...spuriousCircularityOnTypeImport.types.diff |  15 -
 .../compiler/stackDepthLimitCastingType.types |   4 +-
 .../stackDepthLimitCastingType.types.diff     |  19 +
 ...symbolLinkDeclarationEmitModuleNames.types |   4 +-
 ...lLinkDeclarationEmitModuleNames.types.diff |  14 +
 ...kDeclarationEmitModuleNamesImportRef.types |   8 +-
 ...arationEmitModuleNamesImportRef.types.diff |  24 +
 ...inkDeclarationEmitModuleNamesRootDir.types |   4 +-
 ...clarationEmitModuleNamesRootDir.types.diff |  14 +
 ...rectLinkGeneratesDeepNonrelativeName.types |  14 +-
 ...inkGeneratesDeepNonrelativeName.types.diff |  27 +-
 ...NoDirectLinkGeneratesNonrelativeName.types |   8 +-
 ...ectLinkGeneratesNonrelativeName.types.diff |  15 +
 ...LinkOptionalGeneratesNonrelativeName.types |   8 +-
 ...ptionalGeneratesNonrelativeName.types.diff |  15 +
 ...rectLinkPeerGeneratesNonrelativeName.types |   8 +-
 ...inkPeerGeneratesNonrelativeName.types.diff |  15 +
 ...tsxResolveExternalModuleExportsTypes.types |   4 +-
 ...solveExternalModuleExportsTypes.types.diff |  19 +
 .../typeReferenceDirectives12.symbols         |   2 +-
 .../typeReferenceDirectives12.symbols.diff    |  11 +
 .../compiler/typeReferenceDirectives12.types  |   2 +-
 .../typeReferenceDirectives12.types.diff      |  11 +
 .../compiler/typeReferenceDirectives9.symbols |   2 +-
 .../typeReferenceDirectives9.symbols.diff     |  11 +
 .../compiler/typeReferenceDirectives9.types   |   2 +-
 .../typeReferenceDirectives9.types.diff       |  11 +
 .../umdGlobalAugmentationNoCrash.types        |   8 +-
 .../umdGlobalAugmentationNoCrash.types.diff   |  34 ++
 .../compiler/umdGlobalConflict.types          |   4 +-
 .../compiler/umdGlobalConflict.types.diff     |  19 +
 ...dWithGlobalAugmentationIsNotCircular.types |   6 +-
 ...GlobalAugmentationIsNotCircular.types.diff |  27 +
 .../visibilityOfCrossModuleTypeUsage.types    |  12 +-
 ...isibilityOfCrossModuleTypeUsage.types.diff |  25 +
 .../allowsImportingTsExtension.symbols        |   4 +-
 .../allowsImportingTsExtension.symbols.diff   |  17 +
 .../allowsImportingTsExtension.types          |   8 +-
 .../allowsImportingTsExtension.types.diff     |  22 +
 ...aryModuleNamespaceIdentifiers_syntax.types |   4 +-
 ...duleNamespaceIdentifiers_syntax.types.diff |  20 +-
 .../conformance/assignmentToVoidZero1.symbols |   8 +-
 .../assignmentToVoidZero1.symbols.diff        |  12 +-
 .../conformance/assignmentToVoidZero1.types   |   8 +-
 .../conformance/assignmentToVoidZero2.symbols |   4 +-
 .../assignmentToVoidZero2.symbols.diff        |   5 +-
 .../conformance/assignmentToVoidZero2.types   |   4 +-
 .../submodule/conformance/chained.types       |   4 +-
 .../submodule/conformance/chained.types.diff  |  13 +
 .../chainedPrototypeAssignment.symbols        |   4 +-
 .../chainedPrototypeAssignment.symbols.diff   |   4 +-
 .../chainedPrototypeAssignment.types          |   4 +-
 .../conformance/commonJSAliasedExport.symbols |   2 +-
 .../commonJSAliasedExport.symbols.diff        |  11 +-
 .../commonJSImportClassTypeReference.symbols  |   4 +-
 ...monJSImportClassTypeReference.symbols.diff |  13 +-
 .../commonJSImportClassTypeReference.types    |   4 +-
 ...monJSImportExportedClassExpression.symbols |   4 +-
 ...ImportExportedClassExpression.symbols.diff |  13 +-
 ...ommonJSImportExportedClassExpression.types |   4 +-
 ...onJSImportNestedClassTypeReference.symbols |   4 +-
 ...mportNestedClassTypeReference.symbols.diff |  13 +-
 ...mmonJSImportNestedClassTypeReference.types |   4 +-
 ...onJsImportBindingElementNarrowType.symbols |   2 +-
 ...mportBindingElementNarrowType.symbols.diff |  11 +
 ...mmonJsImportBindingElementNarrowType.types |   2 +-
 .../conformance/constructorFunctions2.symbols |   2 +-
 .../constructorFunctions2.symbols.diff        |   7 +-
 .../contextualTypedSpecialAssignment.symbols  |  12 +-
 ...textualTypedSpecialAssignment.symbols.diff |  21 +-
 .../contextualTypedSpecialAssignment.types    |  16 +-
 ...FileForHtmlFileWithinDeclarationFile.types |   2 +-
 ...orHtmlFileWithinDeclarationFile.types.diff |  11 +
 .../duplicateExportAssignments.types          |   2 +-
 .../duplicateExportAssignments.types.diff     |  11 +
 .../conformance/enumTagOnExports.symbols      |   6 +-
 .../conformance/enumTagOnExports.symbols.diff |   6 +-
 .../conformance/enumTagOnExports.types        |   8 +-
 .../exportAsNamespace1(module=commonjs).types |   2 +-
 ...rtAsNamespace1(module=commonjs).types.diff |  11 +
 .../exportAsNamespace1(module=es2015).types   |   2 +-
 ...portAsNamespace1(module=es2015).types.diff |  11 +
 .../exportAsNamespace1(module=esnext).types   |   2 +-
 ...portAsNamespace1(module=esnext).types.diff |  11 +
 .../exportAsNamespace2(module=commonjs).types |   2 +-
 ...rtAsNamespace2(module=commonjs).types.diff |  11 +
 .../exportAsNamespace2(module=es2015).types   |   2 +-
 ...portAsNamespace2(module=es2015).types.diff |  11 +
 .../exportAsNamespace2(module=esnext).types   |   2 +-
 ...portAsNamespace2(module=esnext).types.diff |  11 +
 .../exportAsNamespace3(module=commonjs).types |   2 +-
 ...rtAsNamespace3(module=commonjs).types.diff |  11 +
 .../exportAsNamespace3(module=es2015).types   |   2 +-
 ...portAsNamespace3(module=es2015).types.diff |  11 +
 .../exportAsNamespace3(module=esnext).types   |   2 +-
 ...portAsNamespace3(module=esnext).types.diff |  11 +
 .../exportAsNamespace4(module=commonjs).types |   2 +-
 ...rtAsNamespace4(module=commonjs).types.diff |  11 +
 .../exportAsNamespace4(module=es2015).types   |   2 +-
 ...portAsNamespace4(module=es2015).types.diff |  11 +
 .../exportAsNamespace4(module=esnext).types   |   2 +-
 ...portAsNamespace4(module=esnext).types.diff |  11 +
 .../conformance/exportAsNamespace5.types      |   2 +-
 .../conformance/exportAsNamespace5.types.diff |  11 +
 ...tion_moduleSpecifier-isolatedModules.types |   2 +-
 ...moduleSpecifier-isolatedModules.types.diff |   8 +
 .../exportDeclaration_moduleSpecifier.types   |   2 +-
 ...portDeclaration_moduleSpecifier.types.diff |  11 +
 .../conformance/exportNamespace1.types        |   2 +-
 .../conformance/exportNamespace1.types.diff   |  10 +
 .../conformance/exportNamespace10.types       |   2 +-
 .../conformance/exportNamespace10.types.diff  |  11 +
 .../conformance/exportNamespace2.types        |   2 +-
 .../conformance/exportNamespace2.types.diff   |  11 +
 .../conformance/exportNamespace3.types        |   4 +-
 .../conformance/exportNamespace3.types.diff   |  16 +
 .../conformance/exportNamespace4.types        |   2 +-
 .../conformance/exportNamespace4.types.diff   |  11 +
 .../conformance/exportNamespace5.types        |   2 +-
 .../conformance/exportNamespace5.types.diff   |  11 +
 .../exportNestedNamespaces.symbols            |   6 +-
 .../exportNestedNamespaces.symbols.diff       |   9 +-
 .../conformance/exportNestedNamespaces.types  |   6 +-
 .../exportNestedNamespaces2.symbols           |  10 +-
 .../exportNestedNamespaces2.symbols.diff      |  24 +-
 .../conformance/exportNestedNamespaces2.types |  14 +-
 ...rtPropertyAssignmentNameResolution.symbols |   4 +-
 ...pertyAssignmentNameResolution.symbols.diff |   4 +-
 ...portPropertyAssignmentNameResolution.types |   6 +-
 ...tTypeMergedWithExportStarAsNamespace.types |  10 +-
 ...MergedWithExportStarAsNamespace.types.diff |  22 +
 .../conformance/exportsAndImports1-es6.types  |   8 +-
 .../exportsAndImports1-es6.types.diff         |  18 +
 .../conformance/exportsAndImports1.types      |   8 +-
 .../conformance/exportsAndImports1.types.diff |  18 +
 .../conformance/exportsAndImports3-es6.types  |  16 +-
 .../exportsAndImports3-es6.types.diff         |  27 +
 .../conformance/exportsAndImports3.types      |  16 +-
 .../conformance/exportsAndImports3.types.diff |  27 +
 .../importAssertion1(module=commonjs).symbols |  16 +-
 ...rtAssertion1(module=commonjs).symbols.diff |  58 ++
 .../importAssertion1(module=commonjs).types   |  32 +-
 ...portAssertion1(module=commonjs).types.diff |  83 +++
 .../importAssertion1(module=es2015).symbols   |  16 +-
 ...portAssertion1(module=es2015).symbols.diff |  58 ++
 .../importAssertion1(module=es2015).types     |  32 +-
 ...importAssertion1(module=es2015).types.diff |  83 +++
 .../importAssertion1(module=esnext).symbols   |  16 +-
 ...portAssertion1(module=esnext).symbols.diff |  58 ++
 .../importAssertion1(module=esnext).types     |  32 +-
 ...importAssertion1(module=esnext).types.diff |  83 +++
 .../importAssertion2(module=commonjs).types   |   2 +-
 ...portAssertion2(module=commonjs).types.diff |  11 +
 .../importAssertion2(module=es2015).types     |   2 +-
 ...importAssertion2(module=es2015).types.diff |  11 +
 .../importAssertion2(module=esnext).types     |   2 +-
 ...importAssertion2(module=esnext).types.diff |   3 +-
 .../importAssertion3(module=es2015).types     |   2 +-
 ...importAssertion3(module=es2015).types.diff |  11 +
 .../importAssertion3(module=esnext).types     |   2 +-
 ...importAssertion3(module=esnext).types.diff |  11 +
 ...importAttributes1(module=commonjs).symbols |  16 +-
 ...tAttributes1(module=commonjs).symbols.diff |  58 ++
 .../importAttributes1(module=commonjs).types  |  32 +-
 ...ortAttributes1(module=commonjs).types.diff |  83 +++
 .../importAttributes1(module=es2015).symbols  |  16 +-
 ...ortAttributes1(module=es2015).symbols.diff |  58 ++
 .../importAttributes1(module=es2015).types    |  32 +-
 ...mportAttributes1(module=es2015).types.diff |  83 +++
 .../importAttributes1(module=esnext).symbols  |  16 +-
 ...ortAttributes1(module=esnext).symbols.diff |  58 ++
 .../importAttributes1(module=esnext).types    |  32 +-
 ...mportAttributes1(module=esnext).types.diff |  83 +++
 .../importAttributes2(module=commonjs).types  |   2 +-
 ...ortAttributes2(module=commonjs).types.diff |  11 +
 .../importAttributes2(module=es2015).types    |   2 +-
 ...mportAttributes2(module=es2015).types.diff |  11 +
 .../importAttributes2(module=esnext).types    |   2 +-
 ...mportAttributes2(module=esnext).types.diff |   3 +-
 .../importAttributes3(module=es2015).types    |   2 +-
 ...mportAttributes3(module=es2015).types.diff |  11 +
 .../importAttributes3(module=esnext).types    |   2 +-
 ...mportAttributes3(module=esnext).types.diff |  11 +
 .../conformance/importAttributes7.symbols     |   2 +-
 .../importAttributes7.symbols.diff            |  11 +
 .../conformance/importAttributes7.types       |   6 +-
 .../conformance/importAttributes7.types.diff  |  18 +-
 .../importCallExpression1ES2020.symbols       |   8 +-
 .../importCallExpression1ES2020.symbols.diff  |  31 ++
 .../importCallExpression1ES2020.types         |  26 +-
 .../importCallExpression1ES2020.types.diff    |  56 ++
 .../importCallExpression2ES2020.symbols       |   2 +-
 .../importCallExpression2ES2020.symbols.diff  |   8 +
 .../importCallExpression2ES2020.types         |   2 +-
 .../importCallExpression2ES2020.types.diff    |   9 +
 .../importCallExpression3ES2020.symbols       |   2 +-
 .../importCallExpression3ES2020.symbols.diff  |  11 +
 .../importCallExpression3ES2020.types         |  10 +-
 .../importCallExpression3ES2020.types.diff    |  20 +
 .../importCallExpression4ES2020.symbols       |   6 +-
 .../importCallExpression4ES2020.symbols.diff  |  28 +
 .../importCallExpression4ES2020.types         |  30 +-
 .../importCallExpression4ES2020.types.diff    |  71 +++
 .../importCallExpressionAsyncES2020.symbols   |  10 +-
 ...portCallExpressionAsyncES2020.symbols.diff |  45 ++
 .../importCallExpressionAsyncES2020.types     |  30 +-
 ...importCallExpressionAsyncES2020.types.diff |  66 +++
 .../importCallExpressionAsyncES5CJS.symbols   |  10 +-
 ...portCallExpressionAsyncES5CJS.symbols.diff |  45 ++
 .../importCallExpressionAsyncES5CJS.types     |  30 +-
 ...importCallExpressionAsyncES5CJS.types.diff |  66 +++
 .../importCallExpressionAsyncES6CJS.symbols   |  10 +-
 ...portCallExpressionAsyncES6CJS.symbols.diff |  45 ++
 .../importCallExpressionAsyncES6CJS.types     |  30 +-
 ...importCallExpressionAsyncES6CJS.types.diff |  66 +++
 ...portCallExpressionDeclarationEmit2.symbols |   2 +-
 ...allExpressionDeclarationEmit2.symbols.diff |   8 +
 ...importCallExpressionDeclarationEmit2.types |   4 +-
 ...tCallExpressionDeclarationEmit2.types.diff |  11 +
 .../importCallExpressionES5CJS.symbols        |  12 +-
 .../importCallExpressionES5CJS.symbols.diff   |  50 ++
 .../importCallExpressionES5CJS.types          |  34 +-
 .../importCallExpressionES5CJS.types.diff     |  79 +++
 .../importCallExpressionES6CJS.symbols        |  12 +-
 .../importCallExpressionES6CJS.symbols.diff   |  50 ++
 .../importCallExpressionES6CJS.types          |  34 +-
 .../importCallExpressionES6CJS.types.diff     |  79 +++
 .../importCallExpressionErrorInES2015.symbols |   6 +-
 ...rtCallExpressionErrorInES2015.symbols.diff |  23 +
 .../importCallExpressionErrorInES2015.types   |  22 +-
 ...portCallExpressionErrorInES2015.types.diff |  48 ++
 .../importCallExpressionInCJS1.symbols        |   8 +-
 .../importCallExpressionInCJS1.symbols.diff   |  31 ++
 .../importCallExpressionInCJS1.types          |  26 +-
 .../importCallExpressionInCJS1.types.diff     |  56 ++
 .../importCallExpressionInCJS2.symbols        |   4 +-
 .../importCallExpressionInCJS2.symbols.diff   |  17 +
 .../importCallExpressionInCJS2.types          |   8 +-
 .../importCallExpressionInCJS2.types.diff     |  23 +
 .../importCallExpressionInCJS3.symbols        |   2 +-
 .../importCallExpressionInCJS3.symbols.diff   |   8 +
 .../importCallExpressionInCJS3.types          |   2 +-
 .../importCallExpressionInCJS3.types.diff     |   9 +
 .../importCallExpressionInCJS4.symbols        |   2 +-
 .../importCallExpressionInCJS4.symbols.diff   |  11 +
 .../importCallExpressionInCJS4.types          |  10 +-
 .../importCallExpressionInCJS4.types.diff     |  20 +
 .../importCallExpressionInCJS5.symbols        |  12 +-
 .../importCallExpressionInCJS5.symbols.diff   |  54 ++
 .../importCallExpressionInCJS5.types          |  60 +--
 .../importCallExpressionInCJS5.types.diff     | 140 +++++
 ...ortCallExpressionInExportEqualsCJS.symbols |   2 +-
 ...llExpressionInExportEqualsCJS.symbols.diff |  10 +
 ...portCallExpressionInScriptContext1.symbols |   2 +-
 ...allExpressionInScriptContext1.symbols.diff |  11 +
 ...importCallExpressionInScriptContext1.types |   4 +-
 ...tCallExpressionInScriptContext1.types.diff |  13 +
 ...portCallExpressionInScriptContext2.symbols |   2 +-
 ...allExpressionInScriptContext2.symbols.diff |  11 +
 ...importCallExpressionInScriptContext2.types |   4 +-
 ...tCallExpressionInScriptContext2.types.diff |  13 +
 .../importCallExpressionNestedCJS.symbols     |   2 +-
 ...importCallExpressionNestedCJS.symbols.diff |  10 +
 .../importCallExpressionNestedCJS.types       |   6 +-
 .../importCallExpressionNestedCJS.types.diff  |  15 +
 .../importCallExpressionNestedCJS2.symbols    |   2 +-
 ...mportCallExpressionNestedCJS2.symbols.diff |  10 +
 .../importCallExpressionNestedCJS2.types      |   6 +-
 .../importCallExpressionNestedCJS2.types.diff |  15 +
 .../importCallExpressionNestedES2015.symbols  |   2 +-
 ...ortCallExpressionNestedES2015.symbols.diff |  10 +
 .../importCallExpressionNestedES2015.types    |   6 +-
 ...mportCallExpressionNestedES2015.types.diff |  15 +
 .../importCallExpressionNestedES20152.symbols |   2 +-
 ...rtCallExpressionNestedES20152.symbols.diff |  10 +
 .../importCallExpressionNestedES20152.types   |   6 +-
 ...portCallExpressionNestedES20152.types.diff |  15 +
 .../importCallExpressionNestedES2020.symbols  |   2 +-
 ...ortCallExpressionNestedES2020.symbols.diff |  10 +
 .../importCallExpressionNestedES2020.types    |   6 +-
 ...mportCallExpressionNestedES2020.types.diff |  15 +
 .../importCallExpressionNestedES20202.symbols |   2 +-
 ...rtCallExpressionNestedES20202.symbols.diff |  10 +
 .../importCallExpressionNestedES20202.types   |   6 +-
 ...portCallExpressionNestedES20202.types.diff |  15 +
 ...allExpressionNoModuleKindSpecified.symbols |   6 +-
 ...pressionNoModuleKindSpecified.symbols.diff |  28 +
 ...tCallExpressionNoModuleKindSpecified.types |  30 +-
 ...ExpressionNoModuleKindSpecified.types.diff |  71 +++
 ...portCallExpressionWithTypeArgument.symbols |   4 +-
 ...allExpressionWithTypeArgument.symbols.diff |  13 +
 ...importCallExpressionWithTypeArgument.types |   8 +-
 ...tCallExpressionWithTypeArgument.types.diff |  18 +
 .../importElisionConstEnumMerge1.types        |   8 +-
 .../importElisionConstEnumMerge1.types.diff   |  16 +
 .../conformance/importTypeGenericTypes.types  |   6 +-
 .../importTypeGenericTypes.types.diff         |  29 +
 .../conformance/importTypeInJSDoc.types       |  20 +-
 .../conformance/importTypeLocal.types         |   6 +-
 .../conformance/importTypeLocal.types.diff    |  29 +
 ...lineJsxFactoryDeclarationsLocalTypes.types |  20 +-
 ...sxFactoryDeclarationsLocalTypes.types.diff |  54 ++
 ...ineJsxFactoryLocalTypeGlobalFallback.types |   8 +-
 ...xFactoryLocalTypeGlobalFallback.types.diff |  22 +
 .../intersectionsAndEmptyObjects.symbols      |   2 +-
 .../intersectionsAndEmptyObjects.symbols.diff |  10 +
 .../intersectionsAndEmptyObjects.types        |   2 +-
 .../intersectionsAndEmptyObjects.types.diff   |  11 +
 .../jsDeclarationsClassAccessor.symbols       |   2 +-
 .../jsDeclarationsClassAccessor.symbols.diff  |  11 +
 .../jsDeclarationsClassAccessor.types         |   2 +-
 ...DeclarationsClassExtendsVisibility.symbols |   2 +-
 ...rationsClassExtendsVisibility.symbols.diff |  11 +-
 ...sExportAssignedConstructorFunction.symbols |   8 +-
 ...rtAssignedConstructorFunction.symbols.diff |   8 +-
 ...onsExportAssignedConstructorFunction.types |  12 +-
 ...clarationsExportAssignedVisibility.symbols |   2 +-
 ...tionsExportAssignedVisibility.symbols.diff |  11 +-
 ...onsExportDoubleAssignmentInClosure.symbols |   4 +-
 ...portDoubleAssignmentInClosure.symbols.diff |   7 +-
 ...tionsExportDoubleAssignmentInClosure.types |   2 +-
 .../jsDeclarationsExportForms.symbols         |   8 +-
 .../jsDeclarationsExportForms.symbols.diff    |   8 +-
 .../jsDeclarationsExportForms.types           |  12 +-
 ...sDeclarationsExportSpecifierNonlocal.types |   6 +-
 ...jsDeclarationsExportedClassAliases.symbols |   2 +-
 ...larationsExportedClassAliases.symbols.diff |   2 +-
 .../jsDeclarationsFunctionsCjs.symbols        |  72 +--
 .../jsDeclarationsFunctionsCjs.symbols.diff   |  72 +--
 .../jsDeclarationsFunctionsCjs.types          | 108 ++--
 ...portAliasExposedWithinNamespaceCjs.symbols |   4 +-
 ...liasExposedWithinNamespaceCjs.symbols.diff |  13 +-
 ...ImportAliasExposedWithinNamespaceCjs.types |   4 +-
 .../jsDeclarationsReexportedCjsAlias.symbols  |   2 +-
 ...eclarationsReexportedCjsAlias.symbols.diff |  10 +-
 ...sReferenceToClassInstanceCrossFile.symbols |   4 +-
 ...renceToClassInstanceCrossFile.symbols.diff |  19 +-
 .../jsDeclarationsTypeReferences2.types       |   2 +-
 .../jsDeclarationsTypeReferences3.symbols     |   8 +-
 ...jsDeclarationsTypeReferences3.symbols.diff |   8 +-
 .../jsDeclarationsTypeReferences3.types       |  12 +-
 .../jsDeclarationsTypedefAndImportTypes.types |   4 +-
 .../jsDeclarationsTypedefAndLatebound.symbols |   2 +-
 ...clarationsTypedefAndLatebound.symbols.diff |  11 +-
 ...TypedefPropertyAndExportAssignment.symbols |   2 +-
 ...efPropertyAndExportAssignment.symbols.diff |  11 +-
 .../jsDeclarationsUniqueSymbolUsage.types     |   6 +-
 .../conformance/jsdocImportType.symbols       |   2 +-
 .../conformance/jsdocImportType.symbols.diff  |  11 +-
 .../conformance/jsdocImportType2.symbols      |   2 +-
 .../conformance/jsdocImportType2.symbols.diff |  11 +-
 ...docImportTypeReferenceToClassAlias.symbols |   4 +-
 ...portTypeReferenceToClassAlias.symbols.diff |   4 +-
 ...jsdocImportTypeReferenceToClassAlias.types |   6 +-
 .../submodule/conformance/jsdocThisType.types |  16 +-
 .../jsdocTypeFromChainedAssignment2.symbols   |  12 +-
 ...docTypeFromChainedAssignment2.symbols.diff |  12 +-
 .../jsdocTypeFromChainedAssignment2.types     |  16 +-
 .../jsdocTypeFromChainedAssignment3.symbols   | 198 +++----
 ...docTypeFromChainedAssignment3.symbols.diff | 198 +++----
 .../jsdocTypeFromChainedAssignment3.types     | 198 +++----
 .../jsdocTypeReferenceToImport.types          |  24 +-
 ...ReferenceToImportOfClassExpression.symbols |   2 +-
 ...enceToImportOfClassExpression.symbols.diff |  10 +-
 ...erenceToImportOfFunctionExpression.symbols |   2 +-
 ...eToImportOfFunctionExpression.symbols.diff |  11 +-
 ...BoundAssignmentDeclarationSupport1.symbols |   6 +-
 ...AssignmentDeclarationSupport1.symbols.diff |  15 +-
 ...teBoundAssignmentDeclarationSupport1.types |   6 +-
 ...BoundAssignmentDeclarationSupport2.symbols |  12 +-
 ...AssignmentDeclarationSupport2.symbols.diff |  12 +-
 ...teBoundAssignmentDeclarationSupport2.types |  18 +-
 ...BoundAssignmentDeclarationSupport3.symbols |  12 +-
 ...AssignmentDeclarationSupport3.symbols.diff |  12 +-
 ...teBoundAssignmentDeclarationSupport3.types |  22 +-
 ...BoundAssignmentDeclarationSupport4.symbols |   8 +-
 ...AssignmentDeclarationSupport4.symbols.diff |   8 +-
 ...teBoundAssignmentDeclarationSupport4.types |  12 +-
 ...BoundAssignmentDeclarationSupport5.symbols |   8 +-
 ...AssignmentDeclarationSupport5.symbols.diff |   8 +-
 ...teBoundAssignmentDeclarationSupport5.types |  12 +-
 ...BoundAssignmentDeclarationSupport6.symbols |   8 +-
 ...AssignmentDeclarationSupport6.symbols.diff |   8 +-
 ...teBoundAssignmentDeclarationSupport6.types |  12 +-
 ...BoundAssignmentDeclarationSupport7.symbols |   8 +-
 ...AssignmentDeclarationSupport7.symbols.diff |   8 +-
 ...teBoundAssignmentDeclarationSupport7.types |  12 +-
 .../leaveOptionalParameterAsWritten.types     |   8 +-
 ...leaveOptionalParameterAsWritten.types.diff |  15 +-
 ...portsSpecifierGenerationConditions.symbols |   2 +-
 ...SpecifierGenerationConditions.symbols.diff |  11 +
 ...ExportsSpecifierGenerationConditions.types |  18 +-
 ...tsSpecifierGenerationConditions.types.diff |  33 +-
 .../conformance/moduleExportAlias.symbols     |  36 +-
 .../moduleExportAlias.symbols.diff            |  53 +-
 .../conformance/moduleExportAlias.types       |  36 +-
 .../conformance/moduleExportAlias2.symbols    |   8 +-
 .../moduleExportAlias2.symbols.diff           |  14 +-
 .../conformance/moduleExportAlias2.types      |   8 +-
 .../conformance/moduleExportAlias4.symbols    |   2 +-
 .../moduleExportAlias4.symbols.diff           |   8 +-
 .../conformance/moduleExportAlias5.symbols    |   8 +-
 .../moduleExportAlias5.symbols.diff           |   9 +-
 .../conformance/moduleExportAlias5.types      |   8 +-
 ...ExportAliasElementAccessExpression.symbols |   4 +-
 ...tAliasElementAccessExpression.symbols.diff |  17 +
 ...leExportAliasElementAccessExpression.types |   4 +-
 .../moduleExportAliasExports.symbols          |  10 +-
 .../moduleExportAliasExports.symbols.diff     |  13 +-
 .../moduleExportAliasExports.types            |  14 +-
 .../moduleExportAliasImported.symbols         |   4 +-
 .../moduleExportAliasImported.symbols.diff    |   7 +-
 .../moduleExportAliasImported.types           |   2 +-
 .../moduleExportAliasUnknown.symbols          |   2 +-
 .../moduleExportAliasUnknown.symbols.diff     |   2 +-
 .../moduleExportAliasUnknown.types            |   2 +-
 .../moduleExportAssignment.symbols            |  16 +-
 .../moduleExportAssignment.symbols.diff       |  16 +-
 .../conformance/moduleExportAssignment.types  |  24 +-
 .../moduleExportAssignment2.symbols           |  12 +-
 .../moduleExportAssignment2.symbols.diff      |  12 +-
 .../conformance/moduleExportAssignment2.types |  18 +-
 .../moduleExportAssignment3.symbols           |   2 +-
 .../moduleExportAssignment3.symbols.diff      |  10 +-
 .../moduleExportAssignment4.symbols           |   4 +-
 .../moduleExportAssignment4.symbols.diff      |   5 +-
 .../conformance/moduleExportAssignment4.types |   4 +-
 .../moduleExportDuplicateAlias.symbols        |  10 +-
 .../moduleExportDuplicateAlias.symbols.diff   |  29 +-
 .../moduleExportDuplicateAlias.types          |  10 +-
 .../moduleExportDuplicateAlias2.symbols       |  18 +-
 .../moduleExportDuplicateAlias2.symbols.diff  |  27 +-
 .../moduleExportDuplicateAlias2.types         |  26 +-
 .../moduleExportDuplicateAlias3.symbols       |  16 +-
 .../moduleExportDuplicateAlias3.symbols.diff  |  28 +-
 .../moduleExportDuplicateAlias3.types         |  16 +-
 .../moduleExportNestedNamespaces.symbols      |  12 +-
 .../moduleExportNestedNamespaces.symbols.diff |  12 +-
 .../moduleExportNestedNamespaces.types        |  18 +-
 ...ExportWithExportPropertyAssignment.symbols |   2 +-
 ...tWithExportPropertyAssignment.symbols.diff |  11 +-
 ...xportWithExportPropertyAssignment2.symbols |   2 +-
 ...WithExportPropertyAssignment2.symbols.diff |  11 +-
 ...xportWithExportPropertyAssignment3.symbols |   2 +-
 ...WithExportPropertyAssignment3.symbols.diff |  11 +-
 ...xportWithExportPropertyAssignment4.symbols |   2 +-
 ...WithExportPropertyAssignment4.symbols.diff |  11 +-
 .../moduleExportsAliasLoop1.symbols           |   4 +-
 .../moduleExportsAliasLoop1.symbols.diff      |   9 +-
 .../conformance/moduleExportsAliasLoop1.types |   4 +-
 .../moduleExportsAliasLoop2.symbols           |   4 +-
 .../moduleExportsAliasLoop2.symbols.diff      |   9 +-
 .../conformance/moduleExportsAliasLoop2.types |   4 +-
 ...duleExportsElementAccessAssignment.symbols |  14 +-
 ...xportsElementAccessAssignment.symbols.diff |  21 +-
 ...moduleExportsElementAccessAssignment.types |  20 +-
 .../multipleDefaultExports03.types            |   2 +-
 .../multipleDefaultExports03.types.diff       |   9 +
 .../multipleDefaultExports05.types            |   4 +-
 .../multipleDefaultExports05.types.diff       |  12 +
 .../conformance/multipleExportDefault3.types  |   2 +-
 .../multipleExportDefault3.types.diff         |   9 +
 .../nestedDestructuringOfRequire.symbols      |   6 +-
 .../nestedDestructuringOfRequire.symbols.diff |  15 +-
 .../nestedDestructuringOfRequire.types        |   8 +-
 ...lesAllowJsCjsFromJs(module=node16).symbols |   2 +-
 ...lowJsCjsFromJs(module=node16).symbols.diff |   2 +-
 ...dulesAllowJsCjsFromJs(module=node16).types |   2 +-
 ...lesAllowJsCjsFromJs(module=node18).symbols |   2 +-
 ...lowJsCjsFromJs(module=node18).symbols.diff |   2 +-
 ...dulesAllowJsCjsFromJs(module=node18).types |   2 +-
 ...sAllowJsCjsFromJs(module=nodenext).symbols |   2 +-
 ...wJsCjsFromJs(module=nodenext).symbols.diff |   2 +-
 ...lesAllowJsCjsFromJs(module=nodenext).types |   2 +-
 ...tWithPackageExports(module=node18).symbols |  36 +-
 ...PackageExports(module=node18).symbols.diff | 106 ++++
 ...ortWithPackageExports(module=node18).types |  96 ++--
 ...thPackageExports(module=node18).types.diff | 119 +++--
 ...ithPackageExports(module=nodenext).symbols |  36 +-
 ...ckageExports(module=nodenext).symbols.diff | 106 ++++
 ...tWithPackageExports(module=nodenext).types |  96 ++--
 ...PackageExports(module=nodenext).types.diff | 166 ++++++
 ...SpecifierResolution(module=node16).symbols |   2 +-
 ...fierResolution(module=node16).symbols.diff |  11 +
 ...ksSpecifierResolution(module=node16).types |  16 +-
 ...cifierResolution(module=node16).types.diff |  30 ++
 ...SpecifierResolution(module=node18).symbols |   2 +-
 ...fierResolution(module=node18).symbols.diff |  11 +
 ...ksSpecifierResolution(module=node18).types |  16 +-
 ...cifierResolution(module=node18).types.diff |  30 ++
 ...ecifierResolution(module=nodenext).symbols |   2 +-
 ...erResolution(module=nodenext).symbols.diff |  11 +
 ...SpecifierResolution(module=nodenext).types |  16 +-
 ...fierResolution(module=nodenext).types.diff |  30 ++
 ...ulesExportsSourceTs(module=node16).symbols |   2 +-
 ...xportsSourceTs(module=node16).symbols.diff |  11 +
 ...odulesExportsSourceTs(module=node16).types |  20 +-
 ...sExportsSourceTs(module=node16).types.diff |  36 ++
 ...ulesExportsSourceTs(module=node18).symbols |   2 +-
 ...xportsSourceTs(module=node18).symbols.diff |  11 +
 ...odulesExportsSourceTs(module=node18).types |  20 +-
 ...sExportsSourceTs(module=node18).types.diff |  36 ++
 ...esExportsSourceTs(module=nodenext).symbols |   2 +-
 ...ortsSourceTs(module=nodenext).symbols.diff |  11 +
 ...ulesExportsSourceTs(module=nodenext).types |  20 +-
 ...xportsSourceTs(module=nodenext).types.diff |  36 ++
 ...enerationConditions(module=node16).symbols |   2 +-
 ...tionConditions(module=node16).symbols.diff |  11 +
 ...rGenerationConditions(module=node16).types |  16 +-
 ...rationConditions(module=node16).types.diff |  30 ++
 ...enerationConditions(module=node18).symbols |   2 +-
 ...tionConditions(module=node18).symbols.diff |  11 +
 ...rGenerationConditions(module=node18).types |  16 +-
 ...rationConditions(module=node18).types.diff |  30 ++
 ...erationConditions(module=nodenext).symbols |   2 +-
 ...onConditions(module=nodenext).symbols.diff |  11 +
 ...enerationConditions(module=nodenext).types |  16 +-
 ...tionConditions(module=nodenext).types.diff |  30 ++
 ...GenerationDirectory(module=node16).symbols |   2 +-
 ...ationDirectory(module=node16).symbols.diff |  11 +
 ...erGenerationDirectory(module=node16).types |  16 +-
 ...erationDirectory(module=node16).types.diff |  30 ++
 ...GenerationDirectory(module=node18).symbols |   2 +-
 ...ationDirectory(module=node18).symbols.diff |  11 +
 ...erGenerationDirectory(module=node18).types |  16 +-
 ...erationDirectory(module=node18).types.diff |  30 ++
 ...nerationDirectory(module=nodenext).symbols |   2 +-
 ...ionDirectory(module=nodenext).symbols.diff |  11 +
 ...GenerationDirectory(module=nodenext).types |  16 +-
 ...ationDirectory(module=nodenext).types.diff |  30 ++
 ...erGenerationPattern(module=node16).symbols |   2 +-
 ...erationPattern(module=node16).symbols.diff |  11 +
 ...fierGenerationPattern(module=node16).types |  16 +-
 ...enerationPattern(module=node16).types.diff |  30 ++
 ...erGenerationPattern(module=node18).symbols |   2 +-
 ...erationPattern(module=node18).symbols.diff |  11 +
 ...fierGenerationPattern(module=node18).types |  16 +-
 ...enerationPattern(module=node18).types.diff |  30 ++
 ...GenerationPattern(module=nodenext).symbols |   2 +-
 ...ationPattern(module=nodenext).symbols.diff |  11 +
 ...erGenerationPattern(module=nodenext).types |  16 +-
 ...erationPattern(module=nodenext).types.diff |  30 ++
 ...peModeDeclarationEmit(module=node16).types |  12 +-
 ...eDeclarationEmit(module=node16).types.diff |  24 +
 ...peModeDeclarationEmit(module=node18).types |  12 +-
 ...eDeclarationEmit(module=node18).types.diff |  24 +
 ...ModeDeclarationEmit(module=nodenext).types |  12 +-
 ...eclarationEmit(module=nodenext).types.diff |  24 +
 ...clarationEmitErrors(module=node16).symbols |   6 +-
 ...tionEmitErrors(module=node16).symbols.diff |  29 +
 ...DeclarationEmitErrors(module=node16).types |  30 +-
 ...rationEmitErrors(module=node16).types.diff |  77 +++
 ...clarationEmitErrors(module=node18).symbols |   6 +-
 ...tionEmitErrors(module=node18).symbols.diff |  29 +
 ...DeclarationEmitErrors(module=node18).types |  30 +-
 ...rationEmitErrors(module=node18).types.diff |  60 ++-
 ...arationEmitErrors(module=nodenext).symbols |   6 +-
 ...onEmitErrors(module=nodenext).symbols.diff |  29 +
 ...clarationEmitErrors(module=nodenext).types |  30 +-
 ...tionEmitErrors(module=nodenext).types.diff |  77 +++
 ...eModeDeclarationEmit1(module=node16).types |  12 +-
 ...DeclarationEmit1(module=node16).types.diff |  24 +
 ...eModeDeclarationEmit1(module=node18).types |  12 +-
 ...DeclarationEmit1(module=node18).types.diff |  24 +
 ...odeDeclarationEmit1(module=nodenext).types |  12 +-
 ...clarationEmit1(module=nodenext).types.diff |  24 +
 ...larationEmitErrors1(module=node16).symbols |   6 +-
 ...ionEmitErrors1(module=node16).symbols.diff |  29 +
 ...eclarationEmitErrors1(module=node16).types |  30 +-
 ...ationEmitErrors1(module=node16).types.diff |  77 +++
 ...larationEmitErrors1(module=node18).symbols |   6 +-
 ...ionEmitErrors1(module=node18).symbols.diff |  29 +
 ...eclarationEmitErrors1(module=node18).types |  30 +-
 ...ationEmitErrors1(module=node18).types.diff |  60 ++-
 ...rationEmitErrors1(module=nodenext).symbols |   6 +-
 ...nEmitErrors1(module=nodenext).symbols.diff |  29 +
 ...larationEmitErrors1(module=nodenext).types |  30 +-
 ...ionEmitErrors1(module=nodenext).types.diff |  77 +++
 .../paramTagOnCallExpression.symbols          |   2 +-
 .../paramTagOnCallExpression.symbols.diff     |   2 +-
 .../paramTagOnCallExpression.types            |   2 +-
 .../paramTagTypeResolution.symbols            |   2 +-
 .../paramTagTypeResolution.symbols.diff       |  11 +-
 ...mports_errors(isolatedmodules=false).types |  10 +-
 ...s_errors(isolatedmodules=false).types.diff |  25 +
 ...Imports_errors(isolatedmodules=true).types |  10 +-
 ...ts_errors(isolatedmodules=true).types.diff |  25 +
 .../conformance/privateNamesUnique-2.types    |   6 +-
 .../privateNamesUnique-2.types.diff           |  17 +-
 .../conformance/reexportClassDefinition.types |   8 +-
 .../reexportClassDefinition.types.diff        |  20 +
 .../submodule/conformance/renamed.types       |   4 +-
 .../submodule/conformance/renamed.types.diff  |  13 +
 .../requireAssertsFromTypescript.symbols      |   4 +-
 .../requireAssertsFromTypescript.symbols.diff |  17 +
 .../requireAssertsFromTypescript.types        |   2 +-
 .../requireOfESWithPropertyAccess.types       |   2 +-
 .../selfNameModuleAugmentation.symbols        |   2 +-
 .../selfNameModuleAugmentation.symbols.diff   |  11 +
 .../selfNameModuleAugmentation.types          |   2 +-
 .../sourceFileMergeWithFunction.types         |   4 +-
 .../sourceFileMergeWithFunction.types.diff    |  17 +
 .../conformance/typeAliasesDoNotMerge.types   |   4 +-
 .../typeAliasesDoNotMerge.types.diff          |  12 +
 .../typeAndNamespaceExportMerge.types         |   6 +-
 .../typeAndNamespaceExportMerge.types.diff    |  22 +
 .../typeFromParamTagForFunction.symbols       |  14 +-
 .../typeFromParamTagForFunction.symbols.diff  |  48 +-
 .../typeFromParamTagForFunction.types         |  14 +-
 .../typeFromPropertyAssignment17.symbols      |   2 +-
 .../typeFromPropertyAssignment17.symbols.diff |  11 +-
 ...eOnlyESMImportFromCJS(module=node18).types |   6 +-
 ...ESMImportFromCJS(module=node18).types.diff |  16 +
 ...nlyESMImportFromCJS(module=nodenext).types |   6 +-
 ...MImportFromCJS(module=nodenext).types.diff |  16 +
 .../conformance/typedefCrossModule.symbols    |   2 +-
 .../typedefCrossModule.symbols.diff           |   2 +-
 .../conformance/typedefCrossModule.types      |   8 +-
 .../conformance/typedefCrossModule2.symbols   |   6 +-
 .../typedefCrossModule2.symbols.diff          |  15 +-
 .../conformance/typedefCrossModule2.types     |   4 +-
 .../typeofImportTypeOnlyExport.types          |   8 +-
 .../typeofImportTypeOnlyExport.types.diff     |  19 +
 ...pesVersionsDeclarationEmit.multiFile.types |  16 +-
 ...rsionsDeclarationEmit.multiFile.types.diff |  31 ++
 ...ionEmit.multiFileBackReferenceToSelf.types |   8 +-
 ...it.multiFileBackReferenceToSelf.types.diff |  24 +
 ...mit.multiFileBackReferenceToUnmapped.types |  18 +-
 ...ultiFileBackReferenceToUnmapped.types.diff |  33 ++
 .../conformance/umd-augmentation-1.types      |   2 +-
 .../conformance/umd-augmentation-1.types.diff |  11 +-
 .../conformance/umd-augmentation-2.types      |   2 +-
 .../conformance/umd-augmentation-2.types.diff |  11 +-
 .../conformance/umd-augmentation-3.types      |   6 +-
 .../conformance/umd-augmentation-3.types.diff |  19 +-
 .../conformance/umd-augmentation-4.types      |   6 +-
 .../conformance/umd-augmentation-4.types.diff |  19 +-
 .../submodule/conformance/umd-errors.types    |   8 +-
 .../conformance/umd-errors.types.diff         |  23 +
 .../submodule/conformance/umd1.types          |   2 +-
 .../submodule/conformance/umd1.types.diff     |   8 +
 .../submodule/conformance/umd3.types          |   2 +-
 .../submodule/conformance/umd3.types.diff     |   8 +
 .../submodule/conformance/umd4.types          |   2 +-
 .../submodule/conformance/umd4.types.diff     |   8 +
 .../submodule/conformance/umd5.types          |   2 +-
 .../submodule/conformance/umd5.types.diff     |   8 +
 .../submodule/conformance/umd9.types          |   4 +-
 .../submodule/conformance/umd9.types.diff     |  13 +
 .../untypedModuleImport_allowJs.symbols       |   2 +-
 .../untypedModuleImport_allowJs.symbols.diff  |   2 +-
 .../untypedModuleImport_allowJs.types         |   2 +-
 ...JsdocTypeTagOnExportAssignment1.types.diff |  12 +
 ...JsdocTypeTagOnExportAssignment2.types.diff |  12 +
 ...JsdocTypeTagOnExportAssignment5.types.diff |  12 +
 ...JsdocTypeTagOnExportAssignment6.types.diff |  12 +
 .../compiler/commonJsUnusedLocals.types.diff  |  10 +
 .../compiler/commonjsAccessExports.types.diff |  29 +-
 ...expandoFunctionSymbolPropertyJs.types.diff |  11 -
 .../exportDefaultWithJSDoc1.types.diff        |  12 +-
 .../exportDefaultWithJSDoc2.types.diff        |  15 +
 .../functionExpressionNames.types.diff        |  12 +-
 .../importTypeResolutionJSDocEOF.types.diff   |  10 +
 ...larationEmitDoesNotRenameImport.types.diff |  28 +
 ...WithDefaultAsNamespaceLikeMerge.types.diff |  35 ++
 ...tUseNodeModulesPathWithoutError.types.diff |  17 +-
 .../jsEnumTagOnObjectFrozen.types.diff        |  38 +-
 ...ortAssignmentNonMutableLocation.types.diff |   7 +-
 ...erMergedWithModuleAugmentation3.types.diff |  27 +-
 ...CompilationExternalPackageError.types.diff |   9 +-
 .../jsdocPropertyTagInvalid.types.diff        |   4 +-
 ...ocReferenceGlobalTypeInCommonJs.types.diff |  11 +
 ...opertyCheckFromContainedLiteral.types.diff |  10 +-
 ...oneDynamicImport(target=es2015).types.diff |  13 +
 ...oneDynamicImport(target=es2020).types.diff |  13 +
 .../compiler/modulePreserve4.types.diff       |  33 +-
 ...lutionWithSuffixes_one_jsModule.types.diff |  37 ++
 ...ution_explicitNodeModulesImport.types.diff |  10 +
 .../pushTypeGetTypeOfAlias.types.diff         |   4 +-
 .../compiler/reactImportDropped.types.diff    |  31 +-
 .../resolveNameWithNamspace.types.diff        |   8 +-
 .../assignmentToVoidZero1.types.diff          |  25 +-
 .../assignmentToVoidZero2.types.diff          |  16 +-
 .../chainedPrototypeAssignment.types.diff     |  14 +-
 ...ommonJSImportClassTypeReference.types.diff |  21 +-
 ...JSImportExportedClassExpression.types.diff |  21 +-
 ...SImportNestedClassTypeReference.types.diff |  18 +-
 ...sImportBindingElementNarrowType.types.diff |  10 +
 ...ontextualTypedSpecialAssignment.types.diff |  22 +-
 .../conformance/enumTagOnExports.types.diff   |  11 +-
 .../exportNestedNamespaces.types.diff         |  22 +-
 .../exportNestedNamespaces2.types.diff        |  47 +-
 ...ropertyAssignmentNameResolution.types.diff |   6 +-
 .../conformance/importTypeInJSDoc.types.diff  |  39 +-
 .../jsDeclarationsClassAccessor.types.diff    |  11 +
 ...portAssignedConstructorFunction.types.diff |  12 +-
 ...ExportDoubleAssignmentInClosure.types.diff |   2 +-
 .../jsDeclarationsExportForms.types.diff      |  12 +-
 ...arationsExportSpecifierNonlocal.types.diff |  12 +
 .../jsDeclarationsFunctionsCjs.types.diff     | 108 ++--
 ...tAliasExposedWithinNamespaceCjs.types.diff |  11 +-
 .../jsDeclarationsTypeReferences2.types.diff  |  11 +-
 .../jsDeclarationsTypeReferences3.types.diff  |  12 +-
 ...clarationsTypedefAndImportTypes.types.diff |  18 +-
 ...jsDeclarationsUniqueSymbolUsage.types.diff |  14 +-
 ...ImportTypeReferenceToClassAlias.types.diff |   6 +-
 .../conformance/jsdocThisType.types.diff      |  43 +-
 ...jsdocTypeFromChainedAssignment2.types.diff |  16 +-
 ...jsdocTypeFromChainedAssignment3.types.diff | 495 +++++++++++++++++-
 .../jsdocTypeReferenceToImport.types.diff     |  26 +-
 ...ndAssignmentDeclarationSupport1.types.diff |  26 +
 ...ndAssignmentDeclarationSupport2.types.diff |  18 +-
 ...ndAssignmentDeclarationSupport3.types.diff |  22 +-
 ...ndAssignmentDeclarationSupport4.types.diff |  12 +-
 ...ndAssignmentDeclarationSupport5.types.diff |  12 +-
 ...ndAssignmentDeclarationSupport6.types.diff |  12 +-
 ...ndAssignmentDeclarationSupport7.types.diff |  12 +-
 .../conformance/moduleExportAlias.types.diff  |  65 ++-
 .../conformance/moduleExportAlias2.types.diff |   8 +-
 .../conformance/moduleExportAlias5.types.diff |   8 +-
 ...ortAliasElementAccessExpression.types.diff |  19 +
 .../moduleExportAliasExports.types.diff       |  34 +-
 .../moduleExportAliasImported.types.diff      |   2 +-
 .../moduleExportAliasUnknown.types.diff       |   2 +-
 .../moduleExportAssignment.types.diff         |  24 +-
 .../moduleExportAssignment2.types.diff        |  18 +-
 .../moduleExportAssignment4.types.diff        |   4 +-
 .../moduleExportDuplicateAlias.types.diff     |  26 +-
 .../moduleExportDuplicateAlias2.types.diff    |  27 +-
 .../moduleExportDuplicateAlias3.types.diff    |  40 +-
 .../moduleExportNestedNamespaces.types.diff   |  18 +-
 .../moduleExportsAliasLoop1.types.diff        |  18 +
 .../moduleExportsAliasLoop2.types.diff        |  18 +
 ...eExportsElementAccessAssignment.types.diff |  43 +-
 .../nestedDestructuringOfRequire.types.diff   |  17 +-
 ...AllowJsCjsFromJs(module=node16).types.diff |   9 +-
 ...AllowJsCjsFromJs(module=node18).types.diff |   9 +-
 ...lowJsCjsFromJs(module=nodenext).types.diff |   9 +-
 .../paramTagOnCallExpression.types.diff       |  11 +
 .../requireAssertsFromTypescript.types.diff   |  10 +
 .../requireOfESWithPropertyAccess.types.diff  |  11 +
 .../selfNameModuleAugmentation.types.diff     |  11 +
 .../typeFromParamTagForFunction.types.diff    |  48 +-
 .../conformance/typedefCrossModule.types.diff |  15 +-
 .../typedefCrossModule2.types.diff            |   4 +-
 .../untypedModuleImport_allowJs.types.diff    |  11 +
 1166 files changed, 14846 insertions(+), 3949 deletions(-)
 rename internal/fourslash/tests/{gen => manual}/moduleReexportedIntoGlobalQuickInfo_test.go (86%)
 rename internal/fourslash/tests/{gen => manual}/quickInfoImportNonunicodePath_test.go (88%)
 create mode 100644 testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/checkerInitializationCrash.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/constEnumNoEmitReexport.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/constEnumPreserveEmitReexport.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitCommonJsModuleReferencedType.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitForTypesWhichNeedImportTypes.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitInlinedDistributiveConditional.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitReadonlyComputedProperty.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitScopeConsistency.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitStringEnumUsedInNonlocalSpread.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitSymlinkPaths.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationImportTypeAliasInferredAndEmittable.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/enumAssignmentCompat6.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/exportInterfaceClassAndValue.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/exportStarNotElided.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/importShouldNotBeElidedInDeclarationEmit.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/importedEnumMemberMergedWithExportedAliasIsError.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/mergedDeclarationExports.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleDuplicateIdentifiers.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionWithRequireAndImport.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleSameValueDuplicateExportedBindings2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/multiImportExport.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/nodeModuleReexportFromDottedPath.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/privacyCannotNameAccessorDeclFile.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/privacyCannotNameVarTypeDeclFile.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameParameterTypeDeclFile.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameReturnTypeDeclFile.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/privacyImportParseErrors.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/reexportWrittenCorrectlyInDeclaration.types.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/spuriousCircularityOnTypeImport.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNames.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesImportRef.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/tsxResolveExternalModuleExportsTypes.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/visibilityOfCrossModuleTypeUsage.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/chained.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/duplicateExportAssignments.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportAsNamespace5.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier-isolatedModules.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportNamespace1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportNamespace10.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportNamespace2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportNamespace3.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportNamespace4.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportNamespace5.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportsAndImports1-es6.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportsAndImports1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportsAndImports3-es6.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/exportsAndImports3.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes7.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importElisionConstEnumMerge1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importTypeGenericTypes.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/importTypeLocal.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/multipleDefaultExports03.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/multipleDefaultExports05.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/multipleExportDefault3.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node18).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/reexportClassDefinition.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/renamed.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/typeAliasesDoNotMerge.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node18).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=nodenext).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/typeofImportTypeOnlyExport.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFile.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/umd-errors.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/umd1.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/umd3.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/umd4.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/umd5.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/umd9.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment1.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment2.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment5.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment6.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/commonJsUnusedLocals.types.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/expandoFunctionSymbolPropertyJs.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/exportDefaultWithJSDoc2.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/importTypeResolutionJSDocEOF.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationEmitDoesNotRenameImport.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/jsdocReferenceGlobalTypeInCommonJs.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2015).types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2020).types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_jsModule.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_explicitNodeModulesImport.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/commonJsImportBindingElementNarrowType.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsClassAccessor.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportSpecifierNonlocal.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport1.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasElementAccessExpression.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsAliasLoop1.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsAliasLoop2.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/paramTagOnCallExpression.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/requireAssertsFromTypescript.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/requireOfESWithPropertyAccess.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/selfNameModuleAugmentation.types.diff
 create mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/untypedModuleImport_allowJs.types.diff

diff --git a/internal/checker/nodebuilder.go b/internal/checker/nodebuilder.go
index bd629596c7..ae9d3877ac 100644
--- a/internal/checker/nodebuilder.go
+++ b/internal/checker/nodebuilder.go
@@ -7,9 +7,9 @@ import (
 )
 
 type NodeBuilder struct {
-	ctxStack  []*NodeBuilderContext
-	basicHost Host
-	impl      *nodeBuilderImpl
+	ctxStack []*NodeBuilderContext
+	host     Host
+	impl     *nodeBuilderImpl
 }
 
 // EmitContext implements NodeBuilderInterface.
@@ -20,6 +20,7 @@ func (b *NodeBuilder) EmitContext() *printer.EmitContext {
 func (b *NodeBuilder) enterContext(enclosingDeclaration *ast.Node, flags nodebuilder.Flags, internalFlags nodebuilder.InternalFlags, tracker nodebuilder.SymbolTracker) {
 	b.ctxStack = append(b.ctxStack, b.impl.ctx)
 	b.impl.ctx = &NodeBuilderContext{
+		host:                     b.host,
 		tracker:                  tracker,
 		flags:                    flags,
 		internalFlags:            internalFlags,
@@ -32,14 +33,7 @@ func (b *NodeBuilder) enterContext(enclosingDeclaration *ast.Node, flags nodebui
 		enclosingSymbolTypes:     make(map[ast.SymbolId]*Type),
 		remappedSymbolReferences: make(map[ast.SymbolId]*ast.Symbol),
 	}
-	// TODO: always provide this; see https://github.com/microsoft/typescript-go/pull/1588#pullrequestreview-3125218673
-	var moduleResolverHost Host
-	if tracker != nil {
-		moduleResolverHost = tracker.GetModuleSpecifierGenerationHost()
-	} else if internalFlags&nodebuilder.InternalFlagsDoNotIncludeSymbolChain != 0 {
-		moduleResolverHost = b.basicHost
-	}
-	tracker = NewSymbolTrackerImpl(b.impl.ctx, tracker, moduleResolverHost)
+	tracker = NewSymbolTrackerImpl(b.impl.ctx, tracker)
 	b.impl.ctx.tracker = tracker
 }
 
@@ -178,7 +172,7 @@ func (b *NodeBuilder) TypeToTypeNode(typ *Type, enclosingDeclaration *ast.Node,
 
 func NewNodeBuilder(ch *Checker, e *printer.EmitContext) *NodeBuilder {
 	impl := newNodeBuilderImpl(ch, e)
-	return &NodeBuilder{impl: impl, ctxStack: make([]*NodeBuilderContext, 0, 1), basicHost: ch.program}
+	return &NodeBuilder{impl: impl, ctxStack: make([]*NodeBuilderContext, 0, 1), host: ch.program}
 }
 
 func (c *Checker) getNodeBuilder() *NodeBuilder {
diff --git a/internal/checker/nodebuilderimpl.go b/internal/checker/nodebuilderimpl.go
index 3c4a06f0be..1b05c0dc8e 100644
--- a/internal/checker/nodebuilderimpl.go
+++ b/internal/checker/nodebuilderimpl.go
@@ -53,6 +53,7 @@ type NodeBuilderSymbolLinks struct {
 	specifierCache module.ModeAwareCache[string]
 }
 type NodeBuilderContext struct {
+	host                            Host
 	tracker                         nodebuilder.SymbolTracker
 	approximateLength               int
 	encounteredError                bool
@@ -1155,7 +1156,7 @@ func (b *nodeBuilderImpl) getSpecifierForModuleSymbol(symbol *ast.Symbol, overri
 			return stringutil.StripQuotes(symbol.Name)
 		}
 	}
-	if b.ctx.enclosingFile == nil || b.ctx.tracker.GetModuleSpecifierGenerationHost() == nil {
+	if b.ctx.enclosingFile == nil {
 		if isAmbientModuleSymbolName(symbol.Name) {
 			return stringutil.StripQuotes(symbol.Name)
 		}
@@ -1188,7 +1189,7 @@ func (b *nodeBuilderImpl) getSpecifierForModuleSymbol(symbol *ast.Symbol, overri
 	// just like how the declaration emitter does for the ambient module declarations - we can easily accomplish this
 	// using the `baseUrl` compiler option (which we would otherwise never use in declaration emit) and a non-relative
 	// specifier preference
-	host := b.ctx.tracker.GetModuleSpecifierGenerationHost()
+	host := b.ctx.host
 	specifierCompilerOptions := b.ch.compilerOptions
 	specifierPref := modulespecifiers.ImportModuleSpecifierPreferenceProjectRelative
 	endingPref := modulespecifiers.ImportModuleSpecifierEndingPreferenceNone
diff --git a/internal/checker/symboltracker.go b/internal/checker/symboltracker.go
index 426ca85f90..2c606c294a 100644
--- a/internal/checker/symboltracker.go
+++ b/internal/checker/symboltracker.go
@@ -2,7 +2,6 @@ package checker
 
 import (
 	"github.com/microsoft/typescript-go/internal/ast"
-	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 	"github.com/microsoft/typescript-go/internal/nodebuilder"
 )
 
@@ -10,10 +9,9 @@ type SymbolTrackerImpl struct {
 	context            *NodeBuilderContext
 	inner              nodebuilder.SymbolTracker
 	DisableTrackSymbol bool
-	tchost             Host
 }
 
-func NewSymbolTrackerImpl(context *NodeBuilderContext, tracker nodebuilder.SymbolTracker, tchost Host) *SymbolTrackerImpl {
+func NewSymbolTrackerImpl(context *NodeBuilderContext, tracker nodebuilder.SymbolTracker) *SymbolTrackerImpl {
 	if tracker != nil {
 		for {
 			t, ok := tracker.(*SymbolTrackerImpl)
@@ -24,14 +22,7 @@ func NewSymbolTrackerImpl(context *NodeBuilderContext, tracker nodebuilder.Symbo
 		}
 	}
 
-	return &SymbolTrackerImpl{context, tracker, false, tchost}
-}
-
-func (this *SymbolTrackerImpl) GetModuleSpecifierGenerationHost() modulespecifiers.ModuleSpecifierGenerationHost {
-	if this.inner == nil {
-		return this.tchost
-	}
-	return this.inner.GetModuleSpecifierGenerationHost()
+	return &SymbolTrackerImpl{context, tracker, false}
 }
 
 func (this *SymbolTrackerImpl) TrackSymbol(symbol *ast.Symbol, enclosingDeclaration *ast.Node, meaning ast.SymbolFlags) bool {
diff --git a/internal/fourslash/_scripts/manualTests.txt b/internal/fourslash/_scripts/manualTests.txt
index 492e3ccf70..96769a778d 100644
--- a/internal/fourslash/_scripts/manualTests.txt
+++ b/internal/fourslash/_scripts/manualTests.txt
@@ -2,3 +2,5 @@ completionListInClosedFunction05
 completionsAtIncompleteObjectLiteralProperty
 completionsSelfDeclaring1
 completionsWithDeprecatedTag4
+moduleReexportedIntoGlobalQuickInfo
+quickInfoImportNonunicodePath
diff --git a/internal/fourslash/tests/gen/moduleReexportedIntoGlobalQuickInfo_test.go b/internal/fourslash/tests/manual/moduleReexportedIntoGlobalQuickInfo_test.go
similarity index 86%
rename from internal/fourslash/tests/gen/moduleReexportedIntoGlobalQuickInfo_test.go
rename to internal/fourslash/tests/manual/moduleReexportedIntoGlobalQuickInfo_test.go
index 2693ca9194..9e8099ffd1 100644
--- a/internal/fourslash/tests/gen/moduleReexportedIntoGlobalQuickInfo_test.go
+++ b/internal/fourslash/tests/manual/moduleReexportedIntoGlobalQuickInfo_test.go
@@ -23,5 +23,5 @@ declare global {
 // @Filename: /index.ts
 let v = new /*1*/THREE.Vector3();`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	f.VerifyQuickInfoAt(t, "1", "const THREE: typeof import(\"/node_modules/@types/three/index\")", "")
+	f.VerifyQuickInfoAt(t, "1", "const THREE: typeof import(\"three\")", "")
 }
diff --git a/internal/fourslash/tests/gen/quickInfoImportNonunicodePath_test.go b/internal/fourslash/tests/manual/quickInfoImportNonunicodePath_test.go
similarity index 88%
rename from internal/fourslash/tests/gen/quickInfoImportNonunicodePath_test.go
rename to internal/fourslash/tests/manual/quickInfoImportNonunicodePath_test.go
index a805007638..330ce413fc 100644
--- a/internal/fourslash/tests/gen/quickInfoImportNonunicodePath_test.go
+++ b/internal/fourslash/tests/manual/quickInfoImportNonunicodePath_test.go
@@ -16,5 +16,5 @@ export const foo = 1;
 // @Filename: /test.ts
 import { foo } from "./江南/*1*/今何在/tmp";`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	f.VerifyQuickInfoAt(t, "1", "module \"/江南今何在/tmp\"", "")
+	f.VerifyQuickInfoAt(t, "1", "module \"./江南今何在/tmp\"", "")
 }
diff --git a/internal/nodebuilder/types.go b/internal/nodebuilder/types.go
index ab10b8c171..f6bf52b40d 100644
--- a/internal/nodebuilder/types.go
+++ b/internal/nodebuilder/types.go
@@ -3,13 +3,10 @@ package nodebuilder
 
 import (
 	"github.com/microsoft/typescript-go/internal/ast"
-	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 )
 
 // TODO: previously all symboltracker methods were optional, but now they're required.
 type SymbolTracker interface {
-	GetModuleSpecifierGenerationHost() modulespecifiers.ModuleSpecifierGenerationHost
-
 	TrackSymbol(symbol *ast.Symbol, enclosingDeclaration *ast.Node, meaning ast.SymbolFlags) bool
 	ReportInaccessibleThisError()
 	ReportPrivateInBaseOfClassExpression(propertyName string)
diff --git a/internal/transformers/declarations/tracker.go b/internal/transformers/declarations/tracker.go
index 2344fdcc8f..c4b0ce8958 100644
--- a/internal/transformers/declarations/tracker.go
+++ b/internal/transformers/declarations/tracker.go
@@ -5,7 +5,6 @@ import (
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/diagnostics"
-	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 	"github.com/microsoft/typescript-go/internal/printer"
 	"github.com/microsoft/typescript-go/internal/scanner"
 )
@@ -17,11 +16,6 @@ type SymbolTrackerImpl struct {
 	fallbackStack []*ast.Node
 }
 
-// GetModuleSpecifierGenerationHost implements checker.SymbolTracker.
-func (s *SymbolTrackerImpl) GetModuleSpecifierGenerationHost() modulespecifiers.ModuleSpecifierGenerationHost {
-	return s.host
-}
-
 // PopErrorFallbackNode implements checker.SymbolTracker.
 func (s *SymbolTrackerImpl) PopErrorFallbackNode() {
 	s.fallbackStack = s.fallbackStack[:len(s.fallbackStack)-1]
diff --git a/testdata/baselines/reference/compiler/declarationEmitAugmentationUsesCorrectSourceFile.types b/testdata/baselines/reference/compiler/declarationEmitAugmentationUsesCorrectSourceFile.types
index d55d97830e..59932e3351 100644
--- a/testdata/baselines/reference/compiler/declarationEmitAugmentationUsesCorrectSourceFile.types
+++ b/testdata/baselines/reference/compiler/declarationEmitAugmentationUsesCorrectSourceFile.types
@@ -27,12 +27,12 @@ declare namespace Knex {
 }
 
 export = knex;
->knex : typeof import("index.ts")
+>knex : typeof import("knex")
 
 === index.ts ===
 import "knex";
 declare module "knex" {
->"knex" : typeof import("node_modules/knex/index")
+>"knex" : typeof import("knex")
 
   namespace Knex {
 >Knex : typeof Knex
diff --git a/testdata/baselines/reference/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types b/testdata/baselines/reference/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
index 9f953aeede..7d476d96a6 100644
--- a/testdata/baselines/reference/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
+++ b/testdata/baselines/reference/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
@@ -17,9 +17,9 @@ import { BindingKey } from '@loopback/context';
 export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any); // line in question
 >CONTROLLER_CLASS : BindingKey<ControllerClass>
 >BindingKey.create<ControllerClass>(null as any) : BindingKey<ControllerClass>
->BindingKey.create : <T extends import("/monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
+>BindingKey.create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
 >BindingKey : typeof BindingKey
->create : <T extends import("/monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
+>create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
 >null as any : any
 
 === /monorepo/context/src/value-promise.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types
index 0c816c7b03..ed4b7c22c4 100644
--- a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types
+++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types
@@ -17,10 +17,10 @@ export declare function styled(): Color;
 
 === file2.ts ===
 import { styled }  from "./file1";
->styled : () => import("color").default
+>styled : () => import("./color").default
 
 export const A = styled();
->A : import("color").default
->styled() : import("color").default
->styled : () => import("color").default
+>A : import("./color").default
+>styled() : import("./color").default
+>styled : () => import("./color").default
 
diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types.diff b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types.diff
new file mode 100644
index 0000000000..3d8f721c51
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types.diff
@@ -0,0 +1,16 @@
+--- old.allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types
++++ new.allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types
+@@= skipped -16, +16 lines =@@
+
+ === file2.ts ===
+ import { styled }  from "./file1";
+->styled : () => import("color").default
++>styled : () => import("./color").default
+
+ export const A = styled();
+->A : import("color").default
+->styled() : import("color").default
+->styled : () => import("color").default
++>A : import("./color").default
++>styled() : import("./color").default
++>styled : () => import("./color").default
diff --git a/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types b/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types
index 57f5694f95..1844f50943 100644
--- a/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types
+++ b/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types
@@ -15,7 +15,7 @@ export default 2 + 2;
 >2 : 2
 
 export as namespace Foo;
->Foo : typeof import("foo")
+>Foo : typeof import("./foo")
 
 === foo2.d.ts ===
 export = 2 + 2;
diff --git a/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types.diff b/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types.diff
new file mode 100644
index 0000000000..3e7edfcb65
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types.diff
@@ -0,0 +1,11 @@
+--- old.ambientExportDefaultErrors.types
++++ new.ambientExportDefaultErrors.types
+@@= skipped -14, +14 lines =@@
+ >2 : 2
+
+ export as namespace Foo;
+->Foo : typeof import("foo")
++>Foo : typeof import("./foo")
+
+ === foo2.d.ts ===
+ export = 2 + 2;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types b/testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types
index 0ab7c1068c..a33663daf9 100644
--- a/testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types
+++ b/testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types
@@ -43,7 +43,7 @@ export function Timestamped<TBase extends Constructor>(Base: TBase) {
 === index.ts ===
 import { wrapClass, Timestamped } from "./wrapClass";
 >wrapClass : (param: any) => typeof Wrapped
->Timestamped : <TBase extends import("wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
+>Timestamped : <TBase extends import("./wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
 
 export default wrapClass(0);
 >wrapClass(0) : typeof Wrapped
@@ -63,7 +63,7 @@ export class User {
 export class TimestampedUser extends Timestamped(User) {
 >TimestampedUser : TimestampedUser
 >Timestamped(User) : Timestamped.(Anonymous class) & User
->Timestamped : <TBase extends import("wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
+>Timestamped : <TBase extends import("./wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
 >User : typeof User
 
     constructor() {
diff --git a/testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types.diff b/testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types.diff
index ac615978ed..18972c2c6d 100644
--- a/testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/anonClassDeclarationEmitIsAnon.types.diff
@@ -19,7 +19,7 @@
  import { wrapClass, Timestamped } from "./wrapClass";
  >wrapClass : (param: any) => typeof Wrapped
 ->Timestamped : <TBase extends import("wrapClass").Constructor>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped<any>.(Anonymous class); } & TBase
-+>Timestamped : <TBase extends import("wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
++>Timestamped : <TBase extends import("./wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
 
  export default wrapClass(0);
  >wrapClass(0) : typeof Wrapped
@@ -30,7 +30,7 @@
 ->Timestamped(User) : Timestamped<typeof User>.(Anonymous class) & User
 ->Timestamped : <TBase extends import("wrapClass").Constructor>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped<any>.(Anonymous class); } & TBase
 +>Timestamped(User) : Timestamped.(Anonymous class) & User
-+>Timestamped : <TBase extends import("wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
++>Timestamped : <TBase extends import("./wrapClass").Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Timestamped.(Anonymous class); } & TBase
  >User : typeof User
 
      constructor() {
diff --git a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types b/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types
index b9593cea1a..f4098cc95a 100644
--- a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types
+++ b/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types
@@ -18,14 +18,14 @@ export function f() {
 
 === nested/derived.ts ===
 import { f } from "./base";
->f : () => import("index").B
+>f : () => import("./shared").B
 
 export function g() {
->g : () => import("index").B
+>g : () => import("./shared").B
 
     return f();
->f() : import("index").B
->f : () => import("index").B
+>f() : import("./shared").B
+>f : () => import("./shared").B
 }
 
 === nested/index.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types.diff b/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types.diff
new file mode 100644
index 0000000000..7ab8b80823
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types.diff
@@ -0,0 +1,21 @@
+--- old.bundledDtsLateExportRenaming.types
++++ new.bundledDtsLateExportRenaming.types
+@@= skipped -17, +17 lines =@@
+
+ === nested/derived.ts ===
+ import { f } from "./base";
+->f : () => import("index").B
++>f : () => import("./shared").B
+
+ export function g() {
+->g : () => import("index").B
++>g : () => import("./shared").B
+
+     return f();
+->f() : import("index").B
+->f : () => import("index").B
++>f() : import("./shared").B
++>f : () => import("./shared").B
+ }
+
+ === nested/index.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.types b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.types
index 1ad7a123fa..4d3b353fe7 100644
--- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.types
+++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.types
@@ -17,8 +17,8 @@ export default { c: false };
 
 === b.js ===
 import a from "./a";
->a : import("a").Foo
+>a : import("./a").Foo
 
 a;
->a : import("a").Foo
+>a : import("./a").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.types b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.types
index a0bdcb21f2..016818ad79 100644
--- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.types
+++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.types
@@ -20,8 +20,8 @@ export default { c: false };
 
 === c.js ===
 import b from "./b";
->b : import("a").Foo
+>b : import("./a").Foo
 
 b;
->b : import("a").Foo
+>b : import("./a").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.types b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.types
index 281fc855ad..da77e34bf9 100644
--- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.types
+++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.types
@@ -19,8 +19,8 @@ export default { a: 1, b: 1 };
 
 === b.js ===
 import a from "./a";
->a : import("a").Foo
+>a : import("./a").Foo
 
 a;
->a : import("a").Foo
+>a : import("./a").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.types b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.types
index f4c55c52e4..9e0e0fdcc0 100644
--- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.types
+++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.types
@@ -21,8 +21,8 @@ export default { a: 1, b: 1, c: 1 };
 
 === b.js ===
 import a from "./a";
->a : import("a").Foo
+>a : import("./a").Foo
 
 a;
->a : import("a").Foo
+>a : import("./a").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types b/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types
index b7147426a3..5717513d28 100644
--- a/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types
+++ b/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types
@@ -13,7 +13,7 @@ import * as _three from './three';
 >_three : typeof _three
 
 export as namespace THREE;
->THREE : typeof import("global")
+>THREE : typeof import("./global")
 
 declare global {
 >global : typeof global
@@ -25,6 +25,6 @@ declare global {
 
 === test.ts ===
 const m = THREE
->m : typeof import("three")
->THREE : typeof import("three")
+>m : typeof import("./three")
+>THREE : typeof import("./three")
 
diff --git a/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types.diff b/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types.diff
new file mode 100644
index 0000000000..80c9740f75
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types.diff
@@ -0,0 +1,19 @@
+--- old.checkMergedGlobalUMDSymbol.types
++++ new.checkMergedGlobalUMDSymbol.types
+@@= skipped -12, +12 lines =@@
+ >_three : typeof _three
+
+ export as namespace THREE;
+->THREE : typeof import("global")
++>THREE : typeof import("./global")
+
+ declare global {
+ >global : typeof global
+@@= skipped -12, +12 lines =@@
+
+ === test.ts ===
+ const m = THREE
+->m : typeof import("three")
+->THREE : typeof import("three")
++>m : typeof import("./three")
++>THREE : typeof import("./three")
diff --git a/testdata/baselines/reference/submodule/compiler/checkerInitializationCrash.types b/testdata/baselines/reference/submodule/compiler/checkerInitializationCrash.types
index 0d0196f819..d4e684708c 100644
--- a/testdata/baselines/reference/submodule/compiler/checkerInitializationCrash.types
+++ b/testdata/baselines/reference/submodule/compiler/checkerInitializationCrash.types
@@ -59,7 +59,7 @@ declare namespace React {
 
 === /node_modules/preact/index.d.ts ===
 export as namespace preact;
->preact : typeof import("/node_modules/preact/index")
+>preact : typeof import("preact")
 
 export interface VNode<P = {}> {}
 
diff --git a/testdata/baselines/reference/submodule/compiler/checkerInitializationCrash.types.diff b/testdata/baselines/reference/submodule/compiler/checkerInitializationCrash.types.diff
new file mode 100644
index 0000000000..8ea686e8fb
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/checkerInitializationCrash.types.diff
@@ -0,0 +1,10 @@
+--- old.checkerInitializationCrash.types
++++ new.checkerInitializationCrash.types
+@@= skipped -58, +58 lines =@@
+
+ === /node_modules/preact/index.d.ts ===
+ export as namespace preact;
+->preact : typeof import("/node_modules/preact/index")
++>preact : typeof import("preact")
+
+ export interface VNode<P = {}> {}
diff --git a/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.symbols b/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.symbols
index 3a6702d713..f99d2dcbfc 100644
--- a/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.symbols
+++ b/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.symbols
@@ -6,6 +6,6 @@ const x = 0;
 
 exports.y = 1;
 >exports.y : Symbol(y, Decl(a.js, 0, 12))
->exports : Symbol("/a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >y : Symbol(y, Decl(a.js, 0, 12))
 
diff --git a/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.symbols.diff b/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.symbols.diff
index 1a21c9b6e4..177a22c18f 100644
--- a/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.symbols.diff
@@ -5,5 +5,5 @@
  exports.y = 1;
  >exports.y : Symbol(y, Decl(a.js, 0, 12))
 ->exports : Symbol(y, Decl(a.js, 0, 12))
-+>exports : Symbol("/a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
  >y : Symbol(y, Decl(a.js, 0, 12))
diff --git a/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.types b/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.types
index ba76be8c22..20552a5633 100644
--- a/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.types
+++ b/testdata/baselines/reference/submodule/compiler/commonJsUnusedLocals.types
@@ -8,7 +8,7 @@ const x = 0;
 exports.y = 1;
 >exports.y = 1 : 1
 >exports.y : 1
->exports : typeof import("/a")
+>exports : typeof import("./a")
 >y : 1
 >1 : 1
 
diff --git a/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.symbols b/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.symbols
index add4ebb75a..1d8634f941 100644
--- a/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.symbols
+++ b/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.symbols
@@ -3,12 +3,12 @@
 === /a.js ===
 exports.x = 0;
 >exports.x : Symbol(x, Decl(a.js, 0, 0))
->exports : Symbol("/a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >x : Symbol(x, Decl(a.js, 0, 0))
 
 exports.x;
 >exports.x : Symbol(x, Decl(a.js, 0, 0))
->exports : Symbol("/a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >x : Symbol(x, Decl(a.js, 0, 0))
 
 // Works nested
@@ -16,7 +16,7 @@ exports.x;
     // 'exports' does not provide a contextual type to a function-class
     exports.Cls = function() {
 >exports.Cls : Symbol(Cls, Decl(a.js, 4, 1))
->exports : Symbol("/a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >Cls : Symbol(Cls, Decl(a.js, 4, 1))
 
         this.x = 0;
@@ -26,6 +26,6 @@ exports.x;
 const instance = new exports.Cls();
 >instance : Symbol(instance, Decl(a.js, 11, 5))
 >exports.Cls : Symbol(Cls, Decl(a.js, 4, 1))
->exports : Symbol("/a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >Cls : Symbol(Cls, Decl(a.js, 4, 1))
 
diff --git a/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.symbols.diff b/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.symbols.diff
index 1f80ef65bf..88df28e3ec 100644
--- a/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.symbols.diff
@@ -5,16 +5,22 @@
  exports.x = 0;
  >exports.x : Symbol(x, Decl(a.js, 0, 0))
 ->exports : Symbol(x, Decl(a.js, 0, 0))
-+>exports : Symbol("/a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
  >x : Symbol(x, Decl(a.js, 0, 0))
 
  exports.x;
+ >exports.x : Symbol(x, Decl(a.js, 0, 0))
+->exports : Symbol("/a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
+ >x : Symbol(x, Decl(a.js, 0, 0))
+
+ // Works nested
 @@= skipped -13, +13 lines =@@
      // 'exports' does not provide a contextual type to a function-class
      exports.Cls = function() {
  >exports.Cls : Symbol(Cls, Decl(a.js, 4, 1))
 ->exports : Symbol(Cls, Decl(a.js, 4, 1))
-+>exports : Symbol("/a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
  >Cls : Symbol(Cls, Decl(a.js, 4, 1))
 
          this.x = 0;
@@ -23,3 +29,10 @@
 ->x : Symbol(Cls.x, Decl(a.js, 6, 30))
      }
  }
+
+ const instance = new exports.Cls();
+ >instance : Symbol(instance, Decl(a.js, 11, 5))
+ >exports.Cls : Symbol(Cls, Decl(a.js, 4, 1))
+->exports : Symbol("/a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
+ >Cls : Symbol(Cls, Decl(a.js, 4, 1))
diff --git a/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.types b/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.types
index 30de41c9a8..ce2c025987 100644
--- a/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.types
+++ b/testdata/baselines/reference/submodule/compiler/commonjsAccessExports.types
@@ -4,13 +4,13 @@
 exports.x = 0;
 >exports.x = 0 : 0
 >exports.x : 0
->exports : typeof import("/a")
+>exports : typeof import("./a")
 >x : 0
 >0 : 0
 
 exports.x;
 >exports.x : 0
->exports : typeof import("/a")
+>exports : typeof import("./a")
 >x : 0
 
 // Works nested
@@ -19,7 +19,7 @@ exports.x;
     exports.Cls = function() {
 >exports.Cls = function() {        this.x = 0;    } : () => void
 >exports.Cls : () => void
->exports : typeof import("/a")
+>exports : typeof import("./a")
 >Cls : () => void
 >function() {        this.x = 0;    } : () => void
 
@@ -36,6 +36,6 @@ const instance = new exports.Cls();
 >instance : any
 >new exports.Cls() : any
 >exports.Cls : () => void
->exports : typeof import("/a")
+>exports : typeof import("./a")
 >Cls : () => void
 
diff --git a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.types b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.types
index 3a8977f8db..e377702e39 100644
--- a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.types
+++ b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.types
@@ -31,13 +31,13 @@ export = pick;
 === node_modules/@types/lodash/index.d.ts ===
 /// <reference path="./object.d.ts" />
 export = _;
->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
+>_ : import("lodash").LoDashStatic
 
 export as namespace _;
->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
+>_ : import("lodash").LoDashStatic
 
 declare const _: _.LoDashStatic;
->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
+>_ : import("lodash").LoDashStatic
 >_ : any
 
 declare namespace _ {
diff --git a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.types.diff b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.types.diff
index c089d60b23..a63e735df8 100644
--- a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.types.diff
@@ -22,6 +22,20 @@
 
  === node_modules/@types/lodash/index.d.ts ===
  /// <reference path="./object.d.ts" />
+ export = _;
+->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
++>_ : import("lodash").LoDashStatic
+
+ export as namespace _;
+->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
++>_ : import("lodash").LoDashStatic
+
+ declare const _: _.LoDashStatic;
+->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
++>_ : import("lodash").LoDashStatic
+ >_ : any
+
+ declare namespace _ {
 @@= skipped -23, +23 lines =@@
 
  === index.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.types b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.types
index 21b55ae75a..95fa62dd67 100644
--- a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.types
+++ b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.types
@@ -31,13 +31,13 @@ export = pick;
 === node_modules/@types/lodash/index.d.ts ===
 /// <reference path="./object.d.ts" />
 export = _;
->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
+>_ : import("lodash").LoDashStatic
 
 export as namespace _;
->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
+>_ : import("lodash").LoDashStatic
 
 declare const _: _.LoDashStatic;
->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
+>_ : import("lodash").LoDashStatic
 >_ : any
 
 declare namespace _ {
diff --git a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.types.diff b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.types.diff
index 5bd98c822d..91b7366ce9 100644
--- a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.types.diff
@@ -22,6 +22,20 @@
 
  === node_modules/@types/lodash/index.d.ts ===
  /// <reference path="./object.d.ts" />
+ export = _;
+->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
++>_ : import("lodash").LoDashStatic
+
+ export as namespace _;
+->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
++>_ : import("lodash").LoDashStatic
+
+ declare const _: _.LoDashStatic;
+->_ : import("node_modules/@types/lodash/index.d.ts").LoDashStatic
++>_ : import("lodash").LoDashStatic
+ >_ : any
+
+ declare namespace _ {
 @@= skipped -23, +23 lines =@@
 
  === index.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNoEmitReexport.types b/testdata/baselines/reference/submodule/compiler/constEnumNoEmitReexport.types
index bf424847b5..a5b4ebe92b 100644
--- a/testdata/baselines/reference/submodule/compiler/constEnumNoEmitReexport.types
+++ b/testdata/baselines/reference/submodule/compiler/constEnumNoEmitReexport.types
@@ -27,12 +27,12 @@ export default MyConstEnum;
 
 === ReExportDefault.ts ===
 export { MyConstEnum as default } from './ConstEnum';
->MyConstEnum : typeof import("ConstEnum").MyConstEnum
->default : typeof import("ConstEnum").MyConstEnum
+>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
+>default : typeof import("./ConstEnum").MyConstEnum
 
 === ReExport.ts ===
 export { MyConstEnum } from './ConstEnum';
->MyConstEnum : typeof import("ConstEnum").MyConstEnum
+>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
 
 === Usage1.ts ===
 import MyConstEnum1 from './ImportExportDefault';
diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNoEmitReexport.types.diff b/testdata/baselines/reference/submodule/compiler/constEnumNoEmitReexport.types.diff
new file mode 100644
index 0000000000..199a85a6a9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/constEnumNoEmitReexport.types.diff
@@ -0,0 +1,18 @@
+--- old.constEnumNoEmitReexport.types
++++ new.constEnumNoEmitReexport.types
+@@= skipped -26, +26 lines =@@
+
+ === ReExportDefault.ts ===
+ export { MyConstEnum as default } from './ConstEnum';
+->MyConstEnum : typeof import("ConstEnum").MyConstEnum
+->default : typeof import("ConstEnum").MyConstEnum
++>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
++>default : typeof import("./ConstEnum").MyConstEnum
+
+ === ReExport.ts ===
+ export { MyConstEnum } from './ConstEnum';
+->MyConstEnum : typeof import("ConstEnum").MyConstEnum
++>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
+
+ === Usage1.ts ===
+ import MyConstEnum1 from './ImportExportDefault';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types b/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types
index ae24aed2d1..41525d7d9c 100644
--- a/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types
+++ b/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types
@@ -19,8 +19,8 @@ export default MyConstEnum;
 
 === ReExport.d.ts ===
 export { MyConstEnum as default } from './ConstEnum';
->MyConstEnum : typeof import("ConstEnum").MyConstEnum
->default : typeof import("ConstEnum").MyConstEnum
+>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
+>default : typeof import("./ConstEnum").MyConstEnum
 
 === usages.ts ===
 import {MyConstEnum} from "./ConstEnum";
diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types.diff b/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types.diff
new file mode 100644
index 0000000000..d62d450055
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types.diff
@@ -0,0 +1,13 @@
+--- old.constEnumNoPreserveDeclarationReexport.types
++++ new.constEnumNoPreserveDeclarationReexport.types
+@@= skipped -18, +18 lines =@@
+
+ === ReExport.d.ts ===
+ export { MyConstEnum as default } from './ConstEnum';
+->MyConstEnum : typeof import("ConstEnum").MyConstEnum
+->default : typeof import("ConstEnum").MyConstEnum
++>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
++>default : typeof import("./ConstEnum").MyConstEnum
+
+ === usages.ts ===
+ import {MyConstEnum} from "./ConstEnum";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/constEnumPreserveEmitReexport.types b/testdata/baselines/reference/submodule/compiler/constEnumPreserveEmitReexport.types
index 00f508705f..cf5fed661c 100644
--- a/testdata/baselines/reference/submodule/compiler/constEnumPreserveEmitReexport.types
+++ b/testdata/baselines/reference/submodule/compiler/constEnumPreserveEmitReexport.types
@@ -20,6 +20,6 @@ export default MyConstEnum;
 
 === ReExport.ts ===
 export { MyConstEnum as default } from './ConstEnum';
->MyConstEnum : typeof import("ConstEnum").MyConstEnum
->default : typeof import("ConstEnum").MyConstEnum
+>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
+>default : typeof import("./ConstEnum").MyConstEnum
 
diff --git a/testdata/baselines/reference/submodule/compiler/constEnumPreserveEmitReexport.types.diff b/testdata/baselines/reference/submodule/compiler/constEnumPreserveEmitReexport.types.diff
new file mode 100644
index 0000000000..0b8a4626bc
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/constEnumPreserveEmitReexport.types.diff
@@ -0,0 +1,10 @@
+--- old.constEnumPreserveEmitReexport.types
++++ new.constEnumPreserveEmitReexport.types
+@@= skipped -19, +19 lines =@@
+
+ === ReExport.ts ===
+ export { MyConstEnum as default } from './ConstEnum';
+->MyConstEnum : typeof import("ConstEnum").MyConstEnum
+->default : typeof import("ConstEnum").MyConstEnum
++>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
++>default : typeof import("./ConstEnum").MyConstEnum
diff --git a/testdata/baselines/reference/submodule/compiler/declFileImportChainInExportAssignment.types b/testdata/baselines/reference/submodule/compiler/declFileImportChainInExportAssignment.types
index 62f257d751..6766726c40 100644
--- a/testdata/baselines/reference/submodule/compiler/declFileImportChainInExportAssignment.types
+++ b/testdata/baselines/reference/submodule/compiler/declFileImportChainInExportAssignment.types
@@ -5,7 +5,7 @@ module m {
 >m : typeof m
 
     export module c {
->c : typeof import("declFileImportChainInExportAssignment")
+>c : typeof import("./declFileImportChainInExportAssignment")
 
         export class c {
 >c : c
diff --git a/testdata/baselines/reference/submodule/compiler/declFileImportChainInExportAssignment.types.diff b/testdata/baselines/reference/submodule/compiler/declFileImportChainInExportAssignment.types.diff
index 3a558a1985..b40fc8f32f 100644
--- a/testdata/baselines/reference/submodule/compiler/declFileImportChainInExportAssignment.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declFileImportChainInExportAssignment.types.diff
@@ -5,7 +5,7 @@
 
      export module c {
 ->c : typeof m.c
-+>c : typeof import("declFileImportChainInExportAssignment")
++>c : typeof import("./declFileImportChainInExportAssignment")
 
          export class c {
  >c : c
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declFileImportModuleWithExportAssignment.types b/testdata/baselines/reference/submodule/compiler/declFileImportModuleWithExportAssignment.types
index dba806afe0..b002ed5b4e 100644
--- a/testdata/baselines/reference/submodule/compiler/declFileImportModuleWithExportAssignment.types
+++ b/testdata/baselines/reference/submodule/compiler/declFileImportModuleWithExportAssignment.types
@@ -35,20 +35,20 @@ module m2 {
 
 }
 var m2: {
->m2 : { (): import("declFileImportModuleWithExportAssignment_0").connectExport; test1: import("declFileImportModuleWithExportAssignment_0").connectModule; test2(): import("declFileImportModuleWithExportAssignment_0").connectModule; }
+>m2 : { (): import("./declFileImportModuleWithExportAssignment_0").connectExport; test1: import("./declFileImportModuleWithExportAssignment_0").connectModule; test2(): import("./declFileImportModuleWithExportAssignment_0").connectModule; }
 
     (): m2.connectExport;
 >m2 : any
 
     test1: m2.connectModule;
->test1 : import("declFileImportModuleWithExportAssignment_0").connectModule
+>test1 : import("./declFileImportModuleWithExportAssignment_0").connectModule
 >m2 : any
 
     test2(): m2.connectModule;
->test2 : () => import("declFileImportModuleWithExportAssignment_0").connectModule
+>test2 : () => import("./declFileImportModuleWithExportAssignment_0").connectModule
 >m2 : any
 
 };
 export = m2;
->m2 : { (): import("declFileImportModuleWithExportAssignment_0").connectExport; test1: import("declFileImportModuleWithExportAssignment_0").connectModule; test2(): import("declFileImportModuleWithExportAssignment_0").connectModule; }
+>m2 : { (): import("./declFileImportModuleWithExportAssignment_0").connectExport; test1: import("./declFileImportModuleWithExportAssignment_0").connectModule; test2(): import("./declFileImportModuleWithExportAssignment_0").connectModule; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declFileImportModuleWithExportAssignment.types.diff b/testdata/baselines/reference/submodule/compiler/declFileImportModuleWithExportAssignment.types.diff
index 49817eed39..2891f86f10 100644
--- a/testdata/baselines/reference/submodule/compiler/declFileImportModuleWithExportAssignment.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declFileImportModuleWithExportAssignment.types.diff
@@ -5,22 +5,22 @@
  }
  var m2: {
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declFileImportModuleWithExportAssignment_0").connectExport; test1: import("declFileImportModuleWithExportAssignment_0").connectModule; test2(): import("declFileImportModuleWithExportAssignment_0").connectModule; }
++>m2 : { (): import("./declFileImportModuleWithExportAssignment_0").connectExport; test1: import("./declFileImportModuleWithExportAssignment_0").connectModule; test2(): import("./declFileImportModuleWithExportAssignment_0").connectModule; }
 
      (): m2.connectExport;
  >m2 : any
 
      test1: m2.connectModule;
 ->test1 : m2.connectModule
-+>test1 : import("declFileImportModuleWithExportAssignment_0").connectModule
++>test1 : import("./declFileImportModuleWithExportAssignment_0").connectModule
  >m2 : any
 
      test2(): m2.connectModule;
 ->test2 : () => m2.connectModule
-+>test2 : () => import("declFileImportModuleWithExportAssignment_0").connectModule
++>test2 : () => import("./declFileImportModuleWithExportAssignment_0").connectModule
  >m2 : any
 
  };
  export = m2;
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declFileImportModuleWithExportAssignment_0").connectExport; test1: import("declFileImportModuleWithExportAssignment_0").connectModule; test2(): import("declFileImportModuleWithExportAssignment_0").connectModule; }
++>m2 : { (): import("./declFileImportModuleWithExportAssignment_0").connectExport; test1: import("./declFileImportModuleWithExportAssignment_0").connectModule; test2(): import("./declFileImportModuleWithExportAssignment_0").connectModule; }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types
index ef5296b5ae..d1c88c91c8 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types
@@ -57,7 +57,7 @@ const fp = { l10ns: {} } as FlatpickrFn;
 >{} : {}
 
 export default fp.l10ns;
->fp.l10ns : { ar?: import("locale").CustomLocale; bg?: import("locale").CustomLocale; } & { default: import("locale").Locale; }
+>fp.l10ns : { ar?: import("./locale").CustomLocale; bg?: import("./locale").CustomLocale; } & { default: import("./locale").Locale; }
 >fp : FlatpickrFn
->l10ns : { ar?: import("locale").CustomLocale; bg?: import("locale").CustomLocale; } & { default: import("locale").Locale; }
+>l10ns : { ar?: import("./locale").CustomLocale; bg?: import("./locale").CustomLocale; } & { default: import("./locale").Locale; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types.diff
new file mode 100644
index 0000000000..f62cb0d58a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types.diff
@@ -0,0 +1,11 @@
+--- old.declarationEmitAliasFromIndirectFile.types
++++ new.declarationEmitAliasFromIndirectFile.types
+@@= skipped -56, +56 lines =@@
+ >{} : {}
+
+ export default fp.l10ns;
+->fp.l10ns : { ar?: import("locale").CustomLocale; bg?: import("locale").CustomLocale; } & { default: import("locale").Locale; }
++>fp.l10ns : { ar?: import("./locale").CustomLocale; bg?: import("./locale").CustomLocale; } & { default: import("./locale").Locale; }
+ >fp : FlatpickrFn
+->l10ns : { ar?: import("locale").CustomLocale; bg?: import("locale").CustomLocale; } & { default: import("locale").Locale; }
++>l10ns : { ar?: import("./locale").CustomLocale; bg?: import("./locale").CustomLocale; } & { default: import("./locale").Locale; }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasInlineing.types b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasInlineing.types
index 86d673d7e2..633e6e566b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasInlineing.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasInlineing.types
@@ -57,13 +57,13 @@ import {fn} from './a'
 >fn : (v: string, p: Omit<{ prop: string; prop2: string; }, "prop">, key: keyof { prop: string; prop2: string; }, p2: Omit<{ prop: string; prop2: string; }, "prop">) => void
 
 import {fnExp} from './aExp'
->fnExp : (v: string, p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, "prop">) => void
+>fnExp : (v: string, p: Omit<import("./aExp").O, "prop">, key: keyof import("./aExp").O, p2: Omit<import("./aExp").O, "prop">) => void
 
 export const f = fn;
 >f : (v: string, p: Omit<{ prop: string; prop2: string; }, "prop">, key: keyof { prop: string; prop2: string; }, p2: Omit<{ prop: string; prop2: string; }, "prop">) => void
 >fn : (v: string, p: Omit<{ prop: string; prop2: string; }, "prop">, key: keyof { prop: string; prop2: string; }, p2: Omit<{ prop: string; prop2: string; }, "prop">) => void
 
 export const fExp = fnExp;
->fExp : (v: string, p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, "prop">) => void
->fnExp : (v: string, p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, "prop">) => void
+>fExp : (v: string, p: Omit<import("./aExp").O, "prop">, key: keyof import("./aExp").O, p2: Omit<import("./aExp").O, "prop">) => void
+>fnExp : (v: string, p: Omit<import("./aExp").O, "prop">, key: keyof import("./aExp").O, p2: Omit<import("./aExp").O, "prop">) => void
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasInlineing.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasInlineing.types.diff
index bf2061eb0c..6fa44c6eac 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasInlineing.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasInlineing.types.diff
@@ -27,7 +27,7 @@
 
  import {fnExp} from './aExp'
 ->fnExp : (v: import("aExp").O["prop"], p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, keyof import("aExp").I>) => void
-+>fnExp : (v: string, p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, "prop">) => void
++>fnExp : (v: string, p: Omit<import("./aExp").O, "prop">, key: keyof import("./aExp").O, p2: Omit<import("./aExp").O, "prop">) => void
 
  export const f = fn;
  >f : (v: string, p: Omit<{ prop: string; prop2: string; }, "prop">, key: keyof { prop: string; prop2: string; }, p2: Omit<{ prop: string; prop2: string; }, "prop">) => void
@@ -36,5 +36,5 @@
  export const fExp = fnExp;
 ->fExp : (v: import("aExp").O["prop"], p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, keyof import("aExp").I>) => void
 ->fnExp : (v: import("aExp").O["prop"], p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, keyof import("aExp").I>) => void
-+>fExp : (v: string, p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, "prop">) => void
-+>fnExp : (v: string, p: Omit<import("aExp").O, "prop">, key: keyof import("aExp").O, p2: Omit<import("aExp").O, "prop">) => void
++>fExp : (v: string, p: Omit<import("./aExp").O, "prop">, key: keyof import("./aExp").O, p2: Omit<import("./aExp").O, "prop">) => void
++>fnExp : (v: string, p: Omit<import("./aExp").O, "prop">, key: keyof import("./aExp").O, p2: Omit<import("./aExp").O, "prop">) => void
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonJsModuleReferencedType.types b/testdata/baselines/reference/submodule/compiler/declarationEmitCommonJsModuleReferencedType.types
index eb699efa65..09dde54684 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonJsModuleReferencedType.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCommonJsModuleReferencedType.types
@@ -32,18 +32,18 @@ export function bar(): RootProps;
 
 === r/entry.ts ===
 import { foo } from "foo";
->foo : () => [import("r/node_modules/foo/index").SomeProps, import("r/node_modules/foo/other").OtherProps, import("r/node_modules/foo/other/index").OtherIndexProps, import("r/node_modules/foo/node_modules/nested/index").NestedProps]
+>foo : () => [import("foo").SomeProps, import("foo").OtherProps, import("foo").OtherIndexProps, import("foo/node_modules/nested").NestedProps]
 
 import { bar } from "root";
->bar : () => import("node_modules/root/index").RootProps
+>bar : () => import("root").RootProps
 
 export const x = foo();
->x : [import("r/node_modules/foo/index").SomeProps, import("r/node_modules/foo/other").OtherProps, import("r/node_modules/foo/other/index").OtherIndexProps, import("r/node_modules/foo/node_modules/nested/index").NestedProps]
->foo() : [import("r/node_modules/foo/index").SomeProps, import("r/node_modules/foo/other").OtherProps, import("r/node_modules/foo/other/index").OtherIndexProps, import("r/node_modules/foo/node_modules/nested/index").NestedProps]
->foo : () => [import("r/node_modules/foo/index").SomeProps, import("r/node_modules/foo/other").OtherProps, import("r/node_modules/foo/other/index").OtherIndexProps, import("r/node_modules/foo/node_modules/nested/index").NestedProps]
+>x : [import("foo").SomeProps, import("foo").OtherProps, import("foo").OtherIndexProps, import("foo/node_modules/nested").NestedProps]
+>foo() : [import("foo").SomeProps, import("foo").OtherProps, import("foo").OtherIndexProps, import("foo/node_modules/nested").NestedProps]
+>foo : () => [import("foo").SomeProps, import("foo").OtherProps, import("foo").OtherIndexProps, import("foo/node_modules/nested").NestedProps]
 
 export const y = bar();
->y : import("node_modules/root/index").RootProps
->bar() : import("node_modules/root/index").RootProps
->bar : () => import("node_modules/root/index").RootProps
+>y : import("root").RootProps
+>bar() : import("root").RootProps
+>bar : () => import("root").RootProps
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonJsModuleReferencedType.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitCommonJsModuleReferencedType.types.diff
new file mode 100644
index 0000000000..6512b659e2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCommonJsModuleReferencedType.types.diff
@@ -0,0 +1,28 @@
+--- old.declarationEmitCommonJsModuleReferencedType.types
++++ new.declarationEmitCommonJsModuleReferencedType.types
+@@= skipped -31, +31 lines =@@
+
+ === r/entry.ts ===
+ import { foo } from "foo";
+->foo : () => [import("r/node_modules/foo/index").SomeProps, import("r/node_modules/foo/other").OtherProps, import("r/node_modules/foo/other/index").OtherIndexProps, import("r/node_modules/foo/node_modules/nested/index").NestedProps]
++>foo : () => [import("foo").SomeProps, import("foo").OtherProps, import("foo").OtherIndexProps, import("foo/node_modules/nested").NestedProps]
+
+ import { bar } from "root";
+->bar : () => import("node_modules/root/index").RootProps
++>bar : () => import("root").RootProps
+
+ export const x = foo();
+->x : [import("r/node_modules/foo/index").SomeProps, import("r/node_modules/foo/other").OtherProps, import("r/node_modules/foo/other/index").OtherIndexProps, import("r/node_modules/foo/node_modules/nested/index").NestedProps]
+->foo() : [import("r/node_modules/foo/index").SomeProps, import("r/node_modules/foo/other").OtherProps, import("r/node_modules/foo/other/index").OtherIndexProps, import("r/node_modules/foo/node_modules/nested/index").NestedProps]
+->foo : () => [import("r/node_modules/foo/index").SomeProps, import("r/node_modules/foo/other").OtherProps, import("r/node_modules/foo/other/index").OtherIndexProps, import("r/node_modules/foo/node_modules/nested/index").NestedProps]
++>x : [import("foo").SomeProps, import("foo").OtherProps, import("foo").OtherIndexProps, import("foo/node_modules/nested").NestedProps]
++>foo() : [import("foo").SomeProps, import("foo").OtherProps, import("foo").OtherIndexProps, import("foo/node_modules/nested").NestedProps]
++>foo : () => [import("foo").SomeProps, import("foo").OtherProps, import("foo").OtherIndexProps, import("foo/node_modules/nested").NestedProps]
+
+ export const y = bar();
+->y : import("node_modules/root/index").RootProps
+->bar() : import("node_modules/root/index").RootProps
+->bar : () => import("node_modules/root/index").RootProps
++>y : import("root").RootProps
++>bar() : import("root").RootProps
++>bar : () => import("root").RootProps
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
index ffec1b3bac..57460ab6f4 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
@@ -18,19 +18,19 @@ export declare const f: (foo: Foo) => boolean;
 
 === projC/index.d.ts ===
 export declare const e: {
->e : { f: (foo: import("projA/index").Foo) => boolean; }
+>e : { f: (foo: import("../projA").Foo) => boolean; }
 
     f: (foo: import("../projA").Foo) => boolean;
->f : (foo: import("projA/index").Foo) => boolean
->foo : import("projA/index").Foo
+>f : (foo: import("../projA").Foo) => boolean
+>foo : import("../projA").Foo
 
 };
 === projD/index.ts ===
 import {e} from "../projC";
->e : { f: (foo: import("projA/index").Foo) => boolean; }
+>e : { f: (foo: import("../projA").Foo) => boolean; }
 
 export const d = {e};
->d : { e: { f: (foo: import("projA/index").Foo) => boolean; }; }
->{e} : { e: { f: (foo: import("projA/index").Foo) => boolean; }; }
->e : { f: (foo: import("projA/index").Foo) => boolean; }
+>d : { e: { f: (foo: import("../projA").Foo) => boolean; }; }
+>{e} : { e: { f: (foo: import("../projA").Foo) => boolean; }; }
+>e : { f: (foo: import("../projA").Foo) => boolean; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
index 30236e8ddf..ccc72218d2 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
@@ -1,15 +1,22 @@
 --- old.declarationEmitCrossFileCopiedGeneratedImportType.types
 +++ new.declarationEmitCrossFileCopiedGeneratedImportType.types
-@@= skipped -17, +17 lines =@@
-
- === projC/index.d.ts ===
- export declare const e: {
-->e : { f: (foo: import("../projA").Foo) => boolean; }
-+>e : { f: (foo: import("projA/index").Foo) => boolean; }
+@@= skipped -21, +21 lines =@@
 
      f: (foo: import("../projA").Foo) => boolean;
-->f : (foo: import("../projA").Foo) => boolean
-+>f : (foo: import("projA/index").Foo) => boolean
- >foo : import("projA/index").Foo
+ >f : (foo: import("../projA").Foo) => boolean
+->foo : import("projA/index").Foo
++>foo : import("../projA").Foo
+
+ };
+ === projD/index.ts ===
+ import {e} from "../projC";
+->e : { f: (foo: import("projA/index").Foo) => boolean; }
++>e : { f: (foo: import("../projA").Foo) => boolean; }
 
- };
\ No newline at end of file
+ export const d = {e};
+->d : { e: { f: (foo: import("projA/index").Foo) => boolean; }; }
+->{e} : { e: { f: (foo: import("projA/index").Foo) => boolean; }; }
+->e : { f: (foo: import("projA/index").Foo) => boolean; }
++>d : { e: { f: (foo: import("../projA").Foo) => boolean; }; }
++>{e} : { e: { f: (foo: import("../projA").Foo) => boolean; }; }
++>e : { f: (foo: import("../projA").Foo) => boolean; }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols
index 027a950cd3..4eb3b5550c 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols
@@ -8,7 +8,7 @@ export function a() {}
 export const x = add(import("./sub"));
 >x : Symbol(x, Decl(index.ts, 0, 12))
 >add : Symbol(add, Decl(index.ts, 1, 27))
->"./sub" : Symbol("sub", Decl(sub.ts, 0, 0))
+>"./sub" : Symbol("./sub", Decl(sub.ts, 0, 0))
 
 export * as Q from "./sub";
 >Q : Symbol(Q, Decl(index.ts, 1, 6))
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols.diff
new file mode 100644
index 0000000000..b3251608da
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols.diff
@@ -0,0 +1,11 @@
+--- old.declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols
++++ new.declarationEmitDoesNotUseReexportedNamespaceAsLocal.symbols
+@@= skipped -7, +7 lines =@@
+ export const x = add(import("./sub"));
+ >x : Symbol(x, Decl(index.ts, 0, 12))
+ >add : Symbol(add, Decl(index.ts, 1, 27))
+->"./sub" : Symbol("sub", Decl(sub.ts, 0, 0))
++>"./sub" : Symbol("./sub", Decl(sub.ts, 0, 0))
+
+ export * as Q from "./sub";
+ >Q : Symbol(Q, Decl(index.ts, 1, 6))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
index 83bfa8dbc3..dc15c089d7 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
@@ -6,14 +6,14 @@ export function a() {}
 
 === index.ts ===
 export const x = add(import("./sub"));
->x : typeof import("sub")
->add(import("./sub")) : typeof import("sub")
+>x : typeof import("./sub")
+>add(import("./sub")) : typeof import("./sub")
 >add : <T>(x: Promise<T>) => T
->import("./sub") : Promise<typeof import("sub")>
+>import("./sub") : Promise<typeof import("./sub")>
 >"./sub" : "./sub"
 
 export * as Q from "./sub";
->Q : typeof import("sub")
+>Q : typeof import("./sub")
 
 declare function add<T>(x: Promise<T>): T;
 >add : <T>(x: Promise<T>) => T
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types.diff
new file mode 100644
index 0000000000..148ccb5cfa
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types.diff
@@ -0,0 +1,21 @@
+--- old.declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
++++ new.declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
+@@= skipped -5, +5 lines =@@
+
+ === index.ts ===
+ export const x = add(import("./sub"));
+->x : typeof import("sub")
+->add(import("./sub")) : typeof import("sub")
++>x : typeof import("./sub")
++>add(import("./sub")) : typeof import("./sub")
+ >add : <T>(x: Promise<T>) => T
+->import("./sub") : Promise<typeof import("sub")>
++>import("./sub") : Promise<typeof import("./sub")>
+ >"./sub" : "./sub"
+
+ export * as Q from "./sub";
+->Q : typeof import("sub")
++>Q : typeof import("./sub")
+
+ declare function add<T>(x: Promise<T>): T;
+ >add : <T>(x: Promise<T>) => T
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.symbols
index 819f5e60aa..da2d053ff3 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.symbols
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.symbols
@@ -28,7 +28,7 @@ export default (suit: Suit, rank: Rank) => ({suit, rank});
 export let lazyCard = () => import('./Card').then(a => a.default);
 >lazyCard : Symbol(lazyCard, Decl(index.ts, 0, 10))
 >import('./Card').then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->'./Card' : Symbol("Card", Decl(Card.ts, 0, 0))
+>'./Card' : Symbol("./Card", Decl(Card.ts, 0, 0))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >a : Symbol(a, Decl(index.ts, 0, 50))
 >a.default : Symbol(default, Decl(Card.ts, 0, 37))
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.symbols.diff
new file mode 100644
index 0000000000..77a1c5455d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.symbols.diff
@@ -0,0 +1,11 @@
+--- old.declarationEmitExportAliasVisibiilityMarking.symbols
++++ new.declarationEmitExportAliasVisibiilityMarking.symbols
+@@= skipped -27, +27 lines =@@
+ export let lazyCard = () => import('./Card').then(a => a.default);
+ >lazyCard : Symbol(lazyCard, Decl(index.ts, 0, 10))
+ >import('./Card').then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+->'./Card' : Symbol("Card", Decl(Card.ts, 0, 0))
++>'./Card' : Symbol("./Card", Decl(Card.ts, 0, 0))
+ >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+ >a : Symbol(a, Decl(index.ts, 0, 50))
+ >a.default : Symbol(default, Decl(Card.ts, 0, 37))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types
index ea475c73f2..cc47b26ac3 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types
@@ -27,18 +27,18 @@ export default (suit: Suit, rank: Rank) => ({suit, rank});
 
 === index.ts ===
 export let lazyCard = () => import('./Card').then(a => a.default);
->lazyCard : () => Promise<(suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }>
->() => import('./Card').then(a => a.default) : () => Promise<(suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }>
->import('./Card').then(a => a.default) : Promise<(suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }>
->import('./Card').then : <TResult1 = typeof import("Card"), TResult2 = never>(onfulfilled?: (value: typeof import("Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->import('./Card') : Promise<typeof import("Card")>
+>lazyCard : () => Promise<(suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }>
+>() => import('./Card').then(a => a.default) : () => Promise<(suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }>
+>import('./Card').then(a => a.default) : Promise<(suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }>
+>import('./Card').then : <TResult1 = typeof import("./Card"), TResult2 = never>(onfulfilled?: (value: typeof import("./Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>import('./Card') : Promise<typeof import("./Card")>
 >'./Card' : "./Card"
->then : <TResult1 = typeof import("Card"), TResult2 = never>(onfulfilled?: (value: typeof import("Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->a => a.default : (a: typeof import("Card")) => (suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }
->a : typeof import("Card")
->a.default : (suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }
->a : typeof import("Card")
->default : (suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }
+>then : <TResult1 = typeof import("./Card"), TResult2 = never>(onfulfilled?: (value: typeof import("./Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>a => a.default : (a: typeof import("./Card")) => (suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }
+>a : typeof import("./Card")
+>a.default : (suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }
+>a : typeof import("./Card")
+>default : (suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }
 
 export { Suit, Rank } from './Types';
 >Suit : any
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types.diff
new file mode 100644
index 0000000000..5bfd6842ba
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.types.diff
@@ -0,0 +1,32 @@
+--- old.declarationEmitExportAliasVisibiilityMarking.types
++++ new.declarationEmitExportAliasVisibiilityMarking.types
+@@= skipped -26, +26 lines =@@
+
+ === index.ts ===
+ export let lazyCard = () => import('./Card').then(a => a.default);
+->lazyCard : () => Promise<(suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }>
+->() => import('./Card').then(a => a.default) : () => Promise<(suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }>
+->import('./Card').then(a => a.default) : Promise<(suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }>
+->import('./Card').then : <TResult1 = typeof import("Card"), TResult2 = never>(onfulfilled?: (value: typeof import("Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->import('./Card') : Promise<typeof import("Card")>
++>lazyCard : () => Promise<(suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }>
++>() => import('./Card').then(a => a.default) : () => Promise<(suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }>
++>import('./Card').then(a => a.default) : Promise<(suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }>
++>import('./Card').then : <TResult1 = typeof import("./Card"), TResult2 = never>(onfulfilled?: (value: typeof import("./Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>import('./Card') : Promise<typeof import("./Card")>
+ >'./Card' : "./Card"
+->then : <TResult1 = typeof import("Card"), TResult2 = never>(onfulfilled?: (value: typeof import("Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->a => a.default : (a: typeof import("Card")) => (suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }
+->a : typeof import("Card")
+->a.default : (suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }
+->a : typeof import("Card")
+->default : (suit: import("Types").Suit, rank: import("Types").Rank) => { suit: import("Types").Suit; rank: import("Types").Rank; }
++>then : <TResult1 = typeof import("./Card"), TResult2 = never>(onfulfilled?: (value: typeof import("./Card")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>a => a.default : (a: typeof import("./Card")) => (suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }
++>a : typeof import("./Card")
++>a.default : (suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }
++>a : typeof import("./Card")
++>default : (suit: import("./Types").Suit, rank: import("./Types").Rank) => { suit: import("./Types").Suit; rank: import("./Types").Rank; }
+
+ export { Suit, Rank } from './Types';
+ >Suit : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.types b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.types
index 45d3ee51d3..b7884fc6f0 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.types
@@ -44,18 +44,18 @@ export function getComp(): Component {
 }
 === src/inferred-comp-export.ts ===
 import { getComp } from "./get-comp";
->getComp : () => import("node_modules/@types/react/index").Component
+>getComp : () => import("react").Component
 
 // this shouldn't need any triple-slash references - it should have a direct import to `react` and that's it
 // This issue (#35343) _only_ reproduces in the test harness when the file in question is in a subfolder
 export const obj = {
->obj : { comp: import("node_modules/@types/react/index").Component; }
->{    comp: getComp()} : { comp: import("node_modules/@types/react/index").Component; }
+>obj : { comp: import("react").Component; }
+>{    comp: getComp()} : { comp: import("react").Component; }
 
     comp: getComp()
->comp : import("node_modules/@types/react/index").Component
->getComp() : import("node_modules/@types/react/index").Component
->getComp : () => import("node_modules/@types/react/index").Component
+>comp : import("react").Component
+>getComp() : import("react").Component
+>getComp : () => import("react").Component
 }
 === src/some-other-file.ts ===
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.types.diff
index 8f19b9ff84..1145998478 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.types.diff
@@ -8,4 +8,28 @@
 +>'react' : any
 
      interface DOMAttributes<T> {
-         css?: any
\ No newline at end of file
+         css?: any
+@@= skipped -22, +22 lines =@@
+ }
+ === src/inferred-comp-export.ts ===
+ import { getComp } from "./get-comp";
+->getComp : () => import("node_modules/@types/react/index").Component
++>getComp : () => import("react").Component
+
+ // this shouldn't need any triple-slash references - it should have a direct import to `react` and that's it
+ // This issue (#35343) _only_ reproduces in the test harness when the file in question is in a subfolder
+ export const obj = {
+->obj : { comp: import("node_modules/@types/react/index").Component; }
+->{    comp: getComp()} : { comp: import("node_modules/@types/react/index").Component; }
++>obj : { comp: import("react").Component; }
++>{    comp: getComp()} : { comp: import("react").Component; }
+
+     comp: getComp()
+->comp : import("node_modules/@types/react/index").Component
+->getComp() : import("node_modules/@types/react/index").Component
+->getComp : () => import("node_modules/@types/react/index").Component
++>comp : import("react").Component
++>getComp() : import("react").Component
++>getComp : () => import("react").Component
+ }
+ === src/some-other-file.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink.types b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink.types
index 78a2505802..7d53bc142b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink.types
@@ -31,15 +31,15 @@ import * as _whatever from "p2";
 >_whatever : typeof _whatever
 
 import { getA } from "typescript-fsa";
->getA : () => import("/p1/node_modules/typescript-fsa/index").A
+>getA : () => import("typescript-fsa").A
 
 export const a = getA();
->a : import("/p1/node_modules/typescript-fsa/index").A
->getA() : import("/p1/node_modules/typescript-fsa/index").A
->getA : () => import("/p1/node_modules/typescript-fsa/index").A
+>a : import("typescript-fsa").A
+>getA() : import("typescript-fsa").A
+>getA : () => import("typescript-fsa").A
 
 === /p2/index.d.ts ===
 export const a: import("typescript-fsa").A;
->a : import("/p2/node_modules/typescript-fsa/index").A
+>a : import("typescript-fsa").A
 
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink.types.diff
new file mode 100644
index 0000000000..492162066e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink.types.diff
@@ -0,0 +1,22 @@
+--- old.declarationEmitForGlobalishSpecifierSymlink.types
++++ new.declarationEmitForGlobalishSpecifierSymlink.types
+@@= skipped -30, +30 lines =@@
+ >_whatever : typeof _whatever
+
+ import { getA } from "typescript-fsa";
+->getA : () => import("/p1/node_modules/typescript-fsa/index").A
++>getA : () => import("typescript-fsa").A
+
+ export const a = getA();
+->a : import("/p1/node_modules/typescript-fsa/index").A
+->getA() : import("/p1/node_modules/typescript-fsa/index").A
+->getA : () => import("/p1/node_modules/typescript-fsa/index").A
++>a : import("typescript-fsa").A
++>getA() : import("typescript-fsa").A
++>getA : () => import("typescript-fsa").A
+
+ === /p2/index.d.ts ===
+ export const a: import("typescript-fsa").A;
+->a : import("/p2/node_modules/typescript-fsa/index").A
++>a : import("typescript-fsa").A
+
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types
index 002d0c966f..66d218ad4f 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types
@@ -18,15 +18,15 @@ import * as _whatever from "p2";
 >_whatever : typeof _whatever
 
 import { getA } from "typescript-fsa";
->getA : () => import("/cache/typescript-fsa/index").A
+>getA : () => import("typescript-fsa").A
 
 export const a = getA();
->a : import("/cache/typescript-fsa/index").A
->getA() : import("/cache/typescript-fsa/index").A
->getA : () => import("/cache/typescript-fsa/index").A
+>a : import("typescript-fsa").A
+>getA() : import("typescript-fsa").A
+>getA : () => import("typescript-fsa").A
 
 === /p2/index.d.ts ===
 export const a: import("typescript-fsa").A;
->a : import("/cache/typescript-fsa/index").A
+>a : import("typescript-fsa").A
 
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types.diff
new file mode 100644
index 0000000000..9243323f7a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types.diff
@@ -0,0 +1,22 @@
+--- old.declarationEmitForGlobalishSpecifierSymlink2.types
++++ new.declarationEmitForGlobalishSpecifierSymlink2.types
+@@= skipped -17, +17 lines =@@
+ >_whatever : typeof _whatever
+
+ import { getA } from "typescript-fsa";
+->getA : () => import("/cache/typescript-fsa/index").A
++>getA : () => import("typescript-fsa").A
+
+ export const a = getA();
+->a : import("/cache/typescript-fsa/index").A
+->getA() : import("/cache/typescript-fsa/index").A
+->getA : () => import("/cache/typescript-fsa/index").A
++>a : import("typescript-fsa").A
++>getA() : import("typescript-fsa").A
++>getA : () => import("typescript-fsa").A
+
+ === /p2/index.d.ts ===
+ export const a: import("typescript-fsa").A;
+->a : import("/cache/typescript-fsa/index").A
++>a : import("typescript-fsa").A
+
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols
index 94b02bdd89..a36ff6eb3d 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols
@@ -5,7 +5,7 @@ import { ParentThing } from './parent';
 >ParentThing : Symbol(ParentThing, Decl(child1.ts, 0, 8))
 
 declare module './parent' {
->'./parent' : Symbol("parent", Decl(parent.ts, 0, 0), Decl(child1.ts, 0, 39))
+>'./parent' : Symbol("./parent", Decl(parent.ts, 0, 0), Decl(child1.ts, 0, 39))
 
     interface ParentThing {
 >ParentThing : Symbol(ParentThing, Decl(parent.ts, 0, 34), Decl(child1.ts, 2, 27))
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols.diff
new file mode 100644
index 0000000000..f2cff05f6a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols.diff
@@ -0,0 +1,11 @@
+--- old.declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols
++++ new.declarationEmitForModuleImportingModuleAugmentationRetainsImport.symbols
+@@= skipped -4, +4 lines =@@
+ >ParentThing : Symbol(ParentThing, Decl(child1.ts, 0, 8))
+
+ declare module './parent' {
+->'./parent' : Symbol("parent", Decl(parent.ts, 0, 0), Decl(child1.ts, 0, 39))
++>'./parent' : Symbol("./parent", Decl(parent.ts, 0, 0), Decl(child1.ts, 0, 39))
+
+     interface ParentThing {
+ >ParentThing : Symbol(ParentThing, Decl(parent.ts, 0, 34), Decl(child1.ts, 2, 27))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.types b/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.types
index 71ac501aac..57d97d9a25 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.types
@@ -5,7 +5,7 @@ import { ParentThing } from './parent';
 >ParentThing : typeof ParentThing
 
 declare module './parent' {
->'./parent' : typeof import("parent")
+>'./parent' : typeof import("./parent")
 
     interface ParentThing {
         add: (a: number, b: number) => number;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.types.diff
new file mode 100644
index 0000000000..88db185025
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForModuleImportingModuleAugmentationRetainsImport.types.diff
@@ -0,0 +1,11 @@
+--- old.declarationEmitForModuleImportingModuleAugmentationRetainsImport.types
++++ new.declarationEmitForModuleImportingModuleAugmentationRetainsImport.types
+@@= skipped -4, +4 lines =@@
+ >ParentThing : typeof ParentThing
+
+ declare module './parent' {
+->'./parent' : typeof import("parent")
++>'./parent' : typeof import("./parent")
+
+     interface ParentThing {
+         add: (a: number, b: number) => number;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForTypesWhichNeedImportTypes.types b/testdata/baselines/reference/submodule/compiler/declarationEmitForTypesWhichNeedImportTypes.types
index cd4edf2caf..6dbc6177fa 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForTypesWhichNeedImportTypes.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForTypesWhichNeedImportTypes.types
@@ -11,10 +11,10 @@ export function createNamed(): Named {
 }
 === a.ts ===
 import { createNamed } from "./b";
->createNamed : () => import("b").Named
+>createNamed : () => import("./b").Named
 
 export const Value = createNamed();
->Value : import("b").Named
->createNamed() : import("b").Named
->createNamed : () => import("b").Named
+>Value : import("./b").Named
+>createNamed() : import("./b").Named
+>createNamed : () => import("./b").Named
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForTypesWhichNeedImportTypes.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitForTypesWhichNeedImportTypes.types.diff
new file mode 100644
index 0000000000..4173c8d370
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForTypesWhichNeedImportTypes.types.diff
@@ -0,0 +1,16 @@
+--- old.declarationEmitForTypesWhichNeedImportTypes.types
++++ new.declarationEmitForTypesWhichNeedImportTypes.types
+@@= skipped -10, +10 lines =@@
+ }
+ === a.ts ===
+ import { createNamed } from "./b";
+->createNamed : () => import("b").Named
++>createNamed : () => import("./b").Named
+
+ export const Value = createNamed();
+->Value : import("b").Named
+->createNamed() : import("b").Named
+->createNamed : () => import("b").Named
++>Value : import("./b").Named
++>createNamed() : import("./b").Named
++>createNamed : () => import("./b").Named
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitImportInExportAssignmentModule.types b/testdata/baselines/reference/submodule/compiler/declarationEmitImportInExportAssignmentModule.types
index 70d4e8d8c4..bd5f69d70f 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitImportInExportAssignmentModule.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitImportInExportAssignmentModule.types
@@ -5,7 +5,7 @@ module m {
 >m : typeof m
 
     export module c {
->c : typeof import("declarationEmitImportInExportAssignmentModule").c
+>c : typeof import("./declarationEmitImportInExportAssignmentModule").c
 
         export class c {
 >c : c
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitImportInExportAssignmentModule.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitImportInExportAssignmentModule.types.diff
index badc009b57..b059d943da 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitImportInExportAssignmentModule.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitImportInExportAssignmentModule.types.diff
@@ -5,7 +5,7 @@
 
      export module c {
 ->c : typeof m.c
-+>c : typeof import("declarationEmitImportInExportAssignmentModule").c
++>c : typeof import("./declarationEmitImportInExportAssignmentModule").c
 
          export class c {
  >c : c
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitInlinedDistributiveConditional.types b/testdata/baselines/reference/submodule/compiler/declarationEmitInlinedDistributiveConditional.types
index 1a305c08c8..76663972a2 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitInlinedDistributiveConditional.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitInlinedDistributiveConditional.types
@@ -2,13 +2,13 @@
 
 === test.ts ===
 import {dropPrivateProps1, dropPrivateProps2} from './api';
->dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+>dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
 >dropPrivateProps2 : <Obj>(obj: Obj) => { [K in keyof Obj extends infer T ? T extends keyof Obj ? T extends `_${string}` ? never : T : never : never]: Obj[K]; }
 
 const a = dropPrivateProps1({foo: 42, _bar: 'secret'}); // type is {foo: number}
 >a : { foo: number; }
 >dropPrivateProps1({foo: 42, _bar: 'secret'}) : { foo: number; }
->dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+>dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
 >{foo: 42, _bar: 'secret'} : { foo: number; _bar: string; }
 >foo : number
 >42 : 42
@@ -30,15 +30,15 @@ const b = dropPrivateProps2({foo: 42, _bar: 'secret'}); // type is {foo: number,
 
 === api.ts ===
 import {excludePrivateKeys1, excludePrivateKeys2} from './internal';
->excludePrivateKeys1 : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+>excludePrivateKeys1 : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
 >excludePrivateKeys2 : <Obj>(obj: Obj) => { [K in keyof Obj extends infer T ? T extends keyof Obj ? T extends `_${string}` ? never : T : never : never]: Obj[K]; }
 
 export const dropPrivateProps1 = <Obj>(obj: Obj) => excludePrivateKeys1(obj);
->dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
-><Obj>(obj: Obj) => excludePrivateKeys1(obj) : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+>dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+><Obj>(obj: Obj) => excludePrivateKeys1(obj) : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
 >obj : Obj
->excludePrivateKeys1(obj) : { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
->excludePrivateKeys1 : <Obj_1>(obj: Obj_1) => { [K in import("internal").PublicKeys1<keyof Obj_1>]: Obj_1[K]; }
+>excludePrivateKeys1(obj) : { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+>excludePrivateKeys1 : <Obj_1>(obj: Obj_1) => { [K in import("./internal").PublicKeys1<keyof Obj_1>]: Obj_1[K]; }
 >obj : Obj
 
 export const dropPrivateProps2 = <Obj>(obj: Obj) => excludePrivateKeys2(obj);
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitInlinedDistributiveConditional.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitInlinedDistributiveConditional.types.diff
new file mode 100644
index 0000000000..5d3079afc2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitInlinedDistributiveConditional.types.diff
@@ -0,0 +1,39 @@
+--- old.declarationEmitInlinedDistributiveConditional.types
++++ new.declarationEmitInlinedDistributiveConditional.types
+@@= skipped -1, +1 lines =@@
+
+ === test.ts ===
+ import {dropPrivateProps1, dropPrivateProps2} from './api';
+->dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
++>dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+ >dropPrivateProps2 : <Obj>(obj: Obj) => { [K in keyof Obj extends infer T ? T extends keyof Obj ? T extends `_${string}` ? never : T : never : never]: Obj[K]; }
+
+ const a = dropPrivateProps1({foo: 42, _bar: 'secret'}); // type is {foo: number}
+ >a : { foo: number; }
+ >dropPrivateProps1({foo: 42, _bar: 'secret'}) : { foo: number; }
+->dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
++>dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+ >{foo: 42, _bar: 'secret'} : { foo: number; _bar: string; }
+ >foo : number
+ >42 : 42
+@@= skipped -28, +28 lines =@@
+
+ === api.ts ===
+ import {excludePrivateKeys1, excludePrivateKeys2} from './internal';
+->excludePrivateKeys1 : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
++>excludePrivateKeys1 : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+ >excludePrivateKeys2 : <Obj>(obj: Obj) => { [K in keyof Obj extends infer T ? T extends keyof Obj ? T extends `_${string}` ? never : T : never : never]: Obj[K]; }
+
+ export const dropPrivateProps1 = <Obj>(obj: Obj) => excludePrivateKeys1(obj);
+->dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+-><Obj>(obj: Obj) => excludePrivateKeys1(obj) : <Obj>(obj: Obj) => { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
++>dropPrivateProps1 : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
++><Obj>(obj: Obj) => excludePrivateKeys1(obj) : <Obj>(obj: Obj) => { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+ >obj : Obj
+->excludePrivateKeys1(obj) : { [K in import("internal").PublicKeys1<keyof Obj>]: Obj[K]; }
+->excludePrivateKeys1 : <Obj_1>(obj: Obj_1) => { [K in import("internal").PublicKeys1<keyof Obj_1>]: Obj_1[K]; }
++>excludePrivateKeys1(obj) : { [K in import("./internal").PublicKeys1<keyof Obj>]: Obj[K]; }
++>excludePrivateKeys1 : <Obj_1>(obj: Obj_1) => { [K in import("./internal").PublicKeys1<keyof Obj_1>]: Obj_1[K]; }
+ >obj : Obj
+
+ export const dropPrivateProps2 = <Obj>(obj: Obj) => excludePrivateKeys2(obj);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitIsolatedDeclarationErrorNotEmittedForNonEmittedFile.types b/testdata/baselines/reference/submodule/compiler/declarationEmitIsolatedDeclarationErrorNotEmittedForNonEmittedFile.types
index 5f7f6ad0e2..f3f4dff2d6 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitIsolatedDeclarationErrorNotEmittedForNonEmittedFile.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitIsolatedDeclarationErrorNotEmittedForNonEmittedFile.types
@@ -48,14 +48,14 @@ declare class TRPCBuilder<TParams> {
 >TRPCBuilder : TRPCBuilder<TParams>
 
     create<TOptions extends Record<string, any>>(): {
->create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
+>create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("./middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("./middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
 
         procedure: {};
 >procedure : {}
 
         middleware: <TNewParams extends Record<string, any>>(fn: import("./middleware").MiddlewareFunction<{
->middleware : <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>
->fn : import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>
+>middleware : <TNewParams extends Record<string, any>>(fn: import("./middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("./middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>
+>fn : import("./middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>
 
             _config: RootConfig<{
 >_config : RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>
@@ -88,27 +88,27 @@ import { initTRPC } from "@trpc/server";
 >initTRPC : TRPCBuilder<object>
 
 const trpc = initTRPC.create();
->trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
->initTRPC.create() : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
->initTRPC.create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<import("node_modules/@trpc/server/internals/utils").PickFirstDefined<TOptions["errorFormatter"], import("node_modules/@trpc/server/internals/utils").ErrorFormatter<object, import("node_modules/@trpc/server/internals/utils").DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<import("node_modules/@trpc/server/internals/utils").PickFirstDefined<TOptions["errorFormatter"], import("node_modules/@trpc/server/internals/utils").ErrorFormatter<object, import("node_modules/@trpc/server/internals/utils").DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
+>trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+>initTRPC.create() : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+>initTRPC.create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<import("@trpc/server").PickFirstDefined<TOptions["errorFormatter"], import("@trpc/server").ErrorFormatter<object, import("@trpc/server").DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<import("@trpc/server").PickFirstDefined<TOptions["errorFormatter"], import("@trpc/server").ErrorFormatter<object, import("@trpc/server").DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
 >initTRPC : TRPCBuilder<object>
->create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<import("node_modules/@trpc/server/internals/utils").PickFirstDefined<TOptions["errorFormatter"], import("node_modules/@trpc/server/internals/utils").ErrorFormatter<object, import("node_modules/@trpc/server/internals/utils").DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<import("node_modules/@trpc/server/internals/utils").PickFirstDefined<TOptions["errorFormatter"], import("node_modules/@trpc/server/internals/utils").ErrorFormatter<object, import("node_modules/@trpc/server/internals/utils").DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
+>create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<import("@trpc/server").PickFirstDefined<TOptions["errorFormatter"], import("@trpc/server").ErrorFormatter<object, import("@trpc/server").DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<import("@trpc/server").PickFirstDefined<TOptions["errorFormatter"], import("@trpc/server").ErrorFormatter<object, import("@trpc/server").DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
 
 export const middleware = trpc.middleware;
->middleware : <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>
->trpc.middleware : <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>
->trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
->middleware : <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>
+>middleware : <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>
+>trpc.middleware : <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>
+>trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+>middleware : <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>
 
 export const router = trpc.router;
 >router : {}
 >trpc.router : {}
->trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+>trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
 >router : {}
 
 export const publicProcedure = trpc.procedure;
 >publicProcedure : {}
 >trpc.procedure : {}
->trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+>trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
 >procedure : {}
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitIsolatedDeclarationErrorNotEmittedForNonEmittedFile.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitIsolatedDeclarationErrorNotEmittedForNonEmittedFile.types.diff
index ec8016a181..9a849ae44c 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitIsolatedDeclarationErrorNotEmittedForNonEmittedFile.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitIsolatedDeclarationErrorNotEmittedForNonEmittedFile.types.diff
@@ -5,7 +5,7 @@
 
      create<TOptions extends Record<string, any>>(): {
 ->create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("./middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape>>>; }>; }, TNewParams>) => import("./middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape>>>; }>; }, TNewParams>; router: {}; }
-+>create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
++>create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("./middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("./middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
 
          procedure: {};
  >procedure : {}
@@ -13,8 +13,8 @@
          middleware: <TNewParams extends Record<string, any>>(fn: import("./middleware").MiddlewareFunction<{
 ->middleware : <TNewParams extends Record<string, any>>(fn: import("./middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape>>>; }>; }, TNewParams>) => import("./middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape>>>; }>; }, TNewParams>
 ->fn : import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape>>>; }>; }, TNewParams>
-+>middleware : <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>
-+>fn : import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>
++>middleware : <TNewParams extends Record<string, any>>(fn: import("./middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("./middleware").MiddlewareBuilder<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>
++>fn : import("./middleware").MiddlewareFunction<{ _config: RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>; }, TNewParams>
 
              _config: RootConfig<{
 ->_config : RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape>>>; }>
@@ -30,4 +30,41 @@
 +>_config : RootConfig<{ errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>; }>
 
                  errorShape: ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape>>>;
- >errorShape : ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>
\ No newline at end of file
+ >errorShape : ErrorFormatterShape<PickFirstDefined<TOptions["errorFormatter"], ErrorFormatter<TParams["ctx"] extends object ? TParams["ctx"] : object, DefaultErrorShape<{}>>>>
+@@= skipped -22, +22 lines =@@
+ >initTRPC : TRPCBuilder<object>
+
+ const trpc = initTRPC.create();
+->trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+->initTRPC.create() : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+->initTRPC.create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<import("node_modules/@trpc/server/internals/utils").PickFirstDefined<TOptions["errorFormatter"], import("node_modules/@trpc/server/internals/utils").ErrorFormatter<object, import("node_modules/@trpc/server/internals/utils").DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<import("node_modules/@trpc/server/internals/utils").PickFirstDefined<TOptions["errorFormatter"], import("node_modules/@trpc/server/internals/utils").ErrorFormatter<object, import("node_modules/@trpc/server/internals/utils").DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
++>trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
++>initTRPC.create() : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
++>initTRPC.create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<import("@trpc/server").PickFirstDefined<TOptions["errorFormatter"], import("@trpc/server").ErrorFormatter<object, import("@trpc/server").DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<import("@trpc/server").PickFirstDefined<TOptions["errorFormatter"], import("@trpc/server").ErrorFormatter<object, import("@trpc/server").DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
+ >initTRPC : TRPCBuilder<object>
+->create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<import("node_modules/@trpc/server/internals/utils").PickFirstDefined<TOptions["errorFormatter"], import("node_modules/@trpc/server/internals/utils").ErrorFormatter<object, import("node_modules/@trpc/server/internals/utils").DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<import("node_modules/@trpc/server/internals/utils").PickFirstDefined<TOptions["errorFormatter"], import("node_modules/@trpc/server/internals/utils").ErrorFormatter<object, import("node_modules/@trpc/server/internals/utils").DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
++>create : <TOptions extends Record<string, any>>() => { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<import("@trpc/server").PickFirstDefined<TOptions["errorFormatter"], import("@trpc/server").ErrorFormatter<object, import("@trpc/server").DefaultErrorShape<{}>>>>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<import("@trpc/server").PickFirstDefined<TOptions["errorFormatter"], import("@trpc/server").ErrorFormatter<object, import("@trpc/server").DefaultErrorShape<{}>>>>; }>; }, TNewParams>; router: {}; }
+
+ export const middleware = trpc.middleware;
+->middleware : <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>
+->trpc.middleware : <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>
+->trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+->middleware : <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>
++>middleware : <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>
++>trpc.middleware : <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>
++>trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
++>middleware : <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>
+
+ export const router = trpc.router;
+ >router : {}
+ >trpc.router : {}
+->trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
++>trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+ >router : {}
+
+ export const publicProcedure = trpc.procedure;
+ >publicProcedure : {}
+ >trpc.procedure : {}
+->trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("node_modules/@trpc/server/middleware").MiddlewareFunction<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("node_modules/@trpc/server/middleware").MiddlewareBuilder<{ _config: import("node_modules/@trpc/server/internals/config").RootConfig<{ errorShape: import("node_modules/@trpc/server/internals/utils").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
++>trpc : { procedure: {}; middleware: <TNewParams extends Record<string, any>>(fn: import("@trpc/server").MiddlewareFunction<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>) => import("@trpc/server").MiddlewareBuilder<{ _config: import("@trpc/server").RootConfig<{ errorShape: import("@trpc/server").ErrorFormatterShape<never>; }>; }, TNewParams>; router: {}; }
+ >procedure : {}
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitNameConflicts.types b/testdata/baselines/reference/submodule/compiler/declarationEmitNameConflicts.types
index 12fe57cd35..e0780e48f6 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitNameConflicts.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitNameConflicts.types
@@ -92,10 +92,10 @@ export module M.P {
 >g : () => void
 
     export var d = M.d; // emitted incorrectly as typeof im
->d : typeof import("declarationEmit_nameConflicts_1")
->M.d : typeof import("declarationEmit_nameConflicts_1")
+>d : typeof import("./declarationEmit_nameConflicts_1")
+>M.d : typeof import("./declarationEmit_nameConflicts_1")
 >M : typeof M
->d : typeof import("declarationEmit_nameConflicts_1")
+>d : typeof import("./declarationEmit_nameConflicts_1")
 }
 
 export module M.Q {
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitNameConflicts.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitNameConflicts.types.diff
index ac75876f19..e253be3a72 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitNameConflicts.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitNameConflicts.types.diff
@@ -6,11 +6,11 @@
      export var d = M.d; // emitted incorrectly as typeof im
 ->d : typeof M.d
 ->M.d : typeof M.d
-+>d : typeof import("declarationEmit_nameConflicts_1")
-+>M.d : typeof import("declarationEmit_nameConflicts_1")
++>d : typeof import("./declarationEmit_nameConflicts_1")
++>M.d : typeof import("./declarationEmit_nameConflicts_1")
  >M : typeof M
 ->d : typeof M.d
-+>d : typeof import("declarationEmit_nameConflicts_1")
++>d : typeof import("./declarationEmit_nameConflicts_1")
  }
 
  export module M.Q {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types
index de34d2b77a..d97750c6d6 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types
@@ -52,45 +52,45 @@ export default styled;
 
 === index.ts ===
 import styled from "styled-components";
->styled : import("node_modules/styled-components/index").StyledInterface
+>styled : import("styled-components").StyledInterface
 
 const A = styled.div``;
->A : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled : import("node_modules/styled-components/index").StyledInterface
->div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+>A : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled.div`` : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled.div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled : import("styled-components").StyledInterface
+>div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
 >`` : ""
 
 const B = styled.div``;
->B : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled : import("node_modules/styled-components/index").StyledInterface
->div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+>B : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled.div`` : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled.div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled : import("styled-components").StyledInterface
+>div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
 >`` : ""
 
 export const C = styled.div``;
->C : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->styled : import("node_modules/styled-components/index").StyledInterface
->div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+>C : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled.div`` : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled.div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>styled : import("styled-components").StyledInterface
+>div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
 >`` : ""
 
 export default Object.assign(A, {
->Object.assign(A, {    B,    C}) : string & import("node_modules/styled-components/index").StyledComponentBase<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never> & import("node_modules/styled-components/node_modules/hoist-non-react-statics/index").NonReactStatics<"div"> & { B: import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>; C: import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>; }
+>Object.assign(A, {    B,    C}) : string & import("styled-components").StyledComponentBase<"div", import("styled-components").DefaultTheme, {}, never> & import("styled-components/node_modules/hoist-non-react-statics").NonReactStatics<"div"> & { B: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>; C: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>; }
 >Object.assign : { <T extends {}, U>(target: T, source: U): T & U; <T extends {}, U, V>(target: T, source1: U, source2: V): T & U & V; <T extends {}, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W; (target: object, ...sources: any[]): any; }
 >Object : ObjectConstructor
 >assign : { <T extends {}, U>(target: T, source: U): T & U; <T extends {}, U, V>(target: T, source1: U, source2: V): T & U & V; <T extends {}, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W; (target: object, ...sources: any[]): any; }
->A : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
->{    B,    C} : { B: import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>; C: import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>; }
+>A : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+>{    B,    C} : { B: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>; C: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>; }
 
     B,
->B : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+>B : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
 
     C
->C : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+>C : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
 
 });
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types.diff
index 5fa7d5290c..c985213254 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.types.diff
@@ -9,35 +9,69 @@
  >a : TemplateStringsArray
  }
 
-@@= skipped -17, +17 lines =@@
+@@= skipped -12, +12 lines =@@
+
+ === index.ts ===
+ import styled from "styled-components";
+->styled : import("node_modules/styled-components/index").StyledInterface
++>styled : import("styled-components").StyledInterface
+
  const A = styled.div``;
- >A : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
- >styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+->A : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+->styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
 ->styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div">
-+>styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
- >styled : import("node_modules/styled-components/index").StyledInterface
+->styled : import("node_modules/styled-components/index").StyledInterface
 ->div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div">
-+>div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
++>A : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled.div`` : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled.div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled : import("styled-components").StyledInterface
++>div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
  >`` : ""
 
  const B = styled.div``;
- >B : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
- >styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+->B : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+->styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
 ->styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div">
-+>styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
- >styled : import("node_modules/styled-components/index").StyledInterface
+->styled : import("node_modules/styled-components/index").StyledInterface
 ->div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div">
-+>div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
++>B : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled.div`` : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled.div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled : import("styled-components").StyledInterface
++>div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
  >`` : ""
 
  export const C = styled.div``;
- >C : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
- >styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+->C : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+->styled.div`` : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
 ->styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div">
-+>styled.div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
- >styled : import("node_modules/styled-components/index").StyledInterface
+->styled : import("node_modules/styled-components/index").StyledInterface
 ->div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div">
-+>div : (a: TemplateStringsArray) => import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
++>C : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled.div`` : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled.div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>styled : import("styled-components").StyledInterface
++>div : (a: TemplateStringsArray) => import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
  >`` : ""
 
- export default Object.assign(A, {
\ No newline at end of file
+ export default Object.assign(A, {
+->Object.assign(A, {    B,    C}) : string & import("node_modules/styled-components/index").StyledComponentBase<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never> & import("node_modules/styled-components/node_modules/hoist-non-react-statics/index").NonReactStatics<"div"> & { B: import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>; C: import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>; }
++>Object.assign(A, {    B,    C}) : string & import("styled-components").StyledComponentBase<"div", import("styled-components").DefaultTheme, {}, never> & import("styled-components/node_modules/hoist-non-react-statics").NonReactStatics<"div"> & { B: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>; C: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>; }
+ >Object.assign : { <T extends {}, U>(target: T, source: U): T & U; <T extends {}, U, V>(target: T, source1: U, source2: V): T & U & V; <T extends {}, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W; (target: object, ...sources: any[]): any; }
+ >Object : ObjectConstructor
+ >assign : { <T extends {}, U>(target: T, source: U): T & U; <T extends {}, U, V>(target: T, source1: U, source2: V): T & U & V; <T extends {}, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W; (target: object, ...sources: any[]): any; }
+->A : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
+->{    B,    C} : { B: import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>; C: import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>; }
++>A : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
++>{    B,    C} : { B: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>; C: import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>; }
+
+     B,
+->B : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
++>B : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+
+     C
+->C : import("node_modules/styled-components/index").StyledComponent<"div", import("node_modules/styled-components/index").DefaultTheme, {}, never>
++>C : import("styled-components").StyledComponent<"div", import("styled-components").DefaultTheme, {}, never>
+
+ });
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types
index 5ae200962a..0a65ecb05d 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types
@@ -16,17 +16,17 @@ export function scalar(value: string): Scalar {
 }
 === src/settings/spacing.ts ===
 import { scalar } from '../lib/operators/scalar';
->scalar : (value: string) => import("src/lib/operators/scalar").Scalar
+>scalar : (value: string) => import("../lib/operators/scalar").Scalar
 
 export default {
->{	get xs() {		return scalar("14px");	}} : { readonly xs: import("src/lib/operators/scalar").Scalar; }
+>{	get xs() {		return scalar("14px");	}} : { readonly xs: import("../lib/operators/scalar").Scalar; }
 
 	get xs() {
->xs : import("src/lib/operators/scalar").Scalar
+>xs : import("../lib/operators/scalar").Scalar
 
 		return scalar("14px");
->scalar("14px") : import("src/lib/operators/scalar").Scalar
->scalar : (value: string) => import("src/lib/operators/scalar").Scalar
+>scalar("14px") : import("../lib/operators/scalar").Scalar
+>scalar : (value: string) => import("../lib/operators/scalar").Scalar
 >"14px" : "14px"
 	}
 };
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types.diff
new file mode 100644
index 0000000000..1e944145ec
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types.diff
@@ -0,0 +1,25 @@
+--- old.declarationEmitPrefersPathKindBasedOnBundling.types
++++ new.declarationEmitPrefersPathKindBasedOnBundling.types
+@@= skipped -15, +15 lines =@@
+ }
+ === src/settings/spacing.ts ===
+ import { scalar } from '../lib/operators/scalar';
+->scalar : (value: string) => import("src/lib/operators/scalar").Scalar
++>scalar : (value: string) => import("../lib/operators/scalar").Scalar
+
+ export default {
+->{	get xs() {		return scalar("14px");	}} : { readonly xs: import("src/lib/operators/scalar").Scalar; }
++>{	get xs() {		return scalar("14px");	}} : { readonly xs: import("../lib/operators/scalar").Scalar; }
+
+ 	get xs() {
+->xs : import("src/lib/operators/scalar").Scalar
++>xs : import("../lib/operators/scalar").Scalar
+
+ 		return scalar("14px");
+->scalar("14px") : import("src/lib/operators/scalar").Scalar
+->scalar : (value: string) => import("src/lib/operators/scalar").Scalar
++>scalar("14px") : import("../lib/operators/scalar").Scalar
++>scalar : (value: string) => import("../lib/operators/scalar").Scalar
+ >"14px" : "14px"
+ 	}
+ };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types
index 047e40c56f..9c72ab5937 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types
@@ -38,15 +38,15 @@ import { T, Q } from "./lib";
 >Q : any
 
 import { create } from "./bbb";
->create : <T>() => () => import("bbb").INode<T>
+>create : <T>() => () => import("./bbb").INode<T>
 
 export const fun = create<T>();
->fun : () => import("bbb").INode<T>
->create<T>() : () => import("bbb").INode<T>
->create : <T>() => () => import("bbb").INode<T>
+>fun : () => import("./bbb").INode<T>
+>create<T>() : () => import("./bbb").INode<T>
+>create : <T>() => () => import("./bbb").INode<T>
 
 export const fun2 = create<Q>();
->fun2 : () => import("bbb").INode<Q>
->create<Q>() : () => import("bbb").INode<Q>
->create : <T>() => () => import("bbb").INode<T>
+>fun2 : () => import("./bbb").INode<Q>
+>create<Q>() : () => import("./bbb").INode<Q>
+>create : <T>() => () => import("./bbb").INode<T>
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types.diff
new file mode 100644
index 0000000000..af87da2e3c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types.diff
@@ -0,0 +1,24 @@
+--- old.declarationEmitQualifiedAliasTypeArgument.types
++++ new.declarationEmitQualifiedAliasTypeArgument.types
+@@= skipped -37, +37 lines =@@
+ >Q : any
+
+ import { create } from "./bbb";
+->create : <T>() => () => import("bbb").INode<T>
++>create : <T>() => () => import("./bbb").INode<T>
+
+ export const fun = create<T>();
+->fun : () => import("bbb").INode<T>
+->create<T>() : () => import("bbb").INode<T>
+->create : <T>() => () => import("bbb").INode<T>
++>fun : () => import("./bbb").INode<T>
++>create<T>() : () => import("./bbb").INode<T>
++>create : <T>() => () => import("./bbb").INode<T>
+
+ export const fun2 = create<Q>();
+->fun2 : () => import("bbb").INode<Q>
+->create<Q>() : () => import("bbb").INode<Q>
+->create : <T>() => () => import("bbb").INode<T>
++>fun2 : () => import("./bbb").INode<Q>
++>create<Q>() : () => import("./bbb").INode<Q>
++>create : <T>() => () => import("./bbb").INode<T>
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReadonlyComputedProperty.types b/testdata/baselines/reference/submodule/compiler/declarationEmitReadonlyComputedProperty.types
index f7b6c354f7..3bbc9dbbc7 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReadonlyComputedProperty.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReadonlyComputedProperty.types
@@ -27,13 +27,13 @@ export function createInstance(): Interface {
 
 === index.ts ===
 import { createInstance } from './bug'
->createInstance : () => import("bug").Interface
+>createInstance : () => import("./bug").Interface
 
 export const spread = {
 >spread : { [SYMBOL]: string; }
 >{  ...createInstance(),} : { [SYMBOL]: string; }
 
   ...createInstance(),
->createInstance() : import("bug").Interface
->createInstance : () => import("bug").Interface
+>createInstance() : import("./bug").Interface
+>createInstance : () => import("./bug").Interface
 }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReadonlyComputedProperty.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReadonlyComputedProperty.types.diff
new file mode 100644
index 0000000000..095e35f78b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReadonlyComputedProperty.types.diff
@@ -0,0 +1,19 @@
+--- old.declarationEmitReadonlyComputedProperty.types
++++ new.declarationEmitReadonlyComputedProperty.types
+@@= skipped -26, +26 lines =@@
+
+ === index.ts ===
+ import { createInstance } from './bug'
+->createInstance : () => import("bug").Interface
++>createInstance : () => import("./bug").Interface
+
+ export const spread = {
+ >spread : { [SYMBOL]: string; }
+ >{  ...createInstance(),} : { [SYMBOL]: string; }
+
+   ...createInstance(),
+->createInstance() : import("bug").Interface
+->createInstance : () => import("bug").Interface
++>createInstance() : import("./bug").Interface
++>createInstance : () => import("./bug").Interface
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types
index c8f3b0b935..b48563a1c0 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types
@@ -8,11 +8,11 @@ import {MetadataAccessor} from "@raymondfeng/pkg2";
 >MetadataAccessor : typeof MetadataAccessor
 
 export const ADMIN = MetadataAccessor.create<boolean>('1');
->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
+>ADMIN : MetadataAccessor<boolean, import("@raymondfeng/pkg2").IdType>
+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("@raymondfeng/pkg2").IdType>
+>MetadataAccessor.create : <T, D extends import("@raymondfeng/pkg2").IdType = import("@raymondfeng/pkg2").IdType>(key: string) => MetadataAccessor<T, D>
 >MetadataAccessor : typeof MetadataAccessor
->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
+>create : <T, D extends import("@raymondfeng/pkg2").IdType = import("@raymondfeng/pkg2").IdType>(key: string) => MetadataAccessor<T, D>
 >'1' : "1"
 
 === monorepo/pkg1/dist/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types.diff
new file mode 100644
index 0000000000..edf1a71be4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types.diff
@@ -0,0 +1,18 @@
+--- old.declarationEmitReexportedSymlinkReference.types
++++ new.declarationEmitReexportedSymlinkReference.types
+@@= skipped -7, +7 lines =@@
+ >MetadataAccessor : typeof MetadataAccessor
+
+ export const ADMIN = MetadataAccessor.create<boolean>('1');
+->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
+->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
+->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
++>ADMIN : MetadataAccessor<boolean, import("@raymondfeng/pkg2").IdType>
++>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("@raymondfeng/pkg2").IdType>
++>MetadataAccessor.create : <T, D extends import("@raymondfeng/pkg2").IdType = import("@raymondfeng/pkg2").IdType>(key: string) => MetadataAccessor<T, D>
+ >MetadataAccessor : typeof MetadataAccessor
+->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
++>create : <T, D extends import("@raymondfeng/pkg2").IdType = import("@raymondfeng/pkg2").IdType>(key: string) => MetadataAccessor<T, D>
+ >'1' : "1"
+
+ === monorepo/pkg1/dist/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types
index d983b84d95..4e655a71a3 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types
@@ -8,11 +8,11 @@ import {MetadataAccessor} from "@raymondfeng/pkg2";
 >MetadataAccessor : typeof MetadataAccessor
 
 export const ADMIN = MetadataAccessor.create<boolean>('1');
->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
+>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >MetadataAccessor : typeof MetadataAccessor
->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
+>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >'1' : "1"
 
 === monorepo/pkg1/dist/index.d.ts ===
@@ -56,7 +56,7 @@ import "./secondary";
 export * from './types';
 === monorepo/pkg2/dist/types.d.ts ===
 export {MetadataAccessor} from '@raymondfeng/pkg1';
->MetadataAccessor : typeof import("monorepo/pkg1/dist/types").MetadataAccessor
+>MetadataAccessor : typeof import("@raymondfeng/pkg1").MetadataAccessor
 
 === monorepo/pkg2/dist/secondary.d.ts ===
 export {IdType} from '@raymondfeng/pkg1';
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types.diff
new file mode 100644
index 0000000000..16feddec9b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types.diff
@@ -0,0 +1,27 @@
+--- old.declarationEmitReexportedSymlinkReference2.types
++++ new.declarationEmitReexportedSymlinkReference2.types
+@@= skipped -7, +7 lines =@@
+ >MetadataAccessor : typeof MetadataAccessor
+
+ export const ADMIN = MetadataAccessor.create<boolean>('1');
+->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
+->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
+->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
++>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
+ >MetadataAccessor : typeof MetadataAccessor
+->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
++>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
+ >'1' : "1"
+
+ === monorepo/pkg1/dist/index.d.ts ===
+@@= skipped -48, +48 lines =@@
+ export * from './types';
+ === monorepo/pkg2/dist/types.d.ts ===
+ export {MetadataAccessor} from '@raymondfeng/pkg1';
+->MetadataAccessor : typeof import("monorepo/pkg1/dist/types").MetadataAccessor
++>MetadataAccessor : typeof import("@raymondfeng/pkg1").MetadataAccessor
+
+ === monorepo/pkg2/dist/secondary.d.ts ===
+ export {IdType} from '@raymondfeng/pkg1';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types
index 2a7c1fad6f..9bdf276c74 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types
@@ -8,11 +8,11 @@ import {MetadataAccessor} from "@raymondfeng/pkg2";
 >MetadataAccessor : typeof MetadataAccessor
 
 export const ADMIN = MetadataAccessor.create<boolean>('1');
->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
+>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >MetadataAccessor : typeof MetadataAccessor
->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
+>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >'1' : "1"
 
 === monorepo/pkg1/dist/index.d.ts ===
@@ -55,5 +55,5 @@ export declare class MetadataAccessor<T, D extends IdType = IdType> {
 export * from './types';
 === monorepo/pkg2/dist/types.d.ts ===
 export {MetadataAccessor} from '@raymondfeng/pkg1';
->MetadataAccessor : typeof import("monorepo/pkg1/dist/types").MetadataAccessor
+>MetadataAccessor : typeof import("@raymondfeng/pkg1").MetadataAccessor
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types.diff
new file mode 100644
index 0000000000..0e12a9ad79
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types.diff
@@ -0,0 +1,24 @@
+--- old.declarationEmitReexportedSymlinkReference3.types
++++ new.declarationEmitReexportedSymlinkReference3.types
+@@= skipped -7, +7 lines =@@
+ >MetadataAccessor : typeof MetadataAccessor
+
+ export const ADMIN = MetadataAccessor.create<boolean>('1');
+->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
+->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
+->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
++>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
+ >MetadataAccessor : typeof MetadataAccessor
+->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
++>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
+ >'1' : "1"
+
+ === monorepo/pkg1/dist/index.d.ts ===
+@@= skipped -47, +47 lines =@@
+ export * from './types';
+ === monorepo/pkg2/dist/types.d.ts ===
+ export {MetadataAccessor} from '@raymondfeng/pkg1';
+->MetadataAccessor : typeof import("monorepo/pkg1/dist/types").MetadataAccessor
++>MetadataAccessor : typeof import("@raymondfeng/pkg1").MetadataAccessor
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.types b/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.types
index 2402eabfc9..22d3ba1283 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.types
@@ -14,11 +14,11 @@ import { Props } from "react-select";
 >Props : any
 
 export const CustomSelect1 = <Option,>(x: Props<Option> & {}) => {}
->CustomSelect1 : <Option>(x: Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option) => void
-><Option,>(x: Props<Option> & {}) => {} : <Option>(x: Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option) => void
->x : Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option
+>CustomSelect1 : <Option>(x: Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option) => void
+><Option,>(x: Props<Option> & {}) => {} : <Option>(x: Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option) => void
+>x : Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option
 
 export function CustomSelect2<Option,>(x: Props<Option> & {}) {}
->CustomSelect2 : <Option>(x: Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option) => void
->x : Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option
+>CustomSelect2 : <Option>(x: Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option) => void
+>x : Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.types.diff
index 718c627a4f..6635754f79 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.types.diff
@@ -6,11 +6,13 @@
  export const CustomSelect1 = <Option,>(x: Props<Option> & {}) => {}
 ->CustomSelect1 : <Option>(x: Props<Option> & {}) => void
 -><Option,>(x: Props<Option> & {}) => {} : <Option>(x: Props<Option> & {}) => void
-+>CustomSelect1 : <Option>(x: Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option) => void
-+><Option,>(x: Props<Option> & {}) => {} : <Option>(x: Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option) => void
- >x : Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option
+->x : Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option
++>CustomSelect1 : <Option>(x: Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option) => void
++><Option,>(x: Props<Option> & {}) => {} : <Option>(x: Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option) => void
++>x : Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option
 
  export function CustomSelect2<Option,>(x: Props<Option> & {}) {}
 ->CustomSelect2 : <Option>(x: Props<Option> & {}) => void
-+>CustomSelect2 : <Option>(x: Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option) => void
- >x : Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option
+->x : Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option
++>CustomSelect2 : <Option>(x: Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option) => void
++>x : Omit<import("react-select").Whatever, "y"> & Partial<import("react-select").Whatever> & Option
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitScopeConsistency.types b/testdata/baselines/reference/submodule/compiler/declarationEmitScopeConsistency.types
index 799133d7e2..5423bf2c88 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitScopeConsistency.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitScopeConsistency.types
@@ -13,12 +13,12 @@ export const f = (x: A) => x as A;
 
 === b.ts ===
 import { f } from "./a";
->f : (x: import("a").A) => import("a").A
+>f : (x: import("./a").A) => import("./a").A
 
 export interface A { other: number }
 >other : number
 
 export const g = f;
->g : (x: import("a").A) => import("a").A
->f : (x: import("a").A) => import("a").A
+>g : (x: import("./a").A) => import("./a").A
+>f : (x: import("./a").A) => import("./a").A
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitScopeConsistency.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitScopeConsistency.types.diff
new file mode 100644
index 0000000000..3c1f4b1c8e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitScopeConsistency.types.diff
@@ -0,0 +1,17 @@
+--- old.declarationEmitScopeConsistency.types
++++ new.declarationEmitScopeConsistency.types
+@@= skipped -12, +12 lines =@@
+
+ === b.ts ===
+ import { f } from "./a";
+->f : (x: import("a").A) => import("a").A
++>f : (x: import("./a").A) => import("./a").A
+
+ export interface A { other: number }
+ >other : number
+
+ export const g = f;
+->g : (x: import("a").A) => import("a").A
+->f : (x: import("a").A) => import("a").A
++>g : (x: import("./a").A) => import("./a").A
++>f : (x: import("./a").A) => import("./a").A
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitStringEnumUsedInNonlocalSpread.types b/testdata/baselines/reference/submodule/compiler/declarationEmitStringEnumUsedInNonlocalSpread.types
index 17de8ad9c1..971337227b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitStringEnumUsedInNonlocalSpread.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitStringEnumUsedInNonlocalSpread.types
@@ -68,10 +68,10 @@ export class B extends A {
 >{            ...super.getA(),            a: '123',        } : { "123123": string; "12312312312": string; a: string; }
 
             ...super.getA(),
->super.getA() : import("class").ITest
->super.getA : () => import("class").ITest
+>super.getA() : import("./class").ITest
+>super.getA : () => import("./class").ITest
 >super : A
->getA : () => import("class").ITest
+>getA : () => import("./class").ITest
 
             a: '123',
 >a : string
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitStringEnumUsedInNonlocalSpread.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitStringEnumUsedInNonlocalSpread.types.diff
new file mode 100644
index 0000000000..e355f26dce
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitStringEnumUsedInNonlocalSpread.types.diff
@@ -0,0 +1,16 @@
+--- old.declarationEmitStringEnumUsedInNonlocalSpread.types
++++ new.declarationEmitStringEnumUsedInNonlocalSpread.types
+@@= skipped -67, +67 lines =@@
+ >{            ...super.getA(),            a: '123',        } : { "123123": string; "12312312312": string; a: string; }
+
+             ...super.getA(),
+->super.getA() : import("class").ITest
+->super.getA : () => import("class").ITest
++>super.getA() : import("./class").ITest
++>super.getA : () => import("./class").ITest
+ >super : A
+->getA : () => import("class").ITest
++>getA : () => import("./class").ITest
+
+             a: '123',
+ >a : string
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitSymlinkPaths.types b/testdata/baselines/reference/submodule/compiler/declarationEmitSymlinkPaths.types
index 641a395052..b8060bc2a6 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitSymlinkPaths.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitSymlinkPaths.types
@@ -23,14 +23,14 @@ import { test } from "search/lib/index";
 >test : <T>(a: () => T) => () => T
 
 import { getNotification } from "../API/NotificationAPIUtils";
->getNotification : () => import("/packages/search-prefix/src/API/NotificationAPIUtils").NotificationResponse
+>getNotification : () => import("../API/NotificationAPIUtils").NotificationResponse
 
 export const NotificationScenario = test(
->NotificationScenario : () => import("/packages/search-prefix/src/API/NotificationAPIUtils").NotificationResponse
->test(  getNotification) : () => import("/packages/search-prefix/src/API/NotificationAPIUtils").NotificationResponse
+>NotificationScenario : () => import("../API/NotificationAPIUtils").NotificationResponse
+>test(  getNotification) : () => import("../API/NotificationAPIUtils").NotificationResponse
 >test : <T>(a: () => T) => () => T
 
   getNotification
->getNotification : () => import("/packages/search-prefix/src/API/NotificationAPIUtils").NotificationResponse
+>getNotification : () => import("../API/NotificationAPIUtils").NotificationResponse
 
 );
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitSymlinkPaths.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitSymlinkPaths.types.diff
new file mode 100644
index 0000000000..6d66607f93
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitSymlinkPaths.types.diff
@@ -0,0 +1,21 @@
+--- old.declarationEmitSymlinkPaths.types
++++ new.declarationEmitSymlinkPaths.types
+@@= skipped -22, +22 lines =@@
+ >test : <T>(a: () => T) => () => T
+
+ import { getNotification } from "../API/NotificationAPIUtils";
+->getNotification : () => import("/packages/search-prefix/src/API/NotificationAPIUtils").NotificationResponse
++>getNotification : () => import("../API/NotificationAPIUtils").NotificationResponse
+
+ export const NotificationScenario = test(
+->NotificationScenario : () => import("/packages/search-prefix/src/API/NotificationAPIUtils").NotificationResponse
+->test(  getNotification) : () => import("/packages/search-prefix/src/API/NotificationAPIUtils").NotificationResponse
++>NotificationScenario : () => import("../API/NotificationAPIUtils").NotificationResponse
++>test(  getNotification) : () => import("../API/NotificationAPIUtils").NotificationResponse
+ >test : <T>(a: () => T) => () => T
+
+   getNotification
+->getNotification : () => import("/packages/search-prefix/src/API/NotificationAPIUtils").NotificationResponse
++>getNotification : () => import("../API/NotificationAPIUtils").NotificationResponse
+
+ );
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types
index a7e117b425..f7aeef6b40 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types
@@ -2,11 +2,11 @@
 
 === a.ts ===
 import { boxedBox } from "./boxedBox";
->boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
+>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
 export const _ = boxedBox;
->_ : import("box").Box<{ boxed: import("box").Box<number>; }>
->boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
+>_ : import("./box").Box<{ boxed: import("./box").Box<number>; }>
+>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
 // At index 83
 /**
@@ -15,10 +15,10 @@ export const _ = boxedBox;
 
 === boxedBox.d.ts ===
 export declare const boxedBox: import("./box").Box<{
->boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
+>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
     boxed: import("./box").Box<number>;
->boxed : import("box").Box<number>
+>boxed : import("./box").Box<number>
 
 }>;                        // ^This is index 83 in this file
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types.diff
index dadbe58b06..f5cd0e4e3d 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types.diff
@@ -1,11 +1,29 @@
 --- old.declarationEmitTopLevelNodeFromCrossFile2.types
 +++ new.declarationEmitTopLevelNodeFromCrossFile2.types
-@@= skipped -14, +14 lines =@@
+@@= skipped -1, +1 lines =@@
+
+ === a.ts ===
+ import { boxedBox } from "./boxedBox";
+->boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
++>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
+
+ export const _ = boxedBox;
+->_ : import("box").Box<{ boxed: import("box").Box<number>; }>
+->boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
++>_ : import("./box").Box<{ boxed: import("./box").Box<number>; }>
++>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
+
+ // At index 83
+ /**
+@@= skipped -13, +13 lines =@@
 
  === boxedBox.d.ts ===
  export declare const boxedBox: import("./box").Box<{
 ->boxedBox : import("box").Box<{ boxed: import("./box").Box<number>; }>
-+>boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
++>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
      boxed: import("./box").Box<number>;
- >boxed : import("box").Box<number>
\ No newline at end of file
+->boxed : import("box").Box<number>
++>boxed : import("./box").Box<number>
+
+ }>;                        // ^This is index 83 in this file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types
index 16bc62034b..06f3e101ce 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types
@@ -18,10 +18,10 @@ export function func() {
 
 === index.ts ===
 import { func } from "./reexporter";
->func : () => import("foo.d.html").CustomHtmlRepresentationThing
+>func : () => import("./foo.d.html").CustomHtmlRepresentationThing
 
 export const c = func();
->c : import("foo.d.html").CustomHtmlRepresentationThing
->func() : import("foo.d.html").CustomHtmlRepresentationThing
->func : () => import("foo.d.html").CustomHtmlRepresentationThing
+>c : import("./foo.d.html").CustomHtmlRepresentationThing
+>func() : import("./foo.d.html").CustomHtmlRepresentationThing
+>func : () => import("./foo.d.html").CustomHtmlRepresentationThing
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types.diff
new file mode 100644
index 0000000000..cc371f9deb
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types.diff
@@ -0,0 +1,16 @@
+--- old.declarationEmitTransitiveImportOfHtmlDeclarationItem.types
++++ new.declarationEmitTransitiveImportOfHtmlDeclarationItem.types
+@@= skipped -17, +17 lines =@@
+
+ === index.ts ===
+ import { func } from "./reexporter";
+->func : () => import("foo.d.html").CustomHtmlRepresentationThing
++>func : () => import("./foo.d.html").CustomHtmlRepresentationThing
+
+ export const c = func();
+->c : import("foo.d.html").CustomHtmlRepresentationThing
+->func() : import("foo.d.html").CustomHtmlRepresentationThing
+->func : () => import("foo.d.html").CustomHtmlRepresentationThing
++>c : import("./foo.d.html").CustomHtmlRepresentationThing
++>func() : import("./foo.d.html").CustomHtmlRepresentationThing
++>func : () => import("./foo.d.html").CustomHtmlRepresentationThing
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUnnessesaryTypeReferenceNotAdded.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUnnessesaryTypeReferenceNotAdded.types
index 7dd9e19386..59e1f0ad5f 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUnnessesaryTypeReferenceNotAdded.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUnnessesaryTypeReferenceNotAdded.types
@@ -28,12 +28,12 @@ declare namespace thing {
     interface ParsedArgs {}
 }
 declare function thing(x: any): thing.ParsedArgs;
->thing : (x: any) => import("/node_modules/@types/minimist/minimist").ParsedArgs
+>thing : (x: any) => import("minimist").ParsedArgs
 >x : any
 >thing : any
 
 export = thing;
->thing : (x: any) => import("/node_modules/@types/minimist/minimist").ParsedArgs
+>thing : (x: any) => import("minimist").ParsedArgs
 
 === /node_modules/@types/process/process.d.ts ===
 declare const thing: any;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUnnessesaryTypeReferenceNotAdded.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUnnessesaryTypeReferenceNotAdded.types.diff
index a7c98fd06a..3906ec001f 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUnnessesaryTypeReferenceNotAdded.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUnnessesaryTypeReferenceNotAdded.types.diff
@@ -5,13 +5,13 @@
  }
  declare function thing(x: any): thing.ParsedArgs;
 ->thing : (x: any) => thing.ParsedArgs
-+>thing : (x: any) => import("/node_modules/@types/minimist/minimist").ParsedArgs
++>thing : (x: any) => import("minimist").ParsedArgs
  >x : any
  >thing : any
 
  export = thing;
 ->thing : (x: any) => thing.ParsedArgs
-+>thing : (x: any) => import("/node_modules/@types/minimist/minimist").ParsedArgs
++>thing : (x: any) => import("minimist").ParsedArgs
 
  === /node_modules/@types/process/process.d.ts ===
  declare const thing: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
index d059a9a664..b64e8344db 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
@@ -301,11 +301,11 @@ export { type UseQueryReturnType, useQuery };
 === node_modules/@tanstack/vue-query/build/modern/index.d.ts ===
 export { UseQueryReturnType, useQuery } from './useQuery-CPqkvEsh.js';
 >UseQueryReturnType : any
->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("./useQuery-CPqkvEsh.js").UseQueryReturnType<TData, TError>
 
 === src/index.mts ===
 import { useQuery } from '@tanstack/vue-query'
->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("@tanstack/vue-query").UseQueryReturnType<TData, TError>
 
 const baseUrl = 'https://api.publicapis.org/'
 >baseUrl : "https://api.publicapis.org/"
@@ -407,12 +407,12 @@ const entryKeys = {
 }
 
 export const useEntries = () => {
->useEntries : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
+>useEntries : () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
 
   return useQuery({
->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("@tanstack/vue-query").UseQueryReturnType<TData, TError>
 >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
 
     queryKey: entryKeys.list(),
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
index 8d4033c770..57bd7a038f 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
@@ -1,6 +1,20 @@
 --- old.declarationEmitUsingAlternativeContainingModules1.types
 +++ new.declarationEmitUsingAlternativeContainingModules1.types
-@@= skipped -349, +349 lines =@@
+@@= skipped -300, +300 lines =@@
+ === node_modules/@tanstack/vue-query/build/modern/index.d.ts ===
+ export { UseQueryReturnType, useQuery } from './useQuery-CPqkvEsh.js';
+ >UseQueryReturnType : any
+->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("./useQuery-CPqkvEsh.js").UseQueryReturnType<TData, TError>
+
+ === src/index.mts ===
+ import { useQuery } from '@tanstack/vue-query'
+->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("@tanstack/vue-query").UseQueryReturnType<TData, TError>
+
+ const baseUrl = 'https://api.publicapis.org/'
+ >baseUrl : "https://api.publicapis.org/"
+@@= skipped -49, +49 lines =@@
  >fetch(baseUrl + 'entries')      .then((res) => res.json()) : Promise<any>
  >fetch(baseUrl + 'entries')      .then : <TResult1 = Response, TResult2 = never>(onfulfilled?: ((value: Response) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
  >fetch(baseUrl + 'entries') : Promise<Response>
@@ -9,7 +23,24 @@
  >baseUrl + 'entries' : string
  >baseUrl : "https://api.publicapis.org/"
  >'entries' : "entries"
-@@= skipped -83, +83 lines =@@
+@@= skipped -57, +57 lines =@@
+ }
+
+ export const useEntries = () => {
+->useEntries : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
+->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
++>useEntries : () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
++>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
+
+   return useQuery({
+->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
+->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
++>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("@tanstack/vue-query").UseQueryReturnType<TData, TError>
+ >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
+
+     queryKey: entryKeys.list(),
+@@= skipped -26, +26 lines =@@
  >(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
  >data : IEntry[]
  >data.slice(0, 10) : IEntry[]
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
index aa4dfb16a3..f8a822a4d8 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
@@ -304,12 +304,12 @@ export { type UseQueryReturnType as b, useQuery as u };
 export { b as UseQueryReturnType, u as useQuery } from './useQuery-CPqkvEsh.js';
 >b : any
 >UseQueryReturnType : any
->u : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
+>u : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("./useQuery-CPqkvEsh.js").b<TData, TError>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("./useQuery-CPqkvEsh.js").b<TData, TError>
 
 === src/index.mts ===
 import { useQuery } from '@tanstack/vue-query'
->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("@tanstack/vue-query").UseQueryReturnType<TData, TError>
 
 const baseUrl = 'https://api.publicapis.org/'
 >baseUrl : "https://api.publicapis.org/"
@@ -411,12 +411,12 @@ const entryKeys = {
 }
 
 export const useEntries = () => {
->useEntries : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
+>useEntries : () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
 
   return useQuery({
->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("@tanstack/vue-query").UseQueryReturnType<TData, TError>
 >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
 
     queryKey: entryKeys.list(),
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
index 5aa7357847..6bb4e8cca8 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
@@ -1,6 +1,22 @@
 --- old.declarationEmitUsingAlternativeContainingModules2.types
 +++ new.declarationEmitUsingAlternativeContainingModules2.types
-@@= skipped -353, +353 lines =@@
+@@= skipped -303, +303 lines =@@
+ export { b as UseQueryReturnType, u as useQuery } from './useQuery-CPqkvEsh.js';
+ >b : any
+ >UseQueryReturnType : any
+->u : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
+->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
++>u : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("./useQuery-CPqkvEsh.js").b<TData, TError>
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("./useQuery-CPqkvEsh.js").b<TData, TError>
+
+ === src/index.mts ===
+ import { useQuery } from '@tanstack/vue-query'
+->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("@tanstack/vue-query").UseQueryReturnType<TData, TError>
+
+ const baseUrl = 'https://api.publicapis.org/'
+ >baseUrl : "https://api.publicapis.org/"
+@@= skipped -50, +50 lines =@@
  >fetch(baseUrl + 'entries')      .then((res) => res.json()) : Promise<any>
  >fetch(baseUrl + 'entries')      .then : <TResult1 = Response, TResult2 = never>(onfulfilled?: ((value: Response) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
  >fetch(baseUrl + 'entries') : Promise<Response>
@@ -9,7 +25,24 @@
  >baseUrl + 'entries' : string
  >baseUrl : "https://api.publicapis.org/"
  >'entries' : "entries"
-@@= skipped -83, +83 lines =@@
+@@= skipped -57, +57 lines =@@
+ }
+
+ export const useEntries = () => {
+->useEntries : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
+->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
++>useEntries : () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
++>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
+
+   return useQuery({
+->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
+->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
++>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("@tanstack/vue-query").UseQueryReturnType<TData, TError>
+ >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
+
+     queryKey: entryKeys.list(),
+@@= skipped -26, +26 lines =@@
  >(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
  >data : IEntry[]
  >data.slice(0, 10) : IEntry[]
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types
index d695f00c90..2e4d76884a 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types
@@ -11,33 +11,33 @@ export declare type SomeType = { arg: Other };
 
 === node_modules/some-dep/dist/index.d.ts ===
 export type OtherType = import('./inner').Other;
->OtherType : import("node_modules/some-dep/dist/inner").Other
+>OtherType : import("./inner").Other
 
 export type SomeType = import('./inner').SomeType;
->SomeType : import("node_modules/some-dep/dist/inner").SomeType
+>SomeType : import("./inner").SomeType
 
 === src/index.ts ===
 import { SomeType } from "some-dep";
 >SomeType : any
 
 export const foo = (thing: SomeType) => {
->foo : (thing: import("node_modules/some-dep/dist/inner").SomeType) => import("node_modules/some-dep/dist/inner").SomeType
->(thing: SomeType) => {  return thing;} : (thing: import("node_modules/some-dep/dist/inner").SomeType) => import("node_modules/some-dep/dist/inner").SomeType
->thing : import("node_modules/some-dep/dist/inner").SomeType
+>foo : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").SomeType
+>(thing: SomeType) => {  return thing;} : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").SomeType
+>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
   return thing;
->thing : import("node_modules/some-dep/dist/inner").SomeType
+>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
 };
 
 export const bar = (thing: SomeType) => {
->bar : (thing: import("node_modules/some-dep/dist/inner").SomeType) => import("node_modules/some-dep/dist/inner").Other
->(thing: SomeType) => {  return thing.arg;} : (thing: import("node_modules/some-dep/dist/inner").SomeType) => import("node_modules/some-dep/dist/inner").Other
->thing : import("node_modules/some-dep/dist/inner").SomeType
+>bar : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").Other
+>(thing: SomeType) => {  return thing.arg;} : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").Other
+>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
   return thing.arg;
->thing.arg : import("node_modules/some-dep/dist/inner").Other
->thing : import("node_modules/some-dep/dist/inner").SomeType
->arg : import("node_modules/some-dep/dist/inner").Other
+>thing.arg : import("../node_modules/some-dep/dist/inner").Other
+>thing : import("../node_modules/some-dep/dist/inner").SomeType
+>arg : import("../node_modules/some-dep/dist/inner").Other
 
 };
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types.diff
index 7ab48a0a49..11e2693ffd 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types.diff
@@ -1,24 +1,48 @@
 --- old.declarationEmitUsingTypeAlias1.types
 +++ new.declarationEmitUsingTypeAlias1.types
-@@= skipped -20, +20 lines =@@
+@@= skipped -10, +10 lines =@@
+
+ === node_modules/some-dep/dist/index.d.ts ===
+ export type OtherType = import('./inner').Other;
+->OtherType : import("node_modules/some-dep/dist/inner").Other
++>OtherType : import("./inner").Other
+
+ export type SomeType = import('./inner').SomeType;
+->SomeType : import("node_modules/some-dep/dist/inner").SomeType
++>SomeType : import("./inner").SomeType
+
+ === src/index.ts ===
+ import { SomeType } from "some-dep";
  >SomeType : any
 
  export const foo = (thing: SomeType) => {
 ->foo : (thing: SomeType) => import("node_modules/some-dep/dist/inner").SomeType
 ->(thing: SomeType) => {  return thing;} : (thing: SomeType) => import("node_modules/some-dep/dist/inner").SomeType
-+>foo : (thing: import("node_modules/some-dep/dist/inner").SomeType) => import("node_modules/some-dep/dist/inner").SomeType
-+>(thing: SomeType) => {  return thing;} : (thing: import("node_modules/some-dep/dist/inner").SomeType) => import("node_modules/some-dep/dist/inner").SomeType
- >thing : import("node_modules/some-dep/dist/inner").SomeType
+->thing : import("node_modules/some-dep/dist/inner").SomeType
++>foo : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").SomeType
++>(thing: SomeType) => {  return thing;} : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").SomeType
++>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
    return thing;
-@@= skipped -10, +10 lines =@@
+->thing : import("node_modules/some-dep/dist/inner").SomeType
++>thing : import("../node_modules/some-dep/dist/inner").SomeType
+
  };
 
  export const bar = (thing: SomeType) => {
 ->bar : (thing: SomeType) => import("node_modules/some-dep/dist/inner").Other
 ->(thing: SomeType) => {  return thing.arg;} : (thing: SomeType) => import("node_modules/some-dep/dist/inner").Other
-+>bar : (thing: import("node_modules/some-dep/dist/inner").SomeType) => import("node_modules/some-dep/dist/inner").Other
-+>(thing: SomeType) => {  return thing.arg;} : (thing: import("node_modules/some-dep/dist/inner").SomeType) => import("node_modules/some-dep/dist/inner").Other
- >thing : import("node_modules/some-dep/dist/inner").SomeType
+->thing : import("node_modules/some-dep/dist/inner").SomeType
++>bar : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").Other
++>(thing: SomeType) => {  return thing.arg;} : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").Other
++>thing : import("../node_modules/some-dep/dist/inner").SomeType
+
+   return thing.arg;
+->thing.arg : import("node_modules/some-dep/dist/inner").Other
+->thing : import("node_modules/some-dep/dist/inner").SomeType
+->arg : import("node_modules/some-dep/dist/inner").Other
++>thing.arg : import("../node_modules/some-dep/dist/inner").Other
++>thing : import("../node_modules/some-dep/dist/inner").SomeType
++>arg : import("../node_modules/some-dep/dist/inner").Other
 
-   return thing.arg;
\ No newline at end of file
+ };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types
index 168e62412f..8084d722c0 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types
@@ -70,13 +70,13 @@ export { shouldLookupName, shouldReuseLocalName, reuseDepName, shouldBeElided };
 
 === src/index.ts ===
 import { goodDeclaration, shouldReuseLocalName, shouldBeElided } from "some-dep";
->goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
+>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 >shouldReuseLocalName : unique symbol
 >shouldBeElided : unique symbol
 
 export const bar = goodDeclaration<{}>;
 >bar : () => () => { shouldPrintResult: "N"; shouldPrintResult2: "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 >goodDeclaration<{}> : () => () => { shouldPrintResult: "N"; shouldPrintResult2: "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
->goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
+>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types.diff
index eb04346f79..1f08da8d11 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types.diff
@@ -23,7 +23,7 @@
  === src/index.ts ===
  import { goodDeclaration, shouldReuseLocalName, shouldBeElided } from "some-dep";
 ->goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends typeof shouldBeElided ? import("node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: typeof import("node_modules/some-dep/dist/other").shouldLookupName; shouldReuseLocalName: typeof shouldReuseLocalName; reuseDepName: typeof import("node_modules/some-dep/dist/other").reuseDepName; }
-+>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
++>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
  >shouldReuseLocalName : unique symbol
  >shouldBeElided : unique symbol
 
@@ -33,5 +33,5 @@
 ->goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends typeof shouldBeElided ? import("node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: typeof import("node_modules/some-dep/dist/other").shouldLookupName; shouldReuseLocalName: typeof shouldReuseLocalName; reuseDepName: typeof import("node_modules/some-dep/dist/other").reuseDepName; }
 +>bar : () => () => { shouldPrintResult: "N"; shouldPrintResult2: "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 +>goodDeclaration<{}> : () => () => { shouldPrintResult: "N"; shouldPrintResult2: "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
-+>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
++>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types b/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types
index a83731d3e1..588f55c0d5 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types
@@ -18,16 +18,16 @@ export function useRef<T>(current: T): MutableRefObject<T> {
 >current : T
 }
 export const useCsvParser = () => {
->useCsvParser : () => MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
->() => {    const parserRef = useRef<typeof import("csv-parse")>(null);    return parserRef;} : () => MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
+>useCsvParser : () => MutableRefObject<typeof import("csv-parse")>
+>() => {    const parserRef = useRef<typeof import("csv-parse")>(null);    return parserRef;} : () => MutableRefObject<typeof import("csv-parse")>
 
     const parserRef = useRef<typeof import("csv-parse")>(null);
->parserRef : MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
->useRef<typeof import("csv-parse")>(null) : MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
+>parserRef : MutableRefObject<typeof import("csv-parse")>
+>useRef<typeof import("csv-parse")>(null) : MutableRefObject<typeof import("csv-parse")>
 >useRef : <T>(current: T) => MutableRefObject<T>
 
     return parserRef;
->parserRef : MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
+>parserRef : MutableRefObject<typeof import("csv-parse")>
 
 };
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types.diff
new file mode 100644
index 0000000000..96ddeeb4fc
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitWithInvalidPackageJsonTypings.types.diff
@@ -0,0 +1,23 @@
+--- old.declarationEmitWithInvalidPackageJsonTypings.types
++++ new.declarationEmitWithInvalidPackageJsonTypings.types
+@@= skipped -17, +17 lines =@@
+ >current : T
+ }
+ export const useCsvParser = () => {
+->useCsvParser : () => MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
+->() => {    const parserRef = useRef<typeof import("csv-parse")>(null);    return parserRef;} : () => MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
++>useCsvParser : () => MutableRefObject<typeof import("csv-parse")>
++>() => {    const parserRef = useRef<typeof import("csv-parse")>(null);    return parserRef;} : () => MutableRefObject<typeof import("csv-parse")>
+
+     const parserRef = useRef<typeof import("csv-parse")>(null);
+->parserRef : MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
+->useRef<typeof import("csv-parse")>(null) : MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
++>parserRef : MutableRefObject<typeof import("csv-parse")>
++>useRef<typeof import("csv-parse")>(null) : MutableRefObject<typeof import("csv-parse")>
+ >useRef : <T>(current: T) => MutableRefObject<T>
+
+     return parserRef;
+->parserRef : MutableRefObject<typeof import("/p1/node_modules/csv-parse/lib/index")>
++>parserRef : MutableRefObject<typeof import("csv-parse")>
+
+ };
diff --git a/testdata/baselines/reference/submodule/compiler/declarationImportTypeAliasInferredAndEmittable.types b/testdata/baselines/reference/submodule/compiler/declarationImportTypeAliasInferredAndEmittable.types
index 257bbc305b..be84317f34 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationImportTypeAliasInferredAndEmittable.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationImportTypeAliasInferredAndEmittable.types
@@ -18,10 +18,10 @@ export = Conn;
 
 === usage.ts ===
 type Conn = import("./foo");
->Conn : import("foo")
+>Conn : import("./foo")
 
 declare var x: Conn;
->x : import("foo")
+>x : import("./foo")
 
 export class Wrap {
 >Wrap : Wrap
@@ -30,8 +30,8 @@ export class Wrap {
 >connItem : number
 
     constructor(c = x) {
->c : import("foo")
->x : import("foo")
+>c : import("./foo")
+>x : import("./foo")
 
         this.connItem = c.item;
 >this.connItem = c.item : number
@@ -39,7 +39,7 @@ export class Wrap {
 >this : this
 >connItem : number
 >c.item : number
->c : import("foo")
+>c : import("./foo")
 >item : number
     }
 }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationImportTypeAliasInferredAndEmittable.types.diff b/testdata/baselines/reference/submodule/compiler/declarationImportTypeAliasInferredAndEmittable.types.diff
new file mode 100644
index 0000000000..16f877cbd4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationImportTypeAliasInferredAndEmittable.types.diff
@@ -0,0 +1,35 @@
+--- old.declarationImportTypeAliasInferredAndEmittable.types
++++ new.declarationImportTypeAliasInferredAndEmittable.types
+@@= skipped -17, +17 lines =@@
+
+ === usage.ts ===
+ type Conn = import("./foo");
+->Conn : import("foo")
++>Conn : import("./foo")
+
+ declare var x: Conn;
+->x : import("foo")
++>x : import("./foo")
+
+ export class Wrap {
+ >Wrap : Wrap
+@@= skipped -12, +12 lines =@@
+ >connItem : number
+
+     constructor(c = x) {
+->c : import("foo")
+->x : import("foo")
++>c : import("./foo")
++>x : import("./foo")
+
+         this.connItem = c.item;
+ >this.connItem = c.item : number
+@@= skipped -9, +9 lines =@@
+ >this : this
+ >connItem : number
+ >c.item : number
+->c : import("foo")
++>c : import("./foo")
+ >item : number
+     }
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationMaps.types b/testdata/baselines/reference/submodule/compiler/declarationMaps.types
index 66bd23ef76..19bd2bcd06 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationMaps.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationMaps.types
@@ -21,21 +21,21 @@ module m2 {
 }
 
 var m2: {
->m2 : { (): import("declarationMaps").connectExport; test1: import("declarationMaps").connectModule; test2(): import("declarationMaps").connectModule; }
+>m2 : { (): import("./declarationMaps").connectExport; test1: import("./declarationMaps").connectModule; test2(): import("./declarationMaps").connectModule; }
 
     (): m2.connectExport;
 >m2 : any
 
     test1: m2.connectModule;
->test1 : import("declarationMaps").connectModule
+>test1 : import("./declarationMaps").connectModule
 >m2 : any
 
     test2(): m2.connectModule;
->test2 : () => import("declarationMaps").connectModule
+>test2 : () => import("./declarationMaps").connectModule
 >m2 : any
 
 };
 
 export = m2;
->m2 : { (): import("declarationMaps").connectExport; test1: import("declarationMaps").connectModule; test2(): import("declarationMaps").connectModule; }
+>m2 : { (): import("./declarationMaps").connectExport; test1: import("./declarationMaps").connectModule; test2(): import("./declarationMaps").connectModule; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationMaps.types.diff b/testdata/baselines/reference/submodule/compiler/declarationMaps.types.diff
index d5a056e9d1..662f2ef448 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationMaps.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationMaps.types.diff
@@ -5,23 +5,23 @@
 
  var m2: {
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declarationMaps").connectExport; test1: import("declarationMaps").connectModule; test2(): import("declarationMaps").connectModule; }
++>m2 : { (): import("./declarationMaps").connectExport; test1: import("./declarationMaps").connectModule; test2(): import("./declarationMaps").connectModule; }
 
      (): m2.connectExport;
  >m2 : any
 
      test1: m2.connectModule;
 ->test1 : m2.connectModule
-+>test1 : import("declarationMaps").connectModule
++>test1 : import("./declarationMaps").connectModule
  >m2 : any
 
      test2(): m2.connectModule;
 ->test2 : () => m2.connectModule
-+>test2 : () => import("declarationMaps").connectModule
++>test2 : () => import("./declarationMaps").connectModule
  >m2 : any
 
  };
 
  export = m2;
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declarationMaps").connectExport; test1: import("declarationMaps").connectModule; test2(): import("declarationMaps").connectModule; }
++>m2 : { (): import("./declarationMaps").connectExport; test1: import("./declarationMaps").connectModule; test2(): import("./declarationMaps").connectModule; }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationMapsWithoutDeclaration.types b/testdata/baselines/reference/submodule/compiler/declarationMapsWithoutDeclaration.types
index 8f5b218567..70686e6604 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationMapsWithoutDeclaration.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationMapsWithoutDeclaration.types
@@ -21,21 +21,21 @@ module m2 {
 }
 
 var m2: {
->m2 : { (): import("declarationMapsWithoutDeclaration").connectExport; test1: import("declarationMapsWithoutDeclaration").connectModule; test2(): import("declarationMapsWithoutDeclaration").connectModule; }
+>m2 : { (): import("./declarationMapsWithoutDeclaration").connectExport; test1: import("./declarationMapsWithoutDeclaration").connectModule; test2(): import("./declarationMapsWithoutDeclaration").connectModule; }
 
     (): m2.connectExport;
 >m2 : any
 
     test1: m2.connectModule;
->test1 : import("declarationMapsWithoutDeclaration").connectModule
+>test1 : import("./declarationMapsWithoutDeclaration").connectModule
 >m2 : any
 
     test2(): m2.connectModule;
->test2 : () => import("declarationMapsWithoutDeclaration").connectModule
+>test2 : () => import("./declarationMapsWithoutDeclaration").connectModule
 >m2 : any
 
 };
 
 export = m2;
->m2 : { (): import("declarationMapsWithoutDeclaration").connectExport; test1: import("declarationMapsWithoutDeclaration").connectModule; test2(): import("declarationMapsWithoutDeclaration").connectModule; }
+>m2 : { (): import("./declarationMapsWithoutDeclaration").connectExport; test1: import("./declarationMapsWithoutDeclaration").connectModule; test2(): import("./declarationMapsWithoutDeclaration").connectModule; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationMapsWithoutDeclaration.types.diff b/testdata/baselines/reference/submodule/compiler/declarationMapsWithoutDeclaration.types.diff
index 25d67824fb..d929242b8e 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationMapsWithoutDeclaration.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationMapsWithoutDeclaration.types.diff
@@ -5,23 +5,23 @@
 
  var m2: {
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declarationMapsWithoutDeclaration").connectExport; test1: import("declarationMapsWithoutDeclaration").connectModule; test2(): import("declarationMapsWithoutDeclaration").connectModule; }
++>m2 : { (): import("./declarationMapsWithoutDeclaration").connectExport; test1: import("./declarationMapsWithoutDeclaration").connectModule; test2(): import("./declarationMapsWithoutDeclaration").connectModule; }
 
      (): m2.connectExport;
  >m2 : any
 
      test1: m2.connectModule;
 ->test1 : m2.connectModule
-+>test1 : import("declarationMapsWithoutDeclaration").connectModule
++>test1 : import("./declarationMapsWithoutDeclaration").connectModule
  >m2 : any
 
      test2(): m2.connectModule;
 ->test2 : () => m2.connectModule
-+>test2 : () => import("declarationMapsWithoutDeclaration").connectModule
++>test2 : () => import("./declarationMapsWithoutDeclaration").connectModule
  >m2 : any
 
  };
 
  export = m2;
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declarationMapsWithoutDeclaration").connectExport; test1: import("declarationMapsWithoutDeclaration").connectModule; test2(): import("declarationMapsWithoutDeclaration").connectModule; }
++>m2 : { (): import("./declarationMapsWithoutDeclaration").connectExport; test1: import("./declarationMapsWithoutDeclaration").connectModule; test2(): import("./declarationMapsWithoutDeclaration").connectModule; }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationsForInferredTypeFromOtherFile.types b/testdata/baselines/reference/submodule/compiler/declarationsForInferredTypeFromOtherFile.types
index 2736ed533c..24472227a9 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationsForInferredTypeFromOtherFile.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationsForInferredTypeFromOtherFile.types
@@ -6,20 +6,20 @@ export class Foo {}
 
 === file2.ts ===
 export function foo(): import("./file1").Foo {
->foo : () => import("file1").Foo
+>foo : () => import("./file1").Foo
 
     return null as any;
 >null as any : any
 }
 === file3.ts ===
 import {foo} from "./file2";
->foo : () => import("file1").Foo
+>foo : () => import("./file1").Foo
 
 export function bar() {
->bar : () => import("file1").Foo
+>bar : () => import("./file1").Foo
 
     return foo();
->foo() : import("file1").Foo
->foo : () => import("file1").Foo
+>foo() : import("./file1").Foo
+>foo : () => import("./file1").Foo
 }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationsForInferredTypeFromOtherFile.types.diff b/testdata/baselines/reference/submodule/compiler/declarationsForInferredTypeFromOtherFile.types.diff
index 703b9898d6..2cbc25e4e0 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationsForInferredTypeFromOtherFile.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationsForInferredTypeFromOtherFile.types.diff
@@ -1,11 +1,19 @@
 --- old.declarationsForInferredTypeFromOtherFile.types
 +++ new.declarationsForInferredTypeFromOtherFile.types
-@@= skipped -5, +5 lines =@@
+@@= skipped -12, +12 lines =@@
+ }
+ === file3.ts ===
+ import {foo} from "./file2";
+->foo : () => import("file1").Foo
++>foo : () => import("./file1").Foo
 
- === file2.ts ===
- export function foo(): import("./file1").Foo {
-->foo : () => import("./file1").Foo
-+>foo : () => import("file1").Foo
+ export function bar() {
+->bar : () => import("file1").Foo
++>bar : () => import("./file1").Foo
 
-     return null as any;
- >null as any : any
\ No newline at end of file
+     return foo();
+->foo() : import("file1").Foo
+->foo : () => import("file1").Foo
++>foo() : import("./file1").Foo
++>foo : () => import("./file1").Foo
+ }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.types b/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.types
index 495ec3483b..e4078a07ad 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.types
@@ -20,7 +20,7 @@ export const Ctor: CtorConstructor;
 
 === node_modules/mod/index.d.ts ===
 import { Ctor } from "./ctor";
->Ctor : import("node_modules/mod/ctor").CtorConstructor
+>Ctor : import("./ctor").CtorConstructor
 
 export default Ctor;
 >Ctor : Ctor
@@ -30,17 +30,17 @@ import * as ns from "mod";
 >ns : typeof ns
 
 const Ctor = ns.default;
->Ctor : import("node_modules/mod/ctor").CtorConstructor
->ns.default : import("node_modules/mod/ctor").CtorConstructor
+>Ctor : import("mod").CtorConstructor
+>ns.default : import("mod").CtorConstructor
 >ns : typeof ns
->default : import("node_modules/mod/ctor").CtorConstructor
+>default : import("mod").CtorConstructor
 
 export const MyComp = Ctor.extends({foo: "bar"});
->MyComp : import("node_modules/mod/ctor").ExtendedCtor<import("node_modules/mod/ctor").Ctor>
->Ctor.extends({foo: "bar"}) : import("node_modules/mod/ctor").ExtendedCtor<import("node_modules/mod/ctor").Ctor>
->Ctor.extends : <T>(x: T) => import("node_modules/mod/ctor").ExtendedCtor<T extends unknown ? import("node_modules/mod/ctor").Ctor : undefined>
->Ctor : import("node_modules/mod/ctor").CtorConstructor
->extends : <T>(x: T) => import("node_modules/mod/ctor").ExtendedCtor<T extends unknown ? import("node_modules/mod/ctor").Ctor : undefined>
+>MyComp : import("mod").ExtendedCtor<import("mod").Ctor>
+>Ctor.extends({foo: "bar"}) : import("mod").ExtendedCtor<import("mod").Ctor>
+>Ctor.extends : <T>(x: T) => import("mod").ExtendedCtor<T extends unknown ? import("mod").Ctor : undefined>
+>Ctor : import("mod").CtorConstructor
+>extends : <T>(x: T) => import("mod").ExtendedCtor<T extends unknown ? import("mod").Ctor : undefined>
 >{foo: "bar"} : { foo: string; }
 >foo : string
 >"bar" : "bar"
diff --git a/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.types.diff b/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.types.diff
new file mode 100644
index 0000000000..2d2ae7b056
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.types.diff
@@ -0,0 +1,37 @@
+--- old.declarationsIndirectGeneratedAliasReference.types
++++ new.declarationsIndirectGeneratedAliasReference.types
+@@= skipped -19, +19 lines =@@
+
+ === node_modules/mod/index.d.ts ===
+ import { Ctor } from "./ctor";
+->Ctor : import("node_modules/mod/ctor").CtorConstructor
++>Ctor : import("./ctor").CtorConstructor
+
+ export default Ctor;
+ >Ctor : Ctor
+@@= skipped -10, +10 lines =@@
+ >ns : typeof ns
+
+ const Ctor = ns.default;
+->Ctor : import("node_modules/mod/ctor").CtorConstructor
+->ns.default : import("node_modules/mod/ctor").CtorConstructor
++>Ctor : import("mod").CtorConstructor
++>ns.default : import("mod").CtorConstructor
+ >ns : typeof ns
+->default : import("node_modules/mod/ctor").CtorConstructor
++>default : import("mod").CtorConstructor
+
+ export const MyComp = Ctor.extends({foo: "bar"});
+->MyComp : import("node_modules/mod/ctor").ExtendedCtor<import("node_modules/mod/ctor").Ctor>
+->Ctor.extends({foo: "bar"}) : import("node_modules/mod/ctor").ExtendedCtor<import("node_modules/mod/ctor").Ctor>
+->Ctor.extends : <T>(x: T) => import("node_modules/mod/ctor").ExtendedCtor<T extends unknown ? import("node_modules/mod/ctor").Ctor : undefined>
+->Ctor : import("node_modules/mod/ctor").CtorConstructor
+->extends : <T>(x: T) => import("node_modules/mod/ctor").ExtendedCtor<T extends unknown ? import("node_modules/mod/ctor").Ctor : undefined>
++>MyComp : import("mod").ExtendedCtor<import("mod").Ctor>
++>Ctor.extends({foo: "bar"}) : import("mod").ExtendedCtor<import("mod").Ctor>
++>Ctor.extends : <T>(x: T) => import("mod").ExtendedCtor<T extends unknown ? import("mod").Ctor : undefined>
++>Ctor : import("mod").CtorConstructor
++>extends : <T>(x: T) => import("mod").ExtendedCtor<T extends unknown ? import("mod").Ctor : undefined>
+ >{foo: "bar"} : { foo: string; }
+ >foo : string
+ >"bar" : "bar"
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declareFileExportAssignment.types b/testdata/baselines/reference/submodule/compiler/declareFileExportAssignment.types
index edd56b955d..e2edc88bc5 100644
--- a/testdata/baselines/reference/submodule/compiler/declareFileExportAssignment.types
+++ b/testdata/baselines/reference/submodule/compiler/declareFileExportAssignment.types
@@ -21,21 +21,21 @@ module m2 {
 }
 
 var m2: {
->m2 : { (): import("declareFileExportAssignment").connectExport; test1: import("declareFileExportAssignment").connectModule; test2(): import("declareFileExportAssignment").connectModule; }
+>m2 : { (): import("./declareFileExportAssignment").connectExport; test1: import("./declareFileExportAssignment").connectModule; test2(): import("./declareFileExportAssignment").connectModule; }
 
     (): m2.connectExport;
 >m2 : any
 
     test1: m2.connectModule;
->test1 : import("declareFileExportAssignment").connectModule
+>test1 : import("./declareFileExportAssignment").connectModule
 >m2 : any
 
     test2(): m2.connectModule;
->test2 : () => import("declareFileExportAssignment").connectModule
+>test2 : () => import("./declareFileExportAssignment").connectModule
 >m2 : any
 
 };
 
 export = m2;
->m2 : { (): import("declareFileExportAssignment").connectExport; test1: import("declareFileExportAssignment").connectModule; test2(): import("declareFileExportAssignment").connectModule; }
+>m2 : { (): import("./declareFileExportAssignment").connectExport; test1: import("./declareFileExportAssignment").connectModule; test2(): import("./declareFileExportAssignment").connectModule; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declareFileExportAssignment.types.diff b/testdata/baselines/reference/submodule/compiler/declareFileExportAssignment.types.diff
index 1ab67aa071..e358da334e 100644
--- a/testdata/baselines/reference/submodule/compiler/declareFileExportAssignment.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declareFileExportAssignment.types.diff
@@ -5,23 +5,23 @@
 
  var m2: {
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declareFileExportAssignment").connectExport; test1: import("declareFileExportAssignment").connectModule; test2(): import("declareFileExportAssignment").connectModule; }
++>m2 : { (): import("./declareFileExportAssignment").connectExport; test1: import("./declareFileExportAssignment").connectModule; test2(): import("./declareFileExportAssignment").connectModule; }
 
      (): m2.connectExport;
  >m2 : any
 
      test1: m2.connectModule;
 ->test1 : m2.connectModule
-+>test1 : import("declareFileExportAssignment").connectModule
++>test1 : import("./declareFileExportAssignment").connectModule
  >m2 : any
 
      test2(): m2.connectModule;
 ->test2 : () => m2.connectModule
-+>test2 : () => import("declareFileExportAssignment").connectModule
++>test2 : () => import("./declareFileExportAssignment").connectModule
  >m2 : any
 
  };
 
  export = m2;
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declareFileExportAssignment").connectExport; test1: import("declareFileExportAssignment").connectModule; test2(): import("declareFileExportAssignment").connectModule; }
++>m2 : { (): import("./declareFileExportAssignment").connectExport; test1: import("./declareFileExportAssignment").connectModule; test2(): import("./declareFileExportAssignment").connectModule; }
diff --git a/testdata/baselines/reference/submodule/compiler/declareFileExportAssignmentWithVarFromVariableStatement.types b/testdata/baselines/reference/submodule/compiler/declareFileExportAssignmentWithVarFromVariableStatement.types
index 55e22b666c..1b8d6d60ce 100644
--- a/testdata/baselines/reference/submodule/compiler/declareFileExportAssignmentWithVarFromVariableStatement.types
+++ b/testdata/baselines/reference/submodule/compiler/declareFileExportAssignmentWithVarFromVariableStatement.types
@@ -23,21 +23,21 @@ module m2 {
 var x = 10, m2: {
 >x : number
 >10 : 10
->m2 : { (): import("declareFileExportAssignmentWithVarFromVariableStatement").connectExport; test1: import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule; test2(): import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule; }
+>m2 : { (): import("./declareFileExportAssignmentWithVarFromVariableStatement").connectExport; test1: import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule; test2(): import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule; }
 
     (): m2.connectExport;
 >m2 : any
 
     test1: m2.connectModule;
->test1 : import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule
+>test1 : import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule
 >m2 : any
 
     test2(): m2.connectModule;
->test2 : () => import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule
+>test2 : () => import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule
 >m2 : any
 
 };
 
 export = m2;
->m2 : { (): import("declareFileExportAssignmentWithVarFromVariableStatement").connectExport; test1: import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule; test2(): import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule; }
+>m2 : { (): import("./declareFileExportAssignmentWithVarFromVariableStatement").connectExport; test1: import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule; test2(): import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declareFileExportAssignmentWithVarFromVariableStatement.types.diff b/testdata/baselines/reference/submodule/compiler/declareFileExportAssignmentWithVarFromVariableStatement.types.diff
index 52cc7dac7d..92f4f8579e 100644
--- a/testdata/baselines/reference/submodule/compiler/declareFileExportAssignmentWithVarFromVariableStatement.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declareFileExportAssignmentWithVarFromVariableStatement.types.diff
@@ -5,23 +5,23 @@
  >x : number
  >10 : 10
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declareFileExportAssignmentWithVarFromVariableStatement").connectExport; test1: import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule; test2(): import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule; }
++>m2 : { (): import("./declareFileExportAssignmentWithVarFromVariableStatement").connectExport; test1: import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule; test2(): import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule; }
 
      (): m2.connectExport;
  >m2 : any
 
      test1: m2.connectModule;
 ->test1 : m2.connectModule
-+>test1 : import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule
++>test1 : import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule
  >m2 : any
 
      test2(): m2.connectModule;
 ->test2 : () => m2.connectModule
-+>test2 : () => import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule
++>test2 : () => import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule
  >m2 : any
 
  };
 
  export = m2;
 ->m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
-+>m2 : { (): import("declareFileExportAssignmentWithVarFromVariableStatement").connectExport; test1: import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule; test2(): import("declareFileExportAssignmentWithVarFromVariableStatement").connectModule; }
++>m2 : { (): import("./declareFileExportAssignmentWithVarFromVariableStatement").connectExport; test1: import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule; test2(): import("./declareFileExportAssignmentWithVarFromVariableStatement").connectModule; }
diff --git a/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.symbols b/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.symbols
index a7521f1994..8f732ccca2 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.symbols
+++ b/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.symbols
@@ -8,14 +8,14 @@ export const x = 0;
 export {};
 
 declare module "./a" {
->"./a" : Symbol("/dir/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10), Decl(b.ts, 4, 1))
+>"./a" : Symbol("./a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10), Decl(b.ts, 4, 1))
 
     export const x = 0;
 >x : Symbol(x, Decl(b.ts, 3, 16))
 }
 
 declare module "../dir/a" {
->"../dir/a" : Symbol("/dir/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10), Decl(b.ts, 4, 1))
+>"../dir/a" : Symbol("./a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10), Decl(b.ts, 4, 1))
 
     export const x = 0;
 >x : Symbol(x, Decl(b.ts, 7, 16))
diff --git a/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.symbols.diff b/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.symbols.diff
new file mode 100644
index 0000000000..95d4b454c2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.symbols.diff
@@ -0,0 +1,19 @@
+--- old.duplicateIdentifierRelatedSpans_moduleAugmentation.symbols
++++ new.duplicateIdentifierRelatedSpans_moduleAugmentation.symbols
+@@= skipped -7, +7 lines =@@
+ export {};
+
+ declare module "./a" {
+->"./a" : Symbol("/dir/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10), Decl(b.ts, 4, 1))
++>"./a" : Symbol("./a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10), Decl(b.ts, 4, 1))
+
+     export const x = 0;
+ >x : Symbol(x, Decl(b.ts, 3, 16))
+ }
+
+ declare module "../dir/a" {
+->"../dir/a" : Symbol("/dir/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10), Decl(b.ts, 4, 1))
++>"../dir/a" : Symbol("./a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10), Decl(b.ts, 4, 1))
+
+     export const x = 0;
+ >x : Symbol(x, Decl(b.ts, 7, 16))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.types b/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.types
index d9eaf07761..d91d97ca79 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.types
+++ b/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.types
@@ -9,7 +9,7 @@ export const x = 0;
 export {};
 
 declare module "./a" {
->"./a" : typeof import("/dir/a")
+>"./a" : typeof import("./a")
 
     export const x = 0;
 >x : 0
@@ -17,7 +17,7 @@ declare module "./a" {
 }
 
 declare module "../dir/a" {
->"../dir/a" : typeof import("/dir/a")
+>"../dir/a" : typeof import("./a")
 
     export const x = 0;
 >x : 0
diff --git a/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.types.diff b/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.types.diff
new file mode 100644
index 0000000000..0d2e19b1e1
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/duplicateIdentifierRelatedSpans_moduleAugmentation.types.diff
@@ -0,0 +1,20 @@
+--- old.duplicateIdentifierRelatedSpans_moduleAugmentation.types
++++ new.duplicateIdentifierRelatedSpans_moduleAugmentation.types
+@@= skipped -8, +8 lines =@@
+ export {};
+
+ declare module "./a" {
+->"./a" : typeof import("/dir/a")
++>"./a" : typeof import("./a")
+
+     export const x = 0;
+ >x : 0
+@@= skipped -8, +8 lines =@@
+ }
+
+ declare module "../dir/a" {
+->"../dir/a" : typeof import("/dir/a")
++>"../dir/a" : typeof import("./a")
+
+     export const x = 0;
+ >x : 0
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage.types b/testdata/baselines/reference/submodule/compiler/duplicatePackage.types
index 77b1ce24d1..950d3d77e8 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage.types
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage.types
@@ -2,23 +2,23 @@
 
 === /src/a.ts ===
 import { a } from "a";
->a : (x: import("/node_modules/a/node_modules/x/index").default) => void
+>a : (x: import("a/node_modules/x").default) => void
 
 import { b } from "b";
 >b : X
 
 import { c } from "c";
->c : import("/node_modules/c/node_modules/x/index").default
+>c : import("c/node_modules/x").default
 
 a(b); // Works
 >a(b) : void
->a : (x: import("/node_modules/a/node_modules/x/index").default) => void
+>a : (x: import("a/node_modules/x").default) => void
 >b : X
 
 a(c); // Error, these are from different versions of the library.
 >a(c) : void
->a : (x: import("/node_modules/a/node_modules/x/index").default) => void
->c : import("/node_modules/c/node_modules/x/index").default
+>a : (x: import("a/node_modules/x").default) => void
+>c : import("c/node_modules/x").default
 
 === /node_modules/a/index.d.ts ===
 import X from "x";
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage.types.diff b/testdata/baselines/reference/submodule/compiler/duplicatePackage.types.diff
index 6dcafc5f6d..5a10c34f68 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage.types.diff
@@ -1,24 +1,37 @@
 --- old.duplicatePackage.types
 +++ new.duplicatePackage.types
-@@= skipped -4, +4 lines =@@
- >a : (x: import("/node_modules/a/node_modules/x/index").default) => void
+@@= skipped -1, +1 lines =@@
+
+ === /src/a.ts ===
+ import { a } from "a";
+->a : (x: import("/node_modules/a/node_modules/x/index").default) => void
++>a : (x: import("a/node_modules/x").default) => void
 
  import { b } from "b";
 ->b : import("/node_modules/a/node_modules/x/index").default
 +>b : X
 
  import { c } from "c";
- >c : import("/node_modules/c/node_modules/x/index").default
-@@= skipped -8, +8 lines =@@
+->c : import("/node_modules/c/node_modules/x/index").default
++>c : import("c/node_modules/x").default
+
  a(b); // Works
  >a(b) : void
- >a : (x: import("/node_modules/a/node_modules/x/index").default) => void
+->a : (x: import("/node_modules/a/node_modules/x/index").default) => void
 ->b : import("/node_modules/a/node_modules/x/index").default
++>a : (x: import("a/node_modules/x").default) => void
 +>b : X
 
  a(c); // Error, these are from different versions of the library.
  >a(c) : void
-@@= skipped -25, +25 lines =@@
+->a : (x: import("/node_modules/a/node_modules/x/index").default) => void
+->c : import("/node_modules/c/node_modules/x/index").default
++>a : (x: import("a/node_modules/x").default) => void
++>c : import("c/node_modules/x").default
+
+ === /node_modules/a/index.d.ts ===
+ import X from "x";
+@@= skipped -36, +36 lines =@@
 
  === /node_modules/b/index.d.ts ===
  import X from "x";
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.types b/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.types
index ac9be73082..15b88929f8 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.types
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.types
@@ -9,9 +9,9 @@ import { Foo } from "foo";
 
 let foo: Foo = a.foo;
 >foo : Foo
->a.foo : import("/node_modules/a/node_modules/foo/index").Foo
+>a.foo : import("a/node_modules/foo").Foo
 >a : typeof a
->foo : import("/node_modules/a/node_modules/foo/index").Foo
+>foo : import("a/node_modules/foo").Foo
 
 === /node_modules/a/index.d.ts ===
 /// <reference types="foo" />
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.types.diff b/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.types.diff
index 80ed49bf27..3439870a59 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.types.diff
@@ -5,10 +5,10 @@
  let foo: Foo = a.foo;
  >foo : Foo
 ->a.foo : Foo
-+>a.foo : import("/node_modules/a/node_modules/foo/index").Foo
++>a.foo : import("a/node_modules/foo").Foo
  >a : typeof a
 ->foo : Foo
-+>foo : import("/node_modules/a/node_modules/foo/index").Foo
++>foo : import("a/node_modules/foo").Foo
 
  === /node_modules/a/index.d.ts ===
  /// <reference types="foo" />
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.types b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.types
index 75d6b524f4..a4b7cb3b37 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.types
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.types
@@ -2,15 +2,15 @@
 
 === /index.ts ===
 import { use } from "foo/use";
->use : (o: import("/node_modules/foo/index").C) => void
+>use : (o: import("foo").C) => void
 
 import { o } from "a";
->o : import("/node_modules/a/node_modules/foo/index").C
+>o : import("a/node_modules/foo").C
 
 use(o);
 >use(o) : void
->use : (o: import("/node_modules/foo/index").C) => void
->o : import("/node_modules/a/node_modules/foo/index").C
+>use : (o: import("foo").C) => void
+>o : import("a/node_modules/foo").C
 
 === /node_modules/a/node_modules/foo/index.d.ts ===
 export class C {
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.types.diff b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.types.diff
index bd4b5c7d10..1910cdd444 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.types.diff
@@ -1,17 +1,22 @@
 --- old.duplicatePackage_relativeImportWithinPackage.types
 +++ new.duplicatePackage_relativeImportWithinPackage.types
-@@= skipped -4, +4 lines =@@
- >use : (o: import("/node_modules/foo/index").C) => void
+@@= skipped -1, +1 lines =@@
+
+ === /index.ts ===
+ import { use } from "foo/use";
+->use : (o: import("/node_modules/foo/index").C) => void
++>use : (o: import("foo").C) => void
 
  import { o } from "a";
 ->o : import("/node_modules/foo/index").C
-+>o : import("/node_modules/a/node_modules/foo/index").C
++>o : import("a/node_modules/foo").C
 
  use(o);
  >use(o) : void
- >use : (o: import("/node_modules/foo/index").C) => void
+->use : (o: import("/node_modules/foo/index").C) => void
 ->o : import("/node_modules/foo/index").C
-+>o : import("/node_modules/a/node_modules/foo/index").C
++>use : (o: import("foo").C) => void
++>o : import("a/node_modules/foo").C
 
  === /node_modules/a/node_modules/foo/index.d.ts ===
  export class C {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.types b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.types
index 8fa6f0c879..f42af79ed6 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.types
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.types
@@ -2,15 +2,15 @@
 
 === /index.ts ===
 import { use } from "@foo/bar/use";
->use : (o: import("/node_modules/@foo/bar/index").C) => void
+>use : (o: import("@foo/bar").C) => void
 
 import { o } from "a";
->o : import("/node_modules/a/node_modules/@foo/bar/index").C
+>o : import("a/node_modules/@foo/bar").C
 
 use(o);
 >use(o) : void
->use : (o: import("/node_modules/@foo/bar/index").C) => void
->o : import("/node_modules/a/node_modules/@foo/bar/index").C
+>use : (o: import("@foo/bar").C) => void
+>o : import("a/node_modules/@foo/bar").C
 
 === /node_modules/a/node_modules/@foo/bar/index.d.ts ===
 export class C {
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.types.diff b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.types.diff
index 61dace3bcc..5dabf053f6 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.types.diff
@@ -1,17 +1,22 @@
 --- old.duplicatePackage_relativeImportWithinPackage_scoped.types
 +++ new.duplicatePackage_relativeImportWithinPackage_scoped.types
-@@= skipped -4, +4 lines =@@
- >use : (o: import("/node_modules/@foo/bar/index").C) => void
+@@= skipped -1, +1 lines =@@
+
+ === /index.ts ===
+ import { use } from "@foo/bar/use";
+->use : (o: import("/node_modules/@foo/bar/index").C) => void
++>use : (o: import("@foo/bar").C) => void
 
  import { o } from "a";
 ->o : import("/node_modules/@foo/bar/index").C
-+>o : import("/node_modules/a/node_modules/@foo/bar/index").C
++>o : import("a/node_modules/@foo/bar").C
 
  use(o);
  >use(o) : void
- >use : (o: import("/node_modules/@foo/bar/index").C) => void
+->use : (o: import("/node_modules/@foo/bar/index").C) => void
 ->o : import("/node_modules/@foo/bar/index").C
-+>o : import("/node_modules/a/node_modules/@foo/bar/index").C
++>use : (o: import("@foo/bar").C) => void
++>o : import("a/node_modules/@foo/bar").C
 
  === /node_modules/a/node_modules/@foo/bar/index.d.ts ===
  export class C {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types
index 7767de1d94..8574e5f1d2 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types
@@ -9,9 +9,9 @@ import * as a from "a";
 
 const o: Foo = a.o;
 >o : Foo
->a.o : import("/node_modules/a/node_modules/foo/Foo").default
+>a.o : import("a/node_modules/foo/Foo").default
 >a : typeof a
->o : import("/node_modules/a/node_modules/foo/Foo").default
+>o : import("a/node_modules/foo/Foo").default
 
 === /node_modules/a/index.d.ts ===
 import Foo from "foo/Foo";
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types.diff b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types.diff
index 25738a74af..e84a0b8231 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types.diff
@@ -5,10 +5,10 @@
  const o: Foo = a.o;
  >o : Foo
 ->a.o : Foo
-+>a.o : import("/node_modules/a/node_modules/foo/Foo").default
++>a.o : import("a/node_modules/foo/Foo").default
  >a : typeof a
 ->o : Foo
-+>o : import("/node_modules/a/node_modules/foo/Foo").default
++>o : import("a/node_modules/foo/Foo").default
 
  === /node_modules/a/index.d.ts ===
  import Foo from "foo/Foo";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.symbols b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.symbols
index 6c9878c3b1..0e3e1f429c 100644
--- a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.symbols
+++ b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.symbols
@@ -24,14 +24,14 @@ export const mod = await (async () => {
 
     case 0:
       return await import("./case0.js");
->"./case0.js" : Symbol("/case0", Decl(case0.ts, 0, 0))
+>"./case0.js" : Symbol("./case0.js", Decl(case0.ts, 0, 0))
 
     case 1:
       return await import("./case1.js");
->"./case1.js" : Symbol("/case1", Decl(case1.ts, 0, 0))
+>"./case1.js" : Symbol("./case1.js", Decl(case1.ts, 0, 0))
 
     default:
       return await import("./caseFallback.js");
->"./caseFallback.js" : Symbol("/caseFallback", Decl(caseFallback.ts, 0, 0))
+>"./caseFallback.js" : Symbol("./caseFallback.js", Decl(caseFallback.ts, 0, 0))
   }
 })();
diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.symbols.diff b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.symbols.diff
new file mode 100644
index 0000000000..0cbebdbad4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.symbols.diff
@@ -0,0 +1,20 @@
+--- old.dynamicImportsDeclaration.symbols
++++ new.dynamicImportsDeclaration.symbols
+@@= skipped -23, +23 lines =@@
+
+     case 0:
+       return await import("./case0.js");
+->"./case0.js" : Symbol("/case0", Decl(case0.ts, 0, 0))
++>"./case0.js" : Symbol("./case0.js", Decl(case0.ts, 0, 0))
+
+     case 1:
+       return await import("./case1.js");
+->"./case1.js" : Symbol("/case1", Decl(case1.ts, 0, 0))
++>"./case1.js" : Symbol("./case1.js", Decl(case1.ts, 0, 0))
+
+     default:
+       return await import("./caseFallback.js");
+->"./caseFallback.js" : Symbol("/caseFallback", Decl(caseFallback.ts, 0, 0))
++>"./caseFallback.js" : Symbol("./caseFallback.js", Decl(caseFallback.ts, 0, 0))
+   }
+ })();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.types b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.types
index c1ba031243..65472a1185 100644
--- a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.types
+++ b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.types
@@ -14,11 +14,11 @@ export default 'fallback';
 
 === /index.ts ===
 export const mod = await (async () => {
->mod : { default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }
->await (async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }})() : { default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }
->(async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }})() : Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }>
->(async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }}) : () => Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }>
->async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }} : () => Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }>
+>mod : { default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }
+>await (async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }})() : { default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }
+>(async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }})() : Promise<{ default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }>
+>(async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }}) : () => Promise<{ default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }>
+>async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }} : () => Promise<{ default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }>
 
   const x: number = 0;
 >x : number
@@ -31,22 +31,22 @@ export const mod = await (async () => {
 >0 : 0
 
       return await import("./case0.js");
->await import("./case0.js") : { default: typeof import("/case0"); }
->import("./case0.js") : Promise<{ default: typeof import("/case0"); }>
+>await import("./case0.js") : { default: typeof import("./case0.js"); }
+>import("./case0.js") : Promise<{ default: typeof import("./case0.js"); }>
 >"./case0.js" : "./case0.js"
 
     case 1:
 >1 : 1
 
       return await import("./case1.js");
->await import("./case1.js") : { default: typeof import("/case1"); }
->import("./case1.js") : Promise<{ default: typeof import("/case1"); }>
+>await import("./case1.js") : { default: typeof import("./case1.js"); }
+>import("./case1.js") : Promise<{ default: typeof import("./case1.js"); }>
 >"./case1.js" : "./case1.js"
 
     default:
       return await import("./caseFallback.js");
->await import("./caseFallback.js") : { default: typeof import("/caseFallback"); }
->import("./caseFallback.js") : Promise<{ default: typeof import("/caseFallback"); }>
+>await import("./caseFallback.js") : { default: typeof import("./caseFallback.js"); }
+>import("./caseFallback.js") : Promise<{ default: typeof import("./caseFallback.js"); }>
 >"./caseFallback.js" : "./caseFallback.js"
   }
 })();
diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.types.diff b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.types.diff
new file mode 100644
index 0000000000..71dcd79762
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.types.diff
@@ -0,0 +1,48 @@
+--- old.dynamicImportsDeclaration.types
++++ new.dynamicImportsDeclaration.types
+@@= skipped -13, +13 lines =@@
+
+ === /index.ts ===
+ export const mod = await (async () => {
+->mod : { default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }
+->await (async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }})() : { default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }
+->(async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }})() : Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }>
+->(async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }}) : () => Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }>
+->async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }} : () => Promise<{ default: typeof import("/case0"); } | { default: typeof import("/case1"); } | { default: typeof import("/caseFallback"); }>
++>mod : { default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }
++>await (async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }})() : { default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }
++>(async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }})() : Promise<{ default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }>
++>(async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }}) : () => Promise<{ default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }>
++>async () => {  const x: number = 0;  switch (x) {    case 0:      return await import("./case0.js");    case 1:      return await import("./case1.js");    default:      return await import("./caseFallback.js");  }} : () => Promise<{ default: typeof import("./case0.js"); } | { default: typeof import("./case1.js"); } | { default: typeof import("./caseFallback.js"); }>
+
+   const x: number = 0;
+ >x : number
+@@= skipped -17, +17 lines =@@
+ >0 : 0
+
+       return await import("./case0.js");
+->await import("./case0.js") : { default: typeof import("/case0"); }
+->import("./case0.js") : Promise<{ default: typeof import("/case0"); }>
++>await import("./case0.js") : { default: typeof import("./case0.js"); }
++>import("./case0.js") : Promise<{ default: typeof import("./case0.js"); }>
+ >"./case0.js" : "./case0.js"
+
+     case 1:
+ >1 : 1
+
+       return await import("./case1.js");
+->await import("./case1.js") : { default: typeof import("/case1"); }
+->import("./case1.js") : Promise<{ default: typeof import("/case1"); }>
++>await import("./case1.js") : { default: typeof import("./case1.js"); }
++>import("./case1.js") : Promise<{ default: typeof import("./case1.js"); }>
+ >"./case1.js" : "./case1.js"
+
+     default:
+       return await import("./caseFallback.js");
+->await import("./caseFallback.js") : { default: typeof import("/caseFallback"); }
+->import("./caseFallback.js") : Promise<{ default: typeof import("/caseFallback"); }>
++>await import("./caseFallback.js") : { default: typeof import("./caseFallback.js"); }
++>import("./caseFallback.js") : Promise<{ default: typeof import("./caseFallback.js"); }>
+ >"./caseFallback.js" : "./caseFallback.js"
+   }
+ })();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols b/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
index 80be37a2c3..24de67c6c3 100644
--- a/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
+++ b/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
@@ -4,7 +4,7 @@
 const _item = require("./namespacer");
 >_item : Symbol(_item, Decl(index.js, 0, 5))
 >require : Symbol(require)
->"./namespacer" : Symbol("namespacer", Decl(namespacer.js, 0, 0))
+>"./namespacer" : Symbol("./namespacer", Decl(namespacer.js, 0, 0))
 
 module.exports = 12;
 >module.exports : Symbol(export=, Decl(index.js, 0, 38))
diff --git a/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols.diff b/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols.diff
index b61e4fb453..04c0a07b6d 100644
--- a/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols.diff
@@ -1,7 +1,11 @@
 --- old.ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
 +++ new.ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
-@@= skipped -6, +6 lines =@@
- >"./namespacer" : Symbol("namespacer", Decl(namespacer.js, 0, 0))
+@@= skipped -3, +3 lines =@@
+ const _item = require("./namespacer");
+ >_item : Symbol(_item, Decl(index.js, 0, 5))
+ >require : Symbol(require)
+->"./namespacer" : Symbol("namespacer", Decl(namespacer.js, 0, 0))
++>"./namespacer" : Symbol("./namespacer", Decl(namespacer.js, 0, 0))
 
  module.exports = 12;
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/enumAssignmentCompat6.types b/testdata/baselines/reference/submodule/compiler/enumAssignmentCompat6.types
index 4c2ed064f2..badc7efb91 100644
--- a/testdata/baselines/reference/submodule/compiler/enumAssignmentCompat6.types
+++ b/testdata/baselines/reference/submodule/compiler/enumAssignmentCompat6.types
@@ -203,12 +203,12 @@ export let x: DiagnosticCategory;
 
         x = y;
 >x = y : DiagnosticCategory
->x : import("f").DiagnosticCategory
+>x : import("./f").DiagnosticCategory
 >y : DiagnosticCategory
 
         y = x;
->y = x : import("f").DiagnosticCategory
+>y = x : import("./f").DiagnosticCategory
 >y : DiagnosticCategory
->x : import("f").DiagnosticCategory
+>x : import("./f").DiagnosticCategory
     }
 })()
diff --git a/testdata/baselines/reference/submodule/compiler/enumAssignmentCompat6.types.diff b/testdata/baselines/reference/submodule/compiler/enumAssignmentCompat6.types.diff
new file mode 100644
index 0000000000..9e543534df
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/enumAssignmentCompat6.types.diff
@@ -0,0 +1,18 @@
+--- old.enumAssignmentCompat6.types
++++ new.enumAssignmentCompat6.types
+@@= skipped -202, +202 lines =@@
+
+         x = y;
+ >x = y : DiagnosticCategory
+->x : import("f").DiagnosticCategory
++>x : import("./f").DiagnosticCategory
+ >y : DiagnosticCategory
+
+         y = x;
+->y = x : import("f").DiagnosticCategory
++>y = x : import("./f").DiagnosticCategory
+ >y : DiagnosticCategory
+->x : import("f").DiagnosticCategory
++>x : import("./f").DiagnosticCategory
+     }
+ })()
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.symbols b/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.symbols
index 772be4d39f..a58befee68 100644
--- a/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.symbols
+++ b/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.symbols
@@ -8,5 +8,5 @@ export = x;
 >x : Symbol(x, Decl(a.ts, 0, 10))
 
 import("./a");
->"./a" : Symbol("/a", Decl(a.ts, 0, 0))
+>"./a" : Symbol("./a", Decl(a.ts, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.symbols.diff b/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.symbols.diff
new file mode 100644
index 0000000000..bfdc48e26a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.symbols.diff
@@ -0,0 +1,8 @@
+--- old.errorForConflictingExportEqualsValue.symbols
++++ new.errorForConflictingExportEqualsValue.symbols
+@@= skipped -7, +7 lines =@@
+ >x : Symbol(x, Decl(a.ts, 0, 10))
+
+ import("./a");
+->"./a" : Symbol("/a", Decl(a.ts, 0, 0))
++>"./a" : Symbol("./a", Decl(a.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/es5ExportEqualsDts.types b/testdata/baselines/reference/submodule/compiler/es5ExportEqualsDts.types
index df3a05d0ab..b714932212 100644
--- a/testdata/baselines/reference/submodule/compiler/es5ExportEqualsDts.types
+++ b/testdata/baselines/reference/submodule/compiler/es5ExportEqualsDts.types
@@ -5,14 +5,14 @@ class A {
 >A : A
 
     foo() {
->foo : () => import("es5ExportEqualsDts").B
+>foo : () => import("./es5ExportEqualsDts").B
 
         var aVal: A.B;
->aVal : import("es5ExportEqualsDts").B
+>aVal : import("./es5ExportEqualsDts").B
 >A : any
 
         return aVal;
->aVal : import("es5ExportEqualsDts").B
+>aVal : import("./es5ExportEqualsDts").B
     }
 }
 
diff --git a/testdata/baselines/reference/submodule/compiler/es5ExportEqualsDts.types.diff b/testdata/baselines/reference/submodule/compiler/es5ExportEqualsDts.types.diff
index 58685f6a2d..5be4676d2b 100644
--- a/testdata/baselines/reference/submodule/compiler/es5ExportEqualsDts.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/es5ExportEqualsDts.types.diff
@@ -5,15 +5,15 @@
 
      foo() {
 ->foo : () => A.B
-+>foo : () => import("es5ExportEqualsDts").B
++>foo : () => import("./es5ExportEqualsDts").B
 
          var aVal: A.B;
 ->aVal : A.B
-+>aVal : import("es5ExportEqualsDts").B
++>aVal : import("./es5ExportEqualsDts").B
  >A : any
 
          return aVal;
 ->aVal : A.B
-+>aVal : import("es5ExportEqualsDts").B
++>aVal : import("./es5ExportEqualsDts").B
      }
  }
diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.types b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.types
index 891796acbe..de22429a09 100644
--- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.types
+++ b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.types
@@ -22,16 +22,16 @@ export module uninstantiated {
 
 === client.ts ===
 export { c } from "./server";
->c : typeof import("server").c
+>c : typeof import("./server").c
 
 export { c as c2 } from "./server";
->c : typeof import("server").c
->c2 : typeof import("server").c
+>c : typeof import("./server").c
+>c2 : typeof import("./server").c
 
 export { i, m as instantiatedModule } from "./server";
 >i : any
->m : typeof import("server").m
->instantiatedModule : typeof import("server").m
+>m : typeof import("./server").m
+>instantiatedModule : typeof import("./server").m
 
 export { uninstantiated } from "./server";
 >uninstantiated : any
diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.types.diff b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.types.diff
new file mode 100644
index 0000000000..7f02782e26
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.types.diff
@@ -0,0 +1,24 @@
+--- old.es6ExportClauseWithoutModuleSpecifierInEs5.types
++++ new.es6ExportClauseWithoutModuleSpecifierInEs5.types
+@@= skipped -21, +21 lines =@@
+
+ === client.ts ===
+ export { c } from "./server";
+->c : typeof import("server").c
++>c : typeof import("./server").c
+
+ export { c as c2 } from "./server";
+->c : typeof import("server").c
+->c2 : typeof import("server").c
++>c : typeof import("./server").c
++>c2 : typeof import("./server").c
+
+ export { i, m as instantiatedModule } from "./server";
+ >i : any
+->m : typeof import("server").m
+->instantiatedModule : typeof import("server").m
++>m : typeof import("./server").m
++>instantiatedModule : typeof import("./server").m
+
+ export { uninstantiated } from "./server";
+ >uninstantiated : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.symbols b/testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.symbols
index 7d8f4fabea..e3ac1c426e 100644
--- a/testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.symbols
+++ b/testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.symbols
@@ -13,7 +13,7 @@ export = foo;
 === index.ts ===
 import("./foo").then(f => {
 >import("./foo").then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->"./foo" : Symbol("foo", Decl(foo.d.ts, 0, 0))
+>"./foo" : Symbol("./foo", Decl(foo.d.ts, 0, 0))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >f : Symbol(f, Decl(index.ts, 0, 21))
 
diff --git a/testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.symbols.diff b/testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.symbols.diff
new file mode 100644
index 0000000000..bc8bbcbef9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.symbols.diff
@@ -0,0 +1,10 @@
+--- old.esModuleInteropImportCall.symbols
++++ new.esModuleInteropImportCall.symbols
+@@= skipped -12, +12 lines =@@
+ === index.ts ===
+ import("./foo").then(f => {
+ >import("./foo").then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+->"./foo" : Symbol("foo", Decl(foo.d.ts, 0, 0))
++>"./foo" : Symbol("./foo", Decl(foo.d.ts, 0, 0))
+ >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+ >f : Symbol(f, Decl(index.ts, 0, 21))
diff --git a/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types b/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types
index c7a44d4cb4..0b89907938 100644
--- a/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types
+++ b/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types
@@ -2,10 +2,10 @@
 
 === mod.d.ts ===
 export = modObj;
->modObj : import("mod").A & import("mod").B
+>modObj : import("./mod").A & import("./mod").B
 
 declare const modObj: modObj.A & modObj.B;
->modObj : import("mod").A & import("mod").B
+>modObj : import("./mod").A & import("./mod").B
 >modObj : any
 >modObj : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types.diff b/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types.diff
index 5baf024ae0..d7f8b7f484 100644
--- a/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types.diff
@@ -5,11 +5,11 @@
  === mod.d.ts ===
  export = modObj;
 ->modObj : modObj.A & modObj.B
-+>modObj : import("mod").A & import("mod").B
++>modObj : import("./mod").A & import("./mod").B
 
  declare const modObj: modObj.A & modObj.B;
 ->modObj : modObj.A & modObj.B
-+>modObj : import("mod").A & import("mod").B
++>modObj : import("./mod").A & import("./mod").B
  >modObj : any
  >modObj : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).symbols b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).symbols
index a9c981cfa7..ca5f28f2e9 100644
--- a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).symbols
+++ b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).symbols
@@ -17,7 +17,7 @@ mdast.toString();
 
 const mdast2 = await import('mdast-util-to-string');
 >mdast2 : Symbol(mdast2, Decl(index.ts, 4, 5))
->'mdast-util-to-string' : Symbol("/node_modules/mdast-util-to-string/index", Decl(index.d.ts, 0, 0))
+>'mdast-util-to-string' : Symbol("mdast-util-to-string", Decl(index.d.ts, 0, 0))
 
 mdast2.toString();
 >mdast2.toString : Symbol(toString, Decl(index.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).symbols.diff b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).symbols.diff
new file mode 100644
index 0000000000..b722d5e459
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).symbols.diff
@@ -0,0 +1,11 @@
+--- old.esmNoSynthesizedDefault(module=esnext).symbols
++++ new.esmNoSynthesizedDefault(module=esnext).symbols
+@@= skipped -16, +16 lines =@@
+
+ const mdast2 = await import('mdast-util-to-string');
+ >mdast2 : Symbol(mdast2, Decl(index.ts, 4, 5))
+->'mdast-util-to-string' : Symbol("/node_modules/mdast-util-to-string/index", Decl(index.d.ts, 0, 0))
++>'mdast-util-to-string' : Symbol("mdast-util-to-string", Decl(index.d.ts, 0, 0))
+
+ mdast2.toString();
+ >mdast2.toString : Symbol(toString, Decl(index.d.ts, 0, 0))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).types b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).types
index 804af336dc..c25d7ac873 100644
--- a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).types
+++ b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).types
@@ -19,19 +19,19 @@ mdast.toString();
 >toString : any
 
 const mdast2 = await import('mdast-util-to-string');
->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
->await import('mdast-util-to-string') : typeof import("/node_modules/mdast-util-to-string/index")
->import('mdast-util-to-string') : Promise<typeof import("/node_modules/mdast-util-to-string/index")>
+>mdast2 : typeof import("mdast-util-to-string")
+>await import('mdast-util-to-string') : typeof import("mdast-util-to-string")
+>import('mdast-util-to-string') : Promise<typeof import("mdast-util-to-string")>
 >'mdast-util-to-string' : "mdast-util-to-string"
 
 mdast2.toString();
 >mdast2.toString() : string
 >mdast2.toString : () => string
->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
+>mdast2 : typeof import("mdast-util-to-string")
 >toString : () => string
 
 mdast2.default;
 >mdast2.default : any
->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
+>mdast2 : typeof import("mdast-util-to-string")
 >default : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).types.diff b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).types.diff
new file mode 100644
index 0000000000..e89280d0fc
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=esnext).types.diff
@@ -0,0 +1,26 @@
+--- old.esmNoSynthesizedDefault(module=esnext).types
++++ new.esmNoSynthesizedDefault(module=esnext).types
+@@= skipped -18, +18 lines =@@
+ >toString : any
+
+ const mdast2 = await import('mdast-util-to-string');
+->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
+->await import('mdast-util-to-string') : typeof import("/node_modules/mdast-util-to-string/index")
+->import('mdast-util-to-string') : Promise<typeof import("/node_modules/mdast-util-to-string/index")>
++>mdast2 : typeof import("mdast-util-to-string")
++>await import('mdast-util-to-string') : typeof import("mdast-util-to-string")
++>import('mdast-util-to-string') : Promise<typeof import("mdast-util-to-string")>
+ >'mdast-util-to-string' : "mdast-util-to-string"
+
+ mdast2.toString();
+ >mdast2.toString() : string
+ >mdast2.toString : () => string
+->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
++>mdast2 : typeof import("mdast-util-to-string")
+ >toString : () => string
+
+ mdast2.default;
+ >mdast2.default : any
+->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
++>mdast2 : typeof import("mdast-util-to-string")
+ >default : any
diff --git a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).symbols b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).symbols
index a9c981cfa7..ca5f28f2e9 100644
--- a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).symbols
+++ b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).symbols
@@ -17,7 +17,7 @@ mdast.toString();
 
 const mdast2 = await import('mdast-util-to-string');
 >mdast2 : Symbol(mdast2, Decl(index.ts, 4, 5))
->'mdast-util-to-string' : Symbol("/node_modules/mdast-util-to-string/index", Decl(index.d.ts, 0, 0))
+>'mdast-util-to-string' : Symbol("mdast-util-to-string", Decl(index.d.ts, 0, 0))
 
 mdast2.toString();
 >mdast2.toString : Symbol(toString, Decl(index.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).symbols.diff b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).symbols.diff
new file mode 100644
index 0000000000..9a63cc1eb9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).symbols.diff
@@ -0,0 +1,11 @@
+--- old.esmNoSynthesizedDefault(module=preserve).symbols
++++ new.esmNoSynthesizedDefault(module=preserve).symbols
+@@= skipped -16, +16 lines =@@
+
+ const mdast2 = await import('mdast-util-to-string');
+ >mdast2 : Symbol(mdast2, Decl(index.ts, 4, 5))
+->'mdast-util-to-string' : Symbol("/node_modules/mdast-util-to-string/index", Decl(index.d.ts, 0, 0))
++>'mdast-util-to-string' : Symbol("mdast-util-to-string", Decl(index.d.ts, 0, 0))
+
+ mdast2.toString();
+ >mdast2.toString : Symbol(toString, Decl(index.d.ts, 0, 0))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).types b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).types
index 804af336dc..c25d7ac873 100644
--- a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).types
+++ b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).types
@@ -19,19 +19,19 @@ mdast.toString();
 >toString : any
 
 const mdast2 = await import('mdast-util-to-string');
->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
->await import('mdast-util-to-string') : typeof import("/node_modules/mdast-util-to-string/index")
->import('mdast-util-to-string') : Promise<typeof import("/node_modules/mdast-util-to-string/index")>
+>mdast2 : typeof import("mdast-util-to-string")
+>await import('mdast-util-to-string') : typeof import("mdast-util-to-string")
+>import('mdast-util-to-string') : Promise<typeof import("mdast-util-to-string")>
 >'mdast-util-to-string' : "mdast-util-to-string"
 
 mdast2.toString();
 >mdast2.toString() : string
 >mdast2.toString : () => string
->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
+>mdast2 : typeof import("mdast-util-to-string")
 >toString : () => string
 
 mdast2.default;
 >mdast2.default : any
->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
+>mdast2 : typeof import("mdast-util-to-string")
 >default : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).types.diff b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).types.diff
new file mode 100644
index 0000000000..6e8c2b6421
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/esmNoSynthesizedDefault(module=preserve).types.diff
@@ -0,0 +1,26 @@
+--- old.esmNoSynthesizedDefault(module=preserve).types
++++ new.esmNoSynthesizedDefault(module=preserve).types
+@@= skipped -18, +18 lines =@@
+ >toString : any
+
+ const mdast2 = await import('mdast-util-to-string');
+->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
+->await import('mdast-util-to-string') : typeof import("/node_modules/mdast-util-to-string/index")
+->import('mdast-util-to-string') : Promise<typeof import("/node_modules/mdast-util-to-string/index")>
++>mdast2 : typeof import("mdast-util-to-string")
++>await import('mdast-util-to-string') : typeof import("mdast-util-to-string")
++>import('mdast-util-to-string') : Promise<typeof import("mdast-util-to-string")>
+ >'mdast-util-to-string' : "mdast-util-to-string"
+
+ mdast2.toString();
+ >mdast2.toString() : string
+ >mdast2.toString : () => string
+->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
++>mdast2 : typeof import("mdast-util-to-string")
+ >toString : () => string
+
+ mdast2.default;
+ >mdast2.default : any
+->mdast2 : typeof import("/node_modules/mdast-util-to-string/index")
++>mdast2 : typeof import("mdast-util-to-string")
+ >default : any
diff --git a/testdata/baselines/reference/submodule/compiler/expandoFunctionSymbolPropertyJs.types b/testdata/baselines/reference/submodule/compiler/expandoFunctionSymbolPropertyJs.types
index caba72790d..075ba65f2f 100644
--- a/testdata/baselines/reference/submodule/compiler/expandoFunctionSymbolPropertyJs.types
+++ b/testdata/baselines/reference/submodule/compiler/expandoFunctionSymbolPropertyJs.types
@@ -21,7 +21,7 @@ import { symb } from "./types";
  * @returns {import("./types").TestSymb}
  */
 export function test() {
->test : () => import("/types").TestSymb
+>test : () => import("./types").TestSymb
 
   function inner() {}
 >inner : { (): void; [symb]: boolean; }
diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types b/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types
index 31b4e9e1bf..8e72fcd718 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types
+++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types
@@ -7,5 +7,5 @@ export var X;
 >X : any
 
 export as namespace N
->N : typeof import("exportAsNamespace")
+>N : typeof import("./exportAsNamespace")
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types.diff b/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types.diff
new file mode 100644
index 0000000000..80e43df3cc
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types.diff
@@ -0,0 +1,8 @@
+--- old.exportAsNamespace.d.types
++++ new.exportAsNamespace.d.types
+@@= skipped -6, +6 lines =@@
+ >X : any
+
+ export as namespace N
+->N : typeof import("exportAsNamespace")
++>N : typeof import("./exportAsNamespace")
diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types
index 6f56d769a2..a5f8474989 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types
+++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types
@@ -2,7 +2,7 @@
 
 === /a.d.ts ===
 export as namespace a;
->a : typeof import("/a")
+>a : typeof import("./a")
 
 export const x = 0;
 >x : 0
diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types.diff b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types.diff
new file mode 100644
index 0000000000..dd0b031b2f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace_augment.types
++++ new.exportAsNamespace_augment.types
+@@= skipped -1, +1 lines =@@
+
+ === /a.d.ts ===
+ export as namespace a;
+->a : typeof import("/a")
++>a : typeof import("./a")
+
+ export const x = 0;
+ >x : 0
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignClassAndModule.types b/testdata/baselines/reference/submodule/compiler/exportAssignClassAndModule.types
index 31e78d8159..0bcd1425f1 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignClassAndModule.types
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignClassAndModule.types
@@ -22,7 +22,7 @@ class Foo {
 >Foo : Foo
 
     x: Foo.Bar;
->x : import("exportAssignClassAndModule_0").Bar
+>x : import("./exportAssignClassAndModule_0").Bar
 >Foo : any
 }
 module Foo {
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignClassAndModule.types.diff b/testdata/baselines/reference/submodule/compiler/exportAssignClassAndModule.types.diff
index 03c176fc70..742f5ae92a 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignClassAndModule.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignClassAndModule.types.diff
@@ -5,7 +5,7 @@
 
      x: Foo.Bar;
 ->x : Foo.Bar
-+>x : import("exportAssignClassAndModule_0").Bar
++>x : import("./exportAssignClassAndModule_0").Bar
  >Foo : any
  }
  module Foo {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
index 5e9be9650d..5d58d58a47 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
@@ -13,10 +13,10 @@ export = Foo;
 
 === index.ts ===
 import { f } from "./thing";
->f : () => import("thing").Bar
+>f : () => import("./thing").Bar
 
 export const thing = f();
->thing : import("thing").Bar
->f() : import("thing").Bar
->f : () => import("thing").Bar
+>thing : import("./thing").Bar
+>f() : import("./thing").Bar
+>f : () => import("./thing").Bar
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types.diff b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types.diff
new file mode 100644
index 0000000000..b0eeab3672
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types.diff
@@ -0,0 +1,16 @@
+--- old.exportAssignedNamespaceIsVisibleInDeclarationEmit.types
++++ new.exportAssignedNamespaceIsVisibleInDeclarationEmit.types
+@@= skipped -12, +12 lines =@@
+
+ === index.ts ===
+ import { f } from "./thing";
+->f : () => import("thing").Bar
++>f : () => import("./thing").Bar
+
+ export const thing = f();
+->thing : import("thing").Bar
+->f() : import("thing").Bar
+->f : () => import("thing").Bar
++>thing : import("./thing").Bar
++>f() : import("./thing").Bar
++>f : () => import("./thing").Bar
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignmentMembersVisibleInAugmentation.types b/testdata/baselines/reference/submodule/compiler/exportAssignmentMembersVisibleInAugmentation.types
index cbbf3b4788..47f8f9cd9a 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignmentMembersVisibleInAugmentation.types
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignmentMembersVisibleInAugmentation.types
@@ -2,7 +2,7 @@
 
 === /node_modules/foo/index.d.ts ===
 export = foo;
->foo : typeof import("/a.ts")
+>foo : typeof import("foo")
 
 declare namespace foo {
     export type T = number;
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignmentMembersVisibleInAugmentation.types.diff b/testdata/baselines/reference/submodule/compiler/exportAssignmentMembersVisibleInAugmentation.types.diff
index 771e2e6d52..76c5328672 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignmentMembersVisibleInAugmentation.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignmentMembersVisibleInAugmentation.types.diff
@@ -5,7 +5,7 @@
  === /node_modules/foo/index.d.ts ===
  export = foo;
 ->foo : typeof import("/node_modules/foo/index.d.ts")
-+>foo : typeof import("/a.ts")
++>foo : typeof import("foo")
 
  declare namespace foo {
      export type T = number;
diff --git a/testdata/baselines/reference/submodule/compiler/exportClassExtendingIntersection.types b/testdata/baselines/reference/submodule/compiler/exportClassExtendingIntersection.types
index dd7f0b96b7..7294cfa2dc 100644
--- a/testdata/baselines/reference/submodule/compiler/exportClassExtendingIntersection.types
+++ b/testdata/baselines/reference/submodule/compiler/exportClassExtendingIntersection.types
@@ -41,12 +41,12 @@ import { MyBaseClass } from './BaseClass';
 >MyBaseClass : typeof MyBaseClass
 
 import { MyMixin } from './MixinClass';
->MyMixin : <T extends import("BaseClass").Constructor<MyBaseClass<any>>>(base: T) => T & import("BaseClass").Constructor<MyMixin>
+>MyMixin : <T extends import("./BaseClass").Constructor<MyBaseClass<any>>>(base: T) => T & import("./BaseClass").Constructor<MyMixin>
 
 export class MyExtendedClass extends MyMixin(MyBaseClass)<string> {
 >MyExtendedClass : MyExtendedClass
 >MyMixin(MyBaseClass) : MyBaseClass<string> & MyMixin
->MyMixin : <T extends import("BaseClass").Constructor<MyBaseClass<any>>>(base: T) => T & import("BaseClass").Constructor<MyMixin>
+>MyMixin : <T extends import("./BaseClass").Constructor<MyBaseClass<any>>>(base: T) => T & import("./BaseClass").Constructor<MyMixin>
 >MyBaseClass : typeof MyBaseClass
 
     extendedClassProperty: number;
@@ -57,7 +57,7 @@ import { MyExtendedClass } from './FinalClass';
 >MyExtendedClass : typeof MyExtendedClass
 
 import { MyMixin } from './MixinClass';
->MyMixin : <T extends import("BaseClass").Constructor<import("BaseClass").MyBaseClass<any>>>(base: T) => T & import("BaseClass").Constructor<MyMixin>
+>MyMixin : <T extends import("./BaseClass").Constructor<import("./BaseClass").MyBaseClass<any>>>(base: T) => T & import("./BaseClass").Constructor<MyMixin>
 
 const myExtendedClass = new MyExtendedClass('string');
 >myExtendedClass : MyExtendedClass
@@ -66,8 +66,8 @@ const myExtendedClass = new MyExtendedClass('string');
 >'string' : "string"
 
 const AnotherMixedClass = MyMixin(MyExtendedClass);
->AnotherMixedClass : typeof MyExtendedClass & import("BaseClass").Constructor<MyMixin>
->MyMixin(MyExtendedClass) : typeof MyExtendedClass & import("BaseClass").Constructor<MyMixin>
->MyMixin : <T extends import("BaseClass").Constructor<import("BaseClass").MyBaseClass<any>>>(base: T) => T & import("BaseClass").Constructor<MyMixin>
+>AnotherMixedClass : typeof MyExtendedClass & import("./BaseClass").Constructor<MyMixin>
+>MyMixin(MyExtendedClass) : typeof MyExtendedClass & import("./BaseClass").Constructor<MyMixin>
+>MyMixin : <T extends import("./BaseClass").Constructor<import("./BaseClass").MyBaseClass<any>>>(base: T) => T & import("./BaseClass").Constructor<MyMixin>
 >MyExtendedClass : typeof MyExtendedClass
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportClassExtendingIntersection.types.diff b/testdata/baselines/reference/submodule/compiler/exportClassExtendingIntersection.types.diff
index 25fd80cd04..831364d166 100644
--- a/testdata/baselines/reference/submodule/compiler/exportClassExtendingIntersection.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportClassExtendingIntersection.types.diff
@@ -8,4 +8,39 @@
 +>class extends base {        mixinProperty: string;    } : { new (...args: any[]): (Anonymous class); prototype: MyMixin.(Anonymous class); } & T
  >base : MyBaseClass<any>
 
-         mixinProperty: string;
\ No newline at end of file
+         mixinProperty: string;
+@@= skipped -12, +12 lines =@@
+ >MyBaseClass : typeof MyBaseClass
+
+ import { MyMixin } from './MixinClass';
+->MyMixin : <T extends import("BaseClass").Constructor<MyBaseClass<any>>>(base: T) => T & import("BaseClass").Constructor<MyMixin>
++>MyMixin : <T extends import("./BaseClass").Constructor<MyBaseClass<any>>>(base: T) => T & import("./BaseClass").Constructor<MyMixin>
+
+ export class MyExtendedClass extends MyMixin(MyBaseClass)<string> {
+ >MyExtendedClass : MyExtendedClass
+ >MyMixin(MyBaseClass) : MyBaseClass<string> & MyMixin
+->MyMixin : <T extends import("BaseClass").Constructor<MyBaseClass<any>>>(base: T) => T & import("BaseClass").Constructor<MyMixin>
++>MyMixin : <T extends import("./BaseClass").Constructor<MyBaseClass<any>>>(base: T) => T & import("./BaseClass").Constructor<MyMixin>
+ >MyBaseClass : typeof MyBaseClass
+
+     extendedClassProperty: number;
+@@= skipped -16, +16 lines =@@
+ >MyExtendedClass : typeof MyExtendedClass
+
+ import { MyMixin } from './MixinClass';
+->MyMixin : <T extends import("BaseClass").Constructor<import("BaseClass").MyBaseClass<any>>>(base: T) => T & import("BaseClass").Constructor<MyMixin>
++>MyMixin : <T extends import("./BaseClass").Constructor<import("./BaseClass").MyBaseClass<any>>>(base: T) => T & import("./BaseClass").Constructor<MyMixin>
+
+ const myExtendedClass = new MyExtendedClass('string');
+ >myExtendedClass : MyExtendedClass
+@@= skipped -9, +9 lines =@@
+ >'string' : "string"
+
+ const AnotherMixedClass = MyMixin(MyExtendedClass);
+->AnotherMixedClass : typeof MyExtendedClass & import("BaseClass").Constructor<MyMixin>
+->MyMixin(MyExtendedClass) : typeof MyExtendedClass & import("BaseClass").Constructor<MyMixin>
+->MyMixin : <T extends import("BaseClass").Constructor<import("BaseClass").MyBaseClass<any>>>(base: T) => T & import("BaseClass").Constructor<MyMixin>
++>AnotherMixedClass : typeof MyExtendedClass & import("./BaseClass").Constructor<MyMixin>
++>MyMixin(MyExtendedClass) : typeof MyExtendedClass & import("./BaseClass").Constructor<MyMixin>
++>MyMixin : <T extends import("./BaseClass").Constructor<import("./BaseClass").MyBaseClass<any>>>(base: T) => T & import("./BaseClass").Constructor<MyMixin>
+ >MyExtendedClass : typeof MyExtendedClass
diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.types b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.types
index 49c5e5325c..4b0073cecd 100644
--- a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.types
+++ b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.types
@@ -86,9 +86,9 @@ namespace A {
 >0 : 0
 }
 export default A.B;
->A.B : typeof import("a").default
+>A.B : typeof import("./a").default
 >A : typeof A
->B : typeof import("a").default
+>B : typeof import("./a").default
 
 === b.ts ===
 export default "foo".length;
diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.types.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.types.diff
index 05a4446675..3a5525fcdc 100644
--- a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.types.diff
@@ -5,10 +5,10 @@
  }
  export default A.B;
 ->A.B : typeof A.B
-+>A.B : typeof import("a").default
++>A.B : typeof import("./a").default
  >A : typeof A
 ->B : typeof A.B
-+>B : typeof import("a").default
++>B : typeof import("./a").default
 
  === b.ts ===
  export default "foo".length;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultWithJSDoc1.types b/testdata/baselines/reference/submodule/compiler/exportDefaultWithJSDoc1.types
index 3b0dc4a506..21fee2342a 100644
--- a/testdata/baselines/reference/submodule/compiler/exportDefaultWithJSDoc1.types
+++ b/testdata/baselines/reference/submodule/compiler/exportDefaultWithJSDoc1.types
@@ -12,10 +12,10 @@
 
 === b.ts ===
 import A from './a'
->A : import("a").NumberLike[]
+>A : import("./a").NumberLike[]
 
 A[0]
->A[0] : import("a").NumberLike
->A : import("a").NumberLike[]
+>A[0] : import("./a").NumberLike
+>A : import("./a").NumberLike[]
 >0 : 0
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultWithJSDoc2.types b/testdata/baselines/reference/submodule/compiler/exportDefaultWithJSDoc2.types
index abd6c3c69a..614d4e1573 100644
--- a/testdata/baselines/reference/submodule/compiler/exportDefaultWithJSDoc2.types
+++ b/testdata/baselines/reference/submodule/compiler/exportDefaultWithJSDoc2.types
@@ -12,10 +12,10 @@ export default /** @type {NumberLike[]} */([ ]);
 
 === b.ts ===
 import A from './a'
->A : import("a").NumberLike[]
+>A : import("./a").NumberLike[]
 
 A[0]
->A[0] : import("a").NumberLike
->A : import("a").NumberLike[]
+>A[0] : import("./a").NumberLike
+>A : import("./a").NumberLike[]
 >0 : 0
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualMemberMissing.types b/testdata/baselines/reference/submodule/compiler/exportEqualMemberMissing.types
index e2510046f3..bdea0ff23c 100644
--- a/testdata/baselines/reference/submodule/compiler/exportEqualMemberMissing.types
+++ b/testdata/baselines/reference/submodule/compiler/exportEqualMemberMissing.types
@@ -32,7 +32,7 @@ module server {
     }
 }
 var server: {
->server : { (): import("exportEqualMemberMissing_0").connectExport; foo: Date; }
+>server : { (): import("./exportEqualMemberMissing_0").connectExport; foo: Date; }
 
     (): server.connectExport;
 >server : any
@@ -42,5 +42,5 @@ var server: {
 
 };
 export = server;
->server : { (): import("exportEqualMemberMissing_0").connectExport; foo: Date; }
+>server : { (): import("./exportEqualMemberMissing_0").connectExport; foo: Date; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualMemberMissing.types.diff b/testdata/baselines/reference/submodule/compiler/exportEqualMemberMissing.types.diff
index 9a8f8abdbc..6bcb064697 100644
--- a/testdata/baselines/reference/submodule/compiler/exportEqualMemberMissing.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportEqualMemberMissing.types.diff
@@ -5,7 +5,7 @@
  }
  var server: {
 ->server : { (): server.connectExport; foo: Date; }
-+>server : { (): import("exportEqualMemberMissing_0").connectExport; foo: Date; }
++>server : { (): import("./exportEqualMemberMissing_0").connectExport; foo: Date; }
 
      (): server.connectExport;
  >server : any
@@ -14,4 +14,4 @@
  };
  export = server;
 ->server : { (): server.connectExport; foo: Date; }
-+>server : { (): import("exportEqualMemberMissing_0").connectExport; foo: Date; }
++>server : { (): import("./exportEqualMemberMissing_0").connectExport; foo: Date; }
diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualsProperty.types b/testdata/baselines/reference/submodule/compiler/exportEqualsProperty.types
index b4f78e2e09..d2a666dd4a 100644
--- a/testdata/baselines/reference/submodule/compiler/exportEqualsProperty.types
+++ b/testdata/baselines/reference/submodule/compiler/exportEqualsProperty.types
@@ -81,9 +81,9 @@ namespace A {
 >0 : 0
 }
 export = A.B;
->A.B : typeof import("a")
+>A.B : typeof import("./a")
 >A : typeof A
->B : typeof import("a")
+>B : typeof import("./a")
 
 === b.ts ===
 export = "foo".length;
diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualsProperty.types.diff b/testdata/baselines/reference/submodule/compiler/exportEqualsProperty.types.diff
index 9b7696f2c9..4ab9579364 100644
--- a/testdata/baselines/reference/submodule/compiler/exportEqualsProperty.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportEqualsProperty.types.diff
@@ -5,10 +5,10 @@
  }
  export = A.B;
 ->A.B : typeof A.B
-+>A.B : typeof import("a")
++>A.B : typeof import("./a")
  >A : typeof A
 ->B : typeof A.B
-+>B : typeof import("a")
++>B : typeof import("./a")
 
  === b.ts ===
  export = "foo".length;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/exportInterfaceClassAndValue.types b/testdata/baselines/reference/submodule/compiler/exportInterfaceClassAndValue.types
index 76c5aa75b2..4ba4397f36 100644
--- a/testdata/baselines/reference/submodule/compiler/exportInterfaceClassAndValue.types
+++ b/testdata/baselines/reference/submodule/compiler/exportInterfaceClassAndValue.types
@@ -6,7 +6,7 @@ export const foo = 1
 >1 : 1
 
 export declare class foo {}
->foo : import("exportInterfaceClassAndValue").foo
+>foo : import("./exportInterfaceClassAndValue").foo
 
 export interface foo {}
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportInterfaceClassAndValue.types.diff b/testdata/baselines/reference/submodule/compiler/exportInterfaceClassAndValue.types.diff
new file mode 100644
index 0000000000..ccc846bc9a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/exportInterfaceClassAndValue.types.diff
@@ -0,0 +1,10 @@
+--- old.exportInterfaceClassAndValue.types
++++ new.exportInterfaceClassAndValue.types
+@@= skipped -5, +5 lines =@@
+ >1 : 1
+
+ export declare class foo {}
+->foo : import("exportInterfaceClassAndValue").foo
++>foo : import("./exportInterfaceClassAndValue").foo
+
+ export interface foo {}
diff --git a/testdata/baselines/reference/submodule/compiler/exportStarNotElided.types b/testdata/baselines/reference/submodule/compiler/exportStarNotElided.types
index ed829464df..8f239817f9 100644
--- a/testdata/baselines/reference/submodule/compiler/exportStarNotElided.types
+++ b/testdata/baselines/reference/submodule/compiler/exportStarNotElided.types
@@ -29,5 +29,5 @@ register("ok");
 export * from "./register";
 export * from "./data1";
 export * as aliased from "./data1";
->aliased : typeof import("data1")
+>aliased : typeof import("./data1")
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportStarNotElided.types.diff b/testdata/baselines/reference/submodule/compiler/exportStarNotElided.types.diff
new file mode 100644
index 0000000000..dae7eec217
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/exportStarNotElided.types.diff
@@ -0,0 +1,8 @@
+--- old.exportStarNotElided.types
++++ new.exportStarNotElided.types
+@@= skipped -28, +28 lines =@@
+ export * from "./register";
+ export * from "./data1";
+ export * as aliased from "./data1";
+->aliased : typeof import("data1")
++>aliased : typeof import("./data1")
diff --git a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.symbols b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.symbols
index 4863eb896c..6ac8813804 100644
--- a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.symbols
+++ b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.symbols
@@ -4,7 +4,7 @@
 export async function foo({ foo = await import("./bar") }) {
 >foo : Symbol(foo, Decl(bar.ts, 0, 0))
 >foo : Symbol(foo, Decl(bar.ts, 0, 27))
->"./bar" : Symbol("bar", Decl(bar.ts, 0, 0))
+>"./bar" : Symbol("./bar", Decl(bar.ts, 0, 0))
 }
 
 export function* foo2({ foo = yield "a" }) {
diff --git a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.symbols.diff b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.symbols.diff
new file mode 100644
index 0000000000..6a91f6ec97
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.symbols.diff
@@ -0,0 +1,11 @@
+--- old.expressionsForbiddenInParameterInitializers.symbols
++++ new.expressionsForbiddenInParameterInitializers.symbols
+@@= skipped -3, +3 lines =@@
+ export async function foo({ foo = await import("./bar") }) {
+ >foo : Symbol(foo, Decl(bar.ts, 0, 0))
+ >foo : Symbol(foo, Decl(bar.ts, 0, 27))
+->"./bar" : Symbol("bar", Decl(bar.ts, 0, 0))
++>"./bar" : Symbol("./bar", Decl(bar.ts, 0, 0))
+ }
+
+ export function* foo2({ foo = yield "a" }) {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.types b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.types
index 9a981dd181..82dd05c902 100644
--- a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.types
+++ b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.types
@@ -2,10 +2,10 @@
 
 === bar.ts ===
 export async function foo({ foo = await import("./bar") }) {
->foo : ({ foo }: { foo?: typeof import("bar"); }) => Promise<void>
->foo : typeof import("bar")
->await import("./bar") : typeof import("bar")
->import("./bar") : Promise<typeof import("bar")>
+>foo : ({ foo }: { foo?: typeof import("./bar"); }) => Promise<void>
+>foo : typeof import("./bar")
+>await import("./bar") : typeof import("./bar")
+>import("./bar") : Promise<typeof import("./bar")>
 >"./bar" : "./bar"
 }
 
diff --git a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.types.diff b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.types.diff
new file mode 100644
index 0000000000..3802721220
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.types.diff
@@ -0,0 +1,16 @@
+--- old.expressionsForbiddenInParameterInitializers.types
++++ new.expressionsForbiddenInParameterInitializers.types
+@@= skipped -1, +1 lines =@@
+
+ === bar.ts ===
+ export async function foo({ foo = await import("./bar") }) {
+->foo : ({ foo }: { foo?: typeof import("bar"); }) => Promise<void>
+->foo : typeof import("bar")
+->await import("./bar") : typeof import("bar")
+->import("./bar") : Promise<typeof import("bar")>
++>foo : ({ foo }: { foo?: typeof import("./bar"); }) => Promise<void>
++>foo : typeof import("./bar")
++>await import("./bar") : typeof import("./bar")
++>import("./bar") : Promise<typeof import("./bar")>
+ >"./bar" : "./bar"
+ }
diff --git a/testdata/baselines/reference/submodule/compiler/functionExpressionNames.symbols b/testdata/baselines/reference/submodule/compiler/functionExpressionNames.symbols
index 8ad2cab8c3..1bde36c196 100644
--- a/testdata/baselines/reference/submodule/compiler/functionExpressionNames.symbols
+++ b/testdata/baselines/reference/submodule/compiler/functionExpressionNames.symbols
@@ -3,7 +3,7 @@
 === b.js ===
 exports.E = function() {
 >exports.E : Symbol(E, Decl(b.js, 0, 0))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 >E : Symbol(E, Decl(b.js, 0, 0))
 
     this.e = 'exported'
@@ -11,7 +11,7 @@ exports.E = function() {
 var e = new exports.E();
 >e : Symbol(e, Decl(b.js, 3, 3))
 >exports.E : Symbol(E, Decl(b.js, 0, 0))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 >E : Symbol(E, Decl(b.js, 0, 0))
 
 var o = {
diff --git a/testdata/baselines/reference/submodule/compiler/functionExpressionNames.symbols.diff b/testdata/baselines/reference/submodule/compiler/functionExpressionNames.symbols.diff
index 72c734d543..385762e525 100644
--- a/testdata/baselines/reference/submodule/compiler/functionExpressionNames.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/functionExpressionNames.symbols.diff
@@ -5,7 +5,7 @@
  exports.E = function() {
  >exports.E : Symbol(E, Decl(b.js, 0, 0))
 ->exports : Symbol(E, Decl(b.js, 0, 0))
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
  >E : Symbol(E, Decl(b.js, 0, 0))
 
      this.e = 'exported'
@@ -15,6 +15,12 @@
  }
  var e = new exports.E();
  >e : Symbol(e, Decl(b.js, 3, 3))
+ >exports.E : Symbol(E, Decl(b.js, 0, 0))
+->exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
+ >E : Symbol(E, Decl(b.js, 0, 0))
+
+ var o = {
 @@= skipped -21, +18 lines =@@
  >C : Symbol(C, Decl(b.js, 5, 9))
 
diff --git a/testdata/baselines/reference/submodule/compiler/functionExpressionNames.types b/testdata/baselines/reference/submodule/compiler/functionExpressionNames.types
index 5ddc9be0cc..0a5b4ed29d 100644
--- a/testdata/baselines/reference/submodule/compiler/functionExpressionNames.types
+++ b/testdata/baselines/reference/submodule/compiler/functionExpressionNames.types
@@ -4,7 +4,7 @@
 exports.E = function() {
 >exports.E = function() {    this.e = 'exported'} : () => void
 >exports.E : () => void
->exports : typeof import("b")
+>exports : typeof import("./b")
 >E : () => void
 >function() {    this.e = 'exported'} : () => void
 
@@ -19,7 +19,7 @@ var e = new exports.E();
 >e : any
 >new exports.E() : any
 >exports.E : () => void
->exports : typeof import("b")
+>exports : typeof import("./b")
 >E : () => void
 
 var o = {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
index f5df44496d..380c52036b 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("a")
+>a : typeof import("./a")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types.diff
new file mode 100644
index 0000000000..09f010ebc6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types.diff
@@ -0,0 +1,11 @@
+--- old.importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
++++ new.importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export * as a from "./a";
+->a : typeof import("a")
++>a : typeof import("./a")
+
+ === tslib.d.ts ===
+ declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
index f5df44496d..380c52036b 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("a")
+>a : typeof import("./a")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types.diff
new file mode 100644
index 0000000000..613a56088e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
++++ new.importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export * as a from "./a";
+->a : typeof import("a")
++>a : typeof import("./a")
+
+ === tslib.d.ts ===
+ declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
index f5df44496d..380c52036b 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("a")
+>a : typeof import("./a")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types.diff
new file mode 100644
index 0000000000..11331710d2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types.diff
@@ -0,0 +1,11 @@
+--- old.importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
++++ new.importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export * as a from "./a";
+->a : typeof import("a")
++>a : typeof import("./a")
+
+ === tslib.d.ts ===
+ declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types
index f5df44496d..380c52036b 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("a")
+>a : typeof import("./a")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types.diff
new file mode 100644
index 0000000000..d0ed8b01a1
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types.diff
@@ -0,0 +1,11 @@
+--- old.importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types
++++ new.importHelpersWithExportStarAs(esmoduleinterop=true,module=commonjs).types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export * as a from "./a";
+->a : typeof import("a")
++>a : typeof import("./a")
+
+ === tslib.d.ts ===
+ declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types
index f5df44496d..380c52036b 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("a")
+>a : typeof import("./a")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types.diff
new file mode 100644
index 0000000000..b1b7e43897
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types
++++ new.importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export * as a from "./a";
+->a : typeof import("a")
++>a : typeof import("./a")
+
+ === tslib.d.ts ===
+ declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types
index f5df44496d..380c52036b 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("a")
+>a : typeof import("./a")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types.diff
new file mode 100644
index 0000000000..00e8f6b8cc
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types.diff
@@ -0,0 +1,11 @@
+--- old.importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types
++++ new.importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export * as a from "./a";
+->a : typeof import("a")
++>a : typeof import("./a")
+
+ === tslib.d.ts ===
+ declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types b/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types
index c1af16f6bd..7782f65169 100644
--- a/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types
+++ b/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types
@@ -2,10 +2,10 @@
 
 === errors.d.ts ===
 export = createHttpError;
->createHttpError : import("errors").NamedConstructors
+>createHttpError : import("./errors").NamedConstructors
 
 declare const createHttpError: createHttpError.NamedConstructors;
->createHttpError : import("errors").NamedConstructors
+>createHttpError : import("./errors").NamedConstructors
 >createHttpError : any
 
 declare namespace createHttpError {
diff --git a/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types.diff b/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types.diff
index fb44d83f43..29f7b3608a 100644
--- a/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types.diff
@@ -5,11 +5,11 @@
  === errors.d.ts ===
  export = createHttpError;
 ->createHttpError : createHttpError.NamedConstructors
-+>createHttpError : import("errors").NamedConstructors
++>createHttpError : import("./errors").NamedConstructors
 
  declare const createHttpError: createHttpError.NamedConstructors;
 ->createHttpError : createHttpError.NamedConstructors
-+>createHttpError : import("errors").NamedConstructors
++>createHttpError : import("./errors").NamedConstructors
  >createHttpError : any
 
  declare namespace createHttpError {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importShouldNotBeElidedInDeclarationEmit.types b/testdata/baselines/reference/submodule/compiler/importShouldNotBeElidedInDeclarationEmit.types
index 11d237c3be..b8bed6497c 100644
--- a/testdata/baselines/reference/submodule/compiler/importShouldNotBeElidedInDeclarationEmit.types
+++ b/testdata/baselines/reference/submodule/compiler/importShouldNotBeElidedInDeclarationEmit.types
@@ -2,7 +2,7 @@
 
 === node_modules/umd.d.ts ===
 export as namespace UMD;
->UMD : typeof import("node_modules/umd")
+>UMD : typeof import("umd.d.ts")
 
 export type Thing = {
 >Thing : Thing
@@ -16,10 +16,10 @@ export declare function makeThing(): Thing;
 
 === index.ts ===
 import { makeThing } from "umd";
->makeThing : () => import("node_modules/umd").Thing
+>makeThing : () => import("umd").Thing
 
 export const thing = makeThing();
->thing : import("node_modules/umd").Thing
->makeThing() : import("node_modules/umd").Thing
->makeThing : () => import("node_modules/umd").Thing
+>thing : import("umd").Thing
+>makeThing() : import("umd").Thing
+>makeThing : () => import("umd").Thing
 
diff --git a/testdata/baselines/reference/submodule/compiler/importShouldNotBeElidedInDeclarationEmit.types.diff b/testdata/baselines/reference/submodule/compiler/importShouldNotBeElidedInDeclarationEmit.types.diff
new file mode 100644
index 0000000000..bdc11ea738
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/importShouldNotBeElidedInDeclarationEmit.types.diff
@@ -0,0 +1,25 @@
+--- old.importShouldNotBeElidedInDeclarationEmit.types
++++ new.importShouldNotBeElidedInDeclarationEmit.types
+@@= skipped -1, +1 lines =@@
+
+ === node_modules/umd.d.ts ===
+ export as namespace UMD;
+->UMD : typeof import("node_modules/umd")
++>UMD : typeof import("umd.d.ts")
+
+ export type Thing = {
+ >Thing : Thing
+@@= skipped -14, +14 lines =@@
+
+ === index.ts ===
+ import { makeThing } from "umd";
+->makeThing : () => import("node_modules/umd").Thing
++>makeThing : () => import("umd").Thing
+
+ export const thing = makeThing();
+->thing : import("node_modules/umd").Thing
+->makeThing() : import("node_modules/umd").Thing
+->makeThing : () => import("node_modules/umd").Thing
++>thing : import("umd").Thing
++>makeThing() : import("umd").Thing
++>makeThing : () => import("umd").Thing
diff --git a/testdata/baselines/reference/submodule/compiler/importTypeResolutionJSDocEOF.types b/testdata/baselines/reference/submodule/compiler/importTypeResolutionJSDocEOF.types
index 507d4be551..67e5e38a34 100644
--- a/testdata/baselines/reference/submodule/compiler/importTypeResolutionJSDocEOF.types
+++ b/testdata/baselines/reference/submodule/compiler/importTypeResolutionJSDocEOF.types
@@ -9,6 +9,6 @@ export interface Bar {
 === usage.js ===
 /** @type {Bar} */
 export let bar;
->bar : import("interfaces").Bar
+>bar : import("./interfaces").Bar
 
 /** @typedef {import('./interfaces').Bar} Bar */
diff --git a/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types b/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types
index 828968f898..af8aee9fc3 100644
--- a/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types
+++ b/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types
@@ -13,7 +13,7 @@ export declare const theme: { a: string }
 
 === test3.ts ===
 export const a: import("./test1").T<typeof import("./test2").theme> = null as any;
->a : import("test1").T<{ a: string; }>
+>a : import("./test1").T<{ a: string; }>
 >theme : any
 >null as any : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types.diff b/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types.diff
index 4a281942c1..8eb3d20a37 100644
--- a/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types.diff
@@ -1,9 +1,11 @@
 --- old.importUsedInGenericImportResolves.types
 +++ new.importUsedInGenericImportResolves.types
-@@= skipped -13, +13 lines =@@
+@@= skipped -12, +12 lines =@@
+
  === test3.ts ===
  export const a: import("./test1").T<typeof import("./test2").theme> = null as any;
- >a : import("test1").T<{ a: string; }>
+->a : import("test1").T<{ a: string; }>
 ->theme : error
++>a : import("./test1").T<{ a: string; }>
 +>theme : any
  >null as any : any
diff --git a/testdata/baselines/reference/submodule/compiler/importedEnumMemberMergedWithExportedAliasIsError.types b/testdata/baselines/reference/submodule/compiler/importedEnumMemberMergedWithExportedAliasIsError.types
index 6cf64389cb..ec07c76f73 100644
--- a/testdata/baselines/reference/submodule/compiler/importedEnumMemberMergedWithExportedAliasIsError.types
+++ b/testdata/baselines/reference/submodule/compiler/importedEnumMemberMergedWithExportedAliasIsError.types
@@ -20,5 +20,5 @@ import EnumA = Enum.A;
 >A : Enum.A
 
 export type EnumA = [string] | [string, number];
->EnumA : import("alias").EnumA
+>EnumA : import("./alias").EnumA
 
diff --git a/testdata/baselines/reference/submodule/compiler/importedEnumMemberMergedWithExportedAliasIsError.types.diff b/testdata/baselines/reference/submodule/compiler/importedEnumMemberMergedWithExportedAliasIsError.types.diff
new file mode 100644
index 0000000000..88eb347d8c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/importedEnumMemberMergedWithExportedAliasIsError.types.diff
@@ -0,0 +1,8 @@
+--- old.importedEnumMemberMergedWithExportedAliasIsError.types
++++ new.importedEnumMemberMergedWithExportedAliasIsError.types
+@@= skipped -19, +19 lines =@@
+ >A : Enum.A
+
+ export type EnumA = [string] | [string, number];
+->EnumA : import("alias").EnumA
++>EnumA : import("./alias").EnumA
diff --git a/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types b/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types
index 93176ff7df..0b4ccc78a3 100644
--- a/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types
+++ b/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types
@@ -63,9 +63,9 @@ declare const User: ObjectTypeComposer<any, any>;
 
 User.addResolver({
 >User.addResolver({  type: User, // `User as any` fix the problem}) : ObjectTypeComposer<any, any>
->User.addResolver : <TResolverSource>(opts: { type?: import("graphql-compose").Thunk<import("graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
+>User.addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose").Thunk<import("./graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
 >User : ObjectTypeComposer<any, any>
->addResolver : <TResolverSource>(opts: { type?: import("graphql-compose").Thunk<import("graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
+>addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose").Thunk<import("./graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
 >{  type: User, // `User as any` fix the problem} : { type: ObjectTypeComposer<any, any>; }
 
   type: User, // `User as any` fix the problem
diff --git a/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types.diff b/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types.diff
index 8d61e11405..20a9b881d9 100644
--- a/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types.diff
@@ -8,4 +8,16 @@
 +>setFields : (fields: Readonly<{ [key: string]: Readonly<Resolver>; }>) => this
  >fields : Readonly<{ [key: string]: Readonly<Resolver>; }>
 
-   public addResolver<TResolverSource>(opts: { type?: Thunk<ComposeOutputTypeDefinition> }): this;
\ No newline at end of file
+   public addResolver<TResolverSource>(opts: { type?: Thunk<ComposeOutputTypeDefinition> }): this;
+@@= skipped -38, +38 lines =@@
+
+ User.addResolver({
+ >User.addResolver({  type: User, // `User as any` fix the problem}) : ObjectTypeComposer<any, any>
+->User.addResolver : <TResolverSource>(opts: { type?: import("graphql-compose").Thunk<import("graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
++>User.addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose").Thunk<import("./graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
+ >User : ObjectTypeComposer<any, any>
+->addResolver : <TResolverSource>(opts: { type?: import("graphql-compose").Thunk<import("graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
++>addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose").Thunk<import("./graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
+ >{  type: User, // `User as any` fix the problem} : { type: ObjectTypeComposer<any, any>; }
+
+   type: User, // `User as any` fix the problem
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.symbols b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.symbols
index 3638ae560b..608d1f8c49 100644
--- a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.symbols
+++ b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.symbols
@@ -5,7 +5,7 @@ import { ParentThing } from './parent';
 >ParentThing : Symbol(ParentThing, Decl(child1.ts, 0, 8))
 
 declare module './parent' {
->'./parent' : Symbol("parent", Decl(parent.ts, 0, 0), Decl(child1.ts, 0, 39))
+>'./parent' : Symbol("./parent", Decl(parent.ts, 0, 0), Decl(child1.ts, 0, 39))
 
     interface ParentThing {
 >ParentThing : Symbol(ParentThing, Decl(parent.ts, 0, 34), Decl(child1.ts, 2, 27))
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.symbols.diff b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.symbols.diff
new file mode 100644
index 0000000000..eaba25316e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.symbols.diff
@@ -0,0 +1,11 @@
+--- old.isolatedDeclarationErrorsAugmentation.symbols
++++ new.isolatedDeclarationErrorsAugmentation.symbols
+@@= skipped -4, +4 lines =@@
+ >ParentThing : Symbol(ParentThing, Decl(child1.ts, 0, 8))
+
+ declare module './parent' {
+->'./parent' : Symbol("parent", Decl(parent.ts, 0, 0), Decl(child1.ts, 0, 39))
++>'./parent' : Symbol("./parent", Decl(parent.ts, 0, 0), Decl(child1.ts, 0, 39))
+
+     interface ParentThing {
+ >ParentThing : Symbol(ParentThing, Decl(parent.ts, 0, 34), Decl(child1.ts, 2, 27))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.types b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.types
index e4dbf01011..bc5f367e99 100644
--- a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.types
+++ b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.types
@@ -5,7 +5,7 @@ import { ParentThing } from './parent';
 >ParentThing : typeof ParentThing
 
 declare module './parent' {
->'./parent' : typeof import("parent")
+>'./parent' : typeof import("./parent")
 
     interface ParentThing {
         add: (a: number, b: number) => number;
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.types.diff b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.types.diff
new file mode 100644
index 0000000000..ce2f482284
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsAugmentation.types.diff
@@ -0,0 +1,11 @@
+--- old.isolatedDeclarationErrorsAugmentation.types
++++ new.isolatedDeclarationErrorsAugmentation.types
+@@= skipped -4, +4 lines =@@
+ >ParentThing : typeof ParentThing
+
+ declare module './parent' {
+->'./parent' : typeof import("parent")
++>'./parent' : typeof import("./parent")
+
+     interface ParentThing {
+         add: (a: number, b: number) => number;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.types b/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.types
index bb70acd139..347481de03 100644
--- a/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.types
+++ b/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.types
@@ -64,5 +64,5 @@ export = T;
 
 === /reExportValueAsTypeOnly.ts ===
 export type { C } from "./exportValue";
->C : import("/exportValue").C
+>C : import("./exportValue").C
 
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.types.diff b/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.types.diff
new file mode 100644
index 0000000000..555a01888f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.types.diff
@@ -0,0 +1,8 @@
+--- old.isolatedModulesReExportType.types
++++ new.isolatedModulesReExportType.types
+@@= skipped -63, +63 lines =@@
+
+ === /reExportValueAsTypeOnly.ts ===
+ export type { C } from "./exportValue";
+->C : import("/exportValue").C
++>C : import("./exportValue").C
diff --git a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitDoesNotRenameImport.types b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitDoesNotRenameImport.types
index 5ba95ac541..f71c8687de 100644
--- a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitDoesNotRenameImport.types
+++ b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitDoesNotRenameImport.types
@@ -40,19 +40,19 @@ class X extends Test {
 >super : typeof Test
 
         if (options.test) {
->options.test : typeof import("Test").default | undefined
+>options.test : typeof import("./Test.js").default | undefined
 >options : Options
->test : typeof import("Test").default | undefined
+>test : typeof import("./Test.js").default | undefined
 
             this.test = new options.test();
->this.test = new options.test() : import("Test").default
+>this.test = new options.test() : import("./Test.js").default
 >this.test : any
 >this : this
 >test : any
->new options.test() : import("Test").default
->options.test : typeof import("Test").default
+>new options.test() : import("./Test.js").default
+>options.test : typeof import("./Test.js").default
 >options : Options
->test : typeof import("Test").default
+>test : typeof import("./Test.js").default
         }
     }
 }
diff --git a/testdata/baselines/reference/submodule/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types b/testdata/baselines/reference/submodule/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types
index 55719cf360..1f3e6cf117 100644
--- a/testdata/baselines/reference/submodule/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types
+++ b/testdata/baselines/reference/submodule/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types
@@ -20,23 +20,23 @@ export declare function createNamespacedHelpers(): NamespacedMappers;
 
 === /index.js ===
 import { createNamespacedHelpers } from './helper'
->createNamespacedHelpers : () => import("/helper").NamespacedMappers
+>createNamespacedHelpers : () => import("./helper").NamespacedMappers
 
 const { mapState } = createNamespacedHelpers()
->mapState : import("/helper").Mapper<import("/helper").Computed>
->createNamespacedHelpers() : import("/helper").NamespacedMappers
->createNamespacedHelpers : () => import("/helper").NamespacedMappers
+>mapState : import("./helper").Mapper<import("./helper").Computed>
+>createNamespacedHelpers() : import("./helper").NamespacedMappers
+>createNamespacedHelpers : () => import("./helper").NamespacedMappers
 
 export default {
->{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("/helper").Computed; }; }
+>{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("./helper").Computed; }; }
 
     computed: {
->computed : { panels: import("/helper").Computed; }
->{        ...mapState(['panels'])    } : { panels: import("/helper").Computed; }
+>computed : { panels: import("./helper").Computed; }
+>{        ...mapState(['panels'])    } : { panels: import("./helper").Computed; }
 
         ...mapState(['panels'])
->mapState(['panels']) : { panels: import("/helper").Computed; }
->mapState : import("/helper").Mapper<import("/helper").Computed>
+>mapState(['panels']) : { panels: import("./helper").Computed; }
+>mapState : import("./helper").Mapper<import("./helper").Computed>
 >['panels'] : "panels"[]
 >'panels' : "panels"
     }
diff --git a/testdata/baselines/reference/submodule/compiler/jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types b/testdata/baselines/reference/submodule/compiler/jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types
index 014d6bf2ed..5bc7a940c2 100644
--- a/testdata/baselines/reference/submodule/compiler/jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types
+++ b/testdata/baselines/reference/submodule/compiler/jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types
@@ -2,7 +2,7 @@
 
 === node_modules/@lion/ajax/dist-types/src/index.d.ts ===
 export type LionRequestInit = import('../types/types.js').LionRequestInit;
->LionRequestInit : import("node_modules/@lion/ajax/dist-types/types/types").LionRequestInit
+>LionRequestInit : import("../types/types.js").LionRequestInit
 
 === node_modules/@lion/ajax/dist-types/types/types.d.ts ===
 export interface LionRequestInit {
@@ -21,8 +21,8 @@ export class NewAjax {
      * @param {LionRequestInit} [init]
      */
     case5_unexpectedlyResolvesPathToNodeModules(init) {}
->case5_unexpectedlyResolvesPathToNodeModules : (init?: import("node_modules/@lion/ajax/dist-types/types/types").LionRequestInit | undefined) => void
->init : import("node_modules/@lion/ajax/dist-types/types/types").LionRequestInit | undefined
+>case5_unexpectedlyResolvesPathToNodeModules : (init?: import("./node_modules/@lion/ajax/dist-types/types/types.js").LionRequestInit | undefined) => void
+>init : import("./node_modules/@lion/ajax/dist-types/types/types.js").LionRequestInit | undefined
 }
 
 /**
diff --git a/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.symbols b/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.symbols
index 2be095b40f..b7c387b3da 100644
--- a/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.symbols
@@ -6,7 +6,7 @@ const { Thing, useThing, cbThing } = require("./index");
 >useThing : Symbol(useThing, Decl(usage.js, 0, 14))
 >cbThing : Symbol(cbThing, Decl(usage.js, 0, 24))
 >require : Symbol(require)
->"./index" : Symbol("index", Decl(index.js, 0, 0))
+>"./index" : Symbol("./index", Decl(index.js, 0, 0))
 
 useThing(Thing.a);
 >useThing : Symbol(useThing, Decl(usage.js, 0, 14))
@@ -58,7 +58,7 @@ const Thing = Object.freeze({
 
 exports.Thing = Thing;
 >exports.Thing : Symbol(Thing, Decl(index.js, 4, 3))
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >Thing : Symbol(Thing, Decl(index.js, 4, 3))
 >Thing : Symbol(Thing, Decl(index.js, 1, 5))
 
@@ -71,7 +71,7 @@ function useThing(x) {}
 
 exports.useThing = useThing;
 >exports.useThing : Symbol(useThing, Decl(index.js, 11, 23))
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >useThing : Symbol(useThing, Decl(index.js, 11, 23))
 >useThing : Symbol(useThing, Decl(index.js, 6, 22))
 
@@ -84,7 +84,7 @@ function cbThing(x) {}
 
 exports.cbThing = cbThing;
 >exports.cbThing : Symbol(cbThing, Decl(index.js, 18, 22))
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >cbThing : Symbol(cbThing, Decl(index.js, 18, 22))
 >cbThing : Symbol(cbThing, Decl(index.js, 13, 28))
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.symbols.diff
index 532ea2f34b..2ec2715f3a 100644
--- a/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsEnumTagOnObjectFrozen.symbols
 +++ new.jsEnumTagOnObjectFrozen.symbols
-@@= skipped -42, +42 lines =@@
+@@= skipped -5, +5 lines =@@
+ >useThing : Symbol(useThing, Decl(usage.js, 0, 14))
+ >cbThing : Symbol(cbThing, Decl(usage.js, 0, 24))
+ >require : Symbol(require)
+->"./index" : Symbol("index", Decl(index.js, 0, 0))
++>"./index" : Symbol("./index", Decl(index.js, 0, 0))
+
+ useThing(Thing.a);
+ >useThing : Symbol(useThing, Decl(usage.js, 0, 14))
+@@= skipped -37, +37 lines =@@
  === index.js ===
  /** @enum {string} */
  const Thing = Object.freeze({
@@ -14,7 +23,7 @@
  exports.Thing = Thing;
  >exports.Thing : Symbol(Thing, Decl(index.js, 4, 3))
 ->exports : Symbol(Thing, Decl(index.js, 4, 3))
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >Thing : Symbol(Thing, Decl(index.js, 4, 3))
 ->Thing : Symbol(Thing, Decl(index.js, 1, 5), Decl(index.js, 0, 4))
 +>Thing : Symbol(Thing, Decl(index.js, 1, 5))
@@ -26,7 +35,7 @@
  exports.useThing = useThing;
  >exports.useThing : Symbol(useThing, Decl(index.js, 11, 23))
 ->exports : Symbol(useThing, Decl(index.js, 11, 23))
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >useThing : Symbol(useThing, Decl(index.js, 11, 23))
  >useThing : Symbol(useThing, Decl(index.js, 6, 22))
 
@@ -35,6 +44,6 @@
  exports.cbThing = cbThing;
  >exports.cbThing : Symbol(cbThing, Decl(index.js, 18, 22))
 ->exports : Symbol(cbThing, Decl(index.js, 18, 22))
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >cbThing : Symbol(cbThing, Decl(index.js, 18, 22))
  >cbThing : Symbol(cbThing, Decl(index.js, 13, 28))
diff --git a/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.types b/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.types
index 3c985d3e02..5d912b169c 100644
--- a/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.types
+++ b/testdata/baselines/reference/submodule/compiler/jsEnumTagOnObjectFrozen.types
@@ -5,7 +5,7 @@ const { Thing, useThing, cbThing } = require("./index");
 >Thing : Readonly<{ a: "thing"; b: "chill"; }>
 >useThing : (x: Thing) => void
 >cbThing : (x: (x: Thing) => void) => void
->require("./index") : typeof import("index")
+>require("./index") : typeof import("./index")
 >require : any
 >"./index" : "./index"
 
@@ -69,7 +69,7 @@ const Thing = Object.freeze({
 exports.Thing = Thing;
 >exports.Thing = Thing : Readonly<{ a: "thing"; b: "chill"; }>
 >exports.Thing : Readonly<{ a: "thing"; b: "chill"; }>
->exports : typeof import("index")
+>exports : typeof import(".")
 >Thing : Readonly<{ a: "thing"; b: "chill"; }>
 >Thing : Readonly<{ a: "thing"; b: "chill"; }>
 
@@ -83,7 +83,7 @@ function useThing(x) {}
 exports.useThing = useThing;
 >exports.useThing = useThing : (x: Thing) => void
 >exports.useThing : (x: Thing) => void
->exports : typeof import("index")
+>exports : typeof import(".")
 >useThing : (x: Thing) => void
 >useThing : (x: Thing) => void
 
@@ -97,7 +97,7 @@ function cbThing(x) {}
 exports.cbThing = cbThing;
 >exports.cbThing = cbThing : (x: (x: Thing) => void) => void
 >exports.cbThing : (x: (x: Thing) => void) => void
->exports : typeof import("index")
+>exports : typeof import(".")
 >cbThing : (x: (x: Thing) => void) => void
 >cbThing : (x: (x: Thing) => void) => void
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols
index 916f7562f3..589493438e 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols
@@ -17,6 +17,6 @@ module.exports = {
 };
 
 exports.customSymbol2 = Symbol("custom");
->exports : Symbol("file", Decl(file.js, 0, 0))
+>exports : Symbol("./file", Decl(file.js, 0, 0))
 >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols.diff
index a3d9141331..3a1baa5727 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols.diff
@@ -20,5 +20,5 @@
 ->exports.customSymbol2 : Symbol(customSymbol2, Decl(file.js, 5, 2))
 ->exports : Symbol(customSymbol2, Decl(file.js, 5, 2))
 ->customSymbol2 : Symbol(customSymbol2, Decl(file.js, 5, 2))
-+>exports : Symbol("file", Decl(file.js, 0, 0))
++>exports : Symbol("./file", Decl(file.js, 0, 0))
  >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types
index d14ac95f27..7cf7bc14ae 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types
+++ b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.types
@@ -23,7 +23,7 @@ module.exports = {
 exports.customSymbol2 = Symbol("custom");
 >exports.customSymbol2 = Symbol("custom") : symbol
 >exports.customSymbol2 : any
->exports : typeof import("file")
+>exports : typeof import("./file")
 >customSymbol2 : any
 >Symbol("custom") : symbol
 >Symbol : SymbolConstructor
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.types b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.types
index 2bd66843ad..62f3736bfb 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.types
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.types
@@ -4,18 +4,18 @@
 module.exports.x = 1;
 >module.exports.x = 1 : 1
 >module.exports.x : any
->module.exports : typeof import("/y")
->module : { "export=": typeof import("/y"); }
->exports : typeof import("/y")
+>module.exports : typeof import("./y.js")
+>module : { "export=": typeof import("./y.js"); }
+>exports : typeof import("./y.js")
 >x : any
 >1 : 1
 
 module.exports = require("./y.js");
->module.exports = require("./y.js") : typeof import("/y")
->module.exports : typeof import("/y")
->module : { "export=": typeof import("/y"); }
->exports : typeof import("/y")
->require("./y.js") : typeof import("/y")
+>module.exports = require("./y.js") : typeof import("./y.js")
+>module.exports : typeof import("./y.js")
+>module : { "export=": typeof import("./y.js"); }
+>exports : typeof import("./y.js")
+>require("./y.js") : typeof import("./y.js")
 >require : any
 >"./y.js" : "./y.js"
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.symbols
index 33e46242e1..0af4ffe351 100644
--- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.symbols
@@ -20,7 +20,7 @@ var a = 10;
 === node_modules/c.js ===
 exports.a = 10;
 >exports.a : Symbol(a, Decl(c.js, 0, 0))
->exports : Symbol("node_modules/c", Decl(c.js, 0, 0))
+>exports : Symbol("c.js", Decl(c.js, 0, 0))
 >a : Symbol(a, Decl(c.js, 0, 0))
 
 c = 10;
diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.symbols.diff
index f8d8fcb96c..19cd38495b 100644
--- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.symbols.diff
@@ -5,7 +5,7 @@
  exports.a = 10;
  >exports.a : Symbol(a, Decl(c.js, 0, 0))
 ->exports : Symbol(a, Decl(c.js, 0, 0))
-+>exports : Symbol("node_modules/c", Decl(c.js, 0, 0))
++>exports : Symbol("c.js", Decl(c.js, 0, 0))
  >a : Symbol(a, Decl(c.js, 0, 0))
 
  c = 10;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.types
index 214d88cded..a8c345ac06 100644
--- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.types
+++ b/testdata/baselines/reference/submodule/compiler/jsFileCompilationExternalPackageError.types
@@ -24,7 +24,7 @@ var a = 10;
 exports.a = 10;
 >exports.a = 10 : 10
 >exports.a : 10
->exports : typeof import("node_modules/c")
+>exports : typeof import("c.js")
 >a : 10
 >10 : 10
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsdocPropertyTagInvalid.types b/testdata/baselines/reference/submodule/compiler/jsdocPropertyTagInvalid.types
index d1737d4e82..db081d9aaa 100644
--- a/testdata/baselines/reference/submodule/compiler/jsdocPropertyTagInvalid.types
+++ b/testdata/baselines/reference/submodule/compiler/jsdocPropertyTagInvalid.types
@@ -13,11 +13,11 @@ export function f(p) { }
 
 === /b.js ===
 import { f } from "./a.js"
->f : (p: import("/a").MyType) => void
+>f : (p: import("./a.js").MyType) => void
 
 f({ x: 42 })
 >f({ x: 42 }) : void
->f : (p: import("/a").MyType) => void
+>f : (p: import("./a.js").MyType) => void
 >{ x: 42 } : { x: number; }
 >x : number
 >42 : 42
diff --git a/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.symbols b/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.symbols
index 35e48e50c2..e4db8a0e86 100644
--- a/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.symbols
@@ -4,7 +4,7 @@
 const other = require('./other');
 >other : Symbol(other, Decl(a.js, 0, 5))
 >require : Symbol(require)
->'./other' : Symbol("other", Decl(other.d.ts, 0, 0))
+>'./other' : Symbol("./other", Decl(other.d.ts, 0, 0))
 
 /** @type {Puppeteer.Keyboard} */
 var ppk;
diff --git a/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.symbols.diff
new file mode 100644
index 0000000000..1e1b6d59e7
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.symbols.diff
@@ -0,0 +1,11 @@
+--- old.jsdocReferenceGlobalTypeInCommonJs.symbols
++++ new.jsdocReferenceGlobalTypeInCommonJs.symbols
+@@= skipped -3, +3 lines =@@
+ const other = require('./other');
+ >other : Symbol(other, Decl(a.js, 0, 5))
+ >require : Symbol(require)
+->'./other' : Symbol("other", Decl(other.d.ts, 0, 0))
++>'./other' : Symbol("./other", Decl(other.d.ts, 0, 0))
+
+ /** @type {Puppeteer.Keyboard} */
+ var ppk;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.types b/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.types
index 9975bedd8a..3dffd7754d 100644
--- a/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.types
+++ b/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.types
@@ -18,7 +18,7 @@ Puppeteer.connect;
 
 === puppet.d.ts ===
 export as namespace Puppeteer;
->Puppeteer : typeof import("puppet")
+>Puppeteer : typeof import("./puppet")
 
 export interface Keyboard {
     key: string
diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespace.types b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespace.types
index 4b699a08b9..240aece4de 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespace.types
+++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespace.types
@@ -204,9 +204,9 @@ export import JSX = JSXInternal;
 
 === /index.tsx ===
 export const Comp = () => <div></div>;
->Comp : () => import("/node_modules/preact/index").JSXInternal.Element
->() => <div></div> : () => import("/node_modules/preact/index").JSXInternal.Element
-><div></div> : import("/node_modules/preact/index").JSXInternal.Element
+>Comp : () => import("preact").JSXInternal.Element
+>() => <div></div> : () => import("preact").JSXInternal.Element
+><div></div> : import("preact").JSXInternal.Element
 >div : any
 >div : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespace.types.diff b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespace.types.diff
index 39e65b31a3..69c33cacab 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespace.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespace.types.diff
@@ -104,4 +104,12 @@
 +>JSXInternal : any
 
  === /index.tsx ===
- export const Comp = () => <div></div>;
\ No newline at end of file
+ export const Comp = () => <div></div>;
+->Comp : () => import("/node_modules/preact/index").JSXInternal.Element
+->() => <div></div> : () => import("/node_modules/preact/index").JSXInternal.Element
+-><div></div> : import("/node_modules/preact/index").JSXInternal.Element
++>Comp : () => import("preact").JSXInternal.Element
++>() => <div></div> : () => import("preact").JSXInternal.Element
++><div></div> : import("preact").JSXInternal.Element
+ >div : any
+ >div : any
diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=preserve).types b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=preserve).types
index b8ff46c0c9..19ff9c0c8d 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=preserve).types
+++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=preserve).types
@@ -105,9 +105,9 @@ export namespace EmotionJSX {
 
 === /index.tsx ===
 export const Comp = () => <div css="color: hotpink;"></div>;
->Comp : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
->() => <div css="color: hotpink;"></div> : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
-><div css="color: hotpink;"></div> : import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+>Comp : () => import("@emotion/react").EmotionJSX.Element
+>() => <div css="color: hotpink;"></div> : () => import("@emotion/react").EmotionJSX.Element
+><div css="color: hotpink;"></div> : import("@emotion/react").EmotionJSX.Element
 >div : any
 >css : string
 >div : any
diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=preserve).types.diff b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=preserve).types.diff
index 4a5b182849..50222e2d09 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=preserve).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=preserve).types.diff
@@ -8,3 +8,17 @@
 +>React : any
 
  declare namespace React {}
+
+@@= skipped -100, +100 lines =@@
+
+ === /index.tsx ===
+ export const Comp = () => <div css="color: hotpink;"></div>;
+->Comp : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+->() => <div css="color: hotpink;"></div> : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+-><div css="color: hotpink;"></div> : import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
++>Comp : () => import("@emotion/react").EmotionJSX.Element
++>() => <div css="color: hotpink;"></div> : () => import("@emotion/react").EmotionJSX.Element
++><div css="color: hotpink;"></div> : import("@emotion/react").EmotionJSX.Element
+ >div : any
+ >css : string
+ >div : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=react-jsx).types b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=react-jsx).types
index b8ff46c0c9..19ff9c0c8d 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=react-jsx).types
+++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=react-jsx).types
@@ -105,9 +105,9 @@ export namespace EmotionJSX {
 
 === /index.tsx ===
 export const Comp = () => <div css="color: hotpink;"></div>;
->Comp : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
->() => <div css="color: hotpink;"></div> : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
-><div css="color: hotpink;"></div> : import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+>Comp : () => import("@emotion/react").EmotionJSX.Element
+>() => <div css="color: hotpink;"></div> : () => import("@emotion/react").EmotionJSX.Element
+><div css="color: hotpink;"></div> : import("@emotion/react").EmotionJSX.Element
 >div : any
 >css : string
 >div : any
diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=react-jsx).types.diff b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=react-jsx).types.diff
index 1abd61d433..d585663eed 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=react-jsx).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromConfigPickedOverGlobalOne(jsx=react-jsx).types.diff
@@ -8,3 +8,17 @@
 +>React : any
 
  declare namespace React {}
+
+@@= skipped -100, +100 lines =@@
+
+ === /index.tsx ===
+ export const Comp = () => <div css="color: hotpink;"></div>;
+->Comp : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+->() => <div css="color: hotpink;"></div> : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+-><div css="color: hotpink;"></div> : import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
++>Comp : () => import("@emotion/react").EmotionJSX.Element
++>() => <div css="color: hotpink;"></div> : () => import("@emotion/react").EmotionJSX.Element
++><div css="color: hotpink;"></div> : import("@emotion/react").EmotionJSX.Element
+ >div : any
+ >css : string
+ >div : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromPragmaPickedOverGlobalOne.types b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromPragmaPickedOverGlobalOne.types
index ed43d79d05..0bb38ba173 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromPragmaPickedOverGlobalOne.types
+++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromPragmaPickedOverGlobalOne.types
@@ -106,9 +106,9 @@ export namespace EmotionJSX {
 === /index.tsx ===
 /* @jsxImportSource @emotion/react */
 export const Comp = () => <div css="color: hotpink;"></div>;
->Comp : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
->() => <div css="color: hotpink;"></div> : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
-><div css="color: hotpink;"></div> : import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+>Comp : () => import("@emotion/react").EmotionJSX.Element
+>() => <div css="color: hotpink;"></div> : () => import("@emotion/react").EmotionJSX.Element
+><div css="color: hotpink;"></div> : import("@emotion/react").EmotionJSX.Element
 >div : any
 >css : string
 >div : any
diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromPragmaPickedOverGlobalOne.types.diff b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromPragmaPickedOverGlobalOne.types.diff
index 800826ad32..0baa714250 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromPragmaPickedOverGlobalOne.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceImplicitImportJSXNamespaceFromPragmaPickedOverGlobalOne.types.diff
@@ -8,3 +8,17 @@
 +>React : any
 
  declare namespace React { }
+
+@@= skipped -101, +101 lines =@@
+ === /index.tsx ===
+ /* @jsxImportSource @emotion/react */
+ export const Comp = () => <div css="color: hotpink;"></div>;
+->Comp : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+->() => <div css="color: hotpink;"></div> : () => import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
+-><div css="color: hotpink;"></div> : import("/node_modules/@emotion/react/jsx-runtime/jsx-namespace").EmotionJSX.Element
++>Comp : () => import("@emotion/react").EmotionJSX.Element
++>() => <div css="color: hotpink;"></div> : () => import("@emotion/react").EmotionJSX.Element
++><div css="color: hotpink;"></div> : import("@emotion/react").EmotionJSX.Element
+ >div : any
+ >css : string
+ >div : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).types b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).types
index 10e32a7579..f9e0364e35 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).types
+++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).types
@@ -102,14 +102,14 @@ export const selfClosing = <img src="./image.png" />;
 
 === index.ts ===
 export * as one from "./one.js";
->one : typeof import("one")
+>one : typeof import("./one.js")
 
 export * as two from "./two.js";
->two : typeof import("two")
+>two : typeof import("./two.js")
 
 export * as three from "./three.js";
->three : typeof import("three")
+>three : typeof import("./three.js")
 
 export * as four from "./four.js";
->four : typeof import("four")
+>four : typeof import("./four.js")
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).types.diff b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).types.diff
new file mode 100644
index 0000000000..9bd7db4427
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).types.diff
@@ -0,0 +1,20 @@
+--- old.jsxRuntimePragma(jsx=preserve).types
++++ new.jsxRuntimePragma(jsx=preserve).types
+@@= skipped -101, +101 lines =@@
+
+ === index.ts ===
+ export * as one from "./one.js";
+->one : typeof import("one")
++>one : typeof import("./one.js")
+
+ export * as two from "./two.js";
+->two : typeof import("two")
++>two : typeof import("./two.js")
+
+ export * as three from "./three.js";
+->three : typeof import("three")
++>three : typeof import("./three.js")
+
+ export * as four from "./four.js";
+->four : typeof import("four")
++>four : typeof import("./four.js")
diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).types b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).types
index 10e32a7579..f9e0364e35 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).types
+++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).types
@@ -102,14 +102,14 @@ export const selfClosing = <img src="./image.png" />;
 
 === index.ts ===
 export * as one from "./one.js";
->one : typeof import("one")
+>one : typeof import("./one.js")
 
 export * as two from "./two.js";
->two : typeof import("two")
+>two : typeof import("./two.js")
 
 export * as three from "./three.js";
->three : typeof import("three")
+>three : typeof import("./three.js")
 
 export * as four from "./four.js";
->four : typeof import("four")
+>four : typeof import("./four.js")
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).types.diff b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).types.diff
new file mode 100644
index 0000000000..42904a177f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).types.diff
@@ -0,0 +1,20 @@
+--- old.jsxRuntimePragma(jsx=react).types
++++ new.jsxRuntimePragma(jsx=react).types
+@@= skipped -101, +101 lines =@@
+
+ === index.ts ===
+ export * as one from "./one.js";
+->one : typeof import("one")
++>one : typeof import("./one.js")
+
+ export * as two from "./two.js";
+->two : typeof import("two")
++>two : typeof import("./two.js")
+
+ export * as three from "./three.js";
+->three : typeof import("three")
++>three : typeof import("./three.js")
+
+ export * as four from "./four.js";
+->four : typeof import("four")
++>four : typeof import("./four.js")
diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).types b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).types
index 10e32a7579..f9e0364e35 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).types
+++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).types
@@ -102,14 +102,14 @@ export const selfClosing = <img src="./image.png" />;
 
 === index.ts ===
 export * as one from "./one.js";
->one : typeof import("one")
+>one : typeof import("./one.js")
 
 export * as two from "./two.js";
->two : typeof import("two")
+>two : typeof import("./two.js")
 
 export * as three from "./three.js";
->three : typeof import("three")
+>three : typeof import("./three.js")
 
 export * as four from "./four.js";
->four : typeof import("four")
+>four : typeof import("./four.js")
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).types.diff b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).types.diff
new file mode 100644
index 0000000000..fae506bd41
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).types.diff
@@ -0,0 +1,20 @@
+--- old.jsxRuntimePragma(jsx=react-jsx).types
++++ new.jsxRuntimePragma(jsx=react-jsx).types
+@@= skipped -101, +101 lines =@@
+
+ === index.ts ===
+ export * as one from "./one.js";
+->one : typeof import("one")
++>one : typeof import("./one.js")
+
+ export * as two from "./two.js";
+->two : typeof import("two")
++>two : typeof import("./two.js")
+
+ export * as three from "./three.js";
+->three : typeof import("three")
++>three : typeof import("./three.js")
+
+ export * as four from "./four.js";
+->four : typeof import("four")
++>four : typeof import("./four.js")
diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).types b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).types
index 10e32a7579..f9e0364e35 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).types
+++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).types
@@ -102,14 +102,14 @@ export const selfClosing = <img src="./image.png" />;
 
 === index.ts ===
 export * as one from "./one.js";
->one : typeof import("one")
+>one : typeof import("./one.js")
 
 export * as two from "./two.js";
->two : typeof import("two")
+>two : typeof import("./two.js")
 
 export * as three from "./three.js";
->three : typeof import("three")
+>three : typeof import("./three.js")
 
 export * as four from "./four.js";
->four : typeof import("four")
+>four : typeof import("./four.js")
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).types.diff b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).types.diff
new file mode 100644
index 0000000000..69fe5313d9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).types.diff
@@ -0,0 +1,20 @@
+--- old.jsxRuntimePragma(jsx=react-jsxdev).types
++++ new.jsxRuntimePragma(jsx=react-jsxdev).types
+@@= skipped -101, +101 lines =@@
+
+ === index.ts ===
+ export * as one from "./one.js";
+->one : typeof import("one")
++>one : typeof import("./one.js")
+
+ export * as two from "./two.js";
+->two : typeof import("two")
++>two : typeof import("./two.js")
+
+ export * as three from "./three.js";
+->three : typeof import("three")
++>three : typeof import("./three.js")
+
+ export * as four from "./four.js";
+->four : typeof import("four")
++>four : typeof import("./four.js")
diff --git a/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.symbols b/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.symbols
index d997c5a153..f9f4caa357 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.symbols
+++ b/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.symbols
@@ -26,7 +26,7 @@ export interface EventList {
 
 === foo.ts ===
 declare module './index' {
->'./index' : Symbol("index", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
+>'./index' : Symbol(".", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
 
     interface EventList {
 >EventList : Symbol(EventList, Decl(eventList.ts, 0, 0), Decl(foo.ts, 0, 26), Decl(bar.ts, 0, 26))
@@ -40,7 +40,7 @@ export {};
 
 === bar.ts ===
 declare module './index' {
->'./index' : Symbol("index", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
+>'./index' : Symbol(".", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
 
     interface EventList {
 >EventList : Symbol(EventList, Decl(eventList.ts, 0, 0), Decl(foo.ts, 0, 26), Decl(bar.ts, 0, 26))
diff --git a/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.symbols.diff b/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.symbols.diff
new file mode 100644
index 0000000000..cfe67d84f9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.symbols.diff
@@ -0,0 +1,20 @@
+--- old.mergeMultipleInterfacesReexported.symbols
++++ new.mergeMultipleInterfacesReexported.symbols
+@@= skipped -25, +25 lines =@@
+
+ === foo.ts ===
+ declare module './index' {
+->'./index' : Symbol("index", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
++>'./index' : Symbol(".", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
+
+     interface EventList {
+ >EventList : Symbol(EventList, Decl(eventList.ts, 0, 0), Decl(foo.ts, 0, 26), Decl(bar.ts, 0, 26))
+@@= skipped -14, +14 lines =@@
+
+ === bar.ts ===
+ declare module './index' {
+->'./index' : Symbol("index", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
++>'./index' : Symbol(".", Decl(index.ts, 0, 0), Decl(foo.ts, 0, 0), Decl(bar.ts, 0, 0))
+
+     interface EventList {
+ >EventList : Symbol(EventList, Decl(eventList.ts, 0, 0), Decl(foo.ts, 0, 26), Decl(bar.ts, 0, 26))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.types b/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.types
index b13e736557..2749b39c0c 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.types
+++ b/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.types
@@ -23,7 +23,7 @@ export interface EventList {
 
 === foo.ts ===
 declare module './index' {
->'./index' : typeof import("index")
+>'./index' : typeof import(".")
 
     interface EventList {
         p1: []
@@ -35,7 +35,7 @@ export {};
 
 === bar.ts ===
 declare module './index' {
->'./index' : typeof import("index")
+>'./index' : typeof import(".")
 
     interface EventList {
         p2: []
diff --git a/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.types.diff b/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.types.diff
new file mode 100644
index 0000000000..f505e644c8
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/mergeMultipleInterfacesReexported.types.diff
@@ -0,0 +1,20 @@
+--- old.mergeMultipleInterfacesReexported.types
++++ new.mergeMultipleInterfacesReexported.types
+@@= skipped -22, +22 lines =@@
+
+ === foo.ts ===
+ declare module './index' {
+->'./index' : typeof import("index")
++>'./index' : typeof import(".")
+
+     interface EventList {
+         p1: []
+@@= skipped -12, +12 lines =@@
+
+ === bar.ts ===
+ declare module './index' {
+->'./index' : typeof import("index")
++>'./index' : typeof import(".")
+
+     interface EventList {
+         p2: []
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.symbols b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.symbols
index 8c61e0efb7..b2e64d9da7 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.symbols
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.symbols
@@ -18,7 +18,7 @@ const y : C = { s: '' }
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
+>'.' : Symbol(".", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
 
   type Row2 = { a: string }
 >Row2 : Symbol(Row2, Decl(a.d.ts, 1, 20))
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.symbols.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.symbols.diff
index 8ace55ccf2..eeaefa03c0 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.symbols.diff
@@ -8,7 +8,11 @@
 +=== a.d.ts ===
  import '.'
  declare module '.' {
- >'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
+->'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
++>'.' : Symbol(".", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
+
+   type Row2 = { a: string }
+ >Row2 : Symbol(Row2, Decl(a.d.ts, 1, 20))
 @@= skipped -14, +14 lines =@@
  >s : Symbol(s, Decl(a.d.ts, 3, 12))
  }
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types
index 18e525d298..79ef7db68a 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types
@@ -19,7 +19,7 @@ const y : C = { s: '' }
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : typeof import("index")
+>'.' : typeof import(".")
 
   type Row2 = { a: string }
 >Row2 : Row2
@@ -32,7 +32,7 @@ declare module '.' {
  
 === index.d.ts ===
 export type {Row2} from './common';
->Row2 : import("common").Row2
+>Row2 : import("./common").Row2
  
 === common.d.ts ===
 export interface Row2 { b: string }
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types.diff
new file mode 100644
index 0000000000..e348ba0579
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types.diff
@@ -0,0 +1,20 @@
+--- old.mergeSymbolReexportInterface.types
++++ new.mergeSymbolReexportInterface.types
+@@= skipped -18, +18 lines =@@
+ === a.d.ts ===
+ import '.'
+ declare module '.' {
+->'.' : typeof import("index")
++>'.' : typeof import(".")
+
+   type Row2 = { a: string }
+ >Row2 : Row2
+@@= skipped -13, +13 lines =@@
+  
+ === index.d.ts ===
+ export type {Row2} from './common';
+->Row2 : import("common").Row2
++>Row2 : import("./common").Row2
+  
+ === common.d.ts ===
+ export interface Row2 { b: string }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.symbols b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.symbols
index 87fde6fddf..3890fd83d6 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.symbols
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.symbols
@@ -20,7 +20,7 @@ const y : C = { s: '' }
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
+>'.' : Symbol(".", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
 
   type Row2<T> = {}
 >Row2 : Symbol(Row2, Decl(a.d.ts, 1, 20))
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.symbols.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.symbols.diff
index 675dcccb80..dd44213a50 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.symbols.diff
@@ -8,7 +8,11 @@
 +=== a.d.ts ===
  import '.'
  declare module '.' {
- >'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
+->'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
++>'.' : Symbol(".", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
+
+   type Row2<T> = {}
+ >Row2 : Symbol(Row2, Decl(a.d.ts, 1, 20))
 @@= skipped -14, +14 lines =@@
  >s : Symbol(s, Decl(a.d.ts, 3, 12))
  }
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types
index 601cff68e6..fd2dcb1525 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types
@@ -21,7 +21,7 @@ const y : C = { s: '' }
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : typeof import("index")
+>'.' : typeof import(".")
 
   type Row2<T> = {}
 >Row2 : Row2<T>
@@ -33,7 +33,7 @@ declare module '.' {
 
 === index.d.ts ===
 export type {Row2} from './common';
->Row2 : import("common").Row2
+>Row2 : import("./common").Row2
 
 === common.d.ts ===
 
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types.diff
new file mode 100644
index 0000000000..efc9c7798a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types.diff
@@ -0,0 +1,19 @@
+--- old.mergeSymbolReexportedTypeAliasInstantiation.types
++++ new.mergeSymbolReexportedTypeAliasInstantiation.types
+@@= skipped -20, +20 lines =@@
+ === a.d.ts ===
+ import '.'
+ declare module '.' {
+->'.' : typeof import("index")
++>'.' : typeof import(".")
+
+   type Row2<T> = {}
+ >Row2 : Row2<T>
+@@= skipped -12, +12 lines =@@
+
+ === index.d.ts ===
+ export type {Row2} from './common';
+->Row2 : import("common").Row2
++>Row2 : import("./common").Row2
+
+ === common.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.symbols b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.symbols
index 423eb1f6c9..6c71a68629 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.symbols
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.symbols
@@ -10,7 +10,7 @@ Row();
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
+>'.' : Symbol(".", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
 
   const Row: () => void;
 >Row : Symbol(Row, Decl(a.d.ts, 2, 7))
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.symbols.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.symbols.diff
index ca362c64d5..97f8254c67 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.symbols.diff
@@ -8,8 +8,10 @@
 +=== a.d.ts ===
  import '.'
  declare module '.' {
- >'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
-@@= skipped -9, +9 lines =@@
+->'.' : Symbol("index", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
++>'.' : Symbol(".", Decl(index.d.ts, 0, 0), Decl(a.d.ts, 0, 10))
+
+   const Row: () => void;
  >Row : Symbol(Row, Decl(a.d.ts, 2, 7))
  }
 
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types
index 6a4425dd53..8487731507 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types
@@ -11,7 +11,7 @@ Row();
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : typeof import("index")
+>'.' : typeof import(".")
 
   const Row: () => void;
 >Row : () => void
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types.diff
new file mode 100644
index 0000000000..818fe950c7
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types.diff
@@ -0,0 +1,11 @@
+--- old.mergeSymbolRexportFunction.types
++++ new.mergeSymbolRexportFunction.types
+@@= skipped -10, +10 lines =@@
+ === a.d.ts ===
+ import '.'
+ declare module '.' {
+->'.' : typeof import("index")
++>'.' : typeof import(".")
+
+   const Row: () => void;
+ >Row : () => void
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/mergedDeclarationExports.types b/testdata/baselines/reference/submodule/compiler/mergedDeclarationExports.types
index 7708915dfa..830c37a287 100644
--- a/testdata/baselines/reference/submodule/compiler/mergedDeclarationExports.types
+++ b/testdata/baselines/reference/submodule/compiler/mergedDeclarationExports.types
@@ -25,7 +25,7 @@ export interface c {}
 // both types (class is also value, but that doesn't matter)
 interface d {}
 export class d {}
->d : import("mergedDeclarationExports").d
+>d : import("./mergedDeclarationExports").d
 
 // both namespaces
 namespace N { }
diff --git a/testdata/baselines/reference/submodule/compiler/mergedDeclarationExports.types.diff b/testdata/baselines/reference/submodule/compiler/mergedDeclarationExports.types.diff
new file mode 100644
index 0000000000..64238443b0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/mergedDeclarationExports.types.diff
@@ -0,0 +1,11 @@
+--- old.mergedDeclarationExports.types
++++ new.mergedDeclarationExports.types
+@@= skipped -24, +24 lines =@@
+ // both types (class is also value, but that doesn't matter)
+ interface d {}
+ export class d {}
+->d : import("mergedDeclarationExports").d
++>d : import("./mergedDeclarationExports").d
+
+ // both namespaces
+ namespace N { }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.symbols b/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.symbols
index 1ab557c289..35aa24fbb3 100644
--- a/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.symbols
+++ b/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.symbols
@@ -3,7 +3,7 @@
 === missingFunctionImplementation2_a.ts ===
 export {};
 declare module "./missingFunctionImplementation2_b" {
->"./missingFunctionImplementation2_b" : Symbol("missingFunctionImplementation2_b", Decl(missingFunctionImplementation2_b.ts, 0, 0), Decl(missingFunctionImplementation2_a.ts, 0, 10))
+>"./missingFunctionImplementation2_b" : Symbol("./missingFunctionImplementation2_b", Decl(missingFunctionImplementation2_b.ts, 0, 0), Decl(missingFunctionImplementation2_a.ts, 0, 10))
 
   export function f(a, b): void;
 >f : Symbol(f, Decl(missingFunctionImplementation2_b.ts, 0, 0), Decl(missingFunctionImplementation2_a.ts, 1, 53))
diff --git a/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.symbols.diff b/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.symbols.diff
new file mode 100644
index 0000000000..a0fb2c519f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.symbols.diff
@@ -0,0 +1,11 @@
+--- old.missingFunctionImplementation2.symbols
++++ new.missingFunctionImplementation2.symbols
+@@= skipped -2, +2 lines =@@
+ === missingFunctionImplementation2_a.ts ===
+ export {};
+ declare module "./missingFunctionImplementation2_b" {
+->"./missingFunctionImplementation2_b" : Symbol("missingFunctionImplementation2_b", Decl(missingFunctionImplementation2_b.ts, 0, 0), Decl(missingFunctionImplementation2_a.ts, 0, 10))
++>"./missingFunctionImplementation2_b" : Symbol("./missingFunctionImplementation2_b", Decl(missingFunctionImplementation2_b.ts, 0, 0), Decl(missingFunctionImplementation2_a.ts, 0, 10))
+
+   export function f(a, b): void;
+ >f : Symbol(f, Decl(missingFunctionImplementation2_b.ts, 0, 0), Decl(missingFunctionImplementation2_a.ts, 1, 53))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.types b/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.types
index a80a7dc8e2..8966813074 100644
--- a/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.types
+++ b/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.types
@@ -3,7 +3,7 @@
 === missingFunctionImplementation2_a.ts ===
 export {};
 declare module "./missingFunctionImplementation2_b" {
->"./missingFunctionImplementation2_b" : typeof import("missingFunctionImplementation2_b")
+>"./missingFunctionImplementation2_b" : typeof import("./missingFunctionImplementation2_b")
 
   export function f(a, b): void;
 >f : { (a?: any, b?: any): any; (a: any, b: any): void; }
diff --git a/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.types.diff b/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.types.diff
new file mode 100644
index 0000000000..9ab292bb0f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/missingFunctionImplementation2.types.diff
@@ -0,0 +1,11 @@
+--- old.missingFunctionImplementation2.types
++++ new.missingFunctionImplementation2.types
+@@= skipped -2, +2 lines =@@
+ === missingFunctionImplementation2_a.ts ===
+ export {};
+ declare module "./missingFunctionImplementation2_b" {
+->"./missingFunctionImplementation2_b" : typeof import("missingFunctionImplementation2_b")
++>"./missingFunctionImplementation2_b" : typeof import("./missingFunctionImplementation2_b")
+
+   export function f(a, b): void;
+ >f : { (a?: any, b?: any): any; (a: any, b: any): void; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.symbols
index 2f9178af10..fa687b8049 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.symbols
@@ -10,7 +10,7 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
 
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.symbols.diff
new file mode 100644
index 0000000000..b8467bf968
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationDeclarationEmit1.symbols
++++ new.moduleAugmentationDeclarationEmit1.symbols
+@@= skipped -9, +9 lines =@@
+ >prototype : Symbol(Observable.prototype)
+
+ declare module "./observable" {
+->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
++>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
+     interface Observable<T> {
+ >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.types
index ebb3f9f81a..b4e6908959 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.types
@@ -16,7 +16,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof import("observable")
+>"./observable" : typeof import("./observable")
 
     interface Observable<T> {
         map<U>(proj: (e:T) => U): Observable<U>
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.types.diff
new file mode 100644
index 0000000000..451868e545
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit1.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationDeclarationEmit1.types
++++ new.moduleAugmentationDeclarationEmit1.types
+@@= skipped -15, +15 lines =@@
+ >function() { } : () => void
+
+ declare module "./observable" {
+->"./observable" : typeof import("observable")
++>"./observable" : typeof import("./observable")
+
+     interface Observable<T> {
+         map<U>(proj: (e:T) => U): Observable<U>
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.symbols
index 67270e4613..3a06de73b4 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.symbols
@@ -10,7 +10,7 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
 
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.symbols.diff
new file mode 100644
index 0000000000..634d13b798
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationDeclarationEmit2.symbols
++++ new.moduleAugmentationDeclarationEmit2.symbols
+@@= skipped -9, +9 lines =@@
+ >prototype : Symbol(Observable.prototype)
+
+ declare module "./observable" {
+->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
++>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
+     interface Observable<T> {
+ >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.types
index a100cfc86a..bc4e53f6f1 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.types
@@ -16,7 +16,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof import("observable")
+>"./observable" : typeof import("./observable")
 
     interface Observable<T> {
         map<U>(proj: (e:T) => U): Observable<U>
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.types.diff
new file mode 100644
index 0000000000..b098ec66ef
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDeclarationEmit2.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationDeclarationEmit2.types
++++ new.moduleAugmentationDeclarationEmit2.types
+@@= skipped -15, +15 lines =@@
+ >function() { } : () => void
+
+ declare module "./observable" {
+->"./observable" : typeof import("observable")
++>"./observable" : typeof import("./observable")
+
+     interface Observable<T> {
+         map<U>(proj: (e:T) => U): Observable<U>
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.symbols
index 0df4700eca..a5b575dad8 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.symbols
@@ -13,7 +13,7 @@ namespace N1 {
 }
 
 declare module "./observable" {
->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(x.ts, 2, 1))
+>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(x.ts, 2, 1))
 
     var x: number;
 >x : Symbol(x, Decl(x.ts, 5, 7))
@@ -72,7 +72,7 @@ declare module "./observable" {
 }
 
 declare module "./test" {
->"./test" : Symbol("test", Decl(test.ts, 0, 0), Decl(x.ts, 20, 1))
+>"./test" : Symbol("./test", Decl(test.ts, 0, 0), Decl(x.ts, 20, 1))
 
     export = N1;
 >N1 : Symbol(N1, Decl(x.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.symbols.diff
new file mode 100644
index 0000000000..40ac540992
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.symbols.diff
@@ -0,0 +1,20 @@
+--- old.moduleAugmentationDisallowedExtensions.symbols
++++ new.moduleAugmentationDisallowedExtensions.symbols
+@@= skipped -12, +12 lines =@@
+ }
+
+ declare module "./observable" {
+->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(x.ts, 2, 1))
++>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(x.ts, 2, 1))
+
+     var x: number;
+ >x : Symbol(x, Decl(x.ts, 5, 7))
+@@= skipped -59, +59 lines =@@
+ }
+
+ declare module "./test" {
+->"./test" : Symbol("test", Decl(test.ts, 0, 0), Decl(x.ts, 20, 1))
++>"./test" : Symbol("./test", Decl(test.ts, 0, 0), Decl(x.ts, 20, 1))
+
+     export = N1;
+ >N1 : Symbol(N1, Decl(x.ts, 0, 0))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.types
index d49e20cd54..6e08037561 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.types
@@ -15,7 +15,7 @@ namespace N1 {
 }
 
 declare module "./observable" {
->"./observable" : typeof import("observable")
+>"./observable" : typeof import("./observable")
 
     var x: number;
 >x : number
@@ -73,7 +73,7 @@ declare module "./observable" {
 }
 
 declare module "./test" {
->"./test" : typeof import("test")
+>"./test" : typeof import("./test")
 
     export = N1;
 >N1 : typeof N1
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.types.diff
new file mode 100644
index 0000000000..09d72edd06
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDisallowedExtensions.types.diff
@@ -0,0 +1,20 @@
+--- old.moduleAugmentationDisallowedExtensions.types
++++ new.moduleAugmentationDisallowedExtensions.types
+@@= skipped -14, +14 lines =@@
+ }
+
+ declare module "./observable" {
+->"./observable" : typeof import("observable")
++>"./observable" : typeof import("./observable")
+
+     var x: number;
+ >x : number
+@@= skipped -58, +58 lines =@@
+ }
+
+ declare module "./test" {
+->"./test" : typeof import("test")
++>"./test" : typeof import("./test")
+
+     export = N1;
+ >N1 : typeof N1
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDuringSyntheticDefaultCheck.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDuringSyntheticDefaultCheck.types
index 2a05f428bb..2904772b46 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDuringSyntheticDefaultCheck.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDuringSyntheticDefaultCheck.types
@@ -8,7 +8,7 @@ import moment = require("moment-timezone");
 
 === node_modules/moment/index.d.ts ===
 declare function moment(): moment.Moment;
->moment : () => import("node_modules/moment/index.d.ts").Moment
+>moment : () => import("moment").Moment
 >moment : any
 
 declare namespace moment {
@@ -18,7 +18,7 @@ declare namespace moment {
   }
 }
 export = moment;
->moment : () => import("node_modules/moment/index.d.ts").Moment
+>moment : () => import("moment").Moment
 
 === node_modules/moment-timezone/index.d.ts ===
 import * as moment from 'moment';
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDuringSyntheticDefaultCheck.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDuringSyntheticDefaultCheck.types.diff
index ce8a9e3a79..d09cfd5039 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDuringSyntheticDefaultCheck.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDuringSyntheticDefaultCheck.types.diff
@@ -10,7 +10,7 @@
  === node_modules/moment/index.d.ts ===
  declare function moment(): moment.Moment;
 ->moment : () => moment.Moment
-+>moment : () => import("node_modules/moment/index.d.ts").Moment
++>moment : () => import("moment").Moment
  >moment : any
 
  declare namespace moment {
@@ -19,7 +19,7 @@
  }
  export = moment;
 ->moment : () => moment.Moment
-+>moment : () => import("node_modules/moment/index.d.ts").Moment
++>moment : () => import("moment").Moment
 
  === node_modules/moment-timezone/index.d.ts ===
  import * as moment from 'moment';
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.symbols
index 9426238c89..4570ee5a96 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.symbols
@@ -10,7 +10,7 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
 
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.symbols.diff
new file mode 100644
index 0000000000..634a6780b3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationExtendFileModule1.symbols
++++ new.moduleAugmentationExtendFileModule1.symbols
+@@= skipped -9, +9 lines =@@
+ >prototype : Symbol(Observable.prototype)
+
+ declare module "./observable" {
+->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
++>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
+     interface Observable<T> {
+ >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.types
index fc0a5df6d4..4a84a166f8 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.types
@@ -16,7 +16,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof import("observable")
+>"./observable" : typeof import("./observable")
 
     interface Observable<T> {
         map<U>(proj: (e:T) => U): Observable<U>
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.types.diff
new file mode 100644
index 0000000000..8bd300c399
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule1.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationExtendFileModule1.types
++++ new.moduleAugmentationExtendFileModule1.types
+@@= skipped -15, +15 lines =@@
+ >function() { } : () => void
+
+ declare module "./observable" {
+->"./observable" : typeof import("observable")
++>"./observable" : typeof import("./observable")
+
+     interface Observable<T> {
+         map<U>(proj: (e:T) => U): Observable<U>
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.symbols
index 8623a239f5..c04e486119 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.symbols
@@ -10,7 +10,7 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
 
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.symbols.diff
new file mode 100644
index 0000000000..8bfbb591b6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationExtendFileModule2.symbols
++++ new.moduleAugmentationExtendFileModule2.symbols
+@@= skipped -9, +9 lines =@@
+ >prototype : Symbol(Observable.prototype)
+
+ declare module "./observable" {
+->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
++>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
+     interface Observable<T> {
+ >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.types
index 9d2c7e0407..666df318d5 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.types
@@ -16,7 +16,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof import("observable")
+>"./observable" : typeof import("./observable")
 
     interface Observable<T> {
         map<U>(proj: (e:T) => U): Observable<U>
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.types.diff
new file mode 100644
index 0000000000..b60ea0ca8c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationExtendFileModule2.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationExtendFileModule2.types
++++ new.moduleAugmentationExtendFileModule2.types
+@@= skipped -15, +15 lines =@@
+ >function() { } : () => void
+
+ declare module "./observable" {
+->"./observable" : typeof import("observable")
++>"./observable" : typeof import("./observable")
+
+     interface Observable<T> {
+         map<U>(proj: (e:T) => U): Observable<U>
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.symbols
index 40e2e57902..0ea72756c0 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.symbols
@@ -28,7 +28,7 @@ A.prototype.foo = function () { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./f1" {
->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 3, 51))
+>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 3, 51))
 
     interface A {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 4, 23))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.symbols.diff
new file mode 100644
index 0000000000..e88f00a9c9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationImportsAndExports1.symbols
++++ new.moduleAugmentationImportsAndExports1.symbols
+@@= skipped -27, +27 lines =@@
+ >undefined : Symbol(undefined)
+
+ declare module "./f1" {
+->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 3, 51))
++>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 3, 51))
+
+     interface A {
+ >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 4, 23))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.types
index 44e15d6671..24300feeff 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.types
@@ -30,7 +30,7 @@ A.prototype.foo = function () { return undefined; }
 >undefined : undefined
 
 declare module "./f1" {
->"./f1" : typeof import("f1")
+>"./f1" : typeof import("./f1")
 
     interface A {
         foo(): B;
@@ -50,9 +50,9 @@ let a: A;
 let b = a.foo().n;
 >b : number
 >a.foo().n : number
->a.foo() : import("f2").B
->a.foo : () => import("f2").B
+>a.foo() : import("./f2").B
+>a.foo : () => import("./f2").B
 >a : A
->foo : () => import("f2").B
+>foo : () => import("./f2").B
 >n : number
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.types.diff
new file mode 100644
index 0000000000..21c00d36c3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports1.types.diff
@@ -0,0 +1,23 @@
+--- old.moduleAugmentationImportsAndExports1.types
++++ new.moduleAugmentationImportsAndExports1.types
+@@= skipped -29, +29 lines =@@
+ >undefined : undefined
+
+ declare module "./f1" {
+->"./f1" : typeof import("f1")
++>"./f1" : typeof import("./f1")
+
+     interface A {
+         foo(): B;
+@@= skipped -20, +20 lines =@@
+ let b = a.foo().n;
+ >b : number
+ >a.foo().n : number
+->a.foo() : import("f2").B
+->a.foo : () => import("f2").B
++>a.foo() : import("./f2").B
++>a.foo : () => import("./f2").B
+ >a : A
+->foo : () => import("f2").B
++>foo : () => import("./f2").B
+ >n : number
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.symbols
index 1cadf1bd8d..eeefc2d8c2 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.symbols
@@ -35,7 +35,7 @@ namespace N {
 }
 
 declare module "./f1" {
->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
+>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
 
     import {B} from "./f2";
 >B : Symbol(B, Decl(f3.ts, 10, 12))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.symbols.diff
new file mode 100644
index 0000000000..0487713187
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationImportsAndExports2.symbols
++++ new.moduleAugmentationImportsAndExports2.symbols
+@@= skipped -34, +34 lines =@@
+ }
+
+ declare module "./f1" {
+->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
++>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
+
+     import {B} from "./f2";
+ >B : Symbol(B, Decl(f3.ts, 10, 12))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.types
index aac290d3dd..9f21ae04f6 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.types
@@ -35,7 +35,7 @@ namespace N {
 }
 
 declare module "./f1" {
->"./f1" : typeof import("f1")
+>"./f1" : typeof import("./f1")
 
     import {B} from "./f2";
 >B : any
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.types.diff
new file mode 100644
index 0000000000..c6aa178e4d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports2.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationImportsAndExports2.types
++++ new.moduleAugmentationImportsAndExports2.types
+@@= skipped -34, +34 lines =@@
+ }
+
+ declare module "./f1" {
+->"./f1" : typeof import("f1")
++>"./f1" : typeof import("./f1")
+
+     import {B} from "./f2";
+ >B : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.symbols
index d2e1435215..5089f310fc 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.symbols
@@ -37,7 +37,7 @@ namespace N {
 }
 
 declare module "./f1" {
->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
+>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
 
     import {B} from "./f2";
 >B : Symbol(B, Decl(f3.ts, 10, 12))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.symbols.diff
new file mode 100644
index 0000000000..b49d0f0c2d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationImportsAndExports3.symbols
++++ new.moduleAugmentationImportsAndExports3.symbols
+@@= skipped -36, +36 lines =@@
+ }
+
+ declare module "./f1" {
+->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
++>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
+
+     import {B} from "./f2";
+ >B : Symbol(B, Decl(f3.ts, 10, 12))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.types
index 7411edc4e1..034fdb6328 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.types
@@ -35,7 +35,7 @@ namespace N {
 }
 
 declare module "./f1" {
->"./f1" : typeof import("f1")
+>"./f1" : typeof import("./f1")
 
     import {B} from "./f2";
 >B : any
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.types.diff
new file mode 100644
index 0000000000..f875ab8ea7
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports3.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationImportsAndExports3.types
++++ new.moduleAugmentationImportsAndExports3.types
+@@= skipped -34, +34 lines =@@
+ }
+
+ declare module "./f1" {
+->"./f1" : typeof import("f1")
++>"./f1" : typeof import("./f1")
+
+     import {B} from "./f2";
+ >B : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.symbols
index c5eaa598d5..2449d8da29 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.symbols
@@ -49,7 +49,7 @@ import C = N.Cls;
 >Cls : Symbol(C, Decl(f3.ts, 6, 39))
 
 declare module "./f1" {
->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
 
     interface A {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.symbols.diff
new file mode 100644
index 0000000000..f679380f69
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationImportsAndExports4.symbols
++++ new.moduleAugmentationImportsAndExports4.symbols
+@@= skipped -48, +48 lines =@@
+ >Cls : Symbol(C, Decl(f3.ts, 6, 39))
+
+ declare module "./f1" {
+->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
++>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+
+     interface A {
+ >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.types
index 6cee735c97..62cf195d61 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.types
@@ -47,7 +47,7 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
->"./f1" : typeof import("f1")
+>"./f1" : typeof import("./f1")
 
     interface A {
         foo(): B;
@@ -73,10 +73,10 @@ let a: A;
 let b = a.foo().n;
 >b : number
 >a.foo().n : number
->a.foo() : import("f2").B
->a.foo : () => import("f2").B
+>a.foo() : import("./f2").B
+>a.foo : () => import("./f2").B
 >a : A
->foo : () => import("f2").B
+>foo : () => import("./f2").B
 >n : number
 
 let c = a.bar().a;
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.types.diff
new file mode 100644
index 0000000000..b5d7bd1b4c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports4.types.diff
@@ -0,0 +1,25 @@
+--- old.moduleAugmentationImportsAndExports4.types
++++ new.moduleAugmentationImportsAndExports4.types
+@@= skipped -46, +46 lines =@@
+ >Cls : C
+
+ declare module "./f1" {
+->"./f1" : typeof import("f1")
++>"./f1" : typeof import("./f1")
+
+     interface A {
+         foo(): B;
+@@= skipped -26, +26 lines =@@
+ let b = a.foo().n;
+ >b : number
+ >a.foo().n : number
+->a.foo() : import("f2").B
+->a.foo : () => import("f2").B
++>a.foo() : import("./f2").B
++>a.foo : () => import("./f2").B
+ >a : A
+->foo : () => import("f2").B
++>foo : () => import("./f2").B
+ >n : number
+
+ let c = a.bar().a;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.symbols
index 7da922f339..ec1d60fe96 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.symbols
@@ -49,7 +49,7 @@ import C = N.Cls;
 >Cls : Symbol(C, Decl(f3.ts, 6, 39))
 
 declare module "./f1" {
->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
 
     interface A {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.symbols.diff
new file mode 100644
index 0000000000..c45258ac70
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationImportsAndExports5.symbols
++++ new.moduleAugmentationImportsAndExports5.symbols
+@@= skipped -48, +48 lines =@@
+ >Cls : Symbol(C, Decl(f3.ts, 6, 39))
+
+ declare module "./f1" {
+->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
++>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+
+     interface A {
+ >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.types
index d65638736e..c1687182e6 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.types
@@ -47,7 +47,7 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
->"./f1" : typeof import("f1")
+>"./f1" : typeof import("./f1")
 
     interface A {
         foo(): B;
@@ -73,10 +73,10 @@ let a: A;
 let b = a.foo().n;
 >b : number
 >a.foo().n : number
->a.foo() : import("f2").B
->a.foo : () => import("f2").B
+>a.foo() : import("./f2").B
+>a.foo : () => import("./f2").B
 >a : A
->foo : () => import("f2").B
+>foo : () => import("./f2").B
 >n : number
 
 let c = a.bar().a;
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.types.diff
new file mode 100644
index 0000000000..b82f4bc32f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports5.types.diff
@@ -0,0 +1,25 @@
+--- old.moduleAugmentationImportsAndExports5.types
++++ new.moduleAugmentationImportsAndExports5.types
+@@= skipped -46, +46 lines =@@
+ >Cls : C
+
+ declare module "./f1" {
+->"./f1" : typeof import("f1")
++>"./f1" : typeof import("./f1")
+
+     interface A {
+         foo(): B;
+@@= skipped -26, +26 lines =@@
+ let b = a.foo().n;
+ >b : number
+ >a.foo().n : number
+->a.foo() : import("f2").B
+->a.foo : () => import("f2").B
++>a.foo() : import("./f2").B
++>a.foo : () => import("./f2").B
+ >a : A
+->foo : () => import("f2").B
++>foo : () => import("./f2").B
+ >n : number
+
+ let c = a.bar().a;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.symbols
index e473b525d7..e3407a6101 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.symbols
@@ -49,7 +49,7 @@ import C = N.Cls;
 >Cls : Symbol(C, Decl(f3.ts, 6, 39))
 
 declare module "./f1" {
->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
 
     interface A {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.symbols.diff
new file mode 100644
index 0000000000..9f9e3310f0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationImportsAndExports6.symbols
++++ new.moduleAugmentationImportsAndExports6.symbols
+@@= skipped -48, +48 lines =@@
+ >Cls : Symbol(C, Decl(f3.ts, 6, 39))
+
+ declare module "./f1" {
+->"./f1" : Symbol("f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
++>"./f1" : Symbol("./f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+
+     interface A {
+ >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.types
index dcfbaa3218..c2a33f1b5e 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.types
@@ -47,7 +47,7 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
->"./f1" : typeof import("f1")
+>"./f1" : typeof import("./f1")
 
     interface A {
         foo(): B;
@@ -73,27 +73,27 @@ let a: A;
 let b = a.foo().n;
 >b : number
 >a.foo().n : number
->a.foo() : import("f2").B
->a.foo : () => import("f2").B
+>a.foo() : import("./f2").B
+>a.foo : () => import("./f2").B
 >a : A
->foo : () => import("f2").B
+>foo : () => import("./f2").B
 >n : number
 
 let c = a.bar().a;
 >c : number
 >a.bar().a : number
->a.bar() : import("f3").N.Ifc
->a.bar : () => import("f3").N.Ifc
+>a.bar() : import("./f3").N.Ifc
+>a.bar : () => import("./f3").N.Ifc
 >a : A
->bar : () => import("f3").N.Ifc
+>bar : () => import("./f3").N.Ifc
 >a : number
 
 let d = a.baz().b;
 >d : number
 >a.baz().b : number
->a.baz() : import("f3").N.Cls
->a.baz : () => import("f3").N.Cls
+>a.baz() : import("./f3").N.Cls
+>a.baz : () => import("./f3").N.Cls
 >a : A
->baz : () => import("f3").N.Cls
+>baz : () => import("./f3").N.Cls
 >b : number
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.types.diff
new file mode 100644
index 0000000000..708dd94e99
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationImportsAndExports6.types.diff
@@ -0,0 +1,47 @@
+--- old.moduleAugmentationImportsAndExports6.types
++++ new.moduleAugmentationImportsAndExports6.types
+@@= skipped -46, +46 lines =@@
+ >Cls : C
+
+ declare module "./f1" {
+->"./f1" : typeof import("f1")
++>"./f1" : typeof import("./f1")
+
+     interface A {
+         foo(): B;
+@@= skipped -26, +26 lines =@@
+ let b = a.foo().n;
+ >b : number
+ >a.foo().n : number
+->a.foo() : import("f2").B
+->a.foo : () => import("f2").B
++>a.foo() : import("./f2").B
++>a.foo : () => import("./f2").B
+ >a : A
+->foo : () => import("f2").B
++>foo : () => import("./f2").B
+ >n : number
+
+ let c = a.bar().a;
+ >c : number
+ >a.bar().a : number
+->a.bar() : import("f3").N.Ifc
+->a.bar : () => import("f3").N.Ifc
++>a.bar() : import("./f3").N.Ifc
++>a.bar : () => import("./f3").N.Ifc
+ >a : A
+->bar : () => import("f3").N.Ifc
++>bar : () => import("./f3").N.Ifc
+ >a : number
+
+ let d = a.baz().b;
+ >d : number
+ >a.baz().b : number
+->a.baz() : import("f3").N.Cls
+->a.baz : () => import("f3").N.Cls
++>a.baz() : import("./f3").N.Cls
++>a.baz : () => import("./f3").N.Cls
+ >a : A
+->baz : () => import("f3").N.Cls
++>baz : () => import("./f3").N.Cls
+ >b : number
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.symbols
index 37b77c5fc8..39d5591043 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.symbols
@@ -10,7 +10,7 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
 
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(map.ts, 4, 31))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.symbols.diff
new file mode 100644
index 0000000000..03f810b590
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationNoNewNames.symbols
++++ new.moduleAugmentationNoNewNames.symbols
+@@= skipped -9, +9 lines =@@
+ >prototype : Symbol(Observable.prototype)
+
+ declare module "./observable" {
+->"./observable" : Symbol("observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
++>"./observable" : Symbol("./observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
+     interface Observable<T> {
+ >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(map.ts, 4, 31))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.types
index cc641a13b1..f95f849dcd 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.types
@@ -16,7 +16,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof import("observable")
+>"./observable" : typeof import("./observable")
 
     interface Observable<T> {
         map<U>(proj: (e:T) => U): Observable<U>
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.types.diff
new file mode 100644
index 0000000000..b934569d24
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationNoNewNames.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationNoNewNames.types
++++ new.moduleAugmentationNoNewNames.types
+@@= skipped -15, +15 lines =@@
+ >function() { } : () => void
+
+ declare module "./observable" {
+->"./observable" : typeof import("observable")
++>"./observable" : typeof import("./observable")
+
+     interface Observable<T> {
+         map<U>(proj: (e:T) => U): Observable<U>
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.symbols
index 656b4dda7a..c4115201c7 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.symbols
@@ -10,7 +10,7 @@ export default I;
 === /b.ts ===
 export {};
 declare module './a' {
->'./a' : Symbol("/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10))
+>'./a' : Symbol("./a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10))
 
     export default interface I { x: number; }
 >I : Symbol(I, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.symbols.diff
new file mode 100644
index 0000000000..b46a68a1ce
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.symbols.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationOfAlias.symbols
++++ new.moduleAugmentationOfAlias.symbols
+@@= skipped -9, +9 lines =@@
+ === /b.ts ===
+ export {};
+ declare module './a' {
+->'./a' : Symbol("/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10))
++>'./a' : Symbol("./a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 10))
+
+     export default interface I { x: number; }
+ >I : Symbol(I, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.types
index 7c8ba4bfa5..571b292bd0 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.types
@@ -8,7 +8,7 @@ export default I;
 === /b.ts ===
 export {};
 declare module './a' {
->'./a' : typeof import("/a")
+>'./a' : typeof import("./a")
 
     export default interface I { x: number; }
 >x : number
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.types.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.types.diff
new file mode 100644
index 0000000000..d92cde03da
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationOfAlias.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleAugmentationOfAlias.types
++++ new.moduleAugmentationOfAlias.types
+@@= skipped -7, +7 lines =@@
+ === /b.ts ===
+ export {};
+ declare module './a' {
+->'./a' : typeof import("/a")
++>'./a' : typeof import("./a")
+
+     export default interface I { x: number; }
+ >x : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleDuplicateIdentifiers.types b/testdata/baselines/reference/submodule/compiler/moduleDuplicateIdentifiers.types
index a6280a56ae..9c78fa8ffa 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleDuplicateIdentifiers.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleDuplicateIdentifiers.types
@@ -44,7 +44,7 @@ export class Kettle {
 }
 
 export class Kettle { // Should error
->Kettle : import("moduleDuplicateIdentifiers").Kettle
+>Kettle : import("./moduleDuplicateIdentifiers").Kettle
 
 	member2 = 42;
 >member2 : number
diff --git a/testdata/baselines/reference/submodule/compiler/moduleDuplicateIdentifiers.types.diff b/testdata/baselines/reference/submodule/compiler/moduleDuplicateIdentifiers.types.diff
new file mode 100644
index 0000000000..f67ed714ec
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleDuplicateIdentifiers.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleDuplicateIdentifiers.types
++++ new.moduleDuplicateIdentifiers.types
+@@= skipped -43, +43 lines =@@
+ }
+
+ export class Kettle { // Should error
+->Kettle : import("moduleDuplicateIdentifiers").Kettle
++>Kettle : import("./moduleDuplicateIdentifiers").Kettle
+
+ 	member2 = 42;
+ >member2 : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols
index 5ea722d79d..761ab55278 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols
@@ -4,12 +4,12 @@
 const eslintReact = require('./eslint-plugin-react.js');
 >eslintReact : Symbol(eslintReact, Decl(eslint.config.js, 0, 5))
 >require : Symbol(require)
->'./eslint-plugin-react.js' : Symbol("eslint-plugin-react", Decl(eslint-plugin-react.js, 0, 0))
+>'./eslint-plugin-react.js' : Symbol("./eslint-plugin-react.js", Decl(eslint-plugin-react.js, 0, 0))
 
 const tseslint = require('./typescript-eslint.js');
 >tseslint : Symbol(tseslint, Decl(eslint.config.js, 1, 5))
 >require : Symbol(require)
->'./typescript-eslint.js' : Symbol("typescript-eslint", Decl(typescript-eslint.js, 0, 0))
+>'./typescript-eslint.js' : Symbol("./typescript-eslint.js", Decl(typescript-eslint.js, 0, 0))
 
 tseslint.config(eslintReact)
 >tseslint.config : Symbol(config, Decl(typescript-eslint.js, 13, 18))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols.diff
index c3a004ee08..23b9d24ecd 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols.diff
@@ -1,11 +1,17 @@
 --- old.moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols
 +++ new.moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols
-@@= skipped -8, +8 lines =@@
+@@= skipped -3, +3 lines =@@
+ const eslintReact = require('./eslint-plugin-react.js');
+ >eslintReact : Symbol(eslintReact, Decl(eslint.config.js, 0, 5))
+ >require : Symbol(require)
+->'./eslint-plugin-react.js' : Symbol("eslint-plugin-react", Decl(eslint-plugin-react.js, 0, 0))
++>'./eslint-plugin-react.js' : Symbol("./eslint-plugin-react.js", Decl(eslint-plugin-react.js, 0, 0))
+
  const tseslint = require('./typescript-eslint.js');
  >tseslint : Symbol(tseslint, Decl(eslint.config.js, 1, 5))
  >require : Symbol(require)
 ->'./typescript-eslint.js' : Symbol(tseslint, Decl(typescript-eslint.js, 0, 0))
-+>'./typescript-eslint.js' : Symbol("typescript-eslint", Decl(typescript-eslint.js, 0, 0))
++>'./typescript-eslint.js' : Symbol("./typescript-eslint.js", Decl(typescript-eslint.js, 0, 0))
 
  tseslint.config(eslintReact)
 ->tseslint.config : Symbol(tseslint.config, Decl(typescript-eslint.js, 13, 18))
@@ -16,7 +22,7 @@
  >eslintReact : Symbol(eslintReact, Decl(eslint.config.js, 0, 5))
 
  === eslint-plugin-react.js ===
-@@= skipped -24, +24 lines =@@
+@@= skipped -29, +29 lines =@@
  }
 
  module.exports = {
diff --git a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.types b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.types
index 6d0c234077..78210a6042 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.types
@@ -8,16 +8,16 @@ const eslintReact = require('./eslint-plugin-react.js');
 >'./eslint-plugin-react.js' : "./eslint-plugin-react.js"
 
 const tseslint = require('./typescript-eslint.js');
->tseslint : { config: (...configs: import("typescript-eslint").Config[]) => void; }
->require('./typescript-eslint.js') : { config: (...configs: import("typescript-eslint").Config[]) => void; }
+>tseslint : { config: (...configs: import("./typescript-eslint.js").Config[]) => void; }
+>require('./typescript-eslint.js') : { config: (...configs: import("./typescript-eslint.js").Config[]) => void; }
 >require : any
 >'./typescript-eslint.js' : "./typescript-eslint.js"
 
 tseslint.config(eslintReact)
 >tseslint.config(eslintReact) : void
->tseslint.config : (...configs: import("typescript-eslint").Config[]) => void
->tseslint : { config: (...configs: import("typescript-eslint").Config[]) => void; }
->config : (...configs: import("typescript-eslint").Config[]) => void
+>tseslint.config : (...configs: import("./typescript-eslint.js").Config[]) => void
+>tseslint : { config: (...configs: import("./typescript-eslint.js").Config[]) => void; }
+>config : (...configs: import("./typescript-eslint.js").Config[]) => void
 >eslintReact : { plugins: { react: { deprecatedRules: { "jsx-sort-default-props": boolean; }; rules: { "no-unsafe": boolean; }; }; }; }
 
 === eslint-plugin-react.js ===
diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols
index 2231926bdd..356c6b0028 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols
@@ -3,7 +3,7 @@
 === /a.ts ===
 const foo = import("./b");
 >foo : Symbol(foo, Decl(a.ts, 0, 5))
->"./b" : Symbol("/b", Decl(b.js, 0, 0))
+>"./b" : Symbol("./b", Decl(b.js, 0, 0))
 
 === /b.js ===
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols.diff
new file mode 100644
index 0000000000..ce856a5afa
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols.diff
@@ -0,0 +1,10 @@
+--- old.moduleNoneDynamicImport(target=es2015).symbols
++++ new.moduleNoneDynamicImport(target=es2015).symbols
+@@= skipped -2, +2 lines =@@
+ === /a.ts ===
+ const foo = import("./b");
+ >foo : Symbol(foo, Decl(a.ts, 0, 5))
+->"./b" : Symbol("/b", Decl(b.js, 0, 0))
++>"./b" : Symbol("./b", Decl(b.js, 0, 0))
+
+ === /b.js ===
diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).types b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).types
index defc0029a8..10d0c86270 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).types
+++ b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).types
@@ -2,8 +2,8 @@
 
 === /a.ts ===
 const foo = import("./b");
->foo : Promise<typeof import("/b")>
->import("./b") : Promise<typeof import("/b")>
+>foo : Promise<typeof import("./b")>
+>import("./b") : Promise<typeof import("./b")>
 >"./b" : "./b"
 
 === /b.js ===
diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols
index 2231926bdd..356c6b0028 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols
@@ -3,7 +3,7 @@
 === /a.ts ===
 const foo = import("./b");
 >foo : Symbol(foo, Decl(a.ts, 0, 5))
->"./b" : Symbol("/b", Decl(b.js, 0, 0))
+>"./b" : Symbol("./b", Decl(b.js, 0, 0))
 
 === /b.js ===
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols.diff
new file mode 100644
index 0000000000..7ba70a3d9c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols.diff
@@ -0,0 +1,10 @@
+--- old.moduleNoneDynamicImport(target=es2020).symbols
++++ new.moduleNoneDynamicImport(target=es2020).symbols
+@@= skipped -2, +2 lines =@@
+ === /a.ts ===
+ const foo = import("./b");
+ >foo : Symbol(foo, Decl(a.ts, 0, 5))
+->"./b" : Symbol("/b", Decl(b.js, 0, 0))
++>"./b" : Symbol("./b", Decl(b.js, 0, 0))
+
+ === /b.js ===
diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).types b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).types
index defc0029a8..10d0c86270 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).types
+++ b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).types
@@ -2,8 +2,8 @@
 
 === /a.ts ===
 const foo = import("./b");
->foo : Promise<typeof import("/b")>
->import("./b") : Promise<typeof import("/b")>
+>foo : Promise<typeof import("./b")>
+>import("./b") : Promise<typeof import("./b")>
 >"./b" : "./b"
 
 === /b.js ===
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols b/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols
index 57e9232fef..e696077582 100644
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols
@@ -7,7 +7,7 @@ import { esm } from "dep";
 const cjs = require("dep");
 >cjs : Symbol(cjs, Decl(main.js, 1, 5))
 >require : Symbol(require)
->"dep" : Symbol("/node_modules/dep/require", Decl(require.d.ts, 0, 0))
+>"dep" : Symbol("dep", Decl(require.d.ts, 0, 0))
 
 === /node_modules/dep/import.d.mts ===
 export const esm: "esm";
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols.diff b/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols.diff
new file mode 100644
index 0000000000..60a68220ee
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols.diff
@@ -0,0 +1,11 @@
+--- old.modulePreserve2.symbols
++++ new.modulePreserve2.symbols
+@@= skipped -6, +6 lines =@@
+ const cjs = require("dep");
+ >cjs : Symbol(cjs, Decl(main.js, 1, 5))
+ >require : Symbol(require)
+->"dep" : Symbol("/node_modules/dep/require", Decl(require.d.ts, 0, 0))
++>"dep" : Symbol("dep", Decl(require.d.ts, 0, 0))
+
+ === /node_modules/dep/import.d.mts ===
+ export const esm: "esm";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols b/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols
index ec9a19af94..58d90d669d 100644
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols
@@ -6,9 +6,9 @@ export const x = 0;
 
 module.exports.y = 0; // Error
 >module.exports.y : Symbol(y, Decl(a.js, 0, 19))
->module.exports : Symbol("/a", Decl(a.js, 0, 0))
+>module.exports : Symbol("./a", Decl(a.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("/a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >y : Symbol(y, Decl(a.js, 0, 19))
 
 === /b.ts ===
@@ -37,7 +37,7 @@ export default 0;
 === /g.js ===
 exports.default = 0;
 >exports.default : Symbol(default, Decl(g.js, 0, 0))
->exports : Symbol("/g", Decl(g.js, 0, 0))
+>exports : Symbol("./g", Decl(g.js, 0, 0))
 >default : Symbol(default, Decl(g.js, 0, 0))
 
 === /main1.ts ===
@@ -105,7 +105,7 @@ d2.default(); // Error
 
 const d3 = await import("./d"); // { default: [Function: default] }
 >d3 : Symbol(d3, Decl(main1.ts, 19, 5))
->"./d" : Symbol("/d", Decl(d.ts, 0, 0))
+>"./d" : Symbol("./d", Decl(d.ts, 0, 0))
 
 d3.default();
 >d3.default : Symbol(default)
@@ -225,7 +225,7 @@ import c1 from "./c"; // { default: [Function: default] }
 const c2 = require("./c"); // { default: [Function: default] }
 >c2 : Symbol(c2, Decl(main3.cjs, 8, 5))
 >require : Symbol(require)
->"./c" : Symbol("/c", Decl(c.ts, 0, 0))
+>"./c" : Symbol("./c", Decl(c.ts, 0, 0))
 
 import d1 from "./d"; // [Function: default]
 >d1 : Symbol(d1, Decl(main3.cjs, 9, 6))
@@ -233,7 +233,7 @@ import d1 from "./d"; // [Function: default]
 const d2 = require("./d"); // [Function: default]
 >d2 : Symbol(d2, Decl(main3.cjs, 10, 5))
 >require : Symbol(require)
->"./d" : Symbol("/d", Decl(d.ts, 0, 0))
+>"./d" : Symbol("./d", Decl(d.ts, 0, 0))
 
 import e1 from "./e.mjs"; // 0
 >e1 : Symbol(e1, Decl(main3.cjs, 11, 6))
@@ -241,7 +241,7 @@ import e1 from "./e.mjs"; // 0
 const e2 = require("./e.mjs"); // 0
 >e2 : Symbol(e2, Decl(main3.cjs, 12, 5))
 >require : Symbol(require)
->"./e.mjs" : Symbol("/e", Decl(e.mts, 0, 0))
+>"./e.mjs" : Symbol("./e.mjs", Decl(e.mts, 0, 0))
 
 import f1 from "./f.cjs"; // 0
 >f1 : Symbol(f1, Decl(main3.cjs, 13, 6))
@@ -262,7 +262,7 @@ const g2 = require("./g"); // { default: 0 }
 === /main4.cjs ===
 exports.x = require("./g");
 >exports.x : Symbol(x, Decl(main4.cjs, 0, 0))
->exports : Symbol("/main4", Decl(main4.cjs, 0, 0))
+>exports : Symbol("./main4.cjs", Decl(main4.cjs, 0, 0))
 >x : Symbol(x, Decl(main4.cjs, 0, 0))
 >require : Symbol(require)
 
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols.diff b/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols.diff
index 2cf5e1aeb9..83d2202e80 100644
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols.diff
@@ -5,9 +5,9 @@
 
  module.exports.y = 0; // Error
 +>module.exports.y : Symbol(y, Decl(a.js, 0, 19))
-+>module.exports : Symbol("/a", Decl(a.js, 0, 0))
++>module.exports : Symbol("./a", Decl(a.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("/a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
 +>y : Symbol(y, Decl(a.js, 0, 19))
 
  === /b.ts ===
@@ -17,11 +17,20 @@
  exports.default = 0;
  >exports.default : Symbol(default, Decl(g.js, 0, 0))
 ->exports : Symbol(default, Decl(g.js, 0, 0))
-+>exports : Symbol("/g", Decl(g.js, 0, 0))
++>exports : Symbol("./g", Decl(g.js, 0, 0))
  >default : Symbol(default, Decl(g.js, 0, 0))
 
  === /main1.ts ===
-@@= skipped -96, +96 lines =@@
+@@= skipped -68, +68 lines =@@
+
+ const d3 = await import("./d"); // { default: [Function: default] }
+ >d3 : Symbol(d3, Decl(main1.ts, 19, 5))
+->"./d" : Symbol("/d", Decl(d.ts, 0, 0))
++>"./d" : Symbol("./d", Decl(d.ts, 0, 0))
+
+ d3.default();
+ >d3.default : Symbol(default)
+@@= skipped -28, +28 lines =@@
  >g1 : Symbol(g1, Decl(main1.ts, 28, 6))
 
  g1.default;
@@ -41,7 +50,34 @@
 
  === /main2.mts ===
  import { x, y } from "./a"; // No y
-@@= skipped -126, +124 lines =@@
+@@= skipped -94, +92 lines =@@
+ const c2 = require("./c"); // { default: [Function: default] }
+ >c2 : Symbol(c2, Decl(main3.cjs, 8, 5))
+ >require : Symbol(require)
+->"./c" : Symbol("/c", Decl(c.ts, 0, 0))
++>"./c" : Symbol("./c", Decl(c.ts, 0, 0))
+
+ import d1 from "./d"; // [Function: default]
+ >d1 : Symbol(d1, Decl(main3.cjs, 9, 6))
+@@= skipped -8, +8 lines =@@
+ const d2 = require("./d"); // [Function: default]
+ >d2 : Symbol(d2, Decl(main3.cjs, 10, 5))
+ >require : Symbol(require)
+->"./d" : Symbol("/d", Decl(d.ts, 0, 0))
++>"./d" : Symbol("./d", Decl(d.ts, 0, 0))
+
+ import e1 from "./e.mjs"; // 0
+ >e1 : Symbol(e1, Decl(main3.cjs, 11, 6))
+@@= skipped -8, +8 lines =@@
+ const e2 = require("./e.mjs"); // 0
+ >e2 : Symbol(e2, Decl(main3.cjs, 12, 5))
+ >require : Symbol(require)
+->"./e.mjs" : Symbol("/e", Decl(e.mts, 0, 0))
++>"./e.mjs" : Symbol("./e.mjs", Decl(e.mts, 0, 0))
+
+ import f1 from "./f.cjs"; // 0
+ >f1 : Symbol(f1, Decl(main3.cjs, 13, 6))
+@@= skipped -16, +16 lines =@@
  const g2 = require("./g"); // { default: 0 }
  >g2 : Symbol(g2, Decl(main3.cjs, 17, 5))
  >require : Symbol(require)
@@ -52,7 +88,7 @@
  exports.x = require("./g");
  >exports.x : Symbol(x, Decl(main4.cjs, 0, 0))
 ->exports : Symbol(x, Decl(main4.cjs, 0, 0))
-+>exports : Symbol("/main4", Decl(main4.cjs, 0, 0))
++>exports : Symbol("./main4.cjs", Decl(main4.cjs, 0, 0))
  >x : Symbol(x, Decl(main4.cjs, 0, 0))
  >require : Symbol(require)
 ->"./g" : Symbol("/g", Decl(g.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve4.types b/testdata/baselines/reference/submodule/compiler/modulePreserve4.types
index 868beda53e..3ab6637395 100644
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve4.types
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve4.types
@@ -8,9 +8,9 @@ export const x = 0;
 module.exports.y = 0; // Error
 >module.exports.y = 0 : 0
 >module.exports.y : 0
->module.exports : typeof import("/a")
->module : { "\"/a\"": typeof import("/a"); }
->exports : typeof import("/a")
+>module.exports : typeof import("./a")
+>module : { "\"/a\"": typeof import("./a"); }
+>exports : typeof import("./a")
 >y : 0
 >0 : 0
 
@@ -44,7 +44,7 @@ export default 0;
 exports.default = 0;
 >exports.default = 0 : 0
 >exports.default : 0
->exports : typeof import("/g")
+>exports : typeof import("./g")
 >default : 0
 >0 : 0
 
@@ -299,11 +299,11 @@ const g2 = require("./g"); // { default: 0 }
 
 === /main4.cjs ===
 exports.x = require("./g");
->exports.x = require("./g") : typeof import("/g")
->exports.x : typeof import("/g")
->exports : typeof import("/main4")
->x : typeof import("/g")
->require("./g") : typeof import("/g")
+>exports.x = require("./g") : typeof import("./g")
+>exports.x : typeof import("./g")
+>exports : typeof import("./main4.cjs")
+>x : typeof import("./g")
+>require("./g") : typeof import("./g")
 >require : any
 >"./g" : "./g"
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
index af8a45085d..41e538c8b6 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
@@ -5,7 +5,7 @@ import * as t from "anotherLib"; // Include the lib that recursively includes op
 >t : typeof t
 
 import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder
->makeSharedOption : () => import("/shared/lib/app").SharedOption
+>makeSharedOption : () => import("@shared/lib/app").SharedOption
 
 === /shared/node_modules/troublesome-lib/lib/Option.d.ts ===
 export class Option {
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types.diff
new file mode 100644
index 0000000000..3164671693
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
++++ new.moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
+@@= skipped -4, +4 lines =@@
+ >t : typeof t
+
+ import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder
+->makeSharedOption : () => import("/shared/lib/app").SharedOption
++>makeSharedOption : () => import("@shared/lib/app").SharedOption
+
+ === /shared/node_modules/troublesome-lib/lib/Option.d.ts ===
+ export class Option {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithRequireAndImport.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithRequireAndImport.types
index 8581abf9e0..5f0000160f 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithRequireAndImport.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithRequireAndImport.types
@@ -5,7 +5,7 @@ declare const require: any;
 >require : any
 
 const a: typeof import('./other') = null as any
->a : typeof import("/other")
+>a : typeof import("./other")
 >null as any : any
 
 function foo() {
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithRequireAndImport.types.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithRequireAndImport.types.diff
new file mode 100644
index 0000000000..0f108c4c39
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithRequireAndImport.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleResolutionWithRequireAndImport.types
++++ new.moduleResolutionWithRequireAndImport.types
+@@= skipped -4, +4 lines =@@
+ >require : any
+
+ const a: typeof import('./other') = null as any
+->a : typeof import("/other")
++>a : typeof import("./other")
+ >null as any : any
+
+ function foo() {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols
index 983b83441e..3a6c752523 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols
@@ -8,7 +8,7 @@ import { ios } from "./foo.js";
 "use strict";
 exports.__esModule = true;
 >exports.__esModule : Symbol(__esModule, Decl(foo.ios.js, 0, 13))
->exports : Symbol("/foo.ios", Decl(foo.ios.js, 0, 0))
+>exports : Symbol("./foo.ios", Decl(foo.ios.js, 0, 0))
 >__esModule : Symbol(__esModule, Decl(foo.ios.js, 0, 13))
 
 function ios() {}
@@ -16,7 +16,7 @@ function ios() {}
 
 exports.ios = ios;
 >exports.ios : Symbol(ios, Decl(foo.ios.js, 2, 17))
->exports : Symbol("/foo.ios", Decl(foo.ios.js, 0, 0))
+>exports : Symbol("./foo.ios", Decl(foo.ios.js, 0, 0))
 >ios : Symbol(ios, Decl(foo.ios.js, 2, 17))
 >ios : Symbol(ios, Decl(foo.ios.js, 1, 26))
 
@@ -24,7 +24,7 @@ exports.ios = ios;
 "use strict";
 exports.__esModule = true;
 >exports.__esModule : Symbol(__esModule, Decl(foo.js, 0, 13))
->exports : Symbol("/foo", Decl(foo.js, 0, 0))
+>exports : Symbol("./foo", Decl(foo.js, 0, 0))
 >__esModule : Symbol(__esModule, Decl(foo.js, 0, 13))
 
 function base() {}
@@ -32,7 +32,7 @@ function base() {}
 
 exports.base = base;
 >exports.base : Symbol(base, Decl(foo.js, 2, 18))
->exports : Symbol("/foo", Decl(foo.js, 0, 0))
+>exports : Symbol("./foo", Decl(foo.js, 0, 0))
 >base : Symbol(base, Decl(foo.js, 2, 18))
 >base : Symbol(base, Decl(foo.js, 1, 26))
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols.diff
index f16dc8a3fe..df513ba2ca 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols.diff
@@ -5,7 +5,7 @@
  exports.__esModule = true;
  >exports.__esModule : Symbol(__esModule, Decl(foo.ios.js, 0, 13))
 ->exports : Symbol(__esModule, Decl(foo.ios.js, 0, 13))
-+>exports : Symbol("/foo.ios", Decl(foo.ios.js, 0, 0))
++>exports : Symbol("./foo.ios", Decl(foo.ios.js, 0, 0))
  >__esModule : Symbol(__esModule, Decl(foo.ios.js, 0, 13))
 
  function ios() {}
@@ -14,7 +14,7 @@
  exports.ios = ios;
  >exports.ios : Symbol(ios, Decl(foo.ios.js, 2, 17))
 ->exports : Symbol(ios, Decl(foo.ios.js, 2, 17))
-+>exports : Symbol("/foo.ios", Decl(foo.ios.js, 0, 0))
++>exports : Symbol("./foo.ios", Decl(foo.ios.js, 0, 0))
  >ios : Symbol(ios, Decl(foo.ios.js, 2, 17))
  >ios : Symbol(ios, Decl(foo.ios.js, 1, 26))
 
@@ -23,7 +23,7 @@
  exports.__esModule = true;
  >exports.__esModule : Symbol(__esModule, Decl(foo.js, 0, 13))
 ->exports : Symbol(__esModule, Decl(foo.js, 0, 13))
-+>exports : Symbol("/foo", Decl(foo.js, 0, 0))
++>exports : Symbol("./foo", Decl(foo.js, 0, 0))
  >__esModule : Symbol(__esModule, Decl(foo.js, 0, 13))
 
  function base() {}
@@ -32,6 +32,6 @@
  exports.base = base;
  >exports.base : Symbol(base, Decl(foo.js, 2, 18))
 ->exports : Symbol(base, Decl(foo.js, 2, 18))
-+>exports : Symbol("/foo", Decl(foo.js, 0, 0))
++>exports : Symbol("./foo", Decl(foo.js, 0, 0))
  >base : Symbol(base, Decl(foo.js, 2, 18))
  >base : Symbol(base, Decl(foo.js, 1, 26))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.types
index 8638ec5dbb..033456f6f1 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.types
@@ -11,7 +11,7 @@ import { ios } from "./foo.js";
 exports.__esModule = true;
 >exports.__esModule = true : true
 >exports.__esModule : true
->exports : typeof import("/foo.ios")
+>exports : typeof import("./foo.ios")
 >__esModule : true
 >true : true
 
@@ -21,7 +21,7 @@ function ios() {}
 exports.ios = ios;
 >exports.ios = ios : () => void
 >exports.ios : () => void
->exports : typeof import("/foo.ios")
+>exports : typeof import("./foo.ios")
 >ios : () => void
 >ios : () => void
 
@@ -32,7 +32,7 @@ exports.ios = ios;
 exports.__esModule = true;
 >exports.__esModule = true : true
 >exports.__esModule : true
->exports : typeof import("/foo")
+>exports : typeof import("./foo")
 >__esModule : true
 >true : true
 
@@ -42,7 +42,7 @@ function base() {}
 exports.base = base;
 >exports.base = base : () => void
 >exports.base : () => void
->exports : typeof import("/foo")
+>exports : typeof import("./foo")
 >base : () => void
 >base : () => void
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.symbols
index 952599a809..f9a551a96e 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.symbols
@@ -7,6 +7,6 @@ import { x } from "../node_modules/foo";
 === /node_modules/foo/index.js ===
 exports.x = 0;
 >exports.x : Symbol(x, Decl(index.js, 0, 0))
->exports : Symbol("/node_modules/foo/index", Decl(index.js, 0, 0))
+>exports : Symbol("foo", Decl(index.js, 0, 0))
 >x : Symbol(x, Decl(index.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.symbols.diff
index ec3db09aa2..7670addc53 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.symbols.diff
@@ -5,5 +5,5 @@
  exports.x = 0;
  >exports.x : Symbol(x, Decl(index.js, 0, 0))
 ->exports : Symbol(x, Decl(index.js, 0, 0))
-+>exports : Symbol("/node_modules/foo/index", Decl(index.js, 0, 0))
++>exports : Symbol("foo", Decl(index.js, 0, 0))
  >x : Symbol(x, Decl(index.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.types b/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.types
index a1fe8e0e8a..67d34851b5 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport.types
@@ -8,7 +8,7 @@ import { x } from "../node_modules/foo";
 exports.x = 0;
 >exports.x = 0 : 0
 >exports.x : 0
->exports : typeof import("/node_modules/foo/index")
+>exports : typeof import("foo")
 >x : 0
 >0 : 0
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleSameValueDuplicateExportedBindings2.types b/testdata/baselines/reference/submodule/compiler/moduleSameValueDuplicateExportedBindings2.types
index 6bb3f9e578..3b9466ce2b 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleSameValueDuplicateExportedBindings2.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleSameValueDuplicateExportedBindings2.types
@@ -7,7 +7,7 @@ export * from "./c";
 
 === b.ts ===
 export {Animals} from "./c";
->Animals : typeof import("c").Animals
+>Animals : typeof import("./c").Animals
 
 === c.ts ===
 export enum Animals {
diff --git a/testdata/baselines/reference/submodule/compiler/moduleSameValueDuplicateExportedBindings2.types.diff b/testdata/baselines/reference/submodule/compiler/moduleSameValueDuplicateExportedBindings2.types.diff
new file mode 100644
index 0000000000..c1744c8e64
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleSameValueDuplicateExportedBindings2.types.diff
@@ -0,0 +1,11 @@
+--- old.moduleSameValueDuplicateExportedBindings2.types
++++ new.moduleSameValueDuplicateExportedBindings2.types
+@@= skipped -6, +6 lines =@@
+
+ === b.ts ===
+ export {Animals} from "./c";
+->Animals : typeof import("c").Animals
++>Animals : typeof import("./c").Animals
+
+ === c.ts ===
+ export enum Animals {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/module_augmentUninstantiatedModule2.types b/testdata/baselines/reference/submodule/compiler/module_augmentUninstantiatedModule2.types
index 4256b711e0..274528dcd4 100644
--- a/testdata/baselines/reference/submodule/compiler/module_augmentUninstantiatedModule2.types
+++ b/testdata/baselines/reference/submodule/compiler/module_augmentUninstantiatedModule2.types
@@ -2,7 +2,7 @@
 
 === module_augmentUninstantiatedModule2.ts ===
 declare var ng: ng.IAngularStatic;
->ng : import("module_augmentUninstantiatedModule2").IAngularStatic
+>ng : import("./module_augmentUninstantiatedModule2").IAngularStatic
 >ng : any
 
 declare module ng {
@@ -19,6 +19,6 @@ declare module ng {
 }
 
 export = ng;
->ng : import("module_augmentUninstantiatedModule2").IAngularStatic
+>ng : import("./module_augmentUninstantiatedModule2").IAngularStatic
 
 
diff --git a/testdata/baselines/reference/submodule/compiler/module_augmentUninstantiatedModule2.types.diff b/testdata/baselines/reference/submodule/compiler/module_augmentUninstantiatedModule2.types.diff
index 2f98d353d6..f76d2f63ad 100644
--- a/testdata/baselines/reference/submodule/compiler/module_augmentUninstantiatedModule2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/module_augmentUninstantiatedModule2.types.diff
@@ -5,7 +5,7 @@
  === module_augmentUninstantiatedModule2.ts ===
  declare var ng: ng.IAngularStatic;
 ->ng : ng.IAngularStatic
-+>ng : import("module_augmentUninstantiatedModule2").IAngularStatic
++>ng : import("./module_augmentUninstantiatedModule2").IAngularStatic
  >ng : any
 
  declare module ng {
@@ -14,5 +14,5 @@
 
  export = ng;
 ->ng : ng.IAngularStatic
-+>ng : import("module_augmentUninstantiatedModule2").IAngularStatic
++>ng : import("./module_augmentUninstantiatedModule2").IAngularStatic
 
diff --git a/testdata/baselines/reference/submodule/compiler/multiImportExport.types b/testdata/baselines/reference/submodule/compiler/multiImportExport.types
index 3ce375d4e2..38e0323719 100644
--- a/testdata/baselines/reference/submodule/compiler/multiImportExport.types
+++ b/testdata/baselines/reference/submodule/compiler/multiImportExport.types
@@ -5,17 +5,17 @@ import Drawing = require('./Drawing');
 >Drawing : typeof Drawing
 
 var addr = new Drawing.Math.Adder();
->addr : import("Math/Adder")
->new Drawing.Math.Adder() : import("Math/Adder")
->Drawing.Math.Adder : typeof import("Math/Adder")
->Drawing.Math : { Adder: typeof import("Math/Adder"); }
+>addr : import("./Math/Adder")
+>new Drawing.Math.Adder() : import("./Math/Adder")
+>Drawing.Math.Adder : typeof import("./Math/Adder")
+>Drawing.Math : { Adder: typeof import("./Math/Adder"); }
 >Drawing : typeof Drawing
->Math : { Adder: typeof import("Math/Adder"); }
->Adder : typeof import("Math/Adder")
+>Math : { Adder: typeof import("./Math/Adder"); }
+>Adder : typeof import("./Math/Adder")
 
 === Drawing.ts ===
 export import Math = require('./Math/Math')
->Math : { Adder: typeof import("Math/Adder"); }
+>Math : { Adder: typeof import("./Math/Adder"); }
 
 === Math/Math.ts ===
 import Adder = require('./Adder');
diff --git a/testdata/baselines/reference/submodule/compiler/multiImportExport.types.diff b/testdata/baselines/reference/submodule/compiler/multiImportExport.types.diff
new file mode 100644
index 0000000000..9786cce570
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/multiImportExport.types.diff
@@ -0,0 +1,27 @@
+--- old.multiImportExport.types
++++ new.multiImportExport.types
+@@= skipped -4, +4 lines =@@
+ >Drawing : typeof Drawing
+
+ var addr = new Drawing.Math.Adder();
+->addr : import("Math/Adder")
+->new Drawing.Math.Adder() : import("Math/Adder")
+->Drawing.Math.Adder : typeof import("Math/Adder")
+->Drawing.Math : { Adder: typeof import("Math/Adder"); }
++>addr : import("./Math/Adder")
++>new Drawing.Math.Adder() : import("./Math/Adder")
++>Drawing.Math.Adder : typeof import("./Math/Adder")
++>Drawing.Math : { Adder: typeof import("./Math/Adder"); }
+ >Drawing : typeof Drawing
+->Math : { Adder: typeof import("Math/Adder"); }
+->Adder : typeof import("Math/Adder")
++>Math : { Adder: typeof import("./Math/Adder"); }
++>Adder : typeof import("./Math/Adder")
+
+ === Drawing.ts ===
+ export import Math = require('./Math/Math')
+->Math : { Adder: typeof import("Math/Adder"); }
++>Math : { Adder: typeof import("./Math/Adder"); }
+
+ === Math/Math.ts ===
+ import Adder = require('./Adder');
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types b/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types
index 4d68f4ca5c..535abea1c8 100644
--- a/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types
+++ b/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types
@@ -18,16 +18,16 @@ declare namespace Foo {
 }
 
 declare function Foo(opts?: Foo.Whatever): void;
->Foo : { (opts?: import("file").Whatever): void; (cb: Function, opts?: import("file").Whatever): void; }
->opts : import("file").Whatever
+>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
+>opts : import("./file").Whatever
 >Foo : any
 
 declare function Foo(cb: Function, opts?: Foo.Whatever): void;
->Foo : { (opts?: import("file").Whatever): void; (cb: Function, opts?: import("file").Whatever): void; }
+>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
 >cb : Function
->opts : import("file").Whatever
+>opts : import("./file").Whatever
 >Foo : any
 
 export = Foo;
->Foo : { (opts?: import("file").Whatever): void; (cb: Function, opts?: import("file").Whatever): void; }
+>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types.diff b/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types.diff
index 779f9ad022..60884aaa44 100644
--- a/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types.diff
@@ -6,18 +6,18 @@
  declare function Foo(opts?: Foo.Whatever): void;
 ->Foo : { (opts?: Foo.Whatever): void; (cb: Function, opts?: Foo.Whatever): void; }
 ->opts : Foo.Whatever
-+>Foo : { (opts?: import("file").Whatever): void; (cb: Function, opts?: import("file").Whatever): void; }
-+>opts : import("file").Whatever
++>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
++>opts : import("./file").Whatever
  >Foo : any
 
  declare function Foo(cb: Function, opts?: Foo.Whatever): void;
 ->Foo : { (opts?: Foo.Whatever): void; (cb: Function, opts?: Foo.Whatever): void; }
-+>Foo : { (opts?: import("file").Whatever): void; (cb: Function, opts?: import("file").Whatever): void; }
++>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
  >cb : Function
 ->opts : Foo.Whatever
-+>opts : import("file").Whatever
++>opts : import("./file").Whatever
  >Foo : any
 
  export = Foo;
 ->Foo : { (opts?: Foo.Whatever): void; (cb: Function, opts?: Foo.Whatever): void; }
-+>Foo : { (opts?: import("file").Whatever): void; (cb: Function, opts?: import("file").Whatever): void; }
++>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
diff --git a/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types b/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types
index 0aeec12f99..9427b0b615 100644
--- a/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types
+++ b/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types
@@ -2,7 +2,7 @@
 
 === /other.d.ts ===
 export as namespace SomeInterface;
->SomeInterface : typeof import("/other")
+>SomeInterface : typeof import("./other")
 
 export type Action = "PUSH" | "POP" | "REPLACE";
 >Action : Action
@@ -13,5 +13,5 @@ interface SomeInterface {
 >length : number
 }
 declare const value: SomeInterface;
->value : import("/other")
+>value : import("./other")
 
diff --git a/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types.diff b/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types.diff
new file mode 100644
index 0000000000..86e4da1609
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types.diff
@@ -0,0 +1,17 @@
+--- old.noCrashUMDMergedWithGlobalValue.types
++++ new.noCrashUMDMergedWithGlobalValue.types
+@@= skipped -1, +1 lines =@@
+
+ === /other.d.ts ===
+ export as namespace SomeInterface;
+->SomeInterface : typeof import("/other")
++>SomeInterface : typeof import("./other")
+
+ export type Action = "PUSH" | "POP" | "REPLACE";
+ >Action : Action
+@@= skipped -11, +11 lines =@@
+ >length : number
+ }
+ declare const value: SomeInterface;
+->value : import("/other")
++>value : import("./other")
diff --git a/testdata/baselines/reference/submodule/compiler/nodeModuleReexportFromDottedPath.types b/testdata/baselines/reference/submodule/compiler/nodeModuleReexportFromDottedPath.types
index ad3363dc2b..c6056cdc9a 100644
--- a/testdata/baselines/reference/submodule/compiler/nodeModuleReexportFromDottedPath.types
+++ b/testdata/baselines/reference/submodule/compiler/nodeModuleReexportFromDottedPath.types
@@ -33,6 +33,6 @@ const EnhancedPrisma = enhancePrisma(PrismaClient);
 >PrismaClient : typeof PrismaClient
 
 export default new EnhancedPrisma();
->new EnhancedPrisma() : PrismaClient<import("/node_modules/.prisma/client/index").PrismaClientOptions>
+>new EnhancedPrisma() : PrismaClient<import(".prisma").PrismaClientOptions>
 >EnhancedPrisma : typeof PrismaClient & { enhanced: unknown; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/nodeModuleReexportFromDottedPath.types.diff b/testdata/baselines/reference/submodule/compiler/nodeModuleReexportFromDottedPath.types.diff
new file mode 100644
index 0000000000..317254a954
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/nodeModuleReexportFromDottedPath.types.diff
@@ -0,0 +1,9 @@
+--- old.nodeModuleReexportFromDottedPath.types
++++ new.nodeModuleReexportFromDottedPath.types
+@@= skipped -32, +32 lines =@@
+ >PrismaClient : typeof PrismaClient
+
+ export default new EnhancedPrisma();
+->new EnhancedPrisma() : PrismaClient<import("/node_modules/.prisma/client/index").PrismaClientOptions>
++>new EnhancedPrisma() : PrismaClient<import(".prisma").PrismaClientOptions>
+ >EnhancedPrisma : typeof PrismaClient & { enhanced: unknown; }
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols
index ad11b82ca7..07ec89c3b2 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols
@@ -6,7 +6,7 @@ export type LocalInterface =
 
     & import("pkg", { assert: {1234, "resolution-mode": "require"} }).RequireInterface
     & import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >assert : Symbol(assert, Decl(index.ts, 2, 21))
 >1234 : Symbol(1234, Decl(index.ts, 2, 31))
 >"resolution-mode" : Symbol("resolution-mode", Decl(index.ts, 2, 36))
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols.diff b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols.diff
new file mode 100644
index 0000000000..89b107e07e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols.diff
@@ -0,0 +1,11 @@
+--- old.parseAssertEntriesError.symbols
++++ new.parseAssertEntriesError.symbols
+@@= skipped -5, +5 lines =@@
+
+     & import("pkg", { assert: {1234, "resolution-mode": "require"} }).RequireInterface
+     & import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >assert : Symbol(assert, Decl(index.ts, 2, 21))
+ >1234 : Symbol(1234, Decl(index.ts, 2, 31))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(index.ts, 2, 36))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
index 88bc0595d0..95aadfc21a 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
@@ -14,7 +14,7 @@ export type LocalInterface =
 
     & import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface;
 >import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface : any
->import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{ assert: {1234, "resolution-mode": "import"} } : { assert: { 1234: any; "resolution-mode": string; }; }
 >assert : { 1234: any; "resolution-mode": string; }
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
new file mode 100644
index 0000000000..efaaa05a3c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
@@ -0,0 +1,11 @@
+--- old.parseAssertEntriesError.types
++++ new.parseAssertEntriesError.types
+@@= skipped -13, +13 lines =@@
+
+     & import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface;
+ >import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface : any
+->import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >{ assert: {1234, "resolution-mode": "import"} } : { assert: { 1234: any; "resolution-mode": string; }; }
+ >assert : { 1234: any; "resolution-mode": string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols
index c5717d367b..8bf1e368d7 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols
@@ -6,7 +6,7 @@ export type LocalInterface =
 
     & import("pkg", { with: {1234, "resolution-mode": "require"} }).RequireInterface
     & import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >with : Symbol(with, Decl(index.ts, 2, 21))
 >1234 : Symbol(1234, Decl(index.ts, 2, 29))
 >"resolution-mode" : Symbol("resolution-mode", Decl(index.ts, 2, 34))
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols.diff b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols.diff
new file mode 100644
index 0000000000..13889d66ca
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols.diff
@@ -0,0 +1,11 @@
+--- old.parseImportAttributesError.symbols
++++ new.parseImportAttributesError.symbols
+@@= skipped -5, +5 lines =@@
+
+     & import("pkg", { with: {1234, "resolution-mode": "require"} }).RequireInterface
+     & import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >with : Symbol(with, Decl(index.ts, 2, 21))
+ >1234 : Symbol(1234, Decl(index.ts, 2, 29))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(index.ts, 2, 34))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
index 60ba390c49..6922d4224c 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
@@ -14,7 +14,7 @@ export type LocalInterface =
 
     & import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface;
 >import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface : any
->import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{ with: {1234, "resolution-mode": "import"} } : { with: { 1234: any; "resolution-mode": string; }; }
 >with : { 1234: any; "resolution-mode": string; }
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
new file mode 100644
index 0000000000..05611d7b67
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
@@ -0,0 +1,11 @@
+--- old.parseImportAttributesError.types
++++ new.parseImportAttributesError.types
+@@= skipped -13, +13 lines =@@
+
+     & import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface;
+ >import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface : any
+->import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >{ with: {1234, "resolution-mode": "import"} } : { with: { 1234: any; "resolution-mode": string; }; }
+ >with : { 1234: any; "resolution-mode": string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/privacyCannotNameAccessorDeclFile.types b/testdata/baselines/reference/submodule/compiler/privacyCannotNameAccessorDeclFile.types
index 418dc46f72..31e0432639 100644
--- a/testdata/baselines/reference/submodule/compiler/privacyCannotNameAccessorDeclFile.types
+++ b/testdata/baselines/reference/submodule/compiler/privacyCannotNameAccessorDeclFile.types
@@ -8,40 +8,40 @@ export class publicClassWithWithPrivateGetAccessorTypes {
 >publicClassWithWithPrivateGetAccessorTypes : publicClassWithWithPrivateGetAccessorTypes
 
     static get myPublicStaticMethod() { // Error
->myPublicStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>myPublicStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
     }
     private static get myPrivateStaticMethod() {
->myPrivateStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>myPrivateStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
     }
     get myPublicMethod() { // Error
->myPublicMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>myPublicMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
     }
     private get myPrivateMethod() {
->myPrivateMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>myPrivateMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
     }
     static get myPublicStaticMethod1() { // Error
 >myPublicStaticMethod1 : import("GlobalWidgets").Widget3
@@ -85,40 +85,40 @@ class privateClassWithWithPrivateGetAccessorTypes {
 >privateClassWithWithPrivateGetAccessorTypes : privateClassWithWithPrivateGetAccessorTypes
 
     static get myPublicStaticMethod() { 
->myPublicStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>myPublicStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
     }
     private static get myPrivateStaticMethod() {
->myPrivateStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>myPrivateStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
     }
     get myPublicMethod() { 
->myPublicMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>myPublicMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
     }
     private get myPrivateMethod() {
->myPrivateMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>myPrivateMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
     }
     static get myPublicStaticMethod1() { 
 >myPublicStaticMethod1 : import("GlobalWidgets").Widget3
@@ -162,22 +162,22 @@ export class publicClassWithPrivateModuleGetAccessorTypes {
 >publicClassWithPrivateModuleGetAccessorTypes : publicClassWithPrivateModuleGetAccessorTypes
 
     static get myPublicStaticMethod() { // Error
->myPublicStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
 
         return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
     }
     get myPublicMethod() { // Error
->myPublicMethod : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
 
         return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
     }
     static get myPublicStaticMethod1() { // Error
 >myPublicStaticMethod1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
@@ -203,22 +203,22 @@ class privateClassWithPrivateModuleGetAccessorTypes {
 >privateClassWithPrivateModuleGetAccessorTypes : privateClassWithPrivateModuleGetAccessorTypes
 
     static get myPublicStaticMethod() { 
->myPublicStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
 
         return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
     }
     get myPublicMethod() { 
->myPublicMethod : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
 
         return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
     }
     static get myPublicStaticMethod1() { 
 >myPublicStaticMethod1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
diff --git a/testdata/baselines/reference/submodule/compiler/privacyCannotNameAccessorDeclFile.types.diff b/testdata/baselines/reference/submodule/compiler/privacyCannotNameAccessorDeclFile.types.diff
new file mode 100644
index 0000000000..40f2976829
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/privacyCannotNameAccessorDeclFile.types.diff
@@ -0,0 +1,178 @@
+--- old.privacyCannotNameAccessorDeclFile.types
++++ new.privacyCannotNameAccessorDeclFile.types
+@@= skipped -7, +7 lines =@@
+ >publicClassWithWithPrivateGetAccessorTypes : publicClassWithWithPrivateGetAccessorTypes
+
+     static get myPublicStaticMethod() { // Error
+->myPublicStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>myPublicStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+     }
+     private static get myPrivateStaticMethod() {
+->myPrivateStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>myPrivateStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+     }
+     get myPublicMethod() { // Error
+->myPublicMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>myPublicMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+     }
+     private get myPrivateMethod() {
+->myPrivateMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>myPrivateMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+     }
+     static get myPublicStaticMethod1() { // Error
+ >myPublicStaticMethod1 : import("GlobalWidgets").Widget3
+@@= skipped -77, +77 lines =@@
+ >privateClassWithWithPrivateGetAccessorTypes : privateClassWithWithPrivateGetAccessorTypes
+
+     static get myPublicStaticMethod() { 
+->myPublicStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>myPublicStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+     }
+     private static get myPrivateStaticMethod() {
+->myPrivateStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>myPrivateStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+     }
+     get myPublicMethod() { 
+->myPublicMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>myPublicMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+     }
+     private get myPrivateMethod() {
+->myPrivateMethod : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>myPrivateMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameAccessorDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1
+     }
+     static get myPublicStaticMethod1() { 
+ >myPublicStaticMethod1 : import("GlobalWidgets").Widget3
+@@= skipped -77, +77 lines =@@
+ >publicClassWithPrivateModuleGetAccessorTypes : publicClassWithPrivateModuleGetAccessorTypes
+
+     static get myPublicStaticMethod() { // Error
+->myPublicStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+
+         return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     get myPublicMethod() { // Error
+->myPublicMethod : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+
+         return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     static get myPublicStaticMethod1() { // Error
+ >myPublicStaticMethod1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+@@= skipped -41, +41 lines =@@
+ >privateClassWithPrivateModuleGetAccessorTypes : privateClassWithPrivateModuleGetAccessorTypes
+
+     static get myPublicStaticMethod() { 
+->myPublicStaticMethod : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicStaticMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+
+         return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     get myPublicMethod() { 
+->myPublicMethod : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicMethod : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+
+         return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     static get myPublicStaticMethod1() { 
+ >myPublicStaticMethod1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/privacyCannotNameVarTypeDeclFile.types b/testdata/baselines/reference/submodule/compiler/privacyCannotNameVarTypeDeclFile.types
index 401fe06c3e..76f85534d7 100644
--- a/testdata/baselines/reference/submodule/compiler/privacyCannotNameVarTypeDeclFile.types
+++ b/testdata/baselines/reference/submodule/compiler/privacyCannotNameVarTypeDeclFile.types
@@ -8,32 +8,32 @@ export class publicClassWithWithPrivatePropertyTypes {
 >publicClassWithWithPrivatePropertyTypes : publicClassWithWithPrivatePropertyTypes
 
     static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
->myPublicStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>myPublicStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
     private static myPrivateStaticProperty = exporter.createExportedWidget1();
->myPrivateStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>myPrivateStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
     myPublicProperty = exporter.createExportedWidget1(); // Error
->myPublicProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>myPublicProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
     private myPrivateProperty = exporter.createExportedWidget1();
->myPrivateProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>myPrivateProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
     static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
 >myPublicStaticProperty1 : import("GlobalWidgets").Widget3
@@ -68,32 +68,32 @@ class privateClassWithWithPrivatePropertyTypes {
 >privateClassWithWithPrivatePropertyTypes : privateClassWithWithPrivatePropertyTypes
 
     static myPublicStaticProperty = exporter.createExportedWidget1(); 
->myPublicStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>myPublicStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
     private static myPrivateStaticProperty = exporter.createExportedWidget1();
->myPrivateStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>myPrivateStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
     myPublicProperty = exporter.createExportedWidget1(); 
->myPublicProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>myPublicProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
     private myPrivateProperty = exporter.createExportedWidget1();
->myPrivateProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>myPrivateProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
     static myPublicStaticProperty1 = exporter.createExportedWidget3(); 
 >myPublicStaticProperty1 : import("GlobalWidgets").Widget3
@@ -125,18 +125,18 @@ class privateClassWithWithPrivatePropertyTypes {
 }
 
 export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error
->publicVarWithPrivatePropertyTypes : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>publicVarWithPrivatePropertyTypes : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
 var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1();
->privateVarWithPrivatePropertyTypes : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>privateVarWithPrivatePropertyTypes : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
 
 export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
 >publicVarWithPrivatePropertyTypes1 : import("GlobalWidgets").Widget3
@@ -156,18 +156,18 @@ export class publicClassWithPrivateModulePropertyTypes {
 >publicClassWithPrivateModulePropertyTypes : publicClassWithPrivateModulePropertyTypes
 
     static myPublicStaticProperty= exporter.createExportedWidget2(); // Error
->myPublicStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
     myPublicProperty = exporter.createExportedWidget2(); // Error
->myPublicProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
     static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
 >myPublicStaticProperty1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
@@ -184,11 +184,11 @@ export class publicClassWithPrivateModulePropertyTypes {
 >createExportedWidget4 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
 }
 export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error
->publicVarWithPrivateModulePropertyTypes : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>publicVarWithPrivateModulePropertyTypes : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
 export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
 >publicVarWithPrivateModulePropertyTypes1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
@@ -201,18 +201,18 @@ class privateClassWithPrivateModulePropertyTypes {
 >privateClassWithPrivateModulePropertyTypes : privateClassWithPrivateModulePropertyTypes
 
     static myPublicStaticProperty= exporter.createExportedWidget2();
->myPublicStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
     myPublicProperty= exporter.createExportedWidget2();
->myPublicProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
     static myPublicStaticProperty1 = exporter.createExportedWidget4();
 >myPublicStaticProperty1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
@@ -229,11 +229,11 @@ class privateClassWithPrivateModulePropertyTypes {
 >createExportedWidget4 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
 }
 var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2();
->privateVarWithPrivateModulePropertyTypes : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>privateVarWithPrivateModulePropertyTypes : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
 var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
 >privateVarWithPrivateModulePropertyTypes1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
diff --git a/testdata/baselines/reference/submodule/compiler/privacyCannotNameVarTypeDeclFile.types.diff b/testdata/baselines/reference/submodule/compiler/privacyCannotNameVarTypeDeclFile.types.diff
new file mode 100644
index 0000000000..1eb0cd7175
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/privacyCannotNameVarTypeDeclFile.types.diff
@@ -0,0 +1,213 @@
+--- old.privacyCannotNameVarTypeDeclFile.types
++++ new.privacyCannotNameVarTypeDeclFile.types
+@@= skipped -7, +7 lines =@@
+ >publicClassWithWithPrivatePropertyTypes : publicClassWithWithPrivatePropertyTypes
+
+     static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
+->myPublicStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>myPublicStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+     private static myPrivateStaticProperty = exporter.createExportedWidget1();
+->myPrivateStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>myPrivateStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+     myPublicProperty = exporter.createExportedWidget1(); // Error
+->myPublicProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>myPublicProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+     private myPrivateProperty = exporter.createExportedWidget1();
+->myPrivateProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>myPrivateProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+     static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
+ >myPublicStaticProperty1 : import("GlobalWidgets").Widget3
+@@= skipped -60, +60 lines =@@
+ >privateClassWithWithPrivatePropertyTypes : privateClassWithWithPrivatePropertyTypes
+
+     static myPublicStaticProperty = exporter.createExportedWidget1(); 
+->myPublicStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>myPublicStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+     private static myPrivateStaticProperty = exporter.createExportedWidget1();
+->myPrivateStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>myPrivateStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+     myPublicProperty = exporter.createExportedWidget1(); 
+->myPublicProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>myPublicProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+     private myPrivateProperty = exporter.createExportedWidget1();
+->myPrivateProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>myPrivateProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+     static myPublicStaticProperty1 = exporter.createExportedWidget3(); 
+ >myPublicStaticProperty1 : import("GlobalWidgets").Widget3
+@@= skipped -57, +57 lines =@@
+ }
+
+ export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error
+->publicVarWithPrivatePropertyTypes : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>publicVarWithPrivatePropertyTypes : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+ var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1();
+->privateVarWithPrivatePropertyTypes : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>privateVarWithPrivatePropertyTypes : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").Widget1
+
+ export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
+ >publicVarWithPrivatePropertyTypes1 : import("GlobalWidgets").Widget3
+@@= skipped -31, +31 lines =@@
+ >publicClassWithPrivateModulePropertyTypes : publicClassWithPrivateModulePropertyTypes
+
+     static myPublicStaticProperty= exporter.createExportedWidget2(); // Error
+->myPublicStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+     myPublicProperty = exporter.createExportedWidget2(); // Error
+->myPublicProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+     static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
+ >myPublicStaticProperty1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+@@= skipped -28, +28 lines =@@
+ >createExportedWidget4 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+ }
+ export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error
+->publicVarWithPrivateModulePropertyTypes : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>publicVarWithPrivateModulePropertyTypes : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+ export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
+ >publicVarWithPrivateModulePropertyTypes1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+@@= skipped -17, +17 lines =@@
+ >privateClassWithPrivateModulePropertyTypes : privateClassWithPrivateModulePropertyTypes
+
+     static myPublicStaticProperty= exporter.createExportedWidget2();
+->myPublicStaticProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicStaticProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+     myPublicProperty= exporter.createExportedWidget2();
+->myPublicProperty : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicProperty : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+     static myPublicStaticProperty1 = exporter.createExportedWidget4();
+ >myPublicStaticProperty1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+@@= skipped -28, +28 lines =@@
+ >createExportedWidget4 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+ }
+ var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2();
+->privateVarWithPrivateModulePropertyTypes : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>privateVarWithPrivateModulePropertyTypes : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyCannotNameVarTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+ var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
+ >privateVarWithPrivateModulePropertyTypes1 : import("GlobalWidgets").SpecializedGlobalWidget.Widget4
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.types b/testdata/baselines/reference/submodule/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.types
index 86ab4b3d88..1ce09061df 100644
--- a/testdata/baselines/reference/submodule/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.types
+++ b/testdata/baselines/reference/submodule/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.types
@@ -8,7 +8,7 @@ module Foo {
 interface Foo<T> {
 }
 var Foo: new () => Foo.A<Foo<string>>;
->Foo : new () => import("privacyCheckExportAssignmentOnExportedGenericInterface1").A<Foo<string>>
+>Foo : new () => import("./privacyCheckExportAssignmentOnExportedGenericInterface1").A<Foo<string>>
 >Foo : any
 
 export = Foo;
diff --git a/testdata/baselines/reference/submodule/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.types.diff b/testdata/baselines/reference/submodule/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.types.diff
index 5c77e3ee2e..7bdb638f89 100644
--- a/testdata/baselines/reference/submodule/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.types.diff
@@ -5,7 +5,7 @@
  }
  var Foo: new () => Foo.A<Foo<string>>;
 ->Foo : new () => Foo.A<Foo<string>>
-+>Foo : new () => import("privacyCheckExportAssignmentOnExportedGenericInterface1").A<Foo<string>>
++>Foo : new () => import("./privacyCheckExportAssignmentOnExportedGenericInterface1").A<Foo<string>>
  >Foo : any
 
  export = Foo;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameParameterTypeDeclFile.types b/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameParameterTypeDeclFile.types
index e312161268..edb520e5f6 100644
--- a/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameParameterTypeDeclFile.types
+++ b/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameParameterTypeDeclFile.types
@@ -8,53 +8,53 @@ export class publicClassWithWithPrivateParmeterTypes {
 >publicClassWithWithPrivateParmeterTypes : publicClassWithWithPrivateParmeterTypes
 
     static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
->myPublicStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>myPublicStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
     private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
->myPrivateStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>myPrivateStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
     myPublicMethod(param  = exporter.createExportedWidget1()) { // Error
->myPublicMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>myPublicMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
     private myPrivateMethod(param = exporter.createExportedWidget1()) {
->myPrivateMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>myPrivateMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
     constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->param1 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>param1 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->param2 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>param2 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
 }
 export class publicClassWithWithPrivateParmeterTypes1 {
@@ -115,53 +115,53 @@ class privateClassWithWithPrivateParmeterTypes {
 >privateClassWithWithPrivateParmeterTypes : privateClassWithWithPrivateParmeterTypes
 
     static myPublicStaticMethod(param = exporter.createExportedWidget1()) {
->myPublicStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>myPublicStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
     private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
->myPrivateStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>myPrivateStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
     myPublicMethod(param  = exporter.createExportedWidget1()) {
->myPublicMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>myPublicMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
     private myPrivateMethod(param = exporter.createExportedWidget1()) {
->myPrivateMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>myPrivateMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
     constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) {
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->param1 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>param1 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->param2 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>param2 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
     }
 }
 class privateClassWithWithPrivateParmeterTypes2 {
@@ -219,20 +219,20 @@ class privateClassWithWithPrivateParmeterTypes2 {
 }
 
 export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error
->publicFunctionWithPrivateParmeterTypes : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>publicFunctionWithPrivateParmeterTypes : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 }
 function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) {
->privateFunctionWithPrivateParmeterTypes : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>privateFunctionWithPrivateParmeterTypes : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
 }
 export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error
 >publicFunctionWithPrivateParmeterTypes1 : (param?: import("GlobalWidgets").Widget3) => void
@@ -256,37 +256,37 @@ export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
 
     static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error
->myPublicStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
     myPublicMethod(param= exporter.createExportedWidget2()) { // Error
->myPublicMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
     constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->param1 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>param1 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->param2 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>param2 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
 }
 export class publicClassWithPrivateModuleParameterTypes2 {
@@ -327,12 +327,12 @@ export class publicClassWithPrivateModuleParameterTypes2 {
     }
 }
 export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error
->publicFunctionWithPrivateModuleParameterTypes : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>publicFunctionWithPrivateModuleParameterTypes : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 }
 export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error
 >publicFunctionWithPrivateModuleParameterTypes1 : (param?: import("GlobalWidgets").SpecializedGlobalWidget.Widget4) => void
@@ -348,37 +348,37 @@ class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
 
     static myPublicStaticMethod(param= exporter.createExportedWidget2()) {
->myPublicStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
     myPublicMethod(param= exporter.createExportedWidget2()) {
->myPublicMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
     constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) {
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->param1 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>param1 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->param2 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>param2 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
 }
 class privateClassWithPrivateModuleParameterTypes1 {
@@ -419,12 +419,12 @@ class privateClassWithPrivateModuleParameterTypes1 {
     }
 }
 function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) {
->privateFunctionWithPrivateModuleParameterTypes : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>privateFunctionWithPrivateModuleParameterTypes : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
 }
 function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) {
 >privateFunctionWithPrivateModuleParameterTypes1 : (param?: import("GlobalWidgets").SpecializedGlobalWidget.Widget4) => void
diff --git a/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameParameterTypeDeclFile.types.diff b/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameParameterTypeDeclFile.types.diff
new file mode 100644
index 0000000000..461f147e1f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameParameterTypeDeclFile.types.diff
@@ -0,0 +1,373 @@
+--- old.privacyFunctionCannotNameParameterTypeDeclFile.types
++++ new.privacyFunctionCannotNameParameterTypeDeclFile.types
+@@= skipped -7, +7 lines =@@
+ >publicClassWithWithPrivateParmeterTypes : publicClassWithWithPrivateParmeterTypes
+
+     static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
+->myPublicStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>myPublicStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+     private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
+->myPrivateStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>myPrivateStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+     myPublicMethod(param  = exporter.createExportedWidget1()) { // Error
+->myPublicMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>myPublicMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+     private myPrivateMethod(param = exporter.createExportedWidget1()) {
+->myPrivateMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>myPrivateMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+     constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->param1 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->param2 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter : typeof exporter
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>param1 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter : typeof exporter
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>param2 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter : typeof exporter
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+ }
+ export class publicClassWithWithPrivateParmeterTypes1 {
+@@= skipped -107, +107 lines =@@
+ >privateClassWithWithPrivateParmeterTypes : privateClassWithWithPrivateParmeterTypes
+
+     static myPublicStaticMethod(param = exporter.createExportedWidget1()) {
+->myPublicStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>myPublicStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+     private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
+->myPrivateStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>myPrivateStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+     myPublicMethod(param  = exporter.createExportedWidget1()) {
+->myPublicMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>myPublicMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+     private myPrivateMethod(param = exporter.createExportedWidget1()) {
+->myPrivateMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>myPrivateMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+     constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) {
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->param1 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->param2 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter : typeof exporter
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>param1 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter : typeof exporter
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>param2 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter : typeof exporter
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+     }
+ }
+ class privateClassWithWithPrivateParmeterTypes2 {
+@@= skipped -104, +104 lines =@@
+ }
+
+ export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error
+->publicFunctionWithPrivateParmeterTypes : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>publicFunctionWithPrivateParmeterTypes : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ }
+ function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) {
+->privateFunctionWithPrivateParmeterTypes : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>privateFunctionWithPrivateParmeterTypes : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").Widget1
+ }
+ export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error
+ >publicFunctionWithPrivateParmeterTypes1 : (param?: import("GlobalWidgets").Widget3) => void
+@@= skipped -37, +37 lines =@@
+ >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
+
+     static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error
+->myPublicStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     myPublicMethod(param= exporter.createExportedWidget2()) { // Error
+->myPublicMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->param1 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->param2 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter : typeof exporter
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>param1 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter : typeof exporter
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>param2 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter : typeof exporter
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+ }
+ export class publicClassWithPrivateModuleParameterTypes2 {
+@@= skipped -71, +71 lines =@@
+     }
+ }
+ export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error
+->publicFunctionWithPrivateModuleParameterTypes : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>publicFunctionWithPrivateModuleParameterTypes : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ }
+ export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error
+ >publicFunctionWithPrivateModuleParameterTypes1 : (param?: import("GlobalWidgets").SpecializedGlobalWidget.Widget4) => void
+@@= skipped -21, +21 lines =@@
+ >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
+
+     static myPublicStaticMethod(param= exporter.createExportedWidget2()) {
+->myPublicStaticMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicStaticMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     myPublicMethod(param= exporter.createExportedWidget2()) {
+->myPublicMethod : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicMethod : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) {
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->param1 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->param2 : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter : typeof exporter
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>param1 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter : typeof exporter
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>param2 : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter : typeof exporter
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+ }
+ class privateClassWithPrivateModuleParameterTypes1 {
+@@= skipped -71, +71 lines =@@
+     }
+ }
+ function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) {
+->privateFunctionWithPrivateModuleParameterTypes : (param?: import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
+->param : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2() : import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>privateFunctionWithPrivateModuleParameterTypes : (param?: import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2) => void
++>param : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ }
+ function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) {
+ >privateFunctionWithPrivateModuleParameterTypes1 : (param?: import("GlobalWidgets").SpecializedGlobalWidget.Widget4) => void
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameReturnTypeDeclFile.types b/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameReturnTypeDeclFile.types
index d2a76773a2..22f07d08a3 100644
--- a/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameReturnTypeDeclFile.types
+++ b/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameReturnTypeDeclFile.types
@@ -8,40 +8,40 @@ export class publicClassWithWithPrivateParmeterTypes {
 >publicClassWithWithPrivateParmeterTypes : publicClassWithWithPrivateParmeterTypes
 
     static myPublicStaticMethod() { // Error
->myPublicStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>myPublicStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
     }
     private static myPrivateStaticMethod() {
->myPrivateStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>myPrivateStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();;
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
     }
     myPublicMethod() { // Error
->myPublicMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>myPublicMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();;
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
     }
     private myPrivateMethod() {
->myPrivateMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>myPrivateMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();;
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
     }
     static myPublicStaticMethod1() { // Error
 >myPublicStaticMethod1 : () => import("GlobalWidgets").Widget3
@@ -85,40 +85,40 @@ class privateClassWithWithPrivateParmeterTypes {
 >privateClassWithWithPrivateParmeterTypes : privateClassWithWithPrivateParmeterTypes
 
     static myPublicStaticMethod() { 
->myPublicStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>myPublicStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
     }
     private static myPrivateStaticMethod() {
->myPrivateStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>myPrivateStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();;
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
     }
     myPublicMethod() { 
->myPublicMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>myPublicMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();;
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
     }
     private myPrivateMethod() {
->myPrivateMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>myPrivateMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
         return exporter.createExportedWidget1();;
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
     }
     static myPublicStaticMethod1() { 
 >myPublicStaticMethod1 : () => import("GlobalWidgets").Widget3
@@ -159,22 +159,22 @@ class privateClassWithWithPrivateParmeterTypes {
 }
 
 export function publicFunctionWithPrivateParmeterTypes() { // Error
->publicFunctionWithPrivateParmeterTypes : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>publicFunctionWithPrivateParmeterTypes : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
     return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 }
 function privateFunctionWithPrivateParmeterTypes()   {
->privateFunctionWithPrivateParmeterTypes : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>privateFunctionWithPrivateParmeterTypes : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 
     return exporter.createExportedWidget1();
->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 >exporter : typeof exporter
->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
 }
 export function publicFunctionWithPrivateParmeterTypes1() { // Error
 >publicFunctionWithPrivateParmeterTypes1 : () => import("GlobalWidgets").Widget3
@@ -199,22 +199,22 @@ export class publicClassWithPrivateModuleReturnTypes {
 >publicClassWithPrivateModuleReturnTypes : publicClassWithPrivateModuleReturnTypes
 
     static myPublicStaticMethod() { // Error
->myPublicStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
         return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
     myPublicMethod() { // Error
->myPublicMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
         return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
     static myPublicStaticMethod1() { // Error
 >myPublicStaticMethod1 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
@@ -236,13 +236,13 @@ export class publicClassWithPrivateModuleReturnTypes {
     }
 }
 export function publicFunctionWithPrivateModuleReturnTypes() { // Error
->publicFunctionWithPrivateModuleReturnTypes : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>publicFunctionWithPrivateModuleReturnTypes : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
     return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 }
 export function publicFunctionWithPrivateModuleReturnTypes1() { // Error
 >publicFunctionWithPrivateModuleReturnTypes1 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
@@ -258,22 +258,22 @@ class privateClassWithPrivateModuleReturnTypes {
 >privateClassWithPrivateModuleReturnTypes : privateClassWithPrivateModuleReturnTypes
 
     static myPublicStaticMethod() { 
->myPublicStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
         return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
     myPublicMethod() { 
->myPublicMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>myPublicMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
         return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
     }
     static myPublicStaticMethod1() { // Error
 >myPublicStaticMethod1 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
@@ -295,13 +295,13 @@ class privateClassWithPrivateModuleReturnTypes {
     }
 }
 function privateFunctionWithPrivateModuleReturnTypes() { 
->privateFunctionWithPrivateModuleReturnTypes : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>privateFunctionWithPrivateModuleReturnTypes : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 
     return exporter.createExportedWidget2();
->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 >exporter : typeof exporter
->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
 }
 function privateFunctionWithPrivateModuleReturnTypes1() {
 >privateFunctionWithPrivateModuleReturnTypes1 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
diff --git a/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameReturnTypeDeclFile.types.diff b/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameReturnTypeDeclFile.types.diff
new file mode 100644
index 0000000000..a62c068c6a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/privacyFunctionCannotNameReturnTypeDeclFile.types.diff
@@ -0,0 +1,245 @@
+--- old.privacyFunctionCannotNameReturnTypeDeclFile.types
++++ new.privacyFunctionCannotNameReturnTypeDeclFile.types
+@@= skipped -7, +7 lines =@@
+ >publicClassWithWithPrivateParmeterTypes : publicClassWithWithPrivateParmeterTypes
+
+     static myPublicStaticMethod() { // Error
+->myPublicStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>myPublicStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+     }
+     private static myPrivateStaticMethod() {
+->myPrivateStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>myPrivateStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();;
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+     }
+     myPublicMethod() { // Error
+->myPublicMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>myPublicMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();;
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+     }
+     private myPrivateMethod() {
+->myPrivateMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>myPrivateMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();;
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+     }
+     static myPublicStaticMethod1() { // Error
+ >myPublicStaticMethod1 : () => import("GlobalWidgets").Widget3
+@@= skipped -77, +77 lines =@@
+ >privateClassWithWithPrivateParmeterTypes : privateClassWithWithPrivateParmeterTypes
+
+     static myPublicStaticMethod() { 
+->myPublicStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>myPublicStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+     }
+     private static myPrivateStaticMethod() {
+->myPrivateStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>myPrivateStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();;
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+     }
+     myPublicMethod() { 
+->myPublicMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>myPublicMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();;
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+     }
+     private myPrivateMethod() {
+->myPrivateMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>myPrivateMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+         return exporter.createExportedWidget1();;
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+     }
+     static myPublicStaticMethod1() { 
+ >myPublicStaticMethod1 : () => import("GlobalWidgets").Widget3
+@@= skipped -74, +74 lines =@@
+ }
+
+ export function publicFunctionWithPrivateParmeterTypes() { // Error
+->publicFunctionWithPrivateParmeterTypes : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>publicFunctionWithPrivateParmeterTypes : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+     return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ }
+ function privateFunctionWithPrivateParmeterTypes()   {
+->privateFunctionWithPrivateParmeterTypes : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>privateFunctionWithPrivateParmeterTypes : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+
+     return exporter.createExportedWidget1();
+->exporter.createExportedWidget1() : import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+->exporter.createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1() : import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>exporter.createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ >exporter : typeof exporter
+->createExportedWidget1 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").Widget1
++>createExportedWidget1 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").Widget1
+ }
+ export function publicFunctionWithPrivateParmeterTypes1() { // Error
+ >publicFunctionWithPrivateParmeterTypes1 : () => import("GlobalWidgets").Widget3
+@@= skipped -40, +40 lines =@@
+ >publicClassWithPrivateModuleReturnTypes : publicClassWithPrivateModuleReturnTypes
+
+     static myPublicStaticMethod() { // Error
+->myPublicStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+         return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     myPublicMethod() { // Error
+->myPublicMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+         return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     static myPublicStaticMethod1() { // Error
+ >myPublicStaticMethod1 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+@@= skipped -37, +37 lines =@@
+     }
+ }
+ export function publicFunctionWithPrivateModuleReturnTypes() { // Error
+->publicFunctionWithPrivateModuleReturnTypes : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>publicFunctionWithPrivateModuleReturnTypes : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+     return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ }
+ export function publicFunctionWithPrivateModuleReturnTypes1() { // Error
+ >publicFunctionWithPrivateModuleReturnTypes1 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+@@= skipped -22, +22 lines =@@
+ >privateClassWithPrivateModuleReturnTypes : privateClassWithPrivateModuleReturnTypes
+
+     static myPublicStaticMethod() { 
+->myPublicStaticMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicStaticMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+         return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     myPublicMethod() { 
+->myPublicMethod : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>myPublicMethod : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+         return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+     }
+     static myPublicStaticMethod1() { // Error
+ >myPublicStaticMethod1 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
+@@= skipped -37, +37 lines =@@
+     }
+ }
+ function privateFunctionWithPrivateModuleReturnTypes() { 
+->privateFunctionWithPrivateModuleReturnTypes : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>privateFunctionWithPrivateModuleReturnTypes : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+
+     return exporter.createExportedWidget2();
+->exporter.createExportedWidget2() : import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+->exporter.createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2() : import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>exporter.createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ >exporter : typeof exporter
+->createExportedWidget2 : () => import("privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
++>createExportedWidget2 : () => import("./privacyFunctionReturnTypeDeclFile_Widgets").SpecializedWidget.Widget2
+ }
+ function privateFunctionWithPrivateModuleReturnTypes1() {
+ >privateFunctionWithPrivateModuleReturnTypes1 : () => import("GlobalWidgets").SpecializedGlobalWidget.Widget4
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/privacyImportParseErrors.types b/testdata/baselines/reference/submodule/compiler/privacyImportParseErrors.types
index 4cb9008206..9186a07e6d 100644
--- a/testdata/baselines/reference/submodule/compiler/privacyImportParseErrors.types
+++ b/testdata/baselines/reference/submodule/compiler/privacyImportParseErrors.types
@@ -1151,7 +1151,7 @@ module m2 {
 }
 
 export module m3 {
->m3 : typeof import("privacyImportParseErrors").m3
+>m3 : typeof import("./privacyImportParseErrors").m3
 
     import m3 = require("use_glo_M1_public");
 >m3 : any
diff --git a/testdata/baselines/reference/submodule/compiler/privacyImportParseErrors.types.diff b/testdata/baselines/reference/submodule/compiler/privacyImportParseErrors.types.diff
new file mode 100644
index 0000000000..93ff21d251
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/privacyImportParseErrors.types.diff
@@ -0,0 +1,11 @@
+--- old.privacyImportParseErrors.types
++++ new.privacyImportParseErrors.types
+@@= skipped -1150, +1150 lines =@@
+ }
+
+ export module m3 {
+->m3 : typeof import("privacyImportParseErrors").m3
++>m3 : typeof import("./privacyImportParseErrors").m3
+
+     import m3 = require("use_glo_M1_public");
+ >m3 : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols
index 738988b717..95ba39314c 100644
--- a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols
+++ b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols
@@ -7,6 +7,6 @@ module.exports = function () {};
 >exports : Symbol(export=, Decl(bar.js, 0, 0))
 
 exports.blah = exports.someProp;
->exports : Symbol("bar", Decl(bar.js, 0, 0))
->exports : Symbol("bar", Decl(bar.js, 0, 0))
+>exports : Symbol("./bar", Decl(bar.js, 0, 0))
+>exports : Symbol("./bar", Decl(bar.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols.diff b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols.diff
index 0866617f76..c3d01abb4f 100644
--- a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols.diff
@@ -14,5 +14,6 @@
 ->exports.blah : Symbol(blah, Decl(bar.js, 0, 32))
 ->exports : Symbol(blah, Decl(bar.js, 0, 32))
 ->blah : Symbol(blah, Decl(bar.js, 0, 32))
-+>exports : Symbol("bar", Decl(bar.js, 0, 0))
- >exports : Symbol("bar", Decl(bar.js, 0, 0))
+->exports : Symbol("bar", Decl(bar.js, 0, 0))
++>exports : Symbol("./bar", Decl(bar.js, 0, 0))
++>exports : Symbol("./bar", Decl(bar.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.types b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.types
index 2465e0c25b..322302ae2d 100644
--- a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.types
+++ b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.types
@@ -11,9 +11,9 @@ module.exports = function () {};
 exports.blah = exports.someProp;
 >exports.blah = exports.someProp : any
 >exports.blah : any
->exports : typeof import("bar")
+>exports : typeof import("./bar")
 >blah : any
 >exports.someProp : any
->exports : typeof import("bar")
+>exports : typeof import("./bar")
 >someProp : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/reactImportDropped.types b/testdata/baselines/reference/submodule/compiler/reactImportDropped.types
index 9b9d4d9e7a..13f16f7676 100644
--- a/testdata/baselines/reference/submodule/compiler/reactImportDropped.types
+++ b/testdata/baselines/reference/submodule/compiler/reactImportDropped.types
@@ -31,10 +31,10 @@ declare global {
 
 === src/components/TabBar.js ===
 export default React.createClass({
->React.createClass({  render() {    return (      null    );  }}) : import("react").ClassicComponentClass
->React.createClass : (spec: any) => import("react").ClassicComponentClass
->React : typeof import("react")
->createClass : (spec: any) => import("react").ClassicComponentClass
+>React.createClass({  render() {    return (      null    );  }}) : import("../../react").ClassicComponentClass
+>React.createClass : (spec: any) => import("../../react").ClassicComponentClass
+>React : typeof import("../../react")
+>createClass : (spec: any) => import("../../react").ClassicComponentClass
 >{  render() {    return (      null    );  }} : { render(): any; }
 
   render() {
@@ -50,7 +50,7 @@ export default React.createClass({
 
 === src/modules/navigation/NavigationView.js ===
 import TabBar from '../../components/TabBar';
->TabBar : import("react").ClassicComponentClass
+>TabBar : import("../../../react.js").ClassicComponentClass
 
 import {layout} from '../../utils/theme'; // <- DO NOT DROP this import
 >layout : any
@@ -58,7 +58,7 @@ import {layout} from '../../utils/theme'; // <- DO NOT DROP this import
 const x = <TabBar height={layout.footerHeight} />;
 >x : any
 ><TabBar height={layout.footerHeight} /> : any
->TabBar : import("react").ClassicComponentClass
+>TabBar : import("../../../react").ClassicComponentClass
 >height : any
 >layout.footerHeight : any
 >layout : any
diff --git a/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.types b/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.types
index 586a63c754..f5e3fbe68f 100644
--- a/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.types
+++ b/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.types
@@ -23,7 +23,7 @@ declare module 'react' { // augment
 }
 export interface StyledOtherComponentList {
     "div": React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>
->"div" : import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>
+>"div" : import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>
 >React : any
 >React : any
 }
@@ -39,24 +39,24 @@ import {StyledOtherComponent, StyledOtherComponentList} from "create-emotion-sty
 >StyledOtherComponentList : any
 
 export default function styled(tag: string): (o: object) => StyledOtherComponent<{}, StyledOtherComponentList["div"], any>;
->styled : (tag: string) => (o: object) => StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>styled : (tag: string) => (o: object) => StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
 >tag : string
 >o : object
 
 === index.ts ===
 import styled from "react-emotion"
->styled : (tag: string) => (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>styled : (tag: string) => (o: object) => import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
 
 const Form = styled('div')({ color: "red" })
->Form : import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
->styled('div')({ color: "red" }) : import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
->styled('div') : (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
->styled : (tag: string) => (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>Form : import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>styled('div')({ color: "red" }) : import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>styled('div') : (o: object) => import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>styled : (tag: string) => (o: object) => import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
 >'div' : "div"
 >{ color: "red" } : { color: string; }
 >color : string
 >"red" : "red"
 
 export default Form
->Form : import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+>Form : import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
 
diff --git a/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.types.diff b/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.types.diff
index 1d7e7c6d8e..de3d474d28 100644
--- a/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.types.diff
@@ -15,27 +15,43 @@
 
      interface HTMLAttributes<T> {
          css?: unknown;
-@@= skipped -30, +30 lines =@@
+@@= skipped -14, +14 lines =@@
+ }
+ export interface StyledOtherComponentList {
+     "div": React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>
+->"div" : import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>
++>"div" : import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>
+ >React : any
+ >React : any
+ }
+@@= skipped -16, +16 lines =@@
  >StyledOtherComponentList : any
 
  export default function styled(tag: string): (o: object) => StyledOtherComponent<{}, StyledOtherComponentList["div"], any>;
 ->styled : (tag: string) => (o: object) => StyledOtherComponent<{}, StyledOtherComponentList["div"], any>
-+>styled : (tag: string) => (o: object) => StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
++>styled : (tag: string) => (o: object) => StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
  >tag : string
  >o : object
 
  === index.ts ===
  import styled from "react-emotion"
 ->styled : (tag: string) => (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/create-emotion-styled/index").StyledOtherComponentList["div"], any>
-+>styled : (tag: string) => (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
++>styled : (tag: string) => (o: object) => import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
 
  const Form = styled('div')({ color: "red" })
- >Form : import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
- >styled('div')({ color: "red" }) : import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+->Form : import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
+->styled('div')({ color: "red" }) : import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
 ->styled('div') : (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/create-emotion-styled/index").StyledOtherComponentList["div"], any>
 ->styled : (tag: string) => (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/create-emotion-styled/index").StyledOtherComponentList["div"], any>
-+>styled('div') : (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
-+>styled : (tag: string) => (o: object) => import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
++>Form : import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
++>styled('div')({ color: "red" }) : import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
++>styled('div') : (o: object) => import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
++>styled : (tag: string) => (o: object) => import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
  >'div' : "div"
  >{ color: "red" } : { color: string; }
- >color : string
\ No newline at end of file
+ >color : string
+ >"red" : "red"
+
+ export default Form
+->Form : import("node_modules/create-emotion-styled/index").StyledOtherComponent<{}, import("node_modules/react/index").DetailedHTMLProps<import("node_modules/react/index").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
++>Form : import("create-emotion-styled").StyledOtherComponent<{}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, any>
diff --git a/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types b/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types
index 91622bc421..e8c31c60d6 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types
+++ b/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types
@@ -6,7 +6,7 @@ export default class Schema {}
 
 === reexporter.d.ts ===
 export { default } from "./schema";
->default : typeof import("schema").default
+>default : typeof import("./schema").default
 
 === usage.ts ===
 import Base from "./reexporter";
diff --git a/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types.diff b/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types.diff
new file mode 100644
index 0000000000..df42627adf
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types.diff
@@ -0,0 +1,11 @@
+--- old.reexportDefaultIsCallable.types
++++ new.reexportDefaultIsCallable.types
+@@= skipped -5, +5 lines =@@
+
+ === reexporter.d.ts ===
+ export { default } from "./schema";
+->default : typeof import("schema").default
++>default : typeof import("./schema").default
+
+ === usage.ts ===
+ import Base from "./reexporter";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types
index 30a3b31e13..9912858142 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types
@@ -12,5 +12,5 @@ export { b } from "./b";
 >b : number
 
 export { default } from "./b";
->default : typeof import("b")
+>default : typeof import("./b")
 
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types.diff
index b2f037525c..3bb807cc7b 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types.diff
@@ -5,4 +5,4 @@
 
  export { default } from "./b";
 ->default : any
-+>default : typeof import("b")
++>default : typeof import("./b")
diff --git a/testdata/baselines/reference/submodule/compiler/reexportWrittenCorrectlyInDeclaration.types b/testdata/baselines/reference/submodule/compiler/reexportWrittenCorrectlyInDeclaration.types
index 3753120314..773aa2789e 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportWrittenCorrectlyInDeclaration.types
+++ b/testdata/baselines/reference/submodule/compiler/reexportWrittenCorrectlyInDeclaration.types
@@ -10,10 +10,10 @@ export class ThingB { }
 
 === Things.ts ===
 export {ThingA} from "./ThingA";
->ThingA : typeof import("ThingA").ThingA
+>ThingA : typeof import("./ThingA").ThingA
 
 export {ThingB} from "./ThingB";
->ThingB : typeof import("ThingB").ThingB
+>ThingB : typeof import("./ThingB").ThingB
 
 === Test.ts ===
 import * as things from "./Things";
diff --git a/testdata/baselines/reference/submodule/compiler/reexportWrittenCorrectlyInDeclaration.types.diff b/testdata/baselines/reference/submodule/compiler/reexportWrittenCorrectlyInDeclaration.types.diff
new file mode 100644
index 0000000000..09a6ea7830
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/reexportWrittenCorrectlyInDeclaration.types.diff
@@ -0,0 +1,15 @@
+--- old.reexportWrittenCorrectlyInDeclaration.types
++++ new.reexportWrittenCorrectlyInDeclaration.types
+@@= skipped -9, +9 lines =@@
+
+ === Things.ts ===
+ export {ThingA} from "./ThingA";
+->ThingA : typeof import("ThingA").ThingA
++>ThingA : typeof import("./ThingA").ThingA
+
+ export {ThingB} from "./ThingB";
+->ThingB : typeof import("ThingB").ThingB
++>ThingB : typeof import("./ThingB").ThingB
+
+ === Test.ts ===
+ import * as things from "./Things";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols
index 9f3eb97f2f..2001b58aad 100644
--- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols
+++ b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols
@@ -22,7 +22,7 @@ json1.b; // No error (OK since that's the type annotation)
 const js0 = require("./js.js");
 >js0 : Symbol(js0, Decl(user.js, 7, 5))
 >require : Symbol(require)
->"./js.js" : Symbol("/js", Decl(js.js, 0, 0))
+>"./js.js" : Symbol("./js.js", Decl(js.js, 0, 0))
 
 json0.b; // Error (good)
 >json0 : Symbol(json0, Decl(user.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols.diff b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols.diff
index 4c49920155..5405d3dfd5 100644
--- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols.diff
@@ -8,7 +8,16 @@
 
  json1.b; // No error (OK since that's the type annotation)
  >json1.b : Symbol(b, Decl(user.js, 3, 12))
-@@= skipped -19, +18 lines =@@
+@@= skipped -10, +9 lines =@@
+ const js0 = require("./js.js");
+ >js0 : Symbol(js0, Decl(user.js, 7, 5))
+ >require : Symbol(require)
+->"./js.js" : Symbol("/js", Decl(js.js, 0, 0))
++>"./js.js" : Symbol("./js.js", Decl(js.js, 0, 0))
+
+ json0.b; // Error (good)
+ >json0 : Symbol(json0, Decl(user.js, 0, 5))
+@@= skipped -9, +9 lines =@@
  const js1 = require("./js.js"); // Error (good)
  >js1 : Symbol(js1, Decl(user.js, 11, 5))
  >require : Symbol(require)
diff --git a/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.symbols b/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.symbols
index b744f9fd3c..60f15da5ac 100644
--- a/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.symbols
+++ b/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.symbols
@@ -31,12 +31,12 @@ var myAssert = require('assert')
 === app.js ===
 exports.equal = myAssert.equal
 >exports.equal : Symbol(equal, Decl(app.js, 0, 0))
->exports : Symbol("app", Decl(app.js, 0, 0))
+>exports : Symbol("./app", Decl(app.js, 0, 0))
 >equal : Symbol(equal, Decl(app.js, 0, 0))
 >myAssert : Symbol(myAssert, Decl(ns.ts, 0, 0), Decl(ns.ts, 4, 3))
 
 exports.equal()
 >exports.equal : Symbol(equal, Decl(app.js, 0, 0))
->exports : Symbol("app", Decl(app.js, 0, 0))
+>exports : Symbol("./app", Decl(app.js, 0, 0))
 >equal : Symbol(equal, Decl(app.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.symbols.diff b/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.symbols.diff
index 049eb3e49f..66468fcffd 100644
--- a/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.symbols.diff
@@ -5,6 +5,12 @@
  exports.equal = myAssert.equal
  >exports.equal : Symbol(equal, Decl(app.js, 0, 0))
 ->exports : Symbol(equal, Decl(app.js, 0, 0))
-+>exports : Symbol("app", Decl(app.js, 0, 0))
++>exports : Symbol("./app", Decl(app.js, 0, 0))
  >equal : Symbol(equal, Decl(app.js, 0, 0))
  >myAssert : Symbol(myAssert, Decl(ns.ts, 0, 0), Decl(ns.ts, 4, 3))
+
+ exports.equal()
+ >exports.equal : Symbol(equal, Decl(app.js, 0, 0))
+->exports : Symbol("app", Decl(app.js, 0, 0))
++>exports : Symbol("./app", Decl(app.js, 0, 0))
+ >equal : Symbol(equal, Decl(app.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.types b/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.types
index 81b6f49067..9ecfb8a107 100644
--- a/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.types
+++ b/testdata/baselines/reference/submodule/compiler/resolveNameWithNamspace.types
@@ -31,7 +31,7 @@ var myAssert = require('assert')
 exports.equal = myAssert.equal
 >exports.equal = myAssert.equal : any
 >exports.equal : any
->exports : typeof import("app")
+>exports : typeof import("./app")
 >equal : any
 >myAssert.equal : any
 >myAssert : any
@@ -40,6 +40,6 @@ exports.equal = myAssert.equal
 exports.equal()
 >exports.equal() : any
 >exports.equal : any
->exports : typeof import("app")
+>exports : typeof import("./app")
 >equal : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/spuriousCircularityOnTypeImport.types b/testdata/baselines/reference/submodule/compiler/spuriousCircularityOnTypeImport.types
index 1e56e852c4..686896d173 100644
--- a/testdata/baselines/reference/submodule/compiler/spuriousCircularityOnTypeImport.types
+++ b/testdata/baselines/reference/submodule/compiler/spuriousCircularityOnTypeImport.types
@@ -17,10 +17,10 @@ export type SelectorMap<T extends Record<string, (...params: unknown[]) => unkno
 };
 
 export declare const value2: {
->value2 : { sliceSelectors: <FuncMap extends import("types").SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]>; }; }
+>value2 : { sliceSelectors: <FuncMap extends import("./types").SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]>; }; }
 
     sliceSelectors: <FuncMap extends import('./types').SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]> };
->sliceSelectors : <FuncMap extends import("types").SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]>; }
+>sliceSelectors : <FuncMap extends import("./types").SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]>; }
 >selectorsBySlice : FuncMap
 
 };
diff --git a/testdata/baselines/reference/submodule/compiler/spuriousCircularityOnTypeImport.types.diff b/testdata/baselines/reference/submodule/compiler/spuriousCircularityOnTypeImport.types.diff
deleted file mode 100644
index 98a0396ad4..0000000000
--- a/testdata/baselines/reference/submodule/compiler/spuriousCircularityOnTypeImport.types.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.spuriousCircularityOnTypeImport.types
-+++ new.spuriousCircularityOnTypeImport.types
-@@= skipped -16, +16 lines =@@
- };
-
- export declare const value2: {
-->value2 : { sliceSelectors: <FuncMap extends import("./types").SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]>; }; }
-+>value2 : { sliceSelectors: <FuncMap extends import("types").SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]>; }; }
-
-     sliceSelectors: <FuncMap extends import('./types').SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]> };
-->sliceSelectors : <FuncMap extends import("./types").SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]>; }
-+>sliceSelectors : <FuncMap extends import("types").SelectorMap<FuncMap>>(selectorsBySlice: FuncMap) => { [P in keyof FuncMap]: Parameters<FuncMap[P]>; }
- >selectorsBySlice : FuncMap
-
- };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.types b/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.types
index 584cc53e50..e31f8adaff 100644
--- a/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.types
+++ b/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.types
@@ -38,7 +38,7 @@ export {
 
 };
 export as namespace Backbone;
->Backbone : typeof import("node_modules/backbone/index")
+>Backbone : typeof import("backbone")
 
 === node_modules/backbone-fetch-cache/index.d.ts ===
 import * as Backbone from "backbone";
@@ -55,7 +55,7 @@ declare module "backbone" {
 }
 export {};
 export as namespace BackboneFetchCache;
->BackboneFetchCache : typeof import("node_modules/backbone-fetch-cache/index")
+>BackboneFetchCache : typeof import("backbone-fetch-cache")
 
 === index.ts ===
 import * as Backbone from "backbone";
diff --git a/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.types.diff b/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.types.diff
index 06ac84c4c4..2f9253e561 100644
--- a/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.types.diff
@@ -8,3 +8,22 @@
 +>initialize : (attributes?: T | undefined, options?: CombinedModelConstructorOptions<E, this> | undefined) => void
  >attributes : T | undefined
  >options : CombinedModelConstructorOptions<E, this> | undefined
+
+@@= skipped -29, +29 lines =@@
+
+ };
+ export as namespace Backbone;
+->Backbone : typeof import("node_modules/backbone/index")
++>Backbone : typeof import("backbone")
+
+ === node_modules/backbone-fetch-cache/index.d.ts ===
+ import * as Backbone from "backbone";
+@@= skipped -17, +17 lines =@@
+ }
+ export {};
+ export as namespace BackboneFetchCache;
+->BackboneFetchCache : typeof import("node_modules/backbone-fetch-cache/index")
++>BackboneFetchCache : typeof import("backbone-fetch-cache")
+
+ === index.ts ===
+ import * as Backbone from "backbone";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNames.types b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNames.types
index cb5677b7f0..37c19f0e7b 100644
--- a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNames.types
+++ b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNames.types
@@ -17,9 +17,9 @@ import { BindingKey } from '@loopback/context';
 export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any); // line in question
 >CONTROLLER_CLASS : BindingKey<ControllerClass>
 >BindingKey.create<ControllerClass>(null as any) : BindingKey<ControllerClass>
->BindingKey.create : <T extends import("monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
+>BindingKey.create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
 >BindingKey : typeof BindingKey
->create : <T extends import("monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
+>create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
 >null as any : any
 
 === monorepo/context/src/value-promise.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNames.types.diff b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNames.types.diff
new file mode 100644
index 0000000000..33bc5bca1f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNames.types.diff
@@ -0,0 +1,14 @@
+--- old.symbolLinkDeclarationEmitModuleNames.types
++++ new.symbolLinkDeclarationEmitModuleNames.types
+@@= skipped -16, +16 lines =@@
+ export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any); // line in question
+ >CONTROLLER_CLASS : BindingKey<ControllerClass>
+ >BindingKey.create<ControllerClass>(null as any) : BindingKey<ControllerClass>
+->BindingKey.create : <T extends import("monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
++>BindingKey.create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
+ >BindingKey : typeof BindingKey
+->create : <T extends import("monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
++>create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
+ >null as any : any
+
+ === monorepo/context/src/value-promise.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesImportRef.types b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesImportRef.types
index 43ca058bb6..b51e80c519 100644
--- a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesImportRef.types
+++ b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesImportRef.types
@@ -2,18 +2,18 @@
 
 === Folder/monorepo/core/index.ts ===
 import { styles } from "package-a";
->styles : import("Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
+>styles : import("styled-components").InterpolationValue[]
 
 export function getStyles() {
->getStyles : () => import("Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
+>getStyles : () => import("styled-components").InterpolationValue[]
 
 	return styles;
->styles : import("Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
+>styles : import("styled-components").InterpolationValue[]
 }
 
 === Folder/monorepo/package-a/index.d.ts ===
 export declare const styles: import("styled-components").InterpolationValue[];
->styles : import("Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
+>styles : import("styled-components").InterpolationValue[]
 
 === Folder/node_modules/styled-components/typings/styled-components.d.ts ===
 
diff --git a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesImportRef.types.diff b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesImportRef.types.diff
new file mode 100644
index 0000000000..97daad3898
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesImportRef.types.diff
@@ -0,0 +1,24 @@
+--- old.symbolLinkDeclarationEmitModuleNamesImportRef.types
++++ new.symbolLinkDeclarationEmitModuleNamesImportRef.types
+@@= skipped -1, +1 lines =@@
+
+ === Folder/monorepo/core/index.ts ===
+ import { styles } from "package-a";
+->styles : import("Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
++>styles : import("styled-components").InterpolationValue[]
+
+ export function getStyles() {
+->getStyles : () => import("Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
++>getStyles : () => import("styled-components").InterpolationValue[]
+
+ 	return styles;
+->styles : import("Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
++>styles : import("styled-components").InterpolationValue[]
+ }
+
+ === Folder/monorepo/package-a/index.d.ts ===
+ export declare const styles: import("styled-components").InterpolationValue[];
+->styles : import("Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
++>styles : import("styled-components").InterpolationValue[]
+
+ === Folder/node_modules/styled-components/typings/styled-components.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
index 9f953aeede..7d476d96a6 100644
--- a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
+++ b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
@@ -17,9 +17,9 @@ import { BindingKey } from '@loopback/context';
 export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any); // line in question
 >CONTROLLER_CLASS : BindingKey<ControllerClass>
 >BindingKey.create<ControllerClass>(null as any) : BindingKey<ControllerClass>
->BindingKey.create : <T extends import("/monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
+>BindingKey.create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
 >BindingKey : typeof BindingKey
->create : <T extends import("/monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
+>create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
 >null as any : any
 
 === /monorepo/context/src/value-promise.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types.diff b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types.diff
new file mode 100644
index 0000000000..99317073e9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types.diff
@@ -0,0 +1,14 @@
+--- old.symbolLinkDeclarationEmitModuleNamesRootDir.types
++++ new.symbolLinkDeclarationEmitModuleNamesRootDir.types
+@@= skipped -16, +16 lines =@@
+ export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any); // line in question
+ >CONTROLLER_CLASS : BindingKey<ControllerClass>
+ >BindingKey.create<ControllerClass>(null as any) : BindingKey<ControllerClass>
+->BindingKey.create : <T extends import("/monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
++>BindingKey.create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
+ >BindingKey : typeof BindingKey
+->create : <T extends import("/monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
++>create : <T extends import("@loopback/context").Constructor<any>>(ctor: T) => BindingKey<T>
+ >null as any : any
+
+ === /monorepo/context/src/value-promise.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types
index 6b26203079..bbfae6a192 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types
@@ -16,20 +16,20 @@ export function create(): Foo;
 
 === workspace/packageB/index.d.ts ===
 import { create } from "package-a";
->create : () => import("workspace/packageA/foo").Foo
+>create : () => import("../packageA/foo").Foo
 
 export declare function invoke(): ReturnType<typeof create>;
->invoke : () => import("workspace/packageA/foo").Foo
->create : () => import("workspace/packageA/foo").Foo
+>invoke : () => import("../packageA/foo").Foo
+>create : () => import("../packageA/foo").Foo
 
 === workspace/packageC/index.ts ===
 import * as pkg from "package-b";
 >pkg : typeof pkg
 
 export const a = pkg.invoke();
->a : import("workspace/packageA/foo").Foo
->pkg.invoke() : import("workspace/packageA/foo").Foo
->pkg.invoke : () => import("workspace/packageA/foo").Foo
+>a : import("../packageA/foo").Foo
+>pkg.invoke() : import("../packageA/foo").Foo
+>pkg.invoke : () => import("../packageA/foo").Foo
 >pkg : typeof pkg
->invoke : () => import("workspace/packageA/foo").Foo
+>invoke : () => import("../packageA/foo").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types.diff
index 50fa3b84e1..daf072ef1e 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types.diff
@@ -1,20 +1,29 @@
 --- old.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types
 +++ new.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types
-@@= skipped -18, +18 lines =@@
- >create : () => import("workspace/packageA/foo").Foo
+@@= skipped -15, +15 lines =@@
+
+ === workspace/packageB/index.d.ts ===
+ import { create } from "package-a";
+->create : () => import("workspace/packageA/foo").Foo
++>create : () => import("../packageA/foo").Foo
 
  export declare function invoke(): ReturnType<typeof create>;
 ->invoke : () => ReturnType<typeof create>
-+>invoke : () => import("workspace/packageA/foo").Foo
- >create : () => import("workspace/packageA/foo").Foo
+->create : () => import("workspace/packageA/foo").Foo
++>invoke : () => import("../packageA/foo").Foo
++>create : () => import("../packageA/foo").Foo
 
  === workspace/packageC/index.ts ===
-@@= skipped -10, +10 lines =@@
+ import * as pkg from "package-b";
+ >pkg : typeof pkg
+
  export const a = pkg.invoke();
- >a : import("workspace/packageA/foo").Foo
- >pkg.invoke() : import("workspace/packageA/foo").Foo
+->a : import("workspace/packageA/foo").Foo
+->pkg.invoke() : import("workspace/packageA/foo").Foo
 ->pkg.invoke : () => ReturnType<typeof import("workspace/packageA/index").create>
-+>pkg.invoke : () => import("workspace/packageA/foo").Foo
++>a : import("../packageA/foo").Foo
++>pkg.invoke() : import("../packageA/foo").Foo
++>pkg.invoke : () => import("../packageA/foo").Foo
  >pkg : typeof pkg
 ->invoke : () => ReturnType<typeof import("workspace/packageA/index").create>
-+>invoke : () => import("workspace/packageA/foo").Foo
++>invoke : () => import("../packageA/foo").Foo
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types
index fc58ede256..279b442259 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types
@@ -19,9 +19,9 @@ import * as pkg from "package-b";
 >pkg : typeof pkg
 
 export const a = pkg.invoke();
->a : import("workspace/packageA/index").Foo
->pkg.invoke() : import("workspace/packageA/index").Foo
->pkg.invoke : () => import("workspace/packageA/index").Foo
+>a : import("../packageA").Foo
+>pkg.invoke() : import("../packageA").Foo
+>pkg.invoke : () => import("../packageA").Foo
 >pkg : typeof pkg
->invoke : () => import("workspace/packageA/index").Foo
+>invoke : () => import("../packageA").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types.diff
new file mode 100644
index 0000000000..523893c69a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types.diff
@@ -0,0 +1,15 @@
+--- old.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types
++++ new.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types
+@@= skipped -18, +18 lines =@@
+ >pkg : typeof pkg
+
+ export const a = pkg.invoke();
+->a : import("workspace/packageA/index").Foo
+->pkg.invoke() : import("workspace/packageA/index").Foo
+->pkg.invoke : () => import("workspace/packageA/index").Foo
++>a : import("../packageA").Foo
++>pkg.invoke() : import("../packageA").Foo
++>pkg.invoke : () => import("../packageA").Foo
+ >pkg : typeof pkg
+->invoke : () => import("workspace/packageA/index").Foo
++>invoke : () => import("../packageA").Foo
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types
index 658d9e4ec4..d008f3c8bd 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types
@@ -19,9 +19,9 @@ import * as pkg from "package-b";
 >pkg : typeof pkg
 
 export const a = pkg.invoke();
->a : import("workspace/packageA/index").Foo
->pkg.invoke() : import("workspace/packageA/index").Foo
->pkg.invoke : () => import("workspace/packageA/index").Foo
+>a : import("../packageA").Foo
+>pkg.invoke() : import("../packageA").Foo
+>pkg.invoke : () => import("../packageA").Foo
 >pkg : typeof pkg
->invoke : () => import("workspace/packageA/index").Foo
+>invoke : () => import("../packageA").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types.diff
new file mode 100644
index 0000000000..2c0536c701
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types.diff
@@ -0,0 +1,15 @@
+--- old.symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types
++++ new.symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types
+@@= skipped -18, +18 lines =@@
+ >pkg : typeof pkg
+
+ export const a = pkg.invoke();
+->a : import("workspace/packageA/index").Foo
+->pkg.invoke() : import("workspace/packageA/index").Foo
+->pkg.invoke : () => import("workspace/packageA/index").Foo
++>a : import("../packageA").Foo
++>pkg.invoke() : import("../packageA").Foo
++>pkg.invoke : () => import("../packageA").Foo
+ >pkg : typeof pkg
+->invoke : () => import("workspace/packageA/index").Foo
++>invoke : () => import("../packageA").Foo
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types
index 0ffc66123f..bb573df5d3 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types
@@ -19,9 +19,9 @@ import * as pkg from "package-b";
 >pkg : typeof pkg
 
 export const a = pkg.invoke();
->a : import("workspace/packageA/index").Foo
->pkg.invoke() : import("workspace/packageA/index").Foo
->pkg.invoke : () => import("workspace/packageA/index").Foo
+>a : import("../packageA").Foo
+>pkg.invoke() : import("../packageA").Foo
+>pkg.invoke : () => import("../packageA").Foo
 >pkg : typeof pkg
->invoke : () => import("workspace/packageA/index").Foo
+>invoke : () => import("../packageA").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types.diff
new file mode 100644
index 0000000000..8dfd33e4c0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types.diff
@@ -0,0 +1,15 @@
+--- old.symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types
++++ new.symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types
+@@= skipped -18, +18 lines =@@
+ >pkg : typeof pkg
+
+ export const a = pkg.invoke();
+->a : import("workspace/packageA/index").Foo
+->pkg.invoke() : import("workspace/packageA/index").Foo
+->pkg.invoke : () => import("workspace/packageA/index").Foo
++>a : import("../packageA").Foo
++>pkg.invoke() : import("../packageA").Foo
++>pkg.invoke : () => import("../packageA").Foo
+ >pkg : typeof pkg
+->invoke : () => import("workspace/packageA/index").Foo
++>invoke : () => import("../packageA").Foo
diff --git a/testdata/baselines/reference/submodule/compiler/tsxResolveExternalModuleExportsTypes.types b/testdata/baselines/reference/submodule/compiler/tsxResolveExternalModuleExportsTypes.types
index 234b9d4506..8bec8c4ccd 100644
--- a/testdata/baselines/reference/submodule/compiler/tsxResolveExternalModuleExportsTypes.types
+++ b/testdata/baselines/reference/submodule/compiler/tsxResolveExternalModuleExportsTypes.types
@@ -2,14 +2,14 @@
 
 === /node_modules/@types/a/index.d.ts ===
 declare var a: a.Foo;
->a : import("/node_modules/@types/a/index.d.ts").Foo
+>a : import("a").Foo
 >a : any
 
 declare namespace a {
     interface Foo {}
 }
 export = a;
->a : import("/node_modules/@types/a/index.d.ts").Foo
+>a : import("a").Foo
 
 === /node_modules/@types/b/index.d.ts ===
 import * as a from 'a';
diff --git a/testdata/baselines/reference/submodule/compiler/tsxResolveExternalModuleExportsTypes.types.diff b/testdata/baselines/reference/submodule/compiler/tsxResolveExternalModuleExportsTypes.types.diff
new file mode 100644
index 0000000000..335c3ed0a3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/tsxResolveExternalModuleExportsTypes.types.diff
@@ -0,0 +1,19 @@
+--- old.tsxResolveExternalModuleExportsTypes.types
++++ new.tsxResolveExternalModuleExportsTypes.types
+@@= skipped -1, +1 lines =@@
+
+ === /node_modules/@types/a/index.d.ts ===
+ declare var a: a.Foo;
+->a : import("/node_modules/@types/a/index.d.ts").Foo
++>a : import("a").Foo
+ >a : any
+
+ declare namespace a {
+     interface Foo {}
+ }
+ export = a;
+->a : import("/node_modules/@types/a/index.d.ts").Foo
++>a : import("a").Foo
+
+ === /node_modules/@types/b/index.d.ts ===
+ import * as a from 'a';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols
index 0eb38dab99..08c794e1ca 100644
--- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols
+++ b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols
@@ -50,7 +50,7 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./main" {
->"./main" : Symbol("/main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
+>"./main" : Symbol("./main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
 
     interface Cls {
 >Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols.diff b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols.diff
new file mode 100644
index 0000000000..76b1d05d6f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols.diff
@@ -0,0 +1,11 @@
+--- old.typeReferenceDirectives12.symbols
++++ new.typeReferenceDirectives12.symbols
+@@= skipped -49, +49 lines =@@
+ >undefined : Symbol(undefined)
+
+ declare module "./main" {
+->"./main" : Symbol("/main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
++>"./main" : Symbol("./main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
+
+     interface Cls {
+ >Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types
index 13ed09d5f9..52a332f3d6 100644
--- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types
+++ b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types
@@ -54,7 +54,7 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : undefined
 
 declare module "./main" {
->"./main" : typeof import("/main")
+>"./main" : typeof import("./main")
 
     interface Cls {
         foo(): Lib;
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types.diff b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types.diff
new file mode 100644
index 0000000000..7215d0efe2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types.diff
@@ -0,0 +1,11 @@
+--- old.typeReferenceDirectives12.types
++++ new.typeReferenceDirectives12.types
+@@= skipped -53, +53 lines =@@
+ >undefined : undefined
+
+ declare module "./main" {
+->"./main" : typeof import("/main")
++>"./main" : typeof import("./main")
+
+     interface Cls {
+         foo(): Lib;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.symbols b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.symbols
index 5a5a8dcb6b..ce4c6c7c5a 100644
--- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.symbols
+++ b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.symbols
@@ -50,7 +50,7 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./main" {
->"./main" : Symbol("/main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
+>"./main" : Symbol("./main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
 
     interface Cls {
 >Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.symbols.diff b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.symbols.diff
new file mode 100644
index 0000000000..53a6cfc0c2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.symbols.diff
@@ -0,0 +1,11 @@
+--- old.typeReferenceDirectives9.symbols
++++ new.typeReferenceDirectives9.symbols
+@@= skipped -49, +49 lines =@@
+ >undefined : Symbol(undefined)
+
+ declare module "./main" {
+->"./main" : Symbol("/main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
++>"./main" : Symbol("./main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
+
+     interface Cls {
+ >Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.types b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.types
index 3029d0a319..c9d5a4c311 100644
--- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.types
+++ b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.types
@@ -54,7 +54,7 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : undefined
 
 declare module "./main" {
->"./main" : typeof import("/main")
+>"./main" : typeof import("./main")
 
     interface Cls {
         foo(): Lib;
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.types.diff b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.types.diff
new file mode 100644
index 0000000000..e8eecd5d43
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives9.types.diff
@@ -0,0 +1,11 @@
+--- old.typeReferenceDirectives9.types
++++ new.typeReferenceDirectives9.types
+@@= skipped -53, +53 lines =@@
+ >undefined : undefined
+
+ declare module "./main" {
+->"./main" : typeof import("/main")
++>"./main" : typeof import("./main")
+
+     interface Cls {
+         foo(): Lib;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types b/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types
index 793de6a727..a6ab4cbabc 100644
--- a/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types
+++ b/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types
@@ -5,13 +5,13 @@ declare global {
 >global : typeof global
 
     const React: typeof import("./module");
->React : typeof import("module")
+>React : typeof import("./module")
 }
 export {};
 
 === module.d.ts ===
 export as namespace React;
->React : typeof import("module")
+>React : typeof import("./module")
 
 export function foo(): string;
 >foo : () => string
@@ -20,7 +20,7 @@ export function foo(): string;
 export {}
 React.foo;
 >React.foo : () => string
->React : typeof import("module")
+>React : typeof import("./module")
 >foo : () => string
 
 === emits.ts ===
@@ -33,6 +33,6 @@ console.log("hello");
 
 React.foo;
 >React.foo : () => string
->React : typeof import("module")
+>React : typeof import("./module")
 >foo : () => string
 
diff --git a/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types.diff b/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types.diff
new file mode 100644
index 0000000000..0c497ed972
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types.diff
@@ -0,0 +1,34 @@
+--- old.umdGlobalAugmentationNoCrash.types
++++ new.umdGlobalAugmentationNoCrash.types
+@@= skipped -4, +4 lines =@@
+ >global : typeof global
+
+     const React: typeof import("./module");
+->React : typeof import("module")
++>React : typeof import("./module")
+ }
+ export {};
+
+ === module.d.ts ===
+ export as namespace React;
+->React : typeof import("module")
++>React : typeof import("./module")
+
+ export function foo(): string;
+ >foo : () => string
+@@= skipped -15, +15 lines =@@
+ export {}
+ React.foo;
+ >React.foo : () => string
+->React : typeof import("module")
++>React : typeof import("./module")
+ >foo : () => string
+
+ === emits.ts ===
+@@= skipped -13, +13 lines =@@
+
+ React.foo;
+ >React.foo : () => string
+->React : typeof import("module")
++>React : typeof import("./module")
+ >foo : () => string
diff --git a/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types b/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types
index b3283d6ec5..39d9f9c2ae 100644
--- a/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types
+++ b/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types
@@ -2,14 +2,14 @@
 
 === v1/index.d.ts ===
 export as namespace Alpha;
->Alpha : typeof import("v1/index")
+>Alpha : typeof import(".")
 
 export var x: string;
 >x : string
 
 === v2/index.d.ts ===
 export as namespace Alpha;
->Alpha : typeof import("v2/index")
+>Alpha : typeof import(".")
 
 export var y: number;
 >y : number
diff --git a/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types.diff b/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types.diff
new file mode 100644
index 0000000000..3f38450890
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types.diff
@@ -0,0 +1,19 @@
+--- old.umdGlobalConflict.types
++++ new.umdGlobalConflict.types
+@@= skipped -1, +1 lines =@@
+
+ === v1/index.d.ts ===
+ export as namespace Alpha;
+->Alpha : typeof import("v1/index")
++>Alpha : typeof import(".")
+
+ export var x: string;
+ >x : string
+
+ === v2/index.d.ts ===
+ export as namespace Alpha;
+->Alpha : typeof import("v2/index")
++>Alpha : typeof import(".")
+
+ export var y: number;
+ >y : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types b/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
index 907f204e07..98ea9abb52 100644
--- a/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
+++ b/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
@@ -5,7 +5,7 @@ declare global {
 >global : typeof global
 
     const React: typeof import("./module");
->React : typeof import("module")
+>React : typeof import("./module")
 }
 
 export { };
@@ -28,7 +28,7 @@ declare namespace React {
 export { };
 React.createRef;
 >React.createRef : () => any
->React : typeof import("module")
+>React : typeof import("./module")
 >createRef : () => any
 
 === emits.ts ===
@@ -41,6 +41,6 @@ console.log("hello");
 
 React.createRef;
 >React.createRef : () => any
->React : typeof import("module")
+>React : typeof import("./module")
 >createRef : () => any
 
diff --git a/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types.diff b/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types.diff
new file mode 100644
index 0000000000..cde3dca175
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types.diff
@@ -0,0 +1,27 @@
+--- old.umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
++++ new.umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
+@@= skipped -4, +4 lines =@@
+ >global : typeof global
+
+     const React: typeof import("./module");
+->React : typeof import("module")
++>React : typeof import("./module")
+ }
+
+ export { };
+@@= skipped -23, +23 lines =@@
+ export { };
+ React.createRef;
+ >React.createRef : () => any
+->React : typeof import("module")
++>React : typeof import("./module")
+ >createRef : () => any
+
+ === emits.ts ===
+@@= skipped -13, +13 lines =@@
+
+ React.createRef;
+ >React.createRef : () => any
+->React : typeof import("module")
++>React : typeof import("./module")
+ >createRef : () => any
diff --git a/testdata/baselines/reference/submodule/compiler/visibilityOfCrossModuleTypeUsage.types b/testdata/baselines/reference/submodule/compiler/visibilityOfCrossModuleTypeUsage.types
index 2ea96a394e..03468afcf4 100644
--- a/testdata/baselines/reference/submodule/compiler/visibilityOfCrossModuleTypeUsage.types
+++ b/testdata/baselines/reference/submodule/compiler/visibilityOfCrossModuleTypeUsage.types
@@ -12,14 +12,14 @@ function run(configuration: commands.IConfiguration) {
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 >absoluteWorkspacePath : string
 >configuration.workspace.toAbsolutePath(configuration.server) : string
->configuration.workspace.toAbsolutePath : (server: import("visibilityOfCrossModuleTypeUsage_server").IServer, workspaceRelativePath?: string) => string
->configuration.workspace : import("visibilityOfCrossModuleTypeUsage_server").IWorkspace
+>configuration.workspace.toAbsolutePath : (server: import("./visibilityOfCrossModuleTypeUsage_server").IServer, workspaceRelativePath?: string) => string
+>configuration.workspace : import("./visibilityOfCrossModuleTypeUsage_server").IWorkspace
 >configuration : commands.IConfiguration
->workspace : import("visibilityOfCrossModuleTypeUsage_server").IWorkspace
->toAbsolutePath : (server: import("visibilityOfCrossModuleTypeUsage_server").IServer, workspaceRelativePath?: string) => string
->configuration.server : import("visibilityOfCrossModuleTypeUsage_server").IServer
+>workspace : import("./visibilityOfCrossModuleTypeUsage_server").IWorkspace
+>toAbsolutePath : (server: import("./visibilityOfCrossModuleTypeUsage_server").IServer, workspaceRelativePath?: string) => string
+>configuration.server : import("./visibilityOfCrossModuleTypeUsage_server").IServer
 >configuration : commands.IConfiguration
->server : import("visibilityOfCrossModuleTypeUsage_server").IServer
+>server : import("./visibilityOfCrossModuleTypeUsage_server").IServer
 }
 === visibilityOfCrossModuleTypeUsage_commands.ts ===
 import fs = require('./visibilityOfCrossModuleTypeUsage_fs');
diff --git a/testdata/baselines/reference/submodule/compiler/visibilityOfCrossModuleTypeUsage.types.diff b/testdata/baselines/reference/submodule/compiler/visibilityOfCrossModuleTypeUsage.types.diff
new file mode 100644
index 0000000000..ce0bc7115a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/visibilityOfCrossModuleTypeUsage.types.diff
@@ -0,0 +1,25 @@
+--- old.visibilityOfCrossModuleTypeUsage.types
++++ new.visibilityOfCrossModuleTypeUsage.types
+@@= skipped -11, +11 lines =@@
+     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
+ >absoluteWorkspacePath : string
+ >configuration.workspace.toAbsolutePath(configuration.server) : string
+->configuration.workspace.toAbsolutePath : (server: import("visibilityOfCrossModuleTypeUsage_server").IServer, workspaceRelativePath?: string) => string
+->configuration.workspace : import("visibilityOfCrossModuleTypeUsage_server").IWorkspace
+->configuration : commands.IConfiguration
+->workspace : import("visibilityOfCrossModuleTypeUsage_server").IWorkspace
+->toAbsolutePath : (server: import("visibilityOfCrossModuleTypeUsage_server").IServer, workspaceRelativePath?: string) => string
+->configuration.server : import("visibilityOfCrossModuleTypeUsage_server").IServer
+->configuration : commands.IConfiguration
+->server : import("visibilityOfCrossModuleTypeUsage_server").IServer
++>configuration.workspace.toAbsolutePath : (server: import("./visibilityOfCrossModuleTypeUsage_server").IServer, workspaceRelativePath?: string) => string
++>configuration.workspace : import("./visibilityOfCrossModuleTypeUsage_server").IWorkspace
++>configuration : commands.IConfiguration
++>workspace : import("./visibilityOfCrossModuleTypeUsage_server").IWorkspace
++>toAbsolutePath : (server: import("./visibilityOfCrossModuleTypeUsage_server").IServer, workspaceRelativePath?: string) => string
++>configuration.server : import("./visibilityOfCrossModuleTypeUsage_server").IServer
++>configuration : commands.IConfiguration
++>server : import("./visibilityOfCrossModuleTypeUsage_server").IServer
+ }
+ === visibilityOfCrossModuleTypeUsage_commands.ts ===
+ import fs = require('./visibilityOfCrossModuleTypeUsage_fs');
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.symbols b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.symbols
index a08e00fcf5..5855682af6 100644
--- a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.symbols
+++ b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.symbols
@@ -23,7 +23,7 @@ type __A = import("./a.ts").A; // ok
 
 const aPromise = import("./a.ts"); // error
 >aPromise : Symbol(aPromise, Decl(b.ts, 4, 5))
->"./a.ts" : Symbol("a", Decl(a.ts, 0, 0))
+>"./a.ts" : Symbol("./a.ts", Decl(a.ts, 0, 0))
 
 === c.ts ===
 import type { A } from "./a.d.ts"; // ok
@@ -40,5 +40,5 @@ type __A = import("./a.d.ts").A; // ok
 
 const aPromise = import("./a.d.ts"); // error
 >aPromise : Symbol(aPromise, Decl(c.ts, 4, 5))
->"./a.d.ts" : Symbol("a", Decl(a.ts, 0, 0))
+>"./a.d.ts" : Symbol("./a.d.ts", Decl(a.ts, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.symbols.diff b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.symbols.diff
new file mode 100644
index 0000000000..15053797a4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.symbols.diff
@@ -0,0 +1,17 @@
+--- old.allowsImportingTsExtension.symbols
++++ new.allowsImportingTsExtension.symbols
+@@= skipped -22, +22 lines =@@
+
+ const aPromise = import("./a.ts"); // error
+ >aPromise : Symbol(aPromise, Decl(b.ts, 4, 5))
+->"./a.ts" : Symbol("a", Decl(a.ts, 0, 0))
++>"./a.ts" : Symbol("./a.ts", Decl(a.ts, 0, 0))
+
+ === c.ts ===
+ import type { A } from "./a.d.ts"; // ok
+@@= skipped -17, +17 lines =@@
+
+ const aPromise = import("./a.d.ts"); // error
+ >aPromise : Symbol(aPromise, Decl(c.ts, 4, 5))
+->"./a.d.ts" : Symbol("a", Decl(a.ts, 0, 0))
++>"./a.d.ts" : Symbol("./a.d.ts", Decl(a.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.types b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.types
index 5bb9a4172f..872009e048 100644
--- a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.types
+++ b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.types
@@ -21,8 +21,8 @@ type __A = import("./a.ts").A; // ok
 >__A : A
 
 const aPromise = import("./a.ts"); // error
->aPromise : Promise<typeof import("a")>
->import("./a.ts") : Promise<typeof import("a")>
+>aPromise : Promise<typeof import("./a.ts")>
+>import("./a.ts") : Promise<typeof import("./a.ts")>
 >"./a.ts" : "./a.ts"
 
 === c.ts ===
@@ -38,7 +38,7 @@ type __A = import("./a.d.ts").A; // ok
 >__A : A
 
 const aPromise = import("./a.d.ts"); // error
->aPromise : Promise<typeof import("a")>
->import("./a.d.ts") : Promise<typeof import("a")>
+>aPromise : Promise<typeof import("./a.d.ts")>
+>import("./a.d.ts") : Promise<typeof import("./a.d.ts")>
 >"./a.d.ts" : "./a.d.ts"
 
diff --git a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.types.diff b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.types.diff
new file mode 100644
index 0000000000..a1e44f6634
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.types.diff
@@ -0,0 +1,22 @@
+--- old.allowsImportingTsExtension.types
++++ new.allowsImportingTsExtension.types
+@@= skipped -20, +20 lines =@@
+ >__A : A
+
+ const aPromise = import("./a.ts"); // error
+->aPromise : Promise<typeof import("a")>
+->import("./a.ts") : Promise<typeof import("a")>
++>aPromise : Promise<typeof import("./a.ts")>
++>import("./a.ts") : Promise<typeof import("./a.ts")>
+ >"./a.ts" : "./a.ts"
+
+ === c.ts ===
+@@= skipped -17, +17 lines =@@
+ >__A : A
+
+ const aPromise = import("./a.d.ts"); // error
+->aPromise : Promise<typeof import("a")>
+->import("./a.d.ts") : Promise<typeof import("a")>
++>aPromise : Promise<typeof import("./a.d.ts")>
++>import("./a.d.ts") : Promise<typeof import("./a.d.ts")>
+ >"./a.d.ts" : "./a.d.ts"
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types
index bd65824066..145586e119 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types
@@ -20,7 +20,7 @@ export { foo as "valid 3" } from "./values-valid";
 >"valid 3" : 123
 
 export * as "valid 4" from "./values-valid";
->"valid 4" : typeof import("values-valid")
+>"valid 4" : typeof import("./values-valid")
 
 === values-bad-import.ts ===
 import { foo as "invalid 2" } from "./values-valid";
@@ -60,7 +60,7 @@ export type { foo as "valid 3" } from "./type-decls-valid";
 >"valid 3" : any
 
 export type * as "valid 4" from "./type-decls-valid";
->"valid 4" : typeof import("type-decls-valid")
+>"valid 4" : typeof import("./type-decls-valid")
 
 === type-decls-bad-import.ts ===
 import type { foo as "invalid 2" } from "./type-decls-valid";
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types.diff
index 00fd27c149..3bb625b7b0 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types.diff
@@ -1,6 +1,12 @@
 --- old.arbitraryModuleNamespaceIdentifiers_syntax.types
 +++ new.arbitraryModuleNamespaceIdentifiers_syntax.types
-@@= skipped -24, +24 lines =@@
+@@= skipped -19, +19 lines =@@
+ >"valid 3" : 123
+
+ export * as "valid 4" from "./values-valid";
+->"valid 4" : typeof import("values-valid")
++>"valid 4" : typeof import("./values-valid")
+
  === values-bad-import.ts ===
  import { foo as "invalid 2" } from "./values-valid";
  >foo : 123
@@ -9,7 +15,7 @@
 
  === values-bad-export.ts ===
  export { "invalid 3" as baz };
-@@= skipped -8, +8 lines =@@
+@@= skipped -13, +13 lines =@@
 
  === values-no-as.ts ===
  import { "invalid 1" } from "./values-valid";
@@ -24,7 +30,13 @@
 
 
  === type-decls-valid.ts ===
-@@= skipped -32, +32 lines =@@
+@@= skipped -27, +27 lines =@@
+ >"valid 3" : any
+
+ export type * as "valid 4" from "./type-decls-valid";
+->"valid 4" : typeof import("type-decls-valid")
++>"valid 4" : typeof import("./type-decls-valid")
+
  === type-decls-bad-import.ts ===
  import type { foo as "invalid 2" } from "./type-decls-valid";
  >foo : any
@@ -33,7 +45,7 @@
 
  === type-decls-bad-export.ts ===
  export type { "invalid 3" as baz };
-@@= skipped -8, +8 lines =@@
+@@= skipped -13, +13 lines =@@
 
  === type-decls-no-as.ts ===
  import type { "invalid 1" } from "./type-decls-valid";
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.symbols b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.symbols
index f3e4a77b42..35b4043433 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.symbols
+++ b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.symbols
@@ -4,19 +4,19 @@
 // #38552
 exports.y = exports.x = void 0;
 >exports.y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
->exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
+>exports : Symbol("./assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
 >y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
 >exports.x : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
->exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
+>exports : Symbol("./assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
 >x : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
 
 exports.x = 1;
 >exports.x : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
->exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
+>exports : Symbol("./assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
 >x : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
 
 exports.y = 2;
 >exports.y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
->exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
+>exports : Symbol("./assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
 >y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
 
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.symbols.diff b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.symbols.diff
index c950b7d9e6..0b415e1043 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.symbols.diff
@@ -5,18 +5,20 @@
  // #38552
  exports.y = exports.x = void 0;
 ->exports.y : Symbol(y, Decl(assignmentToVoidZero1.js, 2, 14))
-+>exports.y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
- >exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
+->exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
 ->y : Symbol(y, Decl(assignmentToVoidZero1.js, 2, 14))
++>exports.y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
++>exports : Symbol("./assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
 +>y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
  >exports.x : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
- >exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
+->exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
++>exports : Symbol("./assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
  >x : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
 
  exports.x = 1;
  >exports.x : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
 ->exports : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
-+>exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
++>exports : Symbol("./assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
  >x : Symbol(x, Decl(assignmentToVoidZero1.js, 1, 31))
 
  exports.y = 2;
@@ -24,5 +26,5 @@
 ->exports : Symbol(y, Decl(assignmentToVoidZero1.js, 2, 14))
 ->y : Symbol(y, Decl(assignmentToVoidZero1.js, 2, 14))
 +>exports.y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
-+>exports : Symbol("assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
++>exports : Symbol("./assignmentToVoidZero1", Decl(assignmentToVoidZero1.js, 0, 0))
 +>y : Symbol(y, Decl(assignmentToVoidZero1.js, 0, 0), Decl(assignmentToVoidZero1.js, 2, 14))
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.types b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.types
index 276508101e..1b88bafaaa 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.types
+++ b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero1.types
@@ -5,11 +5,11 @@
 exports.y = exports.x = void 0;
 >exports.y = exports.x = void 0 : undefined
 >exports.y : undefined
->exports : typeof import("assignmentToVoidZero1")
+>exports : typeof import("./assignmentToVoidZero1")
 >y : undefined
 >exports.x = void 0 : undefined
 >exports.x : 1
->exports : typeof import("assignmentToVoidZero1")
+>exports : typeof import("./assignmentToVoidZero1")
 >x : 1
 >void 0 : undefined
 >0 : 0
@@ -17,14 +17,14 @@ exports.y = exports.x = void 0;
 exports.x = 1;
 >exports.x = 1 : 1
 >exports.x : 1
->exports : typeof import("assignmentToVoidZero1")
+>exports : typeof import("./assignmentToVoidZero1")
 >x : 1
 >1 : 1
 
 exports.y = 2;
 >exports.y = 2 : 2
 >exports.y : undefined
->exports : typeof import("assignmentToVoidZero1")
+>exports : typeof import("./assignmentToVoidZero1")
 >y : undefined
 >2 : 2
 
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.symbols b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.symbols
index 6af568668a..718daf1523 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.symbols
@@ -3,12 +3,12 @@
 === assignmentToVoidZero2.js ===
 exports.j = 1;
 >exports.j : Symbol(j, Decl(assignmentToVoidZero2.js, 0, 0))
->exports : Symbol("assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
+>exports : Symbol("./assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
 >j : Symbol(j, Decl(assignmentToVoidZero2.js, 0, 0))
 
 exports.k = void 0;
 >exports.k : Symbol(k, Decl(assignmentToVoidZero2.js, 0, 14))
->exports : Symbol("assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
+>exports : Symbol("./assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
 >k : Symbol(k, Decl(assignmentToVoidZero2.js, 0, 14))
 
 var o = {}
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.symbols.diff b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.symbols.diff
index 501a090bde..d624e64847 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.symbols.diff
@@ -5,12 +5,13 @@
  exports.j = 1;
  >exports.j : Symbol(j, Decl(assignmentToVoidZero2.js, 0, 0))
 ->exports : Symbol(j, Decl(assignmentToVoidZero2.js, 0, 0))
-+>exports : Symbol("assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
++>exports : Symbol("./assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
  >j : Symbol(j, Decl(assignmentToVoidZero2.js, 0, 0))
 
  exports.k = void 0;
+->exports : Symbol("assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
 +>exports.k : Symbol(k, Decl(assignmentToVoidZero2.js, 0, 14))
- >exports : Symbol("assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
++>exports : Symbol("./assignmentToVoidZero2", Decl(assignmentToVoidZero2.js, 0, 0))
 +>k : Symbol(k, Decl(assignmentToVoidZero2.js, 0, 14))
 
  var o = {}
diff --git a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.types b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.types
index fced68d811..a45837679f 100644
--- a/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.types
+++ b/testdata/baselines/reference/submodule/conformance/assignmentToVoidZero2.types
@@ -4,14 +4,14 @@
 exports.j = 1;
 >exports.j = 1 : 1
 >exports.j : 1
->exports : typeof import("assignmentToVoidZero2")
+>exports : typeof import("./assignmentToVoidZero2")
 >j : 1
 >1 : 1
 
 exports.k = void 0;
 >exports.k = void 0 : undefined
 >exports.k : undefined
->exports : typeof import("assignmentToVoidZero2")
+>exports : typeof import("./assignmentToVoidZero2")
 >k : undefined
 >void 0 : undefined
 >0 : 0
diff --git a/testdata/baselines/reference/submodule/conformance/chained.types b/testdata/baselines/reference/submodule/conformance/chained.types
index f0ec956b41..58dacb5da5 100644
--- a/testdata/baselines/reference/submodule/conformance/chained.types
+++ b/testdata/baselines/reference/submodule/conformance/chained.types
@@ -18,8 +18,8 @@ import { Z as Y } from './a';
 >Y : any
 
 export { B as C } from './a';
->B : typeof import("/a").B
->C : typeof import("/a").B
+>B : typeof import("./a").B
+>C : typeof import("./a").B
 
 === /c.ts ===
 import type { C } from './b';
diff --git a/testdata/baselines/reference/submodule/conformance/chained.types.diff b/testdata/baselines/reference/submodule/conformance/chained.types.diff
new file mode 100644
index 0000000000..9c44a714e1
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/chained.types.diff
@@ -0,0 +1,13 @@
+--- old.chained.types
++++ new.chained.types
+@@= skipped -17, +17 lines =@@
+ >Y : any
+
+ export { B as C } from './a';
+->B : typeof import("/a").B
+->C : typeof import("/a").B
++>B : typeof import("./a").B
++>C : typeof import("./a").B
+
+ === /c.ts ===
+ import type { C } from './b';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.symbols b/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.symbols
index ab772818c5..16cbe3f88c 100644
--- a/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.symbols
@@ -49,13 +49,13 @@ var B = function B() {
 }
 exports.A = A
 >exports.A : Symbol(A, Decl(mod.js, 6, 1))
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >A : Symbol(A, Decl(mod.js, 6, 1))
 >A : Symbol(A, Decl(mod.js, 1, 3))
 
 exports.B = B
 >exports.B : Symbol(B, Decl(mod.js, 7, 13))
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >B : Symbol(B, Decl(mod.js, 7, 13))
 >B : Symbol(B, Decl(mod.js, 4, 3))
 
diff --git a/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.symbols.diff
index eb9d12d2c0..453182f5d9 100644
--- a/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.symbols.diff
@@ -41,7 +41,7 @@
  exports.A = A
  >exports.A : Symbol(A, Decl(mod.js, 6, 1))
 ->exports : Symbol(A, Decl(mod.js, 6, 1))
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >A : Symbol(A, Decl(mod.js, 6, 1))
 ->A : Symbol(A, Decl(mod.js, 1, 3), Decl(mod.js, 8, 13))
 +>A : Symbol(A, Decl(mod.js, 1, 3))
@@ -49,7 +49,7 @@
  exports.B = B
  >exports.B : Symbol(B, Decl(mod.js, 7, 13))
 ->exports : Symbol(B, Decl(mod.js, 7, 13))
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >B : Symbol(B, Decl(mod.js, 7, 13))
 ->B : Symbol(B, Decl(mod.js, 4, 3), Decl(mod.js, 9, 13))
 +>B : Symbol(B, Decl(mod.js, 4, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.types b/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.types
index b109ec6a57..4dbebc0c05 100644
--- a/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.types
+++ b/testdata/baselines/reference/submodule/conformance/chainedPrototypeAssignment.types
@@ -73,14 +73,14 @@ var B = function B() {
 exports.A = A
 >exports.A = A : { (): void; prototype: { m(n: number): number; }; }
 >exports.A : { (): void; prototype: { m(n: number): number; }; }
->exports : typeof import("mod")
+>exports : typeof import("./mod")
 >A : { (): void; prototype: { m(n: number): number; }; }
 >A : { (): void; prototype: { m(n: number): number; }; }
 
 exports.B = B
 >exports.B = B : { (): void; prototype: { m(n: number): number; }; }
 >exports.B : { (): void; prototype: { m(n: number): number; }; }
->exports : typeof import("mod")
+>exports : typeof import("./mod")
 >B : { (): void; prototype: { m(n: number): number; }; }
 >B : { (): void; prototype: { m(n: number): number; }; }
 
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols
index 8c3b8e0421..183d7bfa62 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols
+++ b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols
@@ -4,7 +4,7 @@
 const { funky } = require('./commonJSAliasedExport');
 >funky : Symbol(funky, Decl(bug43713.js, 0, 7))
 >require : Symbol(require)
->'./commonJSAliasedExport' : Symbol("commonJSAliasedExport", Decl(commonJSAliasedExport.js, 0, 0))
+>'./commonJSAliasedExport' : Symbol("./commonJSAliasedExport", Decl(commonJSAliasedExport.js, 0, 0))
 
 /** @type {boolean} */
 var diddy
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols.diff b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols.diff
index 57e789428e..10f38a222b 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols.diff
@@ -1,6 +1,15 @@
 --- old.commonJSAliasedExport.symbols
 +++ new.commonJSAliasedExport.symbols
-@@= skipped -27, +27 lines =@@
+@@= skipped -3, +3 lines =@@
+ const { funky } = require('./commonJSAliasedExport');
+ >funky : Symbol(funky, Decl(bug43713.js, 0, 7))
+ >require : Symbol(require)
+->'./commonJSAliasedExport' : Symbol("commonJSAliasedExport", Decl(commonJSAliasedExport.js, 0, 0))
++>'./commonJSAliasedExport' : Symbol("./commonJSAliasedExport", Decl(commonJSAliasedExport.js, 0, 0))
+
+ /** @type {boolean} */
+ var diddy
+@@= skipped -24, +24 lines =@@
      return false;
  }
  module.exports = donkey;
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.symbols b/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.symbols
index 1bec9daf02..bf67b636b8 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.symbols
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.symbols
@@ -4,7 +4,7 @@
 const { K } = require("./mod1");
 >K : Symbol(K, Decl(main.js, 0, 7))
 >require : Symbol(require)
->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
+>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 /** @param {K} k */
 function f(k) {
@@ -28,7 +28,7 @@ class K {
 }
 exports.K = K;
 >exports.K : Symbol(K, Decl(mod1.js, 4, 1))
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >K : Symbol(K, Decl(mod1.js, 4, 1))
 >K : Symbol(K, Decl(mod1.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.symbols.diff b/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.symbols.diff
index d78b03b32f..dbe484281c 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.symbols.diff
@@ -1,6 +1,15 @@
 --- old.commonJSImportClassTypeReference.symbols
 +++ new.commonJSImportClassTypeReference.symbols
-@@= skipped -11, +11 lines =@@
+@@= skipped -3, +3 lines =@@
+ const { K } = require("./mod1");
+ >K : Symbol(K, Decl(main.js, 0, 7))
+ >require : Symbol(require)
+->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
++>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ /** @param {K} k */
+ function f(k) {
+@@= skipped -8, +8 lines =@@
  >k : Symbol(k, Decl(main.js, 2, 11))
 
      k.values()
@@ -15,6 +24,6 @@
  exports.K = K;
  >exports.K : Symbol(K, Decl(mod1.js, 4, 1))
 ->exports : Symbol(K, Decl(mod1.js, 4, 1))
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
  >K : Symbol(K, Decl(mod1.js, 4, 1))
  >K : Symbol(K, Decl(mod1.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.types b/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.types
index 7c31947da1..801980f671 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.types
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportClassTypeReference.types
@@ -3,7 +3,7 @@
 === main.js ===
 const { K } = require("./mod1");
 >K : typeof K
->require("./mod1") : typeof import("mod1")
+>require("./mod1") : typeof import("./mod1")
 >require : any
 >"./mod1" : "./mod1"
 
@@ -34,7 +34,7 @@ class K {
 exports.K = K;
 >exports.K = K : typeof K
 >exports.K : typeof K
->exports : typeof import("mod1")
+>exports : typeof import("./mod1")
 >K : typeof K
 >K : typeof K
 
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.symbols b/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.symbols
index 356d6a38ae..57372aca65 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.symbols
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.symbols
@@ -4,7 +4,7 @@
 const { K } = require("./mod1");
 >K : Symbol(K, Decl(main.js, 0, 7))
 >require : Symbol(require)
->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
+>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 /** @param {K} k */
 function f(k) {
@@ -18,7 +18,7 @@ function f(k) {
 === mod1.js ===
 exports.K = class K {
 >exports.K : Symbol(K, Decl(mod1.js, 0, 0))
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >K : Symbol(K, Decl(mod1.js, 0, 0))
 >K : Symbol(K, Decl(mod1.js, 0, 11))
 
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.symbols.diff b/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.symbols.diff
index f866db9a67..23fbe1e543 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.symbols.diff
@@ -1,6 +1,15 @@
 --- old.commonJSImportExportedClassExpression.symbols
 +++ new.commonJSImportExportedClassExpression.symbols
-@@= skipped -11, +11 lines =@@
+@@= skipped -3, +3 lines =@@
+ const { K } = require("./mod1");
+ >K : Symbol(K, Decl(main.js, 0, 7))
+ >require : Symbol(require)
+->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
++>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ /** @param {K} k */
+ function f(k) {
+@@= skipped -8, +8 lines =@@
  >k : Symbol(k, Decl(main.js, 2, 11))
 
      k.values()
@@ -13,6 +22,6 @@
  exports.K = class K {
  >exports.K : Symbol(K, Decl(mod1.js, 0, 0))
 ->exports : Symbol(K, Decl(mod1.js, 0, 0))
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
  >K : Symbol(K, Decl(mod1.js, 0, 0))
  >K : Symbol(K, Decl(mod1.js, 0, 11))
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.types b/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.types
index 00dcff55ca..6e2a938917 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.types
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportExportedClassExpression.types
@@ -3,7 +3,7 @@
 === main.js ===
 const { K } = require("./mod1");
 >K : typeof K
->require("./mod1") : typeof import("mod1")
+>require("./mod1") : typeof import("./mod1")
 >require : any
 >"./mod1" : "./mod1"
 
@@ -23,7 +23,7 @@ function f(k) {
 exports.K = class K {
 >exports.K = class K {    values() {    }} : typeof K
 >exports.K : typeof K
->exports : typeof import("mod1")
+>exports : typeof import("./mod1")
 >K : typeof K
 >class K {    values() {    }} : typeof K
 >K : typeof K
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.symbols b/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.symbols
index 845281b3f8..3895ac24fc 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.symbols
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.symbols
@@ -4,7 +4,7 @@
 const { K } = require("./mod1");
 >K : Symbol(K, Decl(main.js, 0, 7))
 >require : Symbol(require)
->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
+>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 /** @param {K} k */
 function f(k) {
@@ -35,7 +35,7 @@ NS.K =class {
 }
 exports.K = NS.K;
 >exports.K : Symbol(K, Decl(mod1.js, 5, 1))
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >K : Symbol(K, Decl(mod1.js, 5, 1))
 >NS.K : Symbol(K, Decl(mod1.js, 0, 11))
 >NS : Symbol(NS, Decl(mod1.js, 0, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.symbols.diff b/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.symbols.diff
index fb26b607db..23b0885fc7 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.symbols.diff
@@ -1,6 +1,15 @@
 --- old.commonJSImportNestedClassTypeReference.symbols
 +++ new.commonJSImportNestedClassTypeReference.symbols
-@@= skipped -11, +11 lines =@@
+@@= skipped -3, +3 lines =@@
+ const { K } = require("./mod1");
+ >K : Symbol(K, Decl(main.js, 0, 7))
+ >require : Symbol(require)
+->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
++>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ /** @param {K} k */
+ function f(k) {
+@@= skipped -8, +8 lines =@@
  >k : Symbol(k, Decl(main.js, 2, 11))
 
      k.values()
@@ -33,7 +42,7 @@
  exports.K = NS.K;
  >exports.K : Symbol(K, Decl(mod1.js, 5, 1))
 ->exports : Symbol(K, Decl(mod1.js, 5, 1))
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
  >K : Symbol(K, Decl(mod1.js, 5, 1))
  >NS.K : Symbol(K, Decl(mod1.js, 0, 11))
 ->NS : Symbol(NS, Decl(mod1.js, 0, 3), Decl(mod1.js, 0, 11))
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.types b/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.types
index 9c6af6b7bc..37695a5a8d 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.types
+++ b/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.types
@@ -3,7 +3,7 @@
 === main.js ===
 const { K } = require("./mod1");
 >K : typeof K
->require("./mod1") : typeof import("mod1")
+>require("./mod1") : typeof import("./mod1")
 >require : any
 >"./mod1" : "./mod1"
 
@@ -44,7 +44,7 @@ NS.K =class {
 exports.K = NS.K;
 >exports.K = NS.K : typeof K
 >exports.K : typeof K
->exports : typeof import("mod1")
+>exports : typeof import("./mod1")
 >K : typeof K
 >NS.K : typeof K
 >NS : { K: typeof K; }
diff --git a/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.symbols b/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.symbols
index 8b821ca105..e9db16d02a 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.symbols
+++ b/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.symbols
@@ -4,7 +4,7 @@
 const { a } = require("./foo");
 >a : Symbol(a, Decl(bar.js, 0, 7))
 >require : Symbol(require)
->"./foo" : Symbol("/foo", Decl(foo.d.ts, 0, 0))
+>"./foo" : Symbol("./foo", Decl(foo.d.ts, 0, 0))
 
 if (a) {
 >a : Symbol(a, Decl(bar.js, 0, 7))
diff --git a/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.symbols.diff b/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.symbols.diff
new file mode 100644
index 0000000000..71a220c3ad
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.symbols.diff
@@ -0,0 +1,11 @@
+--- old.commonJsImportBindingElementNarrowType.symbols
++++ new.commonJsImportBindingElementNarrowType.symbols
+@@= skipped -3, +3 lines =@@
+ const { a } = require("./foo");
+ >a : Symbol(a, Decl(bar.js, 0, 7))
+ >require : Symbol(require)
+->"./foo" : Symbol("/foo", Decl(foo.d.ts, 0, 0))
++>"./foo" : Symbol("./foo", Decl(foo.d.ts, 0, 0))
+
+ if (a) {
+ >a : Symbol(a, Decl(bar.js, 0, 7))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.types b/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.types
index 218b36ccf9..cc12e155aa 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.types
+++ b/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.types
@@ -3,7 +3,7 @@
 === /bar.js ===
 const { a } = require("./foo");
 >a : number | null
->require("./foo") : typeof import("/foo")
+>require("./foo") : typeof import("./foo")
 >require : any
 >"./foo" : "./foo"
 
diff --git a/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols b/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols
index 8b686083ff..4547527876 100644
--- a/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols
@@ -13,7 +13,7 @@ declare var module: any, exports: any;
 const A = require("./other");
 >A : Symbol(A, Decl(index.js, 0, 5))
 >require : Symbol(require, Decl(node.d.ts, 0, 0))
->"./other" : Symbol("other", Decl(other.js, 0, 0))
+>"./other" : Symbol("./other", Decl(other.js, 0, 0))
 
 const a = new A().id;
 >a : Symbol(a, Decl(index.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols.diff b/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols.diff
index 48e391f261..a2ac48809c 100644
--- a/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols.diff
@@ -1,6 +1,11 @@
 --- old.constructorFunctions2.symbols
 +++ new.constructorFunctions2.symbols
-@@= skipped -16, +16 lines =@@
+@@= skipped -12, +12 lines =@@
+ const A = require("./other");
+ >A : Symbol(A, Decl(index.js, 0, 5))
+ >require : Symbol(require, Decl(node.d.ts, 0, 0))
+->"./other" : Symbol("other", Decl(other.js, 0, 0))
++>"./other" : Symbol("./other", Decl(other.js, 0, 0))
 
  const a = new A().id;
  >a : Symbol(a, Decl(index.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols
index 36332f0b2b..a44107adcb 100644
--- a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols
@@ -85,7 +85,7 @@ class Thing {
 /** @type {DoneStatus} */
 exports.x = {
 >exports.x : Symbol(x, Decl(test.js, 36, 1))
->exports : Symbol("test", Decl(test.js, 0, 0))
+>exports : Symbol("./test", Decl(test.js, 0, 0))
 >x : Symbol(x, Decl(test.js, 36, 1))
 
     status: "done",
@@ -97,15 +97,15 @@ exports.x = {
 }
 exports.x
 >exports.x : Symbol(x, Decl(test.js, 36, 1))
->exports : Symbol("test", Decl(test.js, 0, 0))
+>exports : Symbol("./test", Decl(test.js, 0, 0))
 >x : Symbol(x, Decl(test.js, 36, 1))
 
 /** @type {DoneStatus} */
 module.exports.y = {
 >module.exports.y : Symbol(y, Decl(test.js, 45, 9))
->module.exports : Symbol("test", Decl(test.js, 0, 0))
+>module.exports : Symbol("./test", Decl(test.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("test", Decl(test.js, 0, 0))
+>exports : Symbol("./test", Decl(test.js, 0, 0))
 >y : Symbol(y, Decl(test.js, 45, 9))
 
     status: "done",
@@ -117,9 +117,9 @@ module.exports.y = {
 }
 module.exports.y
 >module.exports.y : Symbol(y, Decl(test.js, 45, 9))
->module.exports : Symbol("test", Decl(test.js, 0, 0))
+>module.exports : Symbol("./test", Decl(test.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("test", Decl(test.js, 0, 0))
+>exports : Symbol("./test", Decl(test.js, 0, 0))
 >y : Symbol(y, Decl(test.js, 45, 9))
 
 // prototype-property assignment
diff --git a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols.diff
index 29f9b8d203..90f162825e 100644
--- a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols.diff
@@ -49,33 +49,40 @@
  exports.x = {
  >exports.x : Symbol(x, Decl(test.js, 36, 1))
 ->exports : Symbol(x, Decl(test.js, 36, 1))
-+>exports : Symbol("test", Decl(test.js, 0, 0))
++>exports : Symbol("./test", Decl(test.js, 0, 0))
  >x : Symbol(x, Decl(test.js, 36, 1))
 
      status: "done",
-@@= skipped -18, +18 lines =@@
+@@= skipped -12, +12 lines =@@
+ }
+ exports.x
+ >exports.x : Symbol(x, Decl(test.js, 36, 1))
+->exports : Symbol("test", Decl(test.js, 0, 0))
++>exports : Symbol("./test", Decl(test.js, 0, 0))
+ >x : Symbol(x, Decl(test.js, 36, 1))
+
  /** @type {DoneStatus} */
  module.exports.y = {
  >module.exports.y : Symbol(y, Decl(test.js, 45, 9))
 ->module.exports : Symbol(y, Decl(test.js, 45, 9))
 ->module : Symbol(module, Decl(test.js, 45, 9))
 ->exports : Symbol(module.exports, Decl(test.js, 0, 0))
-+>module.exports : Symbol("test", Decl(test.js, 0, 0))
++>module.exports : Symbol("./test", Decl(test.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("test", Decl(test.js, 0, 0))
++>exports : Symbol("./test", Decl(test.js, 0, 0))
  >y : Symbol(y, Decl(test.js, 45, 9))
 
      status: "done",
-@@= skipped -14, +14 lines =@@
+@@= skipped -20, +20 lines =@@
  }
  module.exports.y
  >module.exports.y : Symbol(y, Decl(test.js, 45, 9))
 ->module.exports : Symbol(module.exports, Decl(test.js, 0, 0))
 ->module : Symbol(module, Decl(test.js, 45, 9))
 ->exports : Symbol(module.exports, Decl(test.js, 0, 0))
-+>module.exports : Symbol("test", Decl(test.js, 0, 0))
++>module.exports : Symbol("./test", Decl(test.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("test", Decl(test.js, 0, 0))
++>exports : Symbol("./test", Decl(test.js, 0, 0))
  >y : Symbol(y, Decl(test.js, 45, 9))
 
  // prototype-property assignment
diff --git a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.types b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.types
index bf08480b49..d3739a557a 100644
--- a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.types
+++ b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.types
@@ -99,7 +99,7 @@ class Thing {
 exports.x = {
 >exports.x = {    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 >exports.x : { status: "done"; m(n: number): void; }
->exports : typeof import("test")
+>exports : typeof import("./test")
 >x : { status: "done"; m(n: number): void; }
 >{    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 
@@ -113,16 +113,16 @@ exports.x = {
 }
 exports.x
 >exports.x : { status: "done"; m(n: number): void; }
->exports : typeof import("test")
+>exports : typeof import("./test")
 >x : { status: "done"; m(n: number): void; }
 
 /** @type {DoneStatus} */
 module.exports.y = {
 >module.exports.y = {    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 >module.exports.y : { status: "done"; m(n: number): void; }
->module.exports : typeof import("test")
->module : { "\"test\"": typeof import("test"); }
->exports : typeof import("test")
+>module.exports : typeof import("./test")
+>module : { "\"test\"": typeof import("./test"); }
+>exports : typeof import("./test")
 >y : { status: "done"; m(n: number): void; }
 >{    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 
@@ -136,9 +136,9 @@ module.exports.y = {
 }
 module.exports.y
 >module.exports.y : { status: "done"; m(n: number): void; }
->module.exports : typeof import("test")
->module : { "\"test\"": typeof import("test"); }
->exports : typeof import("test")
+>module.exports : typeof import("./test")
+>module : { "\"test\"": typeof import("./test"); }
+>exports : typeof import("./test")
 >y : { status: "done"; m(n: number): void; }
 
 // prototype-property assignment
diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types b/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types
index 2ba44b0b00..2d3871023b 100644
--- a/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types
+++ b/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types
@@ -24,7 +24,7 @@ export class HTML5Element extends HTMLElement {
 
 === file.d.ts ===
 export * as mod from "./component.html";
->mod : typeof import("component.d.html")
+>mod : typeof import("./component.html")
 
 === main.ts ===
 import { mod } from "./file.js";
diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types.diff b/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types.diff
new file mode 100644
index 0000000000..102ed2516f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types.diff
@@ -0,0 +1,11 @@
+--- old.declarationFileForHtmlFileWithinDeclarationFile.types
++++ new.declarationFileForHtmlFileWithinDeclarationFile.types
+@@= skipped -23, +23 lines =@@
+
+ === file.d.ts ===
+ export * as mod from "./component.html";
+->mod : typeof import("component.d.html")
++>mod : typeof import("./component.html")
+
+ === main.ts ===
+ import { mod } from "./file.js";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/duplicateExportAssignments.types b/testdata/baselines/reference/submodule/conformance/duplicateExportAssignments.types
index 530d42c108..131c618aff 100644
--- a/testdata/baselines/reference/submodule/conformance/duplicateExportAssignments.types
+++ b/testdata/baselines/reference/submodule/conformance/duplicateExportAssignments.types
@@ -31,7 +31,7 @@ export = y;
 
 === foo3.ts ===
 module x {
->x : typeof import("foo3")
+>x : typeof import("./foo3")
 
 	export var x = 10;
 >x : number
diff --git a/testdata/baselines/reference/submodule/conformance/duplicateExportAssignments.types.diff b/testdata/baselines/reference/submodule/conformance/duplicateExportAssignments.types.diff
new file mode 100644
index 0000000000..e2df62a6ab
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/duplicateExportAssignments.types.diff
@@ -0,0 +1,11 @@
+--- old.duplicateExportAssignments.types
++++ new.duplicateExportAssignments.types
+@@= skipped -30, +30 lines =@@
+
+ === foo3.ts ===
+ module x {
+->x : typeof import("foo3")
++>x : typeof import("./foo3")
+
+ 	export var x = 10;
+ >x : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols
index fb9a7f22ad..c8d1daf52a 100644
--- a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols
+++ b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols
@@ -4,14 +4,14 @@
 /** @enum {number} */
 exports.a = {};
 >exports.a : Symbol(a, Decl(enumTagOnExports.js, 0, 0))
->exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
+>exports : Symbol("./enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 >a : Symbol(a, Decl(enumTagOnExports.js, 0, 0))
 
 /** @enum {string} */
 module.exports.b = {};
 >module.exports.b : Symbol(b, Decl(enumTagOnExports.js, 1, 15))
->module.exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
+>module.exports : Symbol("./enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
+>exports : Symbol("./enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 >b : Symbol(b, Decl(enumTagOnExports.js, 1, 15))
 
diff --git a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols.diff b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols.diff
index b19e94ec50..38d8278904 100644
--- a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols.diff
@@ -8,7 +8,7 @@
 ->exports : Symbol(a, Decl(enumTagOnExports.js, 0, 0), Decl(enumTagOnExports.js, 1, 8), Decl(enumTagOnExports.js, 0, 4))
 ->a : Symbol(a, Decl(enumTagOnExports.js, 0, 0), Decl(enumTagOnExports.js, 1, 8), Decl(enumTagOnExports.js, 0, 4))
 +>exports.a : Symbol(a, Decl(enumTagOnExports.js, 0, 0))
-+>exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
++>exports : Symbol("./enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 +>a : Symbol(a, Decl(enumTagOnExports.js, 0, 0))
 
  /** @enum {string} */
@@ -19,7 +19,7 @@
 ->exports : Symbol(module.exports, Decl(enumTagOnExports.js, 0, 0))
 ->b : Symbol(b, Decl(enumTagOnExports.js, 1, 15), Decl(enumTagOnExports.js, 4, 15), Decl(enumTagOnExports.js, 3, 4))
 +>module.exports.b : Symbol(b, Decl(enumTagOnExports.js, 1, 15))
-+>module.exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
++>module.exports : Symbol("./enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
++>exports : Symbol("./enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 +>b : Symbol(b, Decl(enumTagOnExports.js, 1, 15))
diff --git a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.types b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.types
index e7d084c8a1..2a041435f5 100644
--- a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.types
+++ b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.types
@@ -5,7 +5,7 @@
 exports.a = {};
 >exports.a = {} : {}
 >exports.a : {}
->exports : typeof import("enumTagOnExports")
+>exports : typeof import("./enumTagOnExports")
 >a : {}
 >{} : {}
 
@@ -13,9 +13,9 @@ exports.a = {};
 module.exports.b = {};
 >module.exports.b = {} : {}
 >module.exports.b : {}
->module.exports : typeof import("enumTagOnExports")
->module : { "\"enumTagOnExports\"": typeof import("enumTagOnExports"); }
->exports : typeof import("enumTagOnExports")
+>module.exports : typeof import("./enumTagOnExports")
+>module : { "\"enumTagOnExports\"": typeof import("./enumTagOnExports"); }
+>exports : typeof import("./enumTagOnExports")
 >b : {}
 >{} : {}
 
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).types
index 8f6efe6a6b..14f26848aa 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).types.diff
new file mode 100644
index 0000000000..3800e25d04
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace1(module=commonjs).types
++++ new.exportAsNamespace1(module=commonjs).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types
index 8f6efe6a6b..14f26848aa 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types.diff
new file mode 100644
index 0000000000..33fd4b2451
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace1(module=es2015).types
++++ new.exportAsNamespace1(module=es2015).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types
index 8f6efe6a6b..14f26848aa 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types.diff
new file mode 100644
index 0000000000..30cad1becf
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace1(module=esnext).types
++++ new.exportAsNamespace1(module=esnext).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=commonjs).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=commonjs).types
index 2be461c62c..aafa9eacca 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=commonjs).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=commonjs).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=commonjs).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=commonjs).types.diff
new file mode 100644
index 0000000000..0c06bbbe9c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=commonjs).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace2(module=commonjs).types
++++ new.exportAsNamespace2(module=commonjs).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types
index 2be461c62c..aafa9eacca 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types.diff
new file mode 100644
index 0000000000..490344fd6f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace2(module=es2015).types
++++ new.exportAsNamespace2(module=es2015).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types
index 2be461c62c..aafa9eacca 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types.diff
new file mode 100644
index 0000000000..5853f35ca6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace2(module=esnext).types
++++ new.exportAsNamespace2(module=esnext).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=commonjs).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=commonjs).types
index 4f2e5814ee..125c02e1a9 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=commonjs).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=commonjs).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : number
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=commonjs).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=commonjs).types.diff
new file mode 100644
index 0000000000..96eec255cf
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=commonjs).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace3(module=commonjs).types
++++ new.exportAsNamespace3(module=commonjs).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types
index 4f2e5814ee..125c02e1a9 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : number
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types.diff
new file mode 100644
index 0000000000..1d7c5ef9de
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace3(module=es2015).types
++++ new.exportAsNamespace3(module=es2015).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types
index 4f2e5814ee..125c02e1a9 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("0")
+>ns : typeof import("./0")
 
 ns.a;
 >ns.a : number
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types.diff
new file mode 100644
index 0000000000..76284e883b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace3(module=esnext).types
++++ new.exportAsNamespace3(module=esnext).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as ns from './0';
+->ns : typeof import("0")
++>ns : typeof import("./0")
+
+ ns.a;
+ >ns.a : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=commonjs).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=commonjs).types
index 8f8591bdfb..537720d322 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=commonjs).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=commonjs).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as default from './0';
->default : typeof import("0")
+>default : typeof import("./0")
 
 === 11.ts ===
 import * as ns from './0';
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=commonjs).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=commonjs).types.diff
new file mode 100644
index 0000000000..4ee955a42b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=commonjs).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace4(module=commonjs).types
++++ new.exportAsNamespace4(module=commonjs).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as default from './0';
+->default : typeof import("0")
++>default : typeof import("./0")
+
+ === 11.ts ===
+ import * as ns from './0';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types
index 8f8591bdfb..537720d322 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as default from './0';
->default : typeof import("0")
+>default : typeof import("./0")
 
 === 11.ts ===
 import * as ns from './0';
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types.diff
new file mode 100644
index 0000000000..dc622a0f3d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace4(module=es2015).types
++++ new.exportAsNamespace4(module=es2015).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as default from './0';
+->default : typeof import("0")
++>default : typeof import("./0")
+
+ === 11.ts ===
+ import * as ns from './0';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types
index 8f8591bdfb..537720d322 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as default from './0';
->default : typeof import("0")
+>default : typeof import("./0")
 
 === 11.ts ===
 import * as ns from './0';
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types.diff
new file mode 100644
index 0000000000..cd98542e89
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace4(module=esnext).types
++++ new.exportAsNamespace4(module=esnext).types
+@@= skipped -10, +10 lines =@@
+
+ === 1.ts ===
+ export * as default from './0';
+->default : typeof import("0")
++>default : typeof import("./0")
+
+ === 11.ts ===
+ import * as ns from './0';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace5.types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace5.types
index a2850b11f1..33008837e8 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace5.types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace5.types
@@ -9,7 +9,7 @@ declare const Named: 0;
 
 === two.d.ts ===
 export * as default from "./three";
->default : typeof import("three")
+>default : typeof import("./three")
 
 === one.ts ===
 import ns from "./two";
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace5.types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace5.types.diff
new file mode 100644
index 0000000000..ed5a3d3564
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace5.types.diff
@@ -0,0 +1,11 @@
+--- old.exportAsNamespace5.types
++++ new.exportAsNamespace5.types
+@@= skipped -8, +8 lines =@@
+
+ === two.d.ts ===
+ export * as default from "./three";
+->default : typeof import("three")
++>default : typeof import("./three")
+
+ === one.ts ===
+ import ns from "./two";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier-isolatedModules.types b/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier-isolatedModules.types
index 6ea2480ca7..de7015acff 100644
--- a/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier-isolatedModules.types
+++ b/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier-isolatedModules.types
@@ -6,5 +6,5 @@ export type A = {};
 
 === /b.ts ===
 export type { A } from './a'; // should not error, but would without `type`
->A : import("/a").A
+>A : import("./a").A
 
diff --git a/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier-isolatedModules.types.diff b/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier-isolatedModules.types.diff
new file mode 100644
index 0000000000..6875fcefab
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier-isolatedModules.types.diff
@@ -0,0 +1,8 @@
+--- old.exportDeclaration_moduleSpecifier-isolatedModules.types
++++ new.exportDeclaration_moduleSpecifier-isolatedModules.types
+@@= skipped -5, +5 lines =@@
+
+ === /b.ts ===
+ export type { A } from './a'; // should not error, but would without `type`
+->A : import("/a").A
++>A : import("./a").A
diff --git a/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier.types b/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier.types
index 2aec620750..37877c3f4a 100644
--- a/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier.types
+++ b/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier.types
@@ -6,7 +6,7 @@ export class A {}
 
 === /b.ts ===
 export type { A } from './a';
->A : import("/a").A
+>A : import("./a").A
 
 === /c.ts ===
 import { A } from './b';
diff --git a/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier.types.diff b/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier.types.diff
new file mode 100644
index 0000000000..63c9587135
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportDeclaration_moduleSpecifier.types.diff
@@ -0,0 +1,11 @@
+--- old.exportDeclaration_moduleSpecifier.types
++++ new.exportDeclaration_moduleSpecifier.types
+@@= skipped -5, +5 lines =@@
+
+ === /b.ts ===
+ export type { A } from './a';
+->A : import("/a").A
++>A : import("./a").A
+
+ === /c.ts ===
+ import { A } from './b';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace1.types b/testdata/baselines/reference/submodule/conformance/exportNamespace1.types
index e30d5da58f..6d7a94c0e9 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNamespace1.types
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace1.types
@@ -6,7 +6,7 @@ export class A {}
 
 === b.ts ===
 export type { A } from './a';
->A : import("a").A
+>A : import("./a").A
 
 === c.ts ===
 
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace1.types.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace1.types.diff
new file mode 100644
index 0000000000..ee355af6f8
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace1.types.diff
@@ -0,0 +1,10 @@
+--- old.exportNamespace1.types
++++ new.exportNamespace1.types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export type { A } from './a';
+->A : import("a").A
++>A : import("./a").A
+
+ === c.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace10.types b/testdata/baselines/reference/submodule/conformance/exportNamespace10.types
index 0103e83f3d..da4efd18a8 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNamespace10.types
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace10.types
@@ -6,7 +6,7 @@ export class A {}
 
 === /b.ts ===
 export type * as ns from "./a";
->ns : typeof import("/a")
+>ns : typeof import("./a")
 
 === /c.ts ===
 import { ns } from "./b";
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace10.types.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace10.types.diff
new file mode 100644
index 0000000000..2bd3e31286
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace10.types.diff
@@ -0,0 +1,11 @@
+--- old.exportNamespace10.types
++++ new.exportNamespace10.types
+@@= skipped -5, +5 lines =@@
+
+ === /b.ts ===
+ export type * as ns from "./a";
+->ns : typeof import("/a")
++>ns : typeof import("./a")
+
+ === /c.ts ===
+ import { ns } from "./b";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace2.types b/testdata/baselines/reference/submodule/conformance/exportNamespace2.types
index d8597ae997..1a2c20a649 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNamespace2.types
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace2.types
@@ -6,7 +6,7 @@ export class A {}
 
 === b.ts ===
 export * as a from './a';
->a : typeof import("a")
+>a : typeof import("./a")
 
 === c.ts ===
 import type { a } from './b';
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace2.types.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace2.types.diff
new file mode 100644
index 0000000000..7599b589ea
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace2.types.diff
@@ -0,0 +1,11 @@
+--- old.exportNamespace2.types
++++ new.exportNamespace2.types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export * as a from './a';
+->a : typeof import("a")
++>a : typeof import("./a")
+
+ === c.ts ===
+ import type { a } from './b';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace3.types b/testdata/baselines/reference/submodule/conformance/exportNamespace3.types
index 2dd6c75be9..3749fe7132 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNamespace3.types
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace3.types
@@ -6,11 +6,11 @@ export class A {}
 
 === b.ts ===
 export type { A } from './a';
->A : import("a").A
+>A : import("./a").A
 
 === c.ts ===
 export * as a from './b';
->a : typeof import("b")
+>a : typeof import("./b")
 
 === d.ts ===
 import { a } from './c';
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace3.types.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace3.types.diff
new file mode 100644
index 0000000000..e94378c71a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace3.types.diff
@@ -0,0 +1,16 @@
+--- old.exportNamespace3.types
++++ new.exportNamespace3.types
+@@= skipped -5, +5 lines =@@
+
+ === b.ts ===
+ export type { A } from './a';
+->A : import("a").A
++>A : import("./a").A
+
+ === c.ts ===
+ export * as a from './b';
+->a : typeof import("b")
++>a : typeof import("./b")
+
+ === d.ts ===
+ import { a } from './c';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace4.types b/testdata/baselines/reference/submodule/conformance/exportNamespace4.types
index 18e16d6f71..6232966b36 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNamespace4.types
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace4.types
@@ -10,7 +10,7 @@ export type * from './a';
 
 === c.ts ===
 export type * as ns from './a';
->ns : typeof import("a")
+>ns : typeof import("./a")
 
 === d.ts ===
 import { A } from './b';
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace4.types.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace4.types.diff
new file mode 100644
index 0000000000..82d0aed0b3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace4.types.diff
@@ -0,0 +1,11 @@
+--- old.exportNamespace4.types
++++ new.exportNamespace4.types
+@@= skipped -9, +9 lines =@@
+
+ === c.ts ===
+ export type * as ns from './a';
+->ns : typeof import("a")
++>ns : typeof import("./a")
+
+ === d.ts ===
+ import { A } from './b';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace5.types b/testdata/baselines/reference/submodule/conformance/exportNamespace5.types
index c4b82a3d58..0fd8d0df74 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNamespace5.types
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace5.types
@@ -13,7 +13,7 @@ export class X {}
 === /b.ts ===
 export type * from "./a";
 export { X } from "./a";
->X : typeof import("/a").X
+>X : typeof import("./a").X
 
 === /c.ts ===
 import { A, B as C, X } from "./b";
diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace5.types.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace5.types.diff
new file mode 100644
index 0000000000..740cf3c039
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportNamespace5.types.diff
@@ -0,0 +1,11 @@
+--- old.exportNamespace5.types
++++ new.exportNamespace5.types
+@@= skipped -12, +12 lines =@@
+ === /b.ts ===
+ export type * from "./a";
+ export { X } from "./a";
+->X : typeof import("/a").X
++>X : typeof import("./a").X
+
+ === /c.ts ===
+ import { A, B as C, X } from "./b";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.symbols b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.symbols
index aa0e1b9c6c..913eae1699 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.symbols
+++ b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.symbols
@@ -3,19 +3,19 @@
 === mod.js ===
 exports.n = {};
 >exports.n : Symbol(n, Decl(mod.js, 0, 0))
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >n : Symbol(n, Decl(mod.js, 0, 0))
 
 exports.n.K = function () {
 >exports.n : Symbol(n, Decl(mod.js, 0, 0))
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >n : Symbol(n, Decl(mod.js, 0, 0))
 
     this.x = 10;
 }
 exports.Classic = class {
 >exports.Classic : Symbol(Classic, Decl(mod.js, 3, 1))
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 
     constructor() {
diff --git a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.symbols.diff b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.symbols.diff
index 1292969e33..5bd7ca82c1 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.symbols.diff
@@ -8,16 +8,17 @@
 ->exports : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 8))
 ->n : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 8))
 +>exports.n : Symbol(n, Decl(mod.js, 0, 0))
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>n : Symbol(n, Decl(mod.js, 0, 0))
 
  exports.n.K = function () {
 ->exports.n.K : Symbol(n.K, Decl(mod.js, 0, 15))
 ->exports.n : Symbol(n.K, Decl(mod.js, 0, 15))
-+>exports.n : Symbol(n, Decl(mod.js, 0, 0))
- >exports : Symbol("mod", Decl(mod.js, 0, 0))
+->exports : Symbol("mod", Decl(mod.js, 0, 0))
 ->n : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 8))
 ->K : Symbol(n.K, Decl(mod.js, 0, 15))
++>exports.n : Symbol(n, Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>n : Symbol(n, Decl(mod.js, 0, 0))
 
      this.x = 10;
@@ -28,7 +29,7 @@
  exports.Classic = class {
  >exports.Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 ->exports : Symbol(Classic, Decl(mod.js, 3, 1))
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 
      constructor() {
diff --git a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.types b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.types
index 31f92441d0..4b795dfb0b 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.types
+++ b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces.types
@@ -4,7 +4,7 @@
 exports.n = {};
 >exports.n = {} : {}
 >exports.n : {}
->exports : typeof import("mod")
+>exports : typeof import("./mod")
 >n : {}
 >{} : {}
 
@@ -12,7 +12,7 @@ exports.n.K = function () {
 >exports.n.K = function () {    this.x = 10;} : () => void
 >exports.n.K : any
 >exports.n : {}
->exports : typeof import("mod")
+>exports : typeof import("./mod")
 >n : {}
 >K : any
 >function () {    this.x = 10;} : () => void
@@ -27,7 +27,7 @@ exports.n.K = function () {
 exports.Classic = class {
 >exports.Classic = class {    constructor() {        this.p = 1    }} : typeof Classic
 >exports.Classic : typeof Classic
->exports : typeof import("mod")
+>exports : typeof import("./mod")
 >Classic : typeof Classic
 >class {    constructor() {        this.p = 1    }} : typeof Classic
 
diff --git a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.symbols b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.symbols
index 0e593e2440..f7488d2d0d 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.symbols
@@ -4,16 +4,16 @@
 // Based on a pattern from adonis
 exports.formatters = {}
 >exports.formatters : Symbol(formatters, Decl(mod.js, 0, 0))
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >formatters : Symbol(formatters, Decl(mod.js, 0, 0))
 
 === first.js ===
 exports = require('./mod')
->exports : Symbol("first", Decl(first.js, 0, 0))
+>exports : Symbol("./first", Decl(first.js, 0, 0))
 >require : Symbol(require)
 
 exports.formatters.j = function (v) {
->exports : Symbol("first", Decl(first.js, 0, 0))
+>exports : Symbol("./first", Decl(first.js, 0, 0))
 >v : Symbol(v, Decl(first.js, 1, 33))
 
     return v
@@ -21,11 +21,11 @@ exports.formatters.j = function (v) {
 }
 === second.js ===
 exports = require('./mod')
->exports : Symbol("second", Decl(second.js, 0, 0))
+>exports : Symbol("./second", Decl(second.js, 0, 0))
 >require : Symbol(require)
 
 exports.formatters.o = function (v) {
->exports : Symbol("second", Decl(second.js, 0, 0))
+>exports : Symbol("./second", Decl(second.js, 0, 0))
 >v : Symbol(v, Decl(second.js, 1, 33))
 
     return v
diff --git a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.symbols.diff b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.symbols.diff
index 7a91342767..f906169706 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.symbols.diff
@@ -5,22 +5,34 @@
  exports.formatters = {}
  >exports.formatters : Symbol(formatters, Decl(mod.js, 0, 0))
 ->exports : Symbol(formatters, Decl(mod.js, 0, 0))
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >formatters : Symbol(formatters, Decl(mod.js, 0, 0))
 
  === first.js ===
  exports = require('./mod')
- >exports : Symbol("first", Decl(first.js, 0, 0))
+->exports : Symbol("first", Decl(first.js, 0, 0))
++>exports : Symbol("./first", Decl(first.js, 0, 0))
  >require : Symbol(require)
 ->'./mod' : Symbol("mod", Decl(mod.js, 0, 0))
 
  exports.formatters.j = function (v) {
- >exports : Symbol("first", Decl(first.js, 0, 0))
-@@= skipped -20, +19 lines =@@
+->exports : Symbol("first", Decl(first.js, 0, 0))
++>exports : Symbol("./first", Decl(first.js, 0, 0))
+ >v : Symbol(v, Decl(first.js, 1, 33))
+
+     return v
+@@= skipped -18, +17 lines =@@
+ }
+ === second.js ===
  exports = require('./mod')
- >exports : Symbol("second", Decl(second.js, 0, 0))
+->exports : Symbol("second", Decl(second.js, 0, 0))
++>exports : Symbol("./second", Decl(second.js, 0, 0))
  >require : Symbol(require)
 ->'./mod' : Symbol("mod", Decl(mod.js, 0, 0))
 
  exports.formatters.o = function (v) {
- >exports : Symbol("second", Decl(second.js, 0, 0))
\ No newline at end of file
+->exports : Symbol("second", Decl(second.js, 0, 0))
++>exports : Symbol("./second", Decl(second.js, 0, 0))
+ >v : Symbol(v, Decl(second.js, 1, 33))
+
+     return v
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.types b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.types
index e8d832d052..e6d6329f2e 100644
--- a/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.types
+++ b/testdata/baselines/reference/submodule/conformance/exportNestedNamespaces2.types
@@ -5,15 +5,15 @@
 exports.formatters = {}
 >exports.formatters = {} : {}
 >exports.formatters : {}
->exports : typeof import("mod")
+>exports : typeof import("./mod")
 >formatters : {}
 >{} : {}
 
 === first.js ===
 exports = require('./mod')
->exports = require('./mod') : typeof import("mod")
+>exports = require('./mod') : typeof import("./mod")
 >exports : any
->require('./mod') : typeof import("mod")
+>require('./mod') : typeof import("./mod")
 >require : any
 >'./mod' : "./mod"
 
@@ -21,7 +21,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 import("first")
+>exports : typeof import("./first")
 >formatters : any
 >j : any
 >function (v) {    return v} : (v: any) => any
@@ -32,9 +32,9 @@ exports.formatters.j = function (v) {
 }
 === second.js ===
 exports = require('./mod')
->exports = require('./mod') : typeof import("mod")
+>exports = require('./mod') : typeof import("./mod")
 >exports : any
->require('./mod') : typeof import("mod")
+>require('./mod') : typeof import("./mod")
 >require : any
 >'./mod' : "./mod"
 
@@ -42,7 +42,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 import("second")
+>exports : typeof import("./second")
 >formatters : any
 >o : any
 >function (v) {    return v} : (v: any) => any
diff --git a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols
index 84112b66c1..a79572351b 100644
--- a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols
+++ b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols
@@ -3,9 +3,9 @@
 === bug24492.js ===
 module.exports.D = class { }
 >module.exports.D : Symbol(D, Decl(bug24492.js, 0, 0))
->module.exports : Symbol("bug24492", Decl(bug24492.js, 0, 0))
+>module.exports : Symbol("./bug24492", Decl(bug24492.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("bug24492", Decl(bug24492.js, 0, 0))
+>exports : Symbol("./bug24492", Decl(bug24492.js, 0, 0))
 >D : Symbol(D, Decl(bug24492.js, 0, 0))
 
 new D()
diff --git a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols.diff b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols.diff
index b4f8fb2594..f800665532 100644
--- a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols.diff
@@ -7,9 +7,9 @@
 ->module.exports : Symbol(D, Decl(bug24492.js, 0, 0))
 ->module : Symbol(module, Decl(bug24492.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(bug24492.js, 0, 0))
-+>module.exports : Symbol("bug24492", Decl(bug24492.js, 0, 0))
++>module.exports : Symbol("./bug24492", Decl(bug24492.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("bug24492", Decl(bug24492.js, 0, 0))
++>exports : Symbol("./bug24492", Decl(bug24492.js, 0, 0))
  >D : Symbol(D, Decl(bug24492.js, 0, 0))
 
  new D()
diff --git a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.types b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.types
index d6b9fd686e..d87e13615a 100644
--- a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.types
+++ b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.types
@@ -4,9 +4,9 @@
 module.exports.D = class { }
 >module.exports.D = class { } : typeof D
 >module.exports.D : typeof D
->module.exports : typeof import("bug24492")
->module : { "\"bug24492\"": typeof import("bug24492"); }
->exports : typeof import("bug24492")
+>module.exports : typeof import("./bug24492")
+>module : { "\"bug24492\"": typeof import("./bug24492"); }
+>exports : typeof import("./bug24492")
 >D : typeof D
 >class { } : typeof D
 
diff --git a/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.types b/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.types
index 783df77eb4..1df2a85bd7 100644
--- a/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.types
+++ b/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.types
@@ -2,14 +2,14 @@
 
 === usage.ts ===
 import { Something } from "./prelude"
->Something : typeof import("Something")
+>Something : typeof import("./Something")
 
 export const myValue: Something<string> = Something.of("abc")
 >myValue : Something<string>
->Something.of("abc") : import("Something").Something<string>
->Something.of : <A>(value: A) => import("Something").Something<A>
->Something : typeof import("Something")
->of : <A>(value: A) => import("Something").Something<A>
+>Something.of("abc") : import("./Something").Something<string>
+>Something.of : <A>(value: A) => import("./Something").Something<A>
+>Something : typeof import("./Something")
+>of : <A>(value: A) => import("./Something").Something<A>
 >"abc" : "abc"
 
 export type MyType = Something.SubType<string>
diff --git a/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.types.diff b/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.types.diff
new file mode 100644
index 0000000000..6ca9fda1d7
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.types.diff
@@ -0,0 +1,22 @@
+--- old.exportTypeMergedWithExportStarAsNamespace.types
++++ new.exportTypeMergedWithExportStarAsNamespace.types
+@@= skipped -1, +1 lines =@@
+
+ === usage.ts ===
+ import { Something } from "./prelude"
+->Something : typeof import("Something")
++>Something : typeof import("./Something")
+
+ export const myValue: Something<string> = Something.of("abc")
+ >myValue : Something<string>
+->Something.of("abc") : import("Something").Something<string>
+->Something.of : <A>(value: A) => import("Something").Something<A>
+->Something : typeof import("Something")
+->of : <A>(value: A) => import("Something").Something<A>
++>Something.of("abc") : import("./Something").Something<string>
++>Something.of : <A>(value: A) => import("./Something").Something<A>
++>Something : typeof import("./Something")
++>of : <A>(value: A) => import("./Something").Something<A>
+ >"abc" : "abc"
+
+ export type MyType = Something.SubType<string>
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports1-es6.types b/testdata/baselines/reference/submodule/conformance/exportsAndImports1-es6.types
index 94ae6bbff5..70d6bc718a 100644
--- a/testdata/baselines/reference/submodule/conformance/exportsAndImports1-es6.types
+++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports1-es6.types
@@ -63,11 +63,11 @@ export { v, f, C, I, E, D, M, N, T, a };
 export { v, f, C, I, E, D, M, N, T, a } from "./t1";
 >v : number
 >f : () => void
->C : typeof import("t1").C
+>C : typeof import("./t1").C
 >I : any
->E : typeof import("t1").E
->D : typeof import("t1").D
->M : typeof import("t1").M
+>E : typeof import("./t1").E
+>D : typeof import("./t1").D
+>M : typeof import("./t1").M
 >N : any
 >T : any
 >a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports1-es6.types.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImports1-es6.types.diff
new file mode 100644
index 0000000000..d1996e8128
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports1-es6.types.diff
@@ -0,0 +1,18 @@
+--- old.exportsAndImports1-es6.types
++++ new.exportsAndImports1-es6.types
+@@= skipped -62, +62 lines =@@
+ export { v, f, C, I, E, D, M, N, T, a } from "./t1";
+ >v : number
+ >f : () => void
+->C : typeof import("t1").C
++>C : typeof import("./t1").C
+ >I : any
+->E : typeof import("t1").E
+->D : typeof import("t1").D
+->M : typeof import("t1").M
++>E : typeof import("./t1").E
++>D : typeof import("./t1").D
++>M : typeof import("./t1").M
+ >N : any
+ >T : any
+ >a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports1.types b/testdata/baselines/reference/submodule/conformance/exportsAndImports1.types
index c45f263060..ba4484a9b6 100644
--- a/testdata/baselines/reference/submodule/conformance/exportsAndImports1.types
+++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports1.types
@@ -63,11 +63,11 @@ export { v, f, C, I, E, D, M, N, T, a };
 export { v, f, C, I, E, D, M, N, T, a } from "./t1";
 >v : number
 >f : () => void
->C : typeof import("t1").C
+>C : typeof import("./t1").C
 >I : any
->E : typeof import("t1").E
->D : typeof import("t1").D
->M : typeof import("t1").M
+>E : typeof import("./t1").E
+>D : typeof import("./t1").D
+>M : typeof import("./t1").M
 >N : any
 >T : any
 >a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports1.types.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImports1.types.diff
new file mode 100644
index 0000000000..453ef7a4e3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports1.types.diff
@@ -0,0 +1,18 @@
+--- old.exportsAndImports1.types
++++ new.exportsAndImports1.types
+@@= skipped -62, +62 lines =@@
+ export { v, f, C, I, E, D, M, N, T, a } from "./t1";
+ >v : number
+ >f : () => void
+->C : typeof import("t1").C
++>C : typeof import("./t1").C
+ >I : any
+->E : typeof import("t1").E
+->D : typeof import("t1").D
+->M : typeof import("t1").M
++>E : typeof import("./t1").E
++>D : typeof import("./t1").D
++>M : typeof import("./t1").M
+ >N : any
+ >T : any
+ >a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports3-es6.types b/testdata/baselines/reference/submodule/conformance/exportsAndImports3-es6.types
index c69fb78d11..0d5127f34e 100644
--- a/testdata/baselines/reference/submodule/conformance/exportsAndImports3-es6.types
+++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports3-es6.types
@@ -75,16 +75,16 @@ export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N,
 >v : number
 >f1 : () => void
 >f : () => void
->C1 : typeof import("t1").C
->C : typeof import("t1").C
+>C1 : typeof import("./t1").C
+>C : typeof import("./t1").C
 >I1 : any
 >I : any
->E1 : typeof import("t1").E
->E : typeof import("t1").E
->D1 : typeof import("t1").D
->D : typeof import("t1").D
->M1 : typeof import("t1").M
->M : typeof import("t1").M
+>E1 : typeof import("./t1").E
+>E : typeof import("./t1").E
+>D1 : typeof import("./t1").D
+>D : typeof import("./t1").D
+>M1 : typeof import("./t1").M
+>M : typeof import("./t1").M
 >N1 : any
 >N : any
 >T1 : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports3-es6.types.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImports3-es6.types.diff
new file mode 100644
index 0000000000..a6310073d6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports3-es6.types.diff
@@ -0,0 +1,27 @@
+--- old.exportsAndImports3-es6.types
++++ new.exportsAndImports3-es6.types
+@@= skipped -74, +74 lines =@@
+ >v : number
+ >f1 : () => void
+ >f : () => void
+->C1 : typeof import("t1").C
+->C : typeof import("t1").C
++>C1 : typeof import("./t1").C
++>C : typeof import("./t1").C
+ >I1 : any
+ >I : any
+->E1 : typeof import("t1").E
+->E : typeof import("t1").E
+->D1 : typeof import("t1").D
+->D : typeof import("t1").D
+->M1 : typeof import("t1").M
+->M : typeof import("t1").M
++>E1 : typeof import("./t1").E
++>E : typeof import("./t1").E
++>D1 : typeof import("./t1").D
++>D : typeof import("./t1").D
++>M1 : typeof import("./t1").M
++>M : typeof import("./t1").M
+ >N1 : any
+ >N : any
+ >T1 : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports3.types b/testdata/baselines/reference/submodule/conformance/exportsAndImports3.types
index 39bf39cb32..de2de2b55f 100644
--- a/testdata/baselines/reference/submodule/conformance/exportsAndImports3.types
+++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports3.types
@@ -75,16 +75,16 @@ export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N,
 >v : number
 >f1 : () => void
 >f : () => void
->C1 : typeof import("t1").C
->C : typeof import("t1").C
+>C1 : typeof import("./t1").C
+>C : typeof import("./t1").C
 >I1 : any
 >I : any
->E1 : typeof import("t1").E
->E : typeof import("t1").E
->D1 : typeof import("t1").D
->D : typeof import("t1").D
->M1 : typeof import("t1").M
->M : typeof import("t1").M
+>E1 : typeof import("./t1").E
+>E : typeof import("./t1").E
+>D1 : typeof import("./t1").D
+>D : typeof import("./t1").D
+>M1 : typeof import("./t1").M
+>M : typeof import("./t1").M
 >N1 : any
 >N : any
 >T1 : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports3.types.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImports3.types.diff
new file mode 100644
index 0000000000..674650a803
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports3.types.diff
@@ -0,0 +1,27 @@
+--- old.exportsAndImports3.types
++++ new.exportsAndImports3.types
+@@= skipped -74, +74 lines =@@
+ >v : number
+ >f1 : () => void
+ >f : () => void
+->C1 : typeof import("t1").C
+->C : typeof import("t1").C
++>C1 : typeof import("./t1").C
++>C : typeof import("./t1").C
+ >I1 : any
+ >I : any
+->E1 : typeof import("t1").E
+->E : typeof import("t1").E
+->D1 : typeof import("t1").D
+->D : typeof import("t1").D
+->M1 : typeof import("t1").M
+->M : typeof import("t1").M
++>E1 : typeof import("./t1").E
++>E : typeof import("./t1").E
++>D1 : typeof import("./t1").D
++>D : typeof import("./t1").D
++>M1 : typeof import("./t1").M
++>M : typeof import("./t1").M
+ >N1 : any
+ >N : any
+ >T1 : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).symbols b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).symbols
index 99ba5af25e..f1121639cd 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).symbols
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).symbols
@@ -58,36 +58,36 @@ d;
 === 3.ts ===
 const a = import('./0')
 >a : Symbol(a, Decl(3.ts, 0, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const b = import('./0', { assert: { type: "json" } })
 >b : Symbol(b, Decl(3.ts, 1, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 1, 25))
 >type : Symbol(type, Decl(3.ts, 1, 35))
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >c : Symbol(c, Decl(3.ts, 2, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 2, 25))
 >type : Symbol(type, Decl(3.ts, 2, 35))
 >ttype : Symbol(ttype, Decl(3.ts, 2, 49))
 
 const d = import('./0', { assert: {} })
 >d : Symbol(d, Decl(3.ts, 3, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 3, 25))
 
 const dd = import('./0', {})
 >dd : Symbol(dd, Decl(3.ts, 4, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 declare function foo(): any;
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const e = import('./0', foo())
 >e : Symbol(e, Decl(3.ts, 6, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const f = import()
@@ -95,11 +95,11 @@ const f = import()
 
 const g = import('./0', {}, {})
 >g : Symbol(g, Decl(3.ts, 8, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const h = import('./0', { assert: { type: "json" }},)
 >h : Symbol(h, Decl(3.ts, 9, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 9, 25))
 >type : Symbol(type, Decl(3.ts, 9, 35))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).symbols.diff b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).symbols.diff
new file mode 100644
index 0000000000..4dd4749117
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).symbols.diff
@@ -0,0 +1,58 @@
+--- old.importAssertion1(module=commonjs).symbols
++++ new.importAssertion1(module=commonjs).symbols
+@@= skipped -57, +57 lines =@@
+ === 3.ts ===
+ const a = import('./0')
+ >a : Symbol(a, Decl(3.ts, 0, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const b = import('./0', { assert: { type: "json" } })
+ >b : Symbol(b, Decl(3.ts, 1, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 1, 25))
+ >type : Symbol(type, Decl(3.ts, 1, 35))
+
+ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
+ >c : Symbol(c, Decl(3.ts, 2, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 2, 25))
+ >type : Symbol(type, Decl(3.ts, 2, 35))
+ >ttype : Symbol(ttype, Decl(3.ts, 2, 49))
+
+ const d = import('./0', { assert: {} })
+ >d : Symbol(d, Decl(3.ts, 3, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 3, 25))
+
+ const dd = import('./0', {})
+ >dd : Symbol(dd, Decl(3.ts, 4, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ declare function foo(): any;
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const e = import('./0', foo())
+ >e : Symbol(e, Decl(3.ts, 6, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const f = import()
+@@= skipped -37, +37 lines =@@
+
+ const g = import('./0', {}, {})
+ >g : Symbol(g, Decl(3.ts, 8, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const h = import('./0', { assert: { type: "json" }},)
+ >h : Symbol(h, Decl(3.ts, 9, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 9, 25))
+ >type : Symbol(type, Decl(3.ts, 9, 35))
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).types b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).types
index 08c8848866..8fcf0f5e4f 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).types
@@ -65,13 +65,13 @@ d;
 
 === 3.ts ===
 const a = import('./0')
->a : Promise<typeof import("0")>
->import('./0') : Promise<typeof import("0")>
+>a : Promise<typeof import("./0")>
+>import('./0') : Promise<typeof import("./0")>
 >'./0' : "./0"
 
 const b = import('./0', { assert: { type: "json" } })
->b : Promise<typeof import("0")>
->import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
+>b : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json" } } : { assert: { type: string; }; }
 >assert : { type: string; }
@@ -80,8 +80,8 @@ const b = import('./0', { assert: { type: "json" } })
 >"json" : "json"
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
->c : Promise<typeof import("0")>
->import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
+>c : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
 >assert : { type: string; ttype: string; }
@@ -92,16 +92,16 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >"typo" : "typo"
 
 const d = import('./0', { assert: {} })
->d : Promise<typeof import("0")>
->import('./0', { assert: {} }) : Promise<typeof import("0")>
+>d : Promise<typeof import("./0")>
+>import('./0', { assert: {} }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: {} } : { assert: {}; }
 >assert : {}
 >{} : {}
 
 const dd = import('./0', {})
->dd : Promise<typeof import("0")>
->import('./0', {}) : Promise<typeof import("0")>
+>dd : Promise<typeof import("./0")>
+>import('./0', {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 
@@ -109,8 +109,8 @@ declare function foo(): any;
 >foo : () => any
 
 const e = import('./0', foo())
->e : Promise<typeof import("0")>
->import('./0', foo()) : Promise<typeof import("0")>
+>e : Promise<typeof import("./0")>
+>import('./0', foo()) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >foo() : any
 >foo : () => any
@@ -120,15 +120,15 @@ const f = import()
 >import() : Promise<any>
 
 const g = import('./0', {}, {})
->g : Promise<typeof import("0")>
->import('./0', {}, {}) : Promise<typeof import("0")>
+>g : Promise<typeof import("./0")>
+>import('./0', {}, {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 >{} : {}
 
 const h = import('./0', { assert: { type: "json" }},)
->h : Promise<typeof import("0")>
->import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
+>h : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json" }},) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json" }} : { assert: { type: string; }; }
 >assert : { type: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).types.diff
new file mode 100644
index 0000000000..eaf99b4e96
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).types.diff
@@ -0,0 +1,83 @@
+--- old.importAssertion1(module=commonjs).types
++++ new.importAssertion1(module=commonjs).types
+@@= skipped -64, +64 lines =@@
+
+ === 3.ts ===
+ const a = import('./0')
+->a : Promise<typeof import("0")>
+->import('./0') : Promise<typeof import("0")>
++>a : Promise<typeof import("./0")>
++>import('./0') : Promise<typeof import("./0")>
+ >'./0' : "./0"
+
+ const b = import('./0', { assert: { type: "json" } })
+->b : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
++>b : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json" } } : { assert: { type: string; }; }
+ >assert : { type: string; }
+@@= skipped -15, +15 lines =@@
+ >"json" : "json"
+
+ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
+->c : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
++>c : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
+ >assert : { type: string; ttype: string; }
+@@= skipped -12, +12 lines =@@
+ >"typo" : "typo"
+
+ const d = import('./0', { assert: {} })
+->d : Promise<typeof import("0")>
+->import('./0', { assert: {} }) : Promise<typeof import("0")>
++>d : Promise<typeof import("./0")>
++>import('./0', { assert: {} }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: {} } : { assert: {}; }
+ >assert : {}
+ >{} : {}
+
+ const dd = import('./0', {})
+->dd : Promise<typeof import("0")>
+->import('./0', {}) : Promise<typeof import("0")>
++>dd : Promise<typeof import("./0")>
++>import('./0', {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+
+@@= skipped -17, +17 lines =@@
+ >foo : () => any
+
+ const e = import('./0', foo())
+->e : Promise<typeof import("0")>
+->import('./0', foo()) : Promise<typeof import("0")>
++>e : Promise<typeof import("./0")>
++>import('./0', foo()) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >foo() : any
+ >foo : () => any
+@@= skipped -11, +11 lines =@@
+ >import() : Promise<any>
+
+ const g = import('./0', {}, {})
+->g : Promise<typeof import("0")>
+->import('./0', {}, {}) : Promise<typeof import("0")>
++>g : Promise<typeof import("./0")>
++>import('./0', {}, {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+ >{} : {}
+
+ const h = import('./0', { assert: { type: "json" }},)
+->h : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
++>h : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json" }},) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json" }} : { assert: { type: string; }; }
+ >assert : { type: string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).symbols b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).symbols
index 99ba5af25e..f1121639cd 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).symbols
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).symbols
@@ -58,36 +58,36 @@ d;
 === 3.ts ===
 const a = import('./0')
 >a : Symbol(a, Decl(3.ts, 0, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const b = import('./0', { assert: { type: "json" } })
 >b : Symbol(b, Decl(3.ts, 1, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 1, 25))
 >type : Symbol(type, Decl(3.ts, 1, 35))
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >c : Symbol(c, Decl(3.ts, 2, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 2, 25))
 >type : Symbol(type, Decl(3.ts, 2, 35))
 >ttype : Symbol(ttype, Decl(3.ts, 2, 49))
 
 const d = import('./0', { assert: {} })
 >d : Symbol(d, Decl(3.ts, 3, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 3, 25))
 
 const dd = import('./0', {})
 >dd : Symbol(dd, Decl(3.ts, 4, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 declare function foo(): any;
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const e = import('./0', foo())
 >e : Symbol(e, Decl(3.ts, 6, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const f = import()
@@ -95,11 +95,11 @@ const f = import()
 
 const g = import('./0', {}, {})
 >g : Symbol(g, Decl(3.ts, 8, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const h = import('./0', { assert: { type: "json" }},)
 >h : Symbol(h, Decl(3.ts, 9, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 9, 25))
 >type : Symbol(type, Decl(3.ts, 9, 35))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).symbols.diff b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).symbols.diff
new file mode 100644
index 0000000000..51a17d12ea
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).symbols.diff
@@ -0,0 +1,58 @@
+--- old.importAssertion1(module=es2015).symbols
++++ new.importAssertion1(module=es2015).symbols
+@@= skipped -57, +57 lines =@@
+ === 3.ts ===
+ const a = import('./0')
+ >a : Symbol(a, Decl(3.ts, 0, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const b = import('./0', { assert: { type: "json" } })
+ >b : Symbol(b, Decl(3.ts, 1, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 1, 25))
+ >type : Symbol(type, Decl(3.ts, 1, 35))
+
+ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
+ >c : Symbol(c, Decl(3.ts, 2, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 2, 25))
+ >type : Symbol(type, Decl(3.ts, 2, 35))
+ >ttype : Symbol(ttype, Decl(3.ts, 2, 49))
+
+ const d = import('./0', { assert: {} })
+ >d : Symbol(d, Decl(3.ts, 3, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 3, 25))
+
+ const dd = import('./0', {})
+ >dd : Symbol(dd, Decl(3.ts, 4, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ declare function foo(): any;
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const e = import('./0', foo())
+ >e : Symbol(e, Decl(3.ts, 6, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const f = import()
+@@= skipped -37, +37 lines =@@
+
+ const g = import('./0', {}, {})
+ >g : Symbol(g, Decl(3.ts, 8, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const h = import('./0', { assert: { type: "json" }},)
+ >h : Symbol(h, Decl(3.ts, 9, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 9, 25))
+ >type : Symbol(type, Decl(3.ts, 9, 35))
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).types
index 08c8848866..8fcf0f5e4f 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).types
@@ -65,13 +65,13 @@ d;
 
 === 3.ts ===
 const a = import('./0')
->a : Promise<typeof import("0")>
->import('./0') : Promise<typeof import("0")>
+>a : Promise<typeof import("./0")>
+>import('./0') : Promise<typeof import("./0")>
 >'./0' : "./0"
 
 const b = import('./0', { assert: { type: "json" } })
->b : Promise<typeof import("0")>
->import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
+>b : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json" } } : { assert: { type: string; }; }
 >assert : { type: string; }
@@ -80,8 +80,8 @@ const b = import('./0', { assert: { type: "json" } })
 >"json" : "json"
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
->c : Promise<typeof import("0")>
->import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
+>c : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
 >assert : { type: string; ttype: string; }
@@ -92,16 +92,16 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >"typo" : "typo"
 
 const d = import('./0', { assert: {} })
->d : Promise<typeof import("0")>
->import('./0', { assert: {} }) : Promise<typeof import("0")>
+>d : Promise<typeof import("./0")>
+>import('./0', { assert: {} }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: {} } : { assert: {}; }
 >assert : {}
 >{} : {}
 
 const dd = import('./0', {})
->dd : Promise<typeof import("0")>
->import('./0', {}) : Promise<typeof import("0")>
+>dd : Promise<typeof import("./0")>
+>import('./0', {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 
@@ -109,8 +109,8 @@ declare function foo(): any;
 >foo : () => any
 
 const e = import('./0', foo())
->e : Promise<typeof import("0")>
->import('./0', foo()) : Promise<typeof import("0")>
+>e : Promise<typeof import("./0")>
+>import('./0', foo()) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >foo() : any
 >foo : () => any
@@ -120,15 +120,15 @@ const f = import()
 >import() : Promise<any>
 
 const g = import('./0', {}, {})
->g : Promise<typeof import("0")>
->import('./0', {}, {}) : Promise<typeof import("0")>
+>g : Promise<typeof import("./0")>
+>import('./0', {}, {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 >{} : {}
 
 const h = import('./0', { assert: { type: "json" }},)
->h : Promise<typeof import("0")>
->import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
+>h : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json" }},) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json" }} : { assert: { type: string; }; }
 >assert : { type: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).types.diff
new file mode 100644
index 0000000000..40f189049c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=es2015).types.diff
@@ -0,0 +1,83 @@
+--- old.importAssertion1(module=es2015).types
++++ new.importAssertion1(module=es2015).types
+@@= skipped -64, +64 lines =@@
+
+ === 3.ts ===
+ const a = import('./0')
+->a : Promise<typeof import("0")>
+->import('./0') : Promise<typeof import("0")>
++>a : Promise<typeof import("./0")>
++>import('./0') : Promise<typeof import("./0")>
+ >'./0' : "./0"
+
+ const b = import('./0', { assert: { type: "json" } })
+->b : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
++>b : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json" } } : { assert: { type: string; }; }
+ >assert : { type: string; }
+@@= skipped -15, +15 lines =@@
+ >"json" : "json"
+
+ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
+->c : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
++>c : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
+ >assert : { type: string; ttype: string; }
+@@= skipped -12, +12 lines =@@
+ >"typo" : "typo"
+
+ const d = import('./0', { assert: {} })
+->d : Promise<typeof import("0")>
+->import('./0', { assert: {} }) : Promise<typeof import("0")>
++>d : Promise<typeof import("./0")>
++>import('./0', { assert: {} }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: {} } : { assert: {}; }
+ >assert : {}
+ >{} : {}
+
+ const dd = import('./0', {})
+->dd : Promise<typeof import("0")>
+->import('./0', {}) : Promise<typeof import("0")>
++>dd : Promise<typeof import("./0")>
++>import('./0', {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+
+@@= skipped -17, +17 lines =@@
+ >foo : () => any
+
+ const e = import('./0', foo())
+->e : Promise<typeof import("0")>
+->import('./0', foo()) : Promise<typeof import("0")>
++>e : Promise<typeof import("./0")>
++>import('./0', foo()) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >foo() : any
+ >foo : () => any
+@@= skipped -11, +11 lines =@@
+ >import() : Promise<any>
+
+ const g = import('./0', {}, {})
+->g : Promise<typeof import("0")>
+->import('./0', {}, {}) : Promise<typeof import("0")>
++>g : Promise<typeof import("./0")>
++>import('./0', {}, {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+ >{} : {}
+
+ const h = import('./0', { assert: { type: "json" }},)
+->h : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
++>h : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json" }},) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json" }} : { assert: { type: string; }; }
+ >assert : { type: string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).symbols b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).symbols
index 99ba5af25e..f1121639cd 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).symbols
@@ -58,36 +58,36 @@ d;
 === 3.ts ===
 const a = import('./0')
 >a : Symbol(a, Decl(3.ts, 0, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const b = import('./0', { assert: { type: "json" } })
 >b : Symbol(b, Decl(3.ts, 1, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 1, 25))
 >type : Symbol(type, Decl(3.ts, 1, 35))
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >c : Symbol(c, Decl(3.ts, 2, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 2, 25))
 >type : Symbol(type, Decl(3.ts, 2, 35))
 >ttype : Symbol(ttype, Decl(3.ts, 2, 49))
 
 const d = import('./0', { assert: {} })
 >d : Symbol(d, Decl(3.ts, 3, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 3, 25))
 
 const dd = import('./0', {})
 >dd : Symbol(dd, Decl(3.ts, 4, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 declare function foo(): any;
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const e = import('./0', foo())
 >e : Symbol(e, Decl(3.ts, 6, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const f = import()
@@ -95,11 +95,11 @@ const f = import()
 
 const g = import('./0', {}, {})
 >g : Symbol(g, Decl(3.ts, 8, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const h = import('./0', { assert: { type: "json" }},)
 >h : Symbol(h, Decl(3.ts, 9, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >assert : Symbol(assert, Decl(3.ts, 9, 25))
 >type : Symbol(type, Decl(3.ts, 9, 35))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).symbols.diff b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).symbols.diff
new file mode 100644
index 0000000000..bd9a905d8c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).symbols.diff
@@ -0,0 +1,58 @@
+--- old.importAssertion1(module=esnext).symbols
++++ new.importAssertion1(module=esnext).symbols
+@@= skipped -57, +57 lines =@@
+ === 3.ts ===
+ const a = import('./0')
+ >a : Symbol(a, Decl(3.ts, 0, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const b = import('./0', { assert: { type: "json" } })
+ >b : Symbol(b, Decl(3.ts, 1, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 1, 25))
+ >type : Symbol(type, Decl(3.ts, 1, 35))
+
+ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
+ >c : Symbol(c, Decl(3.ts, 2, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 2, 25))
+ >type : Symbol(type, Decl(3.ts, 2, 35))
+ >ttype : Symbol(ttype, Decl(3.ts, 2, 49))
+
+ const d = import('./0', { assert: {} })
+ >d : Symbol(d, Decl(3.ts, 3, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 3, 25))
+
+ const dd = import('./0', {})
+ >dd : Symbol(dd, Decl(3.ts, 4, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ declare function foo(): any;
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const e = import('./0', foo())
+ >e : Symbol(e, Decl(3.ts, 6, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const f = import()
+@@= skipped -37, +37 lines =@@
+
+ const g = import('./0', {}, {})
+ >g : Symbol(g, Decl(3.ts, 8, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const h = import('./0', { assert: { type: "json" }},)
+ >h : Symbol(h, Decl(3.ts, 9, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >assert : Symbol(assert, Decl(3.ts, 9, 25))
+ >type : Symbol(type, Decl(3.ts, 9, 35))
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).types
index 08c8848866..8fcf0f5e4f 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).types
@@ -65,13 +65,13 @@ d;
 
 === 3.ts ===
 const a = import('./0')
->a : Promise<typeof import("0")>
->import('./0') : Promise<typeof import("0")>
+>a : Promise<typeof import("./0")>
+>import('./0') : Promise<typeof import("./0")>
 >'./0' : "./0"
 
 const b = import('./0', { assert: { type: "json" } })
->b : Promise<typeof import("0")>
->import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
+>b : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json" } } : { assert: { type: string; }; }
 >assert : { type: string; }
@@ -80,8 +80,8 @@ const b = import('./0', { assert: { type: "json" } })
 >"json" : "json"
 
 const c = import('./0', { assert: { type: "json", ttype: "typo" } })
->c : Promise<typeof import("0")>
->import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
+>c : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
 >assert : { type: string; ttype: string; }
@@ -92,16 +92,16 @@ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
 >"typo" : "typo"
 
 const d = import('./0', { assert: {} })
->d : Promise<typeof import("0")>
->import('./0', { assert: {} }) : Promise<typeof import("0")>
+>d : Promise<typeof import("./0")>
+>import('./0', { assert: {} }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: {} } : { assert: {}; }
 >assert : {}
 >{} : {}
 
 const dd = import('./0', {})
->dd : Promise<typeof import("0")>
->import('./0', {}) : Promise<typeof import("0")>
+>dd : Promise<typeof import("./0")>
+>import('./0', {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 
@@ -109,8 +109,8 @@ declare function foo(): any;
 >foo : () => any
 
 const e = import('./0', foo())
->e : Promise<typeof import("0")>
->import('./0', foo()) : Promise<typeof import("0")>
+>e : Promise<typeof import("./0")>
+>import('./0', foo()) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >foo() : any
 >foo : () => any
@@ -120,15 +120,15 @@ const f = import()
 >import() : Promise<any>
 
 const g = import('./0', {}, {})
->g : Promise<typeof import("0")>
->import('./0', {}, {}) : Promise<typeof import("0")>
+>g : Promise<typeof import("./0")>
+>import('./0', {}, {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 >{} : {}
 
 const h = import('./0', { assert: { type: "json" }},)
->h : Promise<typeof import("0")>
->import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
+>h : Promise<typeof import("./0")>
+>import('./0', { assert: { type: "json" }},) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ assert: { type: "json" }} : { assert: { type: string; }; }
 >assert : { type: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).types.diff
new file mode 100644
index 0000000000..a6d760a717
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=esnext).types.diff
@@ -0,0 +1,83 @@
+--- old.importAssertion1(module=esnext).types
++++ new.importAssertion1(module=esnext).types
+@@= skipped -64, +64 lines =@@
+
+ === 3.ts ===
+ const a = import('./0')
+->a : Promise<typeof import("0")>
+->import('./0') : Promise<typeof import("0")>
++>a : Promise<typeof import("./0")>
++>import('./0') : Promise<typeof import("./0")>
+ >'./0' : "./0"
+
+ const b = import('./0', { assert: { type: "json" } })
+->b : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json" } }) : Promise<typeof import("0")>
++>b : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json" } } : { assert: { type: string; }; }
+ >assert : { type: string; }
+@@= skipped -15, +15 lines =@@
+ >"json" : "json"
+
+ const c = import('./0', { assert: { type: "json", ttype: "typo" } })
+->c : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
++>c : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json", ttype: "typo" } } : { assert: { type: string; ttype: string; }; }
+ >assert : { type: string; ttype: string; }
+@@= skipped -12, +12 lines =@@
+ >"typo" : "typo"
+
+ const d = import('./0', { assert: {} })
+->d : Promise<typeof import("0")>
+->import('./0', { assert: {} }) : Promise<typeof import("0")>
++>d : Promise<typeof import("./0")>
++>import('./0', { assert: {} }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: {} } : { assert: {}; }
+ >assert : {}
+ >{} : {}
+
+ const dd = import('./0', {})
+->dd : Promise<typeof import("0")>
+->import('./0', {}) : Promise<typeof import("0")>
++>dd : Promise<typeof import("./0")>
++>import('./0', {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+
+@@= skipped -17, +17 lines =@@
+ >foo : () => any
+
+ const e = import('./0', foo())
+->e : Promise<typeof import("0")>
+->import('./0', foo()) : Promise<typeof import("0")>
++>e : Promise<typeof import("./0")>
++>import('./0', foo()) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >foo() : any
+ >foo : () => any
+@@= skipped -11, +11 lines =@@
+ >import() : Promise<any>
+
+ const g = import('./0', {}, {})
+->g : Promise<typeof import("0")>
+->import('./0', {}, {}) : Promise<typeof import("0")>
++>g : Promise<typeof import("./0")>
++>import('./0', {}, {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+ >{} : {}
+
+ const h = import('./0', { assert: { type: "json" }},)
+->h : Promise<typeof import("0")>
+->import('./0', { assert: { type: "json" }},) : Promise<typeof import("0")>
++>h : Promise<typeof import("./0")>
++>import('./0', { assert: { type: "json" }},) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ assert: { type: "json" }} : { assert: { type: string; }; }
+ >assert : { type: string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).types b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).types
index f917bb2b1e..511738644c 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).types
@@ -22,7 +22,7 @@ export * from './0' assert { type: "json" }
 >type : any
 
 export * as ns from './0' assert { type: "json" }
->ns : typeof import("0")
+>ns : typeof import("./0")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).types.diff
new file mode 100644
index 0000000000..afedbecc00
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).types.diff
@@ -0,0 +1,11 @@
+--- old.importAssertion2(module=commonjs).types
++++ new.importAssertion2(module=commonjs).types
+@@= skipped -21, +21 lines =@@
+ >type : any
+
+ export * as ns from './0' assert { type: "json" }
+->ns : typeof import("0")
++>ns : typeof import("./0")
+ >type : any
+
+ === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types
index f917bb2b1e..511738644c 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types
@@ -22,7 +22,7 @@ export * from './0' assert { type: "json" }
 >type : any
 
 export * as ns from './0' assert { type: "json" }
->ns : typeof import("0")
+>ns : typeof import("./0")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types.diff
new file mode 100644
index 0000000000..9d1c5da071
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.importAssertion2(module=es2015).types
++++ new.importAssertion2(module=es2015).types
+@@= skipped -21, +21 lines =@@
+ >type : any
+
+ export * as ns from './0' assert { type: "json" }
+->ns : typeof import("0")
++>ns : typeof import("./0")
+ >type : any
+
+ === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types
index f917bb2b1e..511738644c 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types
@@ -22,7 +22,7 @@ export * from './0' assert { type: "json" }
 >type : any
 
 export * as ns from './0' assert { type: "json" }
->ns : typeof import("0")
+>ns : typeof import("./0")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types.diff
index bfd4810cfb..7d4d6fbf4e 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types.diff
@@ -18,8 +18,9 @@
 +>type : any
 
  export * as ns from './0' assert { type: "json" }
- >ns : typeof import("0")
+->ns : typeof import("0")
 ->type : error
++>ns : typeof import("./0")
 +>type : any
 
  === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types
index 7897fd1126..764bc09625 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types
@@ -9,7 +9,7 @@ export type {} from './0' assert { type: "json" }
 >type : any
 
 export type { I } from './0' assert { type: "json" }
->I : import("0").I
+>I : import("./0").I
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types.diff
new file mode 100644
index 0000000000..35d3ca6c0a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.importAssertion3(module=es2015).types
++++ new.importAssertion3(module=es2015).types
+@@= skipped -8, +8 lines =@@
+ >type : any
+
+ export type { I } from './0' assert { type: "json" }
+->I : import("0").I
++>I : import("./0").I
+ >type : any
+
+ === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types
index 7897fd1126..764bc09625 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types
@@ -9,7 +9,7 @@ export type {} from './0' assert { type: "json" }
 >type : any
 
 export type { I } from './0' assert { type: "json" }
->I : import("0").I
+>I : import("./0").I
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types.diff
new file mode 100644
index 0000000000..676d20ddd5
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types.diff
@@ -0,0 +1,11 @@
+--- old.importAssertion3(module=esnext).types
++++ new.importAssertion3(module=esnext).types
+@@= skipped -8, +8 lines =@@
+ >type : any
+
+ export type { I } from './0' assert { type: "json" }
+->I : import("0").I
++>I : import("./0").I
+ >type : any
+
+ === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).symbols b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).symbols
index 65dc9f6636..b4c764df13 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).symbols
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).symbols
@@ -58,36 +58,36 @@ d;
 === 3.ts ===
 const a = import('./0')
 >a : Symbol(a, Decl(3.ts, 0, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const b = import('./0', { with: { type: "json" } })
 >b : Symbol(b, Decl(3.ts, 1, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 1, 25))
 >type : Symbol(type, Decl(3.ts, 1, 33))
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >c : Symbol(c, Decl(3.ts, 2, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 2, 25))
 >type : Symbol(type, Decl(3.ts, 2, 33))
 >ttype : Symbol(ttype, Decl(3.ts, 2, 47))
 
 const d = import('./0', { with: {} })
 >d : Symbol(d, Decl(3.ts, 3, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 3, 25))
 
 const dd = import('./0', {})
 >dd : Symbol(dd, Decl(3.ts, 4, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 declare function foo(): any;
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const e = import('./0', foo())
 >e : Symbol(e, Decl(3.ts, 6, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const f = import()
@@ -95,11 +95,11 @@ const f = import()
 
 const g = import('./0', {}, {})
 >g : Symbol(g, Decl(3.ts, 8, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const h = import('./0', { with: { type: "json" }},)
 >h : Symbol(h, Decl(3.ts, 9, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 9, 25))
 >type : Symbol(type, Decl(3.ts, 9, 33))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).symbols.diff b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).symbols.diff
new file mode 100644
index 0000000000..20d28bfe40
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).symbols.diff
@@ -0,0 +1,58 @@
+--- old.importAttributes1(module=commonjs).symbols
++++ new.importAttributes1(module=commonjs).symbols
+@@= skipped -57, +57 lines =@@
+ === 3.ts ===
+ const a = import('./0')
+ >a : Symbol(a, Decl(3.ts, 0, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const b = import('./0', { with: { type: "json" } })
+ >b : Symbol(b, Decl(3.ts, 1, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 1, 25))
+ >type : Symbol(type, Decl(3.ts, 1, 33))
+
+ const c = import('./0', { with: { type: "json", ttype: "typo" } })
+ >c : Symbol(c, Decl(3.ts, 2, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 2, 25))
+ >type : Symbol(type, Decl(3.ts, 2, 33))
+ >ttype : Symbol(ttype, Decl(3.ts, 2, 47))
+
+ const d = import('./0', { with: {} })
+ >d : Symbol(d, Decl(3.ts, 3, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 3, 25))
+
+ const dd = import('./0', {})
+ >dd : Symbol(dd, Decl(3.ts, 4, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ declare function foo(): any;
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const e = import('./0', foo())
+ >e : Symbol(e, Decl(3.ts, 6, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const f = import()
+@@= skipped -37, +37 lines =@@
+
+ const g = import('./0', {}, {})
+ >g : Symbol(g, Decl(3.ts, 8, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const h = import('./0', { with: { type: "json" }},)
+ >h : Symbol(h, Decl(3.ts, 9, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 9, 25))
+ >type : Symbol(type, Decl(3.ts, 9, 33))
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).types b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).types
index fb1da06ede..d752bedca2 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).types
@@ -65,13 +65,13 @@ d;
 
 === 3.ts ===
 const a = import('./0')
->a : Promise<typeof import("0")>
->import('./0') : Promise<typeof import("0")>
+>a : Promise<typeof import("./0")>
+>import('./0') : Promise<typeof import("./0")>
 >'./0' : "./0"
 
 const b = import('./0', { with: { type: "json" } })
->b : Promise<typeof import("0")>
->import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
+>b : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json" } } : { with: { type: string; }; }
 >with : { type: string; }
@@ -80,8 +80,8 @@ const b = import('./0', { with: { type: "json" } })
 >"json" : "json"
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
->c : Promise<typeof import("0")>
->import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
+>c : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
 >with : { type: string; ttype: string; }
@@ -92,16 +92,16 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >"typo" : "typo"
 
 const d = import('./0', { with: {} })
->d : Promise<typeof import("0")>
->import('./0', { with: {} }) : Promise<typeof import("0")>
+>d : Promise<typeof import("./0")>
+>import('./0', { with: {} }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: {} } : { with: {}; }
 >with : {}
 >{} : {}
 
 const dd = import('./0', {})
->dd : Promise<typeof import("0")>
->import('./0', {}) : Promise<typeof import("0")>
+>dd : Promise<typeof import("./0")>
+>import('./0', {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 
@@ -109,8 +109,8 @@ declare function foo(): any;
 >foo : () => any
 
 const e = import('./0', foo())
->e : Promise<typeof import("0")>
->import('./0', foo()) : Promise<typeof import("0")>
+>e : Promise<typeof import("./0")>
+>import('./0', foo()) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >foo() : any
 >foo : () => any
@@ -120,15 +120,15 @@ const f = import()
 >import() : Promise<any>
 
 const g = import('./0', {}, {})
->g : Promise<typeof import("0")>
->import('./0', {}, {}) : Promise<typeof import("0")>
+>g : Promise<typeof import("./0")>
+>import('./0', {}, {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 >{} : {}
 
 const h = import('./0', { with: { type: "json" }},)
->h : Promise<typeof import("0")>
->import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
+>h : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json" }},) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json" }} : { with: { type: string; }; }
 >with : { type: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).types.diff
new file mode 100644
index 0000000000..aa728f22c2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).types.diff
@@ -0,0 +1,83 @@
+--- old.importAttributes1(module=commonjs).types
++++ new.importAttributes1(module=commonjs).types
+@@= skipped -64, +64 lines =@@
+
+ === 3.ts ===
+ const a = import('./0')
+->a : Promise<typeof import("0")>
+->import('./0') : Promise<typeof import("0")>
++>a : Promise<typeof import("./0")>
++>import('./0') : Promise<typeof import("./0")>
+ >'./0' : "./0"
+
+ const b = import('./0', { with: { type: "json" } })
+->b : Promise<typeof import("0")>
+->import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
++>b : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json" } } : { with: { type: string; }; }
+ >with : { type: string; }
+@@= skipped -15, +15 lines =@@
+ >"json" : "json"
+
+ const c = import('./0', { with: { type: "json", ttype: "typo" } })
+->c : Promise<typeof import("0")>
+->import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
++>c : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
+ >with : { type: string; ttype: string; }
+@@= skipped -12, +12 lines =@@
+ >"typo" : "typo"
+
+ const d = import('./0', { with: {} })
+->d : Promise<typeof import("0")>
+->import('./0', { with: {} }) : Promise<typeof import("0")>
++>d : Promise<typeof import("./0")>
++>import('./0', { with: {} }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: {} } : { with: {}; }
+ >with : {}
+ >{} : {}
+
+ const dd = import('./0', {})
+->dd : Promise<typeof import("0")>
+->import('./0', {}) : Promise<typeof import("0")>
++>dd : Promise<typeof import("./0")>
++>import('./0', {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+
+@@= skipped -17, +17 lines =@@
+ >foo : () => any
+
+ const e = import('./0', foo())
+->e : Promise<typeof import("0")>
+->import('./0', foo()) : Promise<typeof import("0")>
++>e : Promise<typeof import("./0")>
++>import('./0', foo()) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >foo() : any
+ >foo : () => any
+@@= skipped -11, +11 lines =@@
+ >import() : Promise<any>
+
+ const g = import('./0', {}, {})
+->g : Promise<typeof import("0")>
+->import('./0', {}, {}) : Promise<typeof import("0")>
++>g : Promise<typeof import("./0")>
++>import('./0', {}, {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+ >{} : {}
+
+ const h = import('./0', { with: { type: "json" }},)
+->h : Promise<typeof import("0")>
+->import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
++>h : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json" }},) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json" }} : { with: { type: string; }; }
+ >with : { type: string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).symbols b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).symbols
index 65dc9f6636..b4c764df13 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).symbols
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).symbols
@@ -58,36 +58,36 @@ d;
 === 3.ts ===
 const a = import('./0')
 >a : Symbol(a, Decl(3.ts, 0, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const b = import('./0', { with: { type: "json" } })
 >b : Symbol(b, Decl(3.ts, 1, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 1, 25))
 >type : Symbol(type, Decl(3.ts, 1, 33))
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >c : Symbol(c, Decl(3.ts, 2, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 2, 25))
 >type : Symbol(type, Decl(3.ts, 2, 33))
 >ttype : Symbol(ttype, Decl(3.ts, 2, 47))
 
 const d = import('./0', { with: {} })
 >d : Symbol(d, Decl(3.ts, 3, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 3, 25))
 
 const dd = import('./0', {})
 >dd : Symbol(dd, Decl(3.ts, 4, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 declare function foo(): any;
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const e = import('./0', foo())
 >e : Symbol(e, Decl(3.ts, 6, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const f = import()
@@ -95,11 +95,11 @@ const f = import()
 
 const g = import('./0', {}, {})
 >g : Symbol(g, Decl(3.ts, 8, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const h = import('./0', { with: { type: "json" }},)
 >h : Symbol(h, Decl(3.ts, 9, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 9, 25))
 >type : Symbol(type, Decl(3.ts, 9, 33))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).symbols.diff b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).symbols.diff
new file mode 100644
index 0000000000..b5b178b7ad
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).symbols.diff
@@ -0,0 +1,58 @@
+--- old.importAttributes1(module=es2015).symbols
++++ new.importAttributes1(module=es2015).symbols
+@@= skipped -57, +57 lines =@@
+ === 3.ts ===
+ const a = import('./0')
+ >a : Symbol(a, Decl(3.ts, 0, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const b = import('./0', { with: { type: "json" } })
+ >b : Symbol(b, Decl(3.ts, 1, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 1, 25))
+ >type : Symbol(type, Decl(3.ts, 1, 33))
+
+ const c = import('./0', { with: { type: "json", ttype: "typo" } })
+ >c : Symbol(c, Decl(3.ts, 2, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 2, 25))
+ >type : Symbol(type, Decl(3.ts, 2, 33))
+ >ttype : Symbol(ttype, Decl(3.ts, 2, 47))
+
+ const d = import('./0', { with: {} })
+ >d : Symbol(d, Decl(3.ts, 3, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 3, 25))
+
+ const dd = import('./0', {})
+ >dd : Symbol(dd, Decl(3.ts, 4, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ declare function foo(): any;
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const e = import('./0', foo())
+ >e : Symbol(e, Decl(3.ts, 6, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const f = import()
+@@= skipped -37, +37 lines =@@
+
+ const g = import('./0', {}, {})
+ >g : Symbol(g, Decl(3.ts, 8, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const h = import('./0', { with: { type: "json" }},)
+ >h : Symbol(h, Decl(3.ts, 9, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 9, 25))
+ >type : Symbol(type, Decl(3.ts, 9, 33))
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).types
index fb1da06ede..d752bedca2 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).types
@@ -65,13 +65,13 @@ d;
 
 === 3.ts ===
 const a = import('./0')
->a : Promise<typeof import("0")>
->import('./0') : Promise<typeof import("0")>
+>a : Promise<typeof import("./0")>
+>import('./0') : Promise<typeof import("./0")>
 >'./0' : "./0"
 
 const b = import('./0', { with: { type: "json" } })
->b : Promise<typeof import("0")>
->import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
+>b : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json" } } : { with: { type: string; }; }
 >with : { type: string; }
@@ -80,8 +80,8 @@ const b = import('./0', { with: { type: "json" } })
 >"json" : "json"
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
->c : Promise<typeof import("0")>
->import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
+>c : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
 >with : { type: string; ttype: string; }
@@ -92,16 +92,16 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >"typo" : "typo"
 
 const d = import('./0', { with: {} })
->d : Promise<typeof import("0")>
->import('./0', { with: {} }) : Promise<typeof import("0")>
+>d : Promise<typeof import("./0")>
+>import('./0', { with: {} }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: {} } : { with: {}; }
 >with : {}
 >{} : {}
 
 const dd = import('./0', {})
->dd : Promise<typeof import("0")>
->import('./0', {}) : Promise<typeof import("0")>
+>dd : Promise<typeof import("./0")>
+>import('./0', {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 
@@ -109,8 +109,8 @@ declare function foo(): any;
 >foo : () => any
 
 const e = import('./0', foo())
->e : Promise<typeof import("0")>
->import('./0', foo()) : Promise<typeof import("0")>
+>e : Promise<typeof import("./0")>
+>import('./0', foo()) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >foo() : any
 >foo : () => any
@@ -120,15 +120,15 @@ const f = import()
 >import() : Promise<any>
 
 const g = import('./0', {}, {})
->g : Promise<typeof import("0")>
->import('./0', {}, {}) : Promise<typeof import("0")>
+>g : Promise<typeof import("./0")>
+>import('./0', {}, {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 >{} : {}
 
 const h = import('./0', { with: { type: "json" }},)
->h : Promise<typeof import("0")>
->import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
+>h : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json" }},) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json" }} : { with: { type: string; }; }
 >with : { type: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).types.diff
new file mode 100644
index 0000000000..2e3f70172e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=es2015).types.diff
@@ -0,0 +1,83 @@
+--- old.importAttributes1(module=es2015).types
++++ new.importAttributes1(module=es2015).types
+@@= skipped -64, +64 lines =@@
+
+ === 3.ts ===
+ const a = import('./0')
+->a : Promise<typeof import("0")>
+->import('./0') : Promise<typeof import("0")>
++>a : Promise<typeof import("./0")>
++>import('./0') : Promise<typeof import("./0")>
+ >'./0' : "./0"
+
+ const b = import('./0', { with: { type: "json" } })
+->b : Promise<typeof import("0")>
+->import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
++>b : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json" } } : { with: { type: string; }; }
+ >with : { type: string; }
+@@= skipped -15, +15 lines =@@
+ >"json" : "json"
+
+ const c = import('./0', { with: { type: "json", ttype: "typo" } })
+->c : Promise<typeof import("0")>
+->import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
++>c : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
+ >with : { type: string; ttype: string; }
+@@= skipped -12, +12 lines =@@
+ >"typo" : "typo"
+
+ const d = import('./0', { with: {} })
+->d : Promise<typeof import("0")>
+->import('./0', { with: {} }) : Promise<typeof import("0")>
++>d : Promise<typeof import("./0")>
++>import('./0', { with: {} }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: {} } : { with: {}; }
+ >with : {}
+ >{} : {}
+
+ const dd = import('./0', {})
+->dd : Promise<typeof import("0")>
+->import('./0', {}) : Promise<typeof import("0")>
++>dd : Promise<typeof import("./0")>
++>import('./0', {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+
+@@= skipped -17, +17 lines =@@
+ >foo : () => any
+
+ const e = import('./0', foo())
+->e : Promise<typeof import("0")>
+->import('./0', foo()) : Promise<typeof import("0")>
++>e : Promise<typeof import("./0")>
++>import('./0', foo()) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >foo() : any
+ >foo : () => any
+@@= skipped -11, +11 lines =@@
+ >import() : Promise<any>
+
+ const g = import('./0', {}, {})
+->g : Promise<typeof import("0")>
+->import('./0', {}, {}) : Promise<typeof import("0")>
++>g : Promise<typeof import("./0")>
++>import('./0', {}, {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+ >{} : {}
+
+ const h = import('./0', { with: { type: "json" }},)
+->h : Promise<typeof import("0")>
+->import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
++>h : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json" }},) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json" }} : { with: { type: string; }; }
+ >with : { type: string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).symbols b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).symbols
index 65dc9f6636..b4c764df13 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).symbols
@@ -58,36 +58,36 @@ d;
 === 3.ts ===
 const a = import('./0')
 >a : Symbol(a, Decl(3.ts, 0, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const b = import('./0', { with: { type: "json" } })
 >b : Symbol(b, Decl(3.ts, 1, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 1, 25))
 >type : Symbol(type, Decl(3.ts, 1, 33))
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >c : Symbol(c, Decl(3.ts, 2, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 2, 25))
 >type : Symbol(type, Decl(3.ts, 2, 33))
 >ttype : Symbol(ttype, Decl(3.ts, 2, 47))
 
 const d = import('./0', { with: {} })
 >d : Symbol(d, Decl(3.ts, 3, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 3, 25))
 
 const dd = import('./0', {})
 >dd : Symbol(dd, Decl(3.ts, 4, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 declare function foo(): any;
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const e = import('./0', foo())
 >e : Symbol(e, Decl(3.ts, 6, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >foo : Symbol(foo, Decl(3.ts, 4, 28))
 
 const f = import()
@@ -95,11 +95,11 @@ const f = import()
 
 const g = import('./0', {}, {})
 >g : Symbol(g, Decl(3.ts, 8, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 
 const h = import('./0', { with: { type: "json" }},)
 >h : Symbol(h, Decl(3.ts, 9, 5))
->'./0' : Symbol("0", Decl(0.ts, 0, 0))
+>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
 >with : Symbol(with, Decl(3.ts, 9, 25))
 >type : Symbol(type, Decl(3.ts, 9, 33))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).symbols.diff b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).symbols.diff
new file mode 100644
index 0000000000..97d7319434
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).symbols.diff
@@ -0,0 +1,58 @@
+--- old.importAttributes1(module=esnext).symbols
++++ new.importAttributes1(module=esnext).symbols
+@@= skipped -57, +57 lines =@@
+ === 3.ts ===
+ const a = import('./0')
+ >a : Symbol(a, Decl(3.ts, 0, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const b = import('./0', { with: { type: "json" } })
+ >b : Symbol(b, Decl(3.ts, 1, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 1, 25))
+ >type : Symbol(type, Decl(3.ts, 1, 33))
+
+ const c = import('./0', { with: { type: "json", ttype: "typo" } })
+ >c : Symbol(c, Decl(3.ts, 2, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 2, 25))
+ >type : Symbol(type, Decl(3.ts, 2, 33))
+ >ttype : Symbol(ttype, Decl(3.ts, 2, 47))
+
+ const d = import('./0', { with: {} })
+ >d : Symbol(d, Decl(3.ts, 3, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 3, 25))
+
+ const dd = import('./0', {})
+ >dd : Symbol(dd, Decl(3.ts, 4, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ declare function foo(): any;
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const e = import('./0', foo())
+ >e : Symbol(e, Decl(3.ts, 6, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >foo : Symbol(foo, Decl(3.ts, 4, 28))
+
+ const f = import()
+@@= skipped -37, +37 lines =@@
+
+ const g = import('./0', {}, {})
+ >g : Symbol(g, Decl(3.ts, 8, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+
+ const h = import('./0', { with: { type: "json" }},)
+ >h : Symbol(h, Decl(3.ts, 9, 5))
+->'./0' : Symbol("0", Decl(0.ts, 0, 0))
++>'./0' : Symbol("./0", Decl(0.ts, 0, 0))
+ >with : Symbol(with, Decl(3.ts, 9, 25))
+ >type : Symbol(type, Decl(3.ts, 9, 33))
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).types
index fb1da06ede..d752bedca2 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).types
@@ -65,13 +65,13 @@ d;
 
 === 3.ts ===
 const a = import('./0')
->a : Promise<typeof import("0")>
->import('./0') : Promise<typeof import("0")>
+>a : Promise<typeof import("./0")>
+>import('./0') : Promise<typeof import("./0")>
 >'./0' : "./0"
 
 const b = import('./0', { with: { type: "json" } })
->b : Promise<typeof import("0")>
->import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
+>b : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json" } } : { with: { type: string; }; }
 >with : { type: string; }
@@ -80,8 +80,8 @@ const b = import('./0', { with: { type: "json" } })
 >"json" : "json"
 
 const c = import('./0', { with: { type: "json", ttype: "typo" } })
->c : Promise<typeof import("0")>
->import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
+>c : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
 >with : { type: string; ttype: string; }
@@ -92,16 +92,16 @@ const c = import('./0', { with: { type: "json", ttype: "typo" } })
 >"typo" : "typo"
 
 const d = import('./0', { with: {} })
->d : Promise<typeof import("0")>
->import('./0', { with: {} }) : Promise<typeof import("0")>
+>d : Promise<typeof import("./0")>
+>import('./0', { with: {} }) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: {} } : { with: {}; }
 >with : {}
 >{} : {}
 
 const dd = import('./0', {})
->dd : Promise<typeof import("0")>
->import('./0', {}) : Promise<typeof import("0")>
+>dd : Promise<typeof import("./0")>
+>import('./0', {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 
@@ -109,8 +109,8 @@ declare function foo(): any;
 >foo : () => any
 
 const e = import('./0', foo())
->e : Promise<typeof import("0")>
->import('./0', foo()) : Promise<typeof import("0")>
+>e : Promise<typeof import("./0")>
+>import('./0', foo()) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >foo() : any
 >foo : () => any
@@ -120,15 +120,15 @@ const f = import()
 >import() : Promise<any>
 
 const g = import('./0', {}, {})
->g : Promise<typeof import("0")>
->import('./0', {}, {}) : Promise<typeof import("0")>
+>g : Promise<typeof import("./0")>
+>import('./0', {}, {}) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{} : {}
 >{} : {}
 
 const h = import('./0', { with: { type: "json" }},)
->h : Promise<typeof import("0")>
->import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
+>h : Promise<typeof import("./0")>
+>import('./0', { with: { type: "json" }},) : Promise<typeof import("./0")>
 >'./0' : "./0"
 >{ with: { type: "json" }} : { with: { type: string; }; }
 >with : { type: string; }
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).types.diff
new file mode 100644
index 0000000000..d70d7a2689
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=esnext).types.diff
@@ -0,0 +1,83 @@
+--- old.importAttributes1(module=esnext).types
++++ new.importAttributes1(module=esnext).types
+@@= skipped -64, +64 lines =@@
+
+ === 3.ts ===
+ const a = import('./0')
+->a : Promise<typeof import("0")>
+->import('./0') : Promise<typeof import("0")>
++>a : Promise<typeof import("./0")>
++>import('./0') : Promise<typeof import("./0")>
+ >'./0' : "./0"
+
+ const b = import('./0', { with: { type: "json" } })
+->b : Promise<typeof import("0")>
+->import('./0', { with: { type: "json" } }) : Promise<typeof import("0")>
++>b : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json" } } : { with: { type: string; }; }
+ >with : { type: string; }
+@@= skipped -15, +15 lines =@@
+ >"json" : "json"
+
+ const c = import('./0', { with: { type: "json", ttype: "typo" } })
+->c : Promise<typeof import("0")>
+->import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("0")>
++>c : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json", ttype: "typo" } }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json", ttype: "typo" } } : { with: { type: string; ttype: string; }; }
+ >with : { type: string; ttype: string; }
+@@= skipped -12, +12 lines =@@
+ >"typo" : "typo"
+
+ const d = import('./0', { with: {} })
+->d : Promise<typeof import("0")>
+->import('./0', { with: {} }) : Promise<typeof import("0")>
++>d : Promise<typeof import("./0")>
++>import('./0', { with: {} }) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: {} } : { with: {}; }
+ >with : {}
+ >{} : {}
+
+ const dd = import('./0', {})
+->dd : Promise<typeof import("0")>
+->import('./0', {}) : Promise<typeof import("0")>
++>dd : Promise<typeof import("./0")>
++>import('./0', {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+
+@@= skipped -17, +17 lines =@@
+ >foo : () => any
+
+ const e = import('./0', foo())
+->e : Promise<typeof import("0")>
+->import('./0', foo()) : Promise<typeof import("0")>
++>e : Promise<typeof import("./0")>
++>import('./0', foo()) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >foo() : any
+ >foo : () => any
+@@= skipped -11, +11 lines =@@
+ >import() : Promise<any>
+
+ const g = import('./0', {}, {})
+->g : Promise<typeof import("0")>
+->import('./0', {}, {}) : Promise<typeof import("0")>
++>g : Promise<typeof import("./0")>
++>import('./0', {}, {}) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{} : {}
+ >{} : {}
+
+ const h = import('./0', { with: { type: "json" }},)
+->h : Promise<typeof import("0")>
+->import('./0', { with: { type: "json" }},) : Promise<typeof import("0")>
++>h : Promise<typeof import("./0")>
++>import('./0', { with: { type: "json" }},) : Promise<typeof import("./0")>
+ >'./0' : "./0"
+ >{ with: { type: "json" }} : { with: { type: string; }; }
+ >with : { type: string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).types b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).types
index 33f423f35d..6008d0b89b 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).types
@@ -22,7 +22,7 @@ export * from './0' with { type: "json" }
 >type : any
 
 export * as ns from './0' with { type: "json" }
->ns : typeof import("0")
+>ns : typeof import("./0")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).types.diff
new file mode 100644
index 0000000000..c7d6481b45
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).types.diff
@@ -0,0 +1,11 @@
+--- old.importAttributes2(module=commonjs).types
++++ new.importAttributes2(module=commonjs).types
+@@= skipped -21, +21 lines =@@
+ >type : any
+
+ export * as ns from './0' with { type: "json" }
+->ns : typeof import("0")
++>ns : typeof import("./0")
+ >type : any
+
+ === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types
index 33f423f35d..6008d0b89b 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types
@@ -22,7 +22,7 @@ export * from './0' with { type: "json" }
 >type : any
 
 export * as ns from './0' with { type: "json" }
->ns : typeof import("0")
+>ns : typeof import("./0")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types.diff
new file mode 100644
index 0000000000..7d3bbc04a8
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.importAttributes2(module=es2015).types
++++ new.importAttributes2(module=es2015).types
+@@= skipped -21, +21 lines =@@
+ >type : any
+
+ export * as ns from './0' with { type: "json" }
+->ns : typeof import("0")
++>ns : typeof import("./0")
+ >type : any
+
+ === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types
index 33f423f35d..6008d0b89b 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types
@@ -22,7 +22,7 @@ export * from './0' with { type: "json" }
 >type : any
 
 export * as ns from './0' with { type: "json" }
->ns : typeof import("0")
+>ns : typeof import("./0")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types.diff
index f03ee209a2..501f9e1204 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types.diff
@@ -18,8 +18,9 @@
 +>type : any
 
  export * as ns from './0' with { type: "json" }
- >ns : typeof import("0")
+->ns : typeof import("0")
 ->type : error
++>ns : typeof import("./0")
 +>type : any
 
  === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types
index c0dc4e6634..7b71ed23de 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types
@@ -9,7 +9,7 @@ export type {} from './0' with { type: "json" }
 >type : any
 
 export type { I } from './0' with { type: "json" }
->I : import("0").I
+>I : import("./0").I
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types.diff
new file mode 100644
index 0000000000..c7454f0752
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types.diff
@@ -0,0 +1,11 @@
+--- old.importAttributes3(module=es2015).types
++++ new.importAttributes3(module=es2015).types
+@@= skipped -8, +8 lines =@@
+ >type : any
+
+ export type { I } from './0' with { type: "json" }
+->I : import("0").I
++>I : import("./0").I
+ >type : any
+
+ === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types
index c0dc4e6634..7b71ed23de 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types
@@ -9,7 +9,7 @@ export type {} from './0' with { type: "json" }
 >type : any
 
 export type { I } from './0' with { type: "json" }
->I : import("0").I
+>I : import("./0").I
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types.diff
new file mode 100644
index 0000000000..af2a947fe3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types.diff
@@ -0,0 +1,11 @@
+--- old.importAttributes3(module=esnext).types
++++ new.importAttributes3(module=esnext).types
+@@= skipped -8, +8 lines =@@
+ >type : any
+
+ export type { I } from './0' with { type: "json" }
+->I : import("0").I
++>I : import("./0").I
+ >type : any
+
+ === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes7.symbols b/testdata/baselines/reference/submodule/conformance/importAttributes7.symbols
index 547b876bd1..871e25429e 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes7.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes7.symbols
@@ -21,7 +21,7 @@ export async function f() {
 
     const a = import("./a", {
 >a : Symbol(a, Decl(b.ts, 3, 9))
->"./a" : Symbol("/a", Decl(a.ts, 0, 0))
+>"./a" : Symbol("./a", Decl(a.ts, 0, 0))
 
         with: { a: "a", "b": "b" },
 >with : Symbol(with, Decl(b.ts, 3, 29))
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes7.symbols.diff b/testdata/baselines/reference/submodule/conformance/importAttributes7.symbols.diff
new file mode 100644
index 0000000000..2e17534be5
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes7.symbols.diff
@@ -0,0 +1,11 @@
+--- old.importAttributes7.symbols
++++ new.importAttributes7.symbols
+@@= skipped -20, +20 lines =@@
+
+     const a = import("./a", {
+ >a : Symbol(a, Decl(b.ts, 3, 9))
+->"./a" : Symbol("/a", Decl(a.ts, 0, 0))
++>"./a" : Symbol("./a", Decl(a.ts, 0, 0))
+
+         with: { a: "a", "b": "b" },
+ >with : Symbol(with, Decl(b.ts, 3, 29))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes7.types b/testdata/baselines/reference/submodule/conformance/importAttributes7.types
index 9e5c8eac18..4fbf4f73de 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes7.types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes7.types
@@ -26,8 +26,8 @@ export async function f() {
 >f : () => Promise<void>
 
     const a = import("./a", {
->a : Promise<typeof import("/a")>
->import("./a", {        with: { a: "a", "b": "b" },    }) : Promise<typeof import("/a")>
+>a : Promise<typeof import("./a")>
+>import("./a", {        with: { a: "a", "b": "b" },    }) : Promise<typeof import("./a")>
 >"./a" : "./a"
 >{        with: { a: "a", "b": "b" },    } : { with: { a: string; b: string; }; }
 
@@ -41,6 +41,6 @@ export async function f() {
 
     });
     a;
->a : Promise<typeof import("/a")>
+>a : Promise<typeof import("./a")>
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes7.types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes7.types.diff
index cf46b013b4..3b11423c2e 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes7.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes7.types.diff
@@ -8,4 +8,20 @@
 +>a : any
 
  export async function f() {
- >f : () => Promise<void>
\ No newline at end of file
+ >f : () => Promise<void>
+
+     const a = import("./a", {
+->a : Promise<typeof import("/a")>
+->import("./a", {        with: { a: "a", "b": "b" },    }) : Promise<typeof import("/a")>
++>a : Promise<typeof import("./a")>
++>import("./a", {        with: { a: "a", "b": "b" },    }) : Promise<typeof import("./a")>
+ >"./a" : "./a"
+ >{        with: { a: "a", "b": "b" },    } : { with: { a: string; b: string; }; }
+
+@@= skipped -21, +21 lines =@@
+
+     });
+     a;
+->a : Promise<typeof import("/a")>
++>a : Promise<typeof import("./a")>
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.symbols
index ed101a3607..b725edb0bf 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.symbols
@@ -6,11 +6,11 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 var p1 = import("./0");
 >p1 : Symbol(p1, Decl(1.ts, 1, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 p1.then(zero => {
 >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -27,13 +27,13 @@ p1.then(zero => {
 
 export var p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 6, 10))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 function foo() {
 >foo : Symbol(foo, Decl(1.ts, 6, 30))
 
     const p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 9, 9))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.symbols.diff
new file mode 100644
index 0000000000..981ce46c8e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.symbols.diff
@@ -0,0 +1,31 @@
+--- old.importCallExpression1ES2020.symbols
++++ new.importCallExpression1ES2020.symbols
+@@= skipped -5, +5 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ var p1 = import("./0");
+ >p1 : Symbol(p1, Decl(1.ts, 1, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ p1.then(zero => {
+ >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -21, +21 lines =@@
+
+ export var p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 6, 10))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ function foo() {
+ >foo : Symbol(foo, Decl(1.ts, 6, 30))
+
+     const p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 9, 9))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.types b/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.types
index c9d28e1474..59d1ad3bb4 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.types
@@ -7,41 +7,41 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->import("./0") : Promise<typeof import("0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
->zero : typeof import("0")
+>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
+>zero : typeof import("./0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof import("0")
+>zero : typeof import("./0")
 >foo : () => string
 
 })
 
 export var p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.types.diff
new file mode 100644
index 0000000000..5b7f67d7a0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression1ES2020.types.diff
@@ -0,0 +1,56 @@
+--- old.importCallExpression1ES2020.types
++++ new.importCallExpression1ES2020.types
+@@= skipped -6, +6 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->import("./0") : Promise<typeof import("0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ var p1 = import("./0");
+->p1 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ p1.then(zero => {
+ >p1.then(zero => {    return zero.foo();}) : Promise<string>
+->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->p1 : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
+->zero : typeof import("0")
++>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>p1 : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
++>zero : typeof import("./0")
+
+     return zero.foo();
+ >zero.foo() : string
+ >zero.foo : () => string
+->zero : typeof import("0")
++>zero : typeof import("./0")
+ >foo : () => string
+
+ })
+
+ export var p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ function foo() {
+ >foo : () => void
+
+     const p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.symbols
index 7fab7d2e6d..7e7ec6b924 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.symbols
@@ -32,5 +32,5 @@ function foo(x: Promise<any>) {
 
 foo(import("./0"));
 >foo : Symbol(foo, Decl(2.ts, 0, 0))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.symbols.diff
new file mode 100644
index 0000000000..d46a9f7442
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.symbols.diff
@@ -0,0 +1,8 @@
+--- old.importCallExpression2ES2020.symbols
++++ new.importCallExpression2ES2020.symbols
+@@= skipped -31, +31 lines =@@
+
+ foo(import("./0"));
+ >foo : Symbol(foo, Decl(2.ts, 0, 0))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.types b/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.types
index 23bd72bc86..ef0779bfda 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.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 import("0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.types.diff
new file mode 100644
index 0000000000..83980fbf37
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression2ES2020.types.diff
@@ -0,0 +1,9 @@
+--- old.importCallExpression2ES2020.types
++++ new.importCallExpression2ES2020.types
+@@= skipped -40, +40 lines =@@
+ foo(import("./0"));
+ >foo(import("./0")) : void
+ >foo : (x: Promise<any>) => void
+->import("./0") : Promise<typeof import("0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.symbols
index f0f1f4457f..07e65b65e8 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.symbols
@@ -15,7 +15,7 @@ async function foo() {
     class C extends (await import("./0")).B {}
 >C : Symbol(C, Decl(2.ts, 0, 22))
 >(await import("./0")).B : Symbol(B, Decl(0.ts, 0, 0))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 >B : Symbol(B, Decl(0.ts, 0, 0))
 
     var c = new C();
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.symbols.diff
new file mode 100644
index 0000000000..b9111b8a75
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.symbols.diff
@@ -0,0 +1,11 @@
+--- old.importCallExpression3ES2020.symbols
++++ new.importCallExpression3ES2020.symbols
+@@= skipped -14, +14 lines =@@
+     class C extends (await import("./0")).B {}
+ >C : Symbol(C, Decl(2.ts, 0, 22))
+ >(await import("./0")).B : Symbol(B, Decl(0.ts, 0, 0))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+ >B : Symbol(B, Decl(0.ts, 0, 0))
+
+     var c = new C();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.types b/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.types
index 748478f1a0..7be266c301 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.types
@@ -15,12 +15,12 @@ async function foo() {
 
     class C extends (await import("./0")).B {}
 >C : C
->(await import("./0")).B : import("0").B
->(await import("./0")) : typeof import("0")
->await import("./0") : typeof import("0")
->import("./0") : Promise<typeof import("0")>
+>(await import("./0")).B : import("./0").B
+>(await import("./0")) : typeof import("./0")
+>await import("./0") : typeof import("./0")
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
->B : typeof import("0").B
+>B : typeof import("./0").B
 
     var c = new C();
 >c : C
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.types.diff
new file mode 100644
index 0000000000..881569ce05
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression3ES2020.types.diff
@@ -0,0 +1,20 @@
+--- old.importCallExpression3ES2020.types
++++ new.importCallExpression3ES2020.types
+@@= skipped -14, +14 lines =@@
+
+     class C extends (await import("./0")).B {}
+ >C : C
+->(await import("./0")).B : import("0").B
+->(await import("./0")) : typeof import("0")
+->await import("./0") : typeof import("0")
+->import("./0") : Promise<typeof import("0")>
++>(await import("./0")).B : import("./0").B
++>(await import("./0")) : typeof import("./0")
++>await import("./0") : typeof import("./0")
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+->B : typeof import("0").B
++>B : typeof import("./0").B
+
+     var c = new C();
+ >c : C
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.symbols
index ffc83f845b..2c0e837c20 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.symbols
@@ -24,14 +24,14 @@ class C {
 
     private myModule = import("./0");
 >myModule : Symbol(C.myModule, Decl(2.ts, 1, 9))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
     method() {
 >method : Symbol(C.method, Decl(2.ts, 2, 37))
 
         const loadAsync = import ("./0");
 >loadAsync : Symbol(loadAsync, Decl(2.ts, 4, 13))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
         this.myModule.then(Zero => {
 >this.myModule.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -56,7 +56,7 @@ class C {
 
             let one = await import("./1");
 >one : Symbol(one, Decl(2.ts, 9, 15))
->"./1" : Symbol("1", Decl(1.ts, 0, 0))
+>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
 
             console.log(one.backup());
 >console : Symbol(console, Decl(2.ts, 0, 11))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.symbols.diff
new file mode 100644
index 0000000000..9b00dfe0fe
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.symbols.diff
@@ -0,0 +1,28 @@
+--- old.importCallExpression4ES2020.symbols
++++ new.importCallExpression4ES2020.symbols
+@@= skipped -23, +23 lines =@@
+
+     private myModule = import("./0");
+ >myModule : Symbol(C.myModule, Decl(2.ts, 1, 9))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+     method() {
+ >method : Symbol(C.method, Decl(2.ts, 2, 37))
+
+         const loadAsync = import ("./0");
+ >loadAsync : Symbol(loadAsync, Decl(2.ts, 4, 13))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+         this.myModule.then(Zero => {
+ >this.myModule.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -32, +32 lines =@@
+
+             let one = await import("./1");
+ >one : Symbol(one, Decl(2.ts, 9, 15))
+->"./1" : Symbol("1", Decl(1.ts, 0, 0))
++>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
+
+             console.log(one.backup());
+ >console : Symbol(console, Decl(2.ts, 0, 11))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.types b/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.types
index b1bde36381..0ede0e8084 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.types
@@ -26,27 +26,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>myModule : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof import("0")>
->import ("./0") : Promise<typeof import("0")>
+>loadAsync : Promise<typeof import("./0")>
+>import ("./0") : Promise<typeof import("./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 import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof import("0")>
+>this.myModule.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("./0")>
 >this : this
->myModule : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("0")) => void
->Zero : typeof import("0")
+>myModule : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("./0")) => void
+>Zero : typeof import("./0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -55,7 +55,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof import("0")
+>Zero : typeof import("./0")
 >foo : () => string
 
         }, async err => {
@@ -70,9 +70,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof import("1")
->await import("./1") : typeof import("1")
->import("./1") : Promise<typeof import("1")>
+>one : typeof import("./1")
+>await import("./1") : typeof import("./1")
+>import("./1") : Promise<typeof import("./1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -82,7 +82,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof import("1")
+>one : typeof import("./1")
 >backup : () => string
 
         });
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.types.diff
new file mode 100644
index 0000000000..f2a49c3e2e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpression4ES2020.types.diff
@@ -0,0 +1,71 @@
+--- old.importCallExpression4ES2020.types
++++ new.importCallExpression4ES2020.types
+@@= skipped -25, +25 lines =@@
+ >C : C
+
+     private myModule = import("./0");
+->myModule : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>myModule : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+     method() {
+ >method : () => void
+
+         const loadAsync = import ("./0");
+->loadAsync : Promise<typeof import("0")>
+->import ("./0") : Promise<typeof import("0")>
++>loadAsync : Promise<typeof import("./0")>
++>import ("./0") : Promise<typeof import("./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 import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->this.myModule : Promise<typeof import("0")>
++>this.myModule.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>this.myModule : Promise<typeof import("./0")>
+ >this : this
+->myModule : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("0")) => void
+->Zero : typeof import("0")
++>myModule : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("./0")) => void
++>Zero : typeof import("./0")
+
+             console.log(Zero.foo());
+ >console.log(Zero.foo()) : any
+@@= skipped -29, +29 lines =@@
+ >log : any
+ >Zero.foo() : string
+ >Zero.foo : () => string
+->Zero : typeof import("0")
++>Zero : typeof import("./0")
+ >foo : () => string
+
+         }, async err => {
+@@= skipped -15, +15 lines =@@
+ >err : any
+
+             let one = await import("./1");
+->one : typeof import("1")
+->await import("./1") : typeof import("1")
+->import("./1") : Promise<typeof import("1")>
++>one : typeof import("./1")
++>await import("./1") : typeof import("./1")
++>import("./1") : Promise<typeof import("./1")>
+ >"./1" : "./1"
+
+             console.log(one.backup());
+@@= skipped -12, +12 lines =@@
+ >log : any
+ >one.backup() : string
+ >one.backup : () => string
+->one : typeof import("1")
++>one : typeof import("./1")
+ >backup : () => string
+
+         });
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.symbols
index c7ae774608..2e77f7fe46 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.symbols
@@ -6,7 +6,7 @@ export async function fn() {
 
     const req = await import('./test') // ONE
 >req : Symbol(req, Decl(test.ts, 1, 9))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
 }
 
 export class cl1 {
@@ -17,7 +17,7 @@ export class cl1 {
 
         const req = await import('./test') // TWO
 >req : Symbol(req, Decl(test.ts, 6, 13))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
     }
 }
 
@@ -29,7 +29,7 @@ export const obj = {
 
         const req = await import('./test') // THREE
 >req : Symbol(req, Decl(test.ts, 12, 13))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
     }
 }
 
@@ -44,7 +44,7 @@ export class cl2 {
 
             const req = await import('./test') // FOUR
 >req : Symbol(req, Decl(test.ts, 19, 17))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
         }
     }
 }
@@ -54,6 +54,6 @@ export const l = async () => {
 
     const req = await import('./test') // FIVE
 >req : Symbol(req, Decl(test.ts, 25, 9))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.symbols.diff
new file mode 100644
index 0000000000..0eeeb33275
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.symbols.diff
@@ -0,0 +1,45 @@
+--- old.importCallExpressionAsyncES2020.symbols
++++ new.importCallExpressionAsyncES2020.symbols
+@@= skipped -5, +5 lines =@@
+
+     const req = await import('./test') // ONE
+ >req : Symbol(req, Decl(test.ts, 1, 9))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+ }
+
+ export class cl1 {
+@@= skipped -11, +11 lines =@@
+
+         const req = await import('./test') // TWO
+ >req : Symbol(req, Decl(test.ts, 6, 13))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+     }
+ }
+
+@@= skipped -12, +12 lines =@@
+
+         const req = await import('./test') // THREE
+ >req : Symbol(req, Decl(test.ts, 12, 13))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+     }
+ }
+
+@@= skipped -15, +15 lines =@@
+
+             const req = await import('./test') // FOUR
+ >req : Symbol(req, Decl(test.ts, 19, 17))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+         }
+     }
+ }
+@@= skipped -10, +10 lines =@@
+
+     const req = await import('./test') // FIVE
+ >req : Symbol(req, Decl(test.ts, 25, 9))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.types
index d2f5e62358..12c99ef94e 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.types
@@ -5,9 +5,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
 }
 
@@ -18,9 +18,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
     }
 }
@@ -34,9 +34,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
     }
 }
@@ -53,9 +53,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
         }
     }
@@ -66,9 +66,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.types.diff
new file mode 100644
index 0000000000..3aa3f5a197
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES2020.types.diff
@@ -0,0 +1,66 @@
+--- old.importCallExpressionAsyncES2020.types
++++ new.importCallExpressionAsyncES2020.types
+@@= skipped -4, +4 lines =@@
+ >fn : () => Promise<void>
+
+     const req = await import('./test') // ONE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+ }
+
+@@= skipped -13, +13 lines =@@
+ >m : () => Promise<void>
+
+         const req = await import('./test') // TWO
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+     }
+ }
+@@= skipped -16, +16 lines =@@
+ >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
+
+         const req = await import('./test') // THREE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+     }
+ }
+@@= skipped -19, +19 lines =@@
+ >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
+
+             const req = await import('./test') // FOUR
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+         }
+     }
+@@= skipped -13, +13 lines =@@
+ >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
+
+     const req = await import('./test') // FIVE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.symbols
index eda297a5ba..a40c0490b3 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.symbols
@@ -6,7 +6,7 @@ export async function fn() {
 
     const req = await import('./test') // ONE
 >req : Symbol(req, Decl(test.ts, 1, 9))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
 }
 
 export class cl1 {
@@ -17,7 +17,7 @@ export class cl1 {
 
         const req = await import('./test') // TWO
 >req : Symbol(req, Decl(test.ts, 6, 13))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
     }
 }
 
@@ -29,7 +29,7 @@ export const obj = {
 
         const req = await import('./test') // THREE
 >req : Symbol(req, Decl(test.ts, 12, 13))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
     }
 }
 
@@ -44,7 +44,7 @@ export class cl2 {
 
             const req = await import('./test') // FOUR
 >req : Symbol(req, Decl(test.ts, 19, 17))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
         }
     }
 }
@@ -54,6 +54,6 @@ export const l = async () => {
 
     const req = await import('./test') // FIVE
 >req : Symbol(req, Decl(test.ts, 25, 9))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.symbols.diff
new file mode 100644
index 0000000000..ea67f1c6dd
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.symbols.diff
@@ -0,0 +1,45 @@
+--- old.importCallExpressionAsyncES5CJS.symbols
++++ new.importCallExpressionAsyncES5CJS.symbols
+@@= skipped -5, +5 lines =@@
+
+     const req = await import('./test') // ONE
+ >req : Symbol(req, Decl(test.ts, 1, 9))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+ }
+
+ export class cl1 {
+@@= skipped -11, +11 lines =@@
+
+         const req = await import('./test') // TWO
+ >req : Symbol(req, Decl(test.ts, 6, 13))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+     }
+ }
+
+@@= skipped -12, +12 lines =@@
+
+         const req = await import('./test') // THREE
+ >req : Symbol(req, Decl(test.ts, 12, 13))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+     }
+ }
+
+@@= skipped -15, +15 lines =@@
+
+             const req = await import('./test') // FOUR
+ >req : Symbol(req, Decl(test.ts, 19, 17))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+         }
+     }
+ }
+@@= skipped -10, +10 lines =@@
+
+     const req = await import('./test') // FIVE
+ >req : Symbol(req, Decl(test.ts, 25, 9))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.types
index 85718fb596..59583f1678 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.types
@@ -5,9 +5,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
 }
 
@@ -18,9 +18,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
     }
 }
@@ -34,9 +34,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
     }
 }
@@ -53,9 +53,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
         }
     }
@@ -66,9 +66,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.types.diff
new file mode 100644
index 0000000000..50c413f0c6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.types.diff
@@ -0,0 +1,66 @@
+--- old.importCallExpressionAsyncES5CJS.types
++++ new.importCallExpressionAsyncES5CJS.types
+@@= skipped -4, +4 lines =@@
+ >fn : () => Promise<void>
+
+     const req = await import('./test') // ONE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+ }
+
+@@= skipped -13, +13 lines =@@
+ >m : () => Promise<void>
+
+         const req = await import('./test') // TWO
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+     }
+ }
+@@= skipped -16, +16 lines =@@
+ >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
+
+         const req = await import('./test') // THREE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+     }
+ }
+@@= skipped -19, +19 lines =@@
+ >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
+
+             const req = await import('./test') // FOUR
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+         }
+     }
+@@= skipped -13, +13 lines =@@
+ >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
+
+     const req = await import('./test') // FIVE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.symbols
index 225c6dc74d..b4de8e18a4 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.symbols
@@ -6,7 +6,7 @@ export async function fn() {
 
     const req = await import('./test') // ONE
 >req : Symbol(req, Decl(test.ts, 1, 9))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
 }
 
 export class cl1 {
@@ -17,7 +17,7 @@ export class cl1 {
 
         const req = await import('./test') // TWO
 >req : Symbol(req, Decl(test.ts, 6, 13))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
     }
 }
 
@@ -29,7 +29,7 @@ export const obj = {
 
         const req = await import('./test') // THREE
 >req : Symbol(req, Decl(test.ts, 12, 13))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
     }
 }
 
@@ -44,7 +44,7 @@ export class cl2 {
 
             const req = await import('./test') // FOUR
 >req : Symbol(req, Decl(test.ts, 19, 17))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
         }
     }
 }
@@ -54,6 +54,6 @@ export const l = async () => {
 
     const req = await import('./test') // FIVE
 >req : Symbol(req, Decl(test.ts, 25, 9))
->'./test' : Symbol("test", Decl(test.ts, 0, 0))
+>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.symbols.diff
new file mode 100644
index 0000000000..ce20b6c5be
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.symbols.diff
@@ -0,0 +1,45 @@
+--- old.importCallExpressionAsyncES6CJS.symbols
++++ new.importCallExpressionAsyncES6CJS.symbols
+@@= skipped -5, +5 lines =@@
+
+     const req = await import('./test') // ONE
+ >req : Symbol(req, Decl(test.ts, 1, 9))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+ }
+
+ export class cl1 {
+@@= skipped -11, +11 lines =@@
+
+         const req = await import('./test') // TWO
+ >req : Symbol(req, Decl(test.ts, 6, 13))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+     }
+ }
+
+@@= skipped -12, +12 lines =@@
+
+         const req = await import('./test') // THREE
+ >req : Symbol(req, Decl(test.ts, 12, 13))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+     }
+ }
+
+@@= skipped -15, +15 lines =@@
+
+             const req = await import('./test') // FOUR
+ >req : Symbol(req, Decl(test.ts, 19, 17))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+         }
+     }
+ }
+@@= skipped -10, +10 lines =@@
+
+     const req = await import('./test') // FIVE
+ >req : Symbol(req, Decl(test.ts, 25, 9))
+->'./test' : Symbol("test", Decl(test.ts, 0, 0))
++>'./test' : Symbol("./test", Decl(test.ts, 0, 0))
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.types
index 4ec7253537..38855b0f27 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.types
@@ -5,9 +5,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
 }
 
@@ -18,9 +18,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
     }
 }
@@ -34,9 +34,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
     }
 }
@@ -53,9 +53,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
         }
     }
@@ -66,9 +66,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof import("test")
->await import('./test') : typeof import("test")
->import('./test') : Promise<typeof import("test")>
+>req : typeof import("./test")
+>await import('./test') : typeof import("./test")
+>import('./test') : Promise<typeof import("./test")>
 >'./test' : "./test"
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.types.diff
new file mode 100644
index 0000000000..06de3d8c94
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.types.diff
@@ -0,0 +1,66 @@
+--- old.importCallExpressionAsyncES6CJS.types
++++ new.importCallExpressionAsyncES6CJS.types
+@@= skipped -4, +4 lines =@@
+ >fn : () => Promise<void>
+
+     const req = await import('./test') // ONE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+ }
+
+@@= skipped -13, +13 lines =@@
+ >m : () => Promise<void>
+
+         const req = await import('./test') // TWO
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+     }
+ }
+@@= skipped -16, +16 lines =@@
+ >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
+
+         const req = await import('./test') // THREE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+     }
+ }
+@@= skipped -19, +19 lines =@@
+ >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
+
+             const req = await import('./test') // FOUR
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+         }
+     }
+@@= skipped -13, +13 lines =@@
+ >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
+
+     const req = await import('./test') // FIVE
+->req : typeof import("test")
+->await import('./test') : typeof import("test")
+->import('./test') : Promise<typeof import("test")>
++>req : typeof import("./test")
++>await import('./test') : typeof import("./test")
++>import('./test') : Promise<typeof import("./test")>
+ >'./test' : "./test"
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.symbols
index 9a1067206e..dd2fd58f19 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.symbols
@@ -7,5 +7,5 @@ export function foo() { return "foo"; }
 === 1.ts ===
 var p1 = import("./0");
 >p1 : Symbol(p1, Decl(1.ts, 0, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.symbols.diff
new file mode 100644
index 0000000000..79685377a0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.symbols.diff
@@ -0,0 +1,8 @@
+--- old.importCallExpressionDeclarationEmit2.symbols
++++ new.importCallExpressionDeclarationEmit2.symbols
+@@= skipped -6, +6 lines =@@
+ === 1.ts ===
+ var p1 = import("./0");
+ >p1 : Symbol(p1, Decl(1.ts, 0, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.types
index a03a8d1867..b59782718d 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.types
@@ -7,7 +7,7 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 var p1 = import("./0");
->p1 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.types.diff
new file mode 100644
index 0000000000..e10da37e7b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit2.types.diff
@@ -0,0 +1,11 @@
+--- old.importCallExpressionDeclarationEmit2.types
++++ new.importCallExpressionDeclarationEmit2.types
+@@= skipped -6, +6 lines =@@
+
+ === 1.ts ===
+ var p1 = import("./0");
+->p1 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.symbols
index 4738339948..0e328b78ee 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.symbols
@@ -6,11 +6,11 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 var p1 = import("./0");
 >p1 : Symbol(p1, Decl(1.ts, 1, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 p1.then(zero => {
 >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -27,14 +27,14 @@ p1.then(zero => {
 
 export var p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 6, 10))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 function foo() {
 >foo : Symbol(foo, Decl(1.ts, 6, 30))
 
     const p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 9, 9))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 }
 
 class C {
@@ -45,7 +45,7 @@ class C {
 
         const loadAsync = import ("./0");
 >loadAsync : Symbol(loadAsync, Decl(1.ts, 14, 13))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
     }
 }
 
@@ -57,6 +57,6 @@ export class D {
 
         const loadAsync = import ("./0");
 >loadAsync : Symbol(loadAsync, Decl(1.ts, 20, 13))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
     }
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.symbols.diff
new file mode 100644
index 0000000000..5bd8d34a4a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.symbols.diff
@@ -0,0 +1,50 @@
+--- old.importCallExpressionES5CJS.symbols
++++ new.importCallExpressionES5CJS.symbols
+@@= skipped -5, +5 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ var p1 = import("./0");
+ >p1 : Symbol(p1, Decl(1.ts, 1, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ p1.then(zero => {
+ >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -21, +21 lines =@@
+
+ export var p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 6, 10))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ function foo() {
+ >foo : Symbol(foo, Decl(1.ts, 6, 30))
+
+     const p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 9, 9))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+ }
+
+ class C {
+@@= skipped -18, +18 lines =@@
+
+         const loadAsync = import ("./0");
+ >loadAsync : Symbol(loadAsync, Decl(1.ts, 14, 13))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+     }
+ }
+
+@@= skipped -12, +12 lines =@@
+
+         const loadAsync = import ("./0");
+ >loadAsync : Symbol(loadAsync, Decl(1.ts, 20, 13))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+     }
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.types
index 97cb8e638c..2ff9feb8be 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.types
@@ -7,41 +7,41 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->import("./0") : Promise<typeof import("0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
->zero : typeof import("0")
+>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
+>zero : typeof import("./0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof import("0")
+>zero : typeof import("./0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 }
 
@@ -52,8 +52,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof import("0")>
->import ("./0") : Promise<typeof import("0")>
+>loadAsync : Promise<typeof import("./0")>
+>import ("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
     }
 }
@@ -65,8 +65,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof import("0")>
->import ("./0") : Promise<typeof import("0")>
+>loadAsync : Promise<typeof import("./0")>
+>import ("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
     }
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.types.diff
new file mode 100644
index 0000000000..3ff0348a04
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.types.diff
@@ -0,0 +1,79 @@
+--- old.importCallExpressionES5CJS.types
++++ new.importCallExpressionES5CJS.types
+@@= skipped -6, +6 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->import("./0") : Promise<typeof import("0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ var p1 = import("./0");
+->p1 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ p1.then(zero => {
+ >p1.then(zero => {    return zero.foo();}) : Promise<string>
+->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->p1 : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
+->zero : typeof import("0")
++>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>p1 : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
++>zero : typeof import("./0")
+
+     return zero.foo();
+ >zero.foo() : string
+ >zero.foo : () => string
+->zero : typeof import("0")
++>zero : typeof import("./0")
+ >foo : () => string
+
+ });
+
+ export var p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ function foo() {
+ >foo : () => void
+
+     const p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+ }
+
+@@= skipped -45, +45 lines =@@
+ >method : () => void
+
+         const loadAsync = import ("./0");
+->loadAsync : Promise<typeof import("0")>
+->import ("./0") : Promise<typeof import("0")>
++>loadAsync : Promise<typeof import("./0")>
++>import ("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+     }
+ }
+@@= skipped -13, +13 lines =@@
+ >method : () => void
+
+         const loadAsync = import ("./0");
+->loadAsync : Promise<typeof import("0")>
+->import ("./0") : Promise<typeof import("0")>
++>loadAsync : Promise<typeof import("./0")>
++>import ("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+     }
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.symbols
index 6c329685e1..121e5f492e 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.symbols
@@ -6,11 +6,11 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 var p1 = import("./0");
 >p1 : Symbol(p1, Decl(1.ts, 1, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 p1.then(zero => {
 >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -27,14 +27,14 @@ p1.then(zero => {
 
 export var p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 6, 10))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 function foo() {
 >foo : Symbol(foo, Decl(1.ts, 6, 30))
 
     const p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 9, 9))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 }
 
 class C {
@@ -45,7 +45,7 @@ class C {
 
         const loadAsync = import ("./0");
 >loadAsync : Symbol(loadAsync, Decl(1.ts, 14, 13))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
     }
 }
 
@@ -57,6 +57,6 @@ export class D {
 
         const loadAsync = import ("./0");
 >loadAsync : Symbol(loadAsync, Decl(1.ts, 20, 13))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
     }
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.symbols.diff
new file mode 100644
index 0000000000..2bd0f51bd6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.symbols.diff
@@ -0,0 +1,50 @@
+--- old.importCallExpressionES6CJS.symbols
++++ new.importCallExpressionES6CJS.symbols
+@@= skipped -5, +5 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ var p1 = import("./0");
+ >p1 : Symbol(p1, Decl(1.ts, 1, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ p1.then(zero => {
+ >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -21, +21 lines =@@
+
+ export var p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 6, 10))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ function foo() {
+ >foo : Symbol(foo, Decl(1.ts, 6, 30))
+
+     const p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 9, 9))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+ }
+
+ class C {
+@@= skipped -18, +18 lines =@@
+
+         const loadAsync = import ("./0");
+ >loadAsync : Symbol(loadAsync, Decl(1.ts, 14, 13))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+     }
+ }
+
+@@= skipped -12, +12 lines =@@
+
+         const loadAsync = import ("./0");
+ >loadAsync : Symbol(loadAsync, Decl(1.ts, 20, 13))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+     }
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.types
index e05d877a0c..f124638bed 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.types
@@ -7,41 +7,41 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->import("./0") : Promise<typeof import("0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
->zero : typeof import("0")
+>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
+>zero : typeof import("./0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof import("0")
+>zero : typeof import("./0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 }
 
@@ -52,8 +52,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof import("0")>
->import ("./0") : Promise<typeof import("0")>
+>loadAsync : Promise<typeof import("./0")>
+>import ("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
     }
 }
@@ -65,8 +65,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof import("0")>
->import ("./0") : Promise<typeof import("0")>
+>loadAsync : Promise<typeof import("./0")>
+>import ("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
     }
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.types.diff
new file mode 100644
index 0000000000..a453fa4562
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.types.diff
@@ -0,0 +1,79 @@
+--- old.importCallExpressionES6CJS.types
++++ new.importCallExpressionES6CJS.types
+@@= skipped -6, +6 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->import("./0") : Promise<typeof import("0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ var p1 = import("./0");
+->p1 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ p1.then(zero => {
+ >p1.then(zero => {    return zero.foo();}) : Promise<string>
+->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->p1 : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
+->zero : typeof import("0")
++>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>p1 : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
++>zero : typeof import("./0")
+
+     return zero.foo();
+ >zero.foo() : string
+ >zero.foo : () => string
+->zero : typeof import("0")
++>zero : typeof import("./0")
+ >foo : () => string
+
+ });
+
+ export var p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ function foo() {
+ >foo : () => void
+
+     const p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+ }
+
+@@= skipped -45, +45 lines =@@
+ >method : () => void
+
+         const loadAsync = import ("./0");
+->loadAsync : Promise<typeof import("0")>
+->import ("./0") : Promise<typeof import("0")>
++>loadAsync : Promise<typeof import("./0")>
++>import ("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+     }
+ }
+@@= skipped -13, +13 lines =@@
+ >method : () => void
+
+         const loadAsync = import ("./0");
+->loadAsync : Promise<typeof import("0")>
+->import ("./0") : Promise<typeof import("0")>
++>loadAsync : Promise<typeof import("./0")>
++>import ("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+     }
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.symbols
index 81ab84da88..4f18dbebb3 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.symbols
@@ -6,11 +6,11 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 var p1 = import("./0");
 >p1 : Symbol(p1, Decl(1.ts, 1, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 p1.then(zero => {
 >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -30,5 +30,5 @@ function foo() {
 
     const p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 7, 9))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.symbols.diff
new file mode 100644
index 0000000000..b85e02fb4c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.symbols.diff
@@ -0,0 +1,23 @@
+--- old.importCallExpressionErrorInES2015.symbols
++++ new.importCallExpressionErrorInES2015.symbols
+@@= skipped -5, +5 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ var p1 = import("./0");
+ >p1 : Symbol(p1, Decl(1.ts, 1, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ p1.then(zero => {
+ >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -24, +24 lines =@@
+
+     const p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 7, 9))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.types
index 3ec6cbb0cb..c40c7a3494 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.types
@@ -7,26 +7,26 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->import("./0") : Promise<typeof import("0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
->zero : typeof import("0")
+>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
+>zero : typeof import("./0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof import("0")
+>zero : typeof import("./0")
 >foo : () => string
 
 })
@@ -35,7 +35,7 @@ function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.types.diff
new file mode 100644
index 0000000000..f9055ff6f5
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionErrorInES2015.types.diff
@@ -0,0 +1,48 @@
+--- old.importCallExpressionErrorInES2015.types
++++ new.importCallExpressionErrorInES2015.types
+@@= skipped -6, +6 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->import("./0") : Promise<typeof import("0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ var p1 = import("./0");
+->p1 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ p1.then(zero => {
+ >p1.then(zero => {    return zero.foo();}) : Promise<string>
+->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->p1 : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
+->zero : typeof import("0")
++>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>p1 : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
++>zero : typeof import("./0")
+
+     return zero.foo();
+ >zero.foo() : string
+ >zero.foo : () => string
+->zero : typeof import("0")
++>zero : typeof import("./0")
+ >foo : () => string
+
+ })
+@@= skipped -28, +28 lines =@@
+ >foo : () => void
+
+     const p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.symbols
index 7c04c916b4..75a429bb25 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.symbols
@@ -6,11 +6,11 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 var p1 = import("./0");
 >p1 : Symbol(p1, Decl(1.ts, 1, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 p1.then(zero => {
 >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -27,12 +27,12 @@ p1.then(zero => {
 
 export var p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 6, 10))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 function foo() {
 >foo : Symbol(foo, Decl(1.ts, 6, 30))
 
     const p2 = import("./0");
 >p2 : Symbol(p2, Decl(1.ts, 9, 9))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.symbols.diff
new file mode 100644
index 0000000000..09737e873c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.symbols.diff
@@ -0,0 +1,31 @@
+--- old.importCallExpressionInCJS1.symbols
++++ new.importCallExpressionInCJS1.symbols
+@@= skipped -5, +5 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ var p1 = import("./0");
+ >p1 : Symbol(p1, Decl(1.ts, 1, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ p1.then(zero => {
+ >p1.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -21, +21 lines =@@
+
+ export var p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 6, 10))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ function foo() {
+ >foo : Symbol(foo, Decl(1.ts, 6, 30))
+
+     const p2 = import("./0");
+ >p2 : Symbol(p2, Decl(1.ts, 9, 9))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.types
index 36dcc9872f..15a4d5b756 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.types
@@ -7,40 +7,40 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 import("./0");
->import("./0") : Promise<typeof import("0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
->zero : typeof import("0")
+>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
+>zero : typeof import("./0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof import("0")
+>zero : typeof import("./0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.types.diff
new file mode 100644
index 0000000000..0650806017
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.types.diff
@@ -0,0 +1,56 @@
+--- old.importCallExpressionInCJS1.types
++++ new.importCallExpressionInCJS1.types
+@@= skipped -6, +6 lines =@@
+
+ === 1.ts ===
+ import("./0");
+->import("./0") : Promise<typeof import("0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ var p1 = import("./0");
+->p1 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ p1.then(zero => {
+ >p1.then(zero => {    return zero.foo();}) : Promise<string>
+->p1.then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->p1 : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->zero => {    return zero.foo();} : (zero: typeof import("0")) => string
+->zero : typeof import("0")
++>p1.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>p1 : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>zero => {    return zero.foo();} : (zero: typeof import("./0")) => string
++>zero : typeof import("./0")
+
+     return zero.foo();
+ >zero.foo() : string
+ >zero.foo : () => string
+->zero : typeof import("0")
++>zero : typeof import("./0")
+ >foo : () => string
+
+ });
+
+ export var p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ function foo() {
+ >foo : () => void
+
+     const p2 = import("./0");
+->p2 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.symbols
index d63b35a299..a40fd4dc88 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.symbols
@@ -23,7 +23,7 @@ async function compute(promise: Promise<any>) {
 
         j = await import("./1");
 >j : Symbol(j, Decl(2.ts, 1, 7))
->"./1" : Symbol("1", Decl(1.ts, 0, 0))
+>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
 
         return j.backup();
 >j : Symbol(j, Decl(2.ts, 1, 7))
@@ -34,5 +34,5 @@ async function compute(promise: Promise<any>) {
 
 compute(import("./0"));
 >compute : Symbol(compute, Decl(2.ts, 0, 0))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.symbols.diff
new file mode 100644
index 0000000000..0aac5a0aec
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.symbols.diff
@@ -0,0 +1,17 @@
+--- old.importCallExpressionInCJS2.symbols
++++ new.importCallExpressionInCJS2.symbols
+@@= skipped -22, +22 lines =@@
+
+         j = await import("./1");
+ >j : Symbol(j, Decl(2.ts, 1, 7))
+->"./1" : Symbol("1", Decl(1.ts, 0, 0))
++>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
+
+         return j.backup();
+ >j : Symbol(j, Decl(2.ts, 1, 7))
+@@= skipped -11, +11 lines =@@
+
+ compute(import("./0"));
+ >compute : Symbol(compute, Decl(2.ts, 0, 0))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.types
index 978f8e3bcc..81fb8a98cf 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.types
@@ -25,10 +25,10 @@ async function compute(promise: Promise<any>) {
 >j : any
 
         j = await import("./1");
->j = await import("./1") : typeof import("1")
+>j = await import("./1") : typeof import("./1")
 >j : any
->await import("./1") : typeof import("1")
->import("./1") : Promise<typeof import("1")>
+>await import("./1") : typeof import("./1")
+>import("./1") : Promise<typeof import("./1")>
 >"./1" : "./1"
 
         return j.backup();
@@ -47,6 +47,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 import("0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.types.diff
new file mode 100644
index 0000000000..ddd20c90f2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.types.diff
@@ -0,0 +1,23 @@
+--- old.importCallExpressionInCJS2.types
++++ new.importCallExpressionInCJS2.types
+@@= skipped -24, +24 lines =@@
+ >j : any
+
+         j = await import("./1");
+->j = await import("./1") : typeof import("1")
++>j = await import("./1") : typeof import("./1")
+ >j : any
+->await import("./1") : typeof import("1")
+->import("./1") : Promise<typeof import("1")>
++>await import("./1") : typeof import("./1")
++>import("./1") : Promise<typeof import("./1")>
+ >"./1" : "./1"
+
+         return j.backup();
+@@= skipped -22, +22 lines =@@
+ compute(import("./0"));
+ >compute(import("./0")) : Promise<any>
+ >compute : (promise: Promise<any>) => Promise<any>
+->import("./0") : Promise<typeof import("0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.symbols
index 47fc0d752c..542ad441ef 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.symbols
@@ -33,5 +33,5 @@ function foo(x: Promise<any>) {
 
 foo(import("./0"));
 >foo : Symbol(foo, Decl(2.ts, 0, 0))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.symbols.diff
new file mode 100644
index 0000000000..cc31909f54
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.symbols.diff
@@ -0,0 +1,8 @@
+--- old.importCallExpressionInCJS3.symbols
++++ new.importCallExpressionInCJS3.symbols
+@@= skipped -32, +32 lines =@@
+
+ foo(import("./0"));
+ >foo : Symbol(foo, Decl(2.ts, 0, 0))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.types
index 6a004536b4..ecb9a90e39 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.types
@@ -42,6 +42,6 @@ function foo(x: Promise<any>) {
 foo(import("./0"));
 >foo(import("./0")) : void
 >foo : (x: Promise<any>) => void
->import("./0") : Promise<typeof import("0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.types.diff
new file mode 100644
index 0000000000..22c21c3d94
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.types.diff
@@ -0,0 +1,9 @@
+--- old.importCallExpressionInCJS3.types
++++ new.importCallExpressionInCJS3.types
+@@= skipped -41, +41 lines =@@
+ foo(import("./0"));
+ >foo(import("./0")) : void
+ >foo : (x: Promise<any>) => void
+->import("./0") : Promise<typeof import("0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.symbols
index 850b51b5b0..f51e6d92ad 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.symbols
@@ -15,7 +15,7 @@ async function foo() {
     class C extends (await import("./0")).B {}
 >C : Symbol(C, Decl(2.ts, 0, 22))
 >(await import("./0")).B : Symbol(B, Decl(0.ts, 0, 0))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 >B : Symbol(B, Decl(0.ts, 0, 0))
 
     var c = new C();
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.symbols.diff
new file mode 100644
index 0000000000..c15054bbbd
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.symbols.diff
@@ -0,0 +1,11 @@
+--- old.importCallExpressionInCJS4.symbols
++++ new.importCallExpressionInCJS4.symbols
+@@= skipped -14, +14 lines =@@
+     class C extends (await import("./0")).B {}
+ >C : Symbol(C, Decl(2.ts, 0, 22))
+ >(await import("./0")).B : Symbol(B, Decl(0.ts, 0, 0))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+ >B : Symbol(B, Decl(0.ts, 0, 0))
+
+     var c = new C();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.types
index 2f99de2816..6fcb6ff05b 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.types
@@ -15,12 +15,12 @@ async function foo() {
 
     class C extends (await import("./0")).B {}
 >C : C
->(await import("./0")).B : import("0").B
->(await import("./0")) : typeof import("0")
->await import("./0") : typeof import("0")
->import("./0") : Promise<typeof import("0")>
+>(await import("./0")).B : import("./0").B
+>(await import("./0")) : typeof import("./0")
+>await import("./0") : typeof import("./0")
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
->B : typeof import("0").B
+>B : typeof import("./0").B
 
     var c = new C();
 >c : C
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.types.diff
new file mode 100644
index 0000000000..50703cd226
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.types.diff
@@ -0,0 +1,20 @@
+--- old.importCallExpressionInCJS4.types
++++ new.importCallExpressionInCJS4.types
+@@= skipped -14, +14 lines =@@
+
+     class C extends (await import("./0")).B {}
+ >C : C
+->(await import("./0")).B : import("0").B
+->(await import("./0")) : typeof import("0")
+->await import("./0") : typeof import("0")
+->import("./0") : Promise<typeof import("0")>
++>(await import("./0")).B : import("./0").B
++>(await import("./0")) : typeof import("./0")
++>await import("./0") : typeof import("./0")
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+->B : typeof import("0").B
++>B : typeof import("./0").B
+
+     var c = new C();
+ >c : C
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.symbols
index 687fc7bc95..d74fccf419 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.symbols
@@ -24,14 +24,14 @@ class C {
 
     private myModule = import("./0");
 >myModule : Symbol(C.myModule, Decl(2.ts, 1, 9))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
     method() {
 >method : Symbol(C.method, Decl(2.ts, 2, 37))
 
         const loadAsync = import ("./0");
 >loadAsync : Symbol(loadAsync, Decl(2.ts, 4, 13))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
         this.myModule.then(Zero => {
 >this.myModule.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -56,7 +56,7 @@ class C {
 
             let one = await import("./1");
 >one : Symbol(one, Decl(2.ts, 9, 15))
->"./1" : Symbol("1", Decl(1.ts, 0, 0))
+>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
 
             console.log(one.backup());
 >console : Symbol(console, Decl(2.ts, 0, 11))
@@ -73,14 +73,14 @@ export class D {
 
     private myModule = import("./0");
 >myModule : Symbol(D.myModule, Decl(2.ts, 15, 16))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
     method() {
 >method : Symbol(D.method, Decl(2.ts, 16, 37))
 
         const loadAsync = import("./0");
 >loadAsync : Symbol(loadAsync, Decl(2.ts, 18, 13))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
         this.myModule.then(Zero => {
 >this.myModule.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -105,7 +105,7 @@ export class D {
 
             let one = await import("./1");
 >one : Symbol(one, Decl(2.ts, 23, 15))
->"./1" : Symbol("1", Decl(1.ts, 0, 0))
+>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
 
             console.log(one.backup());
 >console : Symbol(console, Decl(2.ts, 0, 11))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.symbols.diff
new file mode 100644
index 0000000000..06eabc2a92
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.symbols.diff
@@ -0,0 +1,54 @@
+--- old.importCallExpressionInCJS5.symbols
++++ new.importCallExpressionInCJS5.symbols
+@@= skipped -23, +23 lines =@@
+
+     private myModule = import("./0");
+ >myModule : Symbol(C.myModule, Decl(2.ts, 1, 9))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+     method() {
+ >method : Symbol(C.method, Decl(2.ts, 2, 37))
+
+         const loadAsync = import ("./0");
+ >loadAsync : Symbol(loadAsync, Decl(2.ts, 4, 13))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+         this.myModule.then(Zero => {
+ >this.myModule.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -32, +32 lines =@@
+
+             let one = await import("./1");
+ >one : Symbol(one, Decl(2.ts, 9, 15))
+->"./1" : Symbol("1", Decl(1.ts, 0, 0))
++>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
+
+             console.log(one.backup());
+ >console : Symbol(console, Decl(2.ts, 0, 11))
+@@= skipped -17, +17 lines =@@
+
+     private myModule = import("./0");
+ >myModule : Symbol(D.myModule, Decl(2.ts, 15, 16))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+     method() {
+ >method : Symbol(D.method, Decl(2.ts, 16, 37))
+
+         const loadAsync = import("./0");
+ >loadAsync : Symbol(loadAsync, Decl(2.ts, 18, 13))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+         this.myModule.then(Zero => {
+ >this.myModule.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -32, +32 lines =@@
+
+             let one = await import("./1");
+ >one : Symbol(one, Decl(2.ts, 23, 15))
+->"./1" : Symbol("1", Decl(1.ts, 0, 0))
++>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
+
+             console.log(one.backup());
+ >console : Symbol(console, Decl(2.ts, 0, 11))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.types
index dc13bd8d95..a0589a8a7e 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.types
@@ -26,27 +26,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>myModule : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof import("0")>
->import ("./0") : Promise<typeof import("0")>
+>loadAsync : Promise<typeof import("./0")>
+>import ("./0") : Promise<typeof import("./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 import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof import("0")>
+>this.myModule.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("./0")>
 >this : this
->myModule : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("0")) => void
->Zero : typeof import("0")
+>myModule : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("./0")) => void
+>Zero : typeof import("./0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -55,7 +55,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof import("0")
+>Zero : typeof import("./0")
 >foo : () => string
 
         }, async err => {
@@ -70,9 +70,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof import("1")
->await import("./1") : typeof import("1")
->import("./1") : Promise<typeof import("1")>
+>one : typeof import("./1")
+>await import("./1") : typeof import("./1")
+>import("./1") : Promise<typeof import("./1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -82,7 +82,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof import("1")
+>one : typeof import("./1")
 >backup : () => string
 
         });
@@ -93,27 +93,27 @@ export class D {
 >D : D
 
     private myModule = import("./0");
->myModule : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>myModule : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>loadAsync : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./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 import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof import("0")>
+>this.myModule.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("./0")>
 >this : this
->myModule : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("0")) => void
->Zero : typeof import("0")
+>myModule : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("./0")) => void
+>Zero : typeof import("./0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -122,7 +122,7 @@ export class D {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof import("0")
+>Zero : typeof import("./0")
 >foo : () => string
 
         }, async err => {
@@ -137,9 +137,9 @@ export class D {
 >err : any
 
             let one = await import("./1");
->one : typeof import("1")
->await import("./1") : typeof import("1")
->import("./1") : Promise<typeof import("1")>
+>one : typeof import("./1")
+>await import("./1") : typeof import("./1")
+>import("./1") : Promise<typeof import("./1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -149,7 +149,7 @@ export class D {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof import("1")
+>one : typeof import("./1")
 >backup : () => string
 
         });
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.types.diff
new file mode 100644
index 0000000000..d394f6c248
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.types.diff
@@ -0,0 +1,140 @@
+--- old.importCallExpressionInCJS5.types
++++ new.importCallExpressionInCJS5.types
+@@= skipped -25, +25 lines =@@
+ >C : C
+
+     private myModule = import("./0");
+->myModule : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>myModule : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+     method() {
+ >method : () => void
+
+         const loadAsync = import ("./0");
+->loadAsync : Promise<typeof import("0")>
+->import ("./0") : Promise<typeof import("0")>
++>loadAsync : Promise<typeof import("./0")>
++>import ("./0") : Promise<typeof import("./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 import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->this.myModule : Promise<typeof import("0")>
++>this.myModule.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>this.myModule : Promise<typeof import("./0")>
+ >this : this
+->myModule : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("0")) => void
+->Zero : typeof import("0")
++>myModule : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("./0")) => void
++>Zero : typeof import("./0")
+
+             console.log(Zero.foo());
+ >console.log(Zero.foo()) : any
+@@= skipped -29, +29 lines =@@
+ >log : any
+ >Zero.foo() : string
+ >Zero.foo : () => string
+->Zero : typeof import("0")
++>Zero : typeof import("./0")
+ >foo : () => string
+
+         }, async err => {
+@@= skipped -15, +15 lines =@@
+ >err : any
+
+             let one = await import("./1");
+->one : typeof import("1")
+->await import("./1") : typeof import("1")
+->import("./1") : Promise<typeof import("1")>
++>one : typeof import("./1")
++>await import("./1") : typeof import("./1")
++>import("./1") : Promise<typeof import("./1")>
+ >"./1" : "./1"
+
+             console.log(one.backup());
+@@= skipped -12, +12 lines =@@
+ >log : any
+ >one.backup() : string
+ >one.backup : () => string
+->one : typeof import("1")
++>one : typeof import("./1")
+ >backup : () => string
+
+         });
+@@= skipped -11, +11 lines =@@
+ >D : D
+
+     private myModule = import("./0");
+->myModule : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>myModule : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+     method() {
+ >method : () => void
+
+         const loadAsync = import("./0");
+->loadAsync : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>loadAsync : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./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 import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->this.myModule : Promise<typeof import("0")>
++>this.myModule.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>this.myModule : Promise<typeof import("./0")>
+ >this : this
+->myModule : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("0")) => void
+->Zero : typeof import("0")
++>myModule : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("./0")) => void
++>Zero : typeof import("./0")
+
+             console.log(Zero.foo());
+ >console.log(Zero.foo()) : any
+@@= skipped -29, +29 lines =@@
+ >log : any
+ >Zero.foo() : string
+ >Zero.foo : () => string
+->Zero : typeof import("0")
++>Zero : typeof import("./0")
+ >foo : () => string
+
+         }, async err => {
+@@= skipped -15, +15 lines =@@
+ >err : any
+
+             let one = await import("./1");
+->one : typeof import("1")
+->await import("./1") : typeof import("1")
+->import("./1") : Promise<typeof import("1")>
++>one : typeof import("./1")
++>await import("./1") : typeof import("./1")
++>import("./1") : Promise<typeof import("./1")>
+ >"./1" : "./1"
+
+             console.log(one.backup());
+@@= skipped -12, +12 lines =@@
+ >log : any
+ >one.backup() : string
+ >one.backup : () => string
+->one : typeof import("1")
++>one : typeof import("./1")
+ >backup : () => string
+
+         });
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.symbols
index 7b21aebd76..1e32c3081c 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.symbols
@@ -8,6 +8,6 @@ export = 42;
 export = async function() {
     const something = await import("./something");
 >something : Symbol(something, Decl(index.ts, 1, 9))
->"./something" : Symbol("something", Decl(something.ts, 0, 0))
+>"./something" : Symbol("./something", Decl(something.ts, 0, 0))
 
 };
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.symbols.diff
new file mode 100644
index 0000000000..94ef92494c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.symbols.diff
@@ -0,0 +1,10 @@
+--- old.importCallExpressionInExportEqualsCJS.symbols
++++ new.importCallExpressionInExportEqualsCJS.symbols
+@@= skipped -7, +7 lines =@@
+ export = async function() {
+     const something = await import("./something");
+ >something : Symbol(something, Decl(index.ts, 1, 9))
+->"./something" : Symbol("something", Decl(something.ts, 0, 0))
++>"./something" : Symbol("./something", Decl(something.ts, 0, 0))
+
+ };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.symbols
index fa68fdd6d9..a9f6f3e05f 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.symbols
@@ -7,7 +7,7 @@ export function foo() { return "foo"; }
 === 1.ts ===
 var p1 = import("./0");
 >p1 : Symbol(p1, Decl(1.ts, 0, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 function arguments() { } // this is allow as the file doesn't have implicit "use strict"
 >arguments : Symbol(arguments, Decl(1.ts, 0, 23))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.symbols.diff
new file mode 100644
index 0000000000..417a7bc286
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.symbols.diff
@@ -0,0 +1,11 @@
+--- old.importCallExpressionInScriptContext1.symbols
++++ new.importCallExpressionInScriptContext1.symbols
+@@= skipped -6, +6 lines =@@
+ === 1.ts ===
+ var p1 = import("./0");
+ >p1 : Symbol(p1, Decl(1.ts, 0, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ function arguments() { } // this is allow as the file doesn't have implicit "use strict"
+ >arguments : Symbol(arguments, Decl(1.ts, 0, 23))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.types
index 819ca4c565..27aba025ed 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.types
@@ -7,8 +7,8 @@ export function foo() { return "foo"; }
 
 === 1.ts ===
 var p1 = import("./0");
->p1 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 function arguments() { } // this is allow as the file doesn't have implicit "use strict"
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.types.diff
new file mode 100644
index 0000000000..ff81a58932
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.types.diff
@@ -0,0 +1,13 @@
+--- old.importCallExpressionInScriptContext1.types
++++ new.importCallExpressionInScriptContext1.types
+@@= skipped -6, +6 lines =@@
+
+ === 1.ts ===
+ var p1 = import("./0");
+->p1 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ function arguments() { } // this is allow as the file doesn't have implicit "use strict"
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.symbols
index fe60b1c964..3a8f9ab9bf 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.symbols
@@ -8,7 +8,7 @@ export function foo() { return "foo"; }
 "use strict"
 var p1 = import("./0");
 >p1 : Symbol(p1, Decl(1.ts, 1, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 function arguments() { }
 >arguments : Symbol(arguments, Decl(1.ts, 1, 23))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.symbols.diff
new file mode 100644
index 0000000000..ec2821fca0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.symbols.diff
@@ -0,0 +1,11 @@
+--- old.importCallExpressionInScriptContext2.symbols
++++ new.importCallExpressionInScriptContext2.symbols
+@@= skipped -7, +7 lines =@@
+ "use strict"
+ var p1 = import("./0");
+ >p1 : Symbol(p1, Decl(1.ts, 1, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ function arguments() { }
+ >arguments : Symbol(arguments, Decl(1.ts, 1, 23))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.types
index b46a6fdadb..6d5fb319be 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.types
@@ -10,8 +10,8 @@ export function foo() { return "foo"; }
 >"use strict" : "use strict"
 
 var p1 = import("./0");
->p1 : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 function arguments() { }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.types.diff
new file mode 100644
index 0000000000..c9cec89ccd
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.types.diff
@@ -0,0 +1,13 @@
+--- old.importCallExpressionInScriptContext2.types
++++ new.importCallExpressionInScriptContext2.types
+@@= skipped -9, +9 lines =@@
+ >"use strict" : "use strict"
+
+ var p1 = import("./0");
+->p1 : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ function arguments() { }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.symbols
index 01a262378e..35e2f3733d 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.symbols
@@ -10,6 +10,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
+>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
 >default : Symbol(default, Decl(foo.ts, 0, 0))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.symbols.diff
new file mode 100644
index 0000000000..0a3ee23e94
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.symbols.diff
@@ -0,0 +1,10 @@
+--- old.importCallExpressionNestedCJS.symbols
++++ new.importCallExpressionNestedCJS.symbols
+@@= skipped -9, +9 lines =@@
+
+     return await import((await import("./foo")).default);
+ >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
+->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
++>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
+ >default : Symbol(default, Decl(foo.ts, 0, 0))
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.types
index afbd2bbae3..7db2e6f79b 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.types
@@ -12,9 +12,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 import("foo")
->await import("./foo") : typeof import("foo")
->import("./foo") : Promise<typeof import("foo")>
+>(await import("./foo")) : typeof import("./foo")
+>await import("./foo") : typeof import("./foo")
+>import("./foo") : Promise<typeof import("./foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.types.diff
new file mode 100644
index 0000000000..5cfcd29a87
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.types.diff
@@ -0,0 +1,15 @@
+--- old.importCallExpressionNestedCJS.types
++++ new.importCallExpressionNestedCJS.types
+@@= skipped -11, +11 lines =@@
+ >await import((await import("./foo")).default) : any
+ >import((await import("./foo")).default) : Promise<any>
+ >(await import("./foo")).default : "./foo"
+->(await import("./foo")) : typeof import("foo")
+->await import("./foo") : typeof import("foo")
+->import("./foo") : Promise<typeof import("foo")>
++>(await import("./foo")) : typeof import("./foo")
++>await import("./foo") : typeof import("./foo")
++>import("./foo") : Promise<typeof import("./foo")>
+ >"./foo" : "./foo"
+ >default : "./foo"
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.symbols
index e16831d526..3a1614e6e5 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.symbols
@@ -10,6 +10,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
+>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
 >default : Symbol(default, Decl(foo.ts, 0, 0))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.symbols.diff
new file mode 100644
index 0000000000..e7bd452b06
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.symbols.diff
@@ -0,0 +1,10 @@
+--- old.importCallExpressionNestedCJS2.symbols
++++ new.importCallExpressionNestedCJS2.symbols
+@@= skipped -9, +9 lines =@@
+
+     return await import((await import("./foo")).default);
+ >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
+->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
++>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
+ >default : Symbol(default, Decl(foo.ts, 0, 0))
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.types
index 5e09193607..dcf49e88a9 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.types
@@ -12,9 +12,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 import("foo")
->await import("./foo") : typeof import("foo")
->import("./foo") : Promise<typeof import("foo")>
+>(await import("./foo")) : typeof import("./foo")
+>await import("./foo") : typeof import("./foo")
+>import("./foo") : Promise<typeof import("./foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.types.diff
new file mode 100644
index 0000000000..faf09fc1ed
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.types.diff
@@ -0,0 +1,15 @@
+--- old.importCallExpressionNestedCJS2.types
++++ new.importCallExpressionNestedCJS2.types
+@@= skipped -11, +11 lines =@@
+ >await import((await import("./foo")).default) : any
+ >import((await import("./foo")).default) : Promise<any>
+ >(await import("./foo")).default : "./foo"
+->(await import("./foo")) : typeof import("foo")
+->await import("./foo") : typeof import("foo")
+->import("./foo") : Promise<typeof import("foo")>
++>(await import("./foo")) : typeof import("./foo")
++>await import("./foo") : typeof import("./foo")
++>import("./foo") : Promise<typeof import("./foo")>
+ >"./foo" : "./foo"
+ >default : "./foo"
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.symbols
index 857d9c265e..059f6c058c 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.symbols
@@ -10,6 +10,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
+>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
 >default : Symbol(default, Decl(foo.ts, 0, 0))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.symbols.diff
new file mode 100644
index 0000000000..103bc0da95
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.symbols.diff
@@ -0,0 +1,10 @@
+--- old.importCallExpressionNestedES2015.symbols
++++ new.importCallExpressionNestedES2015.symbols
+@@= skipped -9, +9 lines =@@
+
+     return await import((await import("./foo")).default);
+ >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
+->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
++>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
+ >default : Symbol(default, Decl(foo.ts, 0, 0))
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.types
index 6895e86954..758895285f 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.types
@@ -12,9 +12,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 import("foo")
->await import("./foo") : typeof import("foo")
->import("./foo") : Promise<typeof import("foo")>
+>(await import("./foo")) : typeof import("./foo")
+>await import("./foo") : typeof import("./foo")
+>import("./foo") : Promise<typeof import("./foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.types.diff
new file mode 100644
index 0000000000..226aa35ea5
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2015.types.diff
@@ -0,0 +1,15 @@
+--- old.importCallExpressionNestedES2015.types
++++ new.importCallExpressionNestedES2015.types
+@@= skipped -11, +11 lines =@@
+ >await import((await import("./foo")).default) : any
+ >import((await import("./foo")).default) : Promise<any>
+ >(await import("./foo")).default : "./foo"
+->(await import("./foo")) : typeof import("foo")
+->await import("./foo") : typeof import("foo")
+->import("./foo") : Promise<typeof import("foo")>
++>(await import("./foo")) : typeof import("./foo")
++>await import("./foo") : typeof import("./foo")
++>import("./foo") : Promise<typeof import("./foo")>
+ >"./foo" : "./foo"
+ >default : "./foo"
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.symbols
index baad97d873..81f582fb19 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.symbols
@@ -10,6 +10,6 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
+>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
 >default : Symbol(default, Decl(foo.ts, 0, 0))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.symbols.diff
new file mode 100644
index 0000000000..ac2499aa83
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.symbols.diff
@@ -0,0 +1,10 @@
+--- old.importCallExpressionNestedES20152.symbols
++++ new.importCallExpressionNestedES20152.symbols
+@@= skipped -9, +9 lines =@@
+
+     return await import((await import("./foo")).default);
+ >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
+->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
++>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
+ >default : Symbol(default, Decl(foo.ts, 0, 0))
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.types
index fe8d4fd53d..97457203d5 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.types
@@ -12,9 +12,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 import("foo")
->await import("./foo") : typeof import("foo")
->import("./foo") : Promise<typeof import("foo")>
+>(await import("./foo")) : typeof import("./foo")
+>await import("./foo") : typeof import("./foo")
+>import("./foo") : Promise<typeof import("./foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.types.diff
new file mode 100644
index 0000000000..f2788a99a7
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20152.types.diff
@@ -0,0 +1,15 @@
+--- old.importCallExpressionNestedES20152.types
++++ new.importCallExpressionNestedES20152.types
+@@= skipped -11, +11 lines =@@
+ >await import((await import("./foo")).default) : any
+ >import((await import("./foo")).default) : Promise<any>
+ >(await import("./foo")).default : "./foo"
+->(await import("./foo")) : typeof import("foo")
+->await import("./foo") : typeof import("foo")
+->import("./foo") : Promise<typeof import("foo")>
++>(await import("./foo")) : typeof import("./foo")
++>await import("./foo") : typeof import("./foo")
++>import("./foo") : Promise<typeof import("./foo")>
+ >"./foo" : "./foo"
+ >default : "./foo"
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.symbols
index 69c49a6b6b..9b127833f3 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.symbols
@@ -10,7 +10,7 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
+>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
 >default : Symbol(default, Decl(foo.ts, 0, 0))
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.symbols.diff
new file mode 100644
index 0000000000..a4606267c0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.symbols.diff
@@ -0,0 +1,10 @@
+--- old.importCallExpressionNestedES2020.symbols
++++ new.importCallExpressionNestedES2020.symbols
+@@= skipped -9, +9 lines =@@
+
+     return await import((await import("./foo")).default);
+ >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
+->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
++>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
+ >default : Symbol(default, Decl(foo.ts, 0, 0))
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.types
index 406da5e9c1..bc3c01d0c4 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.types
@@ -12,9 +12,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 import("foo")
->await import("./foo") : typeof import("foo")
->import("./foo") : Promise<typeof import("foo")>
+>(await import("./foo")) : typeof import("./foo")
+>await import("./foo") : typeof import("./foo")
+>import("./foo") : Promise<typeof import("./foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.types.diff
new file mode 100644
index 0000000000..57dfa666c3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES2020.types.diff
@@ -0,0 +1,15 @@
+--- old.importCallExpressionNestedES2020.types
++++ new.importCallExpressionNestedES2020.types
+@@= skipped -11, +11 lines =@@
+ >await import((await import("./foo")).default) : any
+ >import((await import("./foo")).default) : Promise<any>
+ >(await import("./foo")).default : "./foo"
+->(await import("./foo")) : typeof import("foo")
+->await import("./foo") : typeof import("foo")
+->import("./foo") : Promise<typeof import("foo")>
++>(await import("./foo")) : typeof import("./foo")
++>await import("./foo") : typeof import("./foo")
++>import("./foo") : Promise<typeof import("./foo")>
+ >"./foo" : "./foo"
+ >default : "./foo"
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.symbols
index f119260879..85c0e1c3d6 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.symbols
@@ -10,7 +10,7 @@ async function foo() {
 
     return await import((await import("./foo")).default);
 >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
+>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
 >default : Symbol(default, Decl(foo.ts, 0, 0))
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.symbols.diff
new file mode 100644
index 0000000000..67fb91d4cc
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.symbols.diff
@@ -0,0 +1,10 @@
+--- old.importCallExpressionNestedES20202.symbols
++++ new.importCallExpressionNestedES20202.symbols
+@@= skipped -9, +9 lines =@@
+
+     return await import((await import("./foo")).default);
+ >(await import("./foo")).default : Symbol(default, Decl(foo.ts, 0, 0))
+->"./foo" : Symbol("foo", Decl(foo.ts, 0, 0))
++>"./foo" : Symbol("./foo", Decl(foo.ts, 0, 0))
+ >default : Symbol(default, Decl(foo.ts, 0, 0))
+ }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.types
index 9bdd08e17b..0119576b7f 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.types
@@ -12,9 +12,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 import("foo")
->await import("./foo") : typeof import("foo")
->import("./foo") : Promise<typeof import("foo")>
+>(await import("./foo")) : typeof import("./foo")
+>await import("./foo") : typeof import("./foo")
+>import("./foo") : Promise<typeof import("./foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.types.diff
new file mode 100644
index 0000000000..de5a070602
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedES20202.types.diff
@@ -0,0 +1,15 @@
+--- old.importCallExpressionNestedES20202.types
++++ new.importCallExpressionNestedES20202.types
+@@= skipped -11, +11 lines =@@
+ >await import((await import("./foo")).default) : any
+ >import((await import("./foo")).default) : Promise<any>
+ >(await import("./foo")).default : "./foo"
+->(await import("./foo")) : typeof import("foo")
+->await import("./foo") : typeof import("foo")
+->import("./foo") : Promise<typeof import("foo")>
++>(await import("./foo")) : typeof import("./foo")
++>await import("./foo") : typeof import("./foo")
++>import("./foo") : Promise<typeof import("./foo")>
+ >"./foo" : "./foo"
+ >default : "./foo"
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.symbols
index a725d9e53e..518d1bd182 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.symbols
@@ -24,14 +24,14 @@ class C {
 
     private myModule = import("./0");
 >myModule : Symbol(C.myModule, Decl(2.ts, 1, 9))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
     method() {
 >method : Symbol(C.method, Decl(2.ts, 2, 37))
 
         const loadAsync = import("./0");
 >loadAsync : Symbol(loadAsync, Decl(2.ts, 4, 13))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
         this.myModule.then(Zero => {
 >this.myModule.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
@@ -56,7 +56,7 @@ class C {
 
             let one = await import("./1");
 >one : Symbol(one, Decl(2.ts, 9, 15))
->"./1" : Symbol("1", Decl(1.ts, 0, 0))
+>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
 
             console.log(one.backup());
 >console : Symbol(console, Decl(2.ts, 0, 11))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.symbols.diff
new file mode 100644
index 0000000000..e0710c2ed3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.symbols.diff
@@ -0,0 +1,28 @@
+--- old.importCallExpressionNoModuleKindSpecified.symbols
++++ new.importCallExpressionNoModuleKindSpecified.symbols
+@@= skipped -23, +23 lines =@@
+
+     private myModule = import("./0");
+ >myModule : Symbol(C.myModule, Decl(2.ts, 1, 9))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+     method() {
+ >method : Symbol(C.method, Decl(2.ts, 2, 37))
+
+         const loadAsync = import("./0");
+ >loadAsync : Symbol(loadAsync, Decl(2.ts, 4, 13))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+         this.myModule.then(Zero => {
+ >this.myModule.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+@@= skipped -32, +32 lines =@@
+
+             let one = await import("./1");
+ >one : Symbol(one, Decl(2.ts, 9, 15))
+->"./1" : Symbol("1", Decl(1.ts, 0, 0))
++>"./1" : Symbol("./1", Decl(1.ts, 0, 0))
+
+             console.log(one.backup());
+ >console : Symbol(console, Decl(2.ts, 0, 11))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.types
index 4b33b8e1cd..543d95f513 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.types
@@ -26,27 +26,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>myModule : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof import("0")>
->import("./0") : Promise<typeof import("0")>
+>loadAsync : Promise<typeof import("./0")>
+>import("./0") : Promise<typeof import("./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 import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof import("0")>
+>this.myModule.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("./0")>
 >this : this
->myModule : Promise<typeof import("0")>
->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("0")) => void
->Zero : typeof import("0")
+>myModule : Promise<typeof import("./0")>
+>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("./0")) => void
+>Zero : typeof import("./0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -55,7 +55,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof import("0")
+>Zero : typeof import("./0")
 >foo : () => string
 
         }, async err => {
@@ -70,9 +70,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof import("1")
->await import("./1") : typeof import("1")
->import("./1") : Promise<typeof import("1")>
+>one : typeof import("./1")
+>await import("./1") : typeof import("./1")
+>import("./1") : Promise<typeof import("./1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -82,7 +82,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof import("1")
+>one : typeof import("./1")
 >backup : () => string
 
         });
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.types.diff
new file mode 100644
index 0000000000..176e63007c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.types.diff
@@ -0,0 +1,71 @@
+--- old.importCallExpressionNoModuleKindSpecified.types
++++ new.importCallExpressionNoModuleKindSpecified.types
+@@= skipped -25, +25 lines =@@
+ >C : C
+
+     private myModule = import("./0");
+->myModule : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>myModule : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+     method() {
+ >method : () => void
+
+         const loadAsync = import("./0");
+->loadAsync : Promise<typeof import("0")>
+->import("./0") : Promise<typeof import("0")>
++>loadAsync : Promise<typeof import("./0")>
++>import("./0") : Promise<typeof import("./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 import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->this.myModule : Promise<typeof import("0")>
++>this.myModule.then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>this.myModule : Promise<typeof import("./0")>
+ >this : this
+->myModule : Promise<typeof import("0")>
+->then : <TResult1 = typeof import("0"), TResult2 = never>(onfulfilled?: (value: typeof import("0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+->Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("0")) => void
+->Zero : typeof import("0")
++>myModule : Promise<typeof import("./0")>
++>then : <TResult1 = typeof import("./0"), TResult2 = never>(onfulfilled?: (value: typeof import("./0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
++>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("./0")) => void
++>Zero : typeof import("./0")
+
+             console.log(Zero.foo());
+ >console.log(Zero.foo()) : any
+@@= skipped -29, +29 lines =@@
+ >log : any
+ >Zero.foo() : string
+ >Zero.foo : () => string
+->Zero : typeof import("0")
++>Zero : typeof import("./0")
+ >foo : () => string
+
+         }, async err => {
+@@= skipped -15, +15 lines =@@
+ >err : any
+
+             let one = await import("./1");
+->one : typeof import("1")
+->await import("./1") : typeof import("1")
+->import("./1") : Promise<typeof import("1")>
++>one : typeof import("./1")
++>await import("./1") : typeof import("./1")
++>import("./1") : Promise<typeof import("./1")>
+ >"./1" : "./1"
+
+             console.log(one.backup());
+@@= skipped -12, +12 lines =@@
+ >log : any
+ >one.backup() : string
+ >one.backup : () => string
+->one : typeof import("1")
++>one : typeof import("./1")
+ >backup : () => string
+
+         });
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.symbols b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.symbols
index d17e7a3652..53ebfd79be 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.symbols
@@ -9,9 +9,9 @@ export function foo() { return "foo"; }
 var p1 = import<Promise<any>>("./0");  // error
 >p1 : Symbol(p1, Decl(1.ts, 1, 3))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
 var p2 = import<>("./0");  // error
 >p2 : Symbol(p2, Decl(1.ts, 2, 3))
->"./0" : Symbol("0", Decl(0.ts, 0, 0))
+>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.symbols.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.symbols.diff
new file mode 100644
index 0000000000..26e09d51b6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.symbols.diff
@@ -0,0 +1,13 @@
+--- old.importCallExpressionWithTypeArgument.symbols
++++ new.importCallExpressionWithTypeArgument.symbols
+@@= skipped -8, +8 lines =@@
+ var p1 = import<Promise<any>>("./0");  // error
+ >p1 : Symbol(p1, Decl(1.ts, 1, 3))
+ >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
+
+ var p2 = import<>("./0");  // error
+ >p2 : Symbol(p2, Decl(1.ts, 2, 3))
+->"./0" : Symbol("0", Decl(0.ts, 0, 0))
++>"./0" : Symbol("./0", Decl(0.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.types b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.types
index e991c27b46..1df8275c17 100644
--- a/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.types
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.types
@@ -10,12 +10,12 @@ export function foo() { return "foo"; }
 >"use strict" : "use strict"
 
 var p1 = import<Promise<any>>("./0");  // error
->p1 : Promise<typeof import("0")>
->import<Promise<any>>("./0") : Promise<typeof import("0")>
+>p1 : Promise<typeof import("./0")>
+>import<Promise<any>>("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
 var p2 = import<>("./0");  // error
->p2 : Promise<typeof import("0")>
->import<>("./0") : Promise<typeof import("0")>
+>p2 : Promise<typeof import("./0")>
+>import<>("./0") : Promise<typeof import("./0")>
 >"./0" : "./0"
 
diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.types.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.types.diff
new file mode 100644
index 0000000000..44e360d290
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.types.diff
@@ -0,0 +1,18 @@
+--- old.importCallExpressionWithTypeArgument.types
++++ new.importCallExpressionWithTypeArgument.types
+@@= skipped -9, +9 lines =@@
+ >"use strict" : "use strict"
+
+ var p1 = import<Promise<any>>("./0");  // error
+->p1 : Promise<typeof import("0")>
+->import<Promise<any>>("./0") : Promise<typeof import("0")>
++>p1 : Promise<typeof import("./0")>
++>import<Promise<any>>("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
+
+ var p2 = import<>("./0");  // error
+->p2 : Promise<typeof import("0")>
+->import<>("./0") : Promise<typeof import("0")>
++>p2 : Promise<typeof import("./0")>
++>import<>("./0") : Promise<typeof import("./0")>
+ >"./0" : "./0"
diff --git a/testdata/baselines/reference/submodule/conformance/importElisionConstEnumMerge1.types b/testdata/baselines/reference/submodule/conformance/importElisionConstEnumMerge1.types
index f3c61fdf0a..e842ff4037 100644
--- a/testdata/baselines/reference/submodule/conformance/importElisionConstEnumMerge1.types
+++ b/testdata/baselines/reference/submodule/conformance/importElisionConstEnumMerge1.types
@@ -22,10 +22,10 @@ export { Enum };
 
 === index.ts ===
 import { Enum } from "./merge";
->Enum : typeof import("enum").Enum
+>Enum : typeof import("./enum").Enum
 
 Enum.One;
->Enum.One : import("enum").Enum
->Enum : typeof import("enum").Enum
->One : import("enum").Enum
+>Enum.One : import("./enum").Enum
+>Enum : typeof import("./enum").Enum
+>One : import("./enum").Enum
 
diff --git a/testdata/baselines/reference/submodule/conformance/importElisionConstEnumMerge1.types.diff b/testdata/baselines/reference/submodule/conformance/importElisionConstEnumMerge1.types.diff
new file mode 100644
index 0000000000..2ce2edf4a6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importElisionConstEnumMerge1.types.diff
@@ -0,0 +1,16 @@
+--- old.importElisionConstEnumMerge1.types
++++ new.importElisionConstEnumMerge1.types
+@@= skipped -21, +21 lines =@@
+
+ === index.ts ===
+ import { Enum } from "./merge";
+->Enum : typeof import("enum").Enum
++>Enum : typeof import("./enum").Enum
+
+ Enum.One;
+->Enum.One : import("enum").Enum
+->Enum : typeof import("enum").Enum
+->One : import("enum").Enum
++>Enum.One : import("./enum").Enum
++>Enum : typeof import("./enum").Enum
++>One : import("./enum").Enum
diff --git a/testdata/baselines/reference/submodule/conformance/importTypeGenericTypes.types b/testdata/baselines/reference/submodule/conformance/importTypeGenericTypes.types
index cf73418605..3d557d9cd0 100644
--- a/testdata/baselines/reference/submodule/conformance/importTypeGenericTypes.types
+++ b/testdata/baselines/reference/submodule/conformance/importTypeGenericTypes.types
@@ -57,7 +57,7 @@ export { Bar }
 
 === usage.ts ===
 export const x: import("./foo")<{x: number}> = { x: 0, y: 0, data: {x: 12} };
->x : import("foo")<{ x: number; }>
+>x : import("./foo")<{ x: number; }>
 >x : number
 >{ x: 0, y: 0, data: {x: 12} } : { x: number; y: number; data: { x: number; }; }
 >x : number
@@ -70,7 +70,7 @@ export const x: import("./foo")<{x: number}> = { x: 0, y: 0, data: {x: 12} };
 >12 : 12
 
 export let y: import("./foo2").Bar.I<{x: number}> = { a: "", b: 0, data: {x: 12} };
->y : import("foo2").Bar.I<{ x: number; }>
+>y : import("./foo2").Bar.I<{ x: number; }>
 >Bar : any
 >x : number
 >{ a: "", b: 0, data: {x: 12} } : { a: string; b: number; data: { x: number; }; }
@@ -98,7 +98,7 @@ export class Bar2<T> {
 }
 
 export let shim: typeof import("./foo2") = {
->shim : typeof import("foo2")
+>shim : typeof import("./foo2")
 >{    Bar: Bar2} : { Bar: typeof Bar2; }
 
     Bar: Bar2
diff --git a/testdata/baselines/reference/submodule/conformance/importTypeGenericTypes.types.diff b/testdata/baselines/reference/submodule/conformance/importTypeGenericTypes.types.diff
new file mode 100644
index 0000000000..d22de35438
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importTypeGenericTypes.types.diff
@@ -0,0 +1,29 @@
+--- old.importTypeGenericTypes.types
++++ new.importTypeGenericTypes.types
+@@= skipped -56, +56 lines =@@
+
+ === usage.ts ===
+ export const x: import("./foo")<{x: number}> = { x: 0, y: 0, data: {x: 12} };
+->x : import("foo")<{ x: number; }>
++>x : import("./foo")<{ x: number; }>
+ >x : number
+ >{ x: 0, y: 0, data: {x: 12} } : { x: number; y: number; data: { x: number; }; }
+ >x : number
+@@= skipped -13, +13 lines =@@
+ >12 : 12
+
+ export let y: import("./foo2").Bar.I<{x: number}> = { a: "", b: 0, data: {x: 12} };
+->y : import("foo2").Bar.I<{ x: number; }>
++>y : import("./foo2").Bar.I<{ x: number; }>
+ >Bar : any
+ >x : number
+ >{ a: "", b: 0, data: {x: 12} } : { a: string; b: number; data: { x: number; }; }
+@@= skipped -28, +28 lines =@@
+ }
+
+ export let shim: typeof import("./foo2") = {
+->shim : typeof import("foo2")
++>shim : typeof import("./foo2")
+ >{    Bar: Bar2} : { Bar: typeof Bar2; }
+
+     Bar: Bar2
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importTypeInJSDoc.types b/testdata/baselines/reference/submodule/conformance/importTypeInJSDoc.types
index 4284ff8a1e..5521333f39 100644
--- a/testdata/baselines/reference/submodule/conformance/importTypeInJSDoc.types
+++ b/testdata/baselines/reference/submodule/conformance/importTypeInJSDoc.types
@@ -20,7 +20,7 @@ declare class MyClass {
 >y : number
 
     constructor(x: MyClass.Bar);
->x : import("externs").Bar
+>x : import("./externs").Bar
 >MyClass : any
 }
 declare global {
@@ -39,25 +39,25 @@ export = MyClass;
  */
 
 let a = /** @type {Foo} */(/** @type {*} */(undefined)); 
->a : import("externs")
->(/** @type {*} */(undefined)) : import("externs")
+>a : import("./externs")
+>(/** @type {*} */(undefined)) : import("./externs")
 >(undefined) : any
 >undefined : undefined
 
 a = new Foo({doer: Foo.Bar});
->a = new Foo({doer: Foo.Bar}) : import("externs")
->a : import("externs")
->new Foo({doer: Foo.Bar}) : import("externs")
->Foo : typeof import("externs")
+>a = new Foo({doer: Foo.Bar}) : import("./externs")
+>a : import("./externs")
+>new Foo({doer: Foo.Bar}) : import("./externs")
+>Foo : typeof import("./externs")
 >{doer: Foo.Bar} : { doer: (x: string, y?: number) => void; }
 >doer : (x: string, y?: number) => void
 >Foo.Bar : (x: string, y?: number) => void
->Foo : typeof import("externs")
+>Foo : typeof import("./externs")
 >Bar : (x: string, y?: number) => void
 
 const q = /** @type {import("./externs").Bar} */({ doer: q => q });
->q : import("externs").Bar
->({ doer: q => q }) : import("externs").Bar
+>q : import("./externs").Bar
+>({ doer: q => q }) : import("./externs").Bar
 >{ doer: q => q } : { doer: (q: string) => string; }
 >doer : (q: string) => string
 >q => q : (q: string) => string
diff --git a/testdata/baselines/reference/submodule/conformance/importTypeLocal.types b/testdata/baselines/reference/submodule/conformance/importTypeLocal.types
index a65dd4bfa0..17d8e0b723 100644
--- a/testdata/baselines/reference/submodule/conformance/importTypeLocal.types
+++ b/testdata/baselines/reference/submodule/conformance/importTypeLocal.types
@@ -48,7 +48,7 @@ export { Bar }
 
 === usage.ts ===
 export const x: import("./foo") = { x: 0, y: 0 };
->x : import("foo")
+>x : import("./foo")
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -56,7 +56,7 @@ export const x: import("./foo") = { x: 0, y: 0 };
 >0 : 0
 
 export let y: import("./foo2").Bar.I = { a: "", b: 0 };
->y : import("foo2").Bar.I
+>y : import("./foo2").Bar.I
 >Bar : any
 >{ a: "", b: 0 } : { a: string; b: number; }
 >a : string
@@ -78,7 +78,7 @@ export class Bar2 {
 }
 
 export let shim: typeof import("./foo2") = {
->shim : typeof import("foo2")
+>shim : typeof import("./foo2")
 >{    Bar: Bar2} : { Bar: typeof Bar2; }
 
     Bar: Bar2
diff --git a/testdata/baselines/reference/submodule/conformance/importTypeLocal.types.diff b/testdata/baselines/reference/submodule/conformance/importTypeLocal.types.diff
new file mode 100644
index 0000000000..41b6fa9549
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/importTypeLocal.types.diff
@@ -0,0 +1,29 @@
+--- old.importTypeLocal.types
++++ new.importTypeLocal.types
+@@= skipped -47, +47 lines =@@
+
+ === usage.ts ===
+ export const x: import("./foo") = { x: 0, y: 0 };
+->x : import("foo")
++>x : import("./foo")
+ >{ x: 0, y: 0 } : { x: number; y: number; }
+ >x : number
+ >0 : 0
+@@= skipped -8, +8 lines =@@
+ >0 : 0
+
+ export let y: import("./foo2").Bar.I = { a: "", b: 0 };
+->y : import("foo2").Bar.I
++>y : import("./foo2").Bar.I
+ >Bar : any
+ >{ a: "", b: 0 } : { a: string; b: number; }
+ >a : string
+@@= skipped -22, +22 lines =@@
+ }
+
+ export let shim: typeof import("./foo2") = {
+->shim : typeof import("foo2")
++>shim : typeof import("./foo2")
+ >{    Bar: Bar2} : { Bar: typeof Bar2; }
+
+     Bar: Bar2
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types
index 45ab5b84ef..7f6c1cd816 100644
--- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types
+++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types
@@ -197,18 +197,18 @@ import { dom } from "./renderer"
 >dom : () => dom.JSX.Element
 
 import prerendered, {MySFC, MyClass, tree} from "./component";
->prerendered : import("renderer2").predom.JSX.Element
->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
+>prerendered : import("./renderer2").predom.JSX.Element
+>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
 >MyClass : typeof MyClass
->tree : import("renderer2").predom.JSX.Element
+>tree : import("./renderer2").predom.JSX.Element
 
 let elem = prerendered;
->elem : import("renderer2").predom.JSX.Element
->prerendered : import("renderer2").predom.JSX.Element
+>elem : import("./renderer2").predom.JSX.Element
+>prerendered : import("./renderer2").predom.JSX.Element
 
 elem = <h></h>; // Expect assignability error here
 >elem = <h></h> : dom.JSX.Element
->elem : import("renderer2").predom.JSX.Element
+>elem : import("./renderer2").predom.JSX.Element
 ><h></h> : dom.JSX.Element
 >h : any
 >h : any
@@ -322,7 +322,7 @@ const _tree = <DOMSFC x={1} y={2}><DOMClass x={3} y={4} /><DOMClass x={5} y={6}
 const _brokenTree = <MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={6} /></MySFC>
 >_brokenTree : dom.JSX.Element
 ><MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={6} /></MySFC> : dom.JSX.Element
->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
+>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
 >x : number
 >1 : 1
 >y : number
@@ -339,7 +339,7 @@ const _brokenTree = <MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={
 >5 : 5
 >y : number
 >6 : 6
->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
+>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
 
 // Should fail, nondom isn't allowed as children of dom
 const _brokenTree2 = <DOMSFC x={1} y={2}>{tree}{tree}</DOMSFC>
@@ -350,7 +350,7 @@ const _brokenTree2 = <DOMSFC x={1} y={2}>{tree}{tree}</DOMSFC>
 >1 : 1
 >y : number
 >2 : 2
->tree : import("renderer2").predom.JSX.Element
->tree : import("renderer2").predom.JSX.Element
+>tree : import("./renderer2").predom.JSX.Element
+>tree : import("./renderer2").predom.JSX.Element
 >DOMSFC : (props: { x: number; y: number; children?: dom.JSX.Element[]; }) => dom.JSX.Element
 
diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types.diff b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types.diff
new file mode 100644
index 0000000000..c7aa43e08a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types.diff
@@ -0,0 +1,54 @@
+--- old.inlineJsxFactoryDeclarationsLocalTypes.types
++++ new.inlineJsxFactoryDeclarationsLocalTypes.types
+@@= skipped -196, +196 lines =@@
+ >dom : () => dom.JSX.Element
+
+ import prerendered, {MySFC, MyClass, tree} from "./component";
+->prerendered : import("renderer2").predom.JSX.Element
+->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
++>prerendered : import("./renderer2").predom.JSX.Element
++>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
+ >MyClass : typeof MyClass
+->tree : import("renderer2").predom.JSX.Element
++>tree : import("./renderer2").predom.JSX.Element
+
+ let elem = prerendered;
+->elem : import("renderer2").predom.JSX.Element
+->prerendered : import("renderer2").predom.JSX.Element
++>elem : import("./renderer2").predom.JSX.Element
++>prerendered : import("./renderer2").predom.JSX.Element
+
+ elem = <h></h>; // Expect assignability error here
+ >elem = <h></h> : dom.JSX.Element
+->elem : import("renderer2").predom.JSX.Element
++>elem : import("./renderer2").predom.JSX.Element
+ ><h></h> : dom.JSX.Element
+ >h : any
+ >h : any
+@@= skipped -125, +125 lines =@@
+ const _brokenTree = <MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={6} /></MySFC>
+ >_brokenTree : dom.JSX.Element
+ ><MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={6} /></MySFC> : dom.JSX.Element
+->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
++>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
+ >x : number
+ >1 : 1
+ >y : number
+@@= skipped -17, +17 lines =@@
+ >5 : 5
+ >y : number
+ >6 : 6
+->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
++>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
+
+ // Should fail, nondom isn't allowed as children of dom
+ const _brokenTree2 = <DOMSFC x={1} y={2}>{tree}{tree}</DOMSFC>
+@@= skipped -11, +11 lines =@@
+ >1 : 1
+ >y : number
+ >2 : 2
+->tree : import("renderer2").predom.JSX.Element
+->tree : import("renderer2").predom.JSX.Element
++>tree : import("./renderer2").predom.JSX.Element
++>tree : import("./renderer2").predom.JSX.Element
+ >DOMSFC : (props: { x: number; y: number; children?: dom.JSX.Element[]; }) => dom.JSX.Element
diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types
index bfbd63aa4a..4c03c11163 100644
--- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types
+++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types
@@ -75,15 +75,15 @@ import { dom } from "./renderer"
 >dom : () => JSX.Element
 
 import prerendered from "./component";
->prerendered : import("renderer2").predom.JSX.Element
+>prerendered : import("./renderer2").predom.JSX.Element
 
 let elem = prerendered;
->elem : import("renderer2").predom.JSX.Element
->prerendered : import("renderer2").predom.JSX.Element
+>elem : import("./renderer2").predom.JSX.Element
+>prerendered : import("./renderer2").predom.JSX.Element
 
 elem = <h></h>; // Expect assignability error here
 >elem = <h></h> : JSX.Element
->elem : import("renderer2").predom.JSX.Element
+>elem : import("./renderer2").predom.JSX.Element
 ><h></h> : JSX.Element
 >h : any
 >h : any
diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types.diff b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types.diff
new file mode 100644
index 0000000000..3e9004bc8b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types.diff
@@ -0,0 +1,22 @@
+--- old.inlineJsxFactoryLocalTypeGlobalFallback.types
++++ new.inlineJsxFactoryLocalTypeGlobalFallback.types
+@@= skipped -74, +74 lines =@@
+ >dom : () => JSX.Element
+
+ import prerendered from "./component";
+->prerendered : import("renderer2").predom.JSX.Element
++>prerendered : import("./renderer2").predom.JSX.Element
+
+ let elem = prerendered;
+->elem : import("renderer2").predom.JSX.Element
+->prerendered : import("renderer2").predom.JSX.Element
++>elem : import("./renderer2").predom.JSX.Element
++>prerendered : import("./renderer2").predom.JSX.Element
+
+ elem = <h></h>; // Expect assignability error here
+ >elem = <h></h> : JSX.Element
+->elem : import("renderer2").predom.JSX.Element
++>elem : import("./renderer2").predom.JSX.Element
+ ><h></h> : JSX.Element
+ >h : any
+ >h : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.symbols b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.symbols
index 298c8b51be..53b5fc0565 100644
--- a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.symbols
+++ b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.symbols
@@ -274,7 +274,7 @@ declare function mock<M>(_: Promise<M>): {} & M;
 
 mock(import('./ex'))
 >mock : Symbol(mock, Decl(intersectionsAndEmptyObjects.ts, 80, 52))
->'./ex' : Symbol("ex", Decl(ex.d.ts, 0, 0))
+>'./ex' : Symbol("./ex", Decl(ex.d.ts, 0, 0))
 
 === ex.d.ts ===
 
diff --git a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.symbols.diff b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.symbols.diff
new file mode 100644
index 0000000000..596d4995d1
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.symbols.diff
@@ -0,0 +1,10 @@
+--- old.intersectionsAndEmptyObjects.symbols
++++ new.intersectionsAndEmptyObjects.symbols
+@@= skipped -273, +273 lines =@@
+
+ mock(import('./ex'))
+ >mock : Symbol(mock, Decl(intersectionsAndEmptyObjects.ts, 80, 52))
+->'./ex' : Symbol("ex", Decl(ex.d.ts, 0, 0))
++>'./ex' : Symbol("./ex", Decl(ex.d.ts, 0, 0))
+
+ === ex.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types
index 09085dbb6f..cf7f2b3942 100644
--- a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types
+++ b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types
@@ -228,7 +228,7 @@ declare function mock<M>(_: Promise<M>): {} & M;
 mock(import('./ex'))
 >mock(import('./ex')) : {}
 >mock : <M>(_: Promise<M>) => {} & M
->import('./ex') : Promise<{ default: typeof import("ex"); }>
+>import('./ex') : Promise<{ default: typeof import("./ex"); }>
 >'./ex' : "./ex"
 
 === ex.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types.diff b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types.diff
new file mode 100644
index 0000000000..06f2934445
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types.diff
@@ -0,0 +1,11 @@
+--- old.intersectionsAndEmptyObjects.types
++++ new.intersectionsAndEmptyObjects.types
+@@= skipped -227, +227 lines =@@
+ mock(import('./ex'))
+ >mock(import('./ex')) : {}
+ >mock : <M>(_: Promise<M>) => {} & M
+->import('./ex') : Promise<{ default: typeof import("ex"); }>
++>import('./ex') : Promise<{ default: typeof import("./ex"); }>
+ >'./ex' : "./ex"
+
+ === ex.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.symbols
index a8b536cb24..59cead6790 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.symbols
@@ -3,7 +3,7 @@
 === supplement.d.ts ===
 export { };
 declare module "./argument.js" {
->"./argument.js" : Symbol("argument", Decl(argument.js, 0, 0), Decl(supplement.d.ts, 0, 11))
+>"./argument.js" : Symbol("./argument", Decl(argument.js, 0, 0), Decl(supplement.d.ts, 0, 11))
 
     interface Argument {
 >Argument : Symbol(Argument, Decl(argument.js, 0, 33), Decl(supplement.d.ts, 1, 32))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.symbols.diff
new file mode 100644
index 0000000000..07b9950b28
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.symbols.diff
@@ -0,0 +1,11 @@
+--- old.jsDeclarationsClassAccessor.symbols
++++ new.jsDeclarationsClassAccessor.symbols
+@@= skipped -2, +2 lines =@@
+ === supplement.d.ts ===
+ export { };
+ declare module "./argument.js" {
+->"./argument.js" : Symbol("argument", Decl(argument.js, 0, 0), Decl(supplement.d.ts, 0, 11))
++>"./argument.js" : Symbol("./argument", Decl(argument.js, 0, 0), Decl(supplement.d.ts, 0, 11))
+
+     interface Argument {
+ >Argument : Symbol(Argument, Decl(argument.js, 0, 33), Decl(supplement.d.ts, 1, 32))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.types
index 66a0119502..7d4361273a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassAccessor.types
@@ -3,7 +3,7 @@
 === supplement.d.ts ===
 export { };
 declare module "./argument.js" {
->"./argument.js" : typeof import("argument")
+>"./argument.js" : typeof import("./argument")
 
     interface Argument {
         idlType: any;
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols
index bd1cc110ec..00f70b3bed 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols
@@ -4,7 +4,7 @@
 const Bar = require("./bar");
 >Bar : Symbol(Bar, Decl(cls.js, 0, 5))
 >require : Symbol(require)
->"./bar" : Symbol("bar", Decl(bar.js, 0, 0))
+>"./bar" : Symbol("./bar", Decl(bar.js, 0, 0))
 
 const Strings = {
 >Strings : Symbol(Strings, Decl(cls.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols.diff
index 92f53b9b9c..bb214f8ddb 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsDeclarationsClassExtendsVisibility.symbols
 +++ new.jsDeclarationsClassExtendsVisibility.symbols
-@@= skipped -20, +20 lines =@@
+@@= skipped -3, +3 lines =@@
+ const Bar = require("./bar");
+ >Bar : Symbol(Bar, Decl(cls.js, 0, 5))
+ >require : Symbol(require)
+->"./bar" : Symbol("bar", Decl(bar.js, 0, 0))
++>"./bar" : Symbol("./bar", Decl(bar.js, 0, 0))
+
+ const Strings = {
+ >Strings : Symbol(Strings, Decl(cls.js, 1, 5))
+@@= skipped -17, +17 lines =@@
  >Bar : Symbol(Bar, Decl(cls.js, 0, 5))
 
  module.exports = Foo;
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols
index da1bfef234..f392c601f3 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols
@@ -4,9 +4,9 @@
 /** @constructor */
 module.exports.MyClass = function() {
 >module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
->module.exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
+>module.exports : Symbol("./jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
+>exports : Symbol("./jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 
     this.x = 1
@@ -14,9 +14,9 @@ module.exports.MyClass = function() {
 module.exports.MyClass.prototype = {
 >module.exports.MyClass.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
 >module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
->module.exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
+>module.exports : Symbol("./jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
+>exports : Symbol("./jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols.diff
index 186e299fad..16f92e1423 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols.diff
@@ -10,9 +10,9 @@
 ->exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 ->MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunction.js, 4, 15))
 +>module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
-+>module.exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
++>module.exports : Symbol("./jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
++>exports : Symbol("./jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 
      this.x = 1
@@ -30,9 +30,9 @@
 ->prototype : Symbol(MyClass.prototype, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 3, 1))
 +>module.exports.MyClass.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
 +>module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
-+>module.exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
++>module.exports : Symbol("./jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
++>exports : Symbol("./jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.types
index 02c191cccc..c9cb7b8192 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.types
@@ -5,9 +5,9 @@
 module.exports.MyClass = function() {
 >module.exports.MyClass = function() {    this.x = 1} : () => void
 >module.exports.MyClass : () => void
->module.exports : typeof import("jsDeclarationsExportAssignedConstructorFunction")
->module : { "\"jsDeclarationsExportAssignedConstructorFunction\"": typeof import("jsDeclarationsExportAssignedConstructorFunction"); }
->exports : typeof import("jsDeclarationsExportAssignedConstructorFunction")
+>module.exports : typeof import("./jsDeclarationsExportAssignedConstructorFunction")
+>module : { "\"jsDeclarationsExportAssignedConstructorFunction\"": typeof import("./jsDeclarationsExportAssignedConstructorFunction"); }
+>exports : typeof import("./jsDeclarationsExportAssignedConstructorFunction")
 >MyClass : () => void
 >function() {    this.x = 1} : () => void
 
@@ -22,9 +22,9 @@ module.exports.MyClass.prototype = {
 >module.exports.MyClass.prototype = {    a: function() {    }} : { a: () => void; }
 >module.exports.MyClass.prototype : any
 >module.exports.MyClass : () => void
->module.exports : typeof import("jsDeclarationsExportAssignedConstructorFunction")
->module : { "\"jsDeclarationsExportAssignedConstructorFunction\"": typeof import("jsDeclarationsExportAssignedConstructorFunction"); }
->exports : typeof import("jsDeclarationsExportAssignedConstructorFunction")
+>module.exports : typeof import("./jsDeclarationsExportAssignedConstructorFunction")
+>module : { "\"jsDeclarationsExportAssignedConstructorFunction\"": typeof import("./jsDeclarationsExportAssignedConstructorFunction"); }
+>exports : typeof import("./jsDeclarationsExportAssignedConstructorFunction")
 >MyClass : () => void
 >prototype : any
 >{    a: function() {    }} : { a: () => void; }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols
index 4d591c1910..d143b54084 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols
@@ -4,7 +4,7 @@
 const Obj = require("./obj");
 >Obj : Symbol(Obj, Decl(index.js, 0, 5))
 >require : Symbol(require)
->"./obj" : Symbol("obj", Decl(obj.js, 0, 0))
+>"./obj" : Symbol("./obj", Decl(obj.js, 0, 0))
 
 class Container {
 >Container : Symbol(Container, Decl(index.js, 0, 29))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols.diff
index b3fc6d29e6..228570911d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsDeclarationsExportAssignedVisibility.symbols
 +++ new.jsDeclarationsExportAssignedVisibility.symbols
-@@= skipped -18, +18 lines =@@
+@@= skipped -3, +3 lines =@@
+ const Obj = require("./obj");
+ >Obj : Symbol(Obj, Decl(index.js, 0, 5))
+ >require : Symbol(require)
+->"./obj" : Symbol("obj", Decl(obj.js, 0, 0))
++>"./obj" : Symbol("./obj", Decl(obj.js, 0, 0))
+
+ class Container {
+ >Container : Symbol(Container, Decl(index.js, 0, 29))
+@@= skipped -15, +15 lines =@@
  }
 
  module.exports = Container;
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols
index d03e2da5ce..34b181bc61 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols
@@ -9,7 +9,7 @@ function foo() {
 >module.exports : Symbol(export=, Decl(index.js, 1, 16))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(index.js, 1, 16))
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >o : Symbol(o, Decl(index.js, 2, 41))
 
         return (o == null) ? create(base) : defineProperties(Object(o), descriptors);
@@ -24,7 +24,7 @@ function foo() {
         // I have no idea what to put here
     }
     exports.methods = m;
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >m : Symbol(m, Decl(index.js, 5, 9))
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols.diff
index 10a3348251..1e03d05822 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols.diff
@@ -9,14 +9,17 @@
 +>module.exports : Symbol(export=, Decl(index.js, 1, 16))
 +>module : Symbol(module.exports)
  >exports : Symbol(export=, Decl(index.js, 1, 16))
- >exports : Symbol("index", Decl(index.js, 0, 0))
+->exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >o : Symbol(o, Decl(index.js, 2, 41))
+
+         return (o == null) ? create(base) : defineProperties(Object(o), descriptors);
 @@= skipped -18, +18 lines =@@
          // I have no idea what to put here
      }
      exports.methods = m;
 ->exports : Symbol(methods, Decl(index.js, 7, 5))
 ->methods : Symbol(methods, Decl(index.js, 7, 5))
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >m : Symbol(m, Decl(index.js, 5, 9))
  }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.types
index 65bb773a69..cd082c13a1 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.types
@@ -40,7 +40,7 @@ function foo() {
     exports.methods = m;
 >exports.methods = m : () => void
 >exports.methods : any
->exports : typeof import("index")
+>exports : typeof import(".")
 >methods : any
 >m : () => void
 }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols
index d5eac93130..ae8eede27d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols
@@ -78,9 +78,9 @@ const ns = require("./cls");
 
 module.exports.ns = ns;
 >module.exports.ns : Symbol(ns, Decl(cjs3.js, 0, 28))
->module.exports : Symbol("cjs3", Decl(cjs3.js, 0, 0))
+>module.exports : Symbol("./cjs3", Decl(cjs3.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("cjs3", Decl(cjs3.js, 0, 0))
+>exports : Symbol("./cjs3", Decl(cjs3.js, 0, 0))
 >ns : Symbol(ns, Decl(cjs3.js, 0, 28))
 >ns : Symbol(ns, Decl(cjs3.js, 0, 5))
 
@@ -92,9 +92,9 @@ const ns = require("./cls");
 
 module.exports.names = ns;
 >module.exports.names : Symbol(names, Decl(cjs4.js, 0, 28))
->module.exports : Symbol("cjs4", Decl(cjs4.js, 0, 0))
+>module.exports : Symbol("./cjs4", Decl(cjs4.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("cjs4", Decl(cjs4.js, 0, 0))
+>exports : Symbol("./cjs4", Decl(cjs4.js, 0, 0))
 >names : Symbol(names, Decl(cjs4.js, 0, 28))
 >ns : Symbol(ns, Decl(cjs4.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols.diff
index 164e13b025..0fabbbc1b4 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols.diff
@@ -33,9 +33,9 @@
 ->module.exports : Symbol(ns, Decl(cjs3.js, 0, 28))
 ->module : Symbol(module, Decl(cjs3.js, 0, 28))
 ->exports : Symbol(module.exports, Decl(cjs3.js, 0, 0))
-+>module.exports : Symbol("cjs3", Decl(cjs3.js, 0, 0))
++>module.exports : Symbol("./cjs3", Decl(cjs3.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("cjs3", Decl(cjs3.js, 0, 0))
++>exports : Symbol("./cjs3", Decl(cjs3.js, 0, 0))
  >ns : Symbol(ns, Decl(cjs3.js, 0, 28))
  >ns : Symbol(ns, Decl(cjs3.js, 0, 5))
 
@@ -46,8 +46,8 @@
 ->module.exports : Symbol(names, Decl(cjs4.js, 0, 28))
 ->module : Symbol(module, Decl(cjs4.js, 0, 28))
 ->exports : Symbol(module.exports, Decl(cjs4.js, 0, 0))
-+>module.exports : Symbol("cjs4", Decl(cjs4.js, 0, 0))
++>module.exports : Symbol("./cjs4", Decl(cjs4.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("cjs4", Decl(cjs4.js, 0, 0))
++>exports : Symbol("./cjs4", Decl(cjs4.js, 0, 0))
  >names : Symbol(names, Decl(cjs4.js, 0, 28))
  >ns : Symbol(ns, Decl(cjs4.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.types
index c6d8f3300d..51fb5244d2 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.types
@@ -85,9 +85,9 @@ const ns = require("./cls");
 module.exports.ns = ns;
 >module.exports.ns = ns : typeof ns
 >module.exports.ns : typeof ns
->module.exports : typeof import("cjs3")
->module : { "\"cjs3\"": typeof import("cjs3"); }
->exports : typeof import("cjs3")
+>module.exports : typeof import("./cjs3")
+>module : { "\"cjs3\"": typeof import("./cjs3"); }
+>exports : typeof import("./cjs3")
 >ns : typeof ns
 >ns : typeof ns
 
@@ -101,9 +101,9 @@ const ns = require("./cls");
 module.exports.names = ns;
 >module.exports.names = ns : typeof ns
 >module.exports.names : typeof ns
->module.exports : typeof import("cjs4")
->module : { "\"cjs4\"": typeof import("cjs4"); }
->exports : typeof import("cjs4")
+>module.exports : typeof import("./cjs4")
+>module : { "\"cjs4\"": typeof import("./cjs4"); }
+>exports : typeof import("./cjs4")
 >names : typeof ns
 >ns : typeof ns
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSpecifierNonlocal.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSpecifierNonlocal.types
index 65fa045ae0..8e64a3ced2 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSpecifierNonlocal.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSpecifierNonlocal.types
@@ -9,7 +9,7 @@ export class OtherThing {}
 
 === index.js ===
 export { Thing, OtherThing as default } from "./source";
->Thing : typeof import("source").Thing
->OtherThing : typeof import("source").OtherThing
->default : typeof import("source").OtherThing
+>Thing : typeof import("./source").Thing
+>OtherThing : typeof import("./source").OtherThing
+>default : typeof import("./source").OtherThing
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols
index 6a59046478..535baf9126 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols
@@ -5,7 +5,7 @@
 const errors = require("./errors");
 >errors : Symbol(errors, Decl(index.js, 1, 5))
 >require : Symbol(require)
->"./errors" : Symbol("utils/errors", Decl(errors.js, 0, 0))
+>"./errors" : Symbol("./errors", Decl(errors.js, 0, 0))
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(index.js, 1, 35))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols.diff
index 84b38aaf06..7a4e2c7735 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols.diff
@@ -5,7 +5,7 @@
  >errors : Symbol(errors, Decl(index.js, 1, 5))
  >require : Symbol(require)
 ->"./errors" : Symbol(errors, Decl(errors.js, 0, 0))
-+>"./errors" : Symbol("utils/errors", Decl(errors.js, 0, 0))
++>"./errors" : Symbol("./errors", Decl(errors.js, 0, 0))
 
  module.exports = {
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols
index d198a27aee..0c79b73a5b 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols
@@ -3,40 +3,40 @@
 === index.js ===
 module.exports.a = function a() {}
 >module.exports.a : Symbol(a, Decl(index.js, 0, 0))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >a : Symbol(a, Decl(index.js, 0, 0))
 >a : Symbol(a, Decl(index.js, 0, 18))
 
 module.exports.b = function b() {}
 >module.exports.b : Symbol(b, Decl(index.js, 0, 34))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >b : Symbol(b, Decl(index.js, 0, 34))
 >b : Symbol(b, Decl(index.js, 2, 18))
 
 module.exports.b.cat = "cat";
 >module.exports.b : Symbol(b, Decl(index.js, 0, 34))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >b : Symbol(b, Decl(index.js, 0, 34))
 
 module.exports.c = function c() {}
 >module.exports.c : Symbol(c, Decl(index.js, 3, 29))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >c : Symbol(c, Decl(index.js, 3, 29))
 >c : Symbol(c, Decl(index.js, 5, 18))
 
 module.exports.c.Cls = class {}
 >module.exports.c : Symbol(c, Decl(index.js, 3, 29))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >c : Symbol(c, Decl(index.js, 3, 29))
 
 /**
@@ -46,9 +46,9 @@ module.exports.c.Cls = class {}
  */
 module.exports.d = function d(a, b) { return /** @type {*} */(null); }
 >module.exports.d : Symbol(d, Decl(index.js, 6, 31))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >d : Symbol(d, Decl(index.js, 6, 31))
 >d : Symbol(d, Decl(index.js, 13, 18))
 >a : Symbol(a, Decl(index.js, 13, 30))
@@ -62,9 +62,9 @@ module.exports.d = function d(a, b) { return /** @type {*} */(null); }
  */
 module.exports.e = function e(a, b) { return /** @type {*} */(null); }
 >module.exports.e : Symbol(e, Decl(index.js, 13, 70))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >e : Symbol(e, Decl(index.js, 13, 70))
 >e : Symbol(e, Decl(index.js, 21, 18))
 >a : Symbol(a, Decl(index.js, 21, 30))
@@ -76,9 +76,9 @@ module.exports.e = function e(a, b) { return /** @type {*} */(null); }
  */
 module.exports.f = function f(a) {
 >module.exports.f : Symbol(f, Decl(index.js, 21, 70))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70))
 >f : Symbol(f, Decl(index.js, 27, 18))
 >a : Symbol(a, Decl(index.js, 27, 30))
@@ -88,14 +88,14 @@ module.exports.f = function f(a) {
 }
 module.exports.f.self = module.exports.f;
 >module.exports.f : Symbol(f, Decl(index.js, 21, 70))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70))
 >module.exports.f : Symbol(f, Decl(index.js, 21, 70))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70))
 
 /**
@@ -118,9 +118,9 @@ function g(a, b) {
 
 module.exports.g = g;
 >module.exports.g : Symbol(g, Decl(index.js, 38, 1))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >g : Symbol(g, Decl(index.js, 38, 1))
 >g : Symbol(g, Decl(index.js, 30, 41))
 
@@ -144,50 +144,50 @@ function hh(a, b) {
 
 module.exports.h = hh;
 >module.exports.h : Symbol(h, Decl(index.js, 48, 1))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >h : Symbol(h, Decl(index.js, 48, 1))
 >hh : Symbol(hh, Decl(index.js, 40, 21))
 
 module.exports.i = function i() {}
 >module.exports.i : Symbol(i, Decl(index.js, 50, 22))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >i : Symbol(i, Decl(index.js, 50, 22))
 >i : Symbol(i, Decl(index.js, 52, 18))
 
 module.exports.ii = module.exports.i;
 >module.exports.ii : Symbol(ii, Decl(index.js, 52, 34))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >ii : Symbol(ii, Decl(index.js, 52, 34))
 >module.exports.i : Symbol(i, Decl(index.js, 50, 22))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >i : Symbol(i, Decl(index.js, 50, 22))
 
 // note that this last one doesn't make much sense in cjs, since exports aren't hoisted bindings
 module.exports.jj = module.exports.j;
 >module.exports.jj : Symbol(jj, Decl(index.js, 53, 37))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >jj : Symbol(jj, Decl(index.js, 53, 37))
 >module.exports.j : Symbol(j, Decl(index.js, 56, 37))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >j : Symbol(j, Decl(index.js, 56, 37))
 
 module.exports.j = function j() {}
 >module.exports.j : Symbol(j, Decl(index.js, 56, 37))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >j : Symbol(j, Decl(index.js, 56, 37))
 >j : Symbol(j, Decl(index.js, 57, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols.diff
index 004154e4b3..31ac5479cb 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols.diff
@@ -7,9 +7,9 @@
 ->module.exports : Symbol(a, Decl(index.js, 0, 0))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >a : Symbol(a, Decl(index.js, 0, 0))
  >a : Symbol(a, Decl(index.js, 0, 18))
 
@@ -20,9 +20,9 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->b : Symbol(b, Decl(index.js, 0, 34), Decl(index.js, 3, 15))
 +>module.exports.b : Symbol(b, Decl(index.js, 0, 34))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>b : Symbol(b, Decl(index.js, 0, 34))
  >b : Symbol(b, Decl(index.js, 2, 18))
 
@@ -35,9 +35,9 @@
 ->b : Symbol(b, Decl(index.js, 0, 34), Decl(index.js, 3, 15))
 ->cat : Symbol(b.cat, Decl(index.js, 2, 34))
 +>module.exports.b : Symbol(b, Decl(index.js, 0, 34))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>b : Symbol(b, Decl(index.js, 0, 34))
 
  module.exports.c = function c() {}
@@ -47,9 +47,9 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->c : Symbol(c, Decl(index.js, 3, 29), Decl(index.js, 6, 15))
 +>module.exports.c : Symbol(c, Decl(index.js, 3, 29))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>c : Symbol(c, Decl(index.js, 3, 29))
  >c : Symbol(c, Decl(index.js, 5, 18))
 
@@ -62,9 +62,9 @@
 ->c : Symbol(c, Decl(index.js, 3, 29), Decl(index.js, 6, 15))
 ->Cls : Symbol(c.Cls, Decl(index.js, 5, 34))
 +>module.exports.c : Symbol(c, Decl(index.js, 3, 29))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>c : Symbol(c, Decl(index.js, 3, 29))
 
  /**
@@ -76,9 +76,9 @@
 ->module.exports : Symbol(d, Decl(index.js, 6, 31))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >d : Symbol(d, Decl(index.js, 6, 31))
  >d : Symbol(d, Decl(index.js, 13, 18))
  >a : Symbol(a, Decl(index.js, 13, 30))
@@ -89,9 +89,9 @@
 ->module.exports : Symbol(e, Decl(index.js, 13, 70))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >e : Symbol(e, Decl(index.js, 13, 70))
  >e : Symbol(e, Decl(index.js, 21, 18))
  >a : Symbol(a, Decl(index.js, 21, 30))
@@ -105,9 +105,9 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 +>module.exports.f : Symbol(f, Decl(index.js, 21, 70))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>f : Symbol(f, Decl(index.js, 21, 70))
  >f : Symbol(f, Decl(index.js, 27, 18))
  >a : Symbol(a, Decl(index.js, 27, 30))
@@ -129,14 +129,14 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 +>module.exports.f : Symbol(f, Decl(index.js, 21, 70))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>f : Symbol(f, Decl(index.js, 21, 70))
 +>module.exports.f : Symbol(f, Decl(index.js, 21, 70))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>f : Symbol(f, Decl(index.js, 21, 70))
 
  /**
@@ -148,9 +148,9 @@
 ->module.exports : Symbol(g, Decl(index.js, 38, 1))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >g : Symbol(g, Decl(index.js, 38, 1))
  >g : Symbol(g, Decl(index.js, 30, 41))
 
@@ -161,9 +161,9 @@
 ->module.exports : Symbol(h, Decl(index.js, 48, 1))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >h : Symbol(h, Decl(index.js, 48, 1))
  >hh : Symbol(hh, Decl(index.js, 40, 21))
 
@@ -172,9 +172,9 @@
 ->module.exports : Symbol(i, Decl(index.js, 50, 22))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >i : Symbol(i, Decl(index.js, 50, 22))
  >i : Symbol(i, Decl(index.js, 52, 18))
 
@@ -183,17 +183,17 @@
 ->module.exports : Symbol(ii, Decl(index.js, 52, 34))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >ii : Symbol(ii, Decl(index.js, 52, 34))
  >module.exports.i : Symbol(i, Decl(index.js, 50, 22))
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >i : Symbol(i, Decl(index.js, 50, 22))
 
  // note that this last one doesn't make much sense in cjs, since exports aren't hoisted bindings
@@ -202,17 +202,17 @@
 ->module.exports : Symbol(jj, Decl(index.js, 53, 37))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >jj : Symbol(jj, Decl(index.js, 53, 37))
  >module.exports.j : Symbol(j, Decl(index.js, 56, 37))
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >j : Symbol(j, Decl(index.js, 56, 37))
 
  module.exports.j = function j() {}
@@ -220,8 +220,8 @@
 ->module.exports : Symbol(j, Decl(index.js, 56, 37))
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
  >j : Symbol(j, Decl(index.js, 56, 37))
  >j : Symbol(j, Decl(index.js, 57, 18))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.types
index d25931180d..9da702ec33 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.types
@@ -4,9 +4,9 @@
 module.exports.a = function a() {}
 >module.exports.a = function a() {} : () => void
 >module.exports.a : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >a : () => void
 >function a() {} : () => void
 >a : () => void
@@ -14,9 +14,9 @@ module.exports.a = function a() {}
 module.exports.b = function b() {}
 >module.exports.b = function b() {} : () => void
 >module.exports.b : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >b : () => void
 >function b() {} : () => void
 >b : () => void
@@ -25,9 +25,9 @@ module.exports.b.cat = "cat";
 >module.exports.b.cat = "cat" : "cat"
 >module.exports.b.cat : any
 >module.exports.b : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >b : () => void
 >cat : any
 >"cat" : "cat"
@@ -35,9 +35,9 @@ module.exports.b.cat = "cat";
 module.exports.c = function c() {}
 >module.exports.c = function c() {} : () => void
 >module.exports.c : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >c : () => void
 >function c() {} : () => void
 >c : () => void
@@ -46,9 +46,9 @@ module.exports.c.Cls = class {}
 >module.exports.c.Cls = class {} : typeof Cls
 >module.exports.c.Cls : any
 >module.exports.c : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >c : () => void
 >Cls : any
 >class {} : typeof Cls
@@ -61,9 +61,9 @@ module.exports.c.Cls = class {}
 module.exports.d = function d(a, b) { return /** @type {*} */(null); }
 >module.exports.d = function d(a, b) { return /** @type {*} */(null); } : (a: any, b: any) => any
 >module.exports.d : (a: any, b: any) => any
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >d : (a: any, b: any) => any
 >function d(a, b) { return /** @type {*} */(null); } : (a: any, b: any) => any
 >d : (a: any, b: any) => any
@@ -80,9 +80,9 @@ module.exports.d = function d(a, b) { return /** @type {*} */(null); }
 module.exports.e = function e(a, b) { return /** @type {*} */(null); }
 >module.exports.e = function e(a, b) { return /** @type {*} */(null); } : (a: any, b: any) => any
 >module.exports.e : (a: any, b: any) => any
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >e : (a: any, b: any) => any
 >function e(a, b) { return /** @type {*} */(null); } : (a: any, b: any) => any
 >e : (a: any, b: any) => any
@@ -97,9 +97,9 @@ module.exports.e = function e(a, b) { return /** @type {*} */(null); }
 module.exports.f = function f(a) {
 >module.exports.f = function f(a) {    return a;} : (a: any) => any
 >module.exports.f : (a: any) => any
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >f : (a: any) => any
 >function f(a) {    return a;} : (a: any) => any
 >f : (a: any) => any
@@ -112,15 +112,15 @@ module.exports.f.self = module.exports.f;
 >module.exports.f.self = module.exports.f : (a: any) => any
 >module.exports.f.self : any
 >module.exports.f : (a: any) => any
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >f : (a: any) => any
 >self : any
 >module.exports.f : (a: any) => any
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >f : (a: any) => any
 
 /**
@@ -146,9 +146,9 @@ function g(a, b) {
 module.exports.g = g;
 >module.exports.g = g : (a: { x: string; }, b: { y: any; }) => any
 >module.exports.g : (a: { x: string; }, b: { y: any; }) => any
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >g : (a: { x: string; }, b: { y: any; }) => any
 >g : (a: { x: string; }, b: { y: any; }) => any
 
@@ -175,18 +175,18 @@ function hh(a, b) {
 module.exports.h = hh;
 >module.exports.h = hh : (a: { x: string; }, b: { y: any; }) => any
 >module.exports.h : (a: { x: string; }, b: { y: any; }) => any
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >h : (a: { x: string; }, b: { y: any; }) => any
 >hh : (a: { x: string; }, b: { y: any; }) => any
 
 module.exports.i = function i() {}
 >module.exports.i = function i() {} : () => void
 >module.exports.i : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >i : () => void
 >function i() {} : () => void
 >i : () => void
@@ -194,36 +194,36 @@ module.exports.i = function i() {}
 module.exports.ii = module.exports.i;
 >module.exports.ii = module.exports.i : () => void
 >module.exports.ii : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >ii : () => void
 >module.exports.i : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >i : () => void
 
 // note that this last one doesn't make much sense in cjs, since exports aren't hoisted bindings
 module.exports.jj = module.exports.j;
 >module.exports.jj = module.exports.j : () => void
 >module.exports.jj : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >jj : () => void
 >module.exports.j : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >j : () => void
 
 module.exports.j = function j() {}
 >module.exports.j = function j() {} : () => void
 >module.exports.j : () => void
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >j : () => void
 >function j() {} : () => void
 >j : () => void
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
index 3882b91669..07c57fcde7 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
@@ -4,7 +4,7 @@
 const {myTypes} = require('./file.js');
 >myTypes : Symbol(myTypes, Decl(file2.js, 0, 7))
 >require : Symbol(require)
->'./file.js' : Symbol("file", Decl(file.js, 0, 0))
+>'./file.js' : Symbol("./file.js", Decl(file.js, 0, 0))
 
 /**
  * @namespace testFnTypes
@@ -71,7 +71,7 @@ const myTypes = {
 
 exports.myTypes = myTypes;
 >exports.myTypes : Symbol(myTypes, Decl(file.js, 9, 4), Decl(file.js, 7, 2))
->exports : Symbol("file", Decl(file.js, 0, 0))
+>exports : Symbol("./file", Decl(file.js, 0, 0))
 >myTypes : Symbol(myTypes, Decl(file.js, 9, 4), Decl(file.js, 7, 2))
 >myTypes : Symbol(myTypes, Decl(file.js, 5, 5), Decl(file.js, 9, 4), Decl(file.js, 12, 3), Decl(file.js, 17, 4))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols.diff
index a6952ae113..6ac9907433 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
 +++ new.jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
-@@= skipped -11, +11 lines =@@
+@@= skipped -3, +3 lines =@@
+ const {myTypes} = require('./file.js');
+ >myTypes : Symbol(myTypes, Decl(file2.js, 0, 7))
+ >require : Symbol(require)
+->'./file.js' : Symbol("file", Decl(file.js, 0, 0))
++>'./file.js' : Symbol("./file.js", Decl(file.js, 0, 0))
+
+ /**
+  * @namespace testFnTypes
+@@= skipped -8, +8 lines =@@
   * @type {Object<string,*>}
   */
  const testFnTypes = {
@@ -40,6 +49,6 @@
 ->myTypes : Symbol(myTypes, Decl(file.js, 7, 2))
 ->myTypes : Symbol(myTypes, Decl(file.js, 5, 5), Decl(file.js, 9, 50), Decl(file.js, 12, 12), Decl(file.js, 17, 38))
 +>exports.myTypes : Symbol(myTypes, Decl(file.js, 9, 4), Decl(file.js, 7, 2))
-+>exports : Symbol("file", Decl(file.js, 0, 0))
++>exports : Symbol("./file", Decl(file.js, 0, 0))
 +>myTypes : Symbol(myTypes, Decl(file.js, 9, 4), Decl(file.js, 7, 2))
 +>myTypes : Symbol(myTypes, Decl(file.js, 5, 5), Decl(file.js, 9, 4), Decl(file.js, 12, 3), Decl(file.js, 17, 4))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
index 184c70b88d..829b051a9f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
@@ -3,7 +3,7 @@
 === file2.js ===
 const {myTypes} = require('./file.js');
 >myTypes : any
->require('./file.js') : typeof import("file")
+>require('./file.js') : typeof import("./file.js")
 >require : any
 >'./file.js' : "./file.js"
 
@@ -82,7 +82,7 @@ const myTypes = {
 exports.myTypes = myTypes;
 >exports.myTypes = myTypes : any
 >exports.myTypes : any
->exports : typeof import("file")
+>exports : typeof import("./file")
 >myTypes : any
 >myTypes : any
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols
index 513254653c..e7aa63364e 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols
@@ -6,7 +6,7 @@ const { SomeClass, SomeClass: Another } = require('./lib');
 >SomeClass : Symbol(SomeClass, Decl(lib.js, 14, 8))
 >Another : Symbol(Another, Decl(main.js, 0, 18))
 >require : Symbol(require)
->'./lib' : Symbol("lib", Decl(lib.js, 0, 0))
+>'./lib' : Symbol("./lib", Decl(lib.js, 0, 0))
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(main.js, 0, 59))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols.diff
index 36e6c88bd9..aa14bd03a7 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols.diff
@@ -1,7 +1,11 @@
 --- old.jsDeclarationsReexportedCjsAlias.symbols
 +++ new.jsDeclarationsReexportedCjsAlias.symbols
-@@= skipped -8, +8 lines =@@
- >'./lib' : Symbol("lib", Decl(lib.js, 0, 0))
+@@= skipped -5, +5 lines =@@
+ >SomeClass : Symbol(SomeClass, Decl(lib.js, 14, 8))
+ >Another : Symbol(Another, Decl(main.js, 0, 18))
+ >require : Symbol(require)
+->'./lib' : Symbol("lib", Decl(lib.js, 0, 0))
++>'./lib' : Symbol("./lib", Decl(lib.js, 0, 0))
 
  module.exports = {
 ->module.exports : Symbol(module.exports, Decl(main.js, 0, 0))
@@ -13,7 +17,7 @@
 
      SomeClass,
  >SomeClass : Symbol(SomeClass, Decl(main.js, 2, 18))
-@@= skipped -34, +34 lines =@@
+@@= skipped -37, +37 lines =@@
  }
 
  module.exports = {
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
index 45beb47533..f9deab1e81 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
@@ -4,7 +4,7 @@
 const {Render} = require("./index");
 >Render : Symbol(Render, Decl(test.js, 0, 7))
 >require : Symbol(require)
->"./index" : Symbol("index", Decl(index.js, 0, 0))
+>"./index" : Symbol("./index", Decl(index.js, 0, 0))
 
 let render = new Render();
 >render : Symbol(render, Decl(test.js, 1, 3))
@@ -45,7 +45,7 @@ module.exports = { Rectangle };
 const {Rectangle} = require('./rectangle');
 >Rectangle : Symbol(Rectangle, Decl(index.js, 0, 7))
 >require : Symbol(require)
->'./rectangle' : Symbol("rectangle", Decl(rectangle.js, 0, 0))
+>'./rectangle' : Symbol("./rectangle", Decl(rectangle.js, 0, 0))
 
 class Render {
 >Render : Symbol(Render, Decl(index.js, 0, 43))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols.diff
index 37af48659b..453a5fce55 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsDeclarationsReferenceToClassInstanceCrossFile.symbols
 +++ new.jsDeclarationsReferenceToClassInstanceCrossFile.symbols
-@@= skipped -35, +35 lines =@@
+@@= skipped -3, +3 lines =@@
+ const {Render} = require("./index");
+ >Render : Symbol(Render, Decl(test.js, 0, 7))
+ >require : Symbol(require)
+->"./index" : Symbol("index", Decl(index.js, 0, 0))
++>"./index" : Symbol("./index", Decl(index.js, 0, 0))
+
+ let render = new Render();
+ >render : Symbol(render, Decl(test.js, 1, 3))
+@@= skipped -32, +32 lines =@@
  }
 
  module.exports = { Rectangle };
@@ -13,6 +22,14 @@
  >Rectangle : Symbol(Rectangle, Decl(rectangle.js, 6, 18))
 
  === index.js ===
+ const {Rectangle} = require('./rectangle');
+ >Rectangle : Symbol(Rectangle, Decl(index.js, 0, 7))
+ >require : Symbol(require)
+->'./rectangle' : Symbol("rectangle", Decl(rectangle.js, 0, 0))
++>'./rectangle' : Symbol("./rectangle", Decl(rectangle.js, 0, 0))
+
+ class Render {
+ >Render : Symbol(Render, Decl(index.js, 0, 43))
 @@= skipped -50, +50 lines =@@
  }
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.types
index 3cfe7c8b06..b0085600d5 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.types
@@ -5,7 +5,7 @@ const{ a, m } = require("./something").o;
 >a : number
 >m : number
 >require("./something").o : { a: number; m: number; }
->require("./something") : typeof import("something")
+>require("./something") : typeof import("./something")
 >require : any
 >"./something" : "./something"
 >o : { a: number; m: number; }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols
index 5e1941f2a7..b09ad4ad4c 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols
@@ -11,16 +11,16 @@ const Something = require("fs").Something;
 
 module.exports.A = {}
 >module.exports.A : Symbol(A, Decl(index.js, 2, 42))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >A : Symbol(A, Decl(index.js, 2, 42))
 
 module.exports.A.B = {
 >module.exports.A : Symbol(A, Decl(index.js, 2, 42))
->module.exports : Symbol("index", Decl(index.js, 0, 0))
+>module.exports : Symbol(".", Decl(index.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("index", Decl(index.js, 0, 0))
+>exports : Symbol(".", Decl(index.js, 0, 0))
 >A : Symbol(A, Decl(index.js, 2, 42))
 
     thing: new Something()
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols.diff
index 59f65b82ab..698c6f781d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols.diff
@@ -14,9 +14,9 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->A : Symbol(A, Decl(index.js, 2, 42), Decl(index.js, 4, 15))
 +>module.exports.A : Symbol(A, Decl(index.js, 2, 42))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>A : Symbol(A, Decl(index.js, 2, 42))
 
  module.exports.A.B = {
@@ -28,9 +28,9 @@
 ->A : Symbol(A, Decl(index.js, 2, 42), Decl(index.js, 4, 15))
 ->B : Symbol(A.B, Decl(index.js, 3, 21))
 +>module.exports.A : Symbol(A, Decl(index.js, 2, 42))
-+>module.exports : Symbol("index", Decl(index.js, 0, 0))
++>module.exports : Symbol(".", Decl(index.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("index", Decl(index.js, 0, 0))
++>exports : Symbol(".", Decl(index.js, 0, 0))
 +>A : Symbol(A, Decl(index.js, 2, 42))
 
      thing: new Something()
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.types
index b33d808def..488d21dcb7 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.types
@@ -14,9 +14,9 @@ const Something = require("fs").Something;
 module.exports.A = {}
 >module.exports.A = {} : {}
 >module.exports.A : {}
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >A : {}
 >{} : {}
 
@@ -24,9 +24,9 @@ module.exports.A.B = {
 >module.exports.A.B = {    thing: new Something()} : { thing: import("fs").Something; }
 >module.exports.A.B : any
 >module.exports.A : {}
->module.exports : typeof import("index")
->module : { "\"index\"": typeof import("index"); }
->exports : typeof import("index")
+>module.exports : typeof import(".")
+>module : { "\"index\"": typeof import("."); }
+>exports : typeof import(".")
 >A : {}
 >B : any
 >{    thing: new Something()} : { thing: import("fs").Something; }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types
index 09d2acf0b9..49227579be 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.types
@@ -36,7 +36,7 @@ class Wrap {
      * @param {Conn} c
      */
     constructor(c) {
->c : import("conn")
+>c : import("./conn")
 
         this.connItem = c.item;
 >this.connItem = c.item : number
@@ -44,7 +44,7 @@ class Wrap {
 >this : this
 >connItem : any
 >c.item : number
->c : import("conn")
+>c : import("./conn")
 >item : number
 
         /** @type {import("./conn").Whatever} */
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols
index 466a84dc81..f0f9634fef 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols
@@ -4,7 +4,7 @@
 const LazySet = require("./LazySet");
 >LazySet : Symbol(LazySet, Decl(index.js, 0, 5))
 >require : Symbol(require)
->"./LazySet" : Symbol("LazySet", Decl(LazySet.js, 0, 0))
+>"./LazySet" : Symbol("./LazySet", Decl(LazySet.js, 0, 0))
 
 /** @type {LazySet} */
 const stringSet = undefined;
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols.diff
index 8079b204f3..791fdb516d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsDeclarationsTypedefAndLatebound.symbols
 +++ new.jsDeclarationsTypedefAndLatebound.symbols
-@@= skipped -40, +40 lines =@@
+@@= skipped -3, +3 lines =@@
+ const LazySet = require("./LazySet");
+ >LazySet : Symbol(LazySet, Decl(index.js, 0, 5))
+ >require : Symbol(require)
+->"./LazySet" : Symbol("LazySet", Decl(LazySet.js, 0, 0))
++>"./LazySet" : Symbol("./LazySet", Decl(LazySet.js, 0, 0))
+
+ /** @type {LazySet} */
+ const stringSet = undefined;
+@@= skipped -37, +37 lines =@@
  }
 
  module.exports = LazySet;
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
index 383deeead4..b7cf1639f4 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
@@ -5,7 +5,7 @@ const {taskGroups, taskNameToGroup} = require('./module.js');
 >taskGroups : Symbol(taskGroups, Decl(index.js, 0, 7))
 >taskNameToGroup : Symbol(taskNameToGroup, Decl(index.js, 0, 18))
 >require : Symbol(require)
->'./module.js' : Symbol("module", Decl(module.js, 0, 0))
+>'./module.js' : Symbol("./module.js", Decl(module.js, 0, 0))
 
 /** @typedef {import('./module.js').TaskGroup} TaskGroup */
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols.diff
index ec22f5af98..909e096519 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsDeclarationsTypedefPropertyAndExportAssignment.symbols
 +++ new.jsDeclarationsTypedefPropertyAndExportAssignment.symbols
-@@= skipped -29, +29 lines =@@
+@@= skipped -4, +4 lines =@@
+ >taskGroups : Symbol(taskGroups, Decl(index.js, 0, 7))
+ >taskNameToGroup : Symbol(taskNameToGroup, Decl(index.js, 0, 18))
+ >require : Symbol(require)
+->'./module.js' : Symbol("module", Decl(module.js, 0, 0))
++>'./module.js' : Symbol("./module.js", Decl(module.js, 0, 0))
+
+ /** @typedef {import('./module.js').TaskGroup} TaskGroup */
+
+@@= skipped -25, +25 lines =@@
  }
 
  module.exports = MainThreadTasks;
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsUniqueSymbolUsage.types b/testdata/baselines/reference/submodule/conformance/jsDeclarationsUniqueSymbolUsage.types
index 90432a73e3..78d910083a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsUniqueSymbolUsage.types
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsUniqueSymbolUsage.types
@@ -16,10 +16,10 @@ export const kSymbol = Symbol("my-symbol");
  * @param {import('./a').WithSymbol} value 
  */
 export function b(value) {
->b : (value: import("a").WithSymbol) => import("a").WithSymbol
->value : import("a").WithSymbol
+>b : (value: import("./a").WithSymbol) => import("./a").WithSymbol
+>value : import("./a").WithSymbol
 
     return value;
->value : import("a").WithSymbol
+>value : import("./a").WithSymbol
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols b/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols
index 7961257a02..bdf2a053a7 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols
@@ -15,7 +15,7 @@ c.chunk;
 const D = require("./mod1");
 >D : Symbol(D, Decl(use.js, 6, 5))
 >require : Symbol(require, Decl(types.d.ts, 0, 0))
->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
+>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 /** @type {D} */
 var d;
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols.diff
index 58bdbe81a5..75884017fc 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsdocImportType.symbols
 +++ new.jsdocImportType.symbols
-@@= skipped -50, +50 lines =@@
+@@= skipped -14, +14 lines =@@
+ const D = require("./mod1");
+ >D : Symbol(D, Decl(use.js, 6, 5))
+ >require : Symbol(require, Decl(types.d.ts, 0, 0))
+->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
++>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ /** @type {D} */
+ var d;
+@@= skipped -36, +36 lines =@@
      }
  }
  module.exports = Chunk;
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols b/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols
index 5db36136d1..3b7471159b 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols
@@ -15,7 +15,7 @@ c.chunk;
 const D = require("./mod1");
 >D : Symbol(D, Decl(use.js, 6, 5))
 >require : Symbol(require, Decl(types.d.ts, 0, 0))
->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
+>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 /** @type {D} */
 var d;
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols.diff
index eaf50f13ef..6faf644df7 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols.diff
@@ -1,6 +1,15 @@
 --- old.jsdocImportType2.symbols
 +++ new.jsdocImportType2.symbols
-@@= skipped -40, +40 lines =@@
+@@= skipped -14, +14 lines =@@
+ const D = require("./mod1");
+ >D : Symbol(D, Decl(use.js, 6, 5))
+ >require : Symbol(require, Decl(types.d.ts, 0, 0))
+->"./mod1" : Symbol("mod1", Decl(mod1.js, 0, 0))
++>"./mod1" : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ /** @type {D} */
+ var d;
+@@= skipped -26, +26 lines =@@
  === mod1.js ===
  /// <reference path='./types.d.ts'/>
  module.exports = class Chunk {
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols
index 260e541451..b3b8cda70e 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols
@@ -9,9 +9,9 @@ class C {
 }
 module.exports.C = C
 >module.exports.C : Symbol(C, Decl(mod1.js, 2, 1))
->module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >C : Symbol(C, Decl(mod1.js, 2, 1))
 >C : Symbol(C, Decl(mod1.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols.diff
index 58da185c0a..e17996d462 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols.diff
@@ -7,9 +7,9 @@
 ->module.exports : Symbol(C, Decl(mod1.js, 2, 1))
 ->module : Symbol(module, Decl(mod1.js, 2, 1))
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
-+>module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>module.exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
  >C : Symbol(C, Decl(mod1.js, 2, 1))
  >C : Symbol(C, Decl(mod1.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.types b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.types
index 9d3f172435..2e3a69fe0b 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.types
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.types
@@ -10,9 +10,9 @@ class C {
 module.exports.C = C
 >module.exports.C = C : typeof C
 >module.exports.C : typeof C
->module.exports : typeof import("mod1")
->module : { "\"mod1\"": typeof import("mod1"); }
->exports : typeof import("mod1")
+>module.exports : typeof import("./mod1")
+>module : { "\"mod1\"": typeof import("./mod1"); }
+>exports : typeof import("./mod1")
 >C : typeof C
 >C : typeof C
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocThisType.types b/testdata/baselines/reference/submodule/conformance/jsdocThisType.types
index c1972827c9..3070063327 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocThisType.types
+++ b/testdata/baselines/reference/submodule/conformance/jsdocThisType.types
@@ -13,13 +13,13 @@ export type M = (this: Foo) => void;
 === /a.js ===
 /** @type {import('./types').M} */
 export const f1 = function() {
->f1 : import("/types").M
->function() {    this.test();} : (this: import("/types").Foo) => void
+>f1 : import("./types").M
+>function() {    this.test();} : (this: import("./types").Foo) => void
 
     this.test();
 >this.test() : any
 >this.test : any
->this : import("/types").Foo
+>this : import("./types").Foo
 >test : any
 }
 
@@ -30,19 +30,19 @@ export function f2() {
     this.test();
 >this.test() : any
 >this.test : any
->this : import("/types").Foo
+>this : import("./types").Foo
 >test : any
 }
 
 /** @type {(this: import('./types').Foo) => void} */
 export const f3 = function() {
->f3 : (this: import("/types").Foo) => void
->function() {    this.test();} : (this: import("/types").Foo) => void
+>f3 : (this: import("./types").Foo) => void
+>function() {    this.test();} : (this: import("./types").Foo) => void
 
     this.test();
 >this.test() : any
 >this.test : any
->this : import("/types").Foo
+>this : import("./types").Foo
 >test : any
 }
 
@@ -53,7 +53,7 @@ export function f4() {
     this.test();
 >this.test() : any
 >this.test : any
->this : import("/types").Foo
+>this : import("./types").Foo
 >test : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols
index 033590b2aa..f31190b703 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols
@@ -26,9 +26,9 @@ mod.i(1)
 /** @param {number} n */
 exports.f = exports.g = function fg(n) {
 >exports.f : Symbol(f, Decl(mod.js, 0, 0))
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >f : Symbol(f, Decl(mod.js, 0, 0))
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >fg : Symbol(fg, Decl(mod.js, 1, 23))
 >n : Symbol(n, Decl(mod.js, 1, 36))
 
@@ -38,13 +38,13 @@ exports.f = exports.g = function fg(n) {
 /** @param {string} mom */
 module.exports.h = module.exports.i = function hi(mom) {
 >module.exports.h : Symbol(h, Decl(mod.js, 3, 1))
->module.exports : Symbol("mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >h : Symbol(h, Decl(mod.js, 3, 1))
->module.exports : Symbol("mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >hi : Symbol(hi, Decl(mod.js, 5, 37))
 >mom : Symbol(mom, Decl(mod.js, 5, 50))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols.diff
index 45429a4144..19d755d514 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols.diff
@@ -23,12 +23,12 @@
  exports.f = exports.g = function fg(n) {
  >exports.f : Symbol(f, Decl(mod.js, 0, 0))
 ->exports : Symbol(f, Decl(mod.js, 0, 0))
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >f : Symbol(f, Decl(mod.js, 0, 0))
 ->exports.g : Symbol(g, Decl(mod.js, 1, 11))
 ->exports : Symbol(g, Decl(mod.js, 1, 11))
 ->g : Symbol(g, Decl(mod.js, 1, 11))
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >fg : Symbol(fg, Decl(mod.js, 1, 23))
  >n : Symbol(n, Decl(mod.js, 1, 36))
 
@@ -39,17 +39,17 @@
 ->module.exports : Symbol(h, Decl(mod.js, 3, 1))
 ->module : Symbol(module, Decl(mod.js, 3, 1))
 ->exports : Symbol(module.exports, Decl(mod.js, 0, 0))
-+>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
++>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >h : Symbol(h, Decl(mod.js, 3, 1))
 ->module.exports.i : Symbol(i, Decl(mod.js, 5, 18))
 ->module.exports : Symbol(i, Decl(mod.js, 5, 18))
 ->module : Symbol(module, Decl(mod.js, 3, 1))
 ->exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 ->i : Symbol(i, Decl(mod.js, 5, 18))
-+>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
++>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >hi : Symbol(hi, Decl(mod.js, 5, 37))
  >mom : Symbol(mom, Decl(mod.js, 5, 50))
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.types b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.types
index 133edfdf46..59e1fe3f85 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.types
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.types
@@ -40,11 +40,11 @@ mod.i(1)
 exports.f = exports.g = function fg(n) {
 >exports.f = exports.g = function fg(n) {    return n + 1} : (n: any) => any
 >exports.f : (n: any) => any
->exports : typeof import("mod")
+>exports : typeof import("./mod")
 >f : (n: any) => any
 >exports.g = function fg(n) {    return n + 1} : (n: any) => any
 >exports.g : any
->exports : typeof import("mod")
+>exports : typeof import("./mod")
 >g : any
 >function fg(n) {    return n + 1} : (n: any) => any
 >fg : (n: any) => any
@@ -59,15 +59,15 @@ exports.f = exports.g = function fg(n) {
 module.exports.h = module.exports.i = function hi(mom) {
 >module.exports.h = module.exports.i = function hi(mom) {    return `hi, ${mom}!`;} : (mom: any) => string
 >module.exports.h : (mom: any) => string
->module.exports : typeof import("mod")
->module : { "\"mod\"": typeof import("mod"); }
->exports : typeof import("mod")
+>module.exports : typeof import("./mod")
+>module : { "\"mod\"": typeof import("./mod"); }
+>exports : typeof import("./mod")
 >h : (mom: any) => string
 >module.exports.i = function hi(mom) {    return `hi, ${mom}!`;} : (mom: any) => string
 >module.exports.i : any
->module.exports : typeof import("mod")
->module : { "\"mod\"": typeof import("mod"); }
->exports : typeof import("mod")
+>module.exports : typeof import("./mod")
+>module : { "\"mod\"": typeof import("./mod"); }
+>exports : typeof import("./mod")
 >i : any
 >function hi(mom) {    return `hi, ${mom}!`;} : (mom: any) => string
 >hi : (mom: any) => string
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.symbols b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.symbols
index 1d92be59d4..9ed4b8e5aa 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.symbols
@@ -3,105 +3,105 @@
 === a.js ===
 exports.wrapSync = exports.selectSeries = exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined;
 >exports.wrapSync : Symbol(wrapSync, Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >wrapSync : Symbol(wrapSync, Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >undefined : Symbol(undefined)
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.symbols.diff
index f7e1842258..d03188dc1f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.symbols.diff
@@ -5,7 +5,7 @@
  exports.wrapSync = exports.selectSeries = exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined;
  >exports.wrapSync : Symbol(wrapSync, Decl(a.js, 0, 0))
 ->exports : Symbol(wrapSync, Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
  >wrapSync : Symbol(wrapSync, Decl(a.js, 0, 0))
 ->exports.selectSeries : Symbol(selectSeries, Decl(a.js, 0, 18))
 ->exports : Symbol(selectSeries, Decl(a.js, 0, 18))
@@ -302,102 +302,102 @@
 ->exports : Symbol(apply, Decl(a.js, 0, 1900))
 ->apply : Symbol(apply, Decl(a.js, 0, 1900))
 ->undefined : Symbol(apply)
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
 +>undefined : Symbol(undefined)
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.types b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.types
index b60f3cee0b..19165b780a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.types
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment3.types
@@ -4,399 +4,399 @@
 exports.wrapSync = exports.selectSeries = exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined;
 >exports.wrapSync = exports.selectSeries = exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.wrapSync : undefined
->exports : typeof import("a")
+>exports : typeof import("./a")
 >wrapSync : undefined
 >exports.selectSeries = exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.selectSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >selectSeries : any
 >exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.selectLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >selectLimit : any
 >exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.select : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >select : any
 >exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.foldr : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >foldr : any
 >exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.foldl : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >foldl : any
 >exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.inject : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >inject : any
 >exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.forEachOfLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >forEachOfLimit : any
 >exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.forEachOfSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >forEachOfSeries : any
 >exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.forEachOf : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >forEachOf : any
 >exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.forEachLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >forEachLimit : any
 >exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.forEachSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >forEachSeries : any
 >exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.forEach : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >forEach : any
 >exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.findSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >findSeries : any
 >exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.findLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >findLimit : any
 >exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.find : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >find : any
 >exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.anySeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >anySeries : any
 >exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.anyLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >anyLimit : any
 >exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.any : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >any : any
 >exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.allSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >allSeries : any
 >exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.allLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >allLimit : any
 >exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.all : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >all : any
 >exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.whilst : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >whilst : any
 >exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.waterfall : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >waterfall : any
 >exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.until : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >until : any
 >exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.unmemoize : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >unmemoize : any
 >exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.tryEach : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >tryEach : any
 >exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.transform : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >transform : any
 >exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.timesSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >timesSeries : any
 >exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.timesLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >timesLimit : any
 >exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.times : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >times : any
 >exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.timeout : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >timeout : any
 >exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.sortBy : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >sortBy : any
 >exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.someSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >someSeries : any
 >exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.someLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >someLimit : any
 >exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.some : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >some : any
 >exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.setImmediate : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >setImmediate : any
 >exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.series : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >series : any
 >exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.seq : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >seq : any
 >exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.retryable : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >retryable : any
 >exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.retry : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >retry : any
 >exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.rejectSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >rejectSeries : any
 >exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.rejectLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >rejectLimit : any
 >exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.reject : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >reject : any
 >exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.reflectAll : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >reflectAll : any
 >exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.reflect : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >reflect : any
 >exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.reduceRight : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >reduceRight : any
 >exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.reduce : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >reduce : any
 >exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.race : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >race : any
 >exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.queue : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >queue : any
 >exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.priorityQueue : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >priorityQueue : any
 >exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.parallelLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >parallelLimit : any
 >exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.parallel : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >parallel : any
 >exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.nextTick : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >nextTick : any
 >exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.memoize : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >memoize : any
 >exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.mapValuesSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >mapValuesSeries : any
 >exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.mapValuesLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >mapValuesLimit : any
 >exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.mapValues : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >mapValues : any
 >exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.mapSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >mapSeries : any
 >exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.mapLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >mapLimit : any
 >exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.map : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >map : any
 >exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.log : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >log : any
 >exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.groupBySeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >groupBySeries : any
 >exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.groupByLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >groupByLimit : any
 >exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.groupBy : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >groupBy : any
 >exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.forever : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >forever : any
 >exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.filterSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >filterSeries : any
 >exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.filterLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >filterLimit : any
 >exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.filter : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >filter : any
 >exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.everySeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >everySeries : any
 >exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.everyLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >everyLimit : any
 >exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.every : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >every : any
 >exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.ensureAsync : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >ensureAsync : any
 >exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.eachSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >eachSeries : any
 >exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.eachOfSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >eachOfSeries : any
 >exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.eachOfLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >eachOfLimit : any
 >exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.eachOf : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >eachOf : any
 >exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.eachLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >eachLimit : any
 >exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.each : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >each : any
 >exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.during : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >during : any
 >exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.doWhilst : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >doWhilst : any
 >exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.doUntil : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >doUntil : any
 >exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.doDuring : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >doDuring : any
 >exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.dir : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >dir : any
 >exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.detectSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >detectSeries : any
 >exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.detectLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >detectLimit : any
 >exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.detect : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >detect : any
 >exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.constant : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >constant : any
 >exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.concatSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >concatSeries : any
 >exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.concatLimit : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >concatLimit : any
 >exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.concat : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >concat : any
 >exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.compose : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >compose : any
 >exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.cargo : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >cargo : any
 >exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.autoInject : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >autoInject : any
 >exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.auto : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >auto : any
 >exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.asyncify : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >asyncify : any
 >exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 >exports.applyEachSeries : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >applyEachSeries : any
 >exports.applyEach = exports.apply = undefined : undefined
 >exports.applyEach : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >applyEach : any
 >exports.apply = undefined : undefined
 >exports.apply : any
->exports : typeof import("a")
+>exports : typeof import("./a")
 >apply : any
 >undefined : undefined
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImport.types b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImport.types
index 4d988a6a2a..c9135d9a56 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImport.types
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImport.types
@@ -2,26 +2,26 @@
 
 === jsdocTypeReferenceToImport.js ===
 const C = require('./ex').C;
->C : typeof import("ex").C
->require('./ex').C : typeof import("ex").C
->require('./ex') : typeof import("ex")
+>C : typeof import("./ex").C
+>require('./ex').C : typeof import("./ex").C
+>require('./ex') : typeof import("./ex")
 >require : any
 >'./ex' : "./ex"
->C : typeof import("ex").C
+>C : typeof import("./ex").C
 
 const D = require('./ex')?.C;
->D : typeof import("ex").C
->require('./ex')?.C : typeof import("ex").C
->require('./ex') : typeof import("ex")
+>D : typeof import("./ex").C
+>require('./ex')?.C : typeof import("./ex").C
+>require('./ex') : typeof import("./ex")
 >require : any
 >'./ex' : "./ex"
->C : typeof import("ex").C
+>C : typeof import("./ex").C
 
 /** @type {C} c */
 var c = new C()
 >c : C
->new C() : import("ex").C
->C : typeof import("ex").C
+>new C() : import("./ex").C
+>C : typeof import("./ex").C
 
 c.start
 >c.start : any
@@ -36,8 +36,8 @@ c.end
 /** @type {D} c */
 var d = new D()
 >d : D
->new D() : import("ex").C
->D : typeof import("ex").C
+>new D() : import("./ex").C
+>D : typeof import("./ex").C
 
 d.start
 >d.start : any
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols
index 9e9d853774..ca4e4d3b4f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols
@@ -4,7 +4,7 @@
 const MW = require("./MW");
 >MW : Symbol(MW, Decl(MC.js, 0, 5))
 >require : Symbol(require)
->"./MW" : Symbol("MW", Decl(MW.js, 0, 0))
+>"./MW" : Symbol("./MW", Decl(MW.js, 0, 0))
 
 /** @typedef {number} Cictema */
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols.diff
index 8c74d87ddb..fc02bad23d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols.diff
@@ -1,6 +1,12 @@
 --- old.jsdocTypeReferenceToImportOfClassExpression.symbols
 +++ new.jsdocTypeReferenceToImportOfClassExpression.symbols
-@@= skipped -8, +8 lines =@@
+@@= skipped -3, +3 lines =@@
+ const MW = require("./MW");
+ >MW : Symbol(MW, Decl(MC.js, 0, 5))
+ >require : Symbol(require)
+->"./MW" : Symbol("MW", Decl(MW.js, 0, 0))
++>"./MW" : Symbol("./MW", Decl(MW.js, 0, 0))
+
  /** @typedef {number} Cictema */
 
  module.exports = class MC {
@@ -13,7 +19,7 @@
  >MC : Symbol(MC, Decl(MC.js, 4, 16))
 
    watch() {
-@@= skipped -35, +35 lines =@@
+@@= skipped -40, +40 lines =@@
  }
 
  module.exports = MW;
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols
index c26128dd85..46d9f359ac 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols
@@ -4,7 +4,7 @@
 const MW = require("./MW");
 >MW : Symbol(MW, Decl(MC.js, 0, 5))
 >require : Symbol(require)
->"./MW" : Symbol("MW", Decl(MW.js, 0, 0))
+>"./MW" : Symbol("./MW", Decl(MW.js, 0, 0))
 
 /** @typedef {number} Meyerhauser */
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols.diff
index 648ac23411..f12fe27c9c 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols.diff
@@ -1,6 +1,13 @@
 --- old.jsdocTypeReferenceToImportOfFunctionExpression.symbols
 +++ new.jsdocTypeReferenceToImportOfFunctionExpression.symbols
-@@= skipped -9, +9 lines =@@
+@@= skipped -3, +3 lines =@@
+ const MW = require("./MW");
+ >MW : Symbol(MW, Decl(MC.js, 0, 5))
+ >require : Symbol(require)
+->"./MW" : Symbol("MW", Decl(MW.js, 0, 0))
++>"./MW" : Symbol("./MW", Decl(MW.js, 0, 0))
+
+ /** @typedef {number} Meyerhauser */
 
  /** @class */
  module.exports = function MC() {
@@ -11,7 +18,7 @@
  >exports : Symbol(export=, Decl(MC.js, 0, 27))
  >MC : Symbol(MC, Decl(MC.js, 5, 16))
 
-@@= skipped -36, +36 lines =@@
+@@= skipped -42, +42 lines =@@
  }
 
  module.exports = MW;
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.symbols
index cd994deae9..ce8079d894 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.symbols
@@ -27,16 +27,16 @@ const _str = "my-fake-sym";
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport1.js, 2, 5))
 
 exports[_sym] = "ok";
->exports : Symbol("lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport1.js, 1, 5))
 
 exports[_str] = "ok";
->exports : Symbol("lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport1.js, 2, 5))
 
 exports.S = _sym;
 >exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport1.js, 5, 21))
->exports : Symbol("lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport1.js, 5, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport1.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.symbols.diff
index f157aac65e..4b366da4ec 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.symbols.diff
@@ -1,10 +1,21 @@
 --- old.lateBoundAssignmentDeclarationSupport1.symbols
 +++ new.lateBoundAssignmentDeclarationSupport1.symbols
-@@= skipped -35, +35 lines =@@
+@@= skipped -26, +26 lines =@@
+ >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport1.js, 2, 5))
+
+ exports[_sym] = "ok";
+->exports : Symbol("lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
+ >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport1.js, 1, 5))
+
+ exports[_str] = "ok";
+->exports : Symbol("lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
+ >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport1.js, 2, 5))
 
  exports.S = _sym;
  >exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport1.js, 5, 21))
 ->exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport1.js, 5, 21))
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport1", Decl(lateBoundAssignmentDeclarationSupport1.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport1.js, 5, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport1.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.types b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.types
index 95d10108ff..485d488783 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.types
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport1.types
@@ -35,21 +35,21 @@ const _str = "my-fake-sym";
 exports[_sym] = "ok";
 >exports[_sym] = "ok" : "ok"
 >exports[_sym] : any
->exports : typeof import("lateBoundAssignmentDeclarationSupport1")
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport1")
 >_sym : unique symbol
 >"ok" : "ok"
 
 exports[_str] = "ok";
 >exports[_str] = "ok" : "ok"
 >exports[_str] : any
->exports : typeof import("lateBoundAssignmentDeclarationSupport1")
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport1")
 >_str : "my-fake-sym"
 >"ok" : "ok"
 
 exports.S = _sym;
 >exports.S = _sym : unique symbol
 >exports.S : unique symbol
->exports : typeof import("lateBoundAssignmentDeclarationSupport1")
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport1")
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols
index 40d007ddf0..eca3b4a84d 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols
@@ -27,22 +27,22 @@ const _str = "my-fake-sym";
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport2.js, 2, 5))
 
 module.exports[_sym] = "ok";
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
 
 module.exports[_str] = "ok";
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport2.js, 2, 5))
 
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols.diff
index ea61a161e6..5d0cd97f16 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols.diff
@@ -7,18 +7,18 @@
 ->module.exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
 
  module.exports[_str] = "ok";
 ->module.exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
  >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport2.js, 2, 5))
 
  module.exports.S = _sym;
@@ -26,8 +26,8 @@
 ->module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.types b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.types
index 2167a77705..82e108b006 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.types
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.types
@@ -35,27 +35,27 @@ const _str = "my-fake-sym";
 module.exports[_sym] = "ok";
 >module.exports[_sym] = "ok" : "ok"
 >module.exports[_sym] : any
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport2")
->module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("lateBoundAssignmentDeclarationSupport2"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport2")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
+>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("./lateBoundAssignmentDeclarationSupport2"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
 >_sym : unique symbol
 >"ok" : "ok"
 
 module.exports[_str] = "ok";
 >module.exports[_str] = "ok" : "ok"
 >module.exports[_str] : any
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport2")
->module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("lateBoundAssignmentDeclarationSupport2"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport2")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
+>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("./lateBoundAssignmentDeclarationSupport2"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
 >_str : "my-fake-sym"
 >"ok" : "ok"
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport2")
->module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("lateBoundAssignmentDeclarationSupport2"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport2")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
+>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("./lateBoundAssignmentDeclarationSupport2"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols
index 0042bfa852..304fa964d6 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols
@@ -30,9 +30,9 @@ Object.defineProperty(module.exports, _sym, { value: "ok" });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
 >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 4, 45))
 
@@ -40,17 +40,17 @@ Object.defineProperty(module.exports, _str, { value: "ok" });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport3.js, 2, 5))
 >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 45))
 
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols.diff
index e1875fe9e9..903bf5a09f 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols.diff
@@ -7,9 +7,9 @@
 ->module.exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
  >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 4, 45))
 
@@ -20,9 +20,9 @@
 ->module.exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
  >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport3.js, 2, 5))
  >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 45))
 
@@ -31,8 +31,8 @@
 ->module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.types b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.types
index f2ee39824f..9bf71295d4 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.types
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.types
@@ -33,26 +33,26 @@ const _str = "my-fake-sym";
 >"my-fake-sym" : "my-fake-sym"
 
 Object.defineProperty(module.exports, _sym, { value: "ok" });
->Object.defineProperty(module.exports, _sym, { value: "ok" }) : typeof import("lateBoundAssignmentDeclarationSupport3")
+>Object.defineProperty(module.exports, _sym, { value: "ok" }) : typeof import("./lateBoundAssignmentDeclarationSupport3")
 >Object.defineProperty : <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T
 >Object : ObjectConstructor
 >defineProperty : <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport3")
->module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("lateBoundAssignmentDeclarationSupport3"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport3")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
+>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("./lateBoundAssignmentDeclarationSupport3"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
 >_sym : unique symbol
 >{ value: "ok" } : { value: string; }
 >value : string
 >"ok" : "ok"
 
 Object.defineProperty(module.exports, _str, { value: "ok" });
->Object.defineProperty(module.exports, _str, { value: "ok" }) : typeof import("lateBoundAssignmentDeclarationSupport3")
+>Object.defineProperty(module.exports, _str, { value: "ok" }) : typeof import("./lateBoundAssignmentDeclarationSupport3")
 >Object.defineProperty : <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T
 >Object : ObjectConstructor
 >defineProperty : <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport3")
->module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("lateBoundAssignmentDeclarationSupport3"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport3")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
+>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("./lateBoundAssignmentDeclarationSupport3"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
 >_str : "my-fake-sym"
 >{ value: "ok" } : { value: string; }
 >value : string
@@ -61,9 +61,9 @@ Object.defineProperty(module.exports, _str, { value: "ok" });
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport3")
->module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("lateBoundAssignmentDeclarationSupport3"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport3")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
+>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("./lateBoundAssignmentDeclarationSupport3"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols
index 3cd2ec6331..d006d1038f 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols
@@ -63,17 +63,17 @@ const _z = inst[_sym];
 
 module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 2, 27))
 
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport4.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols.diff
index a2cb603930..1df888277c 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols.diff
@@ -7,9 +7,9 @@
 ->module.exports : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 2, 27))
 
@@ -18,8 +18,8 @@
 ->module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport4.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.types b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.types
index 0f24042875..5c0e03443a 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.types
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.types
@@ -80,18 +80,18 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F = F : () => void
 >module.exports.F : () => void
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport4")
->module : { "\"lateBoundAssignmentDeclarationSupport4\"": typeof import("lateBoundAssignmentDeclarationSupport4"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport4")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport4")
+>module : { "\"lateBoundAssignmentDeclarationSupport4\"": typeof import("./lateBoundAssignmentDeclarationSupport4"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport4")
 >F : () => void
 >F : () => void
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport4")
->module : { "\"lateBoundAssignmentDeclarationSupport4\"": typeof import("lateBoundAssignmentDeclarationSupport4"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport4")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport4")
+>module : { "\"lateBoundAssignmentDeclarationSupport4\"": typeof import("./lateBoundAssignmentDeclarationSupport4"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport4")
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols
index bfb9059745..589521c347 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols
@@ -64,17 +64,17 @@ const _z = inst[_sym];
 
 module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 2, 27))
 
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport5.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols.diff
index da3e923b0f..7f72290249 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols.diff
@@ -30,9 +30,9 @@
 ->module.exports : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 ->F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 2, 27), Decl(lateBoundAssignmentDeclarationSupport5.js, 5, 1))
 +>F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 2, 27))
@@ -42,8 +42,8 @@
 ->module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport5.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.types b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.types
index 8114fc3a27..efb0a174d2 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.types
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.types
@@ -79,18 +79,18 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F = F : { (): void; prototype: { [_sym]: string; "my-fake-sym": string; }; }
 >module.exports.F : { (): void; prototype: { [_sym]: string; "my-fake-sym": string; }; }
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport5")
->module : { "\"lateBoundAssignmentDeclarationSupport5\"": typeof import("lateBoundAssignmentDeclarationSupport5"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport5")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport5")
+>module : { "\"lateBoundAssignmentDeclarationSupport5\"": typeof import("./lateBoundAssignmentDeclarationSupport5"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport5")
 >F : { (): void; prototype: { [_sym]: string; "my-fake-sym": string; }; }
 >F : { (): void; prototype: { [_sym]: string; "my-fake-sym": string; }; }
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport5")
->module : { "\"lateBoundAssignmentDeclarationSupport5\"": typeof import("lateBoundAssignmentDeclarationSupport5"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport5")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport5")
+>module : { "\"lateBoundAssignmentDeclarationSupport5\"": typeof import("./lateBoundAssignmentDeclarationSupport5"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport5")
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols
index c2449f4ba8..837f4b0ea2 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols
@@ -76,17 +76,17 @@ const _z = inst[_sym];
 
 module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 2, 27))
 
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport6.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols.diff
index 03282bced5..81acf2fae5 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols.diff
@@ -19,9 +19,9 @@
 ->module.exports : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 2, 27))
 
@@ -30,8 +30,8 @@
 ->module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport6.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.types b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.types
index 324a80ae81..011fe06265 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.types
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.types
@@ -97,18 +97,18 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F = F : () => void
 >module.exports.F : () => void
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport6")
->module : { "\"lateBoundAssignmentDeclarationSupport6\"": typeof import("lateBoundAssignmentDeclarationSupport6"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport6")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport6")
+>module : { "\"lateBoundAssignmentDeclarationSupport6\"": typeof import("./lateBoundAssignmentDeclarationSupport6"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport6")
 >F : () => void
 >F : () => void
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport6")
->module : { "\"lateBoundAssignmentDeclarationSupport6\"": typeof import("lateBoundAssignmentDeclarationSupport6"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport6")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport6")
+>module : { "\"lateBoundAssignmentDeclarationSupport6\"": typeof import("./lateBoundAssignmentDeclarationSupport6"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport6")
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols
index eba0c9f488..8591c6fa33 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols
@@ -43,17 +43,17 @@ F[_str] = "ok";
 
 module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 1, 27))
 
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
->module.exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
+>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
+>exports : Symbol("./lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols.diff
index 00bc1adc0c..35e71aaa08 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols.diff
@@ -31,9 +31,9 @@
 ->module.exports : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 ->F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 1, 27), Decl(lateBoundAssignmentDeclarationSupport7.js, 4, 1), Decl(lateBoundAssignmentDeclarationSupport7.js, 5, 15))
 +>F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 1, 27))
@@ -43,8 +43,8 @@
 ->module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
-+>module.exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
++>module.exports : Symbol("./lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
++>exports : Symbol("./lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.types b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.types
index 5fdae11a4f..7c3a480473 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.types
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.types
@@ -55,18 +55,18 @@ F[_str] = "ok";
 module.exports.F = F;
 >module.exports.F = F : { (): void; [_sym]: string; "my-fake-sym": string; }
 >module.exports.F : { (): void; [_sym]: string; "my-fake-sym": string; }
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport7")
->module : { "\"lateBoundAssignmentDeclarationSupport7\"": typeof import("lateBoundAssignmentDeclarationSupport7"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport7")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport7")
+>module : { "\"lateBoundAssignmentDeclarationSupport7\"": typeof import("./lateBoundAssignmentDeclarationSupport7"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport7")
 >F : { (): void; [_sym]: string; "my-fake-sym": string; }
 >F : { (): void; [_sym]: string; "my-fake-sym": string; }
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("lateBoundAssignmentDeclarationSupport7")
->module : { "\"lateBoundAssignmentDeclarationSupport7\"": typeof import("lateBoundAssignmentDeclarationSupport7"); }
->exports : typeof import("lateBoundAssignmentDeclarationSupport7")
+>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport7")
+>module : { "\"lateBoundAssignmentDeclarationSupport7\"": typeof import("./lateBoundAssignmentDeclarationSupport7"); }
+>exports : typeof import("./lateBoundAssignmentDeclarationSupport7")
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/testdata/baselines/reference/submodule/conformance/leaveOptionalParameterAsWritten.types b/testdata/baselines/reference/submodule/conformance/leaveOptionalParameterAsWritten.types
index 9af67c9cd9..60730ea6b3 100644
--- a/testdata/baselines/reference/submodule/conformance/leaveOptionalParameterAsWritten.types
+++ b/testdata/baselines/reference/submodule/conformance/leaveOptionalParameterAsWritten.types
@@ -27,12 +27,12 @@ declare global {
 
 === c.ts ===
 type Foo = teams.calling.Foo;
->Foo : import("a").Foo
+>Foo : import("./a").Foo
 >teams : any
 >calling : any
 
 export const bar = (p?: Foo) => {}
->bar : (p?: import("a").Foo | undefined) => void
->(p?: Foo) => {} : (p?: import("a").Foo | undefined) => void
->p : import("a").Foo | undefined
+>bar : (p?: import("./a").Foo | undefined) => void
+>(p?: Foo) => {} : (p?: import("./a").Foo | undefined) => void
+>p : import("./a").Foo | undefined
 
diff --git a/testdata/baselines/reference/submodule/conformance/leaveOptionalParameterAsWritten.types.diff b/testdata/baselines/reference/submodule/conformance/leaveOptionalParameterAsWritten.types.diff
index bc6d6a2cc5..12024b7b56 100644
--- a/testdata/baselines/reference/submodule/conformance/leaveOptionalParameterAsWritten.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/leaveOptionalParameterAsWritten.types.diff
@@ -1,11 +1,18 @@
 --- old.leaveOptionalParameterAsWritten.types
 +++ new.leaveOptionalParameterAsWritten.types
-@@= skipped -31, +31 lines =@@
+@@= skipped -26, +26 lines =@@
+
+ === c.ts ===
+ type Foo = teams.calling.Foo;
+->Foo : import("a").Foo
++>Foo : import("./a").Foo
+ >teams : any
  >calling : any
 
  export const bar = (p?: Foo) => {}
 ->bar : (p?: Foo) => void
 ->(p?: Foo) => {} : (p?: Foo) => void
-+>bar : (p?: import("a").Foo | undefined) => void
-+>(p?: Foo) => {} : (p?: import("a").Foo | undefined) => void
- >p : import("a").Foo | undefined
+->p : import("a").Foo | undefined
++>bar : (p?: import("./a").Foo | undefined) => void
++>(p?: Foo) => {} : (p?: import("./a").Foo | undefined) => void
++>p : import("./a").Foo | undefined
diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.symbols b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.symbols
index 72508ecd14..05c9af9ad1 100644
--- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.symbols
+++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.symbols
@@ -4,7 +4,7 @@
 export const a = async () => (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 0, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 0, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 0, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.symbols.diff b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.symbols.diff
new file mode 100644
index 0000000000..a90655aafc
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.symbols.diff
@@ -0,0 +1,11 @@
+--- old.legacyNodeModulesExportsSpecifierGenerationConditions.symbols
++++ new.legacyNodeModulesExportsSpecifierGenerationConditions.symbols
+@@= skipped -3, +3 lines =@@
+ export const a = async () => (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 0, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 0, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 0, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types
index 97773ea899..feb034a32d 100644
--- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types
+++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types
@@ -2,19 +2,19 @@
 
 === index.ts ===
 export const a = async () => (await import("inner")).x();
->a : () => Promise<import("node_modules/inner/private").Thing>
->async () => (await import("inner")).x() : () => Promise<import("node_modules/inner/private").Thing>
->(await import("inner")).x() : import("node_modules/inner/private").Thing
->(await import("inner")).x : () => import("node_modules/inner/private").Thing
->(await import("inner")) : { x: () => import("node_modules/inner/private").Thing; default: typeof import("node_modules/inner/index"); }
->await import("inner") : { x: () => import("node_modules/inner/private").Thing; default: typeof import("node_modules/inner/index"); }
->import("inner") : Promise<{ x: () => import("node_modules/inner/private").Thing; default: typeof import("node_modules/inner/index"); }>
+>a : () => Promise<import("./node_modules/inner/private").Thing>
+>async () => (await import("inner")).x() : () => Promise<import("./node_modules/inner/private").Thing>
+>(await import("inner")).x() : import("./node_modules/inner/private").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/private").Thing
+>(await import("inner")) : { x: () => import("./node_modules/inner/private").Thing; default: typeof import("inner"); }
+>await import("inner") : { x: () => import("./node_modules/inner/private").Thing; default: typeof import("inner"); }
+>import("inner") : Promise<{ x: () => import("./node_modules/inner/private").Thing; default: typeof import("inner"); }>
 >"inner" : "inner"
->x : () => import("node_modules/inner/private").Thing
+>x : () => import("./node_modules/inner/private").Thing
 
 === node_modules/inner/index.d.ts ===
 export { x } from "./other.js";
->x : () => import("node_modules/inner/private").Thing
+>x : () => import("./private.js").Thing
 
 === node_modules/inner/other.d.ts ===
 import { Thing } from "./private.js"
diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types.diff b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types.diff
index 67e8decade..706aef9a88 100644
--- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types.diff
@@ -1,14 +1,31 @@
 --- old.legacyNodeModulesExportsSpecifierGenerationConditions.types
 +++ new.legacyNodeModulesExportsSpecifierGenerationConditions.types
-@@= skipped -5, +5 lines =@@
- >async () => (await import("inner")).x() : () => Promise<import("node_modules/inner/private").Thing>
- >(await import("inner")).x() : import("node_modules/inner/private").Thing
- >(await import("inner")).x : () => import("node_modules/inner/private").Thing
+@@= skipped -1, +1 lines =@@
+
+ === index.ts ===
+ export const a = async () => (await import("inner")).x();
+->a : () => Promise<import("node_modules/inner/private").Thing>
+->async () => (await import("inner")).x() : () => Promise<import("node_modules/inner/private").Thing>
+->(await import("inner")).x() : import("node_modules/inner/private").Thing
+->(await import("inner")).x : () => import("node_modules/inner/private").Thing
 ->(await import("inner")) : typeof import("node_modules/inner/index")
 ->await import("inner") : typeof import("node_modules/inner/index")
 ->import("inner") : Promise<typeof import("node_modules/inner/index")>
-+>(await import("inner")) : { x: () => import("node_modules/inner/private").Thing; default: typeof import("node_modules/inner/index"); }
-+>await import("inner") : { x: () => import("node_modules/inner/private").Thing; default: typeof import("node_modules/inner/index"); }
-+>import("inner") : Promise<{ x: () => import("node_modules/inner/private").Thing; default: typeof import("node_modules/inner/index"); }>
++>a : () => Promise<import("./node_modules/inner/private").Thing>
++>async () => (await import("inner")).x() : () => Promise<import("./node_modules/inner/private").Thing>
++>(await import("inner")).x() : import("./node_modules/inner/private").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/private").Thing
++>(await import("inner")) : { x: () => import("./node_modules/inner/private").Thing; default: typeof import("inner"); }
++>await import("inner") : { x: () => import("./node_modules/inner/private").Thing; default: typeof import("inner"); }
++>import("inner") : Promise<{ x: () => import("./node_modules/inner/private").Thing; default: typeof import("inner"); }>
  >"inner" : "inner"
- >x : () => import("node_modules/inner/private").Thing
+->x : () => import("node_modules/inner/private").Thing
++>x : () => import("./node_modules/inner/private").Thing
+
+ === node_modules/inner/index.d.ts ===
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/private").Thing
++>x : () => import("./private.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ import { Thing } from "./private.js"
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols
index db9cea396e..9fb9187154 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols
@@ -68,13 +68,13 @@ b.func20;
 === b.js ===
 var exportsAlias = exports;
 >exportsAlias : Symbol(exportsAlias, Decl(b.js, 0, 3))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 exportsAlias.func1 = function () { };
 >exportsAlias : Symbol(exportsAlias, Decl(b.js, 0, 3))
 
 exports.func2 = function () { };
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 var moduleExportsAlias = module.exports;
 >moduleExportsAlias : Symbol(moduleExportsAlias, Decl(b.js, 4, 3))
@@ -92,7 +92,7 @@ module.exports.func4 = function () { };
 
 var multipleDeclarationAlias1 = exports = module.exports;
 >multipleDeclarationAlias1 : Symbol(multipleDeclarationAlias1, Decl(b.js, 8, 3))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -105,7 +105,7 @@ var multipleDeclarationAlias2 = module.exports = exports;
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 multipleDeclarationAlias2.func6 = function () { };
 >multipleDeclarationAlias2 : Symbol(multipleDeclarationAlias2, Decl(b.js, 11, 3))
@@ -116,7 +116,7 @@ var someOtherVariable;
 var multipleDeclarationAlias3 = someOtherVariable = exports;
 >multipleDeclarationAlias3 : Symbol(multipleDeclarationAlias3, Decl(b.js, 15, 3))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 multipleDeclarationAlias3.func7 = function () { };
 >multipleDeclarationAlias3 : Symbol(multipleDeclarationAlias3, Decl(b.js, 15, 3))
@@ -136,14 +136,14 @@ var multipleDeclarationAlias5 = module.exports = exports = {};
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 multipleDeclarationAlias5.func9 = function () { };
 >multipleDeclarationAlias5 : Symbol(multipleDeclarationAlias5, Decl(b.js, 21, 3))
 
 var multipleDeclarationAlias6 = exports = module.exports = {};
 >multipleDeclarationAlias6 : Symbol(multipleDeclarationAlias6, Decl(b.js, 24, 3))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -152,14 +152,14 @@ multipleDeclarationAlias6.func10 = function () { };
 >multipleDeclarationAlias6 : Symbol(multipleDeclarationAlias6, Decl(b.js, 24, 3))
 
 exports = module.exports = someOtherVariable = {};
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 
 exports.func11 = function () { };
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 module.exports.func12 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -167,14 +167,14 @@ module.exports.func12 = function () { };
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports = module.exports = someOtherVariable = {};
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 
 exports.func11 = function () { };
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 module.exports.func12 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -182,13 +182,13 @@ module.exports.func12 = function () { };
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports = module.exports = {};
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports.func13 = function () { };
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 module.exports.func14 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -196,13 +196,13 @@ module.exports.func14 = function () { };
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports = module.exports = {};
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports.func15 = function () { };
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 module.exports.func16 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -213,10 +213,10 @@ module.exports = exports = {};
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(b.js, 41, 40))
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 exports.func17 = function () { };
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 module.exports.func18 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -229,7 +229,7 @@ module.exports = {};
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports.func19 = function () { };
->exports : Symbol("b", Decl(b.js, 0, 0))
+>exports : Symbol("./b", Decl(b.js, 0, 0))
 
 module.exports.func20 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols.diff
index 7c68f5c1af..6e6059a541 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols.diff
@@ -105,8 +105,10 @@
 
 
  === b.js ===
-@@= skipped -106, +66 lines =@@
- >exports : Symbol("b", Decl(b.js, 0, 0))
+ var exportsAlias = exports;
+ >exportsAlias : Symbol(exportsAlias, Decl(b.js, 0, 3))
+->exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  exportsAlias.func1 = function () { };
 ->exportsAlias.func1 : Symbol(func1, Decl(b.js, 0, 27))
@@ -117,7 +119,7 @@
 ->exports.func2 : Symbol(func2, Decl(b.js, 1, 37))
 ->exports : Symbol(func2, Decl(b.js, 1, 37))
 ->func2 : Symbol(func2, Decl(b.js, 1, 37))
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  var moduleExportsAlias = module.exports;
  >moduleExportsAlias : Symbol(moduleExportsAlias, Decl(b.js, 4, 3))
@@ -145,10 +147,11 @@
 
  var multipleDeclarationAlias1 = exports = module.exports;
  >multipleDeclarationAlias1 : Symbol(multipleDeclarationAlias1, Decl(b.js, 8, 3))
- >exports : Symbol("b", Decl(b.js, 0, 0))
+->exports : Symbol("b", Decl(b.js, 0, 0))
 ->module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -163,10 +166,11 @@
 ->module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
+->exports : Symbol("b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
- >exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  multipleDeclarationAlias2.func6 = function () { };
 ->multipleDeclarationAlias2.func6 : Symbol(func6, Decl(b.js, 11, 57))
@@ -175,8 +179,12 @@
 
  var someOtherVariable;
  >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
-@@= skipped -60, +48 lines =@@
- >exports : Symbol("b", Decl(b.js, 0, 0))
+@@= skipped -163, +111 lines =@@
+ var multipleDeclarationAlias3 = someOtherVariable = exports;
+ >multipleDeclarationAlias3 : Symbol(multipleDeclarationAlias3, Decl(b.js, 15, 3))
+ >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
+->exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  multipleDeclarationAlias3.func7 = function () { };
 ->multipleDeclarationAlias3.func7 : Symbol(func7, Decl(b.js, 15, 60))
@@ -203,10 +211,11 @@
 ->module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
+->exports : Symbol("b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
- >exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  multipleDeclarationAlias5.func9 = function () { };
 ->multipleDeclarationAlias5.func9 : Symbol(func9, Decl(b.js, 21, 62))
@@ -215,10 +224,11 @@
 
  var multipleDeclarationAlias6 = exports = module.exports = {};
  >multipleDeclarationAlias6 : Symbol(multipleDeclarationAlias6, Decl(b.js, 24, 3))
- >exports : Symbol("b", Decl(b.js, 0, 0))
+->exports : Symbol("b", Decl(b.js, 0, 0))
 ->module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -267,14 +277,14 @@
 ->func12 : Symbol(func12, Decl(b.js, 28, 33), Decl(b.js, 32, 33))
 +
 +exports = module.exports = someOtherVariable = {};
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 +>someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 +
 +exports.func11 = function () { };
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 +
 +module.exports.func12 = function () { };
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -282,14 +292,14 @@
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 +
 +exports = module.exports = someOtherVariable = {};
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 +>someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 +
 +exports.func11 = function () { };
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 +
 +module.exports.func12 = function () { };
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -297,10 +307,11 @@
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  exports = module.exports = {};
- >exports : Symbol("b", Decl(b.js, 0, 0))
+->exports : Symbol("b", Decl(b.js, 0, 0))
 ->module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -309,7 +320,7 @@
 ->exports.func13 : Symbol(func13, Decl(b.js, 35, 30))
 ->exports : Symbol(func13, Decl(b.js, 35, 30))
 ->func13 : Symbol(func13, Decl(b.js, 35, 30))
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  module.exports.func14 = function () { };
 ->module.exports.func14 : Symbol(func14, Decl(b.js, 36, 33))
@@ -322,10 +333,11 @@
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  exports = module.exports = {};
- >exports : Symbol("b", Decl(b.js, 0, 0))
+->exports : Symbol("b", Decl(b.js, 0, 0))
 ->module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
@@ -334,7 +346,7 @@
 ->exports.func15 : Symbol(func15, Decl(b.js, 39, 30))
 ->exports : Symbol(func15, Decl(b.js, 39, 30))
 ->func15 : Symbol(func15, Decl(b.js, 39, 30))
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  module.exports.func16 = function () { };
 ->module.exports.func16 : Symbol(func16, Decl(b.js, 40, 33))
@@ -350,16 +362,17 @@
 ->module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
+->exports : Symbol("b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
 +>module : Symbol(module.exports)
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
- >exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  exports.func17 = function () { };
 ->exports.func17 : Symbol(func17, Decl(b.js, 43, 30))
 ->exports : Symbol(func17, Decl(b.js, 43, 30))
 ->func17 : Symbol(func17, Decl(b.js, 43, 30))
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  module.exports.func18 = function () { };
 ->module.exports.func18 : Symbol(func18, Decl(b.js, 44, 33))
@@ -383,7 +396,7 @@
 ->exports.func19 : Symbol(func19, Decl(b.js, 47, 20))
 ->exports : Symbol(func19, Decl(b.js, 47, 20))
 ->func19 : Symbol(func19, Decl(b.js, 47, 20))
-+>exports : Symbol("b", Decl(b.js, 0, 0))
++>exports : Symbol("./b", Decl(b.js, 0, 0))
 
  module.exports.func20 = function () { };
 ->module.exports.func20 : Symbol(func20, Decl(b.js, 48, 33))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.types b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.types
index 5a3d5ee053..c1a0b90c39 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.types
@@ -107,20 +107,20 @@ b.func20;
 
 === b.js ===
 var exportsAlias = exports;
->exportsAlias : typeof import("b")
->exports : typeof import("b")
+>exportsAlias : typeof import("./b")
+>exports : typeof import("./b")
 
 exportsAlias.func1 = function () { };
 >exportsAlias.func1 = function () { } : () => void
 >exportsAlias.func1 : any
->exportsAlias : typeof import("b")
+>exportsAlias : typeof import("./b")
 >func1 : any
 >function () { } : () => void
 
 exports.func2 = function () { };
 >exports.func2 = function () { } : () => void
 >exports.func2 : any
->exports : typeof import("b")
+>exports : typeof import("./b")
 >func2 : any
 >function () { } : () => void
 
@@ -162,17 +162,17 @@ multipleDeclarationAlias1.func5 = function () { };
 >function () { } : () => void
 
 var multipleDeclarationAlias2 = module.exports = exports;
->multipleDeclarationAlias2 : typeof import("b")
->module.exports = exports : typeof import("b")
+>multipleDeclarationAlias2 : typeof import("./b")
+>module.exports = exports : typeof import("./b")
 >module.exports : {}
 >module : { "export=": {}; }
 >exports : {}
->exports : typeof import("b")
+>exports : typeof import("./b")
 
 multipleDeclarationAlias2.func6 = function () { };
 >multipleDeclarationAlias2.func6 = function () { } : () => void
 >multipleDeclarationAlias2.func6 : any
->multipleDeclarationAlias2 : typeof import("b")
+>multipleDeclarationAlias2 : typeof import("./b")
 >func6 : any
 >function () { } : () => void
 
@@ -180,15 +180,15 @@ var someOtherVariable;
 >someOtherVariable : any
 
 var multipleDeclarationAlias3 = someOtherVariable = exports;
->multipleDeclarationAlias3 : typeof import("b")
->someOtherVariable = exports : typeof import("b")
+>multipleDeclarationAlias3 : typeof import("./b")
+>someOtherVariable = exports : typeof import("./b")
 >someOtherVariable : any
->exports : typeof import("b")
+>exports : typeof import("./b")
 
 multipleDeclarationAlias3.func7 = function () { };
 >multipleDeclarationAlias3.func7 = function () { } : () => void
 >multipleDeclarationAlias3.func7 : any
->multipleDeclarationAlias3 : typeof import("b")
+>multipleDeclarationAlias3 : typeof import("./b")
 >func7 : any
 >function () { } : () => void
 
@@ -255,7 +255,7 @@ exports = module.exports = someOtherVariable = {};
 exports.func11 = function () { };
 >exports.func11 = function () { } : () => void
 >exports.func11 : any
->exports : typeof import("b")
+>exports : typeof import("./b")
 >func11 : any
 >function () { } : () => void
 
@@ -282,7 +282,7 @@ exports = module.exports = someOtherVariable = {};
 exports.func11 = function () { };
 >exports.func11 = function () { } : () => void
 >exports.func11 : any
->exports : typeof import("b")
+>exports : typeof import("./b")
 >func11 : any
 >function () { } : () => void
 
@@ -307,7 +307,7 @@ exports = module.exports = {};
 exports.func13 = function () { };
 >exports.func13 = function () { } : () => void
 >exports.func13 : any
->exports : typeof import("b")
+>exports : typeof import("./b")
 >func13 : any
 >function () { } : () => void
 
@@ -332,7 +332,7 @@ exports = module.exports = {};
 exports.func15 = function () { };
 >exports.func15 = function () { } : () => void
 >exports.func15 : any
->exports : typeof import("b")
+>exports : typeof import("./b")
 >func15 : any
 >function () { } : () => void
 
@@ -357,7 +357,7 @@ module.exports = exports = {};
 exports.func17 = function () { };
 >exports.func17 = function () { } : () => void
 >exports.func17 : any
->exports : typeof import("b")
+>exports : typeof import("./b")
 >func17 : any
 >function () { } : () => void
 
@@ -380,7 +380,7 @@ module.exports = {};
 exports.func19 = function () { };
 >exports.func19 = function () { } : () => void
 >exports.func19 : any
->exports : typeof import("b")
+>exports : typeof import("./b")
 >func19 : any
 >function () { } : () => void
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols
index efe1cb3025..c4b5252c20 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols
@@ -32,15 +32,15 @@ declare var module: { exports: any };
 === semver.js ===
 /// <reference path='node.d.ts' />
 exports = module.exports = C
->exports : Symbol("semver", Decl(semver.js, 0, 0))
->module.exports : Symbol("semver", Decl(semver.js, 0, 0))
+>exports : Symbol("./semver", Decl(semver.js, 0, 0))
+>module.exports : Symbol("./semver", Decl(semver.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("semver", Decl(semver.js, 0, 0))
+>exports : Symbol("./semver", Decl(semver.js, 0, 0))
 >C : Symbol(C, Decl(semver.js, 2, 22))
 
 exports.f = n => n + 1
 >exports.f : Symbol(f, Decl(semver.js, 1, 28))
->exports : Symbol("semver", Decl(semver.js, 0, 0))
+>exports : Symbol("./semver", Decl(semver.js, 0, 0))
 >f : Symbol(f, Decl(semver.js, 1, 28))
 >n : Symbol(n, Decl(semver.js, 2, 11))
 >n : Symbol(n, Decl(semver.js, 2, 11))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols.diff
index 0a1a2a7d7c..fee855457b 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols.diff
@@ -9,26 +9,28 @@
 
  var two = C.f(1)
  >two : Symbol(two, Decl(index.js, 2, 3))
-@@= skipped -28, +28 lines =@@
+@@= skipped -27, +27 lines =@@
+ === semver.js ===
  /// <reference path='node.d.ts' />
  exports = module.exports = C
- >exports : Symbol("semver", Decl(semver.js, 0, 0))
+->exports : Symbol("semver", Decl(semver.js, 0, 0))
 ->module.exports : Symbol(module.exports, Decl(semver.js, 0, 0))
 ->module : Symbol(export=, Decl(semver.js, 1, 9))
 ->exports : Symbol(export=, Decl(semver.js, 1, 9))
-+>module.exports : Symbol("semver", Decl(semver.js, 0, 0))
++>exports : Symbol("./semver", Decl(semver.js, 0, 0))
++>module.exports : Symbol("./semver", Decl(semver.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("semver", Decl(semver.js, 0, 0))
++>exports : Symbol("./semver", Decl(semver.js, 0, 0))
  >C : Symbol(C, Decl(semver.js, 2, 22))
 
  exports.f = n => n + 1
  >exports.f : Symbol(f, Decl(semver.js, 1, 28))
 ->exports : Symbol(f, Decl(semver.js, 1, 28))
-+>exports : Symbol("semver", Decl(semver.js, 0, 0))
++>exports : Symbol("./semver", Decl(semver.js, 0, 0))
  >f : Symbol(f, Decl(semver.js, 1, 28))
  >n : Symbol(n, Decl(semver.js, 2, 11))
  >n : Symbol(n, Decl(semver.js, 2, 11))
-@@= skipped -16, +16 lines =@@
+@@= skipped -17, +17 lines =@@
  >C : Symbol(C, Decl(semver.js, 2, 22))
 
      this.p = 1
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.types b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.types
index 4f98ffa2dc..8ec634b4d0 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.types
@@ -39,15 +39,15 @@ exports = module.exports = C
 >exports = module.exports = C : () => void
 >exports : any
 >module.exports = C : () => void
->module.exports : typeof import("semver")
->module : { "\"semver\"": typeof import("semver"); }
->exports : typeof import("semver")
+>module.exports : typeof import("./semver")
+>module : { "\"semver\"": typeof import("./semver"); }
+>exports : typeof import("./semver")
 >C : () => void
 
 exports.f = n => n + 1
 >exports.f = n => n + 1 : (n: any) => any
 >exports.f : (n: any) => any
->exports : typeof import("semver")
+>exports : typeof import("./semver")
 >f : (n: any) => any
 >n => n + 1 : (n: any) => any
 >n : any
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols
index a9cab75a98..96d2f5f298 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols
@@ -5,7 +5,7 @@
 var wat = require('./bug24024')
 >wat : Symbol(wat, Decl(bug24024.js, 1, 3))
 >require : Symbol(require)
->'./bug24024' : Symbol("bug24024", Decl(bug24024.js, 0, 0))
+>'./bug24024' : Symbol("./bug24024", Decl(bug24024.js, 0, 0))
 
 module.exports = class C {}
 >module.exports : Symbol(wat, Decl(bug24024.js, 2, 16))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols.diff
index 8a574736aa..479f1b82bb 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols.diff
@@ -1,7 +1,11 @@
 --- old.moduleExportAlias4.symbols
 +++ new.moduleExportAlias4.symbols
-@@= skipped -7, +7 lines =@@
- >'./bug24024' : Symbol("bug24024", Decl(bug24024.js, 0, 0))
+@@= skipped -4, +4 lines =@@
+ var wat = require('./bug24024')
+ >wat : Symbol(wat, Decl(bug24024.js, 1, 3))
+ >require : Symbol(require)
+->'./bug24024' : Symbol("bug24024", Decl(bug24024.js, 0, 0))
++>'./bug24024' : Symbol("./bug24024", Decl(bug24024.js, 0, 0))
 
  module.exports = class C {}
 ->module.exports : Symbol(module.exports, Decl(bug24024.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols
index 9a8873d427..05025d14b5 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols
@@ -6,15 +6,15 @@ const webpack = function (){
 >webpack : Symbol(webpack, Decl(bug24754.js, 1, 5))
 }
 exports = module.exports = webpack;
->exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
->module.exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
+>exports : Symbol("./bug24754", Decl(bug24754.js, 0, 0))
+>module.exports : Symbol("./bug24754", Decl(bug24754.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
+>exports : Symbol("./bug24754", Decl(bug24754.js, 0, 0))
 >webpack : Symbol(webpack, Decl(bug24754.js, 1, 5))
 
 exports.version = 1001;
 >exports.version : Symbol(version, Decl(bug24754.js, 3, 35))
->exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
+>exports : Symbol("./bug24754", Decl(bug24754.js, 0, 0))
 >version : Symbol(version, Decl(bug24754.js, 3, 35))
 
 webpack.WebpackOptionsDefaulter = 1111;
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols.diff
index 40a2d99fcf..09f09243d3 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols.diff
@@ -8,20 +8,21 @@
 +>webpack : Symbol(webpack, Decl(bug24754.js, 1, 5))
  }
  exports = module.exports = webpack;
- >exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
+->exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
 ->module.exports : Symbol(module.exports, Decl(bug24754.js, 0, 0))
 ->module : Symbol(export=, Decl(bug24754.js, 3, 9))
 ->exports : Symbol(export=, Decl(bug24754.js, 3, 9))
 ->webpack : Symbol(webpack, Decl(bug24754.js, 1, 5), Decl(bug24754.js, 4, 23))
-+>module.exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
++>exports : Symbol("./bug24754", Decl(bug24754.js, 0, 0))
++>module.exports : Symbol("./bug24754", Decl(bug24754.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
++>exports : Symbol("./bug24754", Decl(bug24754.js, 0, 0))
 +>webpack : Symbol(webpack, Decl(bug24754.js, 1, 5))
 
  exports.version = 1001;
  >exports.version : Symbol(version, Decl(bug24754.js, 3, 35))
 ->exports : Symbol(version, Decl(bug24754.js, 3, 35))
-+>exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
++>exports : Symbol("./bug24754", Decl(bug24754.js, 0, 0))
  >version : Symbol(version, Decl(bug24754.js, 3, 35))
 
  webpack.WebpackOptionsDefaulter = 1111;
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.types b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.types
index 54b8fe94f8..a49e23ba07 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.types
@@ -10,15 +10,15 @@ exports = module.exports = webpack;
 >exports = module.exports = webpack : { (): void; WebpackOptionsDefaulter: number; }
 >exports : any
 >module.exports = webpack : { (): void; WebpackOptionsDefaulter: number; }
->module.exports : typeof import("bug24754")
->module : { "\"bug24754\"": typeof import("bug24754"); }
->exports : typeof import("bug24754")
+>module.exports : typeof import("./bug24754")
+>module : { "\"bug24754\"": typeof import("./bug24754"); }
+>exports : typeof import("./bug24754")
 >webpack : { (): void; WebpackOptionsDefaulter: number; }
 
 exports.version = 1001;
 >exports.version = 1001 : 1001
 >exports.version : 1001
->exports : typeof import("bug24754")
+>exports : typeof import("./bug24754")
 >version : 1001
 >1001 : 1001
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.symbols
index 7984bf7597..a8daf18ce4 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.symbols
@@ -5,13 +5,13 @@ function D () { }
 >D : Symbol(D, Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
 
 exports["D"] = D;
->exports : Symbol("moduleExportAliasElementAccessExpression", Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
+>exports : Symbol("./moduleExportAliasElementAccessExpression", Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
 >"D" : Symbol("D", Decl(moduleExportAliasElementAccessExpression.js, 0, 17))
 >D : Symbol(D, Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
 
  // (the only package I could find that uses spaces in identifiers is webidl-conversions)
 exports["Does not work yet"] = D;
->exports : Symbol("moduleExportAliasElementAccessExpression", Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
+>exports : Symbol("./moduleExportAliasElementAccessExpression", Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
 >"Does not work yet" : Symbol("Does not work yet", Decl(moduleExportAliasElementAccessExpression.js, 1, 17))
 >D : Symbol(D, Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.symbols.diff
new file mode 100644
index 0000000000..2ee6a20468
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.symbols.diff
@@ -0,0 +1,17 @@
+--- old.moduleExportAliasElementAccessExpression.symbols
++++ new.moduleExportAliasElementAccessExpression.symbols
+@@= skipped -4, +4 lines =@@
+ >D : Symbol(D, Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
+
+ exports["D"] = D;
+->exports : Symbol("moduleExportAliasElementAccessExpression", Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
++>exports : Symbol("./moduleExportAliasElementAccessExpression", Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
+ >"D" : Symbol("D", Decl(moduleExportAliasElementAccessExpression.js, 0, 17))
+ >D : Symbol(D, Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
+
+  // (the only package I could find that uses spaces in identifiers is webidl-conversions)
+ exports["Does not work yet"] = D;
+->exports : Symbol("moduleExportAliasElementAccessExpression", Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
++>exports : Symbol("./moduleExportAliasElementAccessExpression", Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
+ >"Does not work yet" : Symbol("Does not work yet", Decl(moduleExportAliasElementAccessExpression.js, 1, 17))
+ >D : Symbol(D, Decl(moduleExportAliasElementAccessExpression.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.types b/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.types
index 08d43e677a..e8e3ae4cbe 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasElementAccessExpression.types
@@ -7,7 +7,7 @@ function D () { }
 exports["D"] = D;
 >exports["D"] = D : () => void
 >exports["D"] : () => void
->exports : typeof import("moduleExportAliasElementAccessExpression")
+>exports : typeof import("./moduleExportAliasElementAccessExpression")
 >"D" : "D"
 >D : () => void
 
@@ -15,7 +15,7 @@ exports["D"] = D;
 exports["Does not work yet"] = D;
 >exports["Does not work yet"] = D : () => void
 >exports["Does not work yet"] : () => void
->exports : typeof import("moduleExportAliasElementAccessExpression")
+>exports : typeof import("./moduleExportAliasElementAccessExpression")
 >"Does not work yet" : "Does not work yet"
 >D : () => void
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols
index 373a830db8..9c2a2585a0 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols
@@ -5,19 +5,19 @@
 (function() {
 exports.bigOak = 1
 >exports.bigOak : Symbol(bigOak, Decl(Eloquent.js, 1, 13))
->exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
+>exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
 >bigOak : Symbol(bigOak, Decl(Eloquent.js, 1, 13))
 
 exports.everywhere = 2
 >exports.everywhere : Symbol(everywhere, Decl(Eloquent.js, 2, 18))
->exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
+>exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
 >everywhere : Symbol(everywhere, Decl(Eloquent.js, 2, 18))
 
 module.exports = exports
->module.exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
+>module.exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
->exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
+>exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
+>exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
 
 })()
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols.diff
index d9b5824e33..b990906477 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols.diff
@@ -5,22 +5,23 @@
  exports.bigOak = 1
  >exports.bigOak : Symbol(bigOak, Decl(Eloquent.js, 1, 13))
 ->exports : Symbol(bigOak, Decl(Eloquent.js, 1, 13))
-+>exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
++>exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
  >bigOak : Symbol(bigOak, Decl(Eloquent.js, 1, 13))
 
  exports.everywhere = 2
  >exports.everywhere : Symbol(everywhere, Decl(Eloquent.js, 2, 18))
 ->exports : Symbol(everywhere, Decl(Eloquent.js, 2, 18))
-+>exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
++>exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
  >everywhere : Symbol(everywhere, Decl(Eloquent.js, 2, 18))
 
  module.exports = exports
 ->module.exports : Symbol(module.exports, Decl(Eloquent.js, 0, 0))
 ->module : Symbol(export=, Decl(Eloquent.js, 3, 22))
 ->exports : Symbol(export=, Decl(Eloquent.js, 3, 22))
-+>module.exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
+->exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
++>module.exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
- >exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
++>exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
++>exports : Symbol("./Eloquent", Decl(Eloquent.js, 0, 0))
 
- })()
\ No newline at end of file
+ })()
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.types b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.types
index 67d0c49f6e..fc4f6be8ad 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.types
@@ -10,23 +10,23 @@
 exports.bigOak = 1
 >exports.bigOak = 1 : 1
 >exports.bigOak : 1
->exports : typeof import("Eloquent")
+>exports : typeof import("./Eloquent")
 >bigOak : 1
 >1 : 1
 
 exports.everywhere = 2
 >exports.everywhere = 2 : 2
 >exports.everywhere : 2
->exports : typeof import("Eloquent")
+>exports : typeof import("./Eloquent")
 >everywhere : 2
 >2 : 2
 
 module.exports = exports
->module.exports = exports : typeof import("Eloquent")
->module.exports : typeof import("Eloquent")
->module : { "\"Eloquent\"": typeof import("Eloquent"); }
->exports : typeof import("Eloquent")
->exports : typeof import("Eloquent")
+>module.exports = exports : typeof import("./Eloquent")
+>module.exports : typeof import("./Eloquent")
+>module : { "\"Eloquent\"": typeof import("./Eloquent"); }
+>exports : typeof import("./Eloquent")
+>exports : typeof import("./Eloquent")
 
 })()
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols
index eed33947c6..fc9c3e3fe2 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols
@@ -2,7 +2,7 @@
 
 === bug28014.js ===
 exports.version = 1
->exports : Symbol("bug28014", Decl(bug28014.js, 0, 0))
+>exports : Symbol("./bug28014", Decl(bug28014.js, 0, 0))
 
 function alias() { }
 >alias : Symbol(alias, Decl(bug28014.js, 0, 19))
@@ -15,5 +15,5 @@ module.exports = alias
 
 === importer.js ===
 import('./bug28014')
->'./bug28014' : Symbol("bug28014", Decl(bug28014.js, 0, 0))
+>'./bug28014' : Symbol("./bug28014", Decl(bug28014.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols.diff
index db6b4bdc5c..6ad71b1643 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols.diff
@@ -7,7 +7,7 @@
 ->exports.version : Symbol(version, Decl(bug28014.js, 0, 0))
 ->exports : Symbol(version, Decl(bug28014.js, 0, 0))
 ->version : Symbol(version, Decl(bug28014.js, 0, 0))
-+>exports : Symbol("bug28014", Decl(bug28014.js, 0, 0))
++>exports : Symbol("./bug28014", Decl(bug28014.js, 0, 0))
 
  function alias() { }
  >alias : Symbol(alias, Decl(bug28014.js, 0, 19))
@@ -21,4 +21,7 @@
 +>exports : Symbol(alias, Decl(bug28014.js, 0, 19))
  >alias : Symbol(alias, Decl(bug28014.js, 0, 19))
 
- === importer.js ===
\ No newline at end of file
+ === importer.js ===
+ import('./bug28014')
+->'./bug28014' : Symbol("bug28014", Decl(bug28014.js, 0, 0))
++>'./bug28014' : Symbol("./bug28014", Decl(bug28014.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.types b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.types
index 2a68c7781f..8aae436c98 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.types
@@ -4,7 +4,7 @@
 exports.version = 1
 >exports.version = 1 : 1
 >exports.version : any
->exports : typeof import("bug28014")
+>exports : typeof import("./bug28014")
 >version : any
 >1 : 1
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols
index 33e6b8ac42..5a85b357c8 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols
@@ -8,5 +8,5 @@ module.exports = window.nonprop;
 >window : Symbol(window, Decl(lib.dom.d.ts, --, --))
 
 exports.foo = bar;
->exports : Symbol("bug27025", Decl(bug27025.js, 0, 0))
+>exports : Symbol("./bug27025", Decl(bug27025.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols.diff
index 179701bcbd..901a43ad06 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols.diff
@@ -15,4 +15,4 @@
  exports.foo = bar;
 ->exports : Symbol(foo, Decl(bug27025.js, 0, 32))
 ->foo : Symbol(foo, Decl(bug27025.js, 0, 32))
-+>exports : Symbol("bug27025", Decl(bug27025.js, 0, 0))
++>exports : Symbol("./bug27025", Decl(bug27025.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.types b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.types
index 0c5b3b1c77..533c0c48bb 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.types
@@ -13,7 +13,7 @@ module.exports = window.nonprop;
 exports.foo = bar;
 >exports.foo = bar : any
 >exports.foo : any
->exports : typeof import("bug27025")
+>exports : typeof import("./bug27025")
 >foo : any
 >bar : any
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols
index d3908ce024..0f068244fa 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols
@@ -23,9 +23,9 @@ class EE {
 }
 var npmlog = module.exports = new EE()
 >npmlog : Symbol(npmlog, Decl(npmlog.js, 4, 3))
->module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
+>module.exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
+>exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 >EE : Symbol(EE, Decl(npmlog.js, 0, 0))
 
 npmlog.on('hi') // both references should see EE.on
@@ -34,25 +34,25 @@ npmlog.on('hi') // both references should see EE.on
 >on : Symbol(EE.on, Decl(npmlog.js, 0, 10))
 
 module.exports.on('hi') // here too
->module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
+>module.exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
+>exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 
 npmlog.x = 1
 >npmlog : Symbol(npmlog, Decl(npmlog.js, 4, 3))
 
 module.exports.y = 2
 >module.exports.y : Symbol(y, Decl(npmlog.js, 9, 12))
->module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
+>module.exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
+>exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 >y : Symbol(y, Decl(npmlog.js, 9, 12))
 
 npmlog.y
 >npmlog : Symbol(npmlog, Decl(npmlog.js, 4, 3))
 
 module.exports.x
->module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
+>module.exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
+>exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols.diff
index 298239bc3b..028db014b5 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols.diff
@@ -26,9 +26,9 @@
 ->module.exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 ->module : Symbol(npmlog, Decl(npmlog.js, 4, 12))
 ->exports : Symbol(npmlog, Decl(npmlog.js, 4, 12))
-+>module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
++>module.exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
++>exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
  >EE : Symbol(EE, Decl(npmlog.js, 0, 0))
 
  npmlog.on('hi') // both references should see EE.on
@@ -41,9 +41,9 @@
 ->module : Symbol(module, Decl(npmlog.js, 4, 12))
 ->exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 ->on : Symbol(EE.on, Decl(npmlog.js, 0, 10))
-+>module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
++>module.exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
++>exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 
  npmlog.x = 1
 ->npmlog.x : Symbol(x, Decl(npmlog.js, 7, 23))
@@ -55,9 +55,9 @@
 ->module.exports : Symbol(y, Decl(npmlog.js, 9, 12))
 ->module : Symbol(module, Decl(npmlog.js, 4, 12))
 ->exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
-+>module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
++>module.exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
++>exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
  >y : Symbol(y, Decl(npmlog.js, 9, 12))
 
  npmlog.y
@@ -71,6 +71,6 @@
 ->module : Symbol(module, Decl(npmlog.js, 4, 12))
 ->exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 ->x : Symbol(x, Decl(npmlog.js, 7, 23))
-+>module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
++>module.exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
++>exports : Symbol("./npmlog", Decl(npmlog.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.types b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.types
index 42098300cf..9c6bdfc605 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.types
@@ -29,9 +29,9 @@ class EE {
 var npmlog = module.exports = new EE()
 >npmlog : EE
 >module.exports = new EE() : EE
->module.exports : typeof import("npmlog")
->module : { "\"npmlog\"": typeof import("npmlog"); }
->exports : typeof import("npmlog")
+>module.exports : typeof import("./npmlog")
+>module : { "\"npmlog\"": typeof import("./npmlog"); }
+>exports : typeof import("./npmlog")
 >new EE() : EE
 >EE : typeof EE
 
@@ -45,9 +45,9 @@ npmlog.on('hi') // both references should see EE.on
 module.exports.on('hi') // here too
 >module.exports.on('hi') : any
 >module.exports.on : any
->module.exports : typeof import("npmlog")
->module : { "\"npmlog\"": typeof import("npmlog"); }
->exports : typeof import("npmlog")
+>module.exports : typeof import("./npmlog")
+>module : { "\"npmlog\"": typeof import("./npmlog"); }
+>exports : typeof import("./npmlog")
 >on : any
 >'hi' : "hi"
 
@@ -61,9 +61,9 @@ npmlog.x = 1
 module.exports.y = 2
 >module.exports.y = 2 : 2
 >module.exports.y : 2
->module.exports : typeof import("npmlog")
->module : { "\"npmlog\"": typeof import("npmlog"); }
->exports : typeof import("npmlog")
+>module.exports : typeof import("./npmlog")
+>module : { "\"npmlog\"": typeof import("./npmlog"); }
+>exports : typeof import("./npmlog")
 >y : 2
 >2 : 2
 
@@ -74,8 +74,8 @@ npmlog.y
 
 module.exports.x
 >module.exports.x : any
->module.exports : typeof import("npmlog")
->module : { "\"npmlog\"": typeof import("npmlog"); }
->exports : typeof import("npmlog")
+>module.exports : typeof import("./npmlog")
+>module : { "\"npmlog\"": typeof import("./npmlog"); }
+>exports : typeof import("./npmlog")
 >x : any
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols
index 78fa43931d..efc383a73a 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols
@@ -3,16 +3,16 @@
 === npm.js ===
 var npm = module.exports = function (tree) {
 >npm : Symbol(npm, Decl(npm.js, 0, 3))
->module.exports : Symbol("npm", Decl(npm.js, 0, 0))
+>module.exports : Symbol("./npm", Decl(npm.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("npm", Decl(npm.js, 0, 0))
+>exports : Symbol("./npm", Decl(npm.js, 0, 0))
 >tree : Symbol(tree, Decl(npm.js, 0, 37))
 }
 module.exports.asReadInstalled = function (tree) {
 >module.exports.asReadInstalled : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
->module.exports : Symbol("npm", Decl(npm.js, 0, 0))
+>module.exports : Symbol("./npm", Decl(npm.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("npm", Decl(npm.js, 0, 0))
+>exports : Symbol("./npm", Decl(npm.js, 0, 0))
 >asReadInstalled : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
 >tree : Symbol(tree, Decl(npm.js, 2, 43))
 
@@ -21,9 +21,9 @@ module.exports.asReadInstalled = function (tree) {
 >tree : Symbol(tree, Decl(npm.js, 2, 43))
 
     module.exports(tree)
->module.exports : Symbol("npm", Decl(npm.js, 0, 0))
+>module.exports : Symbol("./npm", Decl(npm.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("npm", Decl(npm.js, 0, 0))
+>exports : Symbol("./npm", Decl(npm.js, 0, 0))
 >tree : Symbol(tree, Decl(npm.js, 2, 43))
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols.diff
index 2304305f4c..dde7d359b7 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols.diff
@@ -7,9 +7,9 @@
 ->module.exports : Symbol(module.exports, Decl(npm.js, 0, 0))
 ->module : Symbol(npm, Decl(npm.js, 0, 9))
 ->exports : Symbol(npm, Decl(npm.js, 0, 9))
-+>module.exports : Symbol("npm", Decl(npm.js, 0, 0))
++>module.exports : Symbol("./npm", Decl(npm.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("npm", Decl(npm.js, 0, 0))
++>exports : Symbol("./npm", Decl(npm.js, 0, 0))
  >tree : Symbol(tree, Decl(npm.js, 0, 37))
  }
  module.exports.asReadInstalled = function (tree) {
@@ -17,9 +17,9 @@
 ->module.exports : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
 ->module : Symbol(module, Decl(npm.js, 0, 9), Decl(npm.js, 3, 13))
 ->exports : Symbol(module.exports, Decl(npm.js, 0, 0))
-+>module.exports : Symbol("npm", Decl(npm.js, 0, 0))
++>module.exports : Symbol("./npm", Decl(npm.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("npm", Decl(npm.js, 0, 0))
++>exports : Symbol("./npm", Decl(npm.js, 0, 0))
  >asReadInstalled : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
  >tree : Symbol(tree, Decl(npm.js, 2, 43))
 
@@ -30,8 +30,8 @@
 ->module.exports : Symbol(module.exports, Decl(npm.js, 0, 0))
 ->module : Symbol(module, Decl(npm.js, 0, 9), Decl(npm.js, 3, 13))
 ->exports : Symbol(module.exports, Decl(npm.js, 0, 0))
-+>module.exports : Symbol("npm", Decl(npm.js, 0, 0))
++>module.exports : Symbol("./npm", Decl(npm.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("npm", Decl(npm.js, 0, 0))
++>exports : Symbol("./npm", Decl(npm.js, 0, 0))
  >tree : Symbol(tree, Decl(npm.js, 2, 43))
  }
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.types b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.types
index f35ed2b1ec..9f2732ca9a 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.types
@@ -4,18 +4,18 @@
 var npm = module.exports = function (tree) {
 >npm : (tree: any) => void
 >module.exports = function (tree) {} : (tree: any) => void
->module.exports : typeof import("npm")
->module : { "\"npm\"": typeof import("npm"); }
->exports : typeof import("npm")
+>module.exports : typeof import("./npm")
+>module : { "\"npm\"": typeof import("./npm"); }
+>exports : typeof import("./npm")
 >function (tree) {} : (tree: any) => void
 >tree : any
 }
 module.exports.asReadInstalled = function (tree) {
 >module.exports.asReadInstalled = function (tree) {    npm(tree) // both references should be callable    module.exports(tree)} : (tree: any) => void
 >module.exports.asReadInstalled : (tree: any) => void
->module.exports : typeof import("npm")
->module : { "\"npm\"": typeof import("npm"); }
->exports : typeof import("npm")
+>module.exports : typeof import("./npm")
+>module : { "\"npm\"": typeof import("./npm"); }
+>exports : typeof import("./npm")
 >asReadInstalled : (tree: any) => void
 >function (tree) {    npm(tree) // both references should be callable    module.exports(tree)} : (tree: any) => void
 >tree : any
@@ -27,9 +27,9 @@ module.exports.asReadInstalled = function (tree) {
 
     module.exports(tree)
 >module.exports(tree) : any
->module.exports : typeof import("npm")
->module : { "\"npm\"": typeof import("npm"); }
->exports : typeof import("npm")
+>module.exports : typeof import("./npm")
+>module : { "\"npm\"": typeof import("./npm"); }
+>exports : typeof import("./npm")
 >tree : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols
index 6c48dba82f..9376dde027 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols
@@ -4,7 +4,7 @@
 var mod = require('./mod')
 >mod : Symbol(mod, Decl(npm.js, 0, 3))
 >require : Symbol(require)
->'./mod' : Symbol("mod", Decl(mod.js, 0, 0))
+>'./mod' : Symbol("./mod", Decl(mod.js, 0, 0))
 
 mod() // should be callable from here too
 >mod : Symbol(mod, Decl(npm.js, 0, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols.diff
index 8f69b075c9..fa17d66ba9 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols.diff
@@ -1,6 +1,14 @@
 --- old.moduleExportAssignment3.symbols
 +++ new.moduleExportAssignment3.symbols
-@@= skipped -10, +10 lines =@@
+@@= skipped -3, +3 lines =@@
+ var mod = require('./mod')
+ >mod : Symbol(mod, Decl(npm.js, 0, 3))
+ >require : Symbol(require)
+->'./mod' : Symbol("mod", Decl(mod.js, 0, 0))
++>'./mod' : Symbol("./mod", Decl(mod.js, 0, 0))
+
+ mod() // should be callable from here too
+ >mod : Symbol(mod, Decl(npm.js, 0, 3))
 
  === mod.js ===
  module.exports = function x() { }
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols
index 723e4e6100..9a37154be5 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols
@@ -2,7 +2,7 @@
 
 === async.js ===
 exports.default = { m: 1, a: 1 }
->exports : Symbol("async", Decl(async.js, 0, 0))
+>exports : Symbol("./async", Decl(async.js, 0, 0))
 >m : Symbol(m, Decl(async.js, 0, 19))
 >a : Symbol(a, Decl(async.js, 0, 25))
 
@@ -10,5 +10,5 @@ module.exports = exports['default'];
 >module.exports : Symbol(export=, Decl(async.js, 0, 32))
 >module : Symbol(module.exports)
 >exports : Symbol(export=, Decl(async.js, 0, 32))
->exports : Symbol("async", Decl(async.js, 0, 0))
+>exports : Symbol("./async", Decl(async.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols.diff
index 2ea079bfe5..7aea5e56fc 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols.diff
@@ -6,7 +6,7 @@
  exports.default = { m: 1, a: 1 }
 ->exports : Symbol(default, Decl(async.js, 0, 0))
 ->default : Symbol(default, Decl(async.js, 0, 0))
-+>exports : Symbol("async", Decl(async.js, 0, 0))
++>exports : Symbol("./async", Decl(async.js, 0, 0))
  >m : Symbol(m, Decl(async.js, 0, 19))
  >a : Symbol(a, Decl(async.js, 0, 25))
 
@@ -16,4 +16,5 @@
 +>module.exports : Symbol(export=, Decl(async.js, 0, 32))
 +>module : Symbol(module.exports)
  >exports : Symbol(export=, Decl(async.js, 0, 32))
- >exports : Symbol("async", Decl(async.js, 0, 0))
+->exports : Symbol("async", Decl(async.js, 0, 0))
++>exports : Symbol("./async", Decl(async.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.types b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.types
index 66d1d5d838..155e39e2e2 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.types
@@ -4,7 +4,7 @@
 exports.default = { m: 1, a: 1 }
 >exports.default = { m: 1, a: 1 } : { m: number; a: number; }
 >exports.default : any
->exports : typeof import("async")
+>exports : typeof import("./async")
 >default : any
 >{ m: 1, a: 1 } : { m: number; a: number; }
 >m : number
@@ -18,6 +18,6 @@ module.exports = exports['default'];
 >module : { "export=": any; }
 >exports : any
 >exports['default'] : any
->exports : typeof import("async")
+>exports : typeof import("./async")
 >'default' : "default"
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.symbols
index 330ee93fa9..7f5a394da8 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.symbols
@@ -4,7 +4,7 @@
 const { apply } = require('./moduleExportAliasDuplicateAlias')
 >apply : Symbol(apply, Decl(test.js, 0, 7))
 >require : Symbol(require)
->'./moduleExportAliasDuplicateAlias' : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>'./moduleExportAliasDuplicateAlias' : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 
 apply()
 >apply : Symbol(apply, Decl(test.js, 0, 7))
@@ -12,7 +12,7 @@ apply()
 === moduleExportAliasDuplicateAlias.js ===
 exports.apply = undefined;
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
 >undefined : Symbol(undefined)
 
@@ -21,17 +21,17 @@ function a() { }
 
 exports.apply()
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
 
 exports.apply = a;
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
 >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 26))
 
 exports.apply()
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.symbols.diff
index dbca3c343a..b56bd95c1a 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.symbols.diff
@@ -1,19 +1,40 @@
 --- old.moduleExportDuplicateAlias.symbols
 +++ new.moduleExportDuplicateAlias.symbols
-@@= skipped -11, +11 lines =@@
+@@= skipped -3, +3 lines =@@
+ const { apply } = require('./moduleExportAliasDuplicateAlias')
+ >apply : Symbol(apply, Decl(test.js, 0, 7))
+ >require : Symbol(require)
+->'./moduleExportAliasDuplicateAlias' : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>'./moduleExportAliasDuplicateAlias' : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+
+ apply()
+ >apply : Symbol(apply, Decl(test.js, 0, 7))
+@@= skipped -8, +8 lines =@@
  === moduleExportAliasDuplicateAlias.js ===
  exports.apply = undefined;
  >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
 ->exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
  >undefined : Symbol(undefined)
 
-@@= skipped -14, +14 lines =@@
+@@= skipped -9, +9 lines =@@
+
+ exports.apply()
+ >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
+->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+ >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
 
  exports.apply = a;
  >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
 ->exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
  >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 26))
+
+ exports.apply()
+ >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
+->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+ >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 2, 15))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.types b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.types
index 393db5718b..ea268466c5 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.types
@@ -3,7 +3,7 @@
 === test.js ===
 const { apply } = require('./moduleExportAliasDuplicateAlias')
 >apply : undefined
->require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
+>require('./moduleExportAliasDuplicateAlias') : typeof import("./moduleExportAliasDuplicateAlias")
 >require : any
 >'./moduleExportAliasDuplicateAlias' : "./moduleExportAliasDuplicateAlias"
 
@@ -15,7 +15,7 @@ apply()
 exports.apply = undefined;
 >exports.apply = undefined : undefined
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >undefined : undefined
 
@@ -25,19 +25,19 @@ function a() { }
 exports.apply()
 >exports.apply() : any
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 
 exports.apply = a;
 >exports.apply = a : () => void
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >a : () => void
 
 exports.apply()
 >exports.apply() : any
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols
index 6441cf72c8..2fae51cd2d 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols
@@ -4,7 +4,7 @@
 const { apply } = require('./moduleExportAliasDuplicateAlias')
 >apply : Symbol(apply, Decl(test.js, 0, 7))
 >require : Symbol(require)
->'./moduleExportAliasDuplicateAlias' : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>'./moduleExportAliasDuplicateAlias' : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 
 apply()
 >apply : Symbol(apply, Decl(test.js, 0, 7))
@@ -12,9 +12,9 @@ apply()
 === moduleExportAliasDuplicateAlias.js ===
 module.exports.apply = undefined;
 >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
->module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>module.exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >undefined : Symbol(undefined)
 
@@ -23,24 +23,24 @@ function a() { }
 
 module.exports.apply = a;
 >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
->module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>module.exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 33))
 
 module.exports.apply = a;
 >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
->module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>module.exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 33))
 
 module.exports.apply()
 >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
->module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>module.exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols.diff
index 265c5d3763..12ef0a51df 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols.diff
@@ -1,15 +1,24 @@
 --- old.moduleExportDuplicateAlias2.symbols
 +++ new.moduleExportDuplicateAlias2.symbols
-@@= skipped -11, +11 lines =@@
+@@= skipped -3, +3 lines =@@
+ const { apply } = require('./moduleExportAliasDuplicateAlias')
+ >apply : Symbol(apply, Decl(test.js, 0, 7))
+ >require : Symbol(require)
+->'./moduleExportAliasDuplicateAlias' : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>'./moduleExportAliasDuplicateAlias' : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+
+ apply()
+ >apply : Symbol(apply, Decl(test.js, 0, 7))
+@@= skipped -8, +8 lines =@@
  === moduleExportAliasDuplicateAlias.js ===
  module.exports.apply = undefined;
  >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 ->module.exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 ->module : Symbol(module, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
-+>module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>module.exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
  >undefined : Symbol(undefined)
 
@@ -20,9 +29,9 @@
 ->module.exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 ->module : Symbol(module, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
-+>module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>module.exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
  >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 33))
 
@@ -31,9 +40,9 @@
 ->module.exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 ->module : Symbol(module, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
-+>module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>module.exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
  >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 33))
 
@@ -42,7 +51,7 @@
 ->module.exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->module : Symbol(module, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
-+>module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>module.exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.types b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.types
index 691a3185a0..ff8d430fea 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.types
@@ -3,7 +3,7 @@
 === test.js ===
 const { apply } = require('./moduleExportAliasDuplicateAlias')
 >apply : undefined
->require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
+>require('./moduleExportAliasDuplicateAlias') : typeof import("./moduleExportAliasDuplicateAlias")
 >require : any
 >'./moduleExportAliasDuplicateAlias' : "./moduleExportAliasDuplicateAlias"
 
@@ -15,9 +15,9 @@ apply()
 module.exports.apply = undefined;
 >module.exports.apply = undefined : undefined
 >module.exports.apply : undefined
->module.exports : typeof import("moduleExportAliasDuplicateAlias")
->module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("moduleExportAliasDuplicateAlias"); }
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>module.exports : typeof import("./moduleExportAliasDuplicateAlias")
+>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("./moduleExportAliasDuplicateAlias"); }
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >undefined : undefined
 
@@ -27,26 +27,26 @@ function a() { }
 module.exports.apply = a;
 >module.exports.apply = a : () => void
 >module.exports.apply : undefined
->module.exports : typeof import("moduleExportAliasDuplicateAlias")
->module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("moduleExportAliasDuplicateAlias"); }
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>module.exports : typeof import("./moduleExportAliasDuplicateAlias")
+>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("./moduleExportAliasDuplicateAlias"); }
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >a : () => void
 
 module.exports.apply = a;
 >module.exports.apply = a : () => void
 >module.exports.apply : undefined
->module.exports : typeof import("moduleExportAliasDuplicateAlias")
->module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("moduleExportAliasDuplicateAlias"); }
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>module.exports : typeof import("./moduleExportAliasDuplicateAlias")
+>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("./moduleExportAliasDuplicateAlias"); }
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >a : () => void
 
 module.exports.apply()
 >module.exports.apply() : any
 >module.exports.apply : undefined
->module.exports : typeof import("moduleExportAliasDuplicateAlias")
->module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("moduleExportAliasDuplicateAlias"); }
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>module.exports : typeof import("./moduleExportAliasDuplicateAlias")
+>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("./moduleExportAliasDuplicateAlias"); }
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.symbols
index 8fb360fee5..7cdf1668c7 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.symbols
@@ -4,7 +4,7 @@
 const { apply } = require('./moduleExportAliasDuplicateAlias')
 >apply : Symbol(apply, Decl(test.js, 0, 7))
 >require : Symbol(require)
->'./moduleExportAliasDuplicateAlias' : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>'./moduleExportAliasDuplicateAlias' : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 
 const result = apply.toFixed()
 >result : Symbol(result, Decl(test.js, 1, 5))
@@ -13,13 +13,13 @@ const result = apply.toFixed()
 === moduleExportAliasDuplicateAlias.js ===
 exports.apply = undefined;
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 >undefined : Symbol(undefined)
 
 exports.apply = undefined;
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 >undefined : Symbol(undefined)
 
@@ -28,28 +28,28 @@ function a() { }
 
 exports.apply = a;
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 1, 26))
 
 exports.apply()
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 
 exports.apply = 'ok'
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 
 var OK = exports.apply.toUpperCase()
 >OK : Symbol(OK, Decl(moduleExportAliasDuplicateAlias.js, 6, 3))
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 
 exports.apply = 1
 >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.symbols.diff
index 5e155e298c..d0739a0649 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.symbols.diff
@@ -1,6 +1,11 @@
 --- old.moduleExportDuplicateAlias3.symbols
 +++ new.moduleExportDuplicateAlias3.symbols
-@@= skipped -7, +7 lines =@@
+@@= skipped -3, +3 lines =@@
+ const { apply } = require('./moduleExportAliasDuplicateAlias')
+ >apply : Symbol(apply, Decl(test.js, 0, 7))
+ >require : Symbol(require)
+->'./moduleExportAliasDuplicateAlias' : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>'./moduleExportAliasDuplicateAlias' : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 
  const result = apply.toFixed()
  >result : Symbol(result, Decl(test.js, 1, 5))
@@ -12,44 +17,49 @@
  exports.apply = undefined;
  >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 ->exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
  >undefined : Symbol(undefined)
 
  exports.apply = undefined;
  >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 ->exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
  >undefined : Symbol(undefined)
 
-@@= skipped -22, +20 lines =@@
+@@= skipped -26, +24 lines =@@
 
  exports.apply = a;
  >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 ->exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
  >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 1, 26))
 
-@@= skipped -11, +11 lines =@@
+ exports.apply()
+ >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
+->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+ >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 
  exports.apply = 'ok'
  >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 ->exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 
  var OK = exports.apply.toUpperCase()
  >OK : Symbol(OK, Decl(moduleExportAliasDuplicateAlias.js, 6, 3))
 ->exports.apply.toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
  >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
- >exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
+->exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 ->toUpperCase : Symbol(String.toUpperCase, Decl(lib.es5.d.ts, --, --))
 
  exports.apply = 1
  >exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
 ->exports : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
-+>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
++>exports : Symbol("./moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 0, 26), Decl(moduleExportAliasDuplicateAlias.js, 2, 16), Decl(moduleExportAliasDuplicateAlias.js, 4, 15), Decl(moduleExportAliasDuplicateAlias.js, 6, 36))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.types b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.types
index dae5cbe2fd..614318ae51 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.types
@@ -3,7 +3,7 @@
 === test.js ===
 const { apply } = require('./moduleExportAliasDuplicateAlias')
 >apply : undefined
->require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
+>require('./moduleExportAliasDuplicateAlias') : typeof import("./moduleExportAliasDuplicateAlias")
 >require : any
 >'./moduleExportAliasDuplicateAlias' : "./moduleExportAliasDuplicateAlias"
 
@@ -18,14 +18,14 @@ const result = apply.toFixed()
 exports.apply = undefined;
 >exports.apply = undefined : undefined
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >undefined : undefined
 
 exports.apply = undefined;
 >exports.apply = undefined : undefined
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >undefined : undefined
 
@@ -35,20 +35,20 @@ function a() { }
 exports.apply = a;
 >exports.apply = a : () => void
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >a : () => void
 
 exports.apply()
 >exports.apply() : any
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 
 exports.apply = 'ok'
 >exports.apply = 'ok' : "ok"
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >'ok' : "ok"
 
@@ -57,14 +57,14 @@ var OK = exports.apply.toUpperCase()
 >exports.apply.toUpperCase() : any
 >exports.apply.toUpperCase : any
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >toUpperCase : any
 
 exports.apply = 1
 >exports.apply = 1 : 1
 >exports.apply : undefined
->exports : typeof import("moduleExportAliasDuplicateAlias")
+>exports : typeof import("./moduleExportAliasDuplicateAlias")
 >apply : undefined
 >1 : 1
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols
index 70e1943890..9c51a51541 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols
@@ -3,16 +3,16 @@
 === mod.js ===
 module.exports.n = {};
 >module.exports.n : Symbol(n, Decl(mod.js, 0, 0))
->module.exports : Symbol("mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >n : Symbol(n, Decl(mod.js, 0, 0))
 
 module.exports.n.K = function C() {
 >module.exports.n : Symbol(n, Decl(mod.js, 0, 0))
->module.exports : Symbol("mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >n : Symbol(n, Decl(mod.js, 0, 0))
 >C : Symbol(C, Decl(mod.js, 1, 20))
 
@@ -20,9 +20,9 @@ module.exports.n.K = function C() {
 }
 module.exports.Classic = class {
 >module.exports.Classic : Symbol(Classic, Decl(mod.js, 3, 1))
->module.exports : Symbol("mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("mod", Decl(mod.js, 0, 0))
+>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 >Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 
     constructor() {
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols.diff
index 2595bc30e5..cabc5ba336 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols.diff
@@ -10,9 +10,9 @@
 ->exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 ->n : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 15))
 +>module.exports.n : Symbol(n, Decl(mod.js, 0, 0))
-+>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
++>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>n : Symbol(n, Decl(mod.js, 0, 0))
 
  module.exports.n.K = function C() {
@@ -24,9 +24,9 @@
 ->n : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 15))
 ->K : Symbol(n.K, Decl(mod.js, 0, 22))
 +>module.exports.n : Symbol(n, Decl(mod.js, 0, 0))
-+>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
++>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>n : Symbol(n, Decl(mod.js, 0, 0))
  >C : Symbol(C, Decl(mod.js, 1, 20))
 
@@ -40,9 +40,9 @@
 ->module.exports : Symbol(Classic, Decl(mod.js, 3, 1))
 ->module : Symbol(module, Decl(mod.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(mod.js, 0, 0))
-+>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
++>module.exports : Symbol("./mod", Decl(mod.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("mod", Decl(mod.js, 0, 0))
++>exports : Symbol("./mod", Decl(mod.js, 0, 0))
  >Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 
      constructor() {
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.types b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.types
index 2c1dc771ce..3bcb48442f 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.types
@@ -4,9 +4,9 @@
 module.exports.n = {};
 >module.exports.n = {} : {}
 >module.exports.n : {}
->module.exports : typeof import("mod")
->module : { "\"mod\"": typeof import("mod"); }
->exports : typeof import("mod")
+>module.exports : typeof import("./mod")
+>module : { "\"mod\"": typeof import("./mod"); }
+>exports : typeof import("./mod")
 >n : {}
 >{} : {}
 
@@ -14,9 +14,9 @@ module.exports.n.K = function C() {
 >module.exports.n.K = function C() {    this.x = 10;} : () => void
 >module.exports.n.K : any
 >module.exports.n : {}
->module.exports : typeof import("mod")
->module : { "\"mod\"": typeof import("mod"); }
->exports : typeof import("mod")
+>module.exports : typeof import("./mod")
+>module : { "\"mod\"": typeof import("./mod"); }
+>exports : typeof import("./mod")
 >n : {}
 >K : any
 >function C() {    this.x = 10;} : () => void
@@ -32,9 +32,9 @@ module.exports.n.K = function C() {
 module.exports.Classic = class {
 >module.exports.Classic = class {    constructor() {        this.p = 1    }} : typeof Classic
 >module.exports.Classic : typeof Classic
->module.exports : typeof import("mod")
->module : { "\"mod\"": typeof import("mod"); }
->exports : typeof import("mod")
+>module.exports : typeof import("./mod")
+>module : { "\"mod\"": typeof import("./mod"); }
+>exports : typeof import("./mod")
 >Classic : typeof Classic
 >class {    constructor() {        this.p = 1    }} : typeof Classic
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols
index 72949ef09f..089248b474 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols
@@ -5,7 +5,7 @@
 var mod1 = require('./mod1')
 >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
 >require : Symbol(require, Decl(requires.d.ts, 0, 37))
->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
+>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 mod1()
 >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols.diff
index 1f47a437b4..2e93ca1915 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols.diff
@@ -1,6 +1,13 @@
 --- old.moduleExportWithExportPropertyAssignment.symbols
 +++ new.moduleExportWithExportPropertyAssignment.symbols
-@@= skipped -10, +10 lines =@@
+@@= skipped -4, +4 lines =@@
+ var mod1 = require('./mod1')
+ >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
+ >require : Symbol(require, Decl(requires.d.ts, 0, 37))
+->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
++>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ mod1()
  >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
 
  mod1.f() // error, not enough arguments
@@ -10,7 +17,7 @@
 
  === requires.d.ts ===
  declare var module: { exports: any };
-@@= skipped -16, +14 lines =@@
+@@= skipped -22, +20 lines =@@
  === mod1.js ===
  /// <reference path='./requires.d.ts' />
  module.exports = function () { }
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols
index 8d1c032884..6f127a682b 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols
@@ -5,7 +5,7 @@
 var mod1 = require('./mod1')
 >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
 >require : Symbol(require, Decl(requires.d.ts, 0, 37))
->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
+>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 mod1.toFixed(12)
 >mod1.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols.diff
index 7ae0287637..067b177b26 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols.diff
@@ -1,6 +1,15 @@
 --- old.moduleExportWithExportPropertyAssignment2.symbols
 +++ new.moduleExportWithExportPropertyAssignment2.symbols
-@@= skipped -26, +26 lines =@@
+@@= skipped -4, +4 lines =@@
+ var mod1 = require('./mod1')
+ >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
+ >require : Symbol(require, Decl(requires.d.ts, 0, 37))
+->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
++>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ mod1.toFixed(12)
+ >mod1.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
+@@= skipped -22, +22 lines =@@
  === mod1.js ===
  /// <reference path='./requires.d.ts' />
  module.exports = 1
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols
index 87abe7abea..e7364473f7 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols
@@ -5,7 +5,7 @@
 var mod1 = require('./mod1')
 >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
 >require : Symbol(require, Decl(requires.d.ts, 0, 37))
->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
+>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 mod1.justExport.toFixed()
 >mod1.justExport.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols.diff
index 5899a74aff..24239ca57e 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols.diff
@@ -1,6 +1,15 @@
 --- old.moduleExportWithExportPropertyAssignment3.symbols
 +++ new.moduleExportWithExportPropertyAssignment3.symbols
-@@= skipped -14, +14 lines =@@
+@@= skipped -4, +4 lines =@@
+ var mod1 = require('./mod1')
+ >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
+ >require : Symbol(require, Decl(requires.d.ts, 0, 37))
+->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
++>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ mod1.justExport.toFixed()
+ >mod1.justExport.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
+@@= skipped -10, +10 lines =@@
  >toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
 
  mod1.bothBefore.toFixed() // error, 'toFixed' not on 'string | number'
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols
index ae3aed29be..af388e96bb 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols
@@ -5,7 +5,7 @@
 var mod1 = require('./mod1')
 >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
 >require : Symbol(require, Decl(requires.d.ts, 0, 37))
->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
+>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 mod1.justExport.toFixed()
 >mod1.justExport.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols.diff
index a1473001d8..ba70a0df54 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols.diff
@@ -1,6 +1,15 @@
 --- old.moduleExportWithExportPropertyAssignment4.symbols
 +++ new.moduleExportWithExportPropertyAssignment4.symbols
-@@= skipped -14, +14 lines =@@
+@@= skipped -4, +4 lines =@@
+ var mod1 = require('./mod1')
+ >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
+ >require : Symbol(require, Decl(requires.d.ts, 0, 37))
+->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
++>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ mod1.justExport.toFixed()
+ >mod1.justExport.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
+@@= skipped -10, +10 lines =@@
  >toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --))
 
  mod1.bothBefore.toFixed() // error
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.symbols
index e062bfc152..06438abc89 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.symbols
@@ -2,11 +2,11 @@
 
 === x.js ===
 exports.fn1();
->exports : Symbol("x", Decl(x.js, 0, 0))
+>exports : Symbol("./x", Decl(x.js, 0, 0))
 
 exports.fn2 = Math.min;
 >exports.fn2 : Symbol(fn2, Decl(x.js, 0, 14))
->exports : Symbol("x", Decl(x.js, 0, 0))
+>exports : Symbol("./x", Decl(x.js, 0, 0))
 >fn2 : Symbol(fn2, Decl(x.js, 0, 14))
 >Math.min : Symbol(Math.min, Decl(lib.es5.d.ts, --, --))
 >Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.symbols.diff
index 41f0c73a8b..2110be0fe1 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.symbols.diff
@@ -1,11 +1,16 @@
 --- old.moduleExportsAliasLoop1.symbols
 +++ new.moduleExportsAliasLoop1.symbols
-@@= skipped -5, +5 lines =@@
+@@= skipped -1, +1 lines =@@
+
+ === x.js ===
+ exports.fn1();
+->exports : Symbol("x", Decl(x.js, 0, 0))
++>exports : Symbol("./x", Decl(x.js, 0, 0))
 
  exports.fn2 = Math.min;
  >exports.fn2 : Symbol(fn2, Decl(x.js, 0, 14))
 ->exports : Symbol(fn2, Decl(x.js, 0, 14))
-+>exports : Symbol("x", Decl(x.js, 0, 0))
++>exports : Symbol("./x", Decl(x.js, 0, 0))
  >fn2 : Symbol(fn2, Decl(x.js, 0, 14))
 ->Math.min : Symbol(fn2, Decl(lib.es5.d.ts, --, --))
 +>Math.min : Symbol(Math.min, Decl(lib.es5.d.ts, --, --))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.types b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.types
index 7a1be8e9a5..bfb4cc2c2f 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop1.types
@@ -4,13 +4,13 @@
 exports.fn1();
 >exports.fn1() : any
 >exports.fn1 : any
->exports : typeof import("x")
+>exports : typeof import("./x")
 >fn1 : any
 
 exports.fn2 = Math.min;
 >exports.fn2 = Math.min : (...values: number[]) => number
 >exports.fn2 : (...values: number[]) => number
->exports : typeof import("x")
+>exports : typeof import("./x")
 >fn2 : (...values: number[]) => number
 >Math.min : (...values: number[]) => number
 >Math : Math
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.symbols
index ff10ba4871..66d6dba2b5 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.symbols
@@ -6,11 +6,11 @@ const Foo = { min: 3 };
 >min : Symbol(min, Decl(x.js, 0, 13))
 
 exports.fn1();
->exports : Symbol("x", Decl(x.js, 0, 0))
+>exports : Symbol("./x", Decl(x.js, 0, 0))
 
 exports.fn2 = Foo.min;
 >exports.fn2 : Symbol(fn2, Decl(x.js, 1, 14))
->exports : Symbol("x", Decl(x.js, 0, 0))
+>exports : Symbol("./x", Decl(x.js, 0, 0))
 >fn2 : Symbol(fn2, Decl(x.js, 1, 14))
 >Foo.min : Symbol(min, Decl(x.js, 0, 13))
 >Foo : Symbol(Foo, Decl(x.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.symbols.diff
index 0e44075be2..27f4208ecc 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.symbols.diff
@@ -1,11 +1,16 @@
 --- old.moduleExportsAliasLoop2.symbols
 +++ new.moduleExportsAliasLoop2.symbols
-@@= skipped -9, +9 lines =@@
+@@= skipped -5, +5 lines =@@
+ >min : Symbol(min, Decl(x.js, 0, 13))
+
+ exports.fn1();
+->exports : Symbol("x", Decl(x.js, 0, 0))
++>exports : Symbol("./x", Decl(x.js, 0, 0))
 
  exports.fn2 = Foo.min;
  >exports.fn2 : Symbol(fn2, Decl(x.js, 1, 14))
 ->exports : Symbol(fn2, Decl(x.js, 1, 14))
-+>exports : Symbol("x", Decl(x.js, 0, 0))
++>exports : Symbol("./x", Decl(x.js, 0, 0))
  >fn2 : Symbol(fn2, Decl(x.js, 1, 14))
 ->Foo.min : Symbol(fn2, Decl(x.js, 0, 13))
 +>Foo.min : Symbol(min, Decl(x.js, 0, 13))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.types b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.types
index cc2605b18b..2a8513b97d 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsAliasLoop2.types
@@ -10,13 +10,13 @@ const Foo = { min: 3 };
 exports.fn1();
 >exports.fn1() : any
 >exports.fn1 : any
->exports : typeof import("x")
+>exports : typeof import("./x")
 >fn1 : any
 
 exports.fn2 = Foo.min;
 >exports.fn2 = Foo.min : number
 >exports.fn2 : number
->exports : typeof import("x")
+>exports : typeof import("./x")
 >fn2 : number
 >Foo.min : number
 >Foo : { min: number; }
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols
index de860794dd..d1b912ed34 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols
@@ -39,34 +39,34 @@ mod1.default;
 === mod1.js ===
 exports.a = { x: "x" };
 >exports.a : Symbol(a, Decl(mod1.js, 0, 0))
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >a : Symbol(a, Decl(mod1.js, 0, 0))
 >x : Symbol(x, Decl(mod1.js, 0, 13))
 
 exports["b"] = { x: "x" };
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >"b" : Symbol("b", Decl(mod1.js, 0, 23))
 >x : Symbol(x, Decl(mod1.js, 1, 16))
 
 exports["default"] = { x: "x" };
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >"default" : Symbol("default", Decl(mod1.js, 1, 26))
 >x : Symbol(x, Decl(mod1.js, 2, 22))
 
 module.exports["c"] = { x: "x" };
->module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >"c" : Symbol("c", Decl(mod1.js, 2, 32))
 >x : Symbol(x, Decl(mod1.js, 3, 23))
 
 module["exports"]["d"] = {};
 >module : Symbol(module.exports)
->"exports" : Symbol("mod1", Decl(mod1.js, 0, 0))
+>"exports" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >"d" : Symbol("d", Decl(mod1.js, 3, 33))
 
 module["exports"]["d"].e = 0;
 >module : Symbol(module.exports)
->"exports" : Symbol("mod1", Decl(mod1.js, 0, 0))
+>"exports" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >"d" : Symbol("d", Decl(mod1.js, 3, 33))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols.diff
index 9cffee87ba..30adb1bea2 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols.diff
@@ -26,20 +26,29 @@
  exports.a = { x: "x" };
  >exports.a : Symbol(a, Decl(mod1.js, 0, 0))
 ->exports : Symbol(a, Decl(mod1.js, 0, 0))
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
  >a : Symbol(a, Decl(mod1.js, 0, 0))
  >x : Symbol(x, Decl(mod1.js, 0, 13))
 
-@@= skipped -15, +15 lines =@@
+ exports["b"] = { x: "x" };
+->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
+ >"b" : Symbol("b", Decl(mod1.js, 0, 23))
+ >x : Symbol(x, Decl(mod1.js, 1, 16))
+
+ exports["default"] = { x: "x" };
+->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
+ >"default" : Symbol("default", Decl(mod1.js, 1, 26))
  >x : Symbol(x, Decl(mod1.js, 2, 22))
 
  module.exports["c"] = { x: "x" };
 ->module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->module : Symbol(module, Decl(mod1.js, 2, 32))
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
-+>module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>module.exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
  >"c" : Symbol("c", Decl(mod1.js, 2, 32))
  >x : Symbol(x, Decl(mod1.js, 3, 23))
 
@@ -48,7 +57,7 @@
 ->"exports" : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->"d" : Symbol("d", Decl(mod1.js, 3, 33), Decl(mod1.js, 5, 18))
 +>module : Symbol(module.exports)
-+>"exports" : Symbol("mod1", Decl(mod1.js, 0, 0))
++>"exports" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 +>"d" : Symbol("d", Decl(mod1.js, 3, 33))
 
  module["exports"]["d"].e = 0;
@@ -58,5 +67,5 @@
 ->"d" : Symbol("d", Decl(mod1.js, 3, 33), Decl(mod1.js, 5, 18))
 ->e : Symbol("d".e, Decl(mod1.js, 4, 28))
 +>module : Symbol(module.exports)
-+>"exports" : Symbol("mod1", Decl(mod1.js, 0, 0))
++>"exports" : Symbol("./mod1", Decl(mod1.js, 0, 0))
 +>"d" : Symbol("d", Decl(mod1.js, 3, 33))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.types b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.types
index 7eb9243928..c84643db7c 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.types
@@ -43,7 +43,7 @@ mod1.default;
 exports.a = { x: "x" };
 >exports.a = { x: "x" } : { x: string; }
 >exports.a : { x: string; }
->exports : typeof import("mod1")
+>exports : typeof import("./mod1")
 >a : { x: string; }
 >{ x: "x" } : { x: string; }
 >x : string
@@ -52,7 +52,7 @@ exports.a = { x: "x" };
 exports["b"] = { x: "x" };
 >exports["b"] = { x: "x" } : { x: string; }
 >exports["b"] : { x: string; }
->exports : typeof import("mod1")
+>exports : typeof import("./mod1")
 >"b" : "b"
 >{ x: "x" } : { x: string; }
 >x : string
@@ -61,7 +61,7 @@ exports["b"] = { x: "x" };
 exports["default"] = { x: "x" };
 >exports["default"] = { x: "x" } : { x: string; }
 >exports["default"] : { x: string; }
->exports : typeof import("mod1")
+>exports : typeof import("./mod1")
 >"default" : "default"
 >{ x: "x" } : { x: string; }
 >x : string
@@ -70,9 +70,9 @@ exports["default"] = { x: "x" };
 module.exports["c"] = { x: "x" };
 >module.exports["c"] = { x: "x" } : { x: string; }
 >module.exports["c"] : { x: string; }
->module.exports : typeof import("mod1")
->module : { "\"mod1\"": typeof import("mod1"); }
->exports : typeof import("mod1")
+>module.exports : typeof import("./mod1")
+>module : { "\"mod1\"": typeof import("./mod1"); }
+>exports : typeof import("./mod1")
 >"c" : "c"
 >{ x: "x" } : { x: string; }
 >x : string
@@ -81,8 +81,8 @@ module.exports["c"] = { x: "x" };
 module["exports"]["d"] = {};
 >module["exports"]["d"] = {} : {}
 >module["exports"]["d"] : {}
->module["exports"] : typeof import("mod1")
->module : { "\"mod1\"": typeof import("mod1"); }
+>module["exports"] : typeof import("./mod1")
+>module : { "\"mod1\"": typeof import("./mod1"); }
 >"exports" : "exports"
 >"d" : "d"
 >{} : {}
@@ -91,8 +91,8 @@ module["exports"]["d"].e = 0;
 >module["exports"]["d"].e = 0 : 0
 >module["exports"]["d"].e : any
 >module["exports"]["d"] : {}
->module["exports"] : typeof import("mod1")
->module : { "\"mod1\"": typeof import("mod1"); }
+>module["exports"] : typeof import("./mod1")
+>module : { "\"mod1\"": typeof import("./mod1"); }
 >"exports" : "exports"
 >"d" : "d"
 >e : any
diff --git a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports03.types b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports03.types
index a0b8143e34..de73e65433 100644
--- a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports03.types
+++ b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports03.types
@@ -6,5 +6,5 @@ export default class C {
 }
 
 export default class C {
->C : import("multipleDefaultExports03").default
+>C : import("./multipleDefaultExports03").default
 }
diff --git a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports03.types.diff b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports03.types.diff
new file mode 100644
index 0000000000..c90e7942e0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports03.types.diff
@@ -0,0 +1,9 @@
+--- old.multipleDefaultExports03.types
++++ new.multipleDefaultExports03.types
+@@= skipped -5, +5 lines =@@
+ }
+
+ export default class C {
+->C : import("multipleDefaultExports03").default
++>C : import("./multipleDefaultExports03").default
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports05.types b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports05.types
index 05854d6371..eb1ba4eec0 100644
--- a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports05.types
+++ b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports05.types
@@ -5,8 +5,8 @@ export default class AA1 {}
 >AA1 : AA1
 
 export default class BB1 {}
->BB1 : import("multipleDefaultExports05").default
+>BB1 : import("./multipleDefaultExports05").default
 
 export default class CC1 {}
->CC1 : import("multipleDefaultExports05").default
+>CC1 : import("./multipleDefaultExports05").default
 
diff --git a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports05.types.diff b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports05.types.diff
new file mode 100644
index 0000000000..a66914f2fd
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports05.types.diff
@@ -0,0 +1,12 @@
+--- old.multipleDefaultExports05.types
++++ new.multipleDefaultExports05.types
+@@= skipped -4, +4 lines =@@
+ >AA1 : AA1
+
+ export default class BB1 {}
+->BB1 : import("multipleDefaultExports05").default
++>BB1 : import("./multipleDefaultExports05").default
+
+ export default class CC1 {}
+->CC1 : import("multipleDefaultExports05").default
++>CC1 : import("./multipleDefaultExports05").default
diff --git a/testdata/baselines/reference/submodule/conformance/multipleExportDefault3.types b/testdata/baselines/reference/submodule/conformance/multipleExportDefault3.types
index 0393dc9f89..0d67002f4a 100644
--- a/testdata/baselines/reference/submodule/conformance/multipleExportDefault3.types
+++ b/testdata/baselines/reference/submodule/conformance/multipleExportDefault3.types
@@ -11,6 +11,6 @@ export default {
 };
 
 export default class C { }
->C : import("multipleExportDefault3").default
+>C : import("./multipleExportDefault3").default
 
 
diff --git a/testdata/baselines/reference/submodule/conformance/multipleExportDefault3.types.diff b/testdata/baselines/reference/submodule/conformance/multipleExportDefault3.types.diff
new file mode 100644
index 0000000000..11d4c61d8e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/multipleExportDefault3.types.diff
@@ -0,0 +1,9 @@
+--- old.multipleExportDefault3.types
++++ new.multipleExportDefault3.types
+@@= skipped -10, +10 lines =@@
+ };
+
+ export default class C { }
+->C : import("multipleExportDefault3").default
++>C : import("./multipleExportDefault3").default
+
diff --git a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols
index 3a19abbb9b..f6ab2a4def 100644
--- a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols
+++ b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols
@@ -8,7 +8,7 @@ const {
 
 } = require('./mod1');
 >require : Symbol(require)
->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
+>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 grey
 >grey : Symbol(grey, Decl(main.js, 1, 12))
@@ -25,9 +25,9 @@ const chalk = {
 };
 module.exports.chalk = chalk
 >module.exports.chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
->module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >module : Symbol(module.exports)
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 >chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
 >chalk : Symbol(chalk, Decl(mod1.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols.diff b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols.diff
index 63b4392e35..86ac7e00eb 100644
--- a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols.diff
@@ -1,14 +1,23 @@
 --- old.nestedDestructuringOfRequire.symbols
 +++ new.nestedDestructuringOfRequire.symbols
-@@= skipped -24, +24 lines =@@
+@@= skipped -7, +7 lines =@@
+
+ } = require('./mod1');
+ >require : Symbol(require)
+->'./mod1' : Symbol("mod1", Decl(mod1.js, 0, 0))
++>'./mod1' : Symbol("./mod1", Decl(mod1.js, 0, 0))
+
+ grey
+ >grey : Symbol(grey, Decl(main.js, 1, 12))
+@@= skipped -17, +17 lines =@@
  };
  module.exports.chalk = chalk
  >module.exports.chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
 ->module.exports : Symbol(chalk, Decl(mod1.js, 2, 2))
 ->module : Symbol(module, Decl(mod1.js, 2, 2))
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
-+>module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>module.exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 +>module : Symbol(module.exports)
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
  >chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
  >chalk : Symbol(chalk, Decl(mod1.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.types b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.types
index 0bbe9c123f..a5b0356940 100644
--- a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.types
+++ b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.types
@@ -7,7 +7,7 @@ const {
 >grey : {}
 
 } = require('./mod1');
->require('./mod1') : typeof import("mod1")
+>require('./mod1') : typeof import("./mod1")
 >require : any
 >'./mod1' : "./mod1"
 
@@ -30,9 +30,9 @@ const chalk = {
 module.exports.chalk = chalk
 >module.exports.chalk = chalk : { grey: {}; }
 >module.exports.chalk : { grey: {}; }
->module.exports : typeof import("mod1")
->module : { "\"mod1\"": typeof import("mod1"); }
->exports : typeof import("mod1")
+>module.exports : typeof import("./mod1")
+>module : { "\"mod1\"": typeof import("./mod1"); }
+>exports : typeof import("./mod1")
 >chalk : { grey: {}; }
 >chalk : { grey: {}; }
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).symbols
index e0dacb4026..2409e80c9c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).symbols
@@ -3,7 +3,7 @@
 === foo.cjs ===
 exports.foo = "foo"
 >exports.foo : Symbol(foo, Decl(foo.cjs, 0, 0))
->exports : Symbol("foo", Decl(foo.cjs, 0, 0))
+>exports : Symbol("./foo.cjs", Decl(foo.cjs, 0, 0))
 >foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 
 === bar.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).symbols.diff
index 60f85982fc..c254afa513 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).symbols.diff
@@ -5,7 +5,7 @@
  exports.foo = "foo"
  >exports.foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 ->exports : Symbol(foo, Decl(foo.cjs, 0, 0))
-+>exports : Symbol("foo", Decl(foo.cjs, 0, 0))
++>exports : Symbol("./foo.cjs", Decl(foo.cjs, 0, 0))
  >foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 
  === bar.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).types
index 44070dc13f..a8044fc0bb 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node16).types
@@ -4,7 +4,7 @@
 exports.foo = "foo"
 >exports.foo = "foo" : "foo"
 >exports.foo : "foo"
->exports : typeof import("foo")
+>exports : typeof import("./foo.cjs")
 >foo : "foo"
 >"foo" : "foo"
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).symbols
index e0dacb4026..2409e80c9c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).symbols
@@ -3,7 +3,7 @@
 === foo.cjs ===
 exports.foo = "foo"
 >exports.foo : Symbol(foo, Decl(foo.cjs, 0, 0))
->exports : Symbol("foo", Decl(foo.cjs, 0, 0))
+>exports : Symbol("./foo.cjs", Decl(foo.cjs, 0, 0))
 >foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 
 === bar.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).symbols.diff
index a8478e44f2..99547f491a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).symbols.diff
@@ -5,7 +5,7 @@
  exports.foo = "foo"
  >exports.foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 ->exports : Symbol(foo, Decl(foo.cjs, 0, 0))
-+>exports : Symbol("foo", Decl(foo.cjs, 0, 0))
++>exports : Symbol("./foo.cjs", Decl(foo.cjs, 0, 0))
  >foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 
  === bar.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).types
index 44070dc13f..a8044fc0bb 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node18).types
@@ -4,7 +4,7 @@
 exports.foo = "foo"
 >exports.foo = "foo" : "foo"
 >exports.foo : "foo"
->exports : typeof import("foo")
+>exports : typeof import("./foo.cjs")
 >foo : "foo"
 >"foo" : "foo"
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).symbols
index e0dacb4026..2409e80c9c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).symbols
@@ -3,7 +3,7 @@
 === foo.cjs ===
 exports.foo = "foo"
 >exports.foo : Symbol(foo, Decl(foo.cjs, 0, 0))
->exports : Symbol("foo", Decl(foo.cjs, 0, 0))
+>exports : Symbol("./foo.cjs", Decl(foo.cjs, 0, 0))
 >foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 
 === bar.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).symbols.diff
index 2a232eef82..823ede0374 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).symbols.diff
@@ -5,7 +5,7 @@
  exports.foo = "foo"
  >exports.foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 ->exports : Symbol(foo, Decl(foo.cjs, 0, 0))
-+>exports : Symbol("foo", Decl(foo.cjs, 0, 0))
++>exports : Symbol("./foo.cjs", Decl(foo.cjs, 0, 0))
  >foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 
  === bar.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).types
index 44070dc13f..a8044fc0bb 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).types
@@ -4,7 +4,7 @@
 exports.foo = "foo"
 >exports.foo = "foo" : "foo"
 >exports.foo : "foo"
->exports : typeof import("foo")
+>exports : typeof import("./foo.cjs")
 >foo : "foo"
 >"foo" : "foo"
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols
index 653778e00a..7b9b9c2b1b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols
@@ -16,85 +16,85 @@ export {};
 // esm format file
 export const a = await import("package/cjs");
 >a : Symbol(a, Decl(other.ts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
 
 export const b = await import("package/mjs");
 >b : Symbol(b, Decl(other.ts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
 
 export const c = await import("package");
 >c : Symbol(c, Decl(other.ts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol("package", Decl(index.ts, 0, 0))
 
 export const f = await import("inner");
 >f : Symbol(f, Decl(other.ts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.ts ===
 // esm format file
 export const d = await import("inner/cjs");
 >d : Symbol(d, Decl(other2.ts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = await import("inner/mjs");
 >e : Symbol(e, Decl(other2.ts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === other.mts ===
 // esm format file
 export const a = await import("package/cjs");
 >a : Symbol(a, Decl(other.mts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
 
 export const b = await import("package/mjs");
 >b : Symbol(b, Decl(other.mts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
 
 export const c = await import("package");
 >c : Symbol(c, Decl(other.mts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol("package", Decl(index.ts, 0, 0))
 
 export const f = await import("inner");
 >f : Symbol(f, Decl(other.mts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.mts ===
 // esm format file
 export const d = await import("inner/cjs");
 >d : Symbol(d, Decl(other2.mts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = await import("inner/mjs");
 >e : Symbol(e, Decl(other2.mts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === other.cts ===
 // cjs format file, no TLA
 export const a = import("package/cjs");
 >a : Symbol(a, Decl(other.cts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("./index.cts", Decl(index.cts, 0, 0))
 
 export const b = import("package/mjs");
 >b : Symbol(b, Decl(other.cts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("./index.mts", Decl(index.mts, 0, 0))
 
 export const c = import("package");
 >c : Symbol(c, Decl(other.cts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol(".", Decl(index.ts, 0, 0))
 
 export const f = import("inner");
 >f : Symbol(f, Decl(other.cts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.cts ===
 // cjs format file, no TLA
 export const d = import("inner/cjs");
 >d : Symbol(d, Decl(other2.cts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = import("inner/mjs");
 >e : Symbol(e, Decl(other2.cts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === node_modules/inner/index.d.ts ===
 // cjs format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols.diff
new file mode 100644
index 0000000000..b09cf56bef
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols.diff
@@ -0,0 +1,106 @@
+--- old.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols
++++ new.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).symbols
+@@= skipped -15, +15 lines =@@
+ // esm format file
+ export const a = await import("package/cjs");
+ >a : Symbol(a, Decl(other.ts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
+
+ export const b = await import("package/mjs");
+ >b : Symbol(b, Decl(other.ts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
+
+ export const c = await import("package");
+ >c : Symbol(c, Decl(other.ts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol("package", Decl(index.ts, 0, 0))
+
+ export const f = await import("inner");
+ >f : Symbol(f, Decl(other.ts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.ts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+ >d : Symbol(d, Decl(other2.ts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = await import("inner/mjs");
+ >e : Symbol(e, Decl(other2.ts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === other.mts ===
+ // esm format file
+ export const a = await import("package/cjs");
+ >a : Symbol(a, Decl(other.mts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
+
+ export const b = await import("package/mjs");
+ >b : Symbol(b, Decl(other.mts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
+
+ export const c = await import("package");
+ >c : Symbol(c, Decl(other.mts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol("package", Decl(index.ts, 0, 0))
+
+ export const f = await import("inner");
+ >f : Symbol(f, Decl(other.mts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.mts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+ >d : Symbol(d, Decl(other2.mts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = await import("inner/mjs");
+ >e : Symbol(e, Decl(other2.mts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === other.cts ===
+ // cjs format file, no TLA
+ export const a = import("package/cjs");
+ >a : Symbol(a, Decl(other.cts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("./index.cts", Decl(index.cts, 0, 0))
+
+ export const b = import("package/mjs");
+ >b : Symbol(b, Decl(other.cts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("./index.mts", Decl(index.mts, 0, 0))
+
+ export const c = import("package");
+ >c : Symbol(c, Decl(other.cts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol(".", Decl(index.ts, 0, 0))
+
+ export const f = import("inner");
+ >f : Symbol(f, Decl(other.cts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.cts ===
+ // cjs format file, no TLA
+ export const d = import("inner/cjs");
+ >d : Symbol(d, Decl(other2.cts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = import("inner/mjs");
+ >e : Symbol(e, Decl(other2.cts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === node_modules/inner/index.d.ts ===
+ // cjs format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types
index 23cab9aabd..8defe1daf4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types
@@ -15,115 +15,115 @@ export {};
 === other.ts ===
 // esm format file
 export const a = await import("package/cjs");
->a : typeof import("index")
->await import("package/cjs") : typeof import("index")
->import("package/cjs") : Promise<typeof import("index")>
+>a : typeof import("package/cjs")
+>await import("package/cjs") : typeof import("package/cjs")
+>import("package/cjs") : Promise<typeof import("package/cjs")>
 >"package/cjs" : "package/cjs"
 
 export const b = await import("package/mjs");
->b : typeof import("index")
->await import("package/mjs") : typeof import("index")
->import("package/mjs") : Promise<typeof import("index")>
+>b : typeof import("package/mjs")
+>await import("package/mjs") : typeof import("package/mjs")
+>import("package/mjs") : Promise<typeof import("package/mjs")>
 >"package/mjs" : "package/mjs"
 
 export const c = await import("package");
->c : typeof import("index")
->await import("package") : typeof import("index")
->import("package") : Promise<typeof import("index")>
+>c : typeof import("package")
+>await import("package") : typeof import("package")
+>import("package") : Promise<typeof import("package")>
 >"package" : "package"
 
 export const f = await import("inner");
->f : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>f : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
 
 === other2.ts ===
 // esm format file
 export const d = await import("inner/cjs");
->d : typeof import("node_modules/inner/index")
->await import("inner/cjs") : typeof import("node_modules/inner/index")
->import("inner/cjs") : Promise<typeof import("node_modules/inner/index")>
+>d : typeof import("inner/cjs")
+>await import("inner/cjs") : typeof import("inner/cjs")
+>import("inner/cjs") : Promise<typeof import("inner/cjs")>
 >"inner/cjs" : "inner/cjs"
 
 export const e = await import("inner/mjs");
->e : typeof import("node_modules/inner/index")
->await import("inner/mjs") : typeof import("node_modules/inner/index")
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
+>e : typeof import("inner/mjs")
+>await import("inner/mjs") : typeof import("inner/mjs")
+>import("inner/mjs") : Promise<typeof import("inner/mjs")>
 >"inner/mjs" : "inner/mjs"
 
 === other.mts ===
 // esm format file
 export const a = await import("package/cjs");
->a : typeof import("index")
->await import("package/cjs") : typeof import("index")
->import("package/cjs") : Promise<typeof import("index")>
+>a : typeof import("package/cjs")
+>await import("package/cjs") : typeof import("package/cjs")
+>import("package/cjs") : Promise<typeof import("package/cjs")>
 >"package/cjs" : "package/cjs"
 
 export const b = await import("package/mjs");
->b : typeof import("index")
->await import("package/mjs") : typeof import("index")
->import("package/mjs") : Promise<typeof import("index")>
+>b : typeof import("package/mjs")
+>await import("package/mjs") : typeof import("package/mjs")
+>import("package/mjs") : Promise<typeof import("package/mjs")>
 >"package/mjs" : "package/mjs"
 
 export const c = await import("package");
->c : typeof import("index")
->await import("package") : typeof import("index")
->import("package") : Promise<typeof import("index")>
+>c : typeof import("package")
+>await import("package") : typeof import("package")
+>import("package") : Promise<typeof import("package")>
 >"package" : "package"
 
 export const f = await import("inner");
->f : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>f : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
 
 === other2.mts ===
 // esm format file
 export const d = await import("inner/cjs");
->d : typeof import("node_modules/inner/index")
->await import("inner/cjs") : typeof import("node_modules/inner/index")
->import("inner/cjs") : Promise<typeof import("node_modules/inner/index")>
+>d : typeof import("inner/cjs")
+>await import("inner/cjs") : typeof import("inner/cjs")
+>import("inner/cjs") : Promise<typeof import("inner/cjs")>
 >"inner/cjs" : "inner/cjs"
 
 export const e = await import("inner/mjs");
->e : typeof import("node_modules/inner/index")
->await import("inner/mjs") : typeof import("node_modules/inner/index")
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
+>e : typeof import("inner/mjs")
+>await import("inner/mjs") : typeof import("inner/mjs")
+>import("inner/mjs") : Promise<typeof import("inner/mjs")>
 >"inner/mjs" : "inner/mjs"
 
 === other.cts ===
 // cjs format file, no TLA
 export const a = import("package/cjs");
->a : Promise<typeof import("index")>
->import("package/cjs") : Promise<typeof import("index")>
+>a : Promise<typeof import("./index.cts")>
+>import("package/cjs") : Promise<typeof import("./index.cts")>
 >"package/cjs" : "package/cjs"
 
 export const b = import("package/mjs");
->b : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
->import("package/mjs") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
+>b : Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>
+>import("package/mjs") : Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>
 >"package/mjs" : "package/mjs"
 
 export const c = import("package");
->c : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
->import("package") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
+>c : Promise<typeof import("package", { with: { "resolution-mode": "import" } })>
+>import("package") : Promise<typeof import("package", { with: { "resolution-mode": "import" } })>
 >"package" : "package"
 
 export const f = import("inner");
->f : Promise<typeof import("node_modules/inner/index")>
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>f : Promise<typeof import("inner")>
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
 
 === other2.cts ===
 // cjs format file, no TLA
 export const d = import("inner/cjs");
->d : Promise<typeof import("node_modules/inner/index")>
->import("inner/cjs") : Promise<typeof import("node_modules/inner/index")>
+>d : Promise<typeof import("inner/cjs")>
+>import("inner/cjs") : Promise<typeof import("inner/cjs")>
 >"inner/cjs" : "inner/cjs"
 
 export const e = import("inner/mjs");
->e : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
+>e : Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>
+>import("inner/mjs") : Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>
 >"inner/mjs" : "inner/mjs"
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types.diff
index 51ba5468e9..a52e794581 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types.diff
@@ -7,22 +7,36 @@
 ->a : { default: typeof import("index"); }
 ->await import("package/cjs") : { default: typeof import("index"); }
 ->import("package/cjs") : Promise<{ default: typeof import("index"); }>
-+>a : typeof import("index")
-+>await import("package/cjs") : typeof import("index")
-+>import("package/cjs") : Promise<typeof import("index")>
++>a : typeof import("package/cjs")
++>await import("package/cjs") : typeof import("package/cjs")
++>import("package/cjs") : Promise<typeof import("package/cjs")>
  >"package/cjs" : "package/cjs"
 
  export const b = await import("package/mjs");
-@@= skipped -18, +18 lines =@@
+->b : typeof import("index")
+->await import("package/mjs") : typeof import("index")
+->import("package/mjs") : Promise<typeof import("index")>
++>b : typeof import("package/mjs")
++>await import("package/mjs") : typeof import("package/mjs")
++>import("package/mjs") : Promise<typeof import("package/mjs")>
+ >"package/mjs" : "package/mjs"
+
+ export const c = await import("package");
+->c : typeof import("index")
+->await import("package") : typeof import("index")
+->import("package") : Promise<typeof import("index")>
++>c : typeof import("package")
++>await import("package") : typeof import("package")
++>import("package") : Promise<typeof import("package")>
  >"package" : "package"
 
  export const f = await import("inner");
 ->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
 ->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
 ->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
-+>f : typeof import("node_modules/inner/index")
-+>await import("inner") : typeof import("node_modules/inner/index")
-+>import("inner") : Promise<typeof import("node_modules/inner/index")>
++>f : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
  >"inner" : "inner"
 
  === other2.ts ===
@@ -31,35 +45,56 @@
 ->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
 ->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
 ->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
-+>d : typeof import("node_modules/inner/index")
-+>await import("inner/cjs") : typeof import("node_modules/inner/index")
-+>import("inner/cjs") : Promise<typeof import("node_modules/inner/index")>
++>d : typeof import("inner/cjs")
++>await import("inner/cjs") : typeof import("inner/cjs")
++>import("inner/cjs") : Promise<typeof import("inner/cjs")>
  >"inner/cjs" : "inner/cjs"
 
  export const e = await import("inner/mjs");
-@@= skipped -22, +22 lines =@@
+->e : typeof import("node_modules/inner/index")
+->await import("inner/mjs") : typeof import("node_modules/inner/index")
+->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
++>e : typeof import("inner/mjs")
++>await import("inner/mjs") : typeof import("inner/mjs")
++>import("inner/mjs") : Promise<typeof import("inner/mjs")>
+ >"inner/mjs" : "inner/mjs"
+
  === other.mts ===
  // esm format file
  export const a = await import("package/cjs");
 ->a : { default: typeof import("index"); }
 ->await import("package/cjs") : { default: typeof import("index"); }
 ->import("package/cjs") : Promise<{ default: typeof import("index"); }>
-+>a : typeof import("index")
-+>await import("package/cjs") : typeof import("index")
-+>import("package/cjs") : Promise<typeof import("index")>
++>a : typeof import("package/cjs")
++>await import("package/cjs") : typeof import("package/cjs")
++>import("package/cjs") : Promise<typeof import("package/cjs")>
  >"package/cjs" : "package/cjs"
 
  export const b = await import("package/mjs");
-@@= skipped -18, +18 lines =@@
+->b : typeof import("index")
+->await import("package/mjs") : typeof import("index")
+->import("package/mjs") : Promise<typeof import("index")>
++>b : typeof import("package/mjs")
++>await import("package/mjs") : typeof import("package/mjs")
++>import("package/mjs") : Promise<typeof import("package/mjs")>
+ >"package/mjs" : "package/mjs"
+
+ export const c = await import("package");
+->c : typeof import("index")
+->await import("package") : typeof import("index")
+->import("package") : Promise<typeof import("index")>
++>c : typeof import("package")
++>await import("package") : typeof import("package")
++>import("package") : Promise<typeof import("package")>
  >"package" : "package"
 
  export const f = await import("inner");
 ->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
 ->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
 ->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
-+>f : typeof import("node_modules/inner/index")
-+>await import("inner") : typeof import("node_modules/inner/index")
-+>import("inner") : Promise<typeof import("node_modules/inner/index")>
++>f : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
  >"inner" : "inner"
 
  === other2.mts ===
@@ -68,31 +103,48 @@
 ->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
 ->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
 ->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
-+>d : typeof import("node_modules/inner/index")
-+>await import("inner/cjs") : typeof import("node_modules/inner/index")
-+>import("inner/cjs") : Promise<typeof import("node_modules/inner/index")>
++>d : typeof import("inner/cjs")
++>await import("inner/cjs") : typeof import("inner/cjs")
++>import("inner/cjs") : Promise<typeof import("inner/cjs")>
  >"inner/cjs" : "inner/cjs"
 
  export const e = await import("inner/mjs");
-@@= skipped -22, +22 lines =@@
+->e : typeof import("node_modules/inner/index")
+->await import("inner/mjs") : typeof import("node_modules/inner/index")
+->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
++>e : typeof import("inner/mjs")
++>await import("inner/mjs") : typeof import("inner/mjs")
++>import("inner/mjs") : Promise<typeof import("inner/mjs")>
+ >"inner/mjs" : "inner/mjs"
+
  === other.cts ===
  // cjs format file, no TLA
  export const a = import("package/cjs");
 ->a : Promise<{ default: typeof import("index"); }>
 ->import("package/cjs") : Promise<{ default: typeof import("index"); }>
-+>a : Promise<typeof import("index")>
-+>import("package/cjs") : Promise<typeof import("index")>
++>a : Promise<typeof import("./index.cts")>
++>import("package/cjs") : Promise<typeof import("./index.cts")>
  >"package/cjs" : "package/cjs"
 
  export const b = import("package/mjs");
-@@= skipped -15, +15 lines =@@
+->b : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
+->import("package/mjs") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
++>b : Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>
++>import("package/mjs") : Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>
+ >"package/mjs" : "package/mjs"
+
+ export const c = import("package");
+->c : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
+->import("package") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
++>c : Promise<typeof import("package", { with: { "resolution-mode": "import" } })>
++>import("package") : Promise<typeof import("package", { with: { "resolution-mode": "import" } })>
  >"package" : "package"
 
  export const f = import("inner");
 ->f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
 ->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
-+>f : Promise<typeof import("node_modules/inner/index")>
-+>import("inner") : Promise<typeof import("node_modules/inner/index")>
++>f : Promise<typeof import("inner")>
++>import("inner") : Promise<typeof import("inner")>
  >"inner" : "inner"
 
  === other2.cts ===
@@ -100,8 +152,15 @@
  export const d = import("inner/cjs");
 ->d : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
 ->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
-+>d : Promise<typeof import("node_modules/inner/index")>
-+>import("inner/cjs") : Promise<typeof import("node_modules/inner/index")>
++>d : Promise<typeof import("inner/cjs")>
++>import("inner/cjs") : Promise<typeof import("inner/cjs")>
  >"inner/cjs" : "inner/cjs"
 
- export const e = import("inner/mjs");
\ No newline at end of file
+ export const e = import("inner/mjs");
+->e : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
+->import("inner/mjs") : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
++>e : Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>
++>import("inner/mjs") : Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>
+ >"inner/mjs" : "inner/mjs"
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols
index 653778e00a..7b9b9c2b1b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols
@@ -16,85 +16,85 @@ export {};
 // esm format file
 export const a = await import("package/cjs");
 >a : Symbol(a, Decl(other.ts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
 
 export const b = await import("package/mjs");
 >b : Symbol(b, Decl(other.ts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
 
 export const c = await import("package");
 >c : Symbol(c, Decl(other.ts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol("package", Decl(index.ts, 0, 0))
 
 export const f = await import("inner");
 >f : Symbol(f, Decl(other.ts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.ts ===
 // esm format file
 export const d = await import("inner/cjs");
 >d : Symbol(d, Decl(other2.ts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = await import("inner/mjs");
 >e : Symbol(e, Decl(other2.ts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === other.mts ===
 // esm format file
 export const a = await import("package/cjs");
 >a : Symbol(a, Decl(other.mts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
 
 export const b = await import("package/mjs");
 >b : Symbol(b, Decl(other.mts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
 
 export const c = await import("package");
 >c : Symbol(c, Decl(other.mts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol("package", Decl(index.ts, 0, 0))
 
 export const f = await import("inner");
 >f : Symbol(f, Decl(other.mts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.mts ===
 // esm format file
 export const d = await import("inner/cjs");
 >d : Symbol(d, Decl(other2.mts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = await import("inner/mjs");
 >e : Symbol(e, Decl(other2.mts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === other.cts ===
 // cjs format file, no TLA
 export const a = import("package/cjs");
 >a : Symbol(a, Decl(other.cts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("./index.cts", Decl(index.cts, 0, 0))
 
 export const b = import("package/mjs");
 >b : Symbol(b, Decl(other.cts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("./index.mts", Decl(index.mts, 0, 0))
 
 export const c = import("package");
 >c : Symbol(c, Decl(other.cts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol(".", Decl(index.ts, 0, 0))
 
 export const f = import("inner");
 >f : Symbol(f, Decl(other.cts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.cts ===
 // cjs format file, no TLA
 export const d = import("inner/cjs");
 >d : Symbol(d, Decl(other2.cts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = import("inner/mjs");
 >e : Symbol(e, Decl(other2.cts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === node_modules/inner/index.d.ts ===
 // cjs format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols.diff
new file mode 100644
index 0000000000..9732961d88
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols.diff
@@ -0,0 +1,106 @@
+--- old.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols
++++ new.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).symbols
+@@= skipped -15, +15 lines =@@
+ // esm format file
+ export const a = await import("package/cjs");
+ >a : Symbol(a, Decl(other.ts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
+
+ export const b = await import("package/mjs");
+ >b : Symbol(b, Decl(other.ts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
+
+ export const c = await import("package");
+ >c : Symbol(c, Decl(other.ts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol("package", Decl(index.ts, 0, 0))
+
+ export const f = await import("inner");
+ >f : Symbol(f, Decl(other.ts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.ts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+ >d : Symbol(d, Decl(other2.ts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = await import("inner/mjs");
+ >e : Symbol(e, Decl(other2.ts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === other.mts ===
+ // esm format file
+ export const a = await import("package/cjs");
+ >a : Symbol(a, Decl(other.mts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
+
+ export const b = await import("package/mjs");
+ >b : Symbol(b, Decl(other.mts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
+
+ export const c = await import("package");
+ >c : Symbol(c, Decl(other.mts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol("package", Decl(index.ts, 0, 0))
+
+ export const f = await import("inner");
+ >f : Symbol(f, Decl(other.mts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.mts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+ >d : Symbol(d, Decl(other2.mts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = await import("inner/mjs");
+ >e : Symbol(e, Decl(other2.mts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === other.cts ===
+ // cjs format file, no TLA
+ export const a = import("package/cjs");
+ >a : Symbol(a, Decl(other.cts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("./index.cts", Decl(index.cts, 0, 0))
+
+ export const b = import("package/mjs");
+ >b : Symbol(b, Decl(other.cts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("./index.mts", Decl(index.mts, 0, 0))
+
+ export const c = import("package");
+ >c : Symbol(c, Decl(other.cts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol(".", Decl(index.ts, 0, 0))
+
+ export const f = import("inner");
+ >f : Symbol(f, Decl(other.cts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.cts ===
+ // cjs format file, no TLA
+ export const d = import("inner/cjs");
+ >d : Symbol(d, Decl(other2.cts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = import("inner/mjs");
+ >e : Symbol(e, Decl(other2.cts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === node_modules/inner/index.d.ts ===
+ // cjs format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types
index 9f4bf477f6..53c5fb3200 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types
@@ -15,115 +15,115 @@ export {};
 === other.ts ===
 // esm format file
 export const a = await import("package/cjs");
->a : { default: typeof import("index"); }
->await import("package/cjs") : { default: typeof import("index"); }
->import("package/cjs") : Promise<{ default: typeof import("index"); }>
+>a : { default: typeof import("package/cjs"); }
+>await import("package/cjs") : { default: typeof import("package/cjs"); }
+>import("package/cjs") : Promise<{ default: typeof import("package/cjs"); }>
 >"package/cjs" : "package/cjs"
 
 export const b = await import("package/mjs");
->b : typeof import("index")
->await import("package/mjs") : typeof import("index")
->import("package/mjs") : Promise<typeof import("index")>
+>b : typeof import("package/mjs")
+>await import("package/mjs") : typeof import("package/mjs")
+>import("package/mjs") : Promise<typeof import("package/mjs")>
 >"package/mjs" : "package/mjs"
 
 export const c = await import("package");
->c : typeof import("index")
->await import("package") : typeof import("index")
->import("package") : Promise<typeof import("index")>
+>c : typeof import("package")
+>await import("package") : typeof import("package")
+>import("package") : Promise<typeof import("package")>
 >"package" : "package"
 
 export const f = await import("inner");
->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
+>f : { cjsMain: true; default: typeof import("inner"); }
+>await import("inner") : { cjsMain: true; default: typeof import("inner"); }
+>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
 >"inner" : "inner"
 
 === other2.ts ===
 // esm format file
 export const d = await import("inner/cjs");
->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
+>d : { cjsNonmain: true; default: typeof import("inner/cjs"); }
+>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("inner/cjs"); }
+>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
 >"inner/cjs" : "inner/cjs"
 
 export const e = await import("inner/mjs");
->e : typeof import("node_modules/inner/index")
->await import("inner/mjs") : typeof import("node_modules/inner/index")
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
+>e : typeof import("inner/mjs")
+>await import("inner/mjs") : typeof import("inner/mjs")
+>import("inner/mjs") : Promise<typeof import("inner/mjs")>
 >"inner/mjs" : "inner/mjs"
 
 === other.mts ===
 // esm format file
 export const a = await import("package/cjs");
->a : { default: typeof import("index"); }
->await import("package/cjs") : { default: typeof import("index"); }
->import("package/cjs") : Promise<{ default: typeof import("index"); }>
+>a : { default: typeof import("package/cjs"); }
+>await import("package/cjs") : { default: typeof import("package/cjs"); }
+>import("package/cjs") : Promise<{ default: typeof import("package/cjs"); }>
 >"package/cjs" : "package/cjs"
 
 export const b = await import("package/mjs");
->b : typeof import("index")
->await import("package/mjs") : typeof import("index")
->import("package/mjs") : Promise<typeof import("index")>
+>b : typeof import("package/mjs")
+>await import("package/mjs") : typeof import("package/mjs")
+>import("package/mjs") : Promise<typeof import("package/mjs")>
 >"package/mjs" : "package/mjs"
 
 export const c = await import("package");
->c : typeof import("index")
->await import("package") : typeof import("index")
->import("package") : Promise<typeof import("index")>
+>c : typeof import("package")
+>await import("package") : typeof import("package")
+>import("package") : Promise<typeof import("package")>
 >"package" : "package"
 
 export const f = await import("inner");
->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
+>f : { cjsMain: true; default: typeof import("inner"); }
+>await import("inner") : { cjsMain: true; default: typeof import("inner"); }
+>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
 >"inner" : "inner"
 
 === other2.mts ===
 // esm format file
 export const d = await import("inner/cjs");
->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
+>d : { cjsNonmain: true; default: typeof import("inner/cjs"); }
+>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("inner/cjs"); }
+>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
 >"inner/cjs" : "inner/cjs"
 
 export const e = await import("inner/mjs");
->e : typeof import("node_modules/inner/index")
->await import("inner/mjs") : typeof import("node_modules/inner/index")
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
+>e : typeof import("inner/mjs")
+>await import("inner/mjs") : typeof import("inner/mjs")
+>import("inner/mjs") : Promise<typeof import("inner/mjs")>
 >"inner/mjs" : "inner/mjs"
 
 === other.cts ===
 // cjs format file, no TLA
 export const a = import("package/cjs");
->a : Promise<{ default: typeof import("index"); }>
->import("package/cjs") : Promise<{ default: typeof import("index"); }>
+>a : Promise<{ default: typeof import("./index.cts"); }>
+>import("package/cjs") : Promise<{ default: typeof import("./index.cts"); }>
 >"package/cjs" : "package/cjs"
 
 export const b = import("package/mjs");
->b : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
->import("package/mjs") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
+>b : Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>
+>import("package/mjs") : Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>
 >"package/mjs" : "package/mjs"
 
 export const c = import("package");
->c : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
->import("package") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
+>c : Promise<typeof import("package", { with: { "resolution-mode": "import" } })>
+>import("package") : Promise<typeof import("package", { with: { "resolution-mode": "import" } })>
 >"package" : "package"
 
 export const f = import("inner");
->f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
+>f : Promise<{ cjsMain: true; default: typeof import("inner"); }>
+>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
 >"inner" : "inner"
 
 === other2.cts ===
 // cjs format file, no TLA
 export const d = import("inner/cjs");
->d : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
+>d : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
+>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
 >"inner/cjs" : "inner/cjs"
 
 export const e = import("inner/mjs");
->e : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
+>e : Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>
+>import("inner/mjs") : Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>
 >"inner/mjs" : "inner/mjs"
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types.diff
new file mode 100644
index 0000000000..bc4d138a94
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types.diff
@@ -0,0 +1,166 @@
+--- old.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types
++++ new.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=nodenext).types
+@@= skipped -14, +14 lines =@@
+ === other.ts ===
+ // esm format file
+ export const a = await import("package/cjs");
+->a : { default: typeof import("index"); }
+->await import("package/cjs") : { default: typeof import("index"); }
+->import("package/cjs") : Promise<{ default: typeof import("index"); }>
++>a : { default: typeof import("package/cjs"); }
++>await import("package/cjs") : { default: typeof import("package/cjs"); }
++>import("package/cjs") : Promise<{ default: typeof import("package/cjs"); }>
+ >"package/cjs" : "package/cjs"
+
+ export const b = await import("package/mjs");
+->b : typeof import("index")
+->await import("package/mjs") : typeof import("index")
+->import("package/mjs") : Promise<typeof import("index")>
++>b : typeof import("package/mjs")
++>await import("package/mjs") : typeof import("package/mjs")
++>import("package/mjs") : Promise<typeof import("package/mjs")>
+ >"package/mjs" : "package/mjs"
+
+ export const c = await import("package");
+->c : typeof import("index")
+->await import("package") : typeof import("index")
+->import("package") : Promise<typeof import("index")>
++>c : typeof import("package")
++>await import("package") : typeof import("package")
++>import("package") : Promise<typeof import("package")>
+ >"package" : "package"
+
+ export const f = await import("inner");
+->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
+->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
+->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
++>f : { cjsMain: true; default: typeof import("inner"); }
++>await import("inner") : { cjsMain: true; default: typeof import("inner"); }
++>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
+ >"inner" : "inner"
+
+ === other2.ts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
+->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
+->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
++>d : { cjsNonmain: true; default: typeof import("inner/cjs"); }
++>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("inner/cjs"); }
++>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
+ >"inner/cjs" : "inner/cjs"
+
+ export const e = await import("inner/mjs");
+->e : typeof import("node_modules/inner/index")
+->await import("inner/mjs") : typeof import("node_modules/inner/index")
+->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
++>e : typeof import("inner/mjs")
++>await import("inner/mjs") : typeof import("inner/mjs")
++>import("inner/mjs") : Promise<typeof import("inner/mjs")>
+ >"inner/mjs" : "inner/mjs"
+
+ === other.mts ===
+ // esm format file
+ export const a = await import("package/cjs");
+->a : { default: typeof import("index"); }
+->await import("package/cjs") : { default: typeof import("index"); }
+->import("package/cjs") : Promise<{ default: typeof import("index"); }>
++>a : { default: typeof import("package/cjs"); }
++>await import("package/cjs") : { default: typeof import("package/cjs"); }
++>import("package/cjs") : Promise<{ default: typeof import("package/cjs"); }>
+ >"package/cjs" : "package/cjs"
+
+ export const b = await import("package/mjs");
+->b : typeof import("index")
+->await import("package/mjs") : typeof import("index")
+->import("package/mjs") : Promise<typeof import("index")>
++>b : typeof import("package/mjs")
++>await import("package/mjs") : typeof import("package/mjs")
++>import("package/mjs") : Promise<typeof import("package/mjs")>
+ >"package/mjs" : "package/mjs"
+
+ export const c = await import("package");
+->c : typeof import("index")
+->await import("package") : typeof import("index")
+->import("package") : Promise<typeof import("index")>
++>c : typeof import("package")
++>await import("package") : typeof import("package")
++>import("package") : Promise<typeof import("package")>
+ >"package" : "package"
+
+ export const f = await import("inner");
+->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
+->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
+->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
++>f : { cjsMain: true; default: typeof import("inner"); }
++>await import("inner") : { cjsMain: true; default: typeof import("inner"); }
++>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
+ >"inner" : "inner"
+
+ === other2.mts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
+->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
+->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
++>d : { cjsNonmain: true; default: typeof import("inner/cjs"); }
++>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("inner/cjs"); }
++>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
+ >"inner/cjs" : "inner/cjs"
+
+ export const e = await import("inner/mjs");
+->e : typeof import("node_modules/inner/index")
+->await import("inner/mjs") : typeof import("node_modules/inner/index")
+->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
++>e : typeof import("inner/mjs")
++>await import("inner/mjs") : typeof import("inner/mjs")
++>import("inner/mjs") : Promise<typeof import("inner/mjs")>
+ >"inner/mjs" : "inner/mjs"
+
+ === other.cts ===
+ // cjs format file, no TLA
+ export const a = import("package/cjs");
+->a : Promise<{ default: typeof import("index"); }>
+->import("package/cjs") : Promise<{ default: typeof import("index"); }>
++>a : Promise<{ default: typeof import("./index.cts"); }>
++>import("package/cjs") : Promise<{ default: typeof import("./index.cts"); }>
+ >"package/cjs" : "package/cjs"
+
+ export const b = import("package/mjs");
+->b : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
+->import("package/mjs") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
++>b : Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>
++>import("package/mjs") : Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>
+ >"package/mjs" : "package/mjs"
+
+ export const c = import("package");
+->c : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
+->import("package") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
++>c : Promise<typeof import("package", { with: { "resolution-mode": "import" } })>
++>import("package") : Promise<typeof import("package", { with: { "resolution-mode": "import" } })>
+ >"package" : "package"
+
+ export const f = import("inner");
+->f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
+->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
++>f : Promise<{ cjsMain: true; default: typeof import("inner"); }>
++>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
+ >"inner" : "inner"
+
+ === other2.cts ===
+ // cjs format file, no TLA
+ export const d = import("inner/cjs");
+->d : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
+->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
++>d : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
++>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
+ >"inner/cjs" : "inner/cjs"
+
+ export const e = import("inner/mjs");
+->e : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
+->import("inner/mjs") : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
++>e : Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>
++>import("inner/mjs") : Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>
+ >"inner/mjs" : "inner/mjs"
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols
index 91fce59692..ca9ddf5226 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols.diff
new file mode 100644
index 0000000000..f937a8dc70
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols
++++ new.nodeModulesExportsBlocksSpecifierResolution(module=node16).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).types
index 38c2231bbe..94a25e7b28 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).types.diff
new file mode 100644
index 0000000000..451442e5be
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node16).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsBlocksSpecifierResolution(module=node16).types
++++ new.nodeModulesExportsBlocksSpecifierResolution(module=node16).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols
index 91fce59692..ca9ddf5226 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols.diff
new file mode 100644
index 0000000000..b05ee8b4bd
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols
++++ new.nodeModulesExportsBlocksSpecifierResolution(module=node18).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).types
index 38c2231bbe..94a25e7b28 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).types.diff
new file mode 100644
index 0000000000..dabd7849c0
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node18).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsBlocksSpecifierResolution(module=node18).types
++++ new.nodeModulesExportsBlocksSpecifierResolution(module=node18).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols
index 91fce59692..ca9ddf5226 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols.diff
new file mode 100644
index 0000000000..0181ec1776
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols
++++ new.nodeModulesExportsBlocksSpecifierResolution(module=nodenext).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types
index 38c2231bbe..94a25e7b28 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types.diff
new file mode 100644
index 0000000000..3b3058b23c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types
++++ new.nodeModulesExportsBlocksSpecifierResolution(module=nodenext).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).symbols
index 1827233096..1800cfa1e6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.ts, 0, 0))
 >x : Symbol(x, Decl(index.ts, 1, 8))
 
 import {a as a2} from "package";
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).symbols.diff
new file mode 100644
index 0000000000..3bafbe775d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSourceTs(module=node16).symbols
++++ new.nodeModulesExportsSourceTs(module=node16).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.ts, 0, 0))
+ >x : Symbol(x, Decl(index.ts, 1, 8))
+
+ import {a as a2} from "package";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types
index e636d618e7..31a1c001b4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types
@@ -6,23 +6,23 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other.js").Thing
 
 import {a as a2} from "package";
->a : import("node_modules/inner/other").Thing
->a2 : import("node_modules/inner/other").Thing
+>a : import("./node_modules/inner/other.js").Thing
+>a2 : import("./node_modules/inner/other.js").Thing
 
 === node_modules/inner/index.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types.diff
new file mode 100644
index 0000000000..442df9f867
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types.diff
@@ -0,0 +1,36 @@
+--- old.nodeModulesExportsSourceTs(module=node16).types
++++ new.nodeModulesExportsSourceTs(module=node16).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other.js").Thing
+
+ import {a as a2} from "package";
+->a : import("node_modules/inner/other").Thing
+->a2 : import("node_modules/inner/other").Thing
++>a : import("./node_modules/inner/other.js").Thing
++>a2 : import("./node_modules/inner/other.js").Thing
+
+ === node_modules/inner/index.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).symbols
index 1827233096..1800cfa1e6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.ts, 0, 0))
 >x : Symbol(x, Decl(index.ts, 1, 8))
 
 import {a as a2} from "package";
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).symbols.diff
new file mode 100644
index 0000000000..89fac5d2bf
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSourceTs(module=node18).symbols
++++ new.nodeModulesExportsSourceTs(module=node18).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.ts, 0, 0))
+ >x : Symbol(x, Decl(index.ts, 1, 8))
+
+ import {a as a2} from "package";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).types
index e636d618e7..31a1c001b4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).types
@@ -6,23 +6,23 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other.js").Thing
 
 import {a as a2} from "package";
->a : import("node_modules/inner/other").Thing
->a2 : import("node_modules/inner/other").Thing
+>a : import("./node_modules/inner/other.js").Thing
+>a2 : import("./node_modules/inner/other.js").Thing
 
 === node_modules/inner/index.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).types.diff
new file mode 100644
index 0000000000..2c9f98fc96
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node18).types.diff
@@ -0,0 +1,36 @@
+--- old.nodeModulesExportsSourceTs(module=node18).types
++++ new.nodeModulesExportsSourceTs(module=node18).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other.js").Thing
+
+ import {a as a2} from "package";
+->a : import("node_modules/inner/other").Thing
+->a2 : import("node_modules/inner/other").Thing
++>a : import("./node_modules/inner/other.js").Thing
++>a2 : import("./node_modules/inner/other.js").Thing
+
+ === node_modules/inner/index.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).symbols
index 1827233096..1800cfa1e6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.ts, 0, 0))
 >x : Symbol(x, Decl(index.ts, 1, 8))
 
 import {a as a2} from "package";
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).symbols.diff
new file mode 100644
index 0000000000..e5d59148d4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSourceTs(module=nodenext).symbols
++++ new.nodeModulesExportsSourceTs(module=nodenext).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.ts, 0, 0))
+ >x : Symbol(x, Decl(index.ts, 1, 8))
+
+ import {a as a2} from "package";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types
index e636d618e7..31a1c001b4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types
@@ -6,23 +6,23 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other.js").Thing
 
 import {a as a2} from "package";
->a : import("node_modules/inner/other").Thing
->a2 : import("node_modules/inner/other").Thing
+>a : import("./node_modules/inner/other.js").Thing
+>a2 : import("./node_modules/inner/other.js").Thing
 
 === node_modules/inner/index.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types.diff
new file mode 100644
index 0000000000..19c0ac0d1a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types.diff
@@ -0,0 +1,36 @@
+--- old.nodeModulesExportsSourceTs(module=nodenext).types
++++ new.nodeModulesExportsSourceTs(module=nodenext).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other.js").Thing
+
+ import {a as a2} from "package";
+->a : import("node_modules/inner/other").Thing
+->a2 : import("node_modules/inner/other").Thing
++>a : import("./node_modules/inner/other.js").Thing
++>a2 : import("./node_modules/inner/other.js").Thing
+
+ === node_modules/inner/index.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols
index d429eab9b4..a2c9ca40fc 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other.js"; // should fail
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols.diff
new file mode 100644
index 0000000000..81100bae40
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols
++++ new.nodeModulesExportsSpecifierGenerationConditions(module=node16).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).types
index b7a32fb0f2..245ee60715 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other.js"; // should fail
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other").Thing
+>(await import("inner")).x() : import("inner/other").Thing
+>(await import("inner")).x : () => import("inner/other").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).types.diff
new file mode 100644
index 0000000000..793b740018
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node16).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationConditions(module=node16).types
++++ new.nodeModulesExportsSpecifierGenerationConditions(module=node16).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other").Thing
++>(await import("inner")).x() : import("inner/other").Thing
++>(await import("inner")).x : () => import("inner/other").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols
index d429eab9b4..a2c9ca40fc 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other.js"; // should fail
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols.diff
new file mode 100644
index 0000000000..7fbed58036
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols
++++ new.nodeModulesExportsSpecifierGenerationConditions(module=node18).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).types
index b7a32fb0f2..245ee60715 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other.js"; // should fail
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other").Thing
+>(await import("inner")).x() : import("inner/other").Thing
+>(await import("inner")).x : () => import("inner/other").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).types.diff
new file mode 100644
index 0000000000..a7254aab91
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node18).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationConditions(module=node18).types
++++ new.nodeModulesExportsSpecifierGenerationConditions(module=node18).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other").Thing
++>(await import("inner")).x() : import("inner/other").Thing
++>(await import("inner")).x : () => import("inner/other").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols
index d429eab9b4..a2c9ca40fc 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other.js"; // should fail
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols.diff
new file mode 100644
index 0000000000..680df0b600
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols
++++ new.nodeModulesExportsSpecifierGenerationConditions(module=nodenext).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types
index b7a32fb0f2..245ee60715 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other.js"; // should fail
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other").Thing
+>(await import("inner")).x() : import("inner/other").Thing
+>(await import("inner")).x : () => import("inner/other").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types.diff
new file mode 100644
index 0000000000..0d1501680d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types
++++ new.nodeModulesExportsSpecifierGenerationConditions(module=nodenext).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other").Thing
++>(await import("inner")).x() : import("inner/other").Thing
++>(await import("inner")).x : () => import("inner/other").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols
index 6fd6d1a29c..c0b17e189a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner/index.js")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols.diff
new file mode 100644
index 0000000000..fd2ca5c43b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols
++++ new.nodeModulesExportsSpecifierGenerationDirectory(module=node16).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner/index.js")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types
index dec34f20fc..36552de494 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner/index.js")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
->await import("inner/index.js") : typeof import("node_modules/inner/index")
->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other.js").Thing
+>(await import("inner/index.js")).x() : import("inner/other.js").Thing
+>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
+>(await import("inner/index.js")) : typeof import("inner/index.js")
+>await import("inner/index.js") : typeof import("inner/index.js")
+>import("inner/index.js") : Promise<typeof import("inner/index.js")>
 >"inner/index.js" : "inner/index.js"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types.diff
new file mode 100644
index 0000000000..e990bb0e51
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node16).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationDirectory(module=node16).types
++++ new.nodeModulesExportsSpecifierGenerationDirectory(module=node16).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner/index.js")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
+->await import("inner/index.js") : typeof import("node_modules/inner/index")
+->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other.js").Thing
++>(await import("inner/index.js")).x() : import("inner/other.js").Thing
++>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
++>(await import("inner/index.js")) : typeof import("inner/index.js")
++>await import("inner/index.js") : typeof import("inner/index.js")
++>import("inner/index.js") : Promise<typeof import("inner/index.js")>
+ >"inner/index.js" : "inner/index.js"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols
index 6fd6d1a29c..c0b17e189a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner/index.js")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols.diff
new file mode 100644
index 0000000000..c50c2bcb6f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols
++++ new.nodeModulesExportsSpecifierGenerationDirectory(module=node18).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner/index.js")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).types
index dec34f20fc..36552de494 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner/index.js")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
->await import("inner/index.js") : typeof import("node_modules/inner/index")
->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other.js").Thing
+>(await import("inner/index.js")).x() : import("inner/other.js").Thing
+>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
+>(await import("inner/index.js")) : typeof import("inner/index.js")
+>await import("inner/index.js") : typeof import("inner/index.js")
+>import("inner/index.js") : Promise<typeof import("inner/index.js")>
 >"inner/index.js" : "inner/index.js"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).types.diff
new file mode 100644
index 0000000000..0e711490da
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node18).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationDirectory(module=node18).types
++++ new.nodeModulesExportsSpecifierGenerationDirectory(module=node18).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner/index.js")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
+->await import("inner/index.js") : typeof import("node_modules/inner/index")
+->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other.js").Thing
++>(await import("inner/index.js")).x() : import("inner/other.js").Thing
++>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
++>(await import("inner/index.js")) : typeof import("inner/index.js")
++>await import("inner/index.js") : typeof import("inner/index.js")
++>import("inner/index.js") : Promise<typeof import("inner/index.js")>
+ >"inner/index.js" : "inner/index.js"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols
index 6fd6d1a29c..c0b17e189a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner/index.js")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols.diff
new file mode 100644
index 0000000000..c1b215c997
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols
++++ new.nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner/index.js")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types
index dec34f20fc..36552de494 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner/index.js")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
->await import("inner/index.js") : typeof import("node_modules/inner/index")
->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other.js").Thing
+>(await import("inner/index.js")).x() : import("inner/other.js").Thing
+>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
+>(await import("inner/index.js")) : typeof import("inner/index.js")
+>await import("inner/index.js") : typeof import("inner/index.js")
+>import("inner/index.js") : Promise<typeof import("inner/index.js")>
 >"inner/index.js" : "inner/index.js"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types.diff
new file mode 100644
index 0000000000..cf77c88dca
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types
++++ new.nodeModulesExportsSpecifierGenerationDirectory(module=nodenext).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner/index.js")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
+->await import("inner/index.js") : typeof import("node_modules/inner/index")
+->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other.js").Thing
++>(await import("inner/index.js")).x() : import("inner/other.js").Thing
++>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
++>(await import("inner/index.js")) : typeof import("inner/index.js")
++>await import("inner/index.js") : typeof import("inner/index.js")
++>import("inner/index.js") : Promise<typeof import("inner/index.js")>
+ >"inner/index.js" : "inner/index.js"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols
index 7429733b3c..263438b3b8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner/index.js")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols.diff
new file mode 100644
index 0000000000..52f26f5bf2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols
++++ new.nodeModulesExportsSpecifierGenerationPattern(module=node16).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner/index.js")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).types
index 70039d87c9..f32afc7c05 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner/index.js")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
->await import("inner/index.js") : typeof import("node_modules/inner/index")
->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other.js").Thing
+>(await import("inner/index.js")).x() : import("inner/other.js").Thing
+>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
+>(await import("inner/index.js")) : typeof import("inner/index.js")
+>await import("inner/index.js") : typeof import("inner/index.js")
+>import("inner/index.js") : Promise<typeof import("inner/index.js")>
 >"inner/index.js" : "inner/index.js"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).types.diff
new file mode 100644
index 0000000000..b67108de6f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node16).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationPattern(module=node16).types
++++ new.nodeModulesExportsSpecifierGenerationPattern(module=node16).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner/index.js")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
+->await import("inner/index.js") : typeof import("node_modules/inner/index")
+->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other.js").Thing
++>(await import("inner/index.js")).x() : import("inner/other.js").Thing
++>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
++>(await import("inner/index.js")) : typeof import("inner/index.js")
++>await import("inner/index.js") : typeof import("inner/index.js")
++>import("inner/index.js") : Promise<typeof import("inner/index.js")>
+ >"inner/index.js" : "inner/index.js"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols
index 7429733b3c..263438b3b8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner/index.js")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols.diff
new file mode 100644
index 0000000000..67970ed921
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols
++++ new.nodeModulesExportsSpecifierGenerationPattern(module=node18).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner/index.js")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).types
index 70039d87c9..f32afc7c05 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner/index.js")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
->await import("inner/index.js") : typeof import("node_modules/inner/index")
->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other.js").Thing
+>(await import("inner/index.js")).x() : import("inner/other.js").Thing
+>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
+>(await import("inner/index.js")) : typeof import("inner/index.js")
+>await import("inner/index.js") : typeof import("inner/index.js")
+>import("inner/index.js") : Promise<typeof import("inner/index.js")>
 >"inner/index.js" : "inner/index.js"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).types.diff
new file mode 100644
index 0000000000..81f0c9fbc3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node18).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationPattern(module=node18).types
++++ new.nodeModulesExportsSpecifierGenerationPattern(module=node18).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner/index.js")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
+->await import("inner/index.js") : typeof import("node_modules/inner/index")
+->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other.js").Thing
++>(await import("inner/index.js")).x() : import("inner/other.js").Thing
++>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
++>(await import("inner/index.js")) : typeof import("inner/index.js")
++>await import("inner/index.js") : typeof import("inner/index.js")
++>import("inner/index.js") : Promise<typeof import("inner/index.js")>
+ >"inner/index.js" : "inner/index.js"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols
index 7429733b3c..263438b3b8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner/index.js")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols.diff
new file mode 100644
index 0000000000..8fa5b5e6e9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols
++++ new.nodeModulesExportsSpecifierGenerationPattern(module=nodenext).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner/index.js")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types
index 70039d87c9..f32afc7c05 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner/index.js")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
->await import("inner/index.js") : typeof import("node_modules/inner/index")
->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other.js").Thing
+>(await import("inner/index.js")).x() : import("inner/other.js").Thing
+>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
+>(await import("inner/index.js")) : typeof import("inner/index.js")
+>await import("inner/index.js") : typeof import("inner/index.js")
+>import("inner/index.js") : Promise<typeof import("inner/index.js")>
 >"inner/index.js" : "inner/index.js"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types.diff
new file mode 100644
index 0000000000..f54192463c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types
++++ new.nodeModulesExportsSpecifierGenerationPattern(module=nodenext).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner/index.js")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
+->await import("inner/index.js") : typeof import("node_modules/inner/index")
+->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other.js").Thing
++>(await import("inner/index.js")).x() : import("inner/other.js").Thing
++>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
++>(await import("inner/index.js")) : typeof import("inner/index.js")
++>await import("inner/index.js") : typeof import("inner/index.js")
++>import("inner/index.js") : Promise<typeof import("inner/index.js")>
+ >"inner/index.js" : "inner/index.js"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
index fdd418b9a1..3b2581fc9e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
new file mode 100644
index 0000000000..384f5efc5e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
@@ -0,0 +1,24 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
+@@= skipped -7, +7 lines =@@
+     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types
index fdd418b9a1..3b2581fc9e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types.diff
new file mode 100644
index 0000000000..1601536383
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types.diff
@@ -0,0 +1,24 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node18).types
+@@= skipped -7, +7 lines =@@
+     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
index fdd418b9a1..3b2581fc9e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
new file mode 100644
index 0000000000..6398b28082
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
@@ -0,0 +1,24 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
+@@= skipped -7, +7 lines =@@
+     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
index 8a23a85dd4..7d845f6e7d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
@@ -33,7 +33,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "require"}).RequireInterface
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
 
 export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
@@ -68,7 +68,7 @@ export type LocalInterface =
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
 
 export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
@@ -99,7 +99,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 59))
 
     & import("pkg", Attribute2).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >Attribute2 : Symbol(Attribute2, Decl(other4.ts, 9, 46))
 
 export const a = (null as any as import("pkg", Attribute1).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
new file mode 100644
index 0000000000..7304271375
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
@@ -0,0 +1,29 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
+@@= skipped -32, +32 lines =@@
+
+     & import("pkg", {"resolution-mode": "require"}).RequireInterface
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
+
+ export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
+@@= skipped -35, +35 lines =@@
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
+
+ export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
+@@= skipped -31, +31 lines =@@
+ >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 59))
+
+     & import("pkg", Attribute2).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >Attribute2 : Symbol(Attribute2, Decl(other4.ts, 9, 46))
+
+ export const a = (null as any as import("pkg", Attribute1).RequireInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
index 22b588a9b5..bc8f825a8e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
@@ -16,15 +16,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -40,7 +40,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -74,9 +74,9 @@ export type LocalInterface =
     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
@@ -97,7 +97,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -145,7 +145,7 @@ export type LocalInterface =
 
     & import("pkg", Attribute2).ImportInterface;
 >import("pkg", Attribute2).ImportInterface : any
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Attribute2 : any
 >ImportInterface : any
@@ -174,9 +174,9 @@ export type LocalInterface =
     & import("pkg", { with: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
new file mode 100644
index 0000000000..cab47a378e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
@@ -0,0 +1,77 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
+@@= skipped -15, +15 lines =@@
+     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /other.ts ===
+@@= skipped -24, +24 lines =@@
+
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+ >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
+->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+ >"resolution-mode" : string
+@@= skipped -34, +34 lines =@@
+     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
+@@= skipped -23, +23 lines =@@
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+ >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
+->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+@@= skipped -48, +48 lines =@@
+
+     & import("pkg", Attribute2).ImportInterface;
+ >import("pkg", Attribute2).ImportInterface : any
+->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >Attribute2 : any
+ >ImportInterface : any
+@@= skipped -29, +29 lines =@@
+     & import("pkg", { with: {} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols
index 8a23a85dd4..7d845f6e7d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols
@@ -33,7 +33,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "require"}).RequireInterface
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
 
 export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
@@ -68,7 +68,7 @@ export type LocalInterface =
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
 
 export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
@@ -99,7 +99,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 59))
 
     & import("pkg", Attribute2).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >Attribute2 : Symbol(Attribute2, Decl(other4.ts, 9, 46))
 
 export const a = (null as any as import("pkg", Attribute1).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols.diff
new file mode 100644
index 0000000000..6be4d750ba
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols.diff
@@ -0,0 +1,29 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).symbols
+@@= skipped -32, +32 lines =@@
+
+     & import("pkg", {"resolution-mode": "require"}).RequireInterface
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
+
+ export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
+@@= skipped -35, +35 lines =@@
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
+
+ export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
+@@= skipped -31, +31 lines =@@
+ >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 59))
+
+     & import("pkg", Attribute2).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >Attribute2 : Symbol(Attribute2, Decl(other4.ts, 9, 46))
+
+ export const a = (null as any as import("pkg", Attribute1).RequireInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types
index beeadd97ad..86908c224d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types
@@ -16,15 +16,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -40,7 +40,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<typeof import("/node_modules/pkg/import")>
+>import("pkg", {"resolution-mode": "import"}) : Promise<typeof import("./node_modules/pkg/import")>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -74,9 +74,9 @@ export type LocalInterface =
     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
@@ -97,7 +97,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<typeof import("/node_modules/pkg/import")>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<typeof import("./node_modules/pkg/import")>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -145,7 +145,7 @@ export type LocalInterface =
 
     & import("pkg", Attribute2).ImportInterface;
 >import("pkg", Attribute2).ImportInterface : any
->import("pkg", Attribute2) : Promise<typeof import("/node_modules/pkg/import")>
+>import("pkg", Attribute2) : Promise<typeof import("./node_modules/pkg/import")>
 >"pkg" : "pkg"
 >Attribute2 : any
 >ImportInterface : any
@@ -174,9 +174,9 @@ export type LocalInterface =
     & import("pkg", { with: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types.diff
index 52dd07ebc3..848f21828d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types.diff
@@ -1,20 +1,55 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types
-@@= skipped -39, +39 lines =@@
+@@= skipped -15, +15 lines =@@
+     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /other.ts ===
+@@= skipped -24, +24 lines =@@
 
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
  >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
 ->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<typeof import("/node_modules/pkg/import")>
++>import("pkg", {"resolution-mode": "import"}) : Promise<typeof import("./node_modules/pkg/import")>
  >"pkg" : "pkg"
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
  >"resolution-mode" : string
-@@= skipped -57, +57 lines =@@
+@@= skipped -34, +34 lines =@@
+     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
+@@= skipped -23, +23 lines =@@
 
      & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
  >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
 ->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<typeof import("/node_modules/pkg/import")>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<typeof import("./node_modules/pkg/import")>
  >"pkg" : "pkg"
  >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -23,7 +58,20 @@
      & import("pkg", Attribute2).ImportInterface;
  >import("pkg", Attribute2).ImportInterface : any
 ->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Attribute2) : Promise<typeof import("/node_modules/pkg/import")>
++>import("pkg", Attribute2) : Promise<typeof import("./node_modules/pkg/import")>
  >"pkg" : "pkg"
  >Attribute2 : any
- >ImportInterface : any
\ No newline at end of file
+ >ImportInterface : any
+@@= skipped -29, +29 lines =@@
+     & import("pkg", { with: {} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
index 8a23a85dd4..7d845f6e7d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
@@ -33,7 +33,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "require"}).RequireInterface
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
 
 export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
@@ -68,7 +68,7 @@ export type LocalInterface =
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
 
 export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
@@ -99,7 +99,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 59))
 
     & import("pkg", Attribute2).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >Attribute2 : Symbol(Attribute2, Decl(other4.ts, 9, 46))
 
 export const a = (null as any as import("pkg", Attribute1).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
new file mode 100644
index 0000000000..dd39cfb197
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
@@ -0,0 +1,29 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
+@@= skipped -32, +32 lines =@@
+
+     & import("pkg", {"resolution-mode": "require"}).RequireInterface
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
+
+ export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
+@@= skipped -35, +35 lines =@@
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
+
+ export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
+@@= skipped -31, +31 lines =@@
+ >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 59))
+
+     & import("pkg", Attribute2).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >Attribute2 : Symbol(Attribute2, Decl(other4.ts, 9, 46))
+
+ export const a = (null as any as import("pkg", Attribute1).RequireInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
index 22b588a9b5..bc8f825a8e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
@@ -16,15 +16,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -40,7 +40,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -74,9 +74,9 @@ export type LocalInterface =
     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
@@ -97,7 +97,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -145,7 +145,7 @@ export type LocalInterface =
 
     & import("pkg", Attribute2).ImportInterface;
 >import("pkg", Attribute2).ImportInterface : any
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Attribute2 : any
 >ImportInterface : any
@@ -174,9 +174,9 @@ export type LocalInterface =
     & import("pkg", { with: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
new file mode 100644
index 0000000000..e2fe8de04b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
@@ -0,0 +1,77 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
+@@= skipped -15, +15 lines =@@
+     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /other.ts ===
+@@= skipped -24, +24 lines =@@
+
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+ >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
+->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+ >"resolution-mode" : string
+@@= skipped -34, +34 lines =@@
+     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
+@@= skipped -23, +23 lines =@@
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+ >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
+->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+@@= skipped -48, +48 lines =@@
+
+     & import("pkg", Attribute2).ImportInterface;
+ >import("pkg", Attribute2).ImportInterface : any
+->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >Attribute2 : any
+ >ImportInterface : any
+@@= skipped -29, +29 lines =@@
+     & import("pkg", { with: {} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
index 7cf69b2a5b..c7a53a5b37 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
new file mode 100644
index 0000000000..6797f2c182
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
@@ -0,0 +1,24 @@
+--- old.nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
++++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
+@@= skipped -7, +7 lines =@@
+     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node18).types
index 7cf69b2a5b..c7a53a5b37 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node18).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node18).types.diff
new file mode 100644
index 0000000000..5ebc5e7999
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node18).types.diff
@@ -0,0 +1,24 @@
+--- old.nodeModulesImportTypeModeDeclarationEmit1(module=node18).types
++++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node18).types
+@@= skipped -7, +7 lines =@@
+     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
index 7cf69b2a5b..c7a53a5b37 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
new file mode 100644
index 0000000000..587df8c2d7
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
@@ -0,0 +1,24 @@
+--- old.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
++++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
+@@= skipped -7, +7 lines =@@
+     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
index ea0f4216cd..7413ce6dd6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
@@ -33,7 +33,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "require"}).RequireInterface
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
 
 export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
@@ -68,7 +68,7 @@ export type LocalInterface =
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
 
 export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
@@ -99,7 +99,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 57))
 
     & import("pkg", Asserts2).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >Asserts2 : Symbol(Asserts2, Decl(other4.ts, 9, 46))
 
 export const a = (null as any as import("pkg", Asserts1).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
new file mode 100644
index 0000000000..81ff971f2b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
@@ -0,0 +1,29 @@
+--- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
++++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
+@@= skipped -32, +32 lines =@@
+
+     & import("pkg", {"resolution-mode": "require"}).RequireInterface
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
+
+ export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
+@@= skipped -35, +35 lines =@@
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
+
+ export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
+@@= skipped -31, +31 lines =@@
+ >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 57))
+
+     & import("pkg", Asserts2).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >Asserts2 : Symbol(Asserts2, Decl(other4.ts, 9, 46))
+
+ export const a = (null as any as import("pkg", Asserts1).RequireInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
index c366fd27fc..c740f9eb8a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
@@ -14,15 +14,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -38,7 +38,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -72,9 +72,9 @@ export type LocalInterface =
     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
@@ -95,7 +95,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -143,7 +143,7 @@ export type LocalInterface =
 
     & import("pkg", Asserts2).ImportInterface;
 >import("pkg", Asserts2).ImportInterface : any
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Asserts2 : any
 >ImportInterface : any
@@ -172,9 +172,9 @@ export type LocalInterface =
     & import("pkg", { assert: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
new file mode 100644
index 0000000000..8478befdce
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
@@ -0,0 +1,77 @@
+--- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
++++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
+@@= skipped -13, +13 lines =@@
+     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /other.ts ===
+@@= skipped -24, +24 lines =@@
+
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+ >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
+->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+ >"resolution-mode" : string
+@@= skipped -34, +34 lines =@@
+     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
+@@= skipped -23, +23 lines =@@
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+ >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
+->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+@@= skipped -48, +48 lines =@@
+
+     & import("pkg", Asserts2).ImportInterface;
+ >import("pkg", Asserts2).ImportInterface : any
+->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >Asserts2 : any
+ >ImportInterface : any
+@@= skipped -29, +29 lines =@@
+     & import("pkg", { assert: {} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols
index ea0f4216cd..7413ce6dd6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols
@@ -33,7 +33,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "require"}).RequireInterface
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
 
 export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
@@ -68,7 +68,7 @@ export type LocalInterface =
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
 
 export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
@@ -99,7 +99,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 57))
 
     & import("pkg", Asserts2).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >Asserts2 : Symbol(Asserts2, Decl(other4.ts, 9, 46))
 
 export const a = (null as any as import("pkg", Asserts1).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols.diff
new file mode 100644
index 0000000000..bb890e7664
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols.diff
@@ -0,0 +1,29 @@
+--- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols
++++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).symbols
+@@= skipped -32, +32 lines =@@
+
+     & import("pkg", {"resolution-mode": "require"}).RequireInterface
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
+
+ export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
+@@= skipped -35, +35 lines =@@
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
+
+ export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
+@@= skipped -31, +31 lines =@@
+ >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 57))
+
+     & import("pkg", Asserts2).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >Asserts2 : Symbol(Asserts2, Decl(other4.ts, 9, 46))
+
+ export const a = (null as any as import("pkg", Asserts1).RequireInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types
index db278cec15..e5f51142b0 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types
@@ -14,15 +14,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -38,7 +38,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<typeof import("/node_modules/pkg/import")>
+>import("pkg", {"resolution-mode": "import"}) : Promise<typeof import("./node_modules/pkg/import")>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -72,9 +72,9 @@ export type LocalInterface =
     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
@@ -95,7 +95,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<typeof import("/node_modules/pkg/import")>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<typeof import("./node_modules/pkg/import")>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -143,7 +143,7 @@ export type LocalInterface =
 
     & import("pkg", Asserts2).ImportInterface;
 >import("pkg", Asserts2).ImportInterface : any
->import("pkg", Asserts2) : Promise<typeof import("/node_modules/pkg/import")>
+>import("pkg", Asserts2) : Promise<typeof import("./node_modules/pkg/import")>
 >"pkg" : "pkg"
 >Asserts2 : any
 >ImportInterface : any
@@ -172,9 +172,9 @@ export type LocalInterface =
     & import("pkg", { assert: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types.diff
index 9f28443bfd..e585c40f51 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types.diff
@@ -1,20 +1,55 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types
-@@= skipped -37, +37 lines =@@
+@@= skipped -13, +13 lines =@@
+     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /other.ts ===
+@@= skipped -24, +24 lines =@@
 
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
  >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
 ->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<typeof import("/node_modules/pkg/import")>
++>import("pkg", {"resolution-mode": "import"}) : Promise<typeof import("./node_modules/pkg/import")>
  >"pkg" : "pkg"
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
  >"resolution-mode" : string
-@@= skipped -57, +57 lines =@@
+@@= skipped -34, +34 lines =@@
+     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
+@@= skipped -23, +23 lines =@@
 
      & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
  >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
 ->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<typeof import("/node_modules/pkg/import")>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<typeof import("./node_modules/pkg/import")>
  >"pkg" : "pkg"
  >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -23,7 +58,20 @@
      & import("pkg", Asserts2).ImportInterface;
  >import("pkg", Asserts2).ImportInterface : any
 ->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Asserts2) : Promise<typeof import("/node_modules/pkg/import")>
++>import("pkg", Asserts2) : Promise<typeof import("./node_modules/pkg/import")>
  >"pkg" : "pkg"
  >Asserts2 : any
- >ImportInterface : any
\ No newline at end of file
+ >ImportInterface : any
+@@= skipped -29, +29 lines =@@
+     & import("pkg", { assert: {} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
index ea0f4216cd..7413ce6dd6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
@@ -33,7 +33,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "require"}).RequireInterface
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
 
 export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
@@ -68,7 +68,7 @@ export type LocalInterface =
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
 
 export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
@@ -99,7 +99,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 57))
 
     & import("pkg", Asserts2).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >Asserts2 : Symbol(Asserts2, Decl(other4.ts, 9, 46))
 
 export const a = (null as any as import("pkg", Asserts1).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
new file mode 100644
index 0000000000..4d95530bef
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
@@ -0,0 +1,29 @@
+--- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
++++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
+@@= skipped -32, +32 lines =@@
+
+     & import("pkg", {"resolution-mode": "require"}).RequireInterface
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
+
+ export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
+@@= skipped -35, +35 lines =@@
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
+
+ export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
+@@= skipped -31, +31 lines =@@
+ >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 57))
+
+     & import("pkg", Asserts2).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >Asserts2 : Symbol(Asserts2, Decl(other4.ts, 9, 46))
+
+ export const a = (null as any as import("pkg", Asserts1).RequireInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
index c366fd27fc..c740f9eb8a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
@@ -14,15 +14,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -38,7 +38,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -72,9 +72,9 @@ export type LocalInterface =
     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
@@ -95,7 +95,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -143,7 +143,7 @@ export type LocalInterface =
 
     & import("pkg", Asserts2).ImportInterface;
 >import("pkg", Asserts2).ImportInterface : any
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Asserts2 : any
 >ImportInterface : any
@@ -172,9 +172,9 @@ export type LocalInterface =
     & import("pkg", { assert: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
new file mode 100644
index 0000000000..eea858a341
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
@@ -0,0 +1,77 @@
+--- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
++++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
+@@= skipped -13, +13 lines =@@
+     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /other.ts ===
+@@= skipped -24, +24 lines =@@
+
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+ >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
+->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+ >"resolution-mode" : string
+@@= skipped -34, +34 lines =@@
+     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
+@@= skipped -23, +23 lines =@@
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+ >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
+->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+@@= skipped -48, +48 lines =@@
+
+     & import("pkg", Asserts2).ImportInterface;
+ >import("pkg", Asserts2).ImportInterface : any
+->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >Asserts2 : any
+ >ImportInterface : any
+@@= skipped -29, +29 lines =@@
+     & import("pkg", { assert: {} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.symbols b/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.symbols
index c52a21de1c..c7f92f5916 100644
--- a/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.symbols
+++ b/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.symbols
@@ -10,7 +10,7 @@ declare function factory(type: string): {};
 /** @param {function} ctor - A big long explanation follows */
 exports.inherits = factory('inherits')
 >exports.inherits : Symbol(inherits, Decl(a.js, 0, 0))
->exports : Symbol("a", Decl(a.js, 0, 0))
+>exports : Symbol("./a", Decl(a.js, 0, 0))
 >inherits : Symbol(inherits, Decl(a.js, 0, 0))
 >factory : Symbol(factory, Decl(decls.d.ts, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.symbols.diff b/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.symbols.diff
index 22140b74a4..39ab7c83c8 100644
--- a/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.symbols.diff
@@ -5,6 +5,6 @@
  exports.inherits = factory('inherits')
  >exports.inherits : Symbol(inherits, Decl(a.js, 0, 0))
 ->exports : Symbol(inherits, Decl(a.js, 0, 0))
-+>exports : Symbol("a", Decl(a.js, 0, 0))
++>exports : Symbol("./a", Decl(a.js, 0, 0))
  >inherits : Symbol(inherits, Decl(a.js, 0, 0))
  >factory : Symbol(factory, Decl(decls.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.types b/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.types
index c783194b17..28ae2a8f54 100644
--- a/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.types
+++ b/testdata/baselines/reference/submodule/conformance/paramTagOnCallExpression.types
@@ -11,7 +11,7 @@ declare function factory(type: string): {};
 exports.inherits = factory('inherits')
 >exports.inherits = factory('inherits') : {}
 >exports.inherits : {}
->exports : typeof import("a")
+>exports : typeof import("./a")
 >inherits : {}
 >factory('inherits') : {}
 >factory : (type: string) => {}
diff --git a/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols b/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols
index 27794910c7..85d9dfb200 100644
--- a/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols
+++ b/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols
@@ -4,7 +4,7 @@
 var f = require('./first');
 >f : Symbol(f, Decl(main.js, 0, 3))
 >require : Symbol(require)
->'./first' : Symbol("first", Decl(first.js, 0, 0))
+>'./first' : Symbol("./first", Decl(first.js, 0, 0))
 
 f(1, n => { })
 >f : Symbol(f, Decl(main.js, 0, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols.diff b/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols.diff
index 6752d4cbb7..c91bafeb7d 100644
--- a/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols.diff
@@ -1,6 +1,15 @@
 --- old.paramTagTypeResolution.symbols
 +++ new.paramTagTypeResolution.symbols
-@@= skipped -15, +15 lines =@@
+@@= skipped -3, +3 lines =@@
+ var f = require('./first');
+ >f : Symbol(f, Decl(main.js, 0, 3))
+ >require : Symbol(require)
+->'./first' : Symbol("first", Decl(first.js, 0, 0))
++>'./first' : Symbol("./first", Decl(first.js, 0, 0))
+
+ f(1, n => { })
+ >f : Symbol(f, Decl(main.js, 0, 3))
+@@= skipped -12, +12 lines =@@
   * @param {(t: T) => void} k
   */
  module.exports = function (x, k) { return k(x) }
diff --git a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types
index f0ca8ad297..ca0310f630 100644
--- a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types
+++ b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types
@@ -49,17 +49,17 @@ export { A as AA } from "./a";
 >AA : any
 
 export { B as BB } from "./b";
->B : typeof import("b").B
->BB : typeof import("b").B
+>B : typeof import("./b").B
+>BB : typeof import("./b").B
 
 === d.fixed.ts ===
 export type { A as AA } from "./a";
 >A : any
->AA : import("a").A
+>AA : import("./a").A
 
 export type { B as BB } from "./b";
->B : typeof import("b").B
->BB : import("b").B
+>B : typeof import("./b").B
+>BB : import("./b").B
 
 === e.ts ===
 import { AA, BB } from "./d";
diff --git a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types.diff b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types.diff
new file mode 100644
index 0000000000..81ce28531b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types.diff
@@ -0,0 +1,25 @@
+--- old.preserveValueImports_errors(isolatedmodules=false).types
++++ new.preserveValueImports_errors(isolatedmodules=false).types
+@@= skipped -48, +48 lines =@@
+ >AA : any
+
+ export { B as BB } from "./b";
+->B : typeof import("b").B
+->BB : typeof import("b").B
++>B : typeof import("./b").B
++>BB : typeof import("./b").B
+
+ === d.fixed.ts ===
+ export type { A as AA } from "./a";
+ >A : any
+->AA : import("a").A
++>AA : import("./a").A
+
+ export type { B as BB } from "./b";
+->B : typeof import("b").B
+->BB : import("b").B
++>B : typeof import("./b").B
++>BB : import("./b").B
+
+ === e.ts ===
+ import { AA, BB } from "./d";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types
index f0ca8ad297..ca0310f630 100644
--- a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types
+++ b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types
@@ -49,17 +49,17 @@ export { A as AA } from "./a";
 >AA : any
 
 export { B as BB } from "./b";
->B : typeof import("b").B
->BB : typeof import("b").B
+>B : typeof import("./b").B
+>BB : typeof import("./b").B
 
 === d.fixed.ts ===
 export type { A as AA } from "./a";
 >A : any
->AA : import("a").A
+>AA : import("./a").A
 
 export type { B as BB } from "./b";
->B : typeof import("b").B
->BB : import("b").B
+>B : typeof import("./b").B
+>BB : import("./b").B
 
 === e.ts ===
 import { AA, BB } from "./d";
diff --git a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types.diff b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types.diff
new file mode 100644
index 0000000000..cc53c3be90
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types.diff
@@ -0,0 +1,25 @@
+--- old.preserveValueImports_errors(isolatedmodules=true).types
++++ new.preserveValueImports_errors(isolatedmodules=true).types
+@@= skipped -48, +48 lines =@@
+ >AA : any
+
+ export { B as BB } from "./b";
+->B : typeof import("b").B
+->BB : typeof import("b").B
++>B : typeof import("./b").B
++>BB : typeof import("./b").B
+
+ === d.fixed.ts ===
+ export type { A as AA } from "./a";
+ >A : any
+->AA : import("a").A
++>AA : import("./a").A
+
+ export type { B as BB } from "./b";
+->B : typeof import("b").B
+->BB : import("b").B
++>B : typeof import("./b").B
++>BB : import("./b").B
+
+ === e.ts ===
+ import { AA, BB } from "./d";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/privateNamesUnique-2.types b/testdata/baselines/reference/submodule/conformance/privateNamesUnique-2.types
index 7c806a4b28..e5f87df19f 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNamesUnique-2.types
+++ b/testdata/baselines/reference/submodule/conformance/privateNamesUnique-2.types
@@ -8,12 +8,12 @@ export class Foo {
 >#x : any
 
     copy(other: import("./b").Foo) {
->copy : (other: import("b").Foo) => void
->other : import("b").Foo
+>copy : (other: import("./b").Foo) => void
+>other : import("./b").Foo
 
         other.#x; // error
 >other.#x : any
->other : import("b").Foo
+>other : import("./b").Foo
     }
 }
     
diff --git a/testdata/baselines/reference/submodule/conformance/privateNamesUnique-2.types.diff b/testdata/baselines/reference/submodule/conformance/privateNamesUnique-2.types.diff
index 7367afe116..61bce8af86 100644
--- a/testdata/baselines/reference/submodule/conformance/privateNamesUnique-2.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/privateNamesUnique-2.types.diff
@@ -1,15 +1,20 @@
 --- old.privateNamesUnique-2.types
 +++ new.privateNamesUnique-2.types
-@@= skipped -7, +7 lines =@@
- >#x : any
+@@= skipped -8, +8 lines =@@
 
      copy(other: import("./b").Foo) {
-->copy : (other: import("./b").Foo) => void
-+>copy : (other: import("b").Foo) => void
- >other : import("b").Foo
+ >copy : (other: import("./b").Foo) => void
+->other : import("b").Foo
++>other : import("./b").Foo
 
          other.#x; // error
-@@= skipped -38, +38 lines =@@
+ >other.#x : any
+->other : import("b").Foo
++>other : import("./b").Foo
+     }
+ }
+     
+@@= skipped -37, +37 lines =@@
 
  a.copy(b); // error
  >a.copy(b) : void
diff --git a/testdata/baselines/reference/submodule/conformance/reexportClassDefinition.types b/testdata/baselines/reference/submodule/conformance/reexportClassDefinition.types
index 2d02d9ee90..8c98e9a079 100644
--- a/testdata/baselines/reference/submodule/conformance/reexportClassDefinition.types
+++ b/testdata/baselines/reference/submodule/conformance/reexportClassDefinition.types
@@ -2,13 +2,13 @@
 
 === foo3.ts ===
 import foo2 = require('./foo2')
->foo2 : { x: typeof import("foo1"); }
+>foo2 : { x: typeof import("./foo1"); }
 
 class x extends foo2.x {}
 >x : x
->foo2.x : import("foo1")
->foo2 : { x: typeof import("foo1"); }
->x : typeof import("foo1")
+>foo2.x : import("./foo1")
+>foo2 : { x: typeof import("./foo1"); }
+>x : typeof import("./foo1")
 
 
 === foo1.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/reexportClassDefinition.types.diff b/testdata/baselines/reference/submodule/conformance/reexportClassDefinition.types.diff
new file mode 100644
index 0000000000..b09fa1fc35
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/reexportClassDefinition.types.diff
@@ -0,0 +1,20 @@
+--- old.reexportClassDefinition.types
++++ new.reexportClassDefinition.types
+@@= skipped -1, +1 lines =@@
+
+ === foo3.ts ===
+ import foo2 = require('./foo2')
+->foo2 : { x: typeof import("foo1"); }
++>foo2 : { x: typeof import("./foo1"); }
+
+ class x extends foo2.x {}
+ >x : x
+->foo2.x : import("foo1")
+->foo2 : { x: typeof import("foo1"); }
+->x : typeof import("foo1")
++>foo2.x : import("./foo1")
++>foo2 : { x: typeof import("./foo1"); }
++>x : typeof import("./foo1")
+
+
+ === foo1.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/renamed.types b/testdata/baselines/reference/submodule/conformance/renamed.types
index 486ae3392d..4c8cd28924 100644
--- a/testdata/baselines/reference/submodule/conformance/renamed.types
+++ b/testdata/baselines/reference/submodule/conformance/renamed.types
@@ -11,8 +11,8 @@ export type { A as B };
 
 === /b.ts ===
 export type { B as C } from './a';
->B : typeof import("/a").B
->C : import("/a").B
+>B : typeof import("./a").B
+>C : import("./a").B
 
 === /c.ts ===
 import type { C as D } from './b';
diff --git a/testdata/baselines/reference/submodule/conformance/renamed.types.diff b/testdata/baselines/reference/submodule/conformance/renamed.types.diff
new file mode 100644
index 0000000000..a7e0679ff1
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/renamed.types.diff
@@ -0,0 +1,13 @@
+--- old.renamed.types
++++ new.renamed.types
+@@= skipped -10, +10 lines =@@
+
+ === /b.ts ===
+ export type { B as C } from './a';
+->B : typeof import("/a").B
+->C : import("/a").B
++>B : typeof import("./a").B
++>C : import("./a").B
+
+ === /c.ts ===
+ import type { C as D } from './b';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.symbols b/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.symbols
index b7598909c2..25ea5a73c7 100644
--- a/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.symbols
+++ b/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.symbols
@@ -4,12 +4,12 @@
 const { art } = require('./ex')
 >art : Symbol(art, Decl(38379.js, 0, 7))
 >require : Symbol(require)
->'./ex' : Symbol("ex", Decl(ex.d.ts, 0, 0))
+>'./ex' : Symbol("./ex", Decl(ex.d.ts, 0, 0))
 
 const artoo = require('./ex2')
 >artoo : Symbol(artoo, Decl(38379.js, 1, 5))
 >require : Symbol(require)
->'./ex2' : Symbol("ex2", Decl(ex2.d.ts, 0, 0))
+>'./ex2' : Symbol("./ex2", Decl(ex2.d.ts, 0, 0))
 
 let x = 1
 >x : Symbol(x, Decl(38379.js, 2, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.symbols.diff b/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.symbols.diff
new file mode 100644
index 0000000000..a42dd3744c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.symbols.diff
@@ -0,0 +1,17 @@
+--- old.requireAssertsFromTypescript.symbols
++++ new.requireAssertsFromTypescript.symbols
+@@= skipped -3, +3 lines =@@
+ const { art } = require('./ex')
+ >art : Symbol(art, Decl(38379.js, 0, 7))
+ >require : Symbol(require)
+->'./ex' : Symbol("ex", Decl(ex.d.ts, 0, 0))
++>'./ex' : Symbol("./ex", Decl(ex.d.ts, 0, 0))
+
+ const artoo = require('./ex2')
+ >artoo : Symbol(artoo, Decl(38379.js, 1, 5))
+ >require : Symbol(require)
+->'./ex2' : Symbol("ex2", Decl(ex2.d.ts, 0, 0))
++>'./ex2' : Symbol("./ex2", Decl(ex2.d.ts, 0, 0))
+
+ let x = 1
+ >x : Symbol(x, Decl(38379.js, 2, 3))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.types b/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.types
index 48ccc7420b..c92cb5495f 100644
--- a/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.types
+++ b/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.types
@@ -3,7 +3,7 @@
 === 38379.js ===
 const { art } = require('./ex')
 >art : (value: any, message?: string | Error) => asserts value
->require('./ex') : typeof import("ex")
+>require('./ex') : typeof import("./ex")
 >require : any
 >'./ex' : "./ex"
 
diff --git a/testdata/baselines/reference/submodule/conformance/requireOfESWithPropertyAccess.types b/testdata/baselines/reference/submodule/conformance/requireOfESWithPropertyAccess.types
index d6971d4e70..1bf747b4a3 100644
--- a/testdata/baselines/reference/submodule/conformance/requireOfESWithPropertyAccess.types
+++ b/testdata/baselines/reference/submodule/conformance/requireOfESWithPropertyAccess.types
@@ -4,7 +4,7 @@
 const x = require('./ch').x
 >x : { grey: {}; }
 >require('./ch').x : { grey: {}; }
->require('./ch') : typeof import("ch")
+>require('./ch') : typeof import("./ch")
 >require : any
 >'./ch' : "./ch"
 >x : { grey: {}; }
diff --git a/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.symbols b/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.symbols
index eb78bcbda7..7fc6f54485 100644
--- a/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.symbols
+++ b/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.symbols
@@ -3,7 +3,7 @@
 === /node_modules/acorn-walk/dist/walk.d.ts ===
 export {};
 declare module 'acorn-walk' {
->'acorn-walk' : Symbol("/node_modules/acorn-walk/dist/walk", Decl(walk.d.ts, 0, 0), Decl(walk.d.ts, 0, 10))
+>'acorn-walk' : Symbol("acorn-walk", Decl(walk.d.ts, 0, 0), Decl(walk.d.ts, 0, 10))
 
   export function simple(node: any, visitors: any, base?: any, state?: any): any;
 >simple : Symbol(simple, Decl(walk.d.ts, 1, 29))
diff --git a/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.symbols.diff b/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.symbols.diff
new file mode 100644
index 0000000000..a56c67417f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.symbols.diff
@@ -0,0 +1,11 @@
+--- old.selfNameModuleAugmentation.symbols
++++ new.selfNameModuleAugmentation.symbols
+@@= skipped -2, +2 lines =@@
+ === /node_modules/acorn-walk/dist/walk.d.ts ===
+ export {};
+ declare module 'acorn-walk' {
+->'acorn-walk' : Symbol("/node_modules/acorn-walk/dist/walk", Decl(walk.d.ts, 0, 0), Decl(walk.d.ts, 0, 10))
++>'acorn-walk' : Symbol("acorn-walk", Decl(walk.d.ts, 0, 0), Decl(walk.d.ts, 0, 10))
+
+   export function simple(node: any, visitors: any, base?: any, state?: any): any;
+ >simple : Symbol(simple, Decl(walk.d.ts, 1, 29))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.types b/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.types
index f6a56f02c6..99ce90f754 100644
--- a/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.types
+++ b/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.types
@@ -3,7 +3,7 @@
 === /node_modules/acorn-walk/dist/walk.d.ts ===
 export {};
 declare module 'acorn-walk' {
->'acorn-walk' : typeof import("/node_modules/acorn-walk/dist/walk")
+>'acorn-walk' : typeof import("acorn-walk")
 
   export function simple(node: any, visitors: any, base?: any, state?: any): any;
 >simple : (node: any, visitors: any, base?: any, state?: any) => any
diff --git a/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types b/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types
index bb66061724..cdfa39d17a 100644
--- a/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types
+++ b/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types
@@ -3,7 +3,7 @@
 === foo.ts ===
 /// <reference path="types.d.ts" />
 declare function foo(): any;
->foo : typeof import("types")
+>foo : typeof import("./types")
 
 === types.d.ts ===
 declare function foo(props: any): any;
@@ -14,5 +14,5 @@ export default foo;
 >foo : (props: any) => any
 
 export as namespace foo;
->foo : typeof import("types")
+>foo : typeof import("./types")
 
diff --git a/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types.diff b/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types.diff
new file mode 100644
index 0000000000..d6d72af687
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types.diff
@@ -0,0 +1,17 @@
+--- old.sourceFileMergeWithFunction.types
++++ new.sourceFileMergeWithFunction.types
+@@= skipped -2, +2 lines =@@
+ === foo.ts ===
+ /// <reference path="types.d.ts" />
+ declare function foo(): any;
+->foo : typeof import("types")
++>foo : typeof import("./types")
+
+ === types.d.ts ===
+ declare function foo(props: any): any;
+@@= skipped -11, +11 lines =@@
+ >foo : (props: any) => any
+
+ export as namespace foo;
+->foo : typeof import("types")
++>foo : typeof import("./types")
diff --git a/testdata/baselines/reference/submodule/conformance/typeAliasesDoNotMerge.types b/testdata/baselines/reference/submodule/conformance/typeAliasesDoNotMerge.types
index 6ebf7dcc30..81c24830d2 100644
--- a/testdata/baselines/reference/submodule/conformance/typeAliasesDoNotMerge.types
+++ b/testdata/baselines/reference/submodule/conformance/typeAliasesDoNotMerge.types
@@ -2,8 +2,8 @@
 
 === typeAliasesDoNotMerge.ts ===
 export type A = {}
->A : import("typeAliasesDoNotMerge").A
+>A : import("./typeAliasesDoNotMerge").A
 
 type A = {}
->A : import("typeAliasesDoNotMerge").A
+>A : import("./typeAliasesDoNotMerge").A
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeAliasesDoNotMerge.types.diff b/testdata/baselines/reference/submodule/conformance/typeAliasesDoNotMerge.types.diff
new file mode 100644
index 0000000000..a4869225d4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typeAliasesDoNotMerge.types.diff
@@ -0,0 +1,12 @@
+--- old.typeAliasesDoNotMerge.types
++++ new.typeAliasesDoNotMerge.types
+@@= skipped -1, +1 lines =@@
+
+ === typeAliasesDoNotMerge.ts ===
+ export type A = {}
+->A : import("typeAliasesDoNotMerge").A
++>A : import("./typeAliasesDoNotMerge").A
+
+ type A = {}
+->A : import("typeAliasesDoNotMerge").A
++>A : import("./typeAliasesDoNotMerge").A
diff --git a/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.types b/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.types
index 8b216aaeb7..5d6a899a20 100644
--- a/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.types
+++ b/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.types
@@ -15,17 +15,17 @@ export type Drink = 0 | 1;
 >Drink : Drink
 
 export * as Drink from "./constants";
->Drink : typeof import("constants")
+>Drink : typeof import("./constants")
 
 
 === index.ts ===
 import { Drink } from "./drink";
->Drink : typeof import("constants")
+>Drink : typeof import("./constants")
 
 // 'Drink' only refers to a type, but is being used as a value here
 const x: Drink = Drink.TEA;
 >x : Drink
 >Drink.TEA : 1
->Drink : typeof import("constants")
+>Drink : typeof import("./constants")
 >TEA : 1
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.types.diff b/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.types.diff
new file mode 100644
index 0000000000..e6aba3c3d1
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.types.diff
@@ -0,0 +1,22 @@
+--- old.typeAndNamespaceExportMerge.types
++++ new.typeAndNamespaceExportMerge.types
+@@= skipped -14, +14 lines =@@
+ >Drink : Drink
+
+ export * as Drink from "./constants";
+->Drink : typeof import("constants")
++>Drink : typeof import("./constants")
+
+
+ === index.ts ===
+ import { Drink } from "./drink";
+->Drink : typeof import("constants")
++>Drink : typeof import("./constants")
+
+ // 'Drink' only refers to a type, but is being used as a value here
+ const x: Drink = Drink.TEA;
+ >x : Drink
+ >Drink.TEA : 1
+->Drink : typeof import("constants")
++>Drink : typeof import("./constants")
+ >TEA : 1
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.symbols b/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.symbols
index b06ce00d14..15b214f699 100644
--- a/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.symbols
@@ -12,7 +12,7 @@ declare var module: any, exports: any;
 === a-ext.js ===
 exports.A = function () {
 >exports.A : Symbol(A, Decl(a-ext.js, 0, 0))
->exports : Symbol("a-ext", Decl(a-ext.js, 0, 0))
+>exports : Symbol("./a-ext", Decl(a-ext.js, 0, 0))
 >A : Symbol(A, Decl(a-ext.js, 0, 0))
 
     this.x = 1;
@@ -22,7 +22,7 @@ exports.A = function () {
 const { A } = require("./a-ext");
 >A : Symbol(A, Decl(a.js, 0, 7))
 >require : Symbol(require, Decl(node.d.ts, 0, 0))
->"./a-ext" : Symbol("a-ext", Decl(a-ext.js, 0, 0))
+>"./a-ext" : Symbol("./a-ext", Decl(a-ext.js, 0, 0))
 
 /** @param {A} p */
 function a(p) { p.x; }
@@ -33,7 +33,7 @@ function a(p) { p.x; }
 === b-ext.js ===
 exports.B = class {
 >exports.B : Symbol(B, Decl(b-ext.js, 0, 0))
->exports : Symbol("b-ext", Decl(b-ext.js, 0, 0))
+>exports : Symbol("./b-ext", Decl(b-ext.js, 0, 0))
 >B : Symbol(B, Decl(b-ext.js, 0, 0))
 
     constructor() {
@@ -48,7 +48,7 @@ exports.B = class {
 const { B } = require("./b-ext");
 >B : Symbol(B, Decl(b.js, 0, 7))
 >require : Symbol(require, Decl(node.d.ts, 0, 0))
->"./b-ext" : Symbol("b-ext", Decl(b-ext.js, 0, 0))
+>"./b-ext" : Symbol("./b-ext", Decl(b-ext.js, 0, 0))
 
 /** @param {B} p */
 function b(p) { p.x; }
@@ -67,7 +67,7 @@ export function C() {
 const { C } = require("./c-ext");
 >C : Symbol(C, Decl(c.js, 0, 7))
 >require : Symbol(require, Decl(node.d.ts, 0, 0))
->"./c-ext" : Symbol("c-ext", Decl(c-ext.js, 0, 0))
+>"./c-ext" : Symbol("./c-ext", Decl(c-ext.js, 0, 0))
 
 /** @param {C} p */
 function c(p) { p.x; }
@@ -86,7 +86,7 @@ export var D = function() {
 const { D } = require("./d-ext");
 >D : Symbol(D, Decl(d.js, 0, 7))
 >require : Symbol(require, Decl(node.d.ts, 0, 0))
->"./d-ext" : Symbol("d-ext", Decl(d-ext.js, 0, 0))
+>"./d-ext" : Symbol("./d-ext", Decl(d-ext.js, 0, 0))
 
 /** @param {D} p */
 function d(p) { p.x; }
@@ -110,7 +110,7 @@ export class E {
 const { E } = require("./e-ext");
 >E : Symbol(E, Decl(e.js, 0, 7))
 >require : Symbol(require, Decl(node.d.ts, 0, 0))
->"./e-ext" : Symbol("e-ext", Decl(e-ext.js, 0, 0))
+>"./e-ext" : Symbol("./e-ext", Decl(e-ext.js, 0, 0))
 
 /** @param {E} p */
 function e(p) { p.x; }
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.symbols.diff b/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.symbols.diff
index e368df2f6e..c6e4875994 100644
--- a/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.symbols.diff
@@ -5,7 +5,7 @@
  exports.A = function () {
  >exports.A : Symbol(A, Decl(a-ext.js, 0, 0))
 ->exports : Symbol(A, Decl(a-ext.js, 0, 0))
-+>exports : Symbol("a-ext", Decl(a-ext.js, 0, 0))
++>exports : Symbol("./a-ext", Decl(a-ext.js, 0, 0))
  >A : Symbol(A, Decl(a-ext.js, 0, 0))
 
      this.x = 1;
@@ -16,7 +16,13 @@
  };
 
  === a.js ===
-@@= skipped -20, +16 lines =@@
+ const { A } = require("./a-ext");
+ >A : Symbol(A, Decl(a.js, 0, 7))
+ >require : Symbol(require, Decl(node.d.ts, 0, 0))
+->"./a-ext" : Symbol("a-ext", Decl(a-ext.js, 0, 0))
++>"./a-ext" : Symbol("./a-ext", Decl(a-ext.js, 0, 0))
+
+ /** @param {A} p */
  function a(p) { p.x; }
  >a : Symbol(a, Decl(a.js, 0, 33))
  >p : Symbol(p, Decl(a.js, 3, 11))
@@ -28,11 +34,18 @@
  exports.B = class {
  >exports.B : Symbol(B, Decl(b-ext.js, 0, 0))
 ->exports : Symbol(B, Decl(b-ext.js, 0, 0))
-+>exports : Symbol("b-ext", Decl(b-ext.js, 0, 0))
++>exports : Symbol("./b-ext", Decl(b-ext.js, 0, 0))
  >B : Symbol(B, Decl(b-ext.js, 0, 0))
 
      constructor() {
-@@= skipped -28, +26 lines =@@
+@@= skipped -42, +36 lines =@@
+ const { B } = require("./b-ext");
+ >B : Symbol(B, Decl(b.js, 0, 7))
+ >require : Symbol(require, Decl(node.d.ts, 0, 0))
+->"./b-ext" : Symbol("b-ext", Decl(b-ext.js, 0, 0))
++>"./b-ext" : Symbol("./b-ext", Decl(b-ext.js, 0, 0))
+
+ /** @param {B} p */
  function b(p) { p.x; }
  >b : Symbol(b, Decl(b.js, 0, 33))
  >p : Symbol(p, Decl(b.js, 3, 11))
@@ -51,7 +64,13 @@
  }
 
  === c.js ===
-@@= skipped -24, +19 lines =@@
+ const { C } = require("./c-ext");
+ >C : Symbol(C, Decl(c.js, 0, 7))
+ >require : Symbol(require, Decl(node.d.ts, 0, 0))
+->"./c-ext" : Symbol("c-ext", Decl(c-ext.js, 0, 0))
++>"./c-ext" : Symbol("./c-ext", Decl(c-ext.js, 0, 0))
+
+ /** @param {C} p */
  function c(p) { p.x; }
  >c : Symbol(c, Decl(c.js, 0, 33))
  >p : Symbol(p, Decl(c.js, 3, 11))
@@ -71,7 +90,13 @@
  };
 
  === d.js ===
-@@= skipped -25, +19 lines =@@
+ const { D } = require("./d-ext");
+ >D : Symbol(D, Decl(d.js, 0, 7))
+ >require : Symbol(require, Decl(node.d.ts, 0, 0))
+->"./d-ext" : Symbol("d-ext", Decl(d-ext.js, 0, 0))
++>"./d-ext" : Symbol("./d-ext", Decl(d-ext.js, 0, 0))
+
+ /** @param {D} p */
  function d(p) { p.x; }
  >d : Symbol(d, Decl(d.js, 0, 33))
  >p : Symbol(p, Decl(d.js, 3, 11))
@@ -81,7 +106,16 @@
 
  === e-ext.js ===
  export class E {
-@@= skipped -35, +33 lines =@@
+@@= skipped -75, +62 lines =@@
+ const { E } = require("./e-ext");
+ >E : Symbol(E, Decl(e.js, 0, 7))
+ >require : Symbol(require, Decl(node.d.ts, 0, 0))
+->"./e-ext" : Symbol("e-ext", Decl(e-ext.js, 0, 0))
++>"./e-ext" : Symbol("./e-ext", Decl(e-ext.js, 0, 0))
+
+ /** @param {E} p */
+ function e(p) { p.x; }
+@@= skipped -15, +15 lines =@@
  >F : Symbol(F, Decl(f.js, 0, 3))
 
      this.x = 1;
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.types b/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.types
index b022355033..09df8e0fdc 100644
--- a/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.types
+++ b/testdata/baselines/reference/submodule/conformance/typeFromParamTagForFunction.types
@@ -13,7 +13,7 @@ declare var module: any, exports: any;
 exports.A = function () {
 >exports.A = function () {    this.x = 1;} : () => void
 >exports.A : () => void
->exports : typeof import("a-ext")
+>exports : typeof import("./a-ext")
 >A : () => void
 >function () {    this.x = 1;} : () => void
 
@@ -29,7 +29,7 @@ exports.A = function () {
 === a.js ===
 const { A } = require("./a-ext");
 >A : () => void
->require("./a-ext") : typeof import("a-ext")
+>require("./a-ext") : typeof import("./a-ext")
 >require : (id: string) => any
 >"./a-ext" : "./a-ext"
 
@@ -45,7 +45,7 @@ function a(p) { p.x; }
 exports.B = class {
 >exports.B = class {    constructor() {        this.x = 1;    }} : typeof B
 >exports.B : typeof B
->exports : typeof import("b-ext")
+>exports : typeof import("./b-ext")
 >B : typeof B
 >class {    constructor() {        this.x = 1;    }} : typeof B
 
@@ -62,7 +62,7 @@ exports.B = class {
 === b.js ===
 const { B } = require("./b-ext");
 >B : typeof B
->require("./b-ext") : typeof import("b-ext")
+>require("./b-ext") : typeof import("./b-ext")
 >require : (id: string) => any
 >"./b-ext" : "./b-ext"
 
@@ -89,7 +89,7 @@ export function C() {
 === c.js ===
 const { C } = require("./c-ext");
 >C : () => void
->require("./c-ext") : typeof import("c-ext")
+>require("./c-ext") : typeof import("./c-ext")
 >require : (id: string) => any
 >"./c-ext" : "./c-ext"
 
@@ -118,7 +118,7 @@ export var D = function() {
 === d.js ===
 const { D } = require("./d-ext");
 >D : () => void
->require("./d-ext") : typeof import("d-ext")
+>require("./d-ext") : typeof import("./d-ext")
 >require : (id: string) => any
 >"./d-ext" : "./d-ext"
 
@@ -147,7 +147,7 @@ export class E {
 === e.js ===
 const { E } = require("./e-ext");
 >E : typeof E
->require("./e-ext") : typeof import("e-ext")
+>require("./e-ext") : typeof import("./e-ext")
 >require : (id: string) => any
 >"./e-ext" : "./e-ext"
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols
index 25919e7a12..5ac7eb0f77 100644
--- a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols
@@ -5,7 +5,7 @@
 var mini = require('./minimatch')
 >mini : Symbol(mini, Decl(use.js, 1, 3))
 >require : Symbol(require, Decl(types.d.ts, 0, 11))
->'./minimatch' : Symbol("minimatch", Decl(minimatch.js, 0, 0))
+>'./minimatch' : Symbol("./minimatch", Decl(minimatch.js, 0, 0))
 
 mini.M.defaults()
 >mini.M.defaults : Symbol(M.defaults, Decl(minimatch.js, 8, 1))
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols.diff b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols.diff
index a8bd929f5f..a0a89143aa 100644
--- a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols.diff
@@ -1,6 +1,15 @@
 --- old.typeFromPropertyAssignment17.symbols
 +++ new.typeFromPropertyAssignment17.symbols
-@@= skipped -20, +20 lines =@@
+@@= skipped -4, +4 lines =@@
+ var mini = require('./minimatch')
+ >mini : Symbol(mini, Decl(use.js, 1, 3))
+ >require : Symbol(require, Decl(types.d.ts, 0, 11))
+->'./minimatch' : Symbol("minimatch", Decl(minimatch.js, 0, 0))
++>'./minimatch' : Symbol("./minimatch", Decl(minimatch.js, 0, 0))
+
+ mini.M.defaults()
+ >mini.M.defaults : Symbol(M.defaults, Decl(minimatch.js, 8, 1))
+@@= skipped -16, +16 lines =@@
  >M : Symbol(mini.M, Decl(minimatch.js, 1, 26))
 
  m.m()
diff --git a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node18).types b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node18).types
index c94b254bed..c4c89833c3 100644
--- a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node18).types
+++ b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node18).types
@@ -9,11 +9,11 @@ import type {} from "./module.mts";
 import type {} from "./module.mts" with { "resolution-mode": "import" };
 import type {} from "./module.mts" with { "resolution-mode": "require" };
 type _1 = typeof import("./module.mts");
->_1 : typeof import("module", { with: { "resolution-mode": "import" } })
+>_1 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
 
 type _2 = typeof import("./module.mts", { with: { "resolution-mode": "import" } });
->_2 : typeof import("module", { with: { "resolution-mode": "import" } })
+>_2 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
 
 type _3 = typeof import("./module.mts", { with: { "resolution-mode": "require" } });
->_3 : typeof import("module", { with: { "resolution-mode": "import" } })
+>_3 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node18).types.diff
new file mode 100644
index 0000000000..1dbc7e56f8
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node18).types.diff
@@ -0,0 +1,16 @@
+--- old.typeOnlyESMImportFromCJS(module=node18).types
++++ new.typeOnlyESMImportFromCJS(module=node18).types
+@@= skipped -8, +8 lines =@@
+ import type {} from "./module.mts" with { "resolution-mode": "import" };
+ import type {} from "./module.mts" with { "resolution-mode": "require" };
+ type _1 = typeof import("./module.mts");
+->_1 : typeof import("module", { with: { "resolution-mode": "import" } })
++>_1 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
+
+ type _2 = typeof import("./module.mts", { with: { "resolution-mode": "import" } });
+->_2 : typeof import("module", { with: { "resolution-mode": "import" } })
++>_2 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
+
+ type _3 = typeof import("./module.mts", { with: { "resolution-mode": "require" } });
+->_3 : typeof import("module", { with: { "resolution-mode": "import" } })
++>_3 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
diff --git a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=nodenext).types
index c94b254bed..c4c89833c3 100644
--- a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=nodenext).types
@@ -9,11 +9,11 @@ import type {} from "./module.mts";
 import type {} from "./module.mts" with { "resolution-mode": "import" };
 import type {} from "./module.mts" with { "resolution-mode": "require" };
 type _1 = typeof import("./module.mts");
->_1 : typeof import("module", { with: { "resolution-mode": "import" } })
+>_1 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
 
 type _2 = typeof import("./module.mts", { with: { "resolution-mode": "import" } });
->_2 : typeof import("module", { with: { "resolution-mode": "import" } })
+>_2 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
 
 type _3 = typeof import("./module.mts", { with: { "resolution-mode": "require" } });
->_3 : typeof import("module", { with: { "resolution-mode": "import" } })
+>_3 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=nodenext).types.diff
new file mode 100644
index 0000000000..311b152fff
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=nodenext).types.diff
@@ -0,0 +1,16 @@
+--- old.typeOnlyESMImportFromCJS(module=nodenext).types
++++ new.typeOnlyESMImportFromCJS(module=nodenext).types
+@@= skipped -8, +8 lines =@@
+ import type {} from "./module.mts" with { "resolution-mode": "import" };
+ import type {} from "./module.mts" with { "resolution-mode": "require" };
+ type _1 = typeof import("./module.mts");
+->_1 : typeof import("module", { with: { "resolution-mode": "import" } })
++>_1 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
+
+ type _2 = typeof import("./module.mts", { with: { "resolution-mode": "import" } });
+->_2 : typeof import("module", { with: { "resolution-mode": "import" } })
++>_2 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
+
+ type _3 = typeof import("./module.mts", { with: { "resolution-mode": "require" } });
+->_3 : typeof import("module", { with: { "resolution-mode": "import" } })
++>_3 : typeof import("./module.mts", { with: { "resolution-mode": "import" } })
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols
index 32a138e1d0..433616a41e 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols
@@ -42,7 +42,7 @@ export function C() {
 
 exports.C = function() {
 >exports.C : Symbol(C, Decl(mod3.js, 0, 0))
->exports : Symbol("mod3", Decl(mod3.js, 0, 0))
+>exports : Symbol("./mod3", Decl(mod3.js, 0, 0))
 >C : Symbol(C, Decl(mod3.js, 0, 0))
 
     this.p = 1
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols.diff b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols.diff
index 41eb9130b5..e0ee729c0b 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols.diff
@@ -37,7 +37,7 @@
  exports.C = function() {
  >exports.C : Symbol(C, Decl(mod3.js, 0, 0))
 ->exports : Symbol(C, Decl(mod3.js, 0, 0))
-+>exports : Symbol("mod3", Decl(mod3.js, 0, 0))
++>exports : Symbol("./mod3", Decl(mod3.js, 0, 0))
  >C : Symbol(C, Decl(mod3.js, 0, 0))
 
      this.p = 1
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.types b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.types
index 2df8da37ca..a66cb912fb 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.types
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.types
@@ -54,7 +54,7 @@ export function C() {
 exports.C = function() {
 >exports.C = function() {    this.p = 1} : () => void
 >exports.C : () => void
->exports : typeof import("mod3")
+>exports : typeof import("./mod3")
 >C : () => void
 >function() {    this.p = 1} : () => void
 
@@ -78,13 +78,13 @@ var both1 = { type: 'a', x: 1 };
 
 /** @type {import('./mod2').Both} */
 var both2 = both1;
->both2 : import("mod2").Both
+>both2 : import("./mod2").Both
 >both1 : any
 
 /** @type {import('./mod3').Both} */
 var both3 = both2;
->both3 : import("mod3").Both
->both2 : import("mod2").Both
+>both3 : import("./mod3").Both
+>both2 : import("./mod2").Both
 
 
 
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols
index 2104a285c8..5769fd3482 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols
@@ -4,7 +4,7 @@
 var mod = require('./mod1.js');
 >mod : Symbol(mod, Decl(use.js, 0, 3))
 >require : Symbol(require)
->'./mod1.js' : Symbol("mod1", Decl(mod1.js, 0, 0))
+>'./mod1.js' : Symbol("./mod1.js", Decl(mod1.js, 0, 0))
 
 /** @type {import("./mod1.js").Baz} */
 var b;
@@ -29,7 +29,7 @@ class Foo { } // should error
 
 /** @typedef {number} Bar */
 exports.Bar = class { }
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 /** @typedef {number} Baz */
 module.exports = {
@@ -49,7 +49,7 @@ var Qux = 2;
 
 /** @typedef {number} Quid */
 exports.Quid = 2;
->exports : Symbol("mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
 /** @typedef {number} Quack */
 module.exports = {
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols.diff b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols.diff
index b01cc9dce5..910dc06276 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols.diff
@@ -1,6 +1,15 @@
 --- old.typedefCrossModule2.symbols
 +++ new.typedefCrossModule2.symbols
-@@= skipped -15, +15 lines =@@
+@@= skipped -3, +3 lines =@@
+ var mod = require('./mod1.js');
+ >mod : Symbol(mod, Decl(use.js, 0, 3))
+ >require : Symbol(require)
+->'./mod1.js' : Symbol("mod1", Decl(mod1.js, 0, 0))
++>'./mod1.js' : Symbol("./mod1.js", Decl(mod1.js, 0, 0))
+
+ /** @type {import("./mod1.js").Baz} */
+ var b;
+@@= skipped -12, +12 lines =@@
 
  var bbb = new mod.Baz();
  >bbb : Symbol(bbb, Decl(use.js, 5, 3))
@@ -23,7 +32,7 @@
 ->exports.Bar : Symbol(Bar, Decl(mod1.js, 3, 13), Decl(mod1.js, 5, 4))
 ->exports : Symbol(Bar, Decl(mod1.js, 3, 13), Decl(mod1.js, 5, 4))
 ->Bar : Symbol(Bar, Decl(mod1.js, 3, 13), Decl(mod1.js, 5, 4))
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
  /** @typedef {number} Baz */
  module.exports = {
@@ -48,7 +57,7 @@
 ->exports.Quid : Symbol(Quid, Decl(mod1.js, 16, 12), Decl(mod1.js, 18, 4))
 ->exports : Symbol(Quid, Decl(mod1.js, 16, 12), Decl(mod1.js, 18, 4))
 ->Quid : Symbol(Quid, Decl(mod1.js, 16, 12), Decl(mod1.js, 18, 4))
-+>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
++>exports : Symbol("./mod1", Decl(mod1.js, 0, 0))
 
  /** @typedef {number} Quack */
  module.exports = {
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.types b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.types
index 9318e46cff..e597356b31 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.types
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.types
@@ -33,7 +33,7 @@ class Foo { } // should error
 exports.Bar = class { }
 >exports.Bar = class { } : typeof Bar
 >exports.Bar : any
->exports : typeof import("mod1")
+>exports : typeof import("./mod1")
 >Bar : any
 >class { } : typeof Bar
 
@@ -61,7 +61,7 @@ var Qux = 2;
 exports.Quid = 2;
 >exports.Quid = 2 : 2
 >exports.Quid : any
->exports : typeof import("mod1")
+>exports : typeof import("./mod1")
 >Quid : any
 >2 : 2
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeofImportTypeOnlyExport.types b/testdata/baselines/reference/submodule/conformance/typeofImportTypeOnlyExport.types
index 1c45582fe4..afd37e07f8 100644
--- a/testdata/baselines/reference/submodule/conformance/typeofImportTypeOnlyExport.types
+++ b/testdata/baselines/reference/submodule/conformance/typeofImportTypeOnlyExport.types
@@ -2,12 +2,12 @@
 
 === button.ts ===
 import {classMap} from './lit.js';
->classMap : () => { directive: typeof import("lit").ClassMapDirective; }
+>classMap : () => { directive: typeof import("./lit.js").ClassMapDirective; }
 
 export const c = classMap();
->c : { directive: typeof import("lit").ClassMapDirective; }
->classMap() : { directive: typeof import("lit").ClassMapDirective; }
->classMap : () => { directive: typeof import("lit").ClassMapDirective; }
+>c : { directive: typeof import("./lit.js").ClassMapDirective; }
+>classMap() : { directive: typeof import("./lit.js").ClassMapDirective; }
+>classMap : () => { directive: typeof import("./lit.js").ClassMapDirective; }
 
 === lit.ts ===
 class ClassMapDirective {}
diff --git a/testdata/baselines/reference/submodule/conformance/typeofImportTypeOnlyExport.types.diff b/testdata/baselines/reference/submodule/conformance/typeofImportTypeOnlyExport.types.diff
new file mode 100644
index 0000000000..bb5f1f089c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typeofImportTypeOnlyExport.types.diff
@@ -0,0 +1,19 @@
+--- old.typeofImportTypeOnlyExport.types
++++ new.typeofImportTypeOnlyExport.types
+@@= skipped -1, +1 lines =@@
+
+ === button.ts ===
+ import {classMap} from './lit.js';
+->classMap : () => { directive: typeof import("lit").ClassMapDirective; }
++>classMap : () => { directive: typeof import("./lit.js").ClassMapDirective; }
+
+ export const c = classMap();
+->c : { directive: typeof import("lit").ClassMapDirective; }
+->classMap() : { directive: typeof import("lit").ClassMapDirective; }
+->classMap : () => { directive: typeof import("lit").ClassMapDirective; }
++>c : { directive: typeof import("./lit.js").ClassMapDirective; }
++>classMap() : { directive: typeof import("./lit.js").ClassMapDirective; }
++>classMap : () => { directive: typeof import("./lit.js").ClassMapDirective; }
+
+ === lit.ts ===
+ class ClassMapDirective {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFile.types b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFile.types
index e6d8aeda07..39872d4024 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFile.types
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFile.types
@@ -2,20 +2,20 @@
 
 === main.ts ===
 import { fa } from "ext";
->fa : () => import("node_modules/ext/ts3.1/index").A
+>fa : () => import("ext").A
 
 import { fb } from "ext/other";
->fb : () => import("node_modules/ext/ts3.1/other").B
+>fb : () => import("ext/other").B
 
 export const va = fa();
->va : import("node_modules/ext/ts3.1/index").A
->fa() : import("node_modules/ext/ts3.1/index").A
->fa : () => import("node_modules/ext/ts3.1/index").A
+>va : import("ext").A
+>fa() : import("ext").A
+>fa : () => import("ext").A
 
 export const vb = fb();
->vb : import("node_modules/ext/ts3.1/other").B
->fb() : import("node_modules/ext/ts3.1/other").B
->fb : () => import("node_modules/ext/ts3.1/other").B
+>vb : import("ext/other").B
+>fb() : import("ext/other").B
+>fb : () => import("ext/other").B
 
 === node_modules/ext/ts3.1/index.d.ts ===
 export interface A {}
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFile.types.diff b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFile.types.diff
new file mode 100644
index 0000000000..db8715a8ca
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFile.types.diff
@@ -0,0 +1,31 @@
+--- old.typesVersionsDeclarationEmit.multiFile.types
++++ new.typesVersionsDeclarationEmit.multiFile.types
+@@= skipped -1, +1 lines =@@
+
+ === main.ts ===
+ import { fa } from "ext";
+->fa : () => import("node_modules/ext/ts3.1/index").A
++>fa : () => import("ext").A
+
+ import { fb } from "ext/other";
+->fb : () => import("node_modules/ext/ts3.1/other").B
++>fb : () => import("ext/other").B
+
+ export const va = fa();
+->va : import("node_modules/ext/ts3.1/index").A
+->fa() : import("node_modules/ext/ts3.1/index").A
+->fa : () => import("node_modules/ext/ts3.1/index").A
++>va : import("ext").A
++>fa() : import("ext").A
++>fa : () => import("ext").A
+
+ export const vb = fb();
+->vb : import("node_modules/ext/ts3.1/other").B
+->fb() : import("node_modules/ext/ts3.1/other").B
+->fb : () => import("node_modules/ext/ts3.1/other").B
++>vb : import("ext/other").B
++>fb() : import("ext/other").B
++>fb : () => import("ext/other").B
+
+ === node_modules/ext/ts3.1/index.d.ts ===
+ export interface A {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types
index 8eb4879ee8..2369c8603b 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types
@@ -5,7 +5,7 @@ import { fa } from "ext";
 >fa : any
 
 import { fb } from "ext/other";
->fb : () => import("node_modules/ext/other").B
+>fb : () => import("ext/other").B
 
 export const va = fa();
 >va : any
@@ -13,9 +13,9 @@ export const va = fa();
 >fa : any
 
 export const vb = fb();
->vb : import("node_modules/ext/other").B
->fb() : import("node_modules/ext/other").B
->fb : () => import("node_modules/ext/other").B
+>vb : import("ext/other").B
+>fb() : import("ext/other").B
+>fb : () => import("ext/other").B
 
 === node_modules/ext/other.d.ts ===
 export interface B {}
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types.diff b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types.diff
new file mode 100644
index 0000000000..98962dec17
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types.diff
@@ -0,0 +1,24 @@
+--- old.typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types
++++ new.typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types
+@@= skipped -4, +4 lines =@@
+ >fa : any
+
+ import { fb } from "ext/other";
+->fb : () => import("node_modules/ext/other").B
++>fb : () => import("ext/other").B
+
+ export const va = fa();
+ >va : any
+@@= skipped -8, +8 lines =@@
+ >fa : any
+
+ export const vb = fb();
+->vb : import("node_modules/ext/other").B
+->fb() : import("node_modules/ext/other").B
+->fb : () => import("node_modules/ext/other").B
++>vb : import("ext/other").B
++>fb() : import("ext/other").B
++>fb : () => import("ext/other").B
+
+ === node_modules/ext/other.d.ts ===
+ export interface B {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types
index 3b0723407f..96cbb71da6 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types
@@ -2,21 +2,21 @@
 
 === main.ts ===
 import { fa } from "ext";
->fa : () => import("node_modules/ext/other").A2
+>fa : () => import("ext").A2
 
 import { fa as fa2 } from "ext/other";
->fa : () => import("node_modules/ext/other").A2
->fa2 : () => import("node_modules/ext/other").A2
+>fa : () => import("ext").A2
+>fa2 : () => import("ext").A2
 
 export const va = fa();
->va : import("node_modules/ext/other").A2
->fa() : import("node_modules/ext/other").A2
->fa : () => import("node_modules/ext/other").A2
+>va : import("ext").A2
+>fa() : import("ext").A2
+>fa : () => import("ext").A2
 
 export const va2 = fa2();
->va2 : import("node_modules/ext/other").A2
->fa2() : import("node_modules/ext/other").A2
->fa2 : () => import("node_modules/ext/other").A2
+>va2 : import("ext").A2
+>fa2() : import("ext").A2
+>fa2 : () => import("ext").A2
 
 === node_modules/ext/other.d.ts ===
 export interface A2 {}
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types.diff b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types.diff
new file mode 100644
index 0000000000..16ce9c5c52
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types.diff
@@ -0,0 +1,33 @@
+--- old.typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types
++++ new.typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types
+@@= skipped -1, +1 lines =@@
+
+ === main.ts ===
+ import { fa } from "ext";
+->fa : () => import("node_modules/ext/other").A2
++>fa : () => import("ext").A2
+
+ import { fa as fa2 } from "ext/other";
+->fa : () => import("node_modules/ext/other").A2
+->fa2 : () => import("node_modules/ext/other").A2
++>fa : () => import("ext").A2
++>fa2 : () => import("ext").A2
+
+ export const va = fa();
+->va : import("node_modules/ext/other").A2
+->fa() : import("node_modules/ext/other").A2
+->fa : () => import("node_modules/ext/other").A2
++>va : import("ext").A2
++>fa() : import("ext").A2
++>fa : () => import("ext").A2
+
+ export const va2 = fa2();
+->va2 : import("node_modules/ext/other").A2
+->fa2() : import("node_modules/ext/other").A2
+->fa2 : () => import("node_modules/ext/other").A2
++>va2 : import("ext").A2
++>fa2() : import("ext").A2
++>fa2 : () => import("ext").A2
+
+ === node_modules/ext/other.d.ts ===
+ export interface A2 {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.types b/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.types
index 23f164b3ae..dbd0bf189b 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.types
+++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.types
@@ -48,7 +48,7 @@ var t = p.x;
 
 === node_modules/math2d/index.d.ts ===
 export as namespace Math2d;
->Math2d : typeof import("node_modules/math2d/index")
+>Math2d : typeof import("math2d")
 
 export interface Point {
 	x: number;
diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.types.diff b/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.types.diff
index 50a1481dfb..b69c74ad80 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.types.diff
@@ -12,7 +12,16 @@
 
  var t = p.x;
  >t : number
-@@= skipped -56, +56 lines =@@
+@@= skipped -12, +12 lines =@@
+
+ === node_modules/math2d/index.d.ts ===
+ export as namespace Math2d;
+->Math2d : typeof import("node_modules/math2d/index")
++>Math2d : typeof import("math2d")
+
+ export interface Point {
+ 	x: number;
+@@= skipped -44, +44 lines =@@
  	// Add a method to the class
  	interface Vector {
  		reverse(): Math2d.Point;
diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-2.types b/testdata/baselines/reference/submodule/conformance/umd-augmentation-2.types
index 012b4adad9..7cc5ecdfab 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-2.types
+++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-2.types
@@ -46,7 +46,7 @@ var t = p.x;
 
 === node_modules/math2d/index.d.ts ===
 export as namespace Math2d;
->Math2d : typeof import("node_modules/math2d/index")
+>Math2d : typeof import("math2d")
 
 export interface Point {
 	x: number;
diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-2.types.diff b/testdata/baselines/reference/submodule/conformance/umd-augmentation-2.types.diff
index e8b09164b9..41ac1b3c9a 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-2.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-2.types.diff
@@ -1,6 +1,15 @@
 --- old.umd-augmentation-2.types
 +++ new.umd-augmentation-2.types
-@@= skipped -89, +89 lines =@@
+@@= skipped -45, +45 lines =@@
+
+ === node_modules/math2d/index.d.ts ===
+ export as namespace Math2d;
+->Math2d : typeof import("node_modules/math2d/index")
++>Math2d : typeof import("math2d")
+
+ export interface Point {
+ 	x: number;
+@@= skipped -44, +44 lines =@@
  	// Add a method to the class
  	interface Vector {
  		reverse(): Math2d.Point;
diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types
index 73c994f78d..635d4b9ebc 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types
+++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types
@@ -48,13 +48,13 @@ var t = p.x;
 
 === node_modules/math2d/index.d.ts ===
 export as namespace Math2d;
->Math2d : typeof import("node_modules/math2d/index.d.ts")
+>Math2d : typeof import("math2d")
 
 export = M2D;
->M2D : typeof import("node_modules/math2d/index.d.ts")
+>M2D : typeof import("math2d")
 
 declare namespace M2D {
->M2D : typeof import("node_modules/math2d/index.d.ts")
+>M2D : typeof import("math2d")
 
 	interface Point {
 		x: number;
diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types.diff b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types.diff
index e3de594a27..f90ff0f051 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types.diff
@@ -12,7 +12,24 @@
 
  var t = p.x;
  >t : number
-@@= skipped -65, +65 lines =@@
+@@= skipped -12, +12 lines =@@
+
+ === node_modules/math2d/index.d.ts ===
+ export as namespace Math2d;
+->Math2d : typeof import("node_modules/math2d/index.d.ts")
++>Math2d : typeof import("math2d")
+
+ export = M2D;
+->M2D : typeof import("node_modules/math2d/index.d.ts")
++>M2D : typeof import("math2d")
+
+ declare namespace M2D {
+->M2D : typeof import("node_modules/math2d/index.d.ts")
++>M2D : typeof import("math2d")
+
+ 	interface Point {
+ 		x: number;
+@@= skipped -53, +53 lines =@@
  	// Add a method to the class
  	interface Vector {
  		reverse(): Math2d.Point;
diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types b/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types
index c49c821777..2efb78b499 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types
+++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types
@@ -46,13 +46,13 @@ var t = p.x;
 
 === node_modules/math2d/index.d.ts ===
 export as namespace Math2d;
->Math2d : typeof import("node_modules/math2d/index.d.ts")
+>Math2d : typeof import("math2d")
 
 export = M2D;
->M2D : typeof import("node_modules/math2d/index.d.ts")
+>M2D : typeof import("math2d")
 
 declare namespace M2D {
->M2D : typeof import("node_modules/math2d/index.d.ts")
+>M2D : typeof import("math2d")
 
 	interface Point {
 		x: number;
diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types.diff b/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types.diff
index ee8caf02b3..cdc3b75e21 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types.diff
@@ -1,6 +1,23 @@
 --- old.umd-augmentation-4.types
 +++ new.umd-augmentation-4.types
-@@= skipped -98, +98 lines =@@
+@@= skipped -45, +45 lines =@@
+
+ === node_modules/math2d/index.d.ts ===
+ export as namespace Math2d;
+->Math2d : typeof import("node_modules/math2d/index.d.ts")
++>Math2d : typeof import("math2d")
+
+ export = M2D;
+->M2D : typeof import("node_modules/math2d/index.d.ts")
++>M2D : typeof import("math2d")
+
+ declare namespace M2D {
+->M2D : typeof import("node_modules/math2d/index.d.ts")
++>M2D : typeof import("math2d")
+
+ 	interface Point {
+ 		x: number;
+@@= skipped -53, +53 lines =@@
  	// Add a method to the class
  	interface Vector {
  		reverse(): Math2d.Point;
diff --git a/testdata/baselines/reference/submodule/conformance/umd-errors.types b/testdata/baselines/reference/submodule/conformance/umd-errors.types
index 24e64b7a2f..d669b1eccd 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-errors.types
+++ b/testdata/baselines/reference/submodule/conformance/umd-errors.types
@@ -20,16 +20,16 @@ export var p;
 >p : any
 
 static export as namespace oo1;
->oo1 : typeof import("err3")
+>oo1 : typeof import("./err3")
 
 declare export as namespace oo2;
->oo2 : typeof import("err3")
+>oo2 : typeof import("./err3")
 
 public export as namespace oo3;
->oo3 : typeof import("err3")
+>oo3 : typeof import("./err3")
 
 const export as namespace oo4;
->oo4 : typeof import("err3")
+>oo4 : typeof import("./err3")
 
 === err4.d.ts ===
 // Illegal, must be at top-level
diff --git a/testdata/baselines/reference/submodule/conformance/umd-errors.types.diff b/testdata/baselines/reference/submodule/conformance/umd-errors.types.diff
new file mode 100644
index 0000000000..cc1beeef1b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/umd-errors.types.diff
@@ -0,0 +1,23 @@
+--- old.umd-errors.types
++++ new.umd-errors.types
+@@= skipped -19, +19 lines =@@
+ >p : any
+
+ static export as namespace oo1;
+->oo1 : typeof import("err3")
++>oo1 : typeof import("./err3")
+
+ declare export as namespace oo2;
+->oo2 : typeof import("err3")
++>oo2 : typeof import("./err3")
+
+ public export as namespace oo3;
+->oo3 : typeof import("err3")
++>oo3 : typeof import("./err3")
+
+ const export as namespace oo4;
+->oo4 : typeof import("err3")
++>oo4 : typeof import("./err3")
+
+ === err4.d.ts ===
+ // Illegal, must be at top-level
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/umd1.types b/testdata/baselines/reference/submodule/conformance/umd1.types
index fa7e7876fc..3b3c0c6580 100644
--- a/testdata/baselines/reference/submodule/conformance/umd1.types
+++ b/testdata/baselines/reference/submodule/conformance/umd1.types
@@ -30,5 +30,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof import("foo")
+>Foo : typeof import("./foo")
 
diff --git a/testdata/baselines/reference/submodule/conformance/umd1.types.diff b/testdata/baselines/reference/submodule/conformance/umd1.types.diff
new file mode 100644
index 0000000000..275dce6ae2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/umd1.types.diff
@@ -0,0 +1,8 @@
+--- old.umd1.types
++++ new.umd1.types
+@@= skipped -29, +29 lines =@@
+ >x : number
+
+ export as namespace Foo;
+->Foo : typeof import("foo")
++>Foo : typeof import("./foo")
diff --git a/testdata/baselines/reference/submodule/conformance/umd3.types b/testdata/baselines/reference/submodule/conformance/umd3.types
index e6d167b6fa..c048b067c6 100644
--- a/testdata/baselines/reference/submodule/conformance/umd3.types
+++ b/testdata/baselines/reference/submodule/conformance/umd3.types
@@ -32,5 +32,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof import("foo")
+>Foo : typeof import("./foo")
 
diff --git a/testdata/baselines/reference/submodule/conformance/umd3.types.diff b/testdata/baselines/reference/submodule/conformance/umd3.types.diff
new file mode 100644
index 0000000000..33c1c5db1a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/umd3.types.diff
@@ -0,0 +1,8 @@
+--- old.umd3.types
++++ new.umd3.types
+@@= skipped -31, +31 lines =@@
+ >x : number
+
+ export as namespace Foo;
+->Foo : typeof import("foo")
++>Foo : typeof import("./foo")
diff --git a/testdata/baselines/reference/submodule/conformance/umd4.types b/testdata/baselines/reference/submodule/conformance/umd4.types
index f4461b26fc..1c90f0522c 100644
--- a/testdata/baselines/reference/submodule/conformance/umd4.types
+++ b/testdata/baselines/reference/submodule/conformance/umd4.types
@@ -32,5 +32,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof import("foo")
+>Foo : typeof import("./foo")
 
diff --git a/testdata/baselines/reference/submodule/conformance/umd4.types.diff b/testdata/baselines/reference/submodule/conformance/umd4.types.diff
new file mode 100644
index 0000000000..00c87889ca
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/umd4.types.diff
@@ -0,0 +1,8 @@
+--- old.umd4.types
++++ new.umd4.types
+@@= skipped -31, +31 lines =@@
+ >x : number
+
+ export as namespace Foo;
+->Foo : typeof import("foo")
++>Foo : typeof import("./foo")
diff --git a/testdata/baselines/reference/submodule/conformance/umd5.types b/testdata/baselines/reference/submodule/conformance/umd5.types
index da57ad5a2b..76cafab48e 100644
--- a/testdata/baselines/reference/submodule/conformance/umd5.types
+++ b/testdata/baselines/reference/submodule/conformance/umd5.types
@@ -37,5 +37,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof import("foo")
+>Foo : typeof import("./foo")
 
diff --git a/testdata/baselines/reference/submodule/conformance/umd5.types.diff b/testdata/baselines/reference/submodule/conformance/umd5.types.diff
new file mode 100644
index 0000000000..d1e70c1e1e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/umd5.types.diff
@@ -0,0 +1,8 @@
+--- old.umd5.types
++++ new.umd5.types
+@@= skipped -36, +36 lines =@@
+ >x : number
+
+ export as namespace Foo;
+->Foo : typeof import("foo")
++>Foo : typeof import("./foo")
diff --git a/testdata/baselines/reference/submodule/conformance/umd9.types b/testdata/baselines/reference/submodule/conformance/umd9.types
index 5a99d7bfe6..c26f357970 100644
--- a/testdata/baselines/reference/submodule/conformance/umd9.types
+++ b/testdata/baselines/reference/submodule/conformance/umd9.types
@@ -3,8 +3,8 @@
 === a.ts ===
 /// <reference path="foo.d.ts" />
 export const x = Foo; // OK in value position because allowUmdGlobalAccess: true
->x : typeof import("foo")
->Foo : typeof import("foo")
+>x : typeof import("./foo")
+>Foo : typeof import("./foo")
 
 === foo.d.ts ===
 declare class Thing {
diff --git a/testdata/baselines/reference/submodule/conformance/umd9.types.diff b/testdata/baselines/reference/submodule/conformance/umd9.types.diff
new file mode 100644
index 0000000000..07e1804379
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/umd9.types.diff
@@ -0,0 +1,13 @@
+--- old.umd9.types
++++ new.umd9.types
+@@= skipped -2, +2 lines =@@
+ === a.ts ===
+ /// <reference path="foo.d.ts" />
+ export const x = Foo; // OK in value position because allowUmdGlobalAccess: true
+->x : typeof import("foo")
+->Foo : typeof import("foo")
++>x : typeof import("./foo")
++>Foo : typeof import("./foo")
+
+ === foo.d.ts ===
+ declare class Thing {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.symbols b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.symbols
index 6493017cb5..b15d6eeaa9 100644
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.symbols
+++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.symbols
@@ -12,7 +12,7 @@ foo.bar();
 === /node_modules/foo/index.js ===
 exports.default = { bar() { return 0; } }
 >exports.default : Symbol(default, Decl(index.js, 0, 0))
->exports : Symbol("/node_modules/foo/index", Decl(index.js, 0, 0))
+>exports : Symbol("foo", Decl(index.js, 0, 0))
 >default : Symbol(default, Decl(index.js, 0, 0))
 >bar : Symbol(bar, Decl(index.js, 0, 19))
 
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.symbols.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.symbols.diff
index b8241f1ff0..3eadb0f029 100644
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.symbols.diff
@@ -5,6 +5,6 @@
  exports.default = { bar() { return 0; } }
  >exports.default : Symbol(default, Decl(index.js, 0, 0))
 ->exports : Symbol(default, Decl(index.js, 0, 0))
-+>exports : Symbol("/node_modules/foo/index", Decl(index.js, 0, 0))
++>exports : Symbol("foo", Decl(index.js, 0, 0))
  >default : Symbol(default, Decl(index.js, 0, 0))
  >bar : Symbol(bar, Decl(index.js, 0, 19))
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.types b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.types
index 114f087c64..0dbb57e504 100644
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.types
+++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.types
@@ -14,7 +14,7 @@ foo.bar();
 exports.default = { bar() { return 0; } }
 >exports.default = { bar() { return 0; } } : { bar(): number; }
 >exports.default : { bar(): number; }
->exports : typeof import("/node_modules/foo/index")
+>exports : typeof import("foo")
 >default : { bar(): number; }
 >{ bar() { return 0; } } : { bar(): number; }
 >bar : () => number
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment1.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment1.types.diff
new file mode 100644
index 0000000000..c32e5448fa
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment1.types.diff
@@ -0,0 +1,12 @@
+--- old.checkJsdocTypeTagOnExportAssignment1.types
++++ new.checkJsdocTypeTagOnExportAssignment1.types
+@@= skipped -16, +16 lines =@@
+
+ === b.js ===
+ import a from "./a";
+->a : import("a").Foo
++>a : import("./a").Foo
+
+ a;
+->a : import("a").Foo
++>a : import("./a").Foo
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment2.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment2.types.diff
new file mode 100644
index 0000000000..354c3f18c8
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment2.types.diff
@@ -0,0 +1,12 @@
+--- old.checkJsdocTypeTagOnExportAssignment2.types
++++ new.checkJsdocTypeTagOnExportAssignment2.types
+@@= skipped -19, +19 lines =@@
+
+ === c.js ===
+ import b from "./b";
+->b : import("a").Foo
++>b : import("./a").Foo
+
+ b;
+->b : import("a").Foo
++>b : import("./a").Foo
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment5.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment5.types.diff
new file mode 100644
index 0000000000..a18bfea751
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment5.types.diff
@@ -0,0 +1,12 @@
+--- old.checkJsdocTypeTagOnExportAssignment5.types
++++ new.checkJsdocTypeTagOnExportAssignment5.types
+@@= skipped -18, +18 lines =@@
+
+ === b.js ===
+ import a from "./a";
+->a : import("a").Foo
++>a : import("./a").Foo
+
+ a;
+->a : import("a").Foo
++>a : import("./a").Foo
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment6.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment6.types.diff
new file mode 100644
index 0000000000..9d1f6aeeae
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/checkJsdocTypeTagOnExportAssignment6.types.diff
@@ -0,0 +1,12 @@
+--- old.checkJsdocTypeTagOnExportAssignment6.types
++++ new.checkJsdocTypeTagOnExportAssignment6.types
+@@= skipped -20, +20 lines =@@
+
+ === b.js ===
+ import a from "./a";
+->a : import("a").Foo
++>a : import("./a").Foo
+
+ a;
+->a : import("a").Foo
++>a : import("./a").Foo
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/commonJsUnusedLocals.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/commonJsUnusedLocals.types.diff
new file mode 100644
index 0000000000..143e2b6724
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/commonJsUnusedLocals.types.diff
@@ -0,0 +1,10 @@
+--- old.commonJsUnusedLocals.types
++++ new.commonJsUnusedLocals.types
+@@= skipped -7, +7 lines =@@
+ exports.y = 1;
+ >exports.y = 1 : 1
+ >exports.y : 1
+->exports : typeof import("/a")
++>exports : typeof import("./a")
+ >y : 1
+ >1 : 1
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/commonjsAccessExports.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/commonjsAccessExports.types.diff
index b1de7c4548..0c498ddeab 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/commonjsAccessExports.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/commonjsAccessExports.types.diff
@@ -1,16 +1,32 @@
 --- old.commonjsAccessExports.types
 +++ new.commonjsAccessExports.types
-@@= skipped -16, +16 lines =@@
+@@= skipped -3, +3 lines =@@
+ exports.x = 0;
+ >exports.x = 0 : 0
+ >exports.x : 0
+->exports : typeof import("/a")
++>exports : typeof import("./a")
+ >x : 0
+ >0 : 0
+
+ exports.x;
+ >exports.x : 0
+->exports : typeof import("/a")
++>exports : typeof import("./a")
+ >x : 0
+
+ // Works nested
  {
      // 'exports' does not provide a contextual type to a function-class
      exports.Cls = function() {
 ->exports.Cls = function() {        this.x = 0;    } : typeof Cls
 ->exports.Cls : typeof Cls
-+>exports.Cls = function() {        this.x = 0;    } : () => void
-+>exports.Cls : () => void
- >exports : typeof import("/a")
+->exports : typeof import("/a")
 ->Cls : typeof Cls
 ->function() {        this.x = 0;    } : typeof Cls
++>exports.Cls = function() {        this.x = 0;    } : () => void
++>exports.Cls : () => void
++>exports : typeof import("./a")
 +>Cls : () => void
 +>function() {        this.x = 0;    } : () => void
 
@@ -28,9 +44,10 @@
 ->instance : Cls
 ->new exports.Cls() : Cls
 ->exports.Cls : typeof Cls
+->exports : typeof import("/a")
+->Cls : typeof Cls
 +>instance : any
 +>new exports.Cls() : any
 +>exports.Cls : () => void
- >exports : typeof import("/a")
-->Cls : typeof Cls
++>exports : typeof import("./a")
 +>Cls : () => void
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/expandoFunctionSymbolPropertyJs.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/expandoFunctionSymbolPropertyJs.types.diff
deleted file mode 100644
index e8a1274ee0..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/compiler/expandoFunctionSymbolPropertyJs.types.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- old.expandoFunctionSymbolPropertyJs.types
-+++ new.expandoFunctionSymbolPropertyJs.types
-@@= skipped -20, +20 lines =@@
-  * @returns {import("./types").TestSymb}
-  */
- export function test() {
-->test : () => import("./types").TestSymb
-+>test : () => import("/types").TestSymb
-
-   function inner() {}
- >inner : { (): void; [symb]: boolean; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/exportDefaultWithJSDoc1.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/exportDefaultWithJSDoc1.types.diff
index 2ec14c281d..3f86798074 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/exportDefaultWithJSDoc1.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/exportDefaultWithJSDoc1.types.diff
@@ -8,4 +8,14 @@
 +>([ ]) : undefined[]
  >[ ] : undefined[]
 
- === b.ts ===
\ No newline at end of file
+ === b.ts ===
+ import A from './a'
+->A : import("a").NumberLike[]
++>A : import("./a").NumberLike[]
+
+ A[0]
+->A[0] : import("a").NumberLike
+->A : import("a").NumberLike[]
++>A[0] : import("./a").NumberLike
++>A : import("./a").NumberLike[]
+ >0 : 0
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/exportDefaultWithJSDoc2.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/exportDefaultWithJSDoc2.types.diff
new file mode 100644
index 0000000000..4de4140638
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/exportDefaultWithJSDoc2.types.diff
@@ -0,0 +1,15 @@
+--- old.exportDefaultWithJSDoc2.types
++++ new.exportDefaultWithJSDoc2.types
+@@= skipped -11, +11 lines =@@
+
+ === b.ts ===
+ import A from './a'
+->A : import("a").NumberLike[]
++>A : import("./a").NumberLike[]
+
+ A[0]
+->A[0] : import("a").NumberLike
+->A : import("a").NumberLike[]
++>A[0] : import("./a").NumberLike
++>A : import("./a").NumberLike[]
+ >0 : 0
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/functionExpressionNames.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/functionExpressionNames.types.diff
index 7bc18246b7..4594a2b99b 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/functionExpressionNames.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/functionExpressionNames.types.diff
@@ -6,11 +6,12 @@
  exports.E = function() {
 ->exports.E = function() {    this.e = 'exported'} : typeof E
 ->exports.E : typeof E
-+>exports.E = function() {    this.e = 'exported'} : () => void
-+>exports.E : () => void
- >exports : typeof import("b")
+->exports : typeof import("b")
 ->E : typeof E
 ->function() {    this.e = 'exported'} : typeof E
++>exports.E = function() {    this.e = 'exported'} : () => void
++>exports.E : () => void
++>exports : typeof import("./b")
 +>E : () => void
 +>function() {    this.e = 'exported'} : () => void
 
@@ -26,11 +27,12 @@
 ->e : E
 ->new exports.E() : E
 ->exports.E : typeof E
+->exports : typeof import("b")
+->E : typeof E
 +>e : any
 +>new exports.E() : any
 +>exports.E : () => void
- >exports : typeof import("b")
-->E : typeof E
++>exports : typeof import("./b")
 +>E : () => void
 
  var o = {
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/importTypeResolutionJSDocEOF.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/importTypeResolutionJSDocEOF.types.diff
new file mode 100644
index 0000000000..5f1bed320e
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/importTypeResolutionJSDocEOF.types.diff
@@ -0,0 +1,10 @@
+--- old.importTypeResolutionJSDocEOF.types
++++ new.importTypeResolutionJSDocEOF.types
+@@= skipped -8, +8 lines =@@
+ === usage.js ===
+ /** @type {Bar} */
+ export let bar;
+->bar : import("interfaces").Bar
++>bar : import("./interfaces").Bar
+
+ /** @typedef {import('./interfaces').Bar} Bar */
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationEmitDoesNotRenameImport.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationEmitDoesNotRenameImport.types.diff
new file mode 100644
index 0000000000..7a35ded200
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationEmitDoesNotRenameImport.types.diff
@@ -0,0 +1,28 @@
+--- old.jsDeclarationEmitDoesNotRenameImport.types
++++ new.jsDeclarationEmitDoesNotRenameImport.types
+@@= skipped -39, +39 lines =@@
+ >super : typeof Test
+
+         if (options.test) {
+->options.test : typeof import("Test").default | undefined
++>options.test : typeof import("./Test.js").default | undefined
+ >options : Options
+->test : typeof import("Test").default | undefined
++>test : typeof import("./Test.js").default | undefined
+
+             this.test = new options.test();
+->this.test = new options.test() : import("Test").default
++>this.test = new options.test() : import("./Test.js").default
+ >this.test : any
+ >this : this
+ >test : any
+->new options.test() : import("Test").default
+->options.test : typeof import("Test").default
++>new options.test() : import("./Test.js").default
++>options.test : typeof import("./Test.js").default
+ >options : Options
+->test : typeof import("Test").default
++>test : typeof import("./Test.js").default
+         }
+     }
+ }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types.diff
new file mode 100644
index 0000000000..a9e5ff0b6b
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types.diff
@@ -0,0 +1,35 @@
+--- old.jsDeclarationsWithDefaultAsNamespaceLikeMerge.types
++++ new.jsDeclarationsWithDefaultAsNamespaceLikeMerge.types
+@@= skipped -19, +19 lines =@@
+
+ === /index.js ===
+ import { createNamespacedHelpers } from './helper'
+->createNamespacedHelpers : () => import("/helper").NamespacedMappers
++>createNamespacedHelpers : () => import("./helper").NamespacedMappers
+
+ const { mapState } = createNamespacedHelpers()
+->mapState : import("/helper").Mapper<import("/helper").Computed>
+->createNamespacedHelpers() : import("/helper").NamespacedMappers
+->createNamespacedHelpers : () => import("/helper").NamespacedMappers
++>mapState : import("./helper").Mapper<import("./helper").Computed>
++>createNamespacedHelpers() : import("./helper").NamespacedMappers
++>createNamespacedHelpers : () => import("./helper").NamespacedMappers
+
+ export default {
+->{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("/helper").Computed; }; }
++>{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("./helper").Computed; }; }
+
+     computed: {
+->computed : { panels: import("/helper").Computed; }
+->{        ...mapState(['panels'])    } : { panels: import("/helper").Computed; }
++>computed : { panels: import("./helper").Computed; }
++>{        ...mapState(['panels'])    } : { panels: import("./helper").Computed; }
+
+         ...mapState(['panels'])
+->mapState(['panels']) : { panels: import("/helper").Computed; }
+->mapState : import("/helper").Mapper<import("/helper").Computed>
++>mapState(['panels']) : { panels: import("./helper").Computed; }
++>mapState : import("./helper").Mapper<import("./helper").Computed>
+ >['panels'] : "panels"[]
+ >'panels' : "panels"
+     }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types.diff
index cd18796709..bcc23d1044 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types.diff
@@ -1,14 +1,25 @@
 --- old.jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types
 +++ new.jsDocDeclarationEmitDoesNotUseNodeModulesPathWithoutError.types
-@@= skipped -20, +20 lines =@@
+@@= skipped -1, +1 lines =@@
+
+ === node_modules/@lion/ajax/dist-types/src/index.d.ts ===
+ export type LionRequestInit = import('../types/types.js').LionRequestInit;
+->LionRequestInit : import("node_modules/@lion/ajax/dist-types/types/types").LionRequestInit
++>LionRequestInit : import("../types/types.js").LionRequestInit
+
+ === node_modules/@lion/ajax/dist-types/types/types.d.ts ===
+ export interface LionRequestInit {
+@@= skipped -19, +19 lines =@@
       * @param {LionRequestInit} [init]
       */
      case5_unexpectedlyResolvesPathToNodeModules(init) {}
 ->case5_unexpectedlyResolvesPathToNodeModules : (init?: LionRequestInit) => void
-+>case5_unexpectedlyResolvesPathToNodeModules : (init?: import("node_modules/@lion/ajax/dist-types/types/types").LionRequestInit | undefined) => void
- >init : import("node_modules/@lion/ajax/dist-types/types/types").LionRequestInit | undefined
+->init : import("node_modules/@lion/ajax/dist-types/types/types").LionRequestInit | undefined
++>case5_unexpectedlyResolvesPathToNodeModules : (init?: import("./node_modules/@lion/ajax/dist-types/types/types.js").LionRequestInit | undefined) => void
++>init : import("./node_modules/@lion/ajax/dist-types/types/types.js").LionRequestInit | undefined
  }
 
+ /**
 @@= skipped -9, +9 lines =@@
   */
  // @ts-expect-error
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsEnumTagOnObjectFrozen.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsEnumTagOnObjectFrozen.types.diff
index 97c14446c0..9bbf9a36b2 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/jsEnumTagOnObjectFrozen.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsEnumTagOnObjectFrozen.types.diff
@@ -1,6 +1,15 @@
 --- old.jsEnumTagOnObjectFrozen.types
 +++ new.jsEnumTagOnObjectFrozen.types
-@@= skipped -24, +24 lines =@@
+@@= skipped -4, +4 lines =@@
+ >Thing : Readonly<{ a: "thing"; b: "chill"; }>
+ >useThing : (x: Thing) => void
+ >cbThing : (x: (x: Thing) => void) => void
+->require("./index") : typeof import("index")
++>require("./index") : typeof import("./index")
+ >require : any
+ >"./index" : "./index"
+
+@@= skipped -20, +20 lines =@@
  cbThing(type => {
  >cbThing(type => {    /** @type {LogEntry} */    const logEntry = {        time: Date.now(),        type,    };}) : void
  >cbThing : (x: (x: Thing) => void) => void
@@ -38,7 +47,16 @@
  >{    a: "thing",    b: "chill"} : { a: "thing"; b: "chill"; }
 
      a: "thing",
-@@= skipped -27, +27 lines =@@
+@@= skipped -18, +18 lines =@@
+ exports.Thing = Thing;
+ >exports.Thing = Thing : Readonly<{ a: "thing"; b: "chill"; }>
+ >exports.Thing : Readonly<{ a: "thing"; b: "chill"; }>
+->exports : typeof import("index")
++>exports : typeof import(".")
+ >Thing : Readonly<{ a: "thing"; b: "chill"; }>
+ >Thing : Readonly<{ a: "thing"; b: "chill"; }>
+
+@@= skipped -9, +9 lines =@@
   */
  function useThing(x) {}
  >useThing : (x: Thing) => void
@@ -46,4 +64,18 @@
 +>x : Thing
 
  exports.useThing = useThing;
- >exports.useThing = useThing : (x: Thing) => void
\ No newline at end of file
+ >exports.useThing = useThing : (x: Thing) => void
+ >exports.useThing : (x: Thing) => void
+->exports : typeof import("index")
++>exports : typeof import(".")
+ >useThing : (x: Thing) => void
+ >useThing : (x: Thing) => void
+
+@@= skipped -19, +19 lines =@@
+ exports.cbThing = cbThing;
+ >exports.cbThing = cbThing : (x: (x: Thing) => void) => void
+ >exports.cbThing : (x: (x: Thing) => void) => void
+->exports : typeof import("index")
++>exports : typeof import(".")
+ >cbThing : (x: (x: Thing) => void) => void
+ >cbThing : (x: (x: Thing) => void) => void
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsExportAssignmentNonMutableLocation.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsExportAssignmentNonMutableLocation.types.diff
index 546289208d..9cf27815e6 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/jsExportAssignmentNonMutableLocation.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsExportAssignmentNonMutableLocation.types.diff
@@ -21,11 +21,12 @@
  exports.customSymbol2 = Symbol("custom");
 ->exports.customSymbol2 = Symbol("custom") : unique symbol
 ->exports.customSymbol2 : unique symbol
-+>exports.customSymbol2 = Symbol("custom") : symbol
-+>exports.customSymbol2 : any
- >exports : typeof import("file")
+->exports : typeof import("file")
 ->customSymbol2 : unique symbol
 ->Symbol("custom") : unique symbol
++>exports.customSymbol2 = Symbol("custom") : symbol
++>exports.customSymbol2 : any
++>exports : typeof import("./file")
 +>customSymbol2 : any
 +>Symbol("custom") : symbol
  >Symbol : SymbolConstructor
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsExportMemberMergedWithModuleAugmentation3.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsExportMemberMergedWithModuleAugmentation3.types.diff
index 7bed8a8860..0d098f61be 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/jsExportMemberMergedWithModuleAugmentation3.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsExportMemberMergedWithModuleAugmentation3.types.diff
@@ -5,20 +5,27 @@
  module.exports.x = 1;
  >module.exports.x = 1 : 1
 ->module.exports.x : 1
-+>module.exports.x : any
- >module.exports : typeof import("/y")
+->module.exports : typeof import("/y")
 ->module : { exports: typeof import("/y"); }
-+>module : { "export=": typeof import("/y"); }
- >exports : typeof import("/y")
+->exports : typeof import("/y")
 ->x : 1
++>module.exports.x : any
++>module.exports : typeof import("./y.js")
++>module : { "export=": typeof import("./y.js"); }
++>exports : typeof import("./y.js")
 +>x : any
  >1 : 1
 
  module.exports = require("./y.js");
- >module.exports = require("./y.js") : typeof import("/y")
- >module.exports : typeof import("/y")
+->module.exports = require("./y.js") : typeof import("/y")
+->module.exports : typeof import("/y")
 ->module : { exports: typeof import("/y"); }
-+>module : { "export=": typeof import("/y"); }
- >exports : typeof import("/y")
- >require("./y.js") : typeof import("/y")
- >require : any
\ No newline at end of file
+->exports : typeof import("/y")
+->require("./y.js") : typeof import("/y")
++>module.exports = require("./y.js") : typeof import("./y.js")
++>module.exports : typeof import("./y.js")
++>module : { "export=": typeof import("./y.js"); }
++>exports : typeof import("./y.js")
++>require("./y.js") : typeof import("./y.js")
+ >require : any
+ >"./y.js" : "./y.js"
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationExternalPackageError.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationExternalPackageError.types.diff
index e26cd529cb..7d1c4eeaae 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationExternalPackageError.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationExternalPackageError.types.diff
@@ -17,7 +17,14 @@
 
  === node_modules/b.ts ===
  var a = 10;
-@@= skipped -24, +24 lines =@@
+@@= skipped -18, +18 lines =@@
+ exports.a = 10;
+ >exports.a = 10 : 10
+ >exports.a : 10
+->exports : typeof import("node_modules/c")
++>exports : typeof import("c.js")
+ >a : 10
+ >10 : 10
 
  c = 10;
  >c = 10 : 10
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsdocPropertyTagInvalid.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsdocPropertyTagInvalid.types.diff
index 05736fc649..1dd35226ed 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/jsdocPropertyTagInvalid.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsdocPropertyTagInvalid.types.diff
@@ -5,12 +5,12 @@
  === /b.js ===
  import { f } from "./a.js"
 ->f : (p: MyType) => void
-+>f : (p: import("/a").MyType) => void
++>f : (p: import("./a.js").MyType) => void
 
  f({ x: 42 })
  >f({ x: 42 }) : void
 ->f : (p: MyType) => void
-+>f : (p: import("/a").MyType) => void
++>f : (p: import("./a.js").MyType) => void
  >{ x: 42 } : { x: number; }
  >x : number
  >42 : 42
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsdocReferenceGlobalTypeInCommonJs.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsdocReferenceGlobalTypeInCommonJs.types.diff
new file mode 100644
index 0000000000..9d1a67beed
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsdocReferenceGlobalTypeInCommonJs.types.diff
@@ -0,0 +1,11 @@
+--- old.jsdocReferenceGlobalTypeInCommonJs.types
++++ new.jsdocReferenceGlobalTypeInCommonJs.types
+@@= skipped -17, +17 lines =@@
+
+ === puppet.d.ts ===
+ export as namespace Puppeteer;
+->Puppeteer : typeof import("puppet")
++>Puppeteer : typeof import("./puppet")
+
+ export interface Keyboard {
+     key: string
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.types.diff
index 3cccf80643..45488af1c8 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.types.diff
@@ -14,8 +14,8 @@
  const tseslint = require('./typescript-eslint.js');
 ->tseslint : typeof tseslint
 ->require('./typescript-eslint.js') : typeof tseslint
-+>tseslint : { config: (...configs: import("typescript-eslint").Config[]) => void; }
-+>require('./typescript-eslint.js') : { config: (...configs: import("typescript-eslint").Config[]) => void; }
++>tseslint : { config: (...configs: import("./typescript-eslint.js").Config[]) => void; }
++>require('./typescript-eslint.js') : { config: (...configs: import("./typescript-eslint.js").Config[]) => void; }
  >require : any
  >'./typescript-eslint.js' : "./typescript-eslint.js"
 
@@ -25,9 +25,9 @@
 ->tseslint : typeof tseslint
 ->config : (...configs: Config[]) => void
 ->eslintReact : { plugins: { react: { deprecatedRules: { "jsx-sort-default-props": boolean; }; rules: { 'no-unsafe': boolean; }; }; }; }
-+>tseslint.config : (...configs: import("typescript-eslint").Config[]) => void
-+>tseslint : { config: (...configs: import("typescript-eslint").Config[]) => void; }
-+>config : (...configs: import("typescript-eslint").Config[]) => void
++>tseslint.config : (...configs: import("./typescript-eslint.js").Config[]) => void
++>tseslint : { config: (...configs: import("./typescript-eslint.js").Config[]) => void; }
++>config : (...configs: import("./typescript-eslint.js").Config[]) => void
 +>eslintReact : { plugins: { react: { deprecatedRules: { "jsx-sort-default-props": boolean; }; rules: { "no-unsafe": boolean; }; }; }; }
 
  === eslint-plugin-react.js ===
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2015).types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2015).types.diff
new file mode 100644
index 0000000000..e2a431750b
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2015).types.diff
@@ -0,0 +1,13 @@
+--- old.moduleNoneDynamicImport(target=es2015).types
++++ new.moduleNoneDynamicImport(target=es2015).types
+@@= skipped -1, +1 lines =@@
+
+ === /a.ts ===
+ const foo = import("./b");
+->foo : Promise<typeof import("/b")>
+->import("./b") : Promise<typeof import("/b")>
++>foo : Promise<typeof import("./b")>
++>import("./b") : Promise<typeof import("./b")>
+ >"./b" : "./b"
+
+ === /b.js ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2020).types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2020).types.diff
new file mode 100644
index 0000000000..7c8b6dd8a7
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2020).types.diff
@@ -0,0 +1,13 @@
+--- old.moduleNoneDynamicImport(target=es2020).types
++++ new.moduleNoneDynamicImport(target=es2020).types
+@@= skipped -1, +1 lines =@@
+
+ === /a.ts ===
+ const foo = import("./b");
+->foo : Promise<typeof import("/b")>
+->import("./b") : Promise<typeof import("/b")>
++>foo : Promise<typeof import("./b")>
++>import("./b") : Promise<typeof import("./b")>
+ >"./b" : "./b"
+
+ === /b.js ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve4.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve4.types.diff
index 632c2c34ea..7eba1ebb31 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve4.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve4.types.diff
@@ -10,14 +10,22 @@
 ->exports : any
 ->y : any
 +>module.exports.y : 0
-+>module.exports : typeof import("/a")
-+>module : { "\"/a\"": typeof import("/a"); }
-+>exports : typeof import("/a")
++>module.exports : typeof import("./a")
++>module : { "\"/a\"": typeof import("./a"); }
++>exports : typeof import("./a")
 +>y : 0
  >0 : 0
 
  === /b.ts ===
-@@= skipped -44, +44 lines =@@
+@@= skipped -37, +37 lines =@@
+ exports.default = 0;
+ >exports.default = 0 : 0
+ >exports.default : 0
+->exports : typeof import("/g")
++>exports : typeof import("./g")
+ >default : 0
+ >0 : 0
+
  === /main1.ts ===
  import { x, y } from "./a"; // No y
  >x : 0
@@ -26,7 +34,7 @@
 
  import a1 = require("./a"); // { x: 0 }
  >a1 : typeof a1
-@@= skipped -101, +101 lines =@@
+@@= skipped -108, +108 lines =@@
  >default : 0
 
  import g1 from "./g"; // { default: 0 }
@@ -92,3 +100,18 @@
 +>require("./g") : typeof g2
  >require : any
  >"./g" : "./g"
+
+ === /main4.cjs ===
+ exports.x = require("./g");
+->exports.x = require("./g") : typeof import("/g")
+->exports.x : typeof import("/g")
+->exports : typeof import("/main4")
+->x : typeof import("/g")
+->require("./g") : typeof import("/g")
++>exports.x = require("./g") : typeof import("./g")
++>exports.x : typeof import("./g")
++>exports : typeof import("./main4.cjs")
++>x : typeof import("./g")
++>require("./g") : typeof import("./g")
+ >require : any
+ >"./g" : "./g"
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_jsModule.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_jsModule.types.diff
new file mode 100644
index 0000000000..92de93f296
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_jsModule.types.diff
@@ -0,0 +1,37 @@
+--- old.moduleResolutionWithSuffixes_one_jsModule.types
++++ new.moduleResolutionWithSuffixes_one_jsModule.types
+@@= skipped -10, +10 lines =@@
+ exports.__esModule = true;
+ >exports.__esModule = true : true
+ >exports.__esModule : true
+->exports : typeof import("/foo.ios")
++>exports : typeof import("./foo.ios")
+ >__esModule : true
+ >true : true
+
+@@= skipped -10, +10 lines =@@
+ exports.ios = ios;
+ >exports.ios = ios : () => void
+ >exports.ios : () => void
+->exports : typeof import("/foo.ios")
++>exports : typeof import("./foo.ios")
+ >ios : () => void
+ >ios : () => void
+
+@@= skipped -11, +11 lines =@@
+ exports.__esModule = true;
+ >exports.__esModule = true : true
+ >exports.__esModule : true
+->exports : typeof import("/foo")
++>exports : typeof import("./foo")
+ >__esModule : true
+ >true : true
+
+@@= skipped -10, +10 lines =@@
+ exports.base = base;
+ >exports.base = base : () => void
+ >exports.base : () => void
+->exports : typeof import("/foo")
++>exports : typeof import("./foo")
+ >base : () => void
+ >base : () => void
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_explicitNodeModulesImport.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_explicitNodeModulesImport.types.diff
new file mode 100644
index 0000000000..fb8b338167
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_explicitNodeModulesImport.types.diff
@@ -0,0 +1,10 @@
+--- old.moduleResolution_explicitNodeModulesImport.types
++++ new.moduleResolution_explicitNodeModulesImport.types
+@@= skipped -7, +7 lines =@@
+ exports.x = 0;
+ >exports.x = 0 : 0
+ >exports.x : 0
+->exports : typeof import("/node_modules/foo/index")
++>exports : typeof import("foo")
+ >x : 0
+ >0 : 0
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pushTypeGetTypeOfAlias.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pushTypeGetTypeOfAlias.types.diff
index acf22eeb9f..8ca356984d 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/pushTypeGetTypeOfAlias.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/pushTypeGetTypeOfAlias.types.diff
@@ -18,9 +18,9 @@
  >exports.blah = exports.someProp : any
  >exports.blah : any
 ->exports : { (): void; blah: any; }
-+>exports : typeof import("bar")
++>exports : typeof import("./bar")
  >blah : any
  >exports.someProp : any
 ->exports : { (): void; blah: any; }
-+>exports : typeof import("bar")
++>exports : typeof import("./bar")
  >someProp : any
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/reactImportDropped.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/reactImportDropped.types.diff
index 9678c7e62b..a0d91d632b 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/reactImportDropped.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/reactImportDropped.types.diff
@@ -1,16 +1,39 @@
 --- old.reactImportDropped.types
 +++ new.reactImportDropped.types
-@@= skipped -55, +55 lines =@@
+@@= skipped -30, +30 lines =@@
+
+ === src/components/TabBar.js ===
+ export default React.createClass({
+->React.createClass({  render() {    return (      null    );  }}) : import("react").ClassicComponentClass
+->React.createClass : (spec: any) => import("react").ClassicComponentClass
+->React : typeof import("react")
+->createClass : (spec: any) => import("react").ClassicComponentClass
++>React.createClass({  render() {    return (      null    );  }}) : import("../../react").ClassicComponentClass
++>React.createClass : (spec: any) => import("../../react").ClassicComponentClass
++>React : typeof import("../../react")
++>createClass : (spec: any) => import("../../react").ClassicComponentClass
+ >{  render() {    return (      null    );  }} : { render(): any; }
+
+   render() {
+@@= skipped -19, +19 lines =@@
+
+ === src/modules/navigation/NavigationView.js ===
+ import TabBar from '../../components/TabBar';
+->TabBar : import("react").ClassicComponentClass
++>TabBar : import("../../../react.js").ClassicComponentClass
+
+ import {layout} from '../../utils/theme'; // <- DO NOT DROP this import
  >layout : any
 
  const x = <TabBar height={layout.footerHeight} />;
 ->x : error
 -><TabBar height={layout.footerHeight} /> : error
-+>x : any
-+><TabBar height={layout.footerHeight} /> : any
- >TabBar : import("react").ClassicComponentClass
+->TabBar : import("react").ClassicComponentClass
 ->height : error
 ->layout.footerHeight : error
++>x : any
++><TabBar height={layout.footerHeight} /> : any
++>TabBar : import("../../../react").ClassicComponentClass
 +>height : any
 +>layout.footerHeight : any
  >layout : any
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/resolveNameWithNamspace.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/resolveNameWithNamspace.types.diff
index f419d795ba..ef01d62ac6 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/resolveNameWithNamspace.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/resolveNameWithNamspace.types.diff
@@ -5,17 +5,19 @@
  exports.equal = myAssert.equal
  >exports.equal = myAssert.equal : any
 ->exports.equal : error
+->exports : typeof import("app")
 +>exports.equal : any
- >exports : typeof import("app")
++>exports : typeof import("./app")
  >equal : any
  >myAssert.equal : any
-@@= skipped -8, +8 lines =@@
+ >myAssert : any
  >equal : any
 
  exports.equal()
 ->exports.equal() : error
 ->exports.equal : error
+->exports : typeof import("app")
 +>exports.equal() : any
 +>exports.equal : any
- >exports : typeof import("app")
++>exports : typeof import("./app")
  >equal : any
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/assignmentToVoidZero1.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/assignmentToVoidZero1.types.diff
index 3413e18bdf..129e57fc85 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/assignmentToVoidZero1.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/assignmentToVoidZero1.types.diff
@@ -5,20 +5,33 @@
  exports.y = exports.x = void 0;
  >exports.y = exports.x = void 0 : undefined
 ->exports.y : 2
-+>exports.y : undefined
- >exports : typeof import("assignmentToVoidZero1")
+->exports : typeof import("assignmentToVoidZero1")
 ->y : 2
++>exports.y : undefined
++>exports : typeof import("./assignmentToVoidZero1")
 +>y : undefined
  >exports.x = void 0 : undefined
  >exports.x : 1
- >exports : typeof import("assignmentToVoidZero1")
-@@= skipped -19, +19 lines =@@
+->exports : typeof import("assignmentToVoidZero1")
++>exports : typeof import("./assignmentToVoidZero1")
+ >x : 1
+ >void 0 : undefined
+ >0 : 0
+@@= skipped -13, +13 lines =@@
+ exports.x = 1;
+ >exports.x = 1 : 1
+ >exports.x : 1
+->exports : typeof import("assignmentToVoidZero1")
++>exports : typeof import("./assignmentToVoidZero1")
+ >x : 1
+ >1 : 1
 
  exports.y = 2;
  >exports.y = 2 : 2
 ->exports.y : 2
-+>exports.y : undefined
- >exports : typeof import("assignmentToVoidZero1")
+->exports : typeof import("assignmentToVoidZero1")
 ->y : 2
++>exports.y : undefined
++>exports : typeof import("./assignmentToVoidZero1")
 +>y : undefined
  >2 : 2
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/assignmentToVoidZero2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/assignmentToVoidZero2.types.diff
index 0e9efc5743..bf4495db2c 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/assignmentToVoidZero2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/assignmentToVoidZero2.types.diff
@@ -1,13 +1,21 @@
 --- old.assignmentToVoidZero2.types
 +++ new.assignmentToVoidZero2.types
-@@= skipped -9, +9 lines =@@
+@@= skipped -3, +3 lines =@@
+ exports.j = 1;
+ >exports.j = 1 : 1
+ >exports.j : 1
+->exports : typeof import("assignmentToVoidZero2")
++>exports : typeof import("./assignmentToVoidZero2")
+ >j : 1
+ >1 : 1
 
  exports.k = void 0;
  >exports.k = void 0 : undefined
 ->exports.k : any
-+>exports.k : undefined
- >exports : typeof import("assignmentToVoidZero2")
+->exports : typeof import("assignmentToVoidZero2")
 ->k : any
++>exports.k : undefined
++>exports : typeof import("./assignmentToVoidZero2")
 +>k : undefined
  >void 0 : undefined
  >0 : 0
@@ -34,7 +42,7 @@
  >y : any
  >void 0 : undefined
  >0 : 0
-@@= skipped -28, +28 lines =@@
+@@= skipped -34, +34 lines =@@
  o.x + o.y
  >o.x + o.y : any
  >o.x : number
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/chainedPrototypeAssignment.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/chainedPrototypeAssignment.types.diff
index a5696e5f6f..850f92019d 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/chainedPrototypeAssignment.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/chainedPrototypeAssignment.types.diff
@@ -86,22 +86,24 @@
  exports.A = A
 ->exports.A = A : typeof A
 ->exports.A : typeof A
-+>exports.A = A : { (): void; prototype: { m(n: number): number; }; }
-+>exports.A : { (): void; prototype: { m(n: number): number; }; }
- >exports : typeof import("mod")
+->exports : typeof import("mod")
 ->A : typeof A
 ->A : typeof A
++>exports.A = A : { (): void; prototype: { m(n: number): number; }; }
++>exports.A : { (): void; prototype: { m(n: number): number; }; }
++>exports : typeof import("./mod")
 +>A : { (): void; prototype: { m(n: number): number; }; }
 +>A : { (): void; prototype: { m(n: number): number; }; }
 
  exports.B = B
 ->exports.B = B : typeof B
 ->exports.B : typeof B
-+>exports.B = B : { (): void; prototype: { m(n: number): number; }; }
-+>exports.B : { (): void; prototype: { m(n: number): number; }; }
- >exports : typeof import("mod")
+->exports : typeof import("mod")
 ->B : typeof B
 ->B : typeof B
++>exports.B = B : { (): void; prototype: { m(n: number): number; }; }
++>exports.B : { (): void; prototype: { m(n: number): number; }; }
++>exports : typeof import("./mod")
 +>B : { (): void; prototype: { m(n: number): number; }; }
 +>B : { (): void; prototype: { m(n: number): number; }; }
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportClassTypeReference.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportClassTypeReference.types.diff
index 3e8573d2e0..c4d5e6891a 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportClassTypeReference.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportClassTypeReference.types.diff
@@ -1,6 +1,15 @@
 --- old.commonJSImportClassTypeReference.types
 +++ new.commonJSImportClassTypeReference.types
-@@= skipped -12, +12 lines =@@
+@@= skipped -2, +2 lines =@@
+ === main.js ===
+ const { K } = require("./mod1");
+ >K : typeof K
+->require("./mod1") : typeof import("mod1")
++>require("./mod1") : typeof import("./mod1")
+ >require : any
+ >"./mod1" : "./mod1"
+
+@@= skipped -10, +10 lines =@@
  >k : K
 
      k.values()
@@ -13,4 +22,12 @@
 +>values : any
  }
 
- === mod1.js ===
\ No newline at end of file
+ === mod1.js ===
+@@= skipped -21, +21 lines =@@
+ exports.K = K;
+ >exports.K = K : typeof K
+ >exports.K : typeof K
+->exports : typeof import("mod1")
++>exports : typeof import("./mod1")
+ >K : typeof K
+ >K : typeof K
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportExportedClassExpression.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportExportedClassExpression.types.diff
index 4760c622be..6c6c190e09 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportExportedClassExpression.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportExportedClassExpression.types.diff
@@ -1,6 +1,15 @@
 --- old.commonJSImportExportedClassExpression.types
 +++ new.commonJSImportExportedClassExpression.types
-@@= skipped -12, +12 lines =@@
+@@= skipped -2, +2 lines =@@
+ === main.js ===
+ const { K } = require("./mod1");
+ >K : typeof K
+->require("./mod1") : typeof import("mod1")
++>require("./mod1") : typeof import("./mod1")
+ >require : any
+ >"./mod1" : "./mod1"
+
+@@= skipped -10, +10 lines =@@
  >k : K
 
      k.values()
@@ -13,4 +22,12 @@
 +>values : any
  }
 
- === mod1.js ===
\ No newline at end of file
+ === mod1.js ===
+ exports.K = class K {
+ >exports.K = class K {    values() {    }} : typeof K
+ >exports.K : typeof K
+->exports : typeof import("mod1")
++>exports : typeof import("./mod1")
+ >K : typeof K
+ >class K {    values() {    }} : typeof K
+ >K : typeof K
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportNestedClassTypeReference.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportNestedClassTypeReference.types.diff
index e34784cfca..1d1036d7a1 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportNestedClassTypeReference.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportNestedClassTypeReference.types.diff
@@ -1,6 +1,15 @@
 --- old.commonJSImportNestedClassTypeReference.types
 +++ new.commonJSImportNestedClassTypeReference.types
-@@= skipped -12, +12 lines =@@
+@@= skipped -2, +2 lines =@@
+ === main.js ===
+ const { K } = require("./mod1");
+ >K : typeof K
+->require("./mod1") : typeof import("mod1")
++>require("./mod1") : typeof import("./mod1")
+ >require : any
+ >"./mod1" : "./mod1"
+
+@@= skipped -10, +10 lines =@@
  >k : K
 
      k.values()
@@ -37,8 +46,11 @@
  >K : typeof K
      }
  }
-@@= skipped -10, +10 lines =@@
- >exports : typeof import("mod1")
+ exports.K = NS.K;
+ >exports.K = NS.K : typeof K
+ >exports.K : typeof K
+->exports : typeof import("mod1")
++>exports : typeof import("./mod1")
  >K : typeof K
  >NS.K : typeof K
 ->NS : typeof NS
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/commonJsImportBindingElementNarrowType.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/commonJsImportBindingElementNarrowType.types.diff
new file mode 100644
index 0000000000..7f39934c91
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/commonJsImportBindingElementNarrowType.types.diff
@@ -0,0 +1,10 @@
+--- old.commonJsImportBindingElementNarrowType.types
++++ new.commonJsImportBindingElementNarrowType.types
+@@= skipped -2, +2 lines =@@
+ === /bar.js ===
+ const { a } = require("./foo");
+ >a : number | null
+->require("./foo") : typeof import("/foo")
++>require("./foo") : typeof import("./foo")
+ >require : any
+ >"./foo" : "./foo"
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/contextualTypedSpecialAssignment.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/contextualTypedSpecialAssignment.types.diff
index b1ce4f81be..a0a13f1a42 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/contextualTypedSpecialAssignment.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/contextualTypedSpecialAssignment.types.diff
@@ -54,9 +54,10 @@
  exports.x = {
  >exports.x = {    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 ->exports.x : DoneStatus
-+>exports.x : { status: "done"; m(n: number): void; }
- >exports : typeof import("test")
+->exports : typeof import("test")
 ->x : DoneStatus
++>exports.x : { status: "done"; m(n: number): void; }
++>exports : typeof import("./test")
 +>x : { status: "done"; m(n: number): void; }
  >{    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 
@@ -66,9 +67,10 @@
  }
  exports.x
 ->exports.x : DoneStatus
-+>exports.x : { status: "done"; m(n: number): void; }
- >exports : typeof import("test")
+->exports : typeof import("test")
 ->x : DoneStatus
++>exports.x : { status: "done"; m(n: number): void; }
++>exports : typeof import("./test")
 +>x : { status: "done"; m(n: number): void; }
 
  /** @type {DoneStatus} */
@@ -80,9 +82,9 @@
 ->exports : typeof module.exports
 ->y : DoneStatus
 +>module.exports.y : { status: "done"; m(n: number): void; }
-+>module.exports : typeof import("test")
-+>module : { "\"test\"": typeof import("test"); }
-+>exports : typeof import("test")
++>module.exports : typeof import("./test")
++>module : { "\"test\"": typeof import("./test"); }
++>exports : typeof import("./test")
 +>y : { status: "done"; m(n: number): void; }
  >{    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 
@@ -97,9 +99,9 @@
 ->exports : typeof module.exports
 ->y : DoneStatus
 +>module.exports.y : { status: "done"; m(n: number): void; }
-+>module.exports : typeof import("test")
-+>module : { "\"test\"": typeof import("test"); }
-+>exports : typeof import("test")
++>module.exports : typeof import("./test")
++>module : { "\"test\"": typeof import("./test"); }
++>exports : typeof import("./test")
 +>y : { status: "done"; m(n: number): void; }
 
  // prototype-property assignment
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/enumTagOnExports.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/enumTagOnExports.types.diff
index 606f14ffc5..06c305a9bc 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/enumTagOnExports.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/enumTagOnExports.types.diff
@@ -5,9 +5,10 @@
  exports.a = {};
  >exports.a = {} : {}
 ->exports.a : typeof a
-+>exports.a : {}
- >exports : typeof import("enumTagOnExports")
+->exports : typeof import("enumTagOnExports")
 ->a : typeof a
++>exports.a : {}
++>exports : typeof import("./enumTagOnExports")
 +>a : {}
  >{} : {}
 
@@ -20,8 +21,8 @@
 ->exports : typeof module.exports
 ->b : typeof b
 +>module.exports.b : {}
-+>module.exports : typeof import("enumTagOnExports")
-+>module : { "\"enumTagOnExports\"": typeof import("enumTagOnExports"); }
-+>exports : typeof import("enumTagOnExports")
++>module.exports : typeof import("./enumTagOnExports")
++>module : { "\"enumTagOnExports\"": typeof import("./enumTagOnExports"); }
++>exports : typeof import("./enumTagOnExports")
 +>b : {}
  >{} : {}
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/exportNestedNamespaces.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/exportNestedNamespaces.types.diff
index a671bcc9d6..6bbb66e3a4 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/exportNestedNamespaces.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/exportNestedNamespaces.types.diff
@@ -6,10 +6,11 @@
  exports.n = {};
 ->exports.n = {} : typeof n
 ->exports.n : typeof n
+->exports : typeof import("mod")
+->n : typeof n
 +>exports.n = {} : {}
 +>exports.n : {}
- >exports : typeof import("mod")
-->n : typeof n
++>exports : typeof import("./mod")
 +>n : {}
  >{} : {}
 
@@ -17,13 +18,14 @@
 ->exports.n.K = function () {    this.x = 10;} : typeof K
 ->exports.n.K : typeof K
 ->exports.n : typeof n
-+>exports.n.K = function () {    this.x = 10;} : () => void
-+>exports.n.K : any
-+>exports.n : {}
- >exports : typeof import("mod")
+->exports : typeof import("mod")
 ->n : typeof n
 ->K : typeof K
 ->function () {    this.x = 10;} : typeof K
++>exports.n.K = function () {    this.x = 10;} : () => void
++>exports.n.K : any
++>exports.n : {}
++>exports : typeof import("./mod")
 +>n : {}
 +>K : any
 +>function () {    this.x = 10;} : () => void
@@ -36,6 +38,14 @@
  >x : any
  >10 : 10
  }
+ exports.Classic = class {
+ >exports.Classic = class {    constructor() {        this.p = 1    }} : typeof Classic
+ >exports.Classic : typeof Classic
+->exports : typeof import("mod")
++>exports : typeof import("./mod")
+ >Classic : typeof Classic
+ >class {    constructor() {        this.p = 1    }} : typeof Classic
+
 @@= skipped -44, +44 lines =@@
  >s : typeof s
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/exportNestedNamespaces2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/exportNestedNamespaces2.types.diff
index 39dd5b80c7..8e338c92e1 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/exportNestedNamespaces2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/exportNestedNamespaces2.types.diff
@@ -1,20 +1,53 @@
 --- old.exportNestedNamespaces2.types
 +++ new.exportNestedNamespaces2.types
-@@= skipped -11, +11 lines =@@
+@@= skipped -4, +4 lines =@@
+ exports.formatters = {}
+ >exports.formatters = {} : {}
+ >exports.formatters : {}
+->exports : typeof import("mod")
++>exports : typeof import("./mod")
+ >formatters : {}
+ >{} : {}
+
  === first.js ===
  exports = require('./mod')
- >exports = require('./mod') : typeof import("mod")
+->exports = require('./mod') : typeof import("mod")
 ->exports : typeof import("first")
+->require('./mod') : typeof import("mod")
++>exports = require('./mod') : typeof import("./mod")
 +>exports : any
- >require('./mod') : typeof import("mod")
++>require('./mod') : typeof import("./mod")
  >require : any
  >'./mod' : "./mod"
-@@= skipped -21, +21 lines =@@
+
+@@= skipped -16, +16 lines =@@
+ >exports.formatters.j = function (v) {    return v} : (v: any) => any
+ >exports.formatters.j : any
+ >exports.formatters : any
+->exports : typeof import("first")
++>exports : typeof import("./first")
+ >formatters : any
+ >j : any
+ >function (v) {    return v} : (v: any) => any
+@@= skipped -11, +11 lines =@@
+ }
  === second.js ===
  exports = require('./mod')
- >exports = require('./mod') : typeof import("mod")
+->exports = require('./mod') : typeof import("mod")
 ->exports : typeof import("second")
+->require('./mod') : typeof import("mod")
++>exports = require('./mod') : typeof import("./mod")
 +>exports : any
- >require('./mod') : typeof import("mod")
++>require('./mod') : typeof import("./mod")
  >require : any
- >'./mod' : "./mod"
\ No newline at end of file
+ >'./mod' : "./mod"
+
+@@= skipped -10, +10 lines =@@
+ >exports.formatters.o = function (v) {    return v} : (v: any) => any
+ >exports.formatters.o : any
+ >exports.formatters : any
+->exports : typeof import("second")
++>exports : typeof import("./second")
+ >formatters : any
+ >o : any
+ >function (v) {    return v} : (v: any) => any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/exportPropertyAssignmentNameResolution.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/exportPropertyAssignmentNameResolution.types.diff
index 7157eec972..5c7d8fe7c7 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/exportPropertyAssignmentNameResolution.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/exportPropertyAssignmentNameResolution.types.diff
@@ -7,9 +7,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("bug24492")
-+>module : { "\"bug24492\"": typeof import("bug24492"); }
-+>exports : typeof import("bug24492")
++>module.exports : typeof import("./bug24492")
++>module : { "\"bug24492\"": typeof import("./bug24492"); }
++>exports : typeof import("./bug24492")
  >D : typeof D
  >class { } : typeof D
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/importTypeInJSDoc.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/importTypeInJSDoc.types.diff
index d3f50c370d..8f10713cda 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/importTypeInJSDoc.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/importTypeInJSDoc.types.diff
@@ -5,7 +5,42 @@
 
      constructor(x: MyClass.Bar);
 ->x : MyClass.Bar
-+>x : import("externs").Bar
++>x : import("./externs").Bar
  >MyClass : any
  }
- declare global {
\ No newline at end of file
+ declare global {
+@@= skipped -19, +19 lines =@@
+  */
+
+ let a = /** @type {Foo} */(/** @type {*} */(undefined)); 
+->a : import("externs")
+->(/** @type {*} */(undefined)) : import("externs")
++>a : import("./externs")
++>(/** @type {*} */(undefined)) : import("./externs")
+ >(undefined) : any
+ >undefined : undefined
+
+ a = new Foo({doer: Foo.Bar});
+->a = new Foo({doer: Foo.Bar}) : import("externs")
+->a : import("externs")
+->new Foo({doer: Foo.Bar}) : import("externs")
+->Foo : typeof import("externs")
++>a = new Foo({doer: Foo.Bar}) : import("./externs")
++>a : import("./externs")
++>new Foo({doer: Foo.Bar}) : import("./externs")
++>Foo : typeof import("./externs")
+ >{doer: Foo.Bar} : { doer: (x: string, y?: number) => void; }
+ >doer : (x: string, y?: number) => void
+ >Foo.Bar : (x: string, y?: number) => void
+->Foo : typeof import("externs")
++>Foo : typeof import("./externs")
+ >Bar : (x: string, y?: number) => void
+
+ const q = /** @type {import("./externs").Bar} */({ doer: q => q });
+->q : import("externs").Bar
+->({ doer: q => q }) : import("externs").Bar
++>q : import("./externs").Bar
++>({ doer: q => q }) : import("./externs").Bar
+ >{ doer: q => q } : { doer: (q: string) => string; }
+ >doer : (q: string) => string
+ >q => q : (q: string) => string
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsClassAccessor.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsClassAccessor.types.diff
new file mode 100644
index 0000000000..a564472019
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsClassAccessor.types.diff
@@ -0,0 +1,11 @@
+--- old.jsDeclarationsClassAccessor.types
++++ new.jsDeclarationsClassAccessor.types
+@@= skipped -2, +2 lines =@@
+ === supplement.d.ts ===
+ export { };
+ declare module "./argument.js" {
+->"./argument.js" : typeof import("argument")
++>"./argument.js" : typeof import("./argument")
+
+     interface Argument {
+         idlType: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportAssignedConstructorFunction.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportAssignedConstructorFunction.types.diff
index c0ec408122..c0ff01906a 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportAssignedConstructorFunction.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportAssignedConstructorFunction.types.diff
@@ -13,9 +13,9 @@
 ->function() {    this.x = 1} : typeof MyClass
 +>module.exports.MyClass = function() {    this.x = 1} : () => void
 +>module.exports.MyClass : () => void
-+>module.exports : typeof import("jsDeclarationsExportAssignedConstructorFunction")
-+>module : { "\"jsDeclarationsExportAssignedConstructorFunction\"": typeof import("jsDeclarationsExportAssignedConstructorFunction"); }
-+>exports : typeof import("jsDeclarationsExportAssignedConstructorFunction")
++>module.exports : typeof import("./jsDeclarationsExportAssignedConstructorFunction")
++>module : { "\"jsDeclarationsExportAssignedConstructorFunction\"": typeof import("./jsDeclarationsExportAssignedConstructorFunction"); }
++>exports : typeof import("./jsDeclarationsExportAssignedConstructorFunction")
 +>MyClass : () => void
 +>function() {    this.x = 1} : () => void
 
@@ -38,9 +38,9 @@
 ->prototype : { a: () => void; }
 +>module.exports.MyClass.prototype : any
 +>module.exports.MyClass : () => void
-+>module.exports : typeof import("jsDeclarationsExportAssignedConstructorFunction")
-+>module : { "\"jsDeclarationsExportAssignedConstructorFunction\"": typeof import("jsDeclarationsExportAssignedConstructorFunction"); }
-+>exports : typeof import("jsDeclarationsExportAssignedConstructorFunction")
++>module.exports : typeof import("./jsDeclarationsExportAssignedConstructorFunction")
++>module : { "\"jsDeclarationsExportAssignedConstructorFunction\"": typeof import("./jsDeclarationsExportAssignedConstructorFunction"); }
++>exports : typeof import("./jsDeclarationsExportAssignedConstructorFunction")
 +>MyClass : () => void
 +>prototype : any
  >{    a: function() {    }} : { a: () => void; }
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportDoubleAssignmentInClosure.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportDoubleAssignmentInClosure.types.diff
index 2bda5c4d35..ffb4c2c0cf 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportDoubleAssignmentInClosure.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportDoubleAssignmentInClosure.types.diff
@@ -46,7 +46,7 @@
  >exports.methods = m : () => void
  >exports.methods : any
 ->exports : any
-+>exports : typeof import("index")
++>exports : typeof import(".")
  >methods : any
  >m : () => void
  }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportForms.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportForms.types.diff
index a1203afcf6..f4342a27f4 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportForms.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportForms.types.diff
@@ -31,9 +31,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("cjs3")
-+>module : { "\"cjs3\"": typeof import("cjs3"); }
-+>exports : typeof import("cjs3")
++>module.exports : typeof import("./cjs3")
++>module : { "\"cjs3\"": typeof import("./cjs3"); }
++>exports : typeof import("./cjs3")
  >ns : typeof ns
  >ns : typeof ns
 
@@ -44,8 +44,8 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("cjs4")
-+>module : { "\"cjs4\"": typeof import("cjs4"); }
-+>exports : typeof import("cjs4")
++>module.exports : typeof import("./cjs4")
++>module : { "\"cjs4\"": typeof import("./cjs4"); }
++>exports : typeof import("./cjs4")
  >names : typeof ns
  >ns : typeof ns
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportSpecifierNonlocal.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportSpecifierNonlocal.types.diff
new file mode 100644
index 0000000000..7629d28b70
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportSpecifierNonlocal.types.diff
@@ -0,0 +1,12 @@
+--- old.jsDeclarationsExportSpecifierNonlocal.types
++++ new.jsDeclarationsExportSpecifierNonlocal.types
+@@= skipped -8, +8 lines =@@
+
+ === index.js ===
+ export { Thing, OtherThing as default } from "./source";
+->Thing : typeof import("source").Thing
+->OtherThing : typeof import("source").OtherThing
+->default : typeof import("source").OtherThing
++>Thing : typeof import("./source").Thing
++>OtherThing : typeof import("./source").OtherThing
++>default : typeof import("./source").OtherThing
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsFunctionsCjs.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsFunctionsCjs.types.diff
index 7bfe7d2274..dd52e4e4ea 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsFunctionsCjs.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsFunctionsCjs.types.diff
@@ -7,9 +7,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
  >a : () => void
  >function a() {} : () => void
  >a : () => void
@@ -25,9 +25,9 @@
 ->b : { (): void; cat: string; }
 +>module.exports.b = function b() {} : () => void
 +>module.exports.b : () => void
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>b : () => void
 +>function b() {} : () => void
 +>b : () => void
@@ -43,9 +43,9 @@
 ->cat : string
 +>module.exports.b.cat : any
 +>module.exports.b : () => void
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>b : () => void
 +>cat : any
  >"cat" : "cat"
@@ -61,9 +61,9 @@
 ->c : { (): void; Cls: typeof Cls; }
 +>module.exports.c = function c() {} : () => void
 +>module.exports.c : () => void
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>c : () => void
 +>function c() {} : () => void
 +>c : () => void
@@ -79,9 +79,9 @@
 ->Cls : typeof Cls
 +>module.exports.c.Cls : any
 +>module.exports.c : () => void
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>c : () => void
 +>Cls : any
  >class {} : typeof Cls
@@ -103,9 +103,9 @@
 ->b : number
 +>module.exports.d = function d(a, b) { return /** @type {*} */(null); } : (a: any, b: any) => any
 +>module.exports.d : (a: any, b: any) => any
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>d : (a: any, b: any) => any
 +>function d(a, b) { return /** @type {*} */(null); } : (a: any, b: any) => any
 +>d : (a: any, b: any) => any
@@ -130,9 +130,9 @@
 ->b : U
 +>module.exports.e = function e(a, b) { return /** @type {*} */(null); } : (a: any, b: any) => any
 +>module.exports.e : (a: any, b: any) => any
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>e : (a: any, b: any) => any
 +>function e(a, b) { return /** @type {*} */(null); } : (a: any, b: any) => any
 +>e : (a: any, b: any) => any
@@ -156,9 +156,9 @@
 ->a : T
 +>module.exports.f = function f(a) {    return a;} : (a: any) => any
 +>module.exports.f : (a: any) => any
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>f : (a: any) => any
 +>function f(a) {    return a;} : (a: any) => any
 +>f : (a: any) => any
@@ -185,15 +185,15 @@
 +>module.exports.f.self = module.exports.f : (a: any) => any
 +>module.exports.f.self : any
 +>module.exports.f : (a: any) => any
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>f : (a: any) => any
 +>self : any
 +>module.exports.f : (a: any) => any
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>f : (a: any) => any
 
  /**
@@ -233,9 +233,9 @@
 ->g : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
 +>module.exports.g = g : (a: { x: string; }, b: { y: any; }) => any
 +>module.exports.g : (a: { x: string; }, b: { y: any; }) => any
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>g : (a: { x: string; }, b: { y: any; }) => any
 +>g : (a: { x: string; }, b: { y: any; }) => any
 
@@ -276,9 +276,9 @@
 ->hh : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
 +>module.exports.h = hh : (a: { x: string; }, b: { y: any; }) => any
 +>module.exports.h : (a: { x: string; }, b: { y: any; }) => any
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>h : (a: { x: string; }, b: { y: any; }) => any
 +>hh : (a: { x: string; }, b: { y: any; }) => any
 
@@ -288,9 +288,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
  >i : () => void
  >function i() {} : () => void
  >i : () => void
@@ -301,17 +301,17 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
  >ii : () => void
  >module.exports.i : () => void
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
  >i : () => void
 
  // note that this last one doesn't make much sense in cjs, since exports aren't hoisted bindings
@@ -321,17 +321,17 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
  >jj : () => void
  >module.exports.j : () => void
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
  >j : () => void
 
  module.exports.j = function j() {}
@@ -340,9 +340,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
  >j : () => void
  >function j() {} : () => void
  >j : () => void
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types.diff
index d366e1ea11..281a6739e3 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types.diff
@@ -5,10 +5,12 @@
  === file2.js ===
  const {myTypes} = require('./file.js');
 ->myTypes : { [x: string]: any; }
+->require('./file.js') : typeof import("file")
 +>myTypes : any
- >require('./file.js') : typeof import("file")
++>require('./file.js') : typeof import("./file.js")
  >require : any
  >'./file.js' : "./file.js"
+
 @@= skipped -11, +11 lines =@@
   * @type {Object<string,*>}
   */
@@ -78,10 +80,11 @@
  exports.myTypes = myTypes;
 ->exports.myTypes = myTypes : { [x: string]: any; }
 ->exports.myTypes : { [x: string]: any; }
-+>exports.myTypes = myTypes : any
-+>exports.myTypes : any
- >exports : typeof import("file")
+->exports : typeof import("file")
 ->myTypes : { [x: string]: any; }
 ->myTypes : { [x: string]: any; }
++>exports.myTypes = myTypes : any
++>exports.myTypes : any
++>exports : typeof import("./file")
 +>myTypes : any
 +>myTypes : any
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypeReferences2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypeReferences2.types.diff
index 3399f418dc..36048b54a9 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypeReferences2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypeReferences2.types.diff
@@ -1,6 +1,15 @@
 --- old.jsDeclarationsTypeReferences2.types
 +++ new.jsDeclarationsTypeReferences2.types
-@@= skipped -16, +16 lines =@@
+@@= skipped -4, +4 lines =@@
+ >a : number
+ >m : number
+ >require("./something").o : { a: number; m: number; }
+->require("./something") : typeof import("something")
++>require("./something") : typeof import("./something")
+ >require : any
+ >"./something" : "./something"
+ >o : { a: number; m: number; }
+@@= skipped -12, +12 lines =@@
  >m : number
 
  module.exports = {
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypeReferences3.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypeReferences3.types.diff
index 5d878b7331..2f8a31622b 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypeReferences3.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypeReferences3.types.diff
@@ -23,9 +23,9 @@
 ->A : typeof A
 +>module.exports.A = {} : {}
 +>module.exports.A : {}
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>A : {}
  >{} : {}
 
@@ -42,9 +42,9 @@
 +>module.exports.A.B = {    thing: new Something()} : { thing: import("fs").Something; }
 +>module.exports.A.B : any
 +>module.exports.A : {}
-+>module.exports : typeof import("index")
-+>module : { "\"index\"": typeof import("index"); }
-+>exports : typeof import("index")
++>module.exports : typeof import(".")
++>module : { "\"index\"": typeof import("."); }
++>exports : typeof import(".")
 +>A : {}
 +>B : any
 +>{    thing: new Something()} : { thing: import("fs").Something; }
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypedefAndImportTypes.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypedefAndImportTypes.types.diff
index 7a95280823..bd3068b2c0 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypedefAndImportTypes.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsTypedefAndImportTypes.types.diff
@@ -9,7 +9,23 @@
  >exports : typeof Conn
  >Conn : typeof Conn
 
-@@= skipped -30, +30 lines =@@
+@@= skipped -16, +16 lines =@@
+      * @param {Conn} c
+      */
+     constructor(c) {
+->c : import("conn")
++>c : import("./conn")
+
+         this.connItem = c.item;
+ >this.connItem = c.item : number
+@@= skipped -8, +8 lines =@@
+ >this : this
+ >connItem : any
+ >c.item : number
+->c : import("conn")
++>c : import("./conn")
+ >item : number
+
          /** @type {import("./conn").Whatever} */
          this.another = "";
  >this.another = "" : ""
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsUniqueSymbolUsage.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsUniqueSymbolUsage.types.diff
index d1f3e49801..af3617182f 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsUniqueSymbolUsage.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsUniqueSymbolUsage.types.diff
@@ -1,11 +1,13 @@
 --- old.jsDeclarationsUniqueSymbolUsage.types
 +++ new.jsDeclarationsUniqueSymbolUsage.types
-@@= skipped -15, +15 lines =@@
-  * @param {import('./a').WithSymbol} value 
+@@= skipped -16, +16 lines =@@
   */
  export function b(value) {
-->b : (value: import("./a").WithSymbol) => import("./a").WithSymbol
-+>b : (value: import("a").WithSymbol) => import("a").WithSymbol
- >value : import("a").WithSymbol
+ >b : (value: import("./a").WithSymbol) => import("./a").WithSymbol
+->value : import("a").WithSymbol
++>value : import("./a").WithSymbol
 
-     return value;
\ No newline at end of file
+     return value;
+->value : import("a").WithSymbol
++>value : import("./a").WithSymbol
+ }
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocImportTypeReferenceToClassAlias.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocImportTypeReferenceToClassAlias.types.diff
index f1be5ed665..170348f47b 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocImportTypeReferenceToClassAlias.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocImportTypeReferenceToClassAlias.types.diff
@@ -7,9 +7,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("mod1")
-+>module : { "\"mod1\"": typeof import("mod1"); }
-+>exports : typeof import("mod1")
++>module.exports : typeof import("./mod1")
++>module : { "\"mod1\"": typeof import("./mod1"); }
++>exports : typeof import("./mod1")
  >C : typeof C
  >C : typeof C
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff
index 1a8ac7b8a7..d5b877b1ed 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff
@@ -1,6 +1,21 @@
 --- old.jsdocThisType.types
 +++ new.jsdocThisType.types
-@@= skipped -24, +24 lines =@@
+@@= skipped -12, +12 lines =@@
+ === /a.js ===
+ /** @type {import('./types').M} */
+ export const f1 = function() {
+->f1 : import("/types").M
+->function() {    this.test();} : (this: import("/types").Foo) => void
++>f1 : import("./types").M
++>function() {    this.test();} : (this: import("./types").Foo) => void
+
+     this.test();
+ >this.test() : any
+ >this.test : any
+->this : import("/types").Foo
++>this : import("./types").Foo
+ >test : any
+ }
 
  /** @type {import('./types').M} */
  export function f2() {
@@ -9,18 +24,20 @@
 
      this.test();
  >this.test() : any
-@@= skipped -11, +11 lines =@@
-
- /** @type {(this: import('./types').Foo) => void} */
- export const f3 = function() {
-->f3 : (this: import("./types").Foo) => void
-->function() {    this.test();} : (this: import("./types").Foo) => void
-+>f3 : (this: import("/types").Foo) => void
-+>function() {    this.test();} : (this: import("/types").Foo) => void
+ >this.test : any
+->this : import("/types").Foo
++>this : import("./types").Foo
+ >test : any
+ }
 
+@@= skipped -29, +29 lines =@@
      this.test();
  >this.test() : any
-@@= skipped -12, +12 lines =@@
+ >this.test : any
+->this : import("/types").Foo
++>this : import("./types").Foo
+ >test : any
+ }
 
  /** @type {(this: import('./types').Foo) => void} */
  export function f4() {
@@ -29,7 +46,11 @@
 
      this.test();
  >this.test() : any
-@@= skipped -11, +11 lines =@@
+ >this.test : any
+->this : import("/types").Foo
++>this : import("./types").Foo
+ >test : any
+ }
 
  /** @type {function(this: import('./types').Foo): void} */
  export const f5 = function() {
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeFromChainedAssignment2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeFromChainedAssignment2.types.diff
index 402f376c48..620d7eacf8 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeFromChainedAssignment2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeFromChainedAssignment2.types.diff
@@ -58,11 +58,11 @@
 ->n : number
 +>exports.f = exports.g = function fg(n) {    return n + 1} : (n: any) => any
 +>exports.f : (n: any) => any
-+>exports : typeof import("mod")
++>exports : typeof import("./mod")
 +>f : (n: any) => any
 +>exports.g = function fg(n) {    return n + 1} : (n: any) => any
 +>exports.g : any
-+>exports : typeof import("mod")
++>exports : typeof import("./mod")
 +>g : any
 +>function fg(n) {    return n + 1} : (n: any) => any
 +>fg : (n: any) => any
@@ -94,15 +94,15 @@
 ->mom : string
 +>module.exports.h = module.exports.i = function hi(mom) {    return `hi, ${mom}!`;} : (mom: any) => string
 +>module.exports.h : (mom: any) => string
-+>module.exports : typeof import("mod")
-+>module : { "\"mod\"": typeof import("mod"); }
-+>exports : typeof import("mod")
++>module.exports : typeof import("./mod")
++>module : { "\"mod\"": typeof import("./mod"); }
++>exports : typeof import("./mod")
 +>h : (mom: any) => string
 +>module.exports.i = function hi(mom) {    return `hi, ${mom}!`;} : (mom: any) => string
 +>module.exports.i : any
-+>module.exports : typeof import("mod")
-+>module : { "\"mod\"": typeof import("mod"); }
-+>exports : typeof import("mod")
++>module.exports : typeof import("./mod")
++>module : { "\"mod\"": typeof import("./mod"); }
++>exports : typeof import("./mod")
 +>i : any
 +>function hi(mom) {    return `hi, ${mom}!`;} : (mom: any) => string
 +>hi : (mom: any) => string
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeFromChainedAssignment3.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeFromChainedAssignment3.types.diff
index 4d97731368..6940649c4b 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeFromChainedAssignment3.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeFromChainedAssignment3.types.diff
@@ -5,20 +5,501 @@
  exports.wrapSync = exports.selectSeries = exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined;
  >exports.wrapSync = exports.selectSeries = exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
 ->exports.wrapSync : any
-+>exports.wrapSync : undefined
- >exports : typeof import("a")
+->exports : typeof import("a")
 ->wrapSync : any
++>exports.wrapSync : undefined
++>exports : typeof import("./a")
 +>wrapSync : undefined
  >exports.selectSeries = exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
  >exports.selectSeries : any
- >exports : typeof import("a")
-@@= skipped -392, +392 lines =@@
- >exports : typeof import("a")
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >selectSeries : any
+ >exports.selectLimit = exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.selectLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >selectLimit : any
+ >exports.select = exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.select : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >select : any
+ >exports.foldr = exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.foldr : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >foldr : any
+ >exports.foldl = exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.foldl : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >foldl : any
+ >exports.inject = exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.inject : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >inject : any
+ >exports.forEachOfLimit = exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.forEachOfLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >forEachOfLimit : any
+ >exports.forEachOfSeries = exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.forEachOfSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >forEachOfSeries : any
+ >exports.forEachOf = exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.forEachOf : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >forEachOf : any
+ >exports.forEachLimit = exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.forEachLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >forEachLimit : any
+ >exports.forEachSeries = exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.forEachSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >forEachSeries : any
+ >exports.forEach = exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.forEach : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >forEach : any
+ >exports.findSeries = exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.findSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >findSeries : any
+ >exports.findLimit = exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.findLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >findLimit : any
+ >exports.find = exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.find : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >find : any
+ >exports.anySeries = exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.anySeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >anySeries : any
+ >exports.anyLimit = exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.anyLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >anyLimit : any
+ >exports.any = exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.any : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >any : any
+ >exports.allSeries = exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.allSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >allSeries : any
+ >exports.allLimit = exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.allLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >allLimit : any
+ >exports.all = exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.all : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >all : any
+ >exports.whilst = exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.whilst : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >whilst : any
+ >exports.waterfall = exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.waterfall : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >waterfall : any
+ >exports.until = exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.until : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >until : any
+ >exports.unmemoize = exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.unmemoize : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >unmemoize : any
+ >exports.tryEach = exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.tryEach : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >tryEach : any
+ >exports.transform = exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.transform : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >transform : any
+ >exports.timesSeries = exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.timesSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >timesSeries : any
+ >exports.timesLimit = exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.timesLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >timesLimit : any
+ >exports.times = exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.times : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >times : any
+ >exports.timeout = exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.timeout : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >timeout : any
+ >exports.sortBy = exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.sortBy : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >sortBy : any
+ >exports.someSeries = exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.someSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >someSeries : any
+ >exports.someLimit = exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.someLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >someLimit : any
+ >exports.some = exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.some : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >some : any
+ >exports.setImmediate = exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.setImmediate : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >setImmediate : any
+ >exports.series = exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.series : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >series : any
+ >exports.seq = exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.seq : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >seq : any
+ >exports.retryable = exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.retryable : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >retryable : any
+ >exports.retry = exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.retry : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >retry : any
+ >exports.rejectSeries = exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.rejectSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >rejectSeries : any
+ >exports.rejectLimit = exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.rejectLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >rejectLimit : any
+ >exports.reject = exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.reject : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >reject : any
+ >exports.reflectAll = exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.reflectAll : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >reflectAll : any
+ >exports.reflect = exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.reflect : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >reflect : any
+ >exports.reduceRight = exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.reduceRight : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >reduceRight : any
+ >exports.reduce = exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.reduce : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >reduce : any
+ >exports.race = exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.race : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >race : any
+ >exports.queue = exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.queue : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >queue : any
+ >exports.priorityQueue = exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.priorityQueue : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >priorityQueue : any
+ >exports.parallelLimit = exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.parallelLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >parallelLimit : any
+ >exports.parallel = exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.parallel : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >parallel : any
+ >exports.nextTick = exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.nextTick : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >nextTick : any
+ >exports.memoize = exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.memoize : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >memoize : any
+ >exports.mapValuesSeries = exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.mapValuesSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >mapValuesSeries : any
+ >exports.mapValuesLimit = exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.mapValuesLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >mapValuesLimit : any
+ >exports.mapValues = exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.mapValues : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >mapValues : any
+ >exports.mapSeries = exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.mapSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >mapSeries : any
+ >exports.mapLimit = exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.mapLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >mapLimit : any
+ >exports.map = exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.map : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >map : any
+ >exports.log = exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.log : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >log : any
+ >exports.groupBySeries = exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.groupBySeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >groupBySeries : any
+ >exports.groupByLimit = exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.groupByLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >groupByLimit : any
+ >exports.groupBy = exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.groupBy : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >groupBy : any
+ >exports.forever = exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.forever : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >forever : any
+ >exports.filterSeries = exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.filterSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >filterSeries : any
+ >exports.filterLimit = exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.filterLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >filterLimit : any
+ >exports.filter = exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.filter : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >filter : any
+ >exports.everySeries = exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.everySeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >everySeries : any
+ >exports.everyLimit = exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.everyLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >everyLimit : any
+ >exports.every = exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.every : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >every : any
+ >exports.ensureAsync = exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.ensureAsync : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >ensureAsync : any
+ >exports.eachSeries = exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.eachSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >eachSeries : any
+ >exports.eachOfSeries = exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.eachOfSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >eachOfSeries : any
+ >exports.eachOfLimit = exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.eachOfLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >eachOfLimit : any
+ >exports.eachOf = exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.eachOf : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >eachOf : any
+ >exports.eachLimit = exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.eachLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >eachLimit : any
+ >exports.each = exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.each : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >each : any
+ >exports.during = exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.during : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >during : any
+ >exports.doWhilst = exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.doWhilst : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >doWhilst : any
+ >exports.doUntil = exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.doUntil : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >doUntil : any
+ >exports.doDuring = exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.doDuring : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >doDuring : any
+ >exports.dir = exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.dir : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >dir : any
+ >exports.detectSeries = exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.detectSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >detectSeries : any
+ >exports.detectLimit = exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.detectLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >detectLimit : any
+ >exports.detect = exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.detect : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >detect : any
+ >exports.constant = exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.constant : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >constant : any
+ >exports.concatSeries = exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.concatSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >concatSeries : any
+ >exports.concatLimit = exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.concatLimit : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >concatLimit : any
+ >exports.concat = exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.concat : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >concat : any
+ >exports.compose = exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.compose : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >compose : any
+ >exports.cargo = exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.cargo : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >cargo : any
+ >exports.autoInject = exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.autoInject : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >autoInject : any
+ >exports.auto = exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.auto : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >auto : any
+ >exports.asyncify = exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.asyncify : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >asyncify : any
+ >exports.applyEachSeries = exports.applyEach = exports.apply = undefined : undefined
+ >exports.applyEachSeries : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >applyEachSeries : any
+ >exports.applyEach = exports.apply = undefined : undefined
+ >exports.applyEach : any
+->exports : typeof import("a")
++>exports : typeof import("./a")
  >applyEach : any
  >exports.apply = undefined : undefined
 ->exports.apply : undefined
-+>exports.apply : any
- >exports : typeof import("a")
+->exports : typeof import("a")
 ->apply : undefined
++>exports.apply : any
++>exports : typeof import("./a")
 +>apply : any
  >undefined : undefined
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeReferenceToImport.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeReferenceToImport.types.diff
index a7c9ca6b1d..0a6c3b3246 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeReferenceToImport.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeReferenceToImport.types.diff
@@ -6,32 +6,34 @@
  const C = require('./ex').C;
 ->C : typeof C
 ->require('./ex').C : typeof C
-+>C : typeof import("ex").C
-+>require('./ex').C : typeof import("ex").C
- >require('./ex') : typeof import("ex")
+->require('./ex') : typeof import("ex")
++>C : typeof import("./ex").C
++>require('./ex').C : typeof import("./ex").C
++>require('./ex') : typeof import("./ex")
  >require : any
  >'./ex' : "./ex"
 ->C : typeof C
-+>C : typeof import("ex").C
++>C : typeof import("./ex").C
 
  const D = require('./ex')?.C;
 ->D : typeof C
 ->require('./ex')?.C : typeof C
-+>D : typeof import("ex").C
-+>require('./ex')?.C : typeof import("ex").C
- >require('./ex') : typeof import("ex")
+->require('./ex') : typeof import("ex")
++>D : typeof import("./ex").C
++>require('./ex')?.C : typeof import("./ex").C
++>require('./ex') : typeof import("./ex")
  >require : any
  >'./ex' : "./ex"
 ->C : typeof C
-+>C : typeof import("ex").C
++>C : typeof import("./ex").C
 
  /** @type {C} c */
  var c = new C()
  >c : C
 ->new C() : C
 ->C : typeof C
-+>new C() : import("ex").C
-+>C : typeof import("ex").C
++>new C() : import("./ex").C
++>C : typeof import("./ex").C
 
  c.start
 ->c.start : number
@@ -53,8 +55,8 @@
 ->new D() : C
 ->D : typeof C
 +>d : D
-+>new D() : import("ex").C
-+>D : typeof import("ex").C
++>new D() : import("./ex").C
++>D : typeof import("./ex").C
 
  d.start
 ->d.start : number
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport1.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport1.types.diff
new file mode 100644
index 0000000000..c48f3cd217
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport1.types.diff
@@ -0,0 +1,26 @@
+--- old.lateBoundAssignmentDeclarationSupport1.types
++++ new.lateBoundAssignmentDeclarationSupport1.types
+@@= skipped -34, +34 lines =@@
+ exports[_sym] = "ok";
+ >exports[_sym] = "ok" : "ok"
+ >exports[_sym] : any
+->exports : typeof import("lateBoundAssignmentDeclarationSupport1")
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport1")
+ >_sym : unique symbol
+ >"ok" : "ok"
+
+ exports[_str] = "ok";
+ >exports[_str] = "ok" : "ok"
+ >exports[_str] : any
+->exports : typeof import("lateBoundAssignmentDeclarationSupport1")
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport1")
+ >_str : "my-fake-sym"
+ >"ok" : "ok"
+
+ exports.S = _sym;
+ >exports.S = _sym : unique symbol
+ >exports.S : unique symbol
+->exports : typeof import("lateBoundAssignmentDeclarationSupport1")
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport1")
+ >S : unique symbol
+ >_sym : unique symbol
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport2.types.diff
index e1d9d3ac9f..c27c28f17a 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport2.types.diff
@@ -7,9 +7,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport2")
-+>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("lateBoundAssignmentDeclarationSupport2"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport2")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
++>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("./lateBoundAssignmentDeclarationSupport2"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
  >_sym : unique symbol
  >"ok" : "ok"
 
@@ -19,9 +19,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport2")
-+>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("lateBoundAssignmentDeclarationSupport2"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport2")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
++>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("./lateBoundAssignmentDeclarationSupport2"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
  >_str : "my-fake-sym"
  >"ok" : "ok"
 
@@ -31,8 +31,8 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport2")
-+>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("lateBoundAssignmentDeclarationSupport2"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport2")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
++>module : { "\"lateBoundAssignmentDeclarationSupport2\"": typeof import("./lateBoundAssignmentDeclarationSupport2"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport2")
  >S : unique symbol
  >_sym : unique symbol
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport3.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport3.types.diff
index bc895e87d5..fb61885123 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport3.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport3.types.diff
@@ -5,16 +5,16 @@
 
  Object.defineProperty(module.exports, _sym, { value: "ok" });
 ->Object.defineProperty(module.exports, _sym, { value: "ok" }) : typeof module.exports
-+>Object.defineProperty(module.exports, _sym, { value: "ok" }) : typeof import("lateBoundAssignmentDeclarationSupport3")
++>Object.defineProperty(module.exports, _sym, { value: "ok" }) : typeof import("./lateBoundAssignmentDeclarationSupport3")
  >Object.defineProperty : <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T
  >Object : ObjectConstructor
  >defineProperty : <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport3")
-+>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("lateBoundAssignmentDeclarationSupport3"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport3")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
++>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("./lateBoundAssignmentDeclarationSupport3"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
  >_sym : unique symbol
  >{ value: "ok" } : { value: string; }
  >value : string
@@ -22,16 +22,16 @@
 
  Object.defineProperty(module.exports, _str, { value: "ok" });
 ->Object.defineProperty(module.exports, _str, { value: "ok" }) : typeof module.exports
-+>Object.defineProperty(module.exports, _str, { value: "ok" }) : typeof import("lateBoundAssignmentDeclarationSupport3")
++>Object.defineProperty(module.exports, _str, { value: "ok" }) : typeof import("./lateBoundAssignmentDeclarationSupport3")
  >Object.defineProperty : <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T
  >Object : ObjectConstructor
  >defineProperty : <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport3")
-+>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("lateBoundAssignmentDeclarationSupport3"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport3")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
++>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("./lateBoundAssignmentDeclarationSupport3"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
  >_str : "my-fake-sym"
  >{ value: "ok" } : { value: string; }
  >value : string
@@ -42,8 +42,8 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport3")
-+>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("lateBoundAssignmentDeclarationSupport3"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport3")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
++>module : { "\"lateBoundAssignmentDeclarationSupport3\"": typeof import("./lateBoundAssignmentDeclarationSupport3"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport3")
  >S : unique symbol
  >_sym : unique symbol
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport4.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport4.types.diff
index 0fcba704f5..4b11dd68f3 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport4.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport4.types.diff
@@ -87,9 +87,9 @@
 ->F : typeof F
 +>module.exports.F = F : () => void
 +>module.exports.F : () => void
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport4")
-+>module : { "\"lateBoundAssignmentDeclarationSupport4\"": typeof import("lateBoundAssignmentDeclarationSupport4"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport4")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport4")
++>module : { "\"lateBoundAssignmentDeclarationSupport4\"": typeof import("./lateBoundAssignmentDeclarationSupport4"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport4")
 +>F : () => void
 +>F : () => void
 
@@ -99,8 +99,8 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport4")
-+>module : { "\"lateBoundAssignmentDeclarationSupport4\"": typeof import("lateBoundAssignmentDeclarationSupport4"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport4")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport4")
++>module : { "\"lateBoundAssignmentDeclarationSupport4\"": typeof import("./lateBoundAssignmentDeclarationSupport4"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport4")
  >S : unique symbol
  >_sym : unique symbol
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport5.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport5.types.diff
index 923d21b3e8..f7d165b11d 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport5.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport5.types.diff
@@ -79,9 +79,9 @@
 ->F : typeof F
 +>module.exports.F = F : { (): void; prototype: { [_sym]: string; "my-fake-sym": string; }; }
 +>module.exports.F : { (): void; prototype: { [_sym]: string; "my-fake-sym": string; }; }
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport5")
-+>module : { "\"lateBoundAssignmentDeclarationSupport5\"": typeof import("lateBoundAssignmentDeclarationSupport5"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport5")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport5")
++>module : { "\"lateBoundAssignmentDeclarationSupport5\"": typeof import("./lateBoundAssignmentDeclarationSupport5"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport5")
 +>F : { (): void; prototype: { [_sym]: string; "my-fake-sym": string; }; }
 +>F : { (): void; prototype: { [_sym]: string; "my-fake-sym": string; }; }
 
@@ -91,8 +91,8 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport5")
-+>module : { "\"lateBoundAssignmentDeclarationSupport5\"": typeof import("lateBoundAssignmentDeclarationSupport5"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport5")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport5")
++>module : { "\"lateBoundAssignmentDeclarationSupport5\"": typeof import("./lateBoundAssignmentDeclarationSupport5"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport5")
  >S : unique symbol
  >_sym : unique symbol
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport6.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport6.types.diff
index 873d1d514a..214cb6462d 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport6.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport6.types.diff
@@ -98,9 +98,9 @@
 ->F : typeof F
 +>module.exports.F = F : () => void
 +>module.exports.F : () => void
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport6")
-+>module : { "\"lateBoundAssignmentDeclarationSupport6\"": typeof import("lateBoundAssignmentDeclarationSupport6"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport6")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport6")
++>module : { "\"lateBoundAssignmentDeclarationSupport6\"": typeof import("./lateBoundAssignmentDeclarationSupport6"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport6")
 +>F : () => void
 +>F : () => void
 
@@ -110,8 +110,8 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport6")
-+>module : { "\"lateBoundAssignmentDeclarationSupport6\"": typeof import("lateBoundAssignmentDeclarationSupport6"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport6")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport6")
++>module : { "\"lateBoundAssignmentDeclarationSupport6\"": typeof import("./lateBoundAssignmentDeclarationSupport6"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport6")
  >S : unique symbol
  >_sym : unique symbol
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport7.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport7.types.diff
index c0beb3e337..9d99d6490f 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport7.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/lateBoundAssignmentDeclarationSupport7.types.diff
@@ -55,9 +55,9 @@
 ->F : typeof F
 +>module.exports.F = F : { (): void; [_sym]: string; "my-fake-sym": string; }
 +>module.exports.F : { (): void; [_sym]: string; "my-fake-sym": string; }
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport7")
-+>module : { "\"lateBoundAssignmentDeclarationSupport7\"": typeof import("lateBoundAssignmentDeclarationSupport7"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport7")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport7")
++>module : { "\"lateBoundAssignmentDeclarationSupport7\"": typeof import("./lateBoundAssignmentDeclarationSupport7"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport7")
 +>F : { (): void; [_sym]: string; "my-fake-sym": string; }
 +>F : { (): void; [_sym]: string; "my-fake-sym": string; }
 
@@ -67,8 +67,8 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("lateBoundAssignmentDeclarationSupport7")
-+>module : { "\"lateBoundAssignmentDeclarationSupport7\"": typeof import("lateBoundAssignmentDeclarationSupport7"); }
-+>exports : typeof import("lateBoundAssignmentDeclarationSupport7")
++>module.exports : typeof import("./lateBoundAssignmentDeclarationSupport7")
++>module : { "\"lateBoundAssignmentDeclarationSupport7\"": typeof import("./lateBoundAssignmentDeclarationSupport7"); }
++>exports : typeof import("./lateBoundAssignmentDeclarationSupport7")
  >S : unique symbol
  >_sym : unique symbol
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias.types.diff
index 9e6c43a1c4..91276e3db0 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias.types.diff
@@ -169,23 +169,29 @@
 
 
  === b.js ===
-@@= skipped -110, +110 lines =@@
+ var exportsAlias = exports;
+->exportsAlias : typeof import("b")
+->exports : typeof import("b")
++>exportsAlias : typeof import("./b")
++>exports : typeof import("./b")
 
  exportsAlias.func1 = function () { };
  >exportsAlias.func1 = function () { } : () => void
 ->exportsAlias.func1 : () => void
-+>exportsAlias.func1 : any
- >exportsAlias : typeof import("b")
+->exportsAlias : typeof import("b")
 ->func1 : () => void
++>exportsAlias.func1 : any
++>exportsAlias : typeof import("./b")
 +>func1 : any
  >function () { } : () => void
 
  exports.func2 = function () { };
  >exports.func2 = function () { } : () => void
 ->exports.func2 : () => void
-+>exports.func2 : any
- >exports : typeof import("b")
+->exports : typeof import("b")
 ->func2 : () => void
++>exports.func2 : any
++>exports : typeof import("./b")
 +>func2 : any
  >function () { } : () => void
 
@@ -253,12 +259,13 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>multipleDeclarationAlias2 : typeof import("b")
-+>module.exports = exports : typeof import("b")
+->exports : typeof import("b")
++>multipleDeclarationAlias2 : typeof import("./b")
++>module.exports = exports : typeof import("./b")
 +>module.exports : {}
 +>module : { "export=": {}; }
 +>exports : {}
- >exports : typeof import("b")
++>exports : typeof import("./b")
 
  multipleDeclarationAlias2.func6 = function () { };
  >multipleDeclarationAlias2.func6 = function () { } : () => void
@@ -266,19 +273,29 @@
 ->multipleDeclarationAlias2 : typeof module.exports
 ->func6 : () => void
 +>multipleDeclarationAlias2.func6 : any
-+>multipleDeclarationAlias2 : typeof import("b")
++>multipleDeclarationAlias2 : typeof import("./b")
 +>func6 : any
  >function () { } : () => void
 
  var someOtherVariable;
-@@= skipped -75, +75 lines =@@
+ >someOtherVariable : any
+
+ var multipleDeclarationAlias3 = someOtherVariable = exports;
+->multipleDeclarationAlias3 : typeof import("b")
+->someOtherVariable = exports : typeof import("b")
++>multipleDeclarationAlias3 : typeof import("./b")
++>someOtherVariable = exports : typeof import("./b")
+ >someOtherVariable : any
+->exports : typeof import("b")
++>exports : typeof import("./b")
 
  multipleDeclarationAlias3.func7 = function () { };
  >multipleDeclarationAlias3.func7 = function () { } : () => void
 ->multipleDeclarationAlias3.func7 : () => void
-+>multipleDeclarationAlias3.func7 : any
- >multipleDeclarationAlias3 : typeof import("b")
+->multipleDeclarationAlias3 : typeof import("b")
 ->func7 : () => void
++>multipleDeclarationAlias3.func7 : any
++>multipleDeclarationAlias3 : typeof import("./b")
 +>func7 : any
  >function () { } : () => void
 
@@ -426,7 +443,7 @@
 +exports.func11 = function () { };
 +>exports.func11 = function () { } : () => void
 +>exports.func11 : any
-+>exports : typeof import("b")
++>exports : typeof import("./b")
 +>func11 : any
 +>function () { } : () => void
 +
@@ -453,7 +470,7 @@
 +exports.func11 = function () { };
 +>exports.func11 = function () { } : () => void
 +>exports.func11 : any
-+>exports : typeof import("b")
++>exports : typeof import("./b")
 +>func11 : any
 +>function () { } : () => void
 +
@@ -484,9 +501,10 @@
  exports.func13 = function () { };
  >exports.func13 = function () { } : () => void
 ->exports.func13 : () => void
-+>exports.func13 : any
- >exports : typeof import("b")
+->exports : typeof import("b")
 ->func13 : () => void
++>exports.func13 : any
++>exports : typeof import("./b")
 +>func13 : any
  >function () { } : () => void
 
@@ -522,9 +540,10 @@
  exports.func15 = function () { };
  >exports.func15 = function () { } : () => void
 ->exports.func15 : () => void
-+>exports.func15 : any
- >exports : typeof import("b")
+->exports : typeof import("b")
 ->func15 : () => void
++>exports.func15 : any
++>exports : typeof import("./b")
 +>func15 : any
  >function () { } : () => void
 
@@ -559,9 +578,10 @@
  exports.func17 = function () { };
  >exports.func17 = function () { } : () => void
 ->exports.func17 : () => void
-+>exports.func17 : any
- >exports : typeof import("b")
+->exports : typeof import("b")
 ->func17 : () => void
++>exports.func17 : any
++>exports : typeof import("./b")
 +>func17 : any
  >function () { } : () => void
 
@@ -593,9 +613,10 @@
  exports.func19 = function () { };
  >exports.func19 = function () { } : () => void
 ->exports.func19 : () => void
-+>exports.func19 : any
- >exports : typeof import("b")
+->exports : typeof import("b")
 ->func19 : () => void
++>exports.func19 : any
++>exports : typeof import("./b")
 +>func19 : any
  >function () { } : () => void
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias2.types.diff
index 8b1fcc8421..4784001b51 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias2.types.diff
@@ -25,16 +25,16 @@
 +>exports = module.exports = C : () => void
 +>exports : any
 +>module.exports = C : () => void
-+>module.exports : typeof import("semver")
-+>module : { "\"semver\"": typeof import("semver"); }
-+>exports : typeof import("semver")
++>module.exports : typeof import("./semver")
++>module : { "\"semver\"": typeof import("./semver"); }
++>exports : typeof import("./semver")
 +>C : () => void
 
  exports.f = n => n + 1
  >exports.f = n => n + 1 : (n: any) => any
  >exports.f : (n: any) => any
 ->exports : typeof C
-+>exports : typeof import("semver")
++>exports : typeof import("./semver")
  >f : (n: any) => any
  >n => n + 1 : (n: any) => any
  >n : any
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias5.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias5.types.diff
index 771c0d6c46..b5ffa14e03 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias5.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAlias5.types.diff
@@ -13,15 +13,15 @@
 +>exports = module.exports = webpack : { (): void; WebpackOptionsDefaulter: number; }
 +>exports : any
 +>module.exports = webpack : { (): void; WebpackOptionsDefaulter: number; }
-+>module.exports : typeof import("bug24754")
-+>module : { "\"bug24754\"": typeof import("bug24754"); }
-+>exports : typeof import("bug24754")
++>module.exports : typeof import("./bug24754")
++>module : { "\"bug24754\"": typeof import("./bug24754"); }
++>exports : typeof import("./bug24754")
  >webpack : { (): void; WebpackOptionsDefaulter: number; }
 
  exports.version = 1001;
  >exports.version = 1001 : 1001
  >exports.version : 1001
 ->exports : { (): void; version: 1001; WebpackOptionsDefaulter: number; }
-+>exports : typeof import("bug24754")
++>exports : typeof import("./bug24754")
  >version : 1001
  >1001 : 1001
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasElementAccessExpression.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasElementAccessExpression.types.diff
new file mode 100644
index 0000000000..4b590a05fe
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasElementAccessExpression.types.diff
@@ -0,0 +1,19 @@
+--- old.moduleExportAliasElementAccessExpression.types
++++ new.moduleExportAliasElementAccessExpression.types
+@@= skipped -6, +6 lines =@@
+ exports["D"] = D;
+ >exports["D"] = D : () => void
+ >exports["D"] : () => void
+->exports : typeof import("moduleExportAliasElementAccessExpression")
++>exports : typeof import("./moduleExportAliasElementAccessExpression")
+ >"D" : "D"
+ >D : () => void
+
+@@= skipped -8, +8 lines =@@
+ exports["Does not work yet"] = D;
+ >exports["Does not work yet"] = D : () => void
+ >exports["Does not work yet"] : () => void
+->exports : typeof import("moduleExportAliasElementAccessExpression")
++>exports : typeof import("./moduleExportAliasElementAccessExpression")
+ >"Does not work yet" : "Does not work yet"
+ >D : () => void
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasExports.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasExports.types.diff
index e32a3712a0..703870ceb8 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasExports.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasExports.types.diff
@@ -1,10 +1,32 @@
 --- old.moduleExportAliasExports.types
 +++ new.moduleExportAliasExports.types
-@@= skipped -23, +23 lines =@@
+@@= skipped -9, +9 lines =@@
+ exports.bigOak = 1
+ >exports.bigOak = 1 : 1
+ >exports.bigOak : 1
+->exports : typeof import("Eloquent")
++>exports : typeof import("./Eloquent")
+ >bigOak : 1
+ >1 : 1
+
+ exports.everywhere = 2
+ >exports.everywhere = 2 : 2
+ >exports.everywhere : 2
+->exports : typeof import("Eloquent")
++>exports : typeof import("./Eloquent")
+ >everywhere : 2
+ >2 : 2
+
  module.exports = exports
- >module.exports = exports : typeof import("Eloquent")
- >module.exports : typeof import("Eloquent")
+->module.exports = exports : typeof import("Eloquent")
+->module.exports : typeof import("Eloquent")
 ->module : { exports: typeof import("Eloquent"); }
-+>module : { "\"Eloquent\"": typeof import("Eloquent"); }
- >exports : typeof import("Eloquent")
- >exports : typeof import("Eloquent")
+->exports : typeof import("Eloquent")
+->exports : typeof import("Eloquent")
++>module.exports = exports : typeof import("./Eloquent")
++>module.exports : typeof import("./Eloquent")
++>module : { "\"Eloquent\"": typeof import("./Eloquent"); }
++>exports : typeof import("./Eloquent")
++>exports : typeof import("./Eloquent")
+
+ })()
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasImported.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasImported.types.diff
index e7111af3a3..c2ddbdd552 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasImported.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasImported.types.diff
@@ -8,7 +8,7 @@
 ->exports : typeof alias
 ->version : 1
 +>exports.version : any
-+>exports : typeof import("bug28014")
++>exports : typeof import("./bug28014")
 +>version : any
  >1 : 1
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasUnknown.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasUnknown.types.diff
index 246e570456..b366e0ae27 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasUnknown.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasUnknown.types.diff
@@ -14,6 +14,6 @@
  >exports.foo = bar : any
  >exports.foo : any
 ->exports : any
-+>exports : typeof import("bug27025")
++>exports : typeof import("./bug27025")
  >foo : any
  >bar : any
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment.types.diff
index 4552049117..2518a28793 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment.types.diff
@@ -40,9 +40,9 @@
 ->exports : { on(s: string): void; x: number; y: 2; }
 +>npmlog : EE
 +>module.exports = new EE() : EE
-+>module.exports : typeof import("npmlog")
-+>module : { "\"npmlog\"": typeof import("npmlog"); }
-+>exports : typeof import("npmlog")
++>module.exports : typeof import("./npmlog")
++>module : { "\"npmlog\"": typeof import("./npmlog"); }
++>exports : typeof import("./npmlog")
  >new EE() : EE
  >EE : typeof EE
 
@@ -63,9 +63,9 @@
 ->on : (s: string) => void
 +>module.exports.on('hi') : any
 +>module.exports.on : any
-+>module.exports : typeof import("npmlog")
-+>module : { "\"npmlog\"": typeof import("npmlog"); }
-+>exports : typeof import("npmlog")
++>module.exports : typeof import("./npmlog")
++>module : { "\"npmlog\"": typeof import("./npmlog"); }
++>exports : typeof import("./npmlog")
 +>on : any
  >'hi' : "hi"
 
@@ -85,9 +85,9 @@
 ->module.exports : { on(s: string): void; x: number; y: 2; }
 ->module : { exports: { on(s: string): void; x: number; y: 2; }; }
 ->exports : { on(s: string): void; x: number; y: 2; }
-+>module.exports : typeof import("npmlog")
-+>module : { "\"npmlog\"": typeof import("npmlog"); }
-+>exports : typeof import("npmlog")
++>module.exports : typeof import("./npmlog")
++>module : { "\"npmlog\"": typeof import("./npmlog"); }
++>exports : typeof import("./npmlog")
  >y : 2
  >2 : 2
 
@@ -106,7 +106,7 @@
 ->exports : { on(s: string): void; x: number; y: 2; }
 ->x : number
 +>module.exports.x : any
-+>module.exports : typeof import("npmlog")
-+>module : { "\"npmlog\"": typeof import("npmlog"); }
-+>exports : typeof import("npmlog")
++>module.exports : typeof import("./npmlog")
++>module : { "\"npmlog\"": typeof import("./npmlog"); }
++>exports : typeof import("./npmlog")
 +>x : any
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment2.types.diff
index 4734c70492..c6e1364453 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment2.types.diff
@@ -11,9 +11,9 @@
 ->exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
 +>npm : (tree: any) => void
 +>module.exports = function (tree) {} : (tree: any) => void
-+>module.exports : typeof import("npm")
-+>module : { "\"npm\"": typeof import("npm"); }
-+>exports : typeof import("npm")
++>module.exports : typeof import("./npm")
++>module : { "\"npm\"": typeof import("./npm"); }
++>exports : typeof import("./npm")
  >function (tree) {} : (tree: any) => void
  >tree : any
  }
@@ -23,9 +23,9 @@
 ->module.exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
 ->module : { exports: { (tree: any): void; asReadInstalled: (tree: any) => void; }; }
 ->exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
-+>module.exports : typeof import("npm")
-+>module : { "\"npm\"": typeof import("npm"); }
-+>exports : typeof import("npm")
++>module.exports : typeof import("./npm")
++>module : { "\"npm\"": typeof import("./npm"); }
++>exports : typeof import("./npm")
  >asReadInstalled : (tree: any) => void
  >function (tree) {    npm(tree) // both references should be callable    module.exports(tree)} : (tree: any) => void
  >tree : any
@@ -42,8 +42,8 @@
 ->module : { exports: { (tree: any): void; asReadInstalled: (tree: any) => void; }; }
 ->exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
 +>module.exports(tree) : any
-+>module.exports : typeof import("npm")
-+>module : { "\"npm\"": typeof import("npm"); }
-+>exports : typeof import("npm")
++>module.exports : typeof import("./npm")
++>module : { "\"npm\"": typeof import("./npm"); }
++>exports : typeof import("./npm")
  >tree : any
  }
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment4.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment4.types.diff
index e472393d20..343c89c389 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment4.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAssignment4.types.diff
@@ -5,7 +5,7 @@
  >exports.default = { m: 1, a: 1 } : { m: number; a: number; }
  >exports.default : any
 ->exports : any
-+>exports : typeof import("async")
++>exports : typeof import("./async")
  >default : any
  >{ m: 1, a: 1 } : { m: number; a: number; }
  >m : number
@@ -22,5 +22,5 @@
  >exports : any
  >exports['default'] : any
 ->exports : any
-+>exports : typeof import("async")
++>exports : typeof import("./async")
  >'default' : "default"
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias.types.diff
index 4fc628595e..f25149178b 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias.types.diff
@@ -5,8 +5,9 @@
  === test.js ===
  const { apply } = require('./moduleExportAliasDuplicateAlias')
 ->apply : () => void
+->require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
 +>apply : undefined
- >require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
++>require('./moduleExportAliasDuplicateAlias') : typeof import("./moduleExportAliasDuplicateAlias")
  >require : any
  >'./moduleExportAliasDuplicateAlias' : "./moduleExportAliasDuplicateAlias"
 
@@ -20,29 +21,38 @@
  exports.apply = undefined;
  >exports.apply = undefined : undefined
 ->exports.apply : any
-+>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
+->exports : typeof import("moduleExportAliasDuplicateAlias")
 ->apply : any
++>exports.apply : undefined
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >undefined : undefined
 
  function a() { }
-@@= skipped -28, +28 lines =@@
+@@= skipped -23, +23 lines =@@
+ exports.apply()
+ >exports.apply() : any
+ >exports.apply : undefined
+->exports : typeof import("moduleExportAliasDuplicateAlias")
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
+ >apply : undefined
 
  exports.apply = a;
  >exports.apply = a : () => void
 ->exports.apply : any
-+>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
+->exports : typeof import("moduleExportAliasDuplicateAlias")
 ->apply : any
++>exports.apply : undefined
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >a : () => void
 
  exports.apply()
 ->exports.apply() : void
 ->exports.apply : () => void
+->exports : typeof import("moduleExportAliasDuplicateAlias")
+->apply : () => void
 +>exports.apply() : any
 +>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
-->apply : () => void
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias2.types.diff
index f8fcb1d917..537ce0e91b 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias2.types.diff
@@ -5,8 +5,9 @@
  === test.js ===
  const { apply } = require('./moduleExportAliasDuplicateAlias')
 ->apply : () => void
+->require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
 +>apply : undefined
- >require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
++>require('./moduleExportAliasDuplicateAlias') : typeof import("./moduleExportAliasDuplicateAlias")
  >require : any
  >'./moduleExportAliasDuplicateAlias' : "./moduleExportAliasDuplicateAlias"
 
@@ -25,9 +26,9 @@
 ->exports : typeof module.exports
 ->apply : any
 +>module.exports.apply : undefined
-+>module.exports : typeof import("moduleExportAliasDuplicateAlias")
-+>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("moduleExportAliasDuplicateAlias"); }
-+>exports : typeof import("moduleExportAliasDuplicateAlias")
++>module.exports : typeof import("./moduleExportAliasDuplicateAlias")
++>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("./moduleExportAliasDuplicateAlias"); }
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >undefined : undefined
 
@@ -42,9 +43,9 @@
 ->exports : typeof module.exports
 ->apply : any
 +>module.exports.apply : undefined
-+>module.exports : typeof import("moduleExportAliasDuplicateAlias")
-+>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("moduleExportAliasDuplicateAlias"); }
-+>exports : typeof import("moduleExportAliasDuplicateAlias")
++>module.exports : typeof import("./moduleExportAliasDuplicateAlias")
++>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("./moduleExportAliasDuplicateAlias"); }
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >a : () => void
 
@@ -56,9 +57,9 @@
 ->exports : typeof module.exports
 ->apply : any
 +>module.exports.apply : undefined
-+>module.exports : typeof import("moduleExportAliasDuplicateAlias")
-+>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("moduleExportAliasDuplicateAlias"); }
-+>exports : typeof import("moduleExportAliasDuplicateAlias")
++>module.exports : typeof import("./moduleExportAliasDuplicateAlias")
++>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("./moduleExportAliasDuplicateAlias"); }
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >a : () => void
 
@@ -71,7 +72,7 @@
 ->apply : () => void
 +>module.exports.apply() : any
 +>module.exports.apply : undefined
-+>module.exports : typeof import("moduleExportAliasDuplicateAlias")
-+>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("moduleExportAliasDuplicateAlias"); }
-+>exports : typeof import("moduleExportAliasDuplicateAlias")
++>module.exports : typeof import("./moduleExportAliasDuplicateAlias")
++>module : { "\"moduleExportAliasDuplicateAlias\"": typeof import("./moduleExportAliasDuplicateAlias"); }
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias3.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias3.types.diff
index f262f89e7f..eaf355aace 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias3.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias3.types.diff
@@ -5,8 +5,9 @@
  === test.js ===
  const { apply } = require('./moduleExportAliasDuplicateAlias')
 ->apply : number
+->require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
 +>apply : undefined
- >require('./moduleExportAliasDuplicateAlias') : typeof import("moduleExportAliasDuplicateAlias")
++>require('./moduleExportAliasDuplicateAlias') : typeof import("./moduleExportAliasDuplicateAlias")
  >require : any
  >'./moduleExportAliasDuplicateAlias' : "./moduleExportAliasDuplicateAlias"
 
@@ -26,18 +27,20 @@
  exports.apply = undefined;
  >exports.apply = undefined : undefined
 ->exports.apply : "ok" | 1 | (() => void) | undefined
-+>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
+->exports : typeof import("moduleExportAliasDuplicateAlias")
 ->apply : "ok" | 1 | (() => void) | undefined
++>exports.apply : undefined
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >undefined : undefined
 
  exports.apply = undefined;
  >exports.apply = undefined : undefined
 ->exports.apply : "ok" | 1 | (() => void) | undefined
-+>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
+->exports : typeof import("moduleExportAliasDuplicateAlias")
 ->apply : "ok" | 1 | (() => void) | undefined
++>exports.apply : undefined
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >undefined : undefined
 
@@ -47,27 +50,30 @@
  exports.apply = a;
  >exports.apply = a : () => void
 ->exports.apply : "ok" | 1 | (() => void) | undefined
-+>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
+->exports : typeof import("moduleExportAliasDuplicateAlias")
 ->apply : "ok" | 1 | (() => void) | undefined
++>exports.apply : undefined
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >a : () => void
 
  exports.apply()
 ->exports.apply() : void
 ->exports.apply : () => void
+->exports : typeof import("moduleExportAliasDuplicateAlias")
+->apply : () => void
 +>exports.apply() : any
 +>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
-->apply : () => void
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
 
  exports.apply = 'ok'
  >exports.apply = 'ok' : "ok"
 ->exports.apply : "ok" | 1 | (() => void) | undefined
-+>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
+->exports : typeof import("moduleExportAliasDuplicateAlias")
 ->apply : "ok" | 1 | (() => void) | undefined
++>exports.apply : undefined
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >'ok' : "ok"
 
@@ -76,21 +82,23 @@
 ->exports.apply.toUpperCase() : string
 ->exports.apply.toUpperCase : () => string
 ->exports.apply : "ok"
+->exports : typeof import("moduleExportAliasDuplicateAlias")
+->apply : "ok"
+->toUpperCase : () => string
 +>OK : any
 +>exports.apply.toUpperCase() : any
 +>exports.apply.toUpperCase : any
 +>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
-->apply : "ok"
-->toUpperCase : () => string
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
 +>toUpperCase : any
 
  exports.apply = 1
  >exports.apply = 1 : 1
 ->exports.apply : "ok" | 1 | (() => void) | undefined
-+>exports.apply : undefined
- >exports : typeof import("moduleExportAliasDuplicateAlias")
+->exports : typeof import("moduleExportAliasDuplicateAlias")
 ->apply : "ok" | 1 | (() => void) | undefined
++>exports.apply : undefined
++>exports : typeof import("./moduleExportAliasDuplicateAlias")
 +>apply : undefined
  >1 : 1
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportNestedNamespaces.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportNestedNamespaces.types.diff
index 9388f3a3bd..43b439dc11 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportNestedNamespaces.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportNestedNamespaces.types.diff
@@ -12,9 +12,9 @@
 ->n : typeof n
 +>module.exports.n = {} : {}
 +>module.exports.n : {}
-+>module.exports : typeof import("mod")
-+>module : { "\"mod\"": typeof import("mod"); }
-+>exports : typeof import("mod")
++>module.exports : typeof import("./mod")
++>module : { "\"mod\"": typeof import("./mod"); }
++>exports : typeof import("./mod")
 +>n : {}
  >{} : {}
 
@@ -32,9 +32,9 @@
 +>module.exports.n.K = function C() {    this.x = 10;} : () => void
 +>module.exports.n.K : any
 +>module.exports.n : {}
-+>module.exports : typeof import("mod")
-+>module : { "\"mod\"": typeof import("mod"); }
-+>exports : typeof import("mod")
++>module.exports : typeof import("./mod")
++>module : { "\"mod\"": typeof import("./mod"); }
++>exports : typeof import("./mod")
 +>n : {}
 +>K : any
 +>function C() {    this.x = 10;} : () => void
@@ -54,9 +54,9 @@
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("mod")
-+>module : { "\"mod\"": typeof import("mod"); }
-+>exports : typeof import("mod")
++>module.exports : typeof import("./mod")
++>module : { "\"mod\"": typeof import("./mod"); }
++>exports : typeof import("./mod")
  >Classic : typeof Classic
  >class {    constructor() {        this.p = 1    }} : typeof Classic
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsAliasLoop1.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsAliasLoop1.types.diff
new file mode 100644
index 0000000000..9016c53dcf
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsAliasLoop1.types.diff
@@ -0,0 +1,18 @@
+--- old.moduleExportsAliasLoop1.types
++++ new.moduleExportsAliasLoop1.types
+@@= skipped -3, +3 lines =@@
+ exports.fn1();
+ >exports.fn1() : any
+ >exports.fn1 : any
+->exports : typeof import("x")
++>exports : typeof import("./x")
+ >fn1 : any
+
+ exports.fn2 = Math.min;
+ >exports.fn2 = Math.min : (...values: number[]) => number
+ >exports.fn2 : (...values: number[]) => number
+->exports : typeof import("x")
++>exports : typeof import("./x")
+ >fn2 : (...values: number[]) => number
+ >Math.min : (...values: number[]) => number
+ >Math : Math
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsAliasLoop2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsAliasLoop2.types.diff
new file mode 100644
index 0000000000..66318fd182
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsAliasLoop2.types.diff
@@ -0,0 +1,18 @@
+--- old.moduleExportsAliasLoop2.types
++++ new.moduleExportsAliasLoop2.types
+@@= skipped -9, +9 lines =@@
+ exports.fn1();
+ >exports.fn1() : any
+ >exports.fn1 : any
+->exports : typeof import("x")
++>exports : typeof import("./x")
+ >fn1 : any
+
+ exports.fn2 = Foo.min;
+ >exports.fn2 = Foo.min : number
+ >exports.fn2 : number
+->exports : typeof import("x")
++>exports : typeof import("./x")
+ >fn2 : number
+ >Foo.min : number
+ >Foo : { min: number; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsElementAccessAssignment.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsElementAccessAssignment.types.diff
index 33c8967a36..af3ced87ac 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsElementAccessAssignment.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportsElementAccessAssignment.types.diff
@@ -23,16 +23,43 @@
 
  mod1.default;
  >mod1.default : { x: string; }
-@@= skipped -47, +47 lines =@@
+@@= skipped -20, +20 lines =@@
+ exports.a = { x: "x" };
+ >exports.a = { x: "x" } : { x: string; }
+ >exports.a : { x: string; }
+->exports : typeof import("mod1")
++>exports : typeof import("./mod1")
+ >a : { x: string; }
+ >{ x: "x" } : { x: string; }
+ >x : string
+@@= skipped -9, +9 lines =@@
+ exports["b"] = { x: "x" };
+ >exports["b"] = { x: "x" } : { x: string; }
+ >exports["b"] : { x: string; }
+->exports : typeof import("mod1")
++>exports : typeof import("./mod1")
+ >"b" : "b"
+ >{ x: "x" } : { x: string; }
+ >x : string
+@@= skipped -9, +9 lines =@@
+ exports["default"] = { x: "x" };
+ >exports["default"] = { x: "x" } : { x: string; }
+ >exports["default"] : { x: string; }
+->exports : typeof import("mod1")
++>exports : typeof import("./mod1")
+ >"default" : "default"
+ >{ x: "x" } : { x: string; }
+ >x : string
+@@= skipped -9, +9 lines =@@
  module.exports["c"] = { x: "x" };
  >module.exports["c"] = { x: "x" } : { x: string; }
  >module.exports["c"] : { x: string; }
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("mod1")
-+>module : { "\"mod1\"": typeof import("mod1"); }
-+>exports : typeof import("mod1")
++>module.exports : typeof import("./mod1")
++>module : { "\"mod1\"": typeof import("./mod1"); }
++>exports : typeof import("./mod1")
  >"c" : "c"
  >{ x: "x" } : { x: string; }
  >x : string
@@ -45,8 +72,8 @@
 ->module : { exports: typeof module.exports; }
 +>module["exports"]["d"] = {} : {}
 +>module["exports"]["d"] : {}
-+>module["exports"] : typeof import("mod1")
-+>module : { "\"mod1\"": typeof import("mod1"); }
++>module["exports"] : typeof import("./mod1")
++>module : { "\"mod1\"": typeof import("./mod1"); }
  >"exports" : "exports"
  >"d" : "d"
  >{} : {}
@@ -59,8 +86,8 @@
 ->module : { exports: typeof module.exports; }
 +>module["exports"]["d"].e : any
 +>module["exports"]["d"] : {}
-+>module["exports"] : typeof import("mod1")
-+>module : { "\"mod1\"": typeof import("mod1"); }
++>module["exports"] : typeof import("./mod1")
++>module : { "\"mod1\"": typeof import("./mod1"); }
  >"exports" : "exports"
  >"d" : "d"
 ->e : number
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nestedDestructuringOfRequire.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nestedDestructuringOfRequire.types.diff
index 935c53cfca..7ba795acec 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nestedDestructuringOfRequire.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nestedDestructuringOfRequire.types.diff
@@ -1,14 +1,23 @@
 --- old.nestedDestructuringOfRequire.types
 +++ new.nestedDestructuringOfRequire.types
-@@= skipped -29, +29 lines =@@
+@@= skipped -6, +6 lines =@@
+ >grey : {}
+
+ } = require('./mod1');
+->require('./mod1') : typeof import("mod1")
++>require('./mod1') : typeof import("./mod1")
+ >require : any
+ >'./mod1' : "./mod1"
+
+@@= skipped -23, +23 lines =@@
  module.exports.chalk = chalk
  >module.exports.chalk = chalk : { grey: {}; }
  >module.exports.chalk : { grey: {}; }
 ->module.exports : typeof module.exports
 ->module : { exports: typeof module.exports; }
 ->exports : typeof module.exports
-+>module.exports : typeof import("mod1")
-+>module : { "\"mod1\"": typeof import("mod1"); }
-+>exports : typeof import("mod1")
++>module.exports : typeof import("./mod1")
++>module : { "\"mod1\"": typeof import("./mod1"); }
++>exports : typeof import("./mod1")
  >chalk : { grey: {}; }
  >chalk : { grey: {}; }
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node16).types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node16).types.diff
index 6a61945545..09fc780471 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node16).types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node16).types.diff
@@ -1,6 +1,13 @@
 --- old.nodeModulesAllowJsCjsFromJs(module=node16).types
 +++ new.nodeModulesAllowJsCjsFromJs(module=node16).types
-@@= skipped -9, +9 lines =@@
+@@= skipped -3, +3 lines =@@
+ exports.foo = "foo"
+ >exports.foo = "foo" : "foo"
+ >exports.foo : "foo"
+->exports : typeof import("foo")
++>exports : typeof import("./foo.cjs")
+ >foo : "foo"
+ >"foo" : "foo"
 
  === bar.ts ===
  import foo from "./foo.cjs"
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node18).types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node18).types.diff
index 864c2f587d..646fc9886b 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node18).types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node18).types.diff
@@ -1,6 +1,13 @@
 --- old.nodeModulesAllowJsCjsFromJs(module=node18).types
 +++ new.nodeModulesAllowJsCjsFromJs(module=node18).types
-@@= skipped -9, +9 lines =@@
+@@= skipped -3, +3 lines =@@
+ exports.foo = "foo"
+ >exports.foo = "foo" : "foo"
+ >exports.foo : "foo"
+->exports : typeof import("foo")
++>exports : typeof import("./foo.cjs")
+ >foo : "foo"
+ >"foo" : "foo"
 
  === bar.ts ===
  import foo from "./foo.cjs"
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).types.diff
index 336e608daa..33b0625bfc 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=nodenext).types.diff
@@ -1,6 +1,13 @@
 --- old.nodeModulesAllowJsCjsFromJs(module=nodenext).types
 +++ new.nodeModulesAllowJsCjsFromJs(module=nodenext).types
-@@= skipped -9, +9 lines =@@
+@@= skipped -3, +3 lines =@@
+ exports.foo = "foo"
+ >exports.foo = "foo" : "foo"
+ >exports.foo : "foo"
+->exports : typeof import("foo")
++>exports : typeof import("./foo.cjs")
+ >foo : "foo"
+ >"foo" : "foo"
 
  === bar.ts ===
  import foo from "./foo.cjs"
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/paramTagOnCallExpression.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/paramTagOnCallExpression.types.diff
new file mode 100644
index 0000000000..7445943d2d
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/paramTagOnCallExpression.types.diff
@@ -0,0 +1,11 @@
+--- old.paramTagOnCallExpression.types
++++ new.paramTagOnCallExpression.types
+@@= skipped -10, +10 lines =@@
+ exports.inherits = factory('inherits')
+ >exports.inherits = factory('inherits') : {}
+ >exports.inherits : {}
+->exports : typeof import("a")
++>exports : typeof import("./a")
+ >inherits : {}
+ >factory('inherits') : {}
+ >factory : (type: string) => {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/requireAssertsFromTypescript.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/requireAssertsFromTypescript.types.diff
new file mode 100644
index 0000000000..d4a7a39898
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/requireAssertsFromTypescript.types.diff
@@ -0,0 +1,10 @@
+--- old.requireAssertsFromTypescript.types
++++ new.requireAssertsFromTypescript.types
+@@= skipped -2, +2 lines =@@
+ === 38379.js ===
+ const { art } = require('./ex')
+ >art : (value: any, message?: string | Error) => asserts value
+->require('./ex') : typeof import("ex")
++>require('./ex') : typeof import("./ex")
+ >require : any
+ >'./ex' : "./ex"
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/requireOfESWithPropertyAccess.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/requireOfESWithPropertyAccess.types.diff
new file mode 100644
index 0000000000..569633d59b
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/requireOfESWithPropertyAccess.types.diff
@@ -0,0 +1,11 @@
+--- old.requireOfESWithPropertyAccess.types
++++ new.requireOfESWithPropertyAccess.types
+@@= skipped -3, +3 lines =@@
+ const x = require('./ch').x
+ >x : { grey: {}; }
+ >require('./ch').x : { grey: {}; }
+->require('./ch') : typeof import("ch")
++>require('./ch') : typeof import("./ch")
+ >require : any
+ >'./ch' : "./ch"
+ >x : { grey: {}; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/selfNameModuleAugmentation.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/selfNameModuleAugmentation.types.diff
new file mode 100644
index 0000000000..c9f6f5f0e2
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/selfNameModuleAugmentation.types.diff
@@ -0,0 +1,11 @@
+--- old.selfNameModuleAugmentation.types
++++ new.selfNameModuleAugmentation.types
+@@= skipped -2, +2 lines =@@
+ === /node_modules/acorn-walk/dist/walk.d.ts ===
+ export {};
+ declare module 'acorn-walk' {
+->'acorn-walk' : typeof import("/node_modules/acorn-walk/dist/walk")
++>'acorn-walk' : typeof import("acorn-walk")
+
+   export function simple(node: any, visitors: any, base?: any, state?: any): any;
+ >simple : (node: any, visitors: any, base?: any, state?: any) => any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typeFromParamTagForFunction.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typeFromParamTagForFunction.types.diff
index 46e193b3c9..c14cabc5de 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/typeFromParamTagForFunction.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/typeFromParamTagForFunction.types.diff
@@ -6,11 +6,12 @@
  exports.A = function () {
 ->exports.A = function () {    this.x = 1;} : typeof A
 ->exports.A : typeof A
-+>exports.A = function () {    this.x = 1;} : () => void
-+>exports.A : () => void
- >exports : typeof import("a-ext")
+->exports : typeof import("a-ext")
 ->A : typeof A
 ->function () {    this.x = 1;} : typeof A
++>exports.A = function () {    this.x = 1;} : () => void
++>exports.A : () => void
++>exports : typeof import("./a-ext")
 +>A : () => void
 +>function () {    this.x = 1;} : () => void
 
@@ -27,10 +28,12 @@
  === a.js ===
  const { A } = require("./a-ext");
 ->A : typeof A
+->require("./a-ext") : typeof import("a-ext")
 +>A : () => void
- >require("./a-ext") : typeof import("a-ext")
++>require("./a-ext") : typeof import("./a-ext")
  >require : (id: string) => any
  >"./a-ext" : "./a-ext"
+
 @@= skipped -9, +9 lines =@@
  function a(p) { p.x; }
  >a : (p: A) => void
@@ -43,7 +46,23 @@
 
  === b-ext.js ===
  exports.B = class {
-@@= skipped -33, +33 lines =@@
+ >exports.B = class {    constructor() {        this.x = 1;    }} : typeof B
+ >exports.B : typeof B
+->exports : typeof import("b-ext")
++>exports : typeof import("./b-ext")
+ >B : typeof B
+ >class {    constructor() {        this.x = 1;    }} : typeof B
+
+@@= skipped -25, +25 lines =@@
+ === b.js ===
+ const { B } = require("./b-ext");
+ >B : typeof B
+->require("./b-ext") : typeof import("b-ext")
++>require("./b-ext") : typeof import("./b-ext")
+ >require : (id: string) => any
+ >"./b-ext" : "./b-ext"
+
+@@= skipped -8, +8 lines =@@
  function b(p) { p.x; }
  >b : (p: B) => void
  >p : B
@@ -70,10 +89,12 @@
  === c.js ===
  const { C } = require("./c-ext");
 ->C : typeof C
+->require("./c-ext") : typeof import("c-ext")
 +>C : () => void
- >require("./c-ext") : typeof import("c-ext")
++>require("./c-ext") : typeof import("./c-ext")
  >require : (id: string) => any
  >"./c-ext" : "./c-ext"
+
 @@= skipped -27, +27 lines =@@
  function c(p) { p.x; }
  >c : (p: C) => void
@@ -104,10 +125,12 @@
  === d.js ===
  const { D } = require("./d-ext");
 ->D : typeof D
+->require("./d-ext") : typeof import("d-ext")
 +>D : () => void
- >require("./d-ext") : typeof import("d-ext")
++>require("./d-ext") : typeof import("./d-ext")
  >require : (id: string) => any
  >"./d-ext" : "./d-ext"
+
 @@= skipped -9, +9 lines =@@
  function d(p) { p.x; }
  >d : (p: D) => void
@@ -120,7 +143,16 @@
 
  === e-ext.js ===
  export class E {
-@@= skipped -35, +35 lines =@@
+@@= skipped -21, +21 lines =@@
+ === e.js ===
+ const { E } = require("./e-ext");
+ >E : typeof E
+->require("./e-ext") : typeof import("e-ext")
++>require("./e-ext") : typeof import("./e-ext")
+ >require : (id: string) => any
+ >"./e-ext" : "./e-ext"
+
+@@= skipped -14, +14 lines =@@
 
  === f.js ===
  var F = function () {
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typedefCrossModule.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typedefCrossModule.types.diff
index a35eb7c1b9..eab0e74fa6 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/typedefCrossModule.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/typedefCrossModule.types.diff
@@ -48,11 +48,12 @@
  exports.C = function() {
 ->exports.C = function() {    this.p = 1} : typeof C
 ->exports.C : typeof C
-+>exports.C = function() {    this.p = 1} : () => void
-+>exports.C : () => void
- >exports : typeof import("mod3")
+->exports : typeof import("mod3")
 ->C : typeof C
 ->function() {    this.p = 1} : typeof C
++>exports.C = function() {    this.p = 1} : () => void
++>exports.C : () => void
++>exports : typeof import("./mod3")
 +>C : () => void
 +>function() {    this.p = 1} : () => void
 
@@ -81,14 +82,16 @@
 
  /** @type {import('./mod2').Both} */
  var both2 = both1;
- >both2 : import("mod2").Both
+->both2 : import("mod2").Both
 ->both1 : import("mod1").A
++>both2 : import("./mod2").Both
 +>both1 : any
 
  /** @type {import('./mod3').Both} */
  var both3 = both2;
- >both3 : import("mod3").Both
+->both3 : import("mod3").Both
 ->both2 : import("mod2").A
-+>both2 : import("mod2").Both
++>both3 : import("./mod3").Both
++>both2 : import("./mod2").Both
 
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typedefCrossModule2.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typedefCrossModule2.types.diff
index 177416b72c..f33a595b97 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/typedefCrossModule2.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/typedefCrossModule2.types.diff
@@ -38,7 +38,7 @@
 ->exports : { Bar: typeof Bar; Baz: typeof Baz; Quid: 2; Quack?: undefined; } | { Bar: typeof Bar; Baz?: undefined; Quid: 2; Quack: number; }
 ->Bar : typeof Bar
 +>exports.Bar : any
-+>exports : typeof import("mod1")
++>exports : typeof import("./mod1")
 +>Bar : any
  >class { } : typeof Bar
 
@@ -63,7 +63,7 @@
 ->exports : { Bar: typeof Bar; Baz: typeof Baz; Quid: 2; Quack?: undefined; } | { Bar: typeof Bar; Baz?: undefined; Quid: 2; Quack: number; }
 ->Quid : 2
 +>exports.Quid : any
-+>exports : typeof import("mod1")
++>exports : typeof import("./mod1")
 +>Quid : any
  >2 : 2
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/untypedModuleImport_allowJs.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/untypedModuleImport_allowJs.types.diff
new file mode 100644
index 0000000000..24172272bd
--- /dev/null
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/untypedModuleImport_allowJs.types.diff
@@ -0,0 +1,11 @@
+--- old.untypedModuleImport_allowJs.types
++++ new.untypedModuleImport_allowJs.types
+@@= skipped -13, +13 lines =@@
+ exports.default = { bar() { return 0; } }
+ >exports.default = { bar() { return 0; } } : { bar(): number; }
+ >exports.default : { bar(): number; }
+->exports : typeof import("/node_modules/foo/index")
++>exports : typeof import("foo")
+ >default : { bar(): number; }
+ >{ bar() { return 0; } } : { bar(): number; }
+ >bar : () => number
\ No newline at end of file

From e129f20ad368d01aa4ac1a684096c449bce3a2a3 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Sun, 5 Oct 2025 22:52:06 -0700
Subject: [PATCH 2/2] Update baselines

---
 ...lesAllowJsCjsFromJs(module=node20).symbols |   2 +-
 ...lowJsCjsFromJs(module=node20).symbols.diff |   2 +-
 ...dulesAllowJsCjsFromJs(module=node20).types |   2 +-
 ...tWithPackageExports(module=node20).symbols |  36 ++---
 ...PackageExports(module=node20).symbols.diff | 106 +++++++++++++
 ...ortWithPackageExports(module=node20).types |  96 ++++++------
 ...thPackageExports(module=node20).types.diff | 141 ++++++++++++++++--
 ...SpecifierResolution(module=node20).symbols |   2 +-
 ...fierResolution(module=node20).symbols.diff |  11 ++
 ...ksSpecifierResolution(module=node20).types |  16 +-
 ...cifierResolution(module=node20).types.diff |  30 ++++
 ...ulesExportsSourceTs(module=node20).symbols |   2 +-
 ...xportsSourceTs(module=node20).symbols.diff |  11 ++
 ...odulesExportsSourceTs(module=node20).types |  20 +--
 ...sExportsSourceTs(module=node20).types.diff |  36 +++++
 ...enerationConditions(module=node20).symbols |   2 +-
 ...tionConditions(module=node20).symbols.diff |  11 ++
 ...rGenerationConditions(module=node20).types |  16 +-
 ...rationConditions(module=node20).types.diff |  30 ++++
 ...GenerationDirectory(module=node20).symbols |   2 +-
 ...ationDirectory(module=node20).symbols.diff |  11 ++
 ...erGenerationDirectory(module=node20).types |  16 +-
 ...erationDirectory(module=node20).types.diff |  30 ++++
 ...erGenerationPattern(module=node20).symbols |   2 +-
 ...erationPattern(module=node20).symbols.diff |  11 ++
 ...fierGenerationPattern(module=node20).types |  16 +-
 ...enerationPattern(module=node20).types.diff |  30 ++++
 ...peModeDeclarationEmit(module=node20).types |  12 +-
 ...eDeclarationEmit(module=node20).types.diff |  24 +++
 ...clarationEmitErrors(module=node20).symbols |   6 +-
 ...tionEmitErrors(module=node20).symbols.diff |  29 ++++
 ...DeclarationEmitErrors(module=node20).types |  30 ++--
 ...rationEmitErrors(module=node20).types.diff |  77 ++++++++++
 ...eModeDeclarationEmit1(module=node20).types |  12 +-
 ...DeclarationEmit1(module=node20).types.diff |  24 +++
 ...larationEmitErrors1(module=node20).symbols |   6 +-
 ...ionEmitErrors1(module=node20).symbols.diff |  29 ++++
 ...eclarationEmitErrors1(module=node20).types |  30 ++--
 ...ationEmitErrors1(module=node20).types.diff |  77 ++++++++++
 ...eOnlyESMImportFromCJS(module=node20).types |   6 +-
 ...ESMImportFromCJS(module=node20).types.diff |   6 +-
 ...AllowJsCjsFromJs(module=node20).types.diff |   9 +-
 42 files changed, 880 insertions(+), 187 deletions(-)
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node20).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types.diff

diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).symbols
index e0dacb4026..2409e80c9c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).symbols
@@ -3,7 +3,7 @@
 === foo.cjs ===
 exports.foo = "foo"
 >exports.foo : Symbol(foo, Decl(foo.cjs, 0, 0))
->exports : Symbol("foo", Decl(foo.cjs, 0, 0))
+>exports : Symbol("./foo.cjs", Decl(foo.cjs, 0, 0))
 >foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 
 === bar.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).symbols.diff
index 1fb8a2a304..75442105f7 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).symbols.diff
@@ -5,7 +5,7 @@
  exports.foo = "foo"
  >exports.foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 ->exports : Symbol(foo, Decl(foo.cjs, 0, 0))
-+>exports : Symbol("foo", Decl(foo.cjs, 0, 0))
++>exports : Symbol("./foo.cjs", Decl(foo.cjs, 0, 0))
  >foo : Symbol(foo, Decl(foo.cjs, 0, 0))
 
  === bar.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).types
index 44070dc13f..a8044fc0bb 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsCjsFromJs(module=node20).types
@@ -4,7 +4,7 @@
 exports.foo = "foo"
 >exports.foo = "foo" : "foo"
 >exports.foo : "foo"
->exports : typeof import("foo")
+>exports : typeof import("./foo.cjs")
 >foo : "foo"
 >"foo" : "foo"
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols
index 653778e00a..8d0c6e1c7e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols
@@ -16,85 +16,85 @@ export {};
 // esm format file
 export const a = await import("package/cjs");
 >a : Symbol(a, Decl(other.ts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("./index.cts", Decl(index.cts, 0, 0))
 
 export const b = await import("package/mjs");
 >b : Symbol(b, Decl(other.ts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("./index.mts", Decl(index.mts, 0, 0))
 
 export const c = await import("package");
 >c : Symbol(c, Decl(other.ts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol(".", Decl(index.ts, 0, 0))
 
 export const f = await import("inner");
 >f : Symbol(f, Decl(other.ts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.ts ===
 // esm format file
 export const d = await import("inner/cjs");
 >d : Symbol(d, Decl(other2.ts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = await import("inner/mjs");
 >e : Symbol(e, Decl(other2.ts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === other.mts ===
 // esm format file
 export const a = await import("package/cjs");
 >a : Symbol(a, Decl(other.mts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
 
 export const b = await import("package/mjs");
 >b : Symbol(b, Decl(other.mts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
 
 export const c = await import("package");
 >c : Symbol(c, Decl(other.mts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol("package", Decl(index.ts, 0, 0))
 
 export const f = await import("inner");
 >f : Symbol(f, Decl(other.mts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.mts ===
 // esm format file
 export const d = await import("inner/cjs");
 >d : Symbol(d, Decl(other2.mts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = await import("inner/mjs");
 >e : Symbol(e, Decl(other2.mts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === other.cts ===
 // cjs format file, no TLA
 export const a = import("package/cjs");
 >a : Symbol(a, Decl(other.cts, 1, 12))
->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
+>"package/cjs" : Symbol("./index.cts", Decl(index.cts, 0, 0))
 
 export const b = import("package/mjs");
 >b : Symbol(b, Decl(other.cts, 2, 12))
->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
+>"package/mjs" : Symbol("./index.mts", Decl(index.mts, 0, 0))
 
 export const c = import("package");
 >c : Symbol(c, Decl(other.cts, 3, 12))
->"package" : Symbol("index", Decl(index.ts, 0, 0))
+>"package" : Symbol(".", Decl(index.ts, 0, 0))
 
 export const f = import("inner");
 >f : Symbol(f, Decl(other.cts, 4, 12))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 
 === other2.cts ===
 // cjs format file, no TLA
 export const d = import("inner/cjs");
 >d : Symbol(d, Decl(other2.cts, 1, 12))
->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
+>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
 
 export const e = import("inner/mjs");
 >e : Symbol(e, Decl(other2.cts, 2, 12))
->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
+>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
 
 === node_modules/inner/index.d.ts ===
 // cjs format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols.diff
new file mode 100644
index 0000000000..2581d78374
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols.diff
@@ -0,0 +1,106 @@
+--- old.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols
++++ new.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).symbols
+@@= skipped -15, +15 lines =@@
+ // esm format file
+ export const a = await import("package/cjs");
+ >a : Symbol(a, Decl(other.ts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("./index.cts", Decl(index.cts, 0, 0))
+
+ export const b = await import("package/mjs");
+ >b : Symbol(b, Decl(other.ts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("./index.mts", Decl(index.mts, 0, 0))
+
+ export const c = await import("package");
+ >c : Symbol(c, Decl(other.ts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol(".", Decl(index.ts, 0, 0))
+
+ export const f = await import("inner");
+ >f : Symbol(f, Decl(other.ts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.ts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+ >d : Symbol(d, Decl(other2.ts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = await import("inner/mjs");
+ >e : Symbol(e, Decl(other2.ts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === other.mts ===
+ // esm format file
+ export const a = await import("package/cjs");
+ >a : Symbol(a, Decl(other.mts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("package/cjs", Decl(index.cts, 0, 0))
+
+ export const b = await import("package/mjs");
+ >b : Symbol(b, Decl(other.mts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("package/mjs", Decl(index.mts, 0, 0))
+
+ export const c = await import("package");
+ >c : Symbol(c, Decl(other.mts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol("package", Decl(index.ts, 0, 0))
+
+ export const f = await import("inner");
+ >f : Symbol(f, Decl(other.mts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.mts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+ >d : Symbol(d, Decl(other2.mts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = await import("inner/mjs");
+ >e : Symbol(e, Decl(other2.mts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === other.cts ===
+ // cjs format file, no TLA
+ export const a = import("package/cjs");
+ >a : Symbol(a, Decl(other.cts, 1, 12))
+->"package/cjs" : Symbol("index", Decl(index.cts, 0, 0))
++>"package/cjs" : Symbol("./index.cts", Decl(index.cts, 0, 0))
+
+ export const b = import("package/mjs");
+ >b : Symbol(b, Decl(other.cts, 2, 12))
+->"package/mjs" : Symbol("index", Decl(index.mts, 0, 0))
++>"package/mjs" : Symbol("./index.mts", Decl(index.mts, 0, 0))
+
+ export const c = import("package");
+ >c : Symbol(c, Decl(other.cts, 3, 12))
+->"package" : Symbol("index", Decl(index.ts, 0, 0))
++>"package" : Symbol(".", Decl(index.ts, 0, 0))
+
+ export const f = import("inner");
+ >f : Symbol(f, Decl(other.cts, 4, 12))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+
+ === other2.cts ===
+ // cjs format file, no TLA
+ export const d = import("inner/cjs");
+ >d : Symbol(d, Decl(other2.cts, 1, 12))
+->"inner/cjs" : Symbol("node_modules/inner/index", Decl(index.d.cts, 0, 0))
++>"inner/cjs" : Symbol("inner/cjs", Decl(index.d.cts, 0, 0))
+
+ export const e = import("inner/mjs");
+ >e : Symbol(e, Decl(other2.cts, 2, 12))
+->"inner/mjs" : Symbol("node_modules/inner/index", Decl(index.d.mts, 0, 0))
++>"inner/mjs" : Symbol("inner/mjs", Decl(index.d.mts, 0, 0))
+
+ === node_modules/inner/index.d.ts ===
+ // cjs format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types
index fe65a70478..400b090842 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types
@@ -15,115 +15,115 @@ export {};
 === other.ts ===
 // esm format file
 export const a = await import("package/cjs");
->a : { default: typeof import("index"); }
->await import("package/cjs") : { default: typeof import("index"); }
->import("package/cjs") : Promise<{ default: typeof import("index"); }>
+>a : { default: typeof import("./index.cts"); }
+>await import("package/cjs") : { default: typeof import("./index.cts"); }
+>import("package/cjs") : Promise<{ default: typeof import("./index.cts"); }>
 >"package/cjs" : "package/cjs"
 
 export const b = await import("package/mjs");
->b : typeof import("index")
->await import("package/mjs") : typeof import("index")
->import("package/mjs") : Promise<typeof import("index")>
+>b : typeof import("./index.mts")
+>await import("package/mjs") : typeof import("./index.mts")
+>import("package/mjs") : Promise<typeof import("./index.mts")>
 >"package/mjs" : "package/mjs"
 
 export const c = await import("package");
->c : { default: typeof import("index"); }
->await import("package") : { default: typeof import("index"); }
->import("package") : Promise<{ default: typeof import("index"); }>
+>c : { default: typeof import("."); }
+>await import("package") : { default: typeof import("."); }
+>import("package") : Promise<{ default: typeof import("."); }>
 >"package" : "package"
 
 export const f = await import("inner");
->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
+>f : { cjsMain: true; default: typeof import("inner"); }
+>await import("inner") : { cjsMain: true; default: typeof import("inner"); }
+>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
 >"inner" : "inner"
 
 === other2.ts ===
 // esm format file
 export const d = await import("inner/cjs");
->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
+>d : { cjsNonmain: true; default: typeof import("inner/cjs"); }
+>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("inner/cjs"); }
+>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
 >"inner/cjs" : "inner/cjs"
 
 export const e = await import("inner/mjs");
->e : typeof import("node_modules/inner/index")
->await import("inner/mjs") : typeof import("node_modules/inner/index")
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
+>e : typeof import("inner/mjs")
+>await import("inner/mjs") : typeof import("inner/mjs")
+>import("inner/mjs") : Promise<typeof import("inner/mjs")>
 >"inner/mjs" : "inner/mjs"
 
 === other.mts ===
 // esm format file
 export const a = await import("package/cjs");
->a : { default: typeof import("index"); }
->await import("package/cjs") : { default: typeof import("index"); }
->import("package/cjs") : Promise<{ default: typeof import("index"); }>
+>a : { default: typeof import("package/cjs"); }
+>await import("package/cjs") : { default: typeof import("package/cjs"); }
+>import("package/cjs") : Promise<{ default: typeof import("package/cjs"); }>
 >"package/cjs" : "package/cjs"
 
 export const b = await import("package/mjs");
->b : typeof import("index")
->await import("package/mjs") : typeof import("index")
->import("package/mjs") : Promise<typeof import("index")>
+>b : typeof import("package/mjs")
+>await import("package/mjs") : typeof import("package/mjs")
+>import("package/mjs") : Promise<typeof import("package/mjs")>
 >"package/mjs" : "package/mjs"
 
 export const c = await import("package");
->c : { default: typeof import("index"); }
->await import("package") : { default: typeof import("index"); }
->import("package") : Promise<{ default: typeof import("index"); }>
+>c : { default: typeof import("package"); }
+>await import("package") : { default: typeof import("package"); }
+>import("package") : Promise<{ default: typeof import("package"); }>
 >"package" : "package"
 
 export const f = await import("inner");
->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
+>f : { cjsMain: true; default: typeof import("inner"); }
+>await import("inner") : { cjsMain: true; default: typeof import("inner"); }
+>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
 >"inner" : "inner"
 
 === other2.mts ===
 // esm format file
 export const d = await import("inner/cjs");
->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
+>d : { cjsNonmain: true; default: typeof import("inner/cjs"); }
+>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("inner/cjs"); }
+>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
 >"inner/cjs" : "inner/cjs"
 
 export const e = await import("inner/mjs");
->e : typeof import("node_modules/inner/index")
->await import("inner/mjs") : typeof import("node_modules/inner/index")
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
+>e : typeof import("inner/mjs")
+>await import("inner/mjs") : typeof import("inner/mjs")
+>import("inner/mjs") : Promise<typeof import("inner/mjs")>
 >"inner/mjs" : "inner/mjs"
 
 === other.cts ===
 // cjs format file, no TLA
 export const a = import("package/cjs");
->a : Promise<{ default: typeof import("index"); }>
->import("package/cjs") : Promise<{ default: typeof import("index"); }>
+>a : Promise<{ default: typeof import("./index.cts"); }>
+>import("package/cjs") : Promise<{ default: typeof import("./index.cts"); }>
 >"package/cjs" : "package/cjs"
 
 export const b = import("package/mjs");
->b : Promise<typeof import("index")>
->import("package/mjs") : Promise<typeof import("index")>
+>b : Promise<typeof import("./index.mts")>
+>import("package/mjs") : Promise<typeof import("./index.mts")>
 >"package/mjs" : "package/mjs"
 
 export const c = import("package");
->c : Promise<{ default: typeof import("index"); }>
->import("package") : Promise<{ default: typeof import("index"); }>
+>c : Promise<{ default: typeof import("."); }>
+>import("package") : Promise<{ default: typeof import("."); }>
 >"package" : "package"
 
 export const f = import("inner");
->f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
+>f : Promise<{ cjsMain: true; default: typeof import("inner"); }>
+>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
 >"inner" : "inner"
 
 === other2.cts ===
 // cjs format file, no TLA
 export const d = import("inner/cjs");
->d : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
+>d : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
+>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
 >"inner/cjs" : "inner/cjs"
 
 export const e = import("inner/mjs");
->e : Promise<typeof import("node_modules/inner/index")>
->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
+>e : Promise<typeof import("inner/mjs")>
+>import("inner/mjs") : Promise<typeof import("inner/mjs")>
 >"inner/mjs" : "inner/mjs"
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types.diff
index b6cb0edebd..840ace488f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types.diff
@@ -1,57 +1,166 @@
 --- old.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types
 +++ new.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node20).types
-@@= skipped -26, +26 lines =@@
+@@= skipped -14, +14 lines =@@
+ === other.ts ===
+ // esm format file
+ export const a = await import("package/cjs");
+->a : { default: typeof import("index"); }
+->await import("package/cjs") : { default: typeof import("index"); }
+->import("package/cjs") : Promise<{ default: typeof import("index"); }>
++>a : { default: typeof import("./index.cts"); }
++>await import("package/cjs") : { default: typeof import("./index.cts"); }
++>import("package/cjs") : Promise<{ default: typeof import("./index.cts"); }>
+ >"package/cjs" : "package/cjs"
+
+ export const b = await import("package/mjs");
+->b : typeof import("index")
+->await import("package/mjs") : typeof import("index")
+->import("package/mjs") : Promise<typeof import("index")>
++>b : typeof import("./index.mts")
++>await import("package/mjs") : typeof import("./index.mts")
++>import("package/mjs") : Promise<typeof import("./index.mts")>
  >"package/mjs" : "package/mjs"
 
  export const c = await import("package");
 ->c : typeof import("index")
 ->await import("package") : typeof import("index")
 ->import("package") : Promise<typeof import("index")>
-+>c : { default: typeof import("index"); }
-+>await import("package") : { default: typeof import("index"); }
-+>import("package") : Promise<{ default: typeof import("index"); }>
++>c : { default: typeof import("."); }
++>await import("package") : { default: typeof import("."); }
++>import("package") : Promise<{ default: typeof import("."); }>
  >"package" : "package"
 
  export const f = await import("inner");
-@@= skipped -40, +40 lines =@@
+->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
+->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
+->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
++>f : { cjsMain: true; default: typeof import("inner"); }
++>await import("inner") : { cjsMain: true; default: typeof import("inner"); }
++>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
+ >"inner" : "inner"
+
+ === other2.ts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
+->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
+->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
++>d : { cjsNonmain: true; default: typeof import("inner/cjs"); }
++>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("inner/cjs"); }
++>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
+ >"inner/cjs" : "inner/cjs"
+
+ export const e = await import("inner/mjs");
+->e : typeof import("node_modules/inner/index")
+->await import("inner/mjs") : typeof import("node_modules/inner/index")
+->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
++>e : typeof import("inner/mjs")
++>await import("inner/mjs") : typeof import("inner/mjs")
++>import("inner/mjs") : Promise<typeof import("inner/mjs")>
+ >"inner/mjs" : "inner/mjs"
+
+ === other.mts ===
+ // esm format file
+ export const a = await import("package/cjs");
+->a : { default: typeof import("index"); }
+->await import("package/cjs") : { default: typeof import("index"); }
+->import("package/cjs") : Promise<{ default: typeof import("index"); }>
++>a : { default: typeof import("package/cjs"); }
++>await import("package/cjs") : { default: typeof import("package/cjs"); }
++>import("package/cjs") : Promise<{ default: typeof import("package/cjs"); }>
+ >"package/cjs" : "package/cjs"
+
+ export const b = await import("package/mjs");
+->b : typeof import("index")
+->await import("package/mjs") : typeof import("index")
+->import("package/mjs") : Promise<typeof import("index")>
++>b : typeof import("package/mjs")
++>await import("package/mjs") : typeof import("package/mjs")
++>import("package/mjs") : Promise<typeof import("package/mjs")>
  >"package/mjs" : "package/mjs"
 
  export const c = await import("package");
 ->c : typeof import("index")
 ->await import("package") : typeof import("index")
 ->import("package") : Promise<typeof import("index")>
-+>c : { default: typeof import("index"); }
-+>await import("package") : { default: typeof import("index"); }
-+>import("package") : Promise<{ default: typeof import("index"); }>
++>c : { default: typeof import("package"); }
++>await import("package") : { default: typeof import("package"); }
++>import("package") : Promise<{ default: typeof import("package"); }>
  >"package" : "package"
 
  export const f = await import("inner");
-@@= skipped -33, +33 lines =@@
+->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
+->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); }
+->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
++>f : { cjsMain: true; default: typeof import("inner"); }
++>await import("inner") : { cjsMain: true; default: typeof import("inner"); }
++>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
+ >"inner" : "inner"
+
+ === other2.mts ===
+ // esm format file
+ export const d = await import("inner/cjs");
+->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
+->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); }
+->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
++>d : { cjsNonmain: true; default: typeof import("inner/cjs"); }
++>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("inner/cjs"); }
++>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
+ >"inner/cjs" : "inner/cjs"
+
+ export const e = await import("inner/mjs");
+->e : typeof import("node_modules/inner/index")
+->await import("inner/mjs") : typeof import("node_modules/inner/index")
+->import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
++>e : typeof import("inner/mjs")
++>await import("inner/mjs") : typeof import("inner/mjs")
++>import("inner/mjs") : Promise<typeof import("inner/mjs")>
+ >"inner/mjs" : "inner/mjs"
+
+ === other.cts ===
+ // cjs format file, no TLA
+ export const a = import("package/cjs");
+->a : Promise<{ default: typeof import("index"); }>
+->import("package/cjs") : Promise<{ default: typeof import("index"); }>
++>a : Promise<{ default: typeof import("./index.cts"); }>
++>import("package/cjs") : Promise<{ default: typeof import("./index.cts"); }>
  >"package/cjs" : "package/cjs"
 
  export const b = import("package/mjs");
 ->b : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
 ->import("package/mjs") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
-+>b : Promise<typeof import("index")>
-+>import("package/mjs") : Promise<typeof import("index")>
++>b : Promise<typeof import("./index.mts")>
++>import("package/mjs") : Promise<typeof import("./index.mts")>
  >"package/mjs" : "package/mjs"
 
  export const c = import("package");
 ->c : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
 ->import("package") : Promise<typeof import("index", { with: { "resolution-mode": "import" } })>
-+>c : Promise<{ default: typeof import("index"); }>
-+>import("package") : Promise<{ default: typeof import("index"); }>
++>c : Promise<{ default: typeof import("."); }>
++>import("package") : Promise<{ default: typeof import("."); }>
  >"package" : "package"
 
  export const f = import("inner");
-@@= skipped -22, +22 lines =@@
+->f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
+->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
++>f : Promise<{ cjsMain: true; default: typeof import("inner"); }>
++>import("inner") : Promise<{ cjsMain: true; default: typeof import("inner"); }>
+ >"inner" : "inner"
+
+ === other2.cts ===
+ // cjs format file, no TLA
+ export const d = import("inner/cjs");
+->d : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
+->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
++>d : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
++>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("inner/cjs"); }>
  >"inner/cjs" : "inner/cjs"
 
  export const e = import("inner/mjs");
 ->e : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
 ->import("inner/mjs") : Promise<typeof import("node_modules/inner/index", { with: { "resolution-mode": "import" } })>
-+>e : Promise<typeof import("node_modules/inner/index")>
-+>import("inner/mjs") : Promise<typeof import("node_modules/inner/index")>
++>e : Promise<typeof import("inner/mjs")>
++>import("inner/mjs") : Promise<typeof import("inner/mjs")>
  >"inner/mjs" : "inner/mjs"
 
  === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols
index 91fce59692..ca9ddf5226 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols.diff
new file mode 100644
index 0000000000..f339d23dcf
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols
++++ new.nodeModulesExportsBlocksSpecifierResolution(module=node20).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).types
index 38c2231bbe..c27029eec3 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("./node_modules/inner/other").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).types.diff
new file mode 100644
index 0000000000..1908fa48b4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksSpecifierResolution(module=node20).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsBlocksSpecifierResolution(module=node20).types
++++ new.nodeModulesExportsBlocksSpecifierResolution(module=node20).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("./node_modules/inner/other").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).symbols
index 1827233096..1800cfa1e6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.ts, 0, 0))
 >x : Symbol(x, Decl(index.ts, 1, 8))
 
 import {a as a2} from "package";
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).symbols.diff
new file mode 100644
index 0000000000..7b91f1a7df
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSourceTs(module=node20).symbols
++++ new.nodeModulesExportsSourceTs(module=node20).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.ts, 0, 0))
+ >x : Symbol(x, Decl(index.ts, 1, 8))
+
+ import {a as a2} from "package";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).types
index e636d618e7..1d77926b2b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).types
@@ -6,23 +6,23 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("./node_modules/inner/other").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other").Thing
 
 import {a as a2} from "package";
->a : import("node_modules/inner/other").Thing
->a2 : import("node_modules/inner/other").Thing
+>a : import("./node_modules/inner/other").Thing
+>a2 : import("./node_modules/inner/other").Thing
 
 === node_modules/inner/index.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).types.diff
new file mode 100644
index 0000000000..cdd083d51d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node20).types.diff
@@ -0,0 +1,36 @@
+--- old.nodeModulesExportsSourceTs(module=node20).types
++++ new.nodeModulesExportsSourceTs(module=node20).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("./node_modules/inner/other").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other").Thing
+
+ import {a as a2} from "package";
+->a : import("node_modules/inner/other").Thing
+->a2 : import("node_modules/inner/other").Thing
++>a : import("./node_modules/inner/other").Thing
++>a2 : import("./node_modules/inner/other").Thing
+
+ === node_modules/inner/index.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols
index d429eab9b4..a2c9ca40fc 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other.js"; // should fail
 export const a = (await import("inner")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols.diff
new file mode 100644
index 0000000000..7f912f85f7
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols
++++ new.nodeModulesExportsSpecifierGenerationConditions(module=node20).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner" : Symbol("inner", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).types
index b7a32fb0f2..245ee60715 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other.js"; // should fail
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner")).x() : import("node_modules/inner/other").Thing
->(await import("inner")).x : () => import("node_modules/inner/other").Thing
->(await import("inner")) : typeof import("node_modules/inner/index")
->await import("inner") : typeof import("node_modules/inner/index")
->import("inner") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other").Thing
+>(await import("inner")).x() : import("inner/other").Thing
+>(await import("inner")).x : () => import("inner/other").Thing
+>(await import("inner")) : typeof import("inner")
+>await import("inner") : typeof import("inner")
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).types.diff
new file mode 100644
index 0000000000..78b805e85d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationConditions(module=node20).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationConditions(module=node20).types
++++ new.nodeModulesExportsSpecifierGenerationConditions(module=node20).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner")).x() : import("node_modules/inner/other").Thing
+->(await import("inner")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner")) : typeof import("node_modules/inner/index")
+->await import("inner") : typeof import("node_modules/inner/index")
+->import("inner") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other").Thing
++>(await import("inner")).x() : import("inner/other").Thing
++>(await import("inner")).x : () => import("inner/other").Thing
++>(await import("inner")) : typeof import("inner")
++>await import("inner") : typeof import("inner")
++>import("inner") : Promise<typeof import("inner")>
+ >"inner" : "inner"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols
index 6fd6d1a29c..c0b17e189a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner/index.js")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols.diff
new file mode 100644
index 0000000000..deb5fb90e2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols
++++ new.nodeModulesExportsSpecifierGenerationDirectory(module=node20).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner/index.js")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).types
index dec34f20fc..36552de494 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner/index.js")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
->await import("inner/index.js") : typeof import("node_modules/inner/index")
->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other.js").Thing
+>(await import("inner/index.js")).x() : import("inner/other.js").Thing
+>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
+>(await import("inner/index.js")) : typeof import("inner/index.js")
+>await import("inner/index.js") : typeof import("inner/index.js")
+>import("inner/index.js") : Promise<typeof import("inner/index.js")>
 >"inner/index.js" : "inner/index.js"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).types.diff
new file mode 100644
index 0000000000..e1fceb1833
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationDirectory(module=node20).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationDirectory(module=node20).types
++++ new.nodeModulesExportsSpecifierGenerationDirectory(module=node20).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner/index.js")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
+->await import("inner/index.js") : typeof import("node_modules/inner/index")
+->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other.js").Thing
++>(await import("inner/index.js")).x() : import("inner/other.js").Thing
++>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
++>(await import("inner/index.js")) : typeof import("inner/index.js")
++>await import("inner/index.js") : typeof import("inner/index.js")
++>import("inner/index.js") : Promise<typeof import("inner/index.js")>
+ >"inner/index.js" : "inner/index.js"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols
index 7429733b3c..263438b3b8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols
@@ -8,7 +8,7 @@ import { Thing } from "inner/other";
 export const a = (await import("inner/index.js")).x();
 >a : Symbol(a, Decl(index.ts, 2, 12))
 >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
+>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
 >x : Symbol(x, Decl(index.d.ts, 1, 8))
 
 === node_modules/inner/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols.diff
new file mode 100644
index 0000000000..d711616a0a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols.diff
@@ -0,0 +1,11 @@
+--- old.nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols
++++ new.nodeModulesExportsSpecifierGenerationPattern(module=node20).symbols
+@@= skipped -7, +7 lines =@@
+ export const a = (await import("inner/index.js")).x();
+ >a : Symbol(a, Decl(index.ts, 2, 12))
+ >(await import("inner/index.js")).x : Symbol(x, Decl(index.d.ts, 1, 8))
+->"inner/index.js" : Symbol("node_modules/inner/index", Decl(index.d.ts, 0, 0))
++>"inner/index.js" : Symbol("inner/index.js", Decl(index.d.ts, 0, 0))
+ >x : Symbol(x, Decl(index.d.ts, 1, 8))
+
+ === node_modules/inner/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).types
index 70039d87c9..f32afc7c05 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).types
@@ -6,19 +6,19 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner/index.js")).x();
->a : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
->await import("inner/index.js") : typeof import("node_modules/inner/index")
->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
+>a : import("inner/other.js").Thing
+>(await import("inner/index.js")).x() : import("inner/other.js").Thing
+>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
+>(await import("inner/index.js")) : typeof import("inner/index.js")
+>await import("inner/index.js") : typeof import("inner/index.js")
+>import("inner/index.js") : Promise<typeof import("inner/index.js")>
 >"inner/index.js" : "inner/index.js"
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("inner/other.js").Thing
 
 === node_modules/inner/index.d.ts ===
 // esm format file
 export { x } from "./other.js";
->x : () => import("node_modules/inner/other").Thing
+>x : () => import("./other.js").Thing
 
 === node_modules/inner/other.d.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).types.diff
new file mode 100644
index 0000000000..66c0a88e2e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSpecifierGenerationPattern(module=node20).types.diff
@@ -0,0 +1,30 @@
+--- old.nodeModulesExportsSpecifierGenerationPattern(module=node20).types
++++ new.nodeModulesExportsSpecifierGenerationPattern(module=node20).types
+@@= skipped -5, +5 lines =@@
+ >Thing : any
+
+ export const a = (await import("inner/index.js")).x();
+->a : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x() : import("node_modules/inner/other").Thing
+->(await import("inner/index.js")).x : () => import("node_modules/inner/other").Thing
+->(await import("inner/index.js")) : typeof import("node_modules/inner/index")
+->await import("inner/index.js") : typeof import("node_modules/inner/index")
+->import("inner/index.js") : Promise<typeof import("node_modules/inner/index")>
++>a : import("inner/other.js").Thing
++>(await import("inner/index.js")).x() : import("inner/other.js").Thing
++>(await import("inner/index.js")).x : () => import("inner/other.js").Thing
++>(await import("inner/index.js")) : typeof import("inner/index.js")
++>await import("inner/index.js") : typeof import("inner/index.js")
++>import("inner/index.js") : Promise<typeof import("inner/index.js")>
+ >"inner/index.js" : "inner/index.js"
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("inner/other.js").Thing
+
+ === node_modules/inner/index.d.ts ===
+ // esm format file
+ export { x } from "./other.js";
+->x : () => import("node_modules/inner/other").Thing
++>x : () => import("./other.js").Thing
+
+ === node_modules/inner/other.d.ts ===
+ // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types
index fdd418b9a1..3b2581fc9e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types.diff
new file mode 100644
index 0000000000..a7479de8d3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types.diff
@@ -0,0 +1,24 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node20).types
+@@= skipped -7, +7 lines =@@
+     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols
index 8a23a85dd4..7d845f6e7d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols
@@ -33,7 +33,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "require"}).RequireInterface
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
 
 export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
@@ -68,7 +68,7 @@ export type LocalInterface =
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
 
 export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
@@ -99,7 +99,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 59))
 
     & import("pkg", Attribute2).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >Attribute2 : Symbol(Attribute2, Decl(other4.ts, 9, 46))
 
 export const a = (null as any as import("pkg", Attribute1).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols.diff
new file mode 100644
index 0000000000..b8690993e7
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols.diff
@@ -0,0 +1,29 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).symbols
+@@= skipped -32, +32 lines =@@
+
+     & import("pkg", {"resolution-mode": "require"}).RequireInterface
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
+
+ export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
+@@= skipped -35, +35 lines =@@
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
+
+ export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
+@@= skipped -31, +31 lines =@@
+ >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 59))
+
+     & import("pkg", Attribute2).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >Attribute2 : Symbol(Attribute2, Decl(other4.ts, 9, 46))
+
+ export const a = (null as any as import("pkg", Attribute1).RequireInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types
index 22b588a9b5..bc8f825a8e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types
@@ -16,15 +16,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -40,7 +40,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -74,9 +74,9 @@ export type LocalInterface =
     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
@@ -97,7 +97,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -145,7 +145,7 @@ export type LocalInterface =
 
     & import("pkg", Attribute2).ImportInterface;
 >import("pkg", Attribute2).ImportInterface : any
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Attribute2 : any
 >ImportInterface : any
@@ -174,9 +174,9 @@ export type LocalInterface =
     & import("pkg", { with: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { with: {} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { with: {} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types.diff
new file mode 100644
index 0000000000..315b5f6243
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types.diff
@@ -0,0 +1,77 @@
+--- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types
++++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node20).types
+@@= skipped -15, +15 lines =@@
+     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /other.ts ===
+@@= skipped -24, +24 lines =@@
+
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+ >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
+->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+ >"resolution-mode" : string
+@@= skipped -34, +34 lines =@@
+     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
+@@= skipped -23, +23 lines =@@
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+ >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
+->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+@@= skipped -48, +48 lines =@@
+
+     & import("pkg", Attribute2).ImportInterface;
+ >import("pkg", Attribute2).ImportInterface : any
+->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >Attribute2 : any
+ >ImportInterface : any
+@@= skipped -29, +29 lines =@@
+     & import("pkg", { with: {} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { with: {} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { with: {} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node20).types
index 7cf69b2a5b..c7a53a5b37 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node20).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node20).types.diff
new file mode 100644
index 0000000000..999cb54137
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node20).types.diff
@@ -0,0 +1,24 @@
+--- old.nodeModulesImportTypeModeDeclarationEmit1(module=node20).types
++++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node20).types
+@@= skipped -7, +7 lines =@@
+     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols
index ea0f4216cd..7413ce6dd6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols
@@ -33,7 +33,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "require"}).RequireInterface
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
 
 export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
@@ -68,7 +68,7 @@ export type LocalInterface =
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
 
 export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
@@ -99,7 +99,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 57))
 
     & import("pkg", Asserts2).ImportInterface;
->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
 >Asserts2 : Symbol(Asserts2, Decl(other4.ts, 9, 46))
 
 export const a = (null as any as import("pkg", Asserts1).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols.diff
new file mode 100644
index 0000000000..47099cdaee
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols.diff
@@ -0,0 +1,29 @@
+--- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols
++++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).symbols
+@@= skipped -32, +32 lines =@@
+
+     & import("pkg", {"resolution-mode": "require"}).RequireInterface
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other.ts, 3, 21))
+
+ export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
+@@= skipped -35, +35 lines =@@
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 2, 23))
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >"resolution-mode" : Symbol("resolution-mode", Decl(other3.ts, 3, 23))
+
+ export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
+@@= skipped -31, +31 lines =@@
+ >RequireInterface : Symbol(RequireInterface, Decl(other4.ts, 8, 57))
+
+     & import("pkg", Asserts2).ImportInterface;
+->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
++>"pkg" : Symbol("./node_modules/pkg/import", Decl(import.d.ts, 0, 0))
+ >Asserts2 : Symbol(Asserts2, Decl(other4.ts, 9, 46))
+
+ export const a = (null as any as import("pkg", Asserts1).RequireInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types
index c366fd27fc..c740f9eb8a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types
@@ -14,15 +14,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : import("/node_modules/pkg/import").ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -38,7 +38,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -72,9 +72,9 @@ export type LocalInterface =
     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
@@ -95,7 +95,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -143,7 +143,7 @@ export type LocalInterface =
 
     & import("pkg", Asserts2).ImportInterface;
 >import("pkg", Asserts2).ImportInterface : any
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
+>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Asserts2 : any
 >ImportInterface : any
@@ -172,9 +172,9 @@ export type LocalInterface =
     & import("pkg", { assert: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
->a : import("/node_modules/pkg/require").RequireInterface
->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
+>a : import("pkg").RequireInterface
+>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("pkg").RequireInterface
+>null as any as import("pkg", { assert: {} }).RequireInterface : import("pkg").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types.diff
new file mode 100644
index 0000000000..f729b3ee95
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types.diff
@@ -0,0 +1,77 @@
+--- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types
++++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node20).types
+@@= skipped -13, +13 lines =@@
+     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+->b : import("/node_modules/pkg/import").ImportInterface
+->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
+->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
+ >null as any : any
+
+ === /other.ts ===
+@@= skipped -24, +24 lines =@@
+
+     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
+ >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
+->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+ >"resolution-mode" : string
+@@= skipped -34, +34 lines =@@
+     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
+@@= skipped -23, +23 lines =@@
+
+     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
+ >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
+->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
+ >{"resolution-mode": "import"} : { "resolution-mode": string; }
+@@= skipped -48, +48 lines =@@
+
+     & import("pkg", Asserts2).ImportInterface;
+ >import("pkg", Asserts2).ImportInterface : any
+->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
++>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
+ >"pkg" : "pkg"
+ >Asserts2 : any
+ >ImportInterface : any
+@@= skipped -29, +29 lines =@@
+     & import("pkg", { assert: {} }).ImportInterface;
+
+ export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
+->a : import("/node_modules/pkg/require").RequireInterface
+->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
+->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
++>a : import("pkg").RequireInterface
++>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("pkg").RequireInterface
++>null as any as import("pkg", { assert: {} }).RequireInterface : import("pkg").RequireInterface
+ >null as any : any
+
+ export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node20).types b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node20).types
index a97ffa95be..080e75d207 100644
--- a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node20).types
+++ b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node20).types
@@ -9,11 +9,11 @@ import type {} from "./module.mts";
 import type {} from "./module.mts" with { "resolution-mode": "import" };
 import type {} from "./module.mts" with { "resolution-mode": "require" };
 type _1 = typeof import("./module.mts");
->_1 : typeof import("module")
+>_1 : typeof import("./module.mts")
 
 type _2 = typeof import("./module.mts", { with: { "resolution-mode": "import" } });
->_2 : typeof import("module")
+>_2 : typeof import("./module.mts")
 
 type _3 = typeof import("./module.mts", { with: { "resolution-mode": "require" } });
->_3 : typeof import("module")
+>_3 : typeof import("./module.mts")
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node20).types.diff b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node20).types.diff
index cb1750eeec..a0d47edf89 100644
--- a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node20).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS(module=node20).types.diff
@@ -5,12 +5,12 @@
  import type {} from "./module.mts" with { "resolution-mode": "require" };
  type _1 = typeof import("./module.mts");
 ->_1 : typeof import("module", { with: { "resolution-mode": "import" } })
-+>_1 : typeof import("module")
++>_1 : typeof import("./module.mts")
 
  type _2 = typeof import("./module.mts", { with: { "resolution-mode": "import" } });
 ->_2 : typeof import("module", { with: { "resolution-mode": "import" } })
-+>_2 : typeof import("module")
++>_2 : typeof import("./module.mts")
 
  type _3 = typeof import("./module.mts", { with: { "resolution-mode": "require" } });
 ->_3 : typeof import("module", { with: { "resolution-mode": "import" } })
-+>_3 : typeof import("module")
++>_3 : typeof import("./module.mts")
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node20).types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node20).types.diff
index 53d48aed42..1d69900afd 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node20).types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsCjsFromJs(module=node20).types.diff
@@ -1,6 +1,13 @@
 --- old.nodeModulesAllowJsCjsFromJs(module=node20).types
 +++ new.nodeModulesAllowJsCjsFromJs(module=node20).types
-@@= skipped -9, +9 lines =@@
+@@= skipped -3, +3 lines =@@
+ exports.foo = "foo"
+ >exports.foo = "foo" : "foo"
+ >exports.foo : "foo"
+->exports : typeof import("foo")
++>exports : typeof import("./foo.cjs")
+ >foo : "foo"
+ >"foo" : "foo"
 
  === bar.ts ===
  import foo from "./foo.cjs"