diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 87101781ead..e8784e7d1f2 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3811,10 +3811,6 @@
         "category": "Error",
         "code": 6189
     },
-    "Found 'package.json' at '{0}'. Package ID is '{1}'.": {
-        "category": "Message",
-        "code": 6190
-    },
     "Whether to keep outdated console output in watch mode instead of clearing the screen.": {
         "category": "Message",
         "code": 6191
@@ -3923,6 +3919,14 @@
         "category": "Message",
         "code": 6217
     },
+    "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========": {
+        "category": "Message",
+        "code": 6218
+    },
+    "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========": {
+        "category": "Message",
+        "code": 6219
+    },
 
     "Projects to reference": {
         "category": "Message",
@@ -4975,7 +4979,7 @@
         "code": 95079
     },
 
-    "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer." :{
+    "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": {
         "category": "Error",
         "code": 18004
     },
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 8761cc0a087..19402b03ee9 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -16,12 +16,23 @@ namespace ts {
         push(value: T): void;
     }
 
-    function withPackageId(packageId: PackageId | undefined, r: PathAndExtension | undefined): Resolved | undefined {
+    function withPackageId(packageInfo: PackageJsonInfo | undefined, r: PathAndExtension | undefined): Resolved | undefined {
+        let packageId: PackageId | undefined;
+        if (r && packageInfo) {
+            const packageJsonContent = packageInfo.packageJsonContent as PackageJson;
+            if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
+                packageId = {
+                    name: packageJsonContent.name,
+                    subModuleName: r.path.slice(packageInfo.packageDirectory.length + directorySeparator.length),
+                    version: packageJsonContent.version
+                };
+            }
+        }
         return r && { path: r.path, extension: r.ext, packageId };
     }
 
     function noPackageId(r: PathAndExtension | undefined): Resolved | undefined {
-        return withPackageId(/*packageId*/ undefined, r);
+        return withPackageId(/*packageInfo*/ undefined, r);
     }
 
     function removeIgnoredPackageId(r: Resolved | undefined): PathAndExtension | undefined {
@@ -307,7 +318,12 @@ namespace ts {
             const { fileName, packageId } = resolved;
             const resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary, resolvedFileName, packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -663,7 +679,12 @@ namespace ts {
 
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -968,10 +989,9 @@ namespace ts {
             }
             const resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                const nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
-                const packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, /*onlyRecordFailures*/ false, state);
-                const packageId = packageInfo && packageInfo.packageId;
-                return withPackageId(packageId, resolvedFromFile);
+                const packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                const packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
+                return withPackageId(packageInfo, resolvedFromFile);
             }
         }
         if (!onlyRecordFailures) {
@@ -998,13 +1018,12 @@ namespace ts {
      * (Not neeeded for `loadModuleFromNodeModules` as that looks up the `package.json` as part of resolution.)
      *
      * packageDirectory is the directory of the package itself.
-     * subModuleName is the path within the package.
-     *   For `blah/node_modules/foo/index.d.ts` this is { packageDirectory: "foo", subModuleName: "index.d.ts" }. (Part before "/node_modules/" is ignored.)
-     *   For `/node_modules/foo/bar.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
-     *   For `/node_modules/@types/foo/bar/index.d.ts` this is { packageDirectory: "@types/foo", subModuleName: "bar/index.d.ts" }.
-     *   For `/node_modules/foo/bar/index.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     *   For `blah/node_modules/foo/index.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/foo/bar.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/@types/foo/bar/index.d.ts` this is packageDirectory: "@types/foo"
+     *   For `/node_modules/foo/bar/index.d.ts` this is packageDirectory: "foo"
      */
-    function parseNodeModuleFromPath(resolved: PathAndExtension): { packageDirectory: string, subModuleName: string } | undefined {
+    function parseNodeModuleFromPath(resolved: PathAndExtension): string | undefined {
         const path = normalizePath(resolved.path);
         const idx = path.lastIndexOf(nodeModulesPathPart);
         if (idx === -1) {
@@ -1016,9 +1035,7 @@ namespace ts {
         if (path.charCodeAt(indexAfterNodeModules) === CharacterCodes.at) {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
-        const packageDirectory = path.slice(0, indexAfterPackageName);
-        const subModuleName = removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + Extension.Dts;
-        return { packageDirectory, subModuleName };
+        return path.slice(0, indexAfterPackageName);
     }
 
     function moveToNextDirectorySeparatorIfAvailable(path: string, prevSeparatorIndex: number): number {
@@ -1026,19 +1043,6 @@ namespace ts {
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
 
-    function addExtensionAndIndex(path: string): string {
-        if (path === "") {
-            return "index.d.ts";
-        }
-        if (endsWith(path, ".d.ts")) {
-            return path;
-        }
-        if (path === "index" || endsWith(path, "/index")) {
-            return path + ".d.ts";
-        }
-        return path + "/index.d.ts";
-    }
-
     function loadModuleFromFileNoPackageId(extensions: Extensions, candidate: string, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
         return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
     }
@@ -1119,61 +1123,29 @@ namespace ts {
     }
 
     function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson = true) {
-        const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
-        const packageId = packageInfo && packageInfo.packageId;
+        const packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
         const packageJsonContent = packageInfo && packageInfo.packageJsonContent;
         const versionPaths = packageInfo && packageInfo.versionPaths;
-        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+        return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
 
     interface PackageJsonInfo {
-        packageJsonContent: PackageJsonPathFields | undefined;
-        packageId: PackageId | undefined;
+        packageDirectory: string;
+        packageJsonContent: PackageJsonPathFields;
         versionPaths: VersionPaths | undefined;
     }
 
-    function getPackageJsonInfo(packageDirectory: string, subModuleName: string, onlyRecordFailures: boolean, state: ModuleResolutionState): PackageJsonInfo | undefined {
+    function getPackageJsonInfo(packageDirectory: string, onlyRecordFailures: boolean, state: ModuleResolutionState): PackageJsonInfo | undefined {
         const { host, traceEnabled } = state;
         const directoryExists = !onlyRecordFailures && directoryProbablyExists(packageDirectory, host);
         const packageJsonPath = combinePaths(packageDirectory, "package.json");
         if (directoryExists && host.fileExists(packageJsonPath)) {
             const packageJsonContent = readJson(packageJsonPath, host) as PackageJson;
-            if (subModuleName === "") { // looking up the root - need to handle types/typings/main redirects for subModuleName
-                const path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
-                if (typeof path === "string") {
-                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
-                }
-                else {
-                    const jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
-                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
-                        const potentialSubModule = jsPath.substring(packageDirectory.length + 1);
-                        subModuleName = (forEach(supportedJSExtensions, extension =>
-                            tryRemoveExtension(potentialSubModule, extension)) || potentialSubModule) + Extension.Dts;
-                    }
-                    else {
-                        subModuleName = "index.d.ts";
-                    }
-                }
-            }
-
-            if (!endsWith(subModuleName, Extension.Dts)) {
-                subModuleName = addExtensionAndIndex(subModuleName);
-            }
-
-            const versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            const packageId: PackageId | undefined = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
-                ? { name: packageJsonContent.name, subModuleName, version: packageJsonContent.version }
-                : undefined;
             if (traceEnabled) {
-                if (packageId) {
-                    trace(host, Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, packageIdToString(packageId));
-                }
-                else {
-                    trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
+                trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-
-            return { packageJsonContent, packageId, versionPaths };
+            const versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
+            return { packageDirectory, packageJsonContent, versionPaths };
         }
         else {
             if (directoryExists && traceEnabled) {
@@ -1328,27 +1300,36 @@ namespace ts {
         const candidate = normalizePath(combinePaths(nodeModulesDirectory, moduleName));
 
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
-        let packageJsonContent: PackageJsonPathFields | undefined;
-        let packageId: PackageId | undefined;
-        let versionPaths: VersionPaths | undefined;
-
-        const packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        let packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
         if (packageInfo) {
-            ({ packageJsonContent, packageId, versionPaths } = packageInfo);
             const fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
             if (fromFile) {
                 return noPackageId(fromFile);
             }
 
-            const fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, fromDirectory);
+            const fromDirectory = loadNodeModuleFromDirectoryWorker(
+                extensions,
+                candidate,
+                !nodeModulesDirectoryExists,
+                state,
+                packageInfo.packageJsonContent,
+                packageInfo.versionPaths
+            );
+            return withPackageId(packageInfo, fromDirectory);
         }
 
         const loader: ResolutionKindSpecificLoader = (extensions, candidate, onlyRecordFailures, state) => {
             const pathAndExtension =
                 loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, pathAndExtension);
+                loadNodeModuleFromDirectoryWorker(
+                    extensions,
+                    candidate,
+                    onlyRecordFailures,
+                    state,
+                    packageInfo && packageInfo.packageJsonContent,
+                    packageInfo && packageInfo.versionPaths
+                );
+            return withPackageId(packageInfo, pathAndExtension);
         };
 
         const { packageName, rest } = parsePackageName(moduleName);
@@ -1356,14 +1337,13 @@ namespace ts {
             const packageDirectory = combinePaths(nodeModulesDirectory, packageName);
 
             // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
-            const packageInfo = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
-            if (packageInfo) ({ packageId, versionPaths } = packageInfo);
-            if (versionPaths) {
+            packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+            if (packageInfo && packageInfo.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, version, rest);
+                    trace(state.host, Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, version, rest);
                 }
                 const packageDirectoryExists = nodeModulesDirectoryExists && directoryProbablyExists(packageDirectory, state.host);
-                const fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                const fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
diff --git a/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.trace.json b/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.trace.json
index c4421e45579..8711f881de8 100644
--- a/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.trace.json
+++ b/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.trace.json
@@ -2,13 +2,13 @@
     "======== Resolving module 'foo/use' from '/index.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo/use' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/use/index.d.ts@1.2.3'.",
     "File '/node_modules/foo/use.ts' does not exist.",
     "File '/node_modules/foo/use.tsx' does not exist.",
     "File '/node_modules/foo/use.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/foo/use.d.ts', result '/node_modules/foo/use.d.ts'.",
-    "======== Module name 'foo/use' was successfully resolved to '/node_modules/foo/use.d.ts'. ========",
+    "======== Module name 'foo/use' was successfully resolved to '/node_modules/foo/use.d.ts' with Package ID 'foo/use.d.ts@1.2.3'. ========",
     "======== Resolving module 'a' from '/index.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'a' from 'node_modules' folder, target file type 'TypeScript'.",
@@ -27,17 +27,14 @@
     "File '/node_modules/foo/index.ts' does not exist.",
     "File '/node_modules/foo/index.tsx' does not exist.",
     "File '/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/index.d.ts@1.2.3'.",
-    "======== Module name './index' was successfully resolved to '/node_modules/foo/index.d.ts'. ========",
+    "======== 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 'NodeJs'.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' does not have a 'main' field.",
+    "Found 'package.json' at '/node_modules/a/node_modules/foo/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/a/node_modules/foo/package.json'. Package ID is 'foo/index.d.ts@1.2.3'.",
     "File '/node_modules/a/node_modules/foo.ts' does not exist.",
     "File '/node_modules/a/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/a/node_modules/foo.d.ts' does not exist.",
@@ -48,5 +45,5 @@
     "File '/node_modules/a/node_modules/foo/index.tsx' does not exist.",
     "File '/node_modules/a/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/a/node_modules/foo/index.d.ts', result '/node_modules/a/node_modules/foo/index.d.ts'.",
-    "======== Module name 'foo' was successfully resolved to '/node_modules/a/node_modules/foo/index.d.ts'. ========"
+    "======== Module name 'foo' was successfully resolved to '/node_modules/a/node_modules/foo/index.d.ts' with Package ID 'foo/index.d.ts@1.2.3'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.trace.json b/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.trace.json
index 97340de57ca..2a4b74ad555 100644
--- a/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.trace.json
+++ b/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.trace.json
@@ -2,13 +2,13 @@
     "======== Resolving module '@foo/bar/use' from '/index.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module '@foo/bar/use' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Found 'package.json' at '/node_modules/@foo/bar/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/@foo/bar/package.json'. Package ID is '@foo/bar/use/index.d.ts@1.2.3'.",
     "File '/node_modules/@foo/bar/use.ts' does not exist.",
     "File '/node_modules/@foo/bar/use.tsx' does not exist.",
     "File '/node_modules/@foo/bar/use.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@foo/bar/use.d.ts', result '/node_modules/@foo/bar/use.d.ts'.",
-    "======== Module name '@foo/bar/use' was successfully resolved to '/node_modules/@foo/bar/use.d.ts'. ========",
+    "======== Module name '@foo/bar/use' was successfully resolved to '/node_modules/@foo/bar/use.d.ts' with Package ID '@foo/bar/use.d.ts@1.2.3'. ========",
     "======== Resolving module 'a' from '/index.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'a' from 'node_modules' folder, target file type 'TypeScript'.",
@@ -27,17 +27,14 @@
     "File '/node_modules/@foo/bar/index.ts' does not exist.",
     "File '/node_modules/@foo/bar/index.tsx' does not exist.",
     "File '/node_modules/@foo/bar/index.d.ts' exist - use it as a name resolution result.",
+    "Found 'package.json' at '/node_modules/@foo/bar/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/@foo/bar/package.json'. Package ID is '@foo/bar/index.d.ts@1.2.3'.",
-    "======== Module name './index' was successfully resolved to '/node_modules/@foo/bar/index.d.ts'. ========",
+    "======== 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 'NodeJs'.",
     "Loading module '@foo/bar' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' does not have a 'main' field.",
+    "Found 'package.json' at '/node_modules/a/node_modules/@foo/bar/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/a/node_modules/@foo/bar/package.json'. Package ID is '@foo/bar/index.d.ts@1.2.3'.",
     "File '/node_modules/a/node_modules/@foo/bar.ts' does not exist.",
     "File '/node_modules/a/node_modules/@foo/bar.tsx' does not exist.",
     "File '/node_modules/a/node_modules/@foo/bar.d.ts' does not exist.",
@@ -48,5 +45,5 @@
     "File '/node_modules/a/node_modules/@foo/bar/index.tsx' does not exist.",
     "File '/node_modules/a/node_modules/@foo/bar/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/a/node_modules/@foo/bar/index.d.ts', result '/node_modules/a/node_modules/@foo/bar/index.d.ts'.",
-    "======== Module name '@foo/bar' was successfully resolved to '/node_modules/a/node_modules/@foo/bar/index.d.ts'. ========"
+    "======== Module name '@foo/bar' was successfully resolved to '/node_modules/a/node_modules/@foo/bar/index.d.ts' with Package ID '@foo/bar/index.d.ts@1.2.3'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-10.trace.json b/tests/baselines/reference/library-reference-10.trace.json
index 37f8ab543ca..92b5b035079 100644
--- a/tests/baselines/reference/library-reference-10.trace.json
+++ b/tests/baselines/reference/library-reference-10.trace.json
@@ -1,18 +1,16 @@
 [
     "======== Resolving type reference directive 'jquery', containing file '/foo/consumer.ts', root directory './types'. ========",
     "Resolving with primary search path './types'.",
-    "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at './types/jquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
     "File 'types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'types/jquery/jquery.d.ts', result '/foo/types/jquery/jquery.d.ts'.",
     "======== Type reference directive 'jquery' was successfully resolved to '/foo/types/jquery/jquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'jquery', containing file '/foo/__inferred type names__.ts', root directory './types'. ========",
     "Resolving with primary search path './types'.",
-    "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at './types/jquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
     "File 'types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'types/jquery/jquery.d.ts', result '/foo/types/jquery/jquery.d.ts'.",
diff --git a/tests/baselines/reference/library-reference-11.trace.json b/tests/baselines/reference/library-reference-11.trace.json
index b5e324d8c36..ff1905707a3 100644
--- a/tests/baselines/reference/library-reference-11.trace.json
+++ b/tests/baselines/reference/library-reference-11.trace.json
@@ -3,9 +3,8 @@
     "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/a/b'.",
     "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.",
-    "'package.json' has 'typings' field 'jquery.d.ts' that references '/a/node_modules/jquery/jquery.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/a/node_modules/jquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/a/node_modules/jquery.d.ts' does not exist.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references '/a/node_modules/jquery/jquery.d.ts'.",
     "File '/a/node_modules/jquery/jquery.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/library-reference-12.trace.json b/tests/baselines/reference/library-reference-12.trace.json
index 1421f1501d9..63be1cc32a3 100644
--- a/tests/baselines/reference/library-reference-12.trace.json
+++ b/tests/baselines/reference/library-reference-12.trace.json
@@ -3,10 +3,8 @@
     "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/a/b'.",
     "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'dist/jquery.d.ts' that references '/a/node_modules/jquery/dist/jquery.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/a/node_modules/jquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/a/node_modules/jquery.d.ts' does not exist.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'dist/jquery.d.ts' that references '/a/node_modules/jquery/dist/jquery.d.ts'.",
diff --git a/tests/baselines/reference/library-reference-2.trace.json b/tests/baselines/reference/library-reference-2.trace.json
index b9b4cf08ca2..d4f50990005 100644
--- a/tests/baselines/reference/library-reference-2.trace.json
+++ b/tests/baselines/reference/library-reference-2.trace.json
@@ -1,10 +1,8 @@
 [
     "======== Resolving type reference directive 'jquery', containing file '/consumer.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/types/jquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
@@ -12,10 +10,8 @@
     "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/jquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'jquery', containing file '/test/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/types/jquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.js b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.js
new file mode 100644
index 00000000000..9f09bea10cf
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.js
@@ -0,0 +1,44 @@
+//// [tests/cases/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.ts] ////
+
+//// [package.json]
+{
+    "name": "troublesome-lib",
+    "version": "1.17.1"
+}
+//// [Compactable.d.ts]
+import { Option } from './Option';
+export class Compactable {
+    option: Option;
+}
+//// [Option.d.ts]
+export class Option {
+    someProperty: string;
+}
+//// [app.d.ts]
+import { Option } from "troublesome-lib/lib/Option";
+export class SharedOption extends Option { }
+export const makeSharedOption: () => SharedOption;
+//// [index.d.ts]
+import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable
+//// [package.json]
+{
+    "name": "troublesome-lib",
+    "version": "1.17.1"
+}
+//// [Compactable.d.ts]
+import { Option } from './Option';
+export class Compactable {
+    option: Option;
+}
+//// [Option.d.ts]
+export class Option {
+    someProperty: string;
+}
+//// [app.ts]
+import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory
+import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder
+
+
+//// [/project/src/app.js]
+"use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.symbols b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.symbols
new file mode 100644
index 00000000000..1e4d65e10b3
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.symbols
@@ -0,0 +1,48 @@
+=== /project/src/app.ts ===
+import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory
+>t : Symbol(t, Decl(app.ts, 0, 6))
+
+import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder
+>makeSharedOption : Symbol(makeSharedOption, Decl(app.ts, 1, 8))
+
+=== /shared/node_modules/troublesome-lib/lib/Option.d.ts ===
+export class Option {
+>Option : Symbol(Option, Decl(Option.d.ts, 0, 0))
+
+    someProperty: string;
+>someProperty : Symbol(Option.someProperty, Decl(Option.d.ts, 0, 21))
+}
+=== /shared/lib/app.d.ts ===
+import { Option } from "troublesome-lib/lib/Option";
+>Option : Symbol(Option, Decl(app.d.ts, 0, 8))
+
+export class SharedOption extends Option { }
+>SharedOption : Symbol(SharedOption, Decl(app.d.ts, 0, 52))
+>Option : Symbol(Option, Decl(app.d.ts, 0, 8))
+
+export const makeSharedOption: () => SharedOption;
+>makeSharedOption : Symbol(makeSharedOption, Decl(app.d.ts, 2, 12))
+>SharedOption : Symbol(SharedOption, Decl(app.d.ts, 0, 52))
+
+=== /project/node_modules/anotherLib/index.d.ts ===
+import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable
+>Compactable : Symbol(Compactable, Decl(index.d.ts, 0, 8))
+
+=== /project/node_modules/troublesome-lib/lib/Compactable.d.ts ===
+import { Option } from './Option';
+>Option : Symbol(Option, Decl(Compactable.d.ts, 0, 8))
+
+export class Compactable {
+>Compactable : Symbol(Compactable, Decl(Compactable.d.ts, 0, 34))
+
+    option: Option;
+>option : Symbol(Compactable.option, Decl(Compactable.d.ts, 1, 26))
+>Option : Symbol(Option, Decl(Compactable.d.ts, 0, 8))
+}
+=== /project/node_modules/troublesome-lib/lib/Option.d.ts ===
+export class Option {
+>Option : Symbol(Option, Decl(Option.d.ts, 0, 0))
+
+    someProperty: string;
+>someProperty : Symbol(Option.someProperty, Decl(Option.d.ts, 0, 21))
+}
diff --git a/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json
new file mode 100644
index 00000000000..e3d7b5dea54
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json
@@ -0,0 +1,76 @@
+[
+    "======== Resolving module 'anotherLib' from '/project/src/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "'baseUrl' option is set to '/project', using this value to resolve non-relative module name 'anotherLib'.",
+    "'paths' option is specified, looking for a pattern to match module name 'anotherLib'.",
+    "'baseUrl' option is set to '/project', using this value to resolve non-relative module name 'anotherLib'.",
+    "Resolving module name 'anotherLib' relative to base url '/project' - '/project/anotherLib'.",
+    "Loading module as file / folder, candidate module location '/project/anotherLib', target file type 'TypeScript'.",
+    "File '/project/anotherLib.ts' does not exist.",
+    "File '/project/anotherLib.tsx' does not exist.",
+    "File '/project/anotherLib.d.ts' does not exist.",
+    "Directory '/project/anotherLib' does not exist, skipping all lookups in it.",
+    "Loading module 'anotherLib' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Directory '/project/src/node_modules' does not exist, skipping all lookups in it.",
+    "File '/project/node_modules/anotherLib/package.json' does not exist.",
+    "File '/project/node_modules/anotherLib.ts' does not exist.",
+    "File '/project/node_modules/anotherLib.tsx' does not exist.",
+    "File '/project/node_modules/anotherLib.d.ts' does not exist.",
+    "File '/project/node_modules/anotherLib/index.ts' does not exist.",
+    "File '/project/node_modules/anotherLib/index.tsx' does not exist.",
+    "File '/project/node_modules/anotherLib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/project/node_modules/anotherLib/index.d.ts', result '/project/node_modules/anotherLib/index.d.ts'.",
+    "======== Module name 'anotherLib' was successfully resolved to '/project/node_modules/anotherLib/index.d.ts'. ========",
+    "======== Resolving module '@shared/lib/app' from '/project/src/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "'baseUrl' option is set to '/project', using this value to resolve non-relative module name '@shared/lib/app'.",
+    "'paths' option is specified, looking for a pattern to match module name '@shared/lib/app'.",
+    "Module name '@shared/lib/app', matched pattern '@shared/*'.",
+    "Trying substitution '../shared/*', candidate module location: '../shared/lib/app'.",
+    "Loading module as file / folder, candidate module location '/shared/lib/app', target file type 'TypeScript'.",
+    "File '/shared/lib/app.ts' does not exist.",
+    "File '/shared/lib/app.tsx' does not exist.",
+    "File '/shared/lib/app.d.ts' exist - use it as a name resolution result.",
+    "======== Module name '@shared/lib/app' was successfully resolved to '/shared/lib/app.d.ts'. ========",
+    "======== Resolving module 'troublesome-lib/lib/Compactable' from '/project/node_modules/anotherLib/index.d.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "'baseUrl' option is set to '/project', using this value to resolve non-relative module name 'troublesome-lib/lib/Compactable'.",
+    "'paths' option is specified, looking for a pattern to match module name 'troublesome-lib/lib/Compactable'.",
+    "'baseUrl' option is set to '/project', using this value to resolve non-relative module name 'troublesome-lib/lib/Compactable'.",
+    "Resolving module name 'troublesome-lib/lib/Compactable' relative to base url '/project' - '/project/troublesome-lib/lib/Compactable'.",
+    "Loading module as file / folder, candidate module location '/project/troublesome-lib/lib/Compactable', target file type 'TypeScript'.",
+    "Loading module 'troublesome-lib/lib/Compactable' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Directory '/project/node_modules/anotherLib/node_modules' does not exist, skipping all lookups in it.",
+    "Found 'package.json' at '/project/node_modules/troublesome-lib/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
+    "File '/project/node_modules/troublesome-lib/lib/Compactable.ts' does not exist.",
+    "File '/project/node_modules/troublesome-lib/lib/Compactable.tsx' does not exist.",
+    "File '/project/node_modules/troublesome-lib/lib/Compactable.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/project/node_modules/troublesome-lib/lib/Compactable.d.ts', result '/project/node_modules/troublesome-lib/lib/Compactable.d.ts'.",
+    "======== Module name 'troublesome-lib/lib/Compactable' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Compactable.d.ts' with Package ID 'troublesome-lib/lib/Compactable.d.ts@1.17.1'. ========",
+    "======== Resolving module './Option' from '/project/node_modules/troublesome-lib/lib/Compactable.d.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/project/node_modules/troublesome-lib/lib/Option', target file type 'TypeScript'.",
+    "File '/project/node_modules/troublesome-lib/lib/Option.ts' does not exist.",
+    "File '/project/node_modules/troublesome-lib/lib/Option.tsx' does not exist.",
+    "File '/project/node_modules/troublesome-lib/lib/Option.d.ts' exist - use it as a name resolution result.",
+    "Found 'package.json' at '/project/node_modules/troublesome-lib/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
+    "======== 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 'NodeJs'.",
+    "'baseUrl' option is set to '/project', using this value to resolve non-relative module name 'troublesome-lib/lib/Option'.",
+    "'paths' option is specified, looking for a pattern to match module name 'troublesome-lib/lib/Option'.",
+    "'baseUrl' option is set to '/project', using this value to resolve non-relative module name 'troublesome-lib/lib/Option'.",
+    "Resolving module name 'troublesome-lib/lib/Option' relative to base url '/project' - '/project/troublesome-lib/lib/Option'.",
+    "Loading module as file / folder, candidate module location '/project/troublesome-lib/lib/Option', target file type 'TypeScript'.",
+    "Loading module 'troublesome-lib/lib/Option' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Directory '/shared/lib/node_modules' does not exist, skipping all lookups in it.",
+    "Found 'package.json' at '/shared/node_modules/troublesome-lib/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
+    "File '/shared/node_modules/troublesome-lib/lib/Option.ts' does not exist.",
+    "File '/shared/node_modules/troublesome-lib/lib/Option.tsx' does not exist.",
+    "File '/shared/node_modules/troublesome-lib/lib/Option.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/shared/node_modules/troublesome-lib/lib/Option.d.ts', result '/shared/node_modules/troublesome-lib/lib/Option.d.ts'.",
+    "======== Module name 'troublesome-lib/lib/Option' was successfully resolved to '/shared/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID 'troublesome-lib/lib/Option.d.ts@1.17.1'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
new file mode 100644
index 00000000000..f3aa22e7df2
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
@@ -0,0 +1,46 @@
+=== /project/src/app.ts ===
+import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory
+>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
+
+=== /shared/node_modules/troublesome-lib/lib/Option.d.ts ===
+export class Option {
+>Option : Option
+
+    someProperty: string;
+>someProperty : string
+}
+=== /shared/lib/app.d.ts ===
+import { Option } from "troublesome-lib/lib/Option";
+>Option : typeof Option
+
+export class SharedOption extends Option { }
+>SharedOption : SharedOption
+>Option : Option
+
+export const makeSharedOption: () => SharedOption;
+>makeSharedOption : () => SharedOption
+
+=== /project/node_modules/anotherLib/index.d.ts ===
+import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable
+>Compactable : typeof Compactable
+
+=== /project/node_modules/troublesome-lib/lib/Compactable.d.ts ===
+import { Option } from './Option';
+>Option : typeof Option
+
+export class Compactable {
+>Compactable : Compactable
+
+    option: Option;
+>option : Option
+}
+=== /project/node_modules/troublesome-lib/lib/Option.d.ts ===
+export class Option {
+>Option : Option
+
+    someProperty: string;
+>someProperty : string
+}
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
index d386774db15..28e150aa345 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
@@ -2,11 +2,8 @@
     "======== Resolving module 'normalize.css' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'normalize.css' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'normalize.css' that references '/node_modules/normalize.css/normalize.css'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/normalize.css/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/normalize.css.ts' does not exist.",
     "File '/node_modules/normalize.css.tsx' does not exist.",
     "File '/node_modules/normalize.css.d.ts' does not exist.",
@@ -25,11 +22,8 @@
     "File '/node_modules/normalize.css/index.d.ts' does not exist.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Loading module 'normalize.css' from 'node_modules' folder, target file type 'JavaScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'normalize.css' that references '/node_modules/normalize.css/normalize.css'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/normalize.css/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/normalize.css.js' does not exist.",
     "File '/node_modules/normalize.css.jsx' does not exist.",
     "'package.json' has 'main' field 'normalize.css' that references '/node_modules/normalize.css/normalize.css'.",
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
index 09a7bf81c98..a92c5953af3 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module 'foo' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'foo.js' that references '/node_modules/foo/foo.js'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/foo.ts' does not exist.",
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
@@ -27,10 +25,8 @@
     "File '/node_modules/foo/index.d.ts' does not exist.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'foo.js' that references '/node_modules/foo/foo.js'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/foo.js' does not exist.",
     "File '/node_modules/foo.jsx' does not exist.",
     "'package.json' does not have a 'main' field.",
diff --git a/tests/baselines/reference/moduleResolution_packageJson_notAtPackageRoot.trace.json b/tests/baselines/reference/moduleResolution_packageJson_notAtPackageRoot.trace.json
index dbd645d9d65..a0ff3e6a5f7 100644
--- a/tests/baselines/reference/moduleResolution_packageJson_notAtPackageRoot.trace.json
+++ b/tests/baselines/reference/moduleResolution_packageJson_notAtPackageRoot.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module 'foo/bar' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo/bar' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'types.d.ts' that references '/node_modules/foo/bar/types.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/foo/bar/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/foo/bar.ts' does not exist.",
     "File '/node_modules/foo/bar.tsx' does not exist.",
     "File '/node_modules/foo/bar.d.ts' does not exist.",
diff --git a/tests/baselines/reference/moduleResolution_packageJson_notAtPackageRoot_fakeScopedPackage.trace.json b/tests/baselines/reference/moduleResolution_packageJson_notAtPackageRoot_fakeScopedPackage.trace.json
index e47dcc86b12..ebeee4299fe 100644
--- a/tests/baselines/reference/moduleResolution_packageJson_notAtPackageRoot_fakeScopedPackage.trace.json
+++ b/tests/baselines/reference/moduleResolution_packageJson_notAtPackageRoot_fakeScopedPackage.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module 'foo/@bar' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo/@bar' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'types.d.ts' that references '/node_modules/foo/@bar/types.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/foo/@bar/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/foo/@bar.ts' does not exist.",
     "File '/node_modules/foo/@bar.tsx' does not exist.",
     "File '/node_modules/foo/@bar.d.ts' does not exist.",
diff --git a/tests/baselines/reference/moduleResolution_packageJson_scopedPackage.trace.json b/tests/baselines/reference/moduleResolution_packageJson_scopedPackage.trace.json
index a8e509ff6e8..959e178b57e 100644
--- a/tests/baselines/reference/moduleResolution_packageJson_scopedPackage.trace.json
+++ b/tests/baselines/reference/moduleResolution_packageJson_scopedPackage.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module '@foo/bar' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module '@foo/bar' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'types.d.ts' that references '/node_modules/@foo/bar/types.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@foo/bar/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/@foo/bar.ts' does not exist.",
     "File '/node_modules/@foo/bar.tsx' does not exist.",
     "File '/node_modules/@foo/bar.d.ts' does not exist.",
diff --git a/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot.trace.json b/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot.trace.json
index 873805b8b57..aafca116d0b 100644
--- a/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot.trace.json
+++ b/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot.trace.json
@@ -3,22 +3,31 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo/bar' from 'node_modules' folder, target file type 'TypeScript'.",
     "File '/node_modules/foo/bar/package.json' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/bar/index.d.ts@1.2.3'.",
     "File '/node_modules/foo/bar.ts' does not exist.",
     "File '/node_modules/foo/bar.tsx' does not exist.",
     "File '/node_modules/foo/bar.d.ts' does not exist.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' has 'types' field 'types.d.ts' that references '/node_modules/foo/bar/types.d.ts'.",
+    "File '/node_modules/foo/bar/types.d.ts' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/foo/bar/types.d.ts', target file type 'TypeScript'.",
+    "File '/node_modules/foo/bar/types.d.ts.ts' does not exist.",
+    "File '/node_modules/foo/bar/types.d.ts.tsx' does not exist.",
+    "File '/node_modules/foo/bar/types.d.ts.d.ts' does not exist.",
+    "Directory '/node_modules/foo/bar/types.d.ts' does not exist, skipping all lookups in it.",
     "File '/node_modules/foo/bar/index.ts' does not exist.",
     "File '/node_modules/foo/bar/index.tsx' does not exist.",
     "File '/node_modules/foo/bar/index.d.ts' does not exist.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Loading module 'foo/bar' from 'node_modules' folder, target file type 'JavaScript'.",
     "File '/node_modules/foo/bar/package.json' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/bar/index.d.ts@1.2.3'.",
     "File '/node_modules/foo/bar.js' does not exist.",
     "File '/node_modules/foo/bar.jsx' does not exist.",
+    "'package.json' does not have a 'main' field.",
     "File '/node_modules/foo/bar/index.js' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/foo/bar/index.js', result '/node_modules/foo/bar/index.js'.",
-    "======== Module name 'foo/bar' was successfully resolved to '/node_modules/foo/bar/index.js'. ========"
+    "======== Module name 'foo/bar' was successfully resolved to '/node_modules/foo/bar/index.js' with Package ID 'foo/bar/index.js@1.2.3'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.trace.json b/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.trace.json
index 95beae1393e..f41b1ca0710 100644
--- a/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.trace.json
+++ b/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.trace.json
@@ -3,22 +3,31 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo/@bar' from 'node_modules' folder, target file type 'TypeScript'.",
     "File '/node_modules/foo/@bar/package.json' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/@bar/index.d.ts@1.2.3'.",
     "File '/node_modules/foo/@bar.ts' does not exist.",
     "File '/node_modules/foo/@bar.tsx' does not exist.",
     "File '/node_modules/foo/@bar.d.ts' does not exist.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' has 'types' field 'types.d.ts' that references '/node_modules/foo/@bar/types.d.ts'.",
+    "File '/node_modules/foo/@bar/types.d.ts' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/foo/@bar/types.d.ts', target file type 'TypeScript'.",
+    "File '/node_modules/foo/@bar/types.d.ts.ts' does not exist.",
+    "File '/node_modules/foo/@bar/types.d.ts.tsx' does not exist.",
+    "File '/node_modules/foo/@bar/types.d.ts.d.ts' does not exist.",
+    "Directory '/node_modules/foo/@bar/types.d.ts' does not exist, skipping all lookups in it.",
     "File '/node_modules/foo/@bar/index.ts' does not exist.",
     "File '/node_modules/foo/@bar/index.tsx' does not exist.",
     "File '/node_modules/foo/@bar/index.d.ts' does not exist.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Loading module 'foo/@bar' from 'node_modules' folder, target file type 'JavaScript'.",
     "File '/node_modules/foo/@bar/package.json' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/@bar/index.d.ts@1.2.3'.",
     "File '/node_modules/foo/@bar.js' does not exist.",
     "File '/node_modules/foo/@bar.jsx' does not exist.",
+    "'package.json' does not have a 'main' field.",
     "File '/node_modules/foo/@bar/index.js' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/foo/@bar/index.js', result '/node_modules/foo/@bar/index.js'.",
-    "======== Module name 'foo/@bar' was successfully resolved to '/node_modules/foo/@bar/index.js'. ========"
+    "======== Module name 'foo/@bar' was successfully resolved to '/node_modules/foo/@bar/index.js' with Package ID 'foo/@bar/index.js@1.2.3'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.trace.json b/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.trace.json
index 4d7ae487813..cf2b1082bf8 100644
--- a/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.trace.json
+++ b/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.trace.json
@@ -2,11 +2,8 @@
     "======== Resolving module 'foo' from '/index.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'src/index.js' that references '/node_modules/foo/src/index.js'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/src/index.d.ts@1.2.3'.",
     "File '/node_modules/foo.ts' does not exist.",
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
@@ -23,5 +20,5 @@
     "File '/node_modules/foo/src/index.tsx' does not exist.",
     "File '/node_modules/foo/src/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/foo/src/index.d.ts', result '/node_modules/foo/src/index.d.ts'.",
-    "======== Module name 'foo' was successfully resolved to '/node_modules/foo/src/index.d.ts'. ========"
+    "======== Module name 'foo' was successfully resolved to '/node_modules/foo/src/index.d.ts' with Package ID 'foo/src/index.d.ts@1.2.3'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/packageJsonMain.trace.json b/tests/baselines/reference/packageJsonMain.trace.json
index 1f722312e1d..2144b6eb15c 100644
--- a/tests/baselines/reference/packageJsonMain.trace.json
+++ b/tests/baselines/reference/packageJsonMain.trace.json
@@ -2,11 +2,8 @@
     "======== Resolving module 'foo' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/foo.ts' does not exist.",
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
@@ -24,11 +21,8 @@
     "File '/node_modules/foo/index.d.ts' does not exist.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/foo.js' does not exist.",
     "File '/node_modules/foo.jsx' does not exist.",
     "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
@@ -40,11 +34,8 @@
     "======== Resolving module 'bar' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'bar' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'rab.js' that references '/node_modules/bar/rab.js'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/bar/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/bar.ts' does not exist.",
     "File '/node_modules/bar.tsx' does not exist.",
     "File '/node_modules/bar.d.ts' does not exist.",
@@ -67,11 +58,8 @@
     "File '/node_modules/bar/index.d.ts' does not exist.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Loading module 'bar' from 'node_modules' folder, target file type 'JavaScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'rab.js' that references '/node_modules/bar/rab.js'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/bar/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/bar.js' does not exist.",
     "File '/node_modules/bar.jsx' does not exist.",
     "'package.json' has 'main' field 'rab.js' that references '/node_modules/bar/rab.js'.",
@@ -81,11 +69,8 @@
     "======== Resolving module 'baz' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'baz' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'zab' that references '/node_modules/baz/zab'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/baz/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/baz.ts' does not exist.",
     "File '/node_modules/baz.tsx' does not exist.",
     "File '/node_modules/baz.d.ts' does not exist.",
@@ -105,11 +90,8 @@
     "File '/node_modules/baz/index.d.ts' does not exist.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Loading module 'baz' from 'node_modules' folder, target file type 'JavaScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'zab' that references '/node_modules/baz/zab'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/baz/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/baz.js' does not exist.",
     "File '/node_modules/baz.jsx' does not exist.",
     "'package.json' has 'main' field 'zab' that references '/node_modules/baz/zab'.",
diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
index f2f16ec6aeb..5bdd8a7e90c 100644
--- a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
+++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
@@ -2,11 +2,8 @@
     "======== Resolving module 'foo' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/foo.ts' does not exist.",
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
@@ -26,11 +23,8 @@
     "File '/node_modules/foo/index.d.ts' does not exist.",
     "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/foo.js' does not exist.",
     "File '/node_modules/foo.jsx' does not exist.",
     "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
diff --git a/tests/baselines/reference/typesVersions.ambientModules.trace.json b/tests/baselines/reference/typesVersions.ambientModules.trace.json
index ad73f88a8ef..53de9ae651e 100644
--- a/tests/baselines/reference/typesVersions.ambientModules.trace.json
+++ b/tests/baselines/reference/typesVersions.ambientModules.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module 'ext' from 'tests/cases/conformance/moduleResolution/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/moduleResolution/node_modules/ext/index'.",
+    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'. Package ID is 'ext/index.d.ts@1.0.0'.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext.ts' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext.tsx' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext.d.ts' does not exist.",
@@ -20,18 +18,20 @@
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.tsx' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts', result 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts'.",
-    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts'. ========",
+    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts' with Package ID 'ext/ts3.1/index.d.ts@1.0.0'. ========",
     "======== Resolving module 'ext/other' from 'tests/cases/conformance/moduleResolution/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext/other' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'. Package ID is 'ext/other/index.d.ts@1.0.0'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'other'.",
     "Module name 'other', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/other'.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.ts' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.tsx' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.d.ts' does not exist.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other/index'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'index'.",
     "Module name 'index', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/index'.",
@@ -43,13 +43,14 @@
     "Directory 'node_modules' does not exist, skipping all lookups in it.",
     "Directory '/node_modules' does not exist, skipping all lookups in it.",
     "Loading module 'ext/other' from 'node_modules' folder, target file type 'JavaScript'.",
+    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'. Package ID is 'ext/other/index.d.ts@1.0.0'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'other'.",
     "Module name 'other', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/other'.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.js' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.jsx' does not exist.",
+    "'package.json' does not have a 'main' field.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'index'.",
     "Module name 'index', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/index'.",
diff --git a/tests/baselines/reference/typesVersions.justIndex.trace.json b/tests/baselines/reference/typesVersions.justIndex.trace.json
index 28e4a5cb3bf..263d16b0b4b 100644
--- a/tests/baselines/reference/typesVersions.justIndex.trace.json
+++ b/tests/baselines/reference/typesVersions.justIndex.trace.json
@@ -7,11 +7,8 @@
     "File '/a.ts' does not exist.",
     "File '/a.tsx' does not exist.",
     "File '/a.d.ts' does not exist.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' does not have a 'types' field.",
-    "'package.json' does not have a 'main' field.",
-    "'package.json' has a 'typesVersions' field with version-specific path mappings.",
     "Found 'package.json' at '/a/package.json'.",
+    "'package.json' has a 'typesVersions' field with version-specific path mappings.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "'package.json' does not have a 'main' field.",
diff --git a/tests/baselines/reference/typesVersions.multiFile.trace.json b/tests/baselines/reference/typesVersions.multiFile.trace.json
index d52db48acfe..d487d352948 100644
--- a/tests/baselines/reference/typesVersions.multiFile.trace.json
+++ b/tests/baselines/reference/typesVersions.multiFile.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module 'ext' from 'tests/cases/conformance/moduleResolution/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/moduleResolution/node_modules/ext/index'.",
+    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'. Package ID is 'ext/index.d.ts@1.0.0'.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext.ts' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext.tsx' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext.d.ts' does not exist.",
@@ -20,12 +18,12 @@
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.tsx' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts', result 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts'.",
-    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts'. ========",
+    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/index.d.ts' with Package ID 'ext/ts3.1/index.d.ts@1.0.0'. ========",
     "======== Resolving module 'ext/other' from 'tests/cases/conformance/moduleResolution/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext/other' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/moduleResolution/node_modules/ext/package.json'. Package ID is 'ext/other/index.d.ts@1.0.0'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'other'.",
     "Module name 'other', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/other'.",
@@ -33,5 +31,5 @@
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.tsx' does not exist.",
     "File 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.d.ts', result 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.d.ts'.",
-    "======== Module name 'ext/other' was successfully resolved to 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.d.ts'. ========"
+    "======== Module name 'ext/other' was successfully resolved to 'tests/cases/conformance/moduleResolution/node_modules/ext/ts3.1/other.d.ts' with Package ID 'ext/ts3.1/other.d.ts@1.0.0'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.ambient.trace.json b/tests/baselines/reference/typesVersionsDeclarationEmit.ambient.trace.json
index 2fcf9d052d4..97972b9d1f6 100644
--- a/tests/baselines/reference/typesVersionsDeclarationEmit.ambient.trace.json
+++ b/tests/baselines/reference/typesVersionsDeclarationEmit.ambient.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module 'ext' from 'tests/cases/conformance/declarationEmit/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/declarationEmit/node_modules/ext/index'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/index.d.ts@1.0.0'.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.d.ts' does not exist.",
@@ -20,18 +18,20 @@
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts', result 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'.",
-    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'. ========",
+    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' with Package ID 'ext/ts3.1/index.d.ts@1.0.0'. ========",
     "======== Resolving module 'ext/other' from 'tests/cases/conformance/declarationEmit/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext/other' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/other/index.d.ts@1.0.0'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'other'.",
     "Module name 'other', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/other'.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts' does not exist.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other/index'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'index'.",
     "Module name 'index', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/index'.",
@@ -43,13 +43,14 @@
     "Directory 'node_modules' does not exist, skipping all lookups in it.",
     "Directory '/node_modules' does not exist, skipping all lookups in it.",
     "Loading module 'ext/other' from 'node_modules' folder, target file type 'JavaScript'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/other/index.d.ts@1.0.0'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'other'.",
     "Module name 'other', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/other'.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.js' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.jsx' does not exist.",
+    "'package.json' does not have a 'main' field.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'index'.",
     "Module name 'index', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/index'.",
diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFile.trace.json b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFile.trace.json
index eee9622037b..224839cf26d 100644
--- a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFile.trace.json
+++ b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFile.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module 'ext' from 'tests/cases/conformance/declarationEmit/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/declarationEmit/node_modules/ext/index'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/index.d.ts@1.0.0'.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.d.ts' does not exist.",
@@ -20,12 +18,12 @@
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts', result 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'.",
-    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'. ========",
+    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' with Package ID 'ext/ts3.1/index.d.ts@1.0.0'. ========",
     "======== Resolving module 'ext/other' from 'tests/cases/conformance/declarationEmit/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext/other' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/other/index.d.ts@1.0.0'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'other'.",
     "Module name 'other', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/other'.",
@@ -33,5 +31,5 @@
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts', result 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts'.",
-    "======== Module name 'ext/other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts'. ========"
+    "======== Module name 'ext/other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts' with Package ID 'ext/ts3.1/other.d.ts@1.0.0'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json
index 464da214bae..a89df5a6dfe 100644
--- a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json
+++ b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.trace.json
@@ -2,10 +2,8 @@
     "======== Resolving module '../' from 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location 'tests/cases/conformance/declarationEmit/node_modules/ext/', target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/declarationEmit/node_modules/ext/index'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/ndex/index.d.ts@1.0.0'.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/declarationEmit/node_modules/ext/index'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'index'.",
@@ -16,23 +14,21 @@
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' exist - use it as a name resolution result.",
-    "======== Module name '../' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'. ========",
+    "======== Module name '../' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' with Package ID 'ext/s3.1/index.d.ts@1.0.0'. ========",
     "======== Resolving module '../other' from 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location 'tests/cases/conformance/declarationEmit/node_modules/ext/other', target file type 'TypeScript'.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts' exist - use it as a name resolution result.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/other.d.ts@1.0.0'.",
-    "======== Module name '../other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts'. ========",
+    "======== Module name '../other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts' with Package ID 'ext/other.d.ts@1.0.0'. ========",
     "======== Resolving module 'ext' from 'tests/cases/conformance/declarationEmit/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/declarationEmit/node_modules/ext/index'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/index.d.ts@1.0.0'.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.d.ts' does not exist.",
@@ -47,12 +43,12 @@
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts', result 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'.",
-    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'. ========",
+    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' with Package ID 'ext/ts3.1/index.d.ts@1.0.0'. ========",
     "======== Resolving module 'ext/other' from 'tests/cases/conformance/declarationEmit/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext/other' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/other/index.d.ts@1.0.0'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'other'.",
     "Module name 'other', matched pattern '*'.",
     "Trying substitution 'ts3.1/*', candidate module location: 'ts3.1/other'.",
@@ -60,5 +56,5 @@
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts', result 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts'.",
-    "======== Module name 'ext/other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts'. ========"
+    "======== Module name 'ext/other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/other.d.ts' with Package ID 'ext/ts3.1/other.d.ts@1.0.0'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json
index fe65b605283..7da95cd402c 100644
--- a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json
+++ b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.trace.json
@@ -5,16 +5,14 @@
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts' exist - use it as a name resolution result.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/other.d.ts@1.0.0'.",
-    "======== Module name '../other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts'. ========",
+    "======== Module name '../other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts' with Package ID 'ext/other.d.ts@1.0.0'. ========",
     "======== Resolving module 'ext' from 'tests/cases/conformance/declarationEmit/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext' from 'node_modules' folder, target file type 'TypeScript'.",
-    "'package.json' does not have a 'typings' field.",
-    "'package.json' has 'types' field 'index' that references 'tests/cases/conformance/declarationEmit/node_modules/ext/index'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/index.d.ts@1.0.0'.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext.d.ts' does not exist.",
@@ -29,16 +27,16 @@
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts', result 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'.",
-    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts'. ========",
+    "======== Module name 'ext' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/ts3.1/index.d.ts' with Package ID 'ext/ts3.1/index.d.ts@1.0.0'. ========",
     "======== Resolving module 'ext/other' from 'tests/cases/conformance/declarationEmit/main.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'ext/other' from 'node_modules' folder, target file type 'TypeScript'.",
+    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'.",
     "'package.json' has a 'typesVersions' field with version-specific path mappings.",
-    "Found 'package.json' at 'tests/cases/conformance/declarationEmit/node_modules/ext/package.json'. Package ID is 'ext/other/index.d.ts@1.0.0'.",
     "'package.json' has a 'typesVersions' entry '>=3.1.0-0' that matches compiler version '3.1.0-dev', looking for a pattern to match module name 'other'.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.ts' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.tsx' does not exist.",
     "File 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts', result 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts'.",
-    "======== Module name 'ext/other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts'. ========"
+    "======== Module name 'ext/other' was successfully resolved to 'tests/cases/conformance/declarationEmit/node_modules/ext/other.d.ts' with Package ID 'ext/other.d.ts@1.0.0'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typingsLookup4.trace.json b/tests/baselines/reference/typingsLookup4.trace.json
index 6409896ad17..3ce97d9d8c9 100644
--- a/tests/baselines/reference/typingsLookup4.trace.json
+++ b/tests/baselines/reference/typingsLookup4.trace.json
@@ -5,9 +5,8 @@
     "File '/node_modules/jquery.ts' does not exist.",
     "File '/node_modules/jquery.tsx' does not exist.",
     "File '/node_modules/jquery.d.ts' does not exist.",
-    "'package.json' has 'typings' field 'jquery.d.ts' that references '/node_modules/@types/jquery/jquery.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@types/jquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/@types/jquery.d.ts' does not exist.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references '/node_modules/@types/jquery/jquery.d.ts'.",
     "File '/node_modules/@types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
@@ -19,9 +18,8 @@
     "File '/node_modules/kquery.ts' does not exist.",
     "File '/node_modules/kquery.tsx' does not exist.",
     "File '/node_modules/kquery.d.ts' does not exist.",
-    "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@types/kquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/@types/kquery.d.ts' does not exist.",
     "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
     "File '/node_modules/@types/kquery/kquery' does not exist.",
@@ -37,9 +35,8 @@
     "File '/node_modules/lquery.ts' does not exist.",
     "File '/node_modules/lquery.tsx' does not exist.",
     "File '/node_modules/lquery.d.ts' does not exist.",
-    "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@types/lquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/@types/lquery.d.ts' does not exist.",
     "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
     "File '/node_modules/@types/lquery/lquery' does not exist.",
@@ -53,9 +50,8 @@
     "File '/node_modules/mquery.ts' does not exist.",
     "File '/node_modules/mquery.tsx' does not exist.",
     "File '/node_modules/mquery.d.ts' does not exist.",
-    "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@types/mquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "File '/node_modules/@types/mquery.d.ts' does not exist.",
     "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.",
     "File '/node_modules/@types/mquery/mquery' does not exist.",
@@ -69,18 +65,16 @@
     "======== Module name 'mquery' was successfully resolved to '/node_modules/@types/mquery/mquery/index.tsx'. ========",
     "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'.",
-    "'package.json' has 'typings' field 'jquery.d.ts' that references '/node_modules/@types/jquery/jquery.d.ts'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@types/jquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references '/node_modules/@types/jquery/jquery.d.ts'.",
     "File '/node_modules/@types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@types/jquery/jquery.d.ts', result '/node_modules/@types/jquery/jquery.d.ts'.",
     "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/jquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'kquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'.",
-    "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@types/kquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
     "File '/node_modules/@types/kquery/kquery' does not exist.",
     "Loading module as file / folder, candidate module location '/node_modules/@types/kquery/kquery', target file type 'TypeScript'.",
@@ -91,9 +85,8 @@
     "======== Type reference directive 'kquery' was successfully resolved to '/node_modules/@types/kquery/kquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'lquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'.",
-    "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@types/lquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
     "File '/node_modules/@types/lquery/lquery' does not exist.",
     "Loading module as file / folder, candidate module location '/node_modules/@types/lquery/lquery', target file type 'TypeScript'.",
@@ -102,9 +95,8 @@
     "======== Type reference directive 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts', primary: true. ========",
     "======== Resolving type reference directive 'mquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'.",
-    "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.",
-    "'package.json' does not have a 'typesVersions' field.",
     "Found 'package.json' at '/node_modules/@types/mquery/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
     "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.",
     "File '/node_modules/@types/mquery/mquery' does not exist.",
     "Loading module as file / folder, candidate module location '/node_modules/@types/mquery/mquery', target file type 'TypeScript'.",
diff --git a/tests/cases/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.ts b/tests/cases/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.ts
new file mode 100644
index 00000000000..acbde7b1c7b
--- /dev/null
+++ b/tests/cases/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.ts
@@ -0,0 +1,51 @@
+// @noImplicitReferences: true
+// @fullEmitPaths: true
+// @traceResolution: true
+// @filename: /shared/node_modules/troublesome-lib/package.json
+{
+    "name": "troublesome-lib",
+    "version": "1.17.1"
+}
+// @filename: /shared/node_modules/troublesome-lib/lib/Compactable.d.ts
+import { Option } from './Option';
+export class Compactable {
+    option: Option;
+}
+// @filename: /shared/node_modules/troublesome-lib/lib/Option.d.ts
+export class Option {
+    someProperty: string;
+}
+// @filename: /shared/lib/app.d.ts
+import { Option } from "troublesome-lib/lib/Option";
+export class SharedOption extends Option { }
+export const makeSharedOption: () => SharedOption;
+// @filename: /project/node_modules/anotherLib/index.d.ts
+import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable
+// @filename: /project/node_modules/troublesome-lib/package.json
+{
+    "name": "troublesome-lib",
+    "version": "1.17.1"
+}
+// @filename: /project/node_modules/troublesome-lib/lib/Compactable.d.ts
+import { Option } from './Option';
+export class Compactable {
+    option: Option;
+}
+// @filename: /project/node_modules/troublesome-lib/lib/Option.d.ts
+export class Option {
+    someProperty: string;
+}
+// @filename: /project/src/app.ts
+import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory
+import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder
+
+// @filename: /project/tsconfig.json
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "@shared/*": ["../shared/*"]
+        }
+    },
+   //"files": ["src/app.ts"]
+}
\ No newline at end of file