diff --git a/internal/module/types.go b/internal/module/types.go
index 7dbc899f31..7999e022a3 100644
--- a/internal/module/types.go
+++ b/internal/module/types.go
@@ -49,7 +49,7 @@ type PackageId struct {
 }
 
 func (p *PackageId) String() string {
-	return fmt.Sprintf("%s@%s%s", p.Name, p.Version, p.PeerDependencies)
+	return fmt.Sprintf("%s@%s%s", p.PackageName(), p.Version, p.PeerDependencies)
 }
 
 func (p *PackageId) PackageName() string {
diff --git a/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.trace.json b/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.trace.json
index 4f4fe2b8e5..c0a9a05fe0 100644
--- a/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.trace.json
+++ b/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.trace.json
@@ -46,7 +46,7 @@ File '/node_modules/shared.ts' does not exist according to earlier cached lookup
 File '/node_modules/shared.tsx' does not exist according to earlier cached lookups.
 File '/node_modules/shared.d.ts' does not exist according to earlier cached lookups.
 Directory '/node_modules/@types' does not exist, skipping all lookups in it.
-======== Module name 'shared' was successfully resolved to '/packages/shared/index.js' with Package ID 'shared@1.0.0'. ========
+======== Module name 'shared' was successfully resolved to '/packages/shared/index.js' with Package ID 'shared/index.js@1.0.0'. ========
 ======== Resolving module './utils.js' from '/packages/shared/index.js'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.trace.json b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.trace.json
index 6fb6a6b336..dc6e3a92cf 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.trace.json
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.trace.json
@@ -36,7 +36,7 @@ File '/node_modules/foo/index.tsx' does not exist.
 File '/node_modules/foo/index.d.ts' exists - use it as a name resolution result.
 File '/node_modules/foo/package.json' exists according to earlier cached lookups.
 'package.json' does not have a 'peerDependencies' field.
-======== Module name './index' was successfully resolved to '/node_modules/foo/index.d.ts' with Package ID 'foo@1.2.3'. ========
+======== Module name './index' was successfully resolved to '/node_modules/foo/index.d.ts' with Package ID 'foo/index.d.ts@1.2.3'. ========
 ======== Resolving module 'foo' from '/node_modules/a/index.d.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.trace.json b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.trace.json
index 77016fd60c..9e9981afde 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.trace.json
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.trace.json
@@ -36,7 +36,7 @@ File '/node_modules/@foo/bar/index.tsx' does not exist.
 File '/node_modules/@foo/bar/index.d.ts' exists - use it as a name resolution result.
 File '/node_modules/@foo/bar/package.json' exists according to earlier cached lookups.
 'package.json' does not have a 'peerDependencies' field.
-======== Module name './index' was successfully resolved to '/node_modules/@foo/bar/index.d.ts' with Package ID '@foo/bar@1.2.3'. ========
+======== Module name './index' was successfully resolved to '/node_modules/@foo/bar/index.d.ts' with Package ID '@foo/bar/index.d.ts@1.2.3'. ========
 ======== Resolving module '@foo/bar' from '/node_modules/a/index.d.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json
index 60cb32749f..86fe2a3b9f 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json
@@ -58,7 +58,7 @@ File '/project/node_modules/troublesome-lib/lib/Option.tsx' does not exist.
 File '/project/node_modules/troublesome-lib/lib/Option.d.ts' exists - use it as a name resolution result.
 File '/project/node_modules/troublesome-lib/package.json' exists according to earlier cached lookups.
 'package.json' does not have a 'peerDependencies' field.
-======== Module name './Option' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID 'troublesome-lib@1.17.1'. ========
+======== Module name './Option' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID 'troublesome-lib/lib/Option.d.ts@1.17.1'. ========
 ======== Resolving module 'troublesome-lib/lib/Option' from '/shared/lib/app.d.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
diff --git a/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNextEsm.trace.json b/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNextEsm.trace.json
index 634bee3663..c214dc7c2e 100644
--- a/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNextEsm.trace.json
+++ b/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNextEsm.trace.json
@@ -10,7 +10,7 @@ File name '/.src/node_modules/@types/react/jsx-runtime.js' has a '.js' extension
 File '/.src/node_modules/@types/react/jsx-runtime.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/.src/node_modules/@types/react/jsx-runtime.d.ts', result '/.src/node_modules/@types/react/jsx-runtime.d.ts'.
-======== Module name 'react/jsx-runtime' was successfully resolved to '/.src/node_modules/@types/react/jsx-runtime.d.ts' with Package ID '@types/react@0.0.1'. ========
+======== Module name 'react/jsx-runtime' was successfully resolved to '/.src/node_modules/@types/react/jsx-runtime.d.ts' with Package ID '@types/react/jsx-runtime.d.ts@0.0.1'. ========
 ======== Resolving module './' from '/.src/node_modules/@types/react/jsx-runtime.d.ts'. ========
 Module resolution kind is not specified, using 'NodeNext'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=esnext).trace.json b/testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=esnext).trace.json
index da55e998b5..80d92bac35 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=esnext).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=esnext).trace.json
@@ -17,4 +17,4 @@ File '/node_modules/conditions/index.web.d.ts' exists - use it as a name resolut
 Resolved under condition 'default'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/conditions/index.web.d.ts', result '/node_modules/conditions/index.web.d.ts'.
-======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID 'conditions@1.0.0'. ========
+======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID 'conditions/index.web.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=preserve).trace.json b/testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=preserve).trace.json
index da55e998b5..80d92bac35 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=preserve).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=preserve).trace.json
@@ -17,4 +17,4 @@ File '/node_modules/conditions/index.web.d.ts' exists - use it as a name resolut
 Resolved under condition 'default'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/conditions/index.web.d.ts', result '/node_modules/conditions/index.web.d.ts'.
-======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID 'conditions@1.0.0'. ========
+======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID 'conditions/index.web.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).trace.json b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).trace.json
index 9e4d897653..9b8cb68a01 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).trace.json
@@ -16,7 +16,7 @@ File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual@1.0.0'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========
 ======== Resolving module 'dual' from '/main.mts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.
@@ -35,7 +35,7 @@ File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual@1.0.0'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========
 ======== Resolving module 'dual' from '/main.cts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -54,4 +54,4 @@ File '/node_modules/dual/index.d.cts' exists - use it as a name resolution resul
 Resolved under condition 'require'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.cts', result '/node_modules/dual/index.d.cts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID 'dual@1.0.0'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID 'dual/index.d.cts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).trace.json b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).trace.json
index 9e4d897653..9b8cb68a01 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).trace.json
@@ -16,7 +16,7 @@ File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual@1.0.0'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========
 ======== Resolving module 'dual' from '/main.mts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.
@@ -35,7 +35,7 @@ File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual@1.0.0'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========
 ======== Resolving module 'dual' from '/main.cts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -54,4 +54,4 @@ File '/node_modules/dual/index.d.cts' exists - use it as a name resolution resul
 Resolved under condition 'require'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.cts', result '/node_modules/dual/index.d.cts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID 'dual@1.0.0'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID 'dual/index.d.cts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=bundler).trace.json b/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=bundler).trace.json
index 6ab1ae8a5f..3fd8074729 100644
--- a/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=bundler).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=bundler).trace.json
@@ -20,4 +20,4 @@ File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution re
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.
-======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep@1.0.0'. ========
+======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=node16).trace.json b/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=node16).trace.json
index b6bcab4eb7..b4010f23a5 100644
--- a/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=node16).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=node16).trace.json
@@ -20,4 +20,4 @@ File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution re
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.
-======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep@1.0.0'. ========
+======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=nodenext).trace.json b/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=nodenext).trace.json
index db9b927d97..52eb32d86e 100644
--- a/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=nodenext).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=nodenext).trace.json
@@ -20,4 +20,4 @@ File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution re
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.
-======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep@1.0.0'. ========
+======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/customConditions(resolvepackagejsonexports=true).trace.json b/testdata/baselines/reference/submodule/conformance/customConditions(resolvepackagejsonexports=true).trace.json
index b80e2e9878..bef9d84454 100644
--- a/testdata/baselines/reference/submodule/conformance/customConditions(resolvepackagejsonexports=true).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/customConditions(resolvepackagejsonexports=true).trace.json
@@ -17,4 +17,4 @@ File '/node_modules/lodash/webpack.d.ts' exists - use it as a name resolution re
 Resolved under condition 'webpack'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/lodash/webpack.d.ts', result '/node_modules/lodash/webpack.d.ts'.
-======== Module name 'lodash' was successfully resolved to '/node_modules/lodash/webpack.d.ts' with Package ID 'lodash@1.0.0'. ========
+======== Module name 'lodash' was successfully resolved to '/node_modules/lodash/webpack.d.ts' with Package ID 'lodash/webpack.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.trace.json b/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.trace.json
index fd231b2be0..af2c3d7476 100644
--- a/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.trace.json
+++ b/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.trace.json
@@ -12,4 +12,4 @@ File '/node_modules/pkg/definitely-not-index.tsx' does not exist.
 File '/node_modules/pkg/definitely-not-index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/pkg/definitely-not-index.d.ts', result '/node_modules/pkg/definitely-not-index.d.ts'.
-======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID 'pkg@1.0.0'. ========
+======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID 'pkg/definitely-not-index.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.trace.json b/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.trace.json
index fd231b2be0..af2c3d7476 100644
--- a/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.trace.json
+++ b/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.trace.json
@@ -12,4 +12,4 @@ File '/node_modules/pkg/definitely-not-index.tsx' does not exist.
 File '/node_modules/pkg/definitely-not-index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/pkg/definitely-not-index.d.ts', result '/node_modules/pkg/definitely-not-index.d.ts'.
-======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID 'pkg@1.0.0'. ========
+======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID 'pkg/definitely-not-index.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.trace.json b/testdata/baselines/reference/submodule/conformance/node10IsNode_node.trace.json
index e62dd092f1..9b2d7aeefb 100644
--- a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.trace.json
+++ b/testdata/baselines/reference/submodule/conformance/node10IsNode_node.trace.json
@@ -12,4 +12,4 @@ File '/node_modules/fancy-lib/definitely-not-index.tsx' does not exist.
 File '/node_modules/fancy-lib/definitely-not-index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/fancy-lib/definitely-not-index.d.ts', result '/node_modules/fancy-lib/definitely-not-index.d.ts'.
-======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID 'fancy-lib@1.0.0'. ========
+======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID 'fancy-lib/definitely-not-index.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/node10IsNode_node10.trace.json b/testdata/baselines/reference/submodule/conformance/node10IsNode_node10.trace.json
index e62dd092f1..9b2d7aeefb 100644
--- a/testdata/baselines/reference/submodule/conformance/node10IsNode_node10.trace.json
+++ b/testdata/baselines/reference/submodule/conformance/node10IsNode_node10.trace.json
@@ -12,4 +12,4 @@ File '/node_modules/fancy-lib/definitely-not-index.tsx' does not exist.
 File '/node_modules/fancy-lib/definitely-not-index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/fancy-lib/definitely-not-index.d.ts', result '/node_modules/fancy-lib/definitely-not-index.d.ts'.
-======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID 'fancy-lib@1.0.0'. ========
+======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID 'fancy-lib/definitely-not-index.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).trace.json b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).trace.json
index b5f76c4a82..08ecaab8be 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).trace.json
@@ -19,7 +19,7 @@ File name '/node_modules/exports-and-types-versions/dist/foo.js' has a '.js' ext
 File '/node_modules/exports-and-types-versions/dist/foo.js' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/exports-and-types-versions/dist/foo.js', result '/node_modules/exports-and-types-versions/dist/foo.js'.
-======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions/dist/foo.js@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/nope' from '/main.cts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -48,7 +48,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-yep' from '/main.cts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -64,7 +64,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types@>=4'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-nah' from '/main.cts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -130,7 +130,7 @@ Module name 'foo', matched pattern 'foo'.
 Trying substitution './types/foo.d.ts', candidate module location: './types/foo.d.ts'.
 File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions/dist/foo.js@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/nope' from '/main.mts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
@@ -159,7 +159,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-yep' from '/main.mts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
@@ -175,7 +175,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types@>=4'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-nah' from '/main.mts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node18).trace.json b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node18).trace.json
index b5f76c4a82..08ecaab8be 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node18).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node18).trace.json
@@ -19,7 +19,7 @@ File name '/node_modules/exports-and-types-versions/dist/foo.js' has a '.js' ext
 File '/node_modules/exports-and-types-versions/dist/foo.js' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/exports-and-types-versions/dist/foo.js', result '/node_modules/exports-and-types-versions/dist/foo.js'.
-======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions/dist/foo.js@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/nope' from '/main.cts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -48,7 +48,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-yep' from '/main.cts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -64,7 +64,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types@>=4'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-nah' from '/main.cts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -130,7 +130,7 @@ Module name 'foo', matched pattern 'foo'.
 Trying substitution './types/foo.d.ts', candidate module location: './types/foo.d.ts'.
 File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions/dist/foo.js@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/nope' from '/main.mts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
@@ -159,7 +159,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-yep' from '/main.mts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
@@ -175,7 +175,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types@>=4'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-nah' from '/main.mts'. ========
 Module resolution kind is not specified, using 'Node16'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).trace.json b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).trace.json
index 486d3aa41d..ed1e959d8f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).trace.json
@@ -19,7 +19,7 @@ File name '/node_modules/exports-and-types-versions/dist/foo.js' has a '.js' ext
 File '/node_modules/exports-and-types-versions/dist/foo.js' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/exports-and-types-versions/dist/foo.js', result '/node_modules/exports-and-types-versions/dist/foo.js'.
-======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions/dist/foo.js@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/nope' from '/main.cts'. ========
 Module resolution kind is not specified, using 'NodeNext'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -48,7 +48,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-yep' from '/main.cts'. ========
 Module resolution kind is not specified, using 'NodeNext'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -64,7 +64,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types@>=4'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-nah' from '/main.cts'. ========
 Module resolution kind is not specified, using 'NodeNext'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.
@@ -130,7 +130,7 @@ Module name 'foo', matched pattern 'foo'.
 Trying substitution './types/foo.d.ts', candidate module location: './types/foo.d.ts'.
 File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/foo' was successfully resolved to '/node_modules/exports-and-types-versions/dist/foo.js' with Package ID 'exports-and-types-versions/dist/foo.js@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/nope' from '/main.mts'. ========
 Module resolution kind is not specified, using 'NodeNext'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
@@ -159,7 +159,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-yep' from '/main.mts'. ========
 Module resolution kind is not specified, using 'NodeNext'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
@@ -175,7 +175,7 @@ File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it a
 Resolved under condition 'types@>=4'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.
-======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions@1.0.0'. ========
+======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========
 ======== Resolving module 'exports-and-types-versions/versioned-nah' from '/main.mts'. ========
 Module resolution kind is not specified, using 'NodeNext'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeCache.trace.json b/testdata/baselines/reference/submodule/conformance/resolutionModeCache.trace.json
index cc9f657434..8fb7cf90dd 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeCache.trace.json
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeCache.trace.json
@@ -17,7 +17,7 @@ File '/node_modules/pkg/index.d.ts' exists - use it as a name resolution result.
 Resolved under condition 'require'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/pkg/index.d.ts', result '/node_modules/pkg/index.d.ts'.
-======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/index.d.ts' with Package ID 'pkg@1.0.0'. ========
+======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/index.d.ts' with Package ID 'pkg/index.d.ts@1.0.0'. ========
 ======== Resolving module 'pkg' from '/index.ts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.
@@ -35,4 +35,4 @@ File '/node_modules/pkg/index.d.mts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/pkg/index.d.mts', result '/node_modules/pkg/index.d.mts'.
-======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/index.d.mts' with Package ID 'pkg@1.0.0'. ========
+======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/index.d.mts' with Package ID 'pkg/index.d.mts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).trace.json b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).trace.json
index 35250020b7..17a9c55955 100644
--- a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).trace.json
@@ -40,7 +40,7 @@ File '/node_modules/foo.d.ts' does not exist.
 File '/node_modules/foo/index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/foo/index.d.ts', result '/node_modules/foo/index.d.ts'.
-======== Module name 'foo' was successfully resolved to '/node_modules/foo/index.mjs' with Package ID 'foo@1.0.0'. ========
+======== Module name 'foo' was successfully resolved to '/node_modules/foo/index.mjs' with Package ID 'foo/index.mjs@1.0.0'. ========
 ======== Resolving module 'bar' from '/index.mts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.
@@ -108,7 +108,7 @@ File '/node_modules/@types/bar.d.ts' does not exist.
 File '/node_modules/@types/bar/index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/@types/bar/index.d.ts', result '/node_modules/@types/bar/index.d.ts'.
-======== Module name 'bar' was successfully resolved to '/node_modules/bar/index.mjs' with Package ID 'bar@1.0.0'. ========
+======== Module name 'bar' was successfully resolved to '/node_modules/bar/index.mjs' with Package ID 'bar/index.mjs@1.0.0'. ========
 ======== Resolving type reference directive 'bar', containing file '/.src/__inferred type names__.ts', root directory '/.src/node_modules/@types,/node_modules/@types'. ========
 Resolving with primary search path '/.src/node_modules/@types, /node_modules/@types'.
 Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it.
diff --git a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).trace.json b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).trace.json
index f1fbfdcd57..ce0c4345da 100644
--- a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).trace.json
+++ b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).trace.json
@@ -36,7 +36,7 @@ File '/node_modules/foo/package.json' exists according to earlier cached lookups
 File '/node_modules/foo/index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/foo/index.d.ts', result '/node_modules/foo/index.d.ts'.
-======== Module name 'foo' was successfully resolved to '/node_modules/foo/index.mjs' with Package ID 'foo@1.0.0'. ========
+======== Module name 'foo' was successfully resolved to '/node_modules/foo/index.mjs' with Package ID 'foo/index.mjs@1.0.0'. ========
 ======== Resolving module 'bar' from '/index.mts'. ========
 Explicitly specified module resolution kind: 'Node16'.
 Resolving in ESM mode with conditions 'import', 'types', 'node'.
@@ -97,7 +97,7 @@ File '/node_modules/@types/bar/package.json' exists according to earlier cached
 File '/node_modules/@types/bar/index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/@types/bar/index.d.ts', result '/node_modules/@types/bar/index.d.ts'.
-======== Module name 'bar' was successfully resolved to '/node_modules/bar/index.mjs' with Package ID 'bar@1.0.0'. ========
+======== Module name 'bar' was successfully resolved to '/node_modules/bar/index.mjs' with Package ID 'bar/index.mjs@1.0.0'. ========
 ======== Resolving type reference directive 'bar', containing file '/.src/__inferred type names__.ts', root directory '/.src/node_modules/@types,/node_modules/@types'. ========
 Resolving with primary search path '/.src/node_modules/@types, /node_modules/@types'.
 Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it.
diff --git a/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.trace.json b/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.trace.json
index 7e9217d7fe..9fbd9cdd72 100644
--- a/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.trace.json
+++ b/testdata/baselines/reference/submodule/conformance/selfNameModuleAugmentation.trace.json
@@ -21,7 +21,7 @@ File '/node_modules/acorn-walk/dist/walk.d.ts' exists - use it as a name resolut
 Resolved under condition 'default'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/acorn-walk/dist/walk.d.ts', result '/node_modules/acorn-walk/dist/walk.d.ts'.
-======== Module name 'acorn-walk' was successfully resolved to '/node_modules/acorn-walk/dist/walk.d.ts' with Package ID 'acorn-walk@8.2.0'. ========
+======== Module name 'acorn-walk' was successfully resolved to '/node_modules/acorn-walk/dist/walk.d.ts' with Package ID 'acorn-walk/dist/walk.d.ts@8.2.0'. ========
 ======== Resolving module 'acorn-walk' from '/index.ts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.
@@ -47,4 +47,4 @@ File '/node_modules/acorn-walk/dist/walk.d.ts' exists - use it as a name resolut
 Resolved under condition 'default'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/acorn-walk/dist/walk.d.ts', result '/node_modules/acorn-walk/dist/walk.d.ts'.
-======== Module name 'acorn-walk' was successfully resolved to '/node_modules/acorn-walk/dist/walk.d.ts' with Package ID 'acorn-walk@8.2.0'. ========
+======== Module name 'acorn-walk' was successfully resolved to '/node_modules/acorn-walk/dist/walk.d.ts' with Package ID 'acorn-walk/dist/walk.d.ts@8.2.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json
index 11f0d60f1a..e5390b7825 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json
@@ -65,4 +65,4 @@ File '/.src/node_modules/ext/other.tsx' does not exist.
 File '/.src/node_modules/ext/other.d.ts' exists - use it as a name resolution result.
 File '/.src/node_modules/ext/package.json' exists according to earlier cached lookups.
 'package.json' does not have a 'peerDependencies' field.
-======== Module name '../other' was successfully resolved to '/.src/node_modules/ext/other.d.ts' with Package ID 'ext@1.0.0'. ========
+======== Module name '../other' was successfully resolved to '/.src/node_modules/ext/other.d.ts' with Package ID 'ext/other.d.ts@1.0.0'. ========
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json
index 740918ca76..59839558cf 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json
@@ -47,4 +47,4 @@ File '/.src/node_modules/ext/other.tsx' does not exist according to earlier cach
 File '/.src/node_modules/ext/other.d.ts' exists - use it as a name resolution result.
 File '/.src/node_modules/ext/package.json' exists according to earlier cached lookups.
 'package.json' does not have a 'peerDependencies' field.
-======== Module name '../other' was successfully resolved to '/.src/node_modules/ext/other.d.ts' with Package ID 'ext@1.0.0'. ========
+======== Module name '../other' was successfully resolved to '/.src/node_modules/ext/other.d.ts' with Package ID 'ext/other.d.ts@1.0.0'. ========