diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index aeb90104f5c..2edf4ada5a1 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8768,8 +8768,15 @@ namespace ts {
             }
             if (symbol.flags & SymbolFlags.ModuleExports) {
                 const fileSymbol = getSymbolOfNode(getSourceFileOfNode(symbol.valueDeclaration));
+                const result = createSymbol(fileSymbol.flags, "exports" as __String);
+                result.declarations = fileSymbol.declarations ? fileSymbol.declarations.slice() : [];
+                result.parent = symbol;
+                result.target = fileSymbol;
+                if (fileSymbol.valueDeclaration) result.valueDeclaration = fileSymbol.valueDeclaration;
+                if (fileSymbol.members) result.members = new Map(fileSymbol.members);
+                if (fileSymbol.exports) result.exports = new Map(fileSymbol.exports);
                 const members = createSymbolTable();
-                members.set("exports" as __String, fileSymbol);
+                members.set("exports" as __String, result);
                 return createAnonymousType(symbol, members, emptyArray, emptyArray, undefined, undefined);
             }
             // Handle catch clause variables
diff --git a/tests/baselines/reference/binderUninitializedModuleExportsAssignment.symbols b/tests/baselines/reference/binderUninitializedModuleExportsAssignment.symbols
index 73777fb2299..0e501f14c85 100644
--- a/tests/baselines/reference/binderUninitializedModuleExportsAssignment.symbols
+++ b/tests/baselines/reference/binderUninitializedModuleExportsAssignment.symbols
@@ -8,7 +8,7 @@ var loop2 = loop1;
 >loop1 : Symbol(loop1, Decl(loop.js, 0, 3))
 
 module.exports = loop2;
->module.exports : Symbol("tests/cases/conformance/salsa/loop", Decl(loop.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(loop.js, 0, 0))
 >module : Symbol(export=, Decl(loop.js, 1, 18))
 >exports : Symbol(export=, Decl(loop.js, 1, 18))
 >loop2 : Symbol(loop2, Decl(loop.js, 1, 3))
diff --git a/tests/baselines/reference/binderUninitializedModuleExportsAssignment.types b/tests/baselines/reference/binderUninitializedModuleExportsAssignment.types
index d1576b85886..7a6fee6cddf 100644
--- a/tests/baselines/reference/binderUninitializedModuleExportsAssignment.types
+++ b/tests/baselines/reference/binderUninitializedModuleExportsAssignment.types
@@ -10,7 +10,7 @@ var loop2 = loop1;
 module.exports = loop2;
 >module.exports = loop2 : any
 >module.exports : any
->module : { "\"tests/cases/conformance/salsa/loop\"": any; }
+>module : { exports: any; }
 >exports : any
 >loop2 : any
 
diff --git a/tests/baselines/reference/callbackCrossModule.symbols b/tests/baselines/reference/callbackCrossModule.symbols
index 9de5c8ffbf3..80a5a9451b0 100644
--- a/tests/baselines/reference/callbackCrossModule.symbols
+++ b/tests/baselines/reference/callbackCrossModule.symbols
@@ -4,7 +4,7 @@
  * @return {any} I don't even know what this should return
  */
 module.exports = C
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 >C : Symbol(C, Decl(mod1.js, 4, 18))
diff --git a/tests/baselines/reference/callbackCrossModule.types b/tests/baselines/reference/callbackCrossModule.types
index 5138fca3471..c3d88c890ac 100644
--- a/tests/baselines/reference/callbackCrossModule.types
+++ b/tests/baselines/reference/callbackCrossModule.types
@@ -6,7 +6,7 @@
 module.exports = C
 >module.exports = C : typeof C
 >module.exports : typeof C
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof C; }
+>module : { exports: typeof C; }
 >exports : typeof C
 >C : typeof C
 
diff --git a/tests/baselines/reference/checkExportsObjectAssignProperty.symbols b/tests/baselines/reference/checkExportsObjectAssignProperty.symbols
index e1dcacbfe2c..df426ed4efc 100644
--- a/tests/baselines/reference/checkExportsObjectAssignProperty.symbols
+++ b/tests/baselines/reference/checkExportsObjectAssignProperty.symbols
@@ -202,9 +202,9 @@ Object.defineProperty(module.exports, "thing", { value: "yes", writable: true })
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >module : Symbol(module, Decl(mod2.js, 0, 22))
->exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >"thing" : Symbol(thing, Decl(mod2.js, 0, 0))
 >value : Symbol(value, Decl(mod2.js, 0, 48))
 >writable : Symbol(writable, Decl(mod2.js, 0, 62))
@@ -213,9 +213,9 @@ Object.defineProperty(module.exports, "readonlyProp", { value: "Smith", writable
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >module : Symbol(module, Decl(mod2.js, 0, 22))
->exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >"readonlyProp" : Symbol(readonlyProp, Decl(mod2.js, 0, 81))
 >value : Symbol(value, Decl(mod2.js, 1, 55))
 >writable : Symbol(writable, Decl(mod2.js, 1, 71))
@@ -224,9 +224,9 @@ Object.defineProperty(module.exports, "rwAccessors", { get() { return 98122 }, s
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >module : Symbol(module, Decl(mod2.js, 0, 22))
->exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >"rwAccessors" : Symbol(rwAccessors, Decl(mod2.js, 1, 91))
 >get : Symbol(get, Decl(mod2.js, 2, 54))
 >set : Symbol(set, Decl(mod2.js, 2, 78))
@@ -236,9 +236,9 @@ Object.defineProperty(module.exports, "readonlyAccessor", { get() { return 21.75
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >module : Symbol(module, Decl(mod2.js, 0, 22))
->exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >"readonlyAccessor" : Symbol(readonlyAccessor, Decl(mod2.js, 2, 104))
 >get : Symbol(get, Decl(mod2.js, 3, 59))
 
@@ -246,9 +246,9 @@ Object.defineProperty(module.exports, "setonlyAccessor", {
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >module : Symbol(module, Decl(mod2.js, 0, 22))
->exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >"setonlyAccessor" : Symbol(setonlyAccessor, Decl(mod2.js, 3, 86))
 
     /** @param {string} str */
diff --git a/tests/baselines/reference/checkExportsObjectAssignProperty.types b/tests/baselines/reference/checkExportsObjectAssignProperty.types
index 78bbbc8f355..a029a2aef6d 100644
--- a/tests/baselines/reference/checkExportsObjectAssignProperty.types
+++ b/tests/baselines/reference/checkExportsObjectAssignProperty.types
@@ -255,9 +255,9 @@ Object.defineProperty(module.exports, "thing", { value: "yes", writable: true })
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod2")
->module : { "\"tests/cases/conformance/jsdoc/mod2\"": typeof import("tests/cases/conformance/jsdoc/mod2"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod2")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"thing" : "thing"
 >{ value: "yes", writable: true } : { value: string; writable: true; }
 >value : string
@@ -270,9 +270,9 @@ Object.defineProperty(module.exports, "readonlyProp", { value: "Smith", writable
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod2")
->module : { "\"tests/cases/conformance/jsdoc/mod2\"": typeof import("tests/cases/conformance/jsdoc/mod2"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod2")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"readonlyProp" : "readonlyProp"
 >{ value: "Smith", writable: false } : { value: string; writable: false; }
 >value : string
@@ -285,9 +285,9 @@ Object.defineProperty(module.exports, "rwAccessors", { get() { return 98122 }, s
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod2")
->module : { "\"tests/cases/conformance/jsdoc/mod2\"": typeof import("tests/cases/conformance/jsdoc/mod2"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod2")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"rwAccessors" : "rwAccessors"
 >{ get() { return 98122 }, set(_) { /*ignore*/ } } : { get(): number; set(_: any): void; }
 >get : () => number
@@ -300,9 +300,9 @@ Object.defineProperty(module.exports, "readonlyAccessor", { get() { return 21.75
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod2")
->module : { "\"tests/cases/conformance/jsdoc/mod2\"": typeof import("tests/cases/conformance/jsdoc/mod2"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod2")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"readonlyAccessor" : "readonlyAccessor"
 >{ get() { return 21.75 } } : { get(): number; }
 >get : () => number
@@ -313,9 +313,9 @@ Object.defineProperty(module.exports, "setonlyAccessor", {
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod2")
->module : { "\"tests/cases/conformance/jsdoc/mod2\"": typeof import("tests/cases/conformance/jsdoc/mod2"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod2")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"setonlyAccessor" : "setonlyAccessor"
 >{    /** @param {string} str */    set(str) {        this.rwAccessors = Number(str)     }} : { set(str: string): void; }
 
diff --git a/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.symbols b/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.symbols
index 051a342a2b5..c06d66518ec 100644
--- a/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.symbols
+++ b/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.symbols
@@ -170,7 +170,7 @@ Object.defineProperty(Person.prototype, "setonlyAccessor", {
     }
 });
 module.exports = Person;
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 19, 3))
 >exports : Symbol(export=, Decl(mod1.js, 19, 3))
 >Person : Symbol(Person, Decl(mod1.js, 0, 0))
diff --git a/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types b/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types
index 77875ad8c63..085f6cf008e 100644
--- a/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types
+++ b/tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types
@@ -214,7 +214,7 @@ Object.defineProperty(Person.prototype, "setonlyAccessor", {
 module.exports = Person;
 >module.exports = Person : typeof Person
 >module.exports : typeof Person
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof Person; }
+>module : { exports: typeof Person; }
 >exports : typeof Person
 >Person : typeof Person
 
diff --git a/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.symbols b/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.symbols
index 3385a5bb58c..34b50108d30 100644
--- a/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.symbols
+++ b/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.symbols
@@ -22,7 +22,7 @@ export = Foo;
 /** @typedef {(foo: Foo) => string} FooFun */
 
 module.exports = /** @type {FooFun} */(void 0);
->module.exports : Symbol("tests/cases/compiler/something", Decl(something.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(something.js, 0, 0))
 >module : Symbol(export=, Decl(something.js, 0, 0))
 >exports : Symbol(export=, Decl(something.js, 0, 0))
 
diff --git a/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.types b/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.types
index c9ddb407381..d3c62c6f0ab 100644
--- a/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.types
+++ b/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.types
@@ -24,7 +24,7 @@ export = Foo;
 module.exports = /** @type {FooFun} */(void 0);
 >module.exports = /** @type {FooFun} */(void 0) : (foo: Foo) => string
 >module.exports : (foo: typeof import("tests/cases/compiler/file")) => string
->module : { "\"tests/cases/compiler/something\"": (foo: typeof import("tests/cases/compiler/file")) => string; }
+>module : { exports: (foo: typeof import("tests/cases/compiler/file")) => string; }
 >exports : (foo: typeof import("tests/cases/compiler/file")) => string
 >(void 0) : FooFun
 >void 0 : undefined
diff --git a/tests/baselines/reference/checkObjectDefineProperty.symbols b/tests/baselines/reference/checkObjectDefineProperty.symbols
index 6b746640af8..0552f8fcf49 100644
--- a/tests/baselines/reference/checkObjectDefineProperty.symbols
+++ b/tests/baselines/reference/checkObjectDefineProperty.symbols
@@ -196,7 +196,7 @@ match(() => expected, (x = expected) => void 0);
 >expected : Symbol(expected, Decl(index.js, 32, 5))
 
 module.exports = x;
->module.exports : Symbol("tests/cases/conformance/jsdoc/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 41, 48))
 >exports : Symbol(export=, Decl(index.js, 41, 48))
 >x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
diff --git a/tests/baselines/reference/checkObjectDefineProperty.types b/tests/baselines/reference/checkObjectDefineProperty.types
index 05359b68bb1..79467e4dc2e 100644
--- a/tests/baselines/reference/checkObjectDefineProperty.types
+++ b/tests/baselines/reference/checkObjectDefineProperty.types
@@ -249,7 +249,7 @@ match(() => expected, (x = expected) => void 0);
 module.exports = x;
 >module.exports = x : typeof x
 >module.exports : typeof x
->module : { "\"tests/cases/conformance/jsdoc/index\"": typeof x; }
+>module : { exports: typeof x; }
 >exports : typeof x
 >x : typeof x
 
diff --git a/tests/baselines/reference/commonJSReexport.symbols b/tests/baselines/reference/commonJSReexport.symbols
index 7b31548415f..73225e001c8 100644
--- a/tests/baselines/reference/commonJSReexport.symbols
+++ b/tests/baselines/reference/commonJSReexport.symbols
@@ -17,9 +17,9 @@ const hardline = { type: "hard" }
 >type : Symbol(type, Decl(first.js, 2, 18))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/salsa/first", Decl(first.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(first.js, 0, 0))
 >module : Symbol(module, Decl(first.js, 2, 33))
->exports : Symbol("tests/cases/conformance/salsa/first", Decl(first.js, 0, 0))
+>exports : Symbol(module.exports, Decl(first.js, 0, 0))
 
   hardline
 >hardline : Symbol(hardline, Decl(first.js, 3, 18))
@@ -28,7 +28,7 @@ module.exports = {
 
 === tests/cases/conformance/salsa/second.js ===
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/salsa/second", Decl(second.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(second.js, 0, 0))
 >module : Symbol(export=, Decl(second.js, 0, 0))
 >exports : Symbol(export=, Decl(second.js, 0, 0))
 
diff --git a/tests/baselines/reference/commonJSReexport.types b/tests/baselines/reference/commonJSReexport.types
index 84e98c4fea0..1b8ec20f349 100644
--- a/tests/baselines/reference/commonJSReexport.types
+++ b/tests/baselines/reference/commonJSReexport.types
@@ -20,10 +20,10 @@ const hardline = { type: "hard" }
 >"hard" : "hard"
 
 module.exports = {
->module.exports = {  hardline} : typeof import("tests/cases/conformance/salsa/first")
->module.exports : typeof import("tests/cases/conformance/salsa/first")
->module : { "\"tests/cases/conformance/salsa/first\"": typeof import("tests/cases/conformance/salsa/first"); }
->exports : typeof import("tests/cases/conformance/salsa/first")
+>module.exports = {  hardline} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{  hardline} : { hardline: { type: string; }; }
 
   hardline
@@ -35,7 +35,7 @@ module.exports = {
 module.exports = {
 >module.exports = {  nested: require('./first')} : { nested: typeof import("tests/cases/conformance/salsa/first"); }
 >module.exports : { nested: typeof import("tests/cases/conformance/salsa/first"); }
->module : { "\"tests/cases/conformance/salsa/second\"": { nested: typeof import("tests/cases/conformance/salsa/first"); }; }
+>module : { exports: { nested: typeof import("tests/cases/conformance/salsa/first"); }; }
 >exports : { nested: typeof import("tests/cases/conformance/salsa/first"); }
 >{  nested: require('./first')} : { nested: typeof import("tests/cases/conformance/salsa/first"); }
 
diff --git a/tests/baselines/reference/commonJsIsolatedModules.symbols b/tests/baselines/reference/commonJsIsolatedModules.symbols
index f0f9d0d7855..af28f884f0e 100644
--- a/tests/baselines/reference/commonJsIsolatedModules.symbols
+++ b/tests/baselines/reference/commonJsIsolatedModules.symbols
@@ -1,8 +1,8 @@
 === tests/cases/compiler/index.js ===
 module.exports = {}
->module.exports : Symbol("tests/cases/compiler/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/compiler/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 
 var x = 1
 >x : Symbol(x, Decl(index.js, 1, 3))
diff --git a/tests/baselines/reference/commonJsIsolatedModules.types b/tests/baselines/reference/commonJsIsolatedModules.types
index 12da6a2e0a7..986988648c9 100644
--- a/tests/baselines/reference/commonJsIsolatedModules.types
+++ b/tests/baselines/reference/commonJsIsolatedModules.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/index.js ===
 module.exports = {}
->module.exports = {} : typeof import("tests/cases/compiler/index")
->module.exports : typeof import("tests/cases/compiler/index")
->module : { "\"tests/cases/compiler/index\"": typeof import("tests/cases/compiler/index"); }
->exports : typeof import("tests/cases/compiler/index")
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
 var x = 1
diff --git a/tests/baselines/reference/constructorFunctions2.symbols b/tests/baselines/reference/constructorFunctions2.symbols
index d0b5b991cce..35a24c915f3 100644
--- a/tests/baselines/reference/constructorFunctions2.symbols
+++ b/tests/baselines/reference/constructorFunctions2.symbols
@@ -56,7 +56,7 @@ function A() { this.id = 1; }
 >id : Symbol(A.id, Decl(other.js, 0, 14))
 
 module.exports = A;
->module.exports : Symbol("tests/cases/conformance/salsa/other", Decl(other.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(other.js, 0, 0))
 >module : Symbol(export=, Decl(other.js, 0, 29))
 >exports : Symbol(export=, Decl(other.js, 0, 29))
 >A : Symbol(A, Decl(other.js, 0, 0))
diff --git a/tests/baselines/reference/constructorFunctions2.types b/tests/baselines/reference/constructorFunctions2.types
index 8b1f3711770..ad5b7b69a38 100644
--- a/tests/baselines/reference/constructorFunctions2.types
+++ b/tests/baselines/reference/constructorFunctions2.types
@@ -71,7 +71,7 @@ function A() { this.id = 1; }
 module.exports = A;
 >module.exports = A : typeof A
 >module.exports : typeof A
->module : { "\"tests/cases/conformance/salsa/other\"": typeof A; }
+>module : { exports: typeof A; }
 >exports : typeof A
 >A : typeof A
 
diff --git a/tests/baselines/reference/contextualTypedSpecialAssignment.symbols b/tests/baselines/reference/contextualTypedSpecialAssignment.symbols
index c185640d897..01047ffb7f5 100644
--- a/tests/baselines/reference/contextualTypedSpecialAssignment.symbols
+++ b/tests/baselines/reference/contextualTypedSpecialAssignment.symbols
@@ -103,7 +103,7 @@ module.exports.y = {
 >module.exports.y : Symbol(y, Decl(test.js, 45, 9))
 >module.exports : Symbol(y, Decl(test.js, 45, 9))
 >module : Symbol(module, Decl(test.js, 45, 9))
->exports : Symbol("tests/cases/conformance/salsa/test", Decl(test.js, 0, 0))
+>exports : Symbol(module.exports, Decl(test.js, 0, 0))
 >y : Symbol(y, Decl(test.js, 45, 9))
 
     status: "done",
@@ -115,9 +115,9 @@ module.exports.y = {
 }
 module.exports.y
 >module.exports.y : Symbol(y, Decl(test.js, 45, 9))
->module.exports : Symbol("tests/cases/conformance/salsa/test", Decl(test.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(test.js, 0, 0))
 >module : Symbol(module, Decl(test.js, 45, 9))
->exports : Symbol("tests/cases/conformance/salsa/test", Decl(test.js, 0, 0))
+>exports : Symbol(module.exports, Decl(test.js, 0, 0))
 >y : Symbol(y, Decl(test.js, 45, 9))
 
 // prototype-property assignment
@@ -165,7 +165,7 @@ F.prototype = {
 // module.exports assignment
 /** @type {{ status: 'done', m(n: number): void }} */
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >module : Symbol(export=, Decl(mod.js, 0, 0))
 >exports : Symbol(export=, Decl(mod.js, 0, 0))
 
diff --git a/tests/baselines/reference/contextualTypedSpecialAssignment.types b/tests/baselines/reference/contextualTypedSpecialAssignment.types
index fe6711a3307..494532a5eae 100644
--- a/tests/baselines/reference/contextualTypedSpecialAssignment.types
+++ b/tests/baselines/reference/contextualTypedSpecialAssignment.types
@@ -118,9 +118,9 @@ exports.x
 module.exports.y = {
 >module.exports.y = {    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 >module.exports.y : DoneStatus
->module.exports : typeof import("tests/cases/conformance/salsa/test")
->module : { "\"tests/cases/conformance/salsa/test\"": typeof import("tests/cases/conformance/salsa/test"); }
->exports : typeof import("tests/cases/conformance/salsa/test")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >y : DoneStatus
 >{    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 
@@ -134,9 +134,9 @@ module.exports.y = {
 }
 module.exports.y
 >module.exports.y : DoneStatus
->module.exports : typeof import("tests/cases/conformance/salsa/test")
->module : { "\"tests/cases/conformance/salsa/test\"": typeof import("tests/cases/conformance/salsa/test"); }
->exports : typeof import("tests/cases/conformance/salsa/test")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >y : DoneStatus
 
 // prototype-property assignment
@@ -192,7 +192,7 @@ F.prototype = {
 module.exports = {
 >module.exports = {    status: "done",    m(n) { }} : { status: 'done'; m(n: number): void; }
 >module.exports : { status: "done"; m(n: number): void; }
->module : { "\"tests/cases/conformance/salsa/mod\"": { status: "done"; m(n: number): void; }; }
+>module : { exports: { status: "done"; m(n: number): void; }; }
 >exports : { status: "done"; m(n: number): void; }
 >{    status: "done",    m(n) { }} : { status: "done"; m(n: number): void; }
 
diff --git a/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols b/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
index 41ba9b444c7..4b0737b3fc0 100644
--- a/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
+++ b/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
@@ -5,7 +5,7 @@ const _item = require("./namespacer");
 >"./namespacer" : Symbol("tests/cases/compiler/namespacer", Decl(namespacer.js, 0, 0))
 
 module.exports = 12;
->module.exports : Symbol("tests/cases/compiler/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 38))
 >exports : Symbol(export=, Decl(index.js, 0, 38))
 
@@ -28,7 +28,7 @@ A.bar = class Q {}
 >Q : Symbol(Q, Decl(namespacey.js, 1, 7))
 
 module.exports = A;
->module.exports : Symbol("tests/cases/compiler/namespacey", Decl(namespacey.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(namespacey.js, 0, 0))
 >module : Symbol(export=, Decl(namespacey.js, 1, 18))
 >exports : Symbol(export=, Decl(namespacey.js, 1, 18))
 >A : Symbol(A, Decl(namespacey.js, 0, 5), Decl(namespacey.js, 0, 12))
@@ -54,7 +54,7 @@ Object.defineProperty(B, "NS", { value: "why though", writable: true });
 >writable : Symbol(writable, Decl(namespacer.js, 2, 53))
 
 module.exports = B;
->module.exports : Symbol("tests/cases/compiler/namespacer", Decl(namespacer.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(namespacer.js, 0, 0))
 >module : Symbol(export=, Decl(namespacer.js, 2, 72))
 >exports : Symbol(export=, Decl(namespacer.js, 2, 72))
 >B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12), Decl(namespacer.js, 2, 22))
diff --git a/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.types b/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.types
index f9bd4704f28..eb25a6fbbef 100644
--- a/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.types
+++ b/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.types
@@ -39,7 +39,7 @@ A.bar = class Q {}
 module.exports = A;
 >module.exports = A : typeof A
 >module.exports : typeof A
->module : { "\"tests/cases/compiler/namespacey\"": typeof A; }
+>module : { exports: typeof A; }
 >exports : typeof A
 >A : typeof A
 
@@ -73,7 +73,7 @@ Object.defineProperty(B, "NS", { value: "why though", writable: true });
 module.exports = B;
 >module.exports = B : typeof B
 >module.exports : typeof B
->module : { "\"tests/cases/compiler/namespacer\"": typeof B; }
+>module : { exports: typeof B; }
 >exports : typeof B
 >B : typeof B
 
diff --git a/tests/baselines/reference/enumTagOnExports.symbols b/tests/baselines/reference/enumTagOnExports.symbols
index 89257c00d49..e829b009cc3 100644
--- a/tests/baselines/reference/enumTagOnExports.symbols
+++ b/tests/baselines/reference/enumTagOnExports.symbols
@@ -10,6 +10,6 @@ module.exports.b = {};
 >module.exports.b : Symbol(b, Decl(enumTagOnExports.js, 1, 15), Decl(enumTagOnExports.js, 4, 15), Decl(enumTagOnExports.js, 3, 4))
 >module.exports : Symbol(b, Decl(enumTagOnExports.js, 1, 15), Decl(enumTagOnExports.js, 4, 15), Decl(enumTagOnExports.js, 3, 4))
 >module : Symbol(module, Decl(enumTagOnExports.js, 1, 15))
->exports : Symbol("tests/cases/conformance/jsdoc/enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
+>exports : Symbol(module.exports, Decl(enumTagOnExports.js, 0, 0))
 >b : Symbol(b, Decl(enumTagOnExports.js, 1, 15), Decl(enumTagOnExports.js, 4, 15), Decl(enumTagOnExports.js, 3, 4))
 
diff --git a/tests/baselines/reference/enumTagOnExports.types b/tests/baselines/reference/enumTagOnExports.types
index ff4333e69e6..7cfcb257c97 100644
--- a/tests/baselines/reference/enumTagOnExports.types
+++ b/tests/baselines/reference/enumTagOnExports.types
@@ -11,9 +11,9 @@ exports.a = {};
 module.exports.b = {};
 >module.exports.b = {} : {}
 >module.exports.b : typeof b
->module.exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
->module : { "\"tests/cases/conformance/jsdoc/enumTagOnExports\"": typeof import("tests/cases/conformance/jsdoc/enumTagOnExports"); }
->exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >b : typeof b
 >{} : {}
 
diff --git a/tests/baselines/reference/enumTagOnExports2.symbols b/tests/baselines/reference/enumTagOnExports2.symbols
index 9bca24fe024..4aae5916873 100644
--- a/tests/baselines/reference/enumTagOnExports2.symbols
+++ b/tests/baselines/reference/enumTagOnExports2.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/jsdoc/enumTagOnExports.js ===
 /** @enum {string} */
 module.exports = {};
->module.exports : Symbol("tests/cases/conformance/jsdoc/enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(enumTagOnExports.js, 0, 0))
 >module : Symbol(module, Decl(enumTagOnExports.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
+>exports : Symbol(module.exports, Decl(enumTagOnExports.js, 0, 0))
 
diff --git a/tests/baselines/reference/enumTagOnExports2.types b/tests/baselines/reference/enumTagOnExports2.types
index 4694f1f14b2..5e638473be8 100644
--- a/tests/baselines/reference/enumTagOnExports2.types
+++ b/tests/baselines/reference/enumTagOnExports2.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/jsdoc/enumTagOnExports.js ===
 /** @enum {string} */
 module.exports = {};
->module.exports = {} : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
->module.exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
->module : { "\"tests/cases/conformance/jsdoc/enumTagOnExports\"": typeof import("tests/cases/conformance/jsdoc/enumTagOnExports"); }
->exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
diff --git a/tests/baselines/reference/expandoFunctionContextualTypesJs.symbols b/tests/baselines/reference/expandoFunctionContextualTypesJs.symbols
index bf0ef14f438..5d5696d84bd 100644
--- a/tests/baselines/reference/expandoFunctionContextualTypesJs.symbols
+++ b/tests/baselines/reference/expandoFunctionContextualTypesJs.symbols
@@ -72,7 +72,7 @@ function foo() {
  * @type {MyComponentProps}
  */
 module.exports = {
->module.exports : Symbol("tests/cases/compiler/input", Decl(input.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(input.js, 0, 0))
 >module : Symbol(export=, Decl(input.js, 42, 1))
 >exports : Symbol(export=, Decl(input.js, 42, 1))
 
@@ -83,7 +83,7 @@ module.exports = {
 expectLiteral({ props: module.exports });
 >expectLiteral : Symbol(expectLiteral, Decl(input.js, 27, 27))
 >props : Symbol(props, Decl(input.js, 51, 15))
->module.exports : Symbol("tests/cases/compiler/input", Decl(input.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(input.js, 0, 0))
 >module : Symbol(module, Decl(input.js, 42, 1), Decl(input.js, 51, 22))
->exports : Symbol("tests/cases/compiler/input", Decl(input.js, 0, 0))
+>exports : Symbol(module.exports, Decl(input.js, 0, 0))
 
diff --git a/tests/baselines/reference/expandoFunctionContextualTypesJs.types b/tests/baselines/reference/expandoFunctionContextualTypesJs.types
index 9ef980d47bf..c2a32db4249 100644
--- a/tests/baselines/reference/expandoFunctionContextualTypesJs.types
+++ b/tests/baselines/reference/expandoFunctionContextualTypesJs.types
@@ -89,7 +89,7 @@ function foo() {
 module.exports = {
 >module.exports = {    color: "red"} : MyComponentProps
 >module.exports : MyComponentProps
->module : { "\"tests/cases/compiler/input\"": MyComponentProps; }
+>module : { exports: MyComponentProps; }
 >exports : MyComponentProps
 >{    color: "red"} : { color: "red"; }
 
@@ -104,6 +104,6 @@ expectLiteral({ props: module.exports });
 >{ props: module.exports } : { props: MyComponentProps; }
 >props : MyComponentProps
 >module.exports : MyComponentProps
->module : { "\"tests/cases/compiler/input\"": MyComponentProps; }
+>module : { exports: MyComponentProps; }
 >exports : MyComponentProps
 
diff --git a/tests/baselines/reference/exportPropertyAssignmentNameResolution.symbols b/tests/baselines/reference/exportPropertyAssignmentNameResolution.symbols
index df6d56766bc..eaa7581dec0 100644
--- a/tests/baselines/reference/exportPropertyAssignmentNameResolution.symbols
+++ b/tests/baselines/reference/exportPropertyAssignmentNameResolution.symbols
@@ -3,7 +3,7 @@ module.exports.D = class { }
 >module.exports.D : Symbol(D, Decl(bug24492.js, 0, 0))
 >module.exports : Symbol(D, Decl(bug24492.js, 0, 0))
 >module : Symbol(module, Decl(bug24492.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/bug24492", Decl(bug24492.js, 0, 0))
+>exports : Symbol(module.exports, Decl(bug24492.js, 0, 0))
 >D : Symbol(D, Decl(bug24492.js, 0, 0))
 
 new D()
diff --git a/tests/baselines/reference/exportPropertyAssignmentNameResolution.types b/tests/baselines/reference/exportPropertyAssignmentNameResolution.types
index cf9d2e85917..9ce801eb04d 100644
--- a/tests/baselines/reference/exportPropertyAssignmentNameResolution.types
+++ b/tests/baselines/reference/exportPropertyAssignmentNameResolution.types
@@ -2,9 +2,9 @@
 module.exports.D = class { }
 >module.exports.D = class { } : typeof D
 >module.exports.D : typeof D
->module.exports : typeof import("tests/cases/conformance/salsa/bug24492")
->module : { "\"tests/cases/conformance/salsa/bug24492\"": typeof import("tests/cases/conformance/salsa/bug24492"); }
->exports : typeof import("tests/cases/conformance/salsa/bug24492")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >D : typeof D
 >class { } : typeof D
 
diff --git a/tests/baselines/reference/exportedAliasedEnumTag.symbols b/tests/baselines/reference/exportedAliasedEnumTag.symbols
index 81cc69aa7e0..e3642158a0a 100644
--- a/tests/baselines/reference/exportedAliasedEnumTag.symbols
+++ b/tests/baselines/reference/exportedAliasedEnumTag.symbols
@@ -1,9 +1,9 @@
 === tests/cases/conformance/jsdoc/exportedAliasedEnumTag.js ===
 var middlewarify = module.exports = {};
 >middlewarify : Symbol(middlewarify, Decl(exportedAliasedEnumTag.js, 0, 3))
->module.exports : Symbol("tests/cases/conformance/jsdoc/exportedAliasedEnumTag", Decl(exportedAliasedEnumTag.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(exportedAliasedEnumTag.js, 0, 0))
 >module : Symbol(module, Decl(exportedAliasedEnumTag.js, 0, 18))
->exports : Symbol("tests/cases/conformance/jsdoc/exportedAliasedEnumTag", Decl(exportedAliasedEnumTag.js, 0, 0))
+>exports : Symbol(module.exports, Decl(exportedAliasedEnumTag.js, 0, 0))
 
 /** @enum */
 middlewarify.Type = {
diff --git a/tests/baselines/reference/exportedAliasedEnumTag.types b/tests/baselines/reference/exportedAliasedEnumTag.types
index b4c14bc52b2..19c94e99ad8 100644
--- a/tests/baselines/reference/exportedAliasedEnumTag.types
+++ b/tests/baselines/reference/exportedAliasedEnumTag.types
@@ -1,17 +1,17 @@
 === tests/cases/conformance/jsdoc/exportedAliasedEnumTag.js ===
 var middlewarify = module.exports = {};
->middlewarify : typeof import("tests/cases/conformance/jsdoc/exportedAliasedEnumTag")
->module.exports = {} : typeof import("tests/cases/conformance/jsdoc/exportedAliasedEnumTag")
->module.exports : typeof import("tests/cases/conformance/jsdoc/exportedAliasedEnumTag")
->module : { "\"tests/cases/conformance/jsdoc/exportedAliasedEnumTag\"": typeof import("tests/cases/conformance/jsdoc/exportedAliasedEnumTag"); }
->exports : typeof import("tests/cases/conformance/jsdoc/exportedAliasedEnumTag")
+>middlewarify : typeof module.exports
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
 /** @enum */
 middlewarify.Type = {
 >middlewarify.Type = {  BEFORE: 'before'} : { BEFORE: string; }
 >middlewarify.Type : { BEFORE: string; }
->middlewarify : typeof import("tests/cases/conformance/jsdoc/exportedAliasedEnumTag")
+>middlewarify : typeof module.exports
 >Type : { BEFORE: string; }
 >{  BEFORE: 'before'} : { BEFORE: string; }
 
diff --git a/tests/baselines/reference/findAllRefs_importType_js.3.baseline.jsonc b/tests/baselines/reference/findAllRefs_importType_js.3.baseline.jsonc
index b7ca959132a..26e86ead593 100644
--- a/tests/baselines/reference/findAllRefs_importType_js.3.baseline.jsonc
+++ b/tests/baselines/reference/findAllRefs_importType_js.3.baseline.jsonc
@@ -15,7 +15,7 @@
       "containerName": "",
       "fileName": "/a.js",
       "kind": "local class",
-      "name": "(local class) D",
+      "name": "(local class) module.exports.D",
       "textSpan": {
         "start": 54,
         "length": 1
@@ -37,9 +37,25 @@
           "text": " ",
           "kind": "space"
         },
+        {
+          "text": "module",
+          "kind": "localName"
+        },
+        {
+          "text": ".",
+          "kind": "punctuation"
+        },
+        {
+          "text": "exports",
+          "kind": "moduleName"
+        },
+        {
+          "text": ".",
+          "kind": "punctuation"
+        },
         {
           "text": "D",
-          "kind": "className"
+          "kind": "aliasName"
         }
       ],
       "contextSpan": {
diff --git a/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.symbols b/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.symbols
index 8fafef268e0..2adf5afc2e0 100644
--- a/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.symbols
+++ b/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.symbols
@@ -10,7 +10,7 @@ window.console; // should not have error: Property 'console' does not exist on t
 >console : Symbol(console, Decl(lib.dom.d.ts, --, --))
 
 module.exports = 'anything';
->module.exports : Symbol("tests/cases/conformance/salsa/bug27099", Decl(bug27099.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bug27099.js, 0, 0))
 >module : Symbol(export=, Decl(bug27099.js, 1, 15))
 >exports : Symbol(export=, Decl(bug27099.js, 1, 15))
 
diff --git a/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types b/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types
index 2da3041af44..74a1d649bd8 100644
--- a/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types
+++ b/tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types
@@ -14,7 +14,7 @@ window.console; // should not have error: Property 'console' does not exist on t
 module.exports = 'anything';
 >module.exports = 'anything' : string
 >module.exports : string
->module : { "\"tests/cases/conformance/salsa/bug27099\"": string; }
+>module : { exports: string; }
 >exports : string
 >'anything' : "anything"
 
diff --git a/tests/baselines/reference/importAliasModuleExports.symbols b/tests/baselines/reference/importAliasModuleExports.symbols
index 59bb97dcccd..d9729f669da 100644
--- a/tests/baselines/reference/importAliasModuleExports.symbols
+++ b/tests/baselines/reference/importAliasModuleExports.symbols
@@ -6,7 +6,7 @@ class Alias {
 >bar : Symbol(Alias.bar, Decl(mod1.js, 0, 13))
 }
 module.exports = Alias;
->module.exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 2, 1))
 >exports : Symbol(export=, Decl(mod1.js, 2, 1))
 >Alias : Symbol(Alias, Decl(mod1.js, 0, 0))
diff --git a/tests/baselines/reference/importAliasModuleExports.types b/tests/baselines/reference/importAliasModuleExports.types
index eff243dee47..795b161a348 100644
--- a/tests/baselines/reference/importAliasModuleExports.types
+++ b/tests/baselines/reference/importAliasModuleExports.types
@@ -9,7 +9,7 @@ class Alias {
 module.exports = Alias;
 >module.exports = Alias : typeof Alias
 >module.exports : typeof Alias
->module : { "\"tests/cases/conformance/salsa/mod1\"": typeof Alias; }
+>module : { exports: typeof Alias; }
 >exports : typeof Alias
 >Alias : typeof Alias
 
diff --git a/tests/baselines/reference/javascriptCommonjsModule.symbols b/tests/baselines/reference/javascriptCommonjsModule.symbols
index da5d60593f4..30fbf94cb0a 100644
--- a/tests/baselines/reference/javascriptCommonjsModule.symbols
+++ b/tests/baselines/reference/javascriptCommonjsModule.symbols
@@ -7,7 +7,7 @@ class Bar extends Foo {}
 >Foo : Symbol(Foo, Decl(index.js, 0, 0))
 
 module.exports = Bar;
->module.exports : Symbol("tests/cases/compiler/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 2, 24))
 >exports : Symbol(export=, Decl(index.js, 2, 24))
 >Bar : Symbol(Bar, Decl(index.js, 0, 12))
diff --git a/tests/baselines/reference/javascriptCommonjsModule.types b/tests/baselines/reference/javascriptCommonjsModule.types
index 2850541b953..d68912be926 100644
--- a/tests/baselines/reference/javascriptCommonjsModule.types
+++ b/tests/baselines/reference/javascriptCommonjsModule.types
@@ -9,7 +9,7 @@ class Bar extends Foo {}
 module.exports = Bar;
 >module.exports = Bar : typeof Bar
 >module.exports : typeof Bar
->module : { "\"tests/cases/compiler/index\"": typeof Bar; }
+>module : { exports: typeof Bar; }
 >exports : typeof Bar
 >Bar : typeof Bar
 
diff --git a/tests/baselines/reference/javascriptImportDefaultBadExport.symbols b/tests/baselines/reference/javascriptImportDefaultBadExport.symbols
index b5506996aff..8e728a46522 100644
--- a/tests/baselines/reference/javascriptImportDefaultBadExport.symbols
+++ b/tests/baselines/reference/javascriptImportDefaultBadExport.symbols
@@ -6,7 +6,7 @@ const alias = {};
 >alias : Symbol(alias, Decl(a.js, 3, 5))
 
 module.exports = alias;
->module.exports : Symbol("/a", Decl(a.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(a.js, 0, 0))
 >module : Symbol(export=, Decl(a.js, 3, 17))
 >exports : Symbol(export=, Decl(a.js, 3, 17))
 >alias : Symbol(alias, Decl(a.js, 3, 5))
diff --git a/tests/baselines/reference/javascriptImportDefaultBadExport.types b/tests/baselines/reference/javascriptImportDefaultBadExport.types
index c01e329340e..e8ff12bd3e9 100644
--- a/tests/baselines/reference/javascriptImportDefaultBadExport.types
+++ b/tests/baselines/reference/javascriptImportDefaultBadExport.types
@@ -9,7 +9,7 @@ const alias = {};
 module.exports = alias;
 >module.exports = alias : {}
 >module.exports : {}
->module : { "\"/a\"": {}; }
+>module : { exports: {}; }
 >exports : {}
 >alias : {}
 
diff --git a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.symbols b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.symbols
index a59d302e7f0..d76e8b90387 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.symbols
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.symbols
@@ -19,7 +19,7 @@ class Foo extends Bar {}
 >Bar : Symbol(Bar, Decl(cls.js, 0, 5))
 
 module.exports = Foo;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/cls", Decl(cls.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(cls.js, 0, 0))
 >module : Symbol(export=, Decl(cls.js, 5, 24))
 >exports : Symbol(export=, Decl(cls.js, 5, 24))
 >Foo : Symbol(Foo, Decl(cls.js, 4, 2))
@@ -28,7 +28,7 @@ module.exports.Strings = Strings;
 >module.exports.Strings : Symbol(Strings, Decl(cls.js, 6, 21))
 >module.exports : Symbol(Strings, Decl(cls.js, 6, 21))
 >module : Symbol(module, Decl(cls.js, 5, 24))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/cls", Decl(cls.js, 0, 0))
+>exports : Symbol(module.exports, Decl(cls.js, 0, 0))
 >Strings : Symbol(Strings, Decl(cls.js, 6, 21))
 >Strings : Symbol(Strings, Decl(cls.js, 1, 5))
 
@@ -37,7 +37,7 @@ class Bar {}
 >Bar : Symbol(Bar, Decl(bar.js, 0, 0))
 
 module.exports = Bar;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/bar", Decl(bar.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bar.js, 0, 0))
 >module : Symbol(export=, Decl(bar.js, 0, 12))
 >exports : Symbol(export=, Decl(bar.js, 0, 12))
 >Bar : Symbol(Bar, Decl(bar.js, 0, 0))
diff --git a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.types b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.types
index b73577a1133..cf4cf2cf8f1 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.types
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.types
@@ -25,7 +25,7 @@ class Foo extends Bar {}
 module.exports = Foo;
 >module.exports = Foo : typeof Foo
 >module.exports : typeof Foo
->module : { "\"tests/cases/conformance/jsdoc/declarations/cls\"": typeof Foo; }
+>module : { exports: typeof Foo; }
 >exports : typeof Foo
 >Foo : typeof Foo
 
@@ -33,7 +33,7 @@ module.exports.Strings = Strings;
 >module.exports.Strings = Strings : { a: string; b: string; }
 >module.exports.Strings : { a: string; b: string; }
 >module.exports : typeof Foo
->module : { "\"tests/cases/conformance/jsdoc/declarations/cls\"": typeof Foo; }
+>module : { exports: typeof Foo; }
 >exports : typeof Foo
 >Strings : { a: string; b: string; }
 >Strings : { a: string; b: string; }
@@ -45,7 +45,7 @@ class Bar {}
 module.exports = Bar;
 >module.exports = Bar : typeof Bar
 >module.exports : typeof Bar
->module : { "\"tests/cases/conformance/jsdoc/declarations/bar\"": typeof Bar; }
+>module : { exports: typeof Bar; }
 >exports : typeof Bar
 >Bar : typeof Bar
 
diff --git a/tests/baselines/reference/jsDeclarationsClassStatic.symbols b/tests/baselines/reference/jsDeclarationsClassStatic.symbols
index 8687099bbe3..635174ee036 100644
--- a/tests/baselines/reference/jsDeclarationsClassStatic.symbols
+++ b/tests/baselines/reference/jsDeclarationsClassStatic.symbols
@@ -28,7 +28,7 @@ const Strings = {
 }
 
 module.exports = Handler;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/source", Decl(source.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(source.js, 0, 0))
 >module : Symbol(export=, Decl(source.js, 12, 1))
 >exports : Symbol(export=, Decl(source.js, 12, 1))
 >Handler : Symbol(Handler, Decl(source.js, 0, 0), Decl(source.js, 7, 1))
@@ -37,7 +37,7 @@ module.exports.Strings = Strings
 >module.exports.Strings : Symbol(Strings, Decl(source.js, 14, 25))
 >module.exports : Symbol(Strings, Decl(source.js, 14, 25))
 >module : Symbol(module, Decl(source.js, 12, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/source", Decl(source.js, 0, 0))
+>exports : Symbol(module.exports, Decl(source.js, 0, 0))
 >Strings : Symbol(Strings, Decl(source.js, 14, 25))
 >Strings : Symbol(Strings, Decl(source.js, 9, 5))
 
diff --git a/tests/baselines/reference/jsDeclarationsClassStatic.types b/tests/baselines/reference/jsDeclarationsClassStatic.types
index 50783314fac..02473d7523f 100644
--- a/tests/baselines/reference/jsDeclarationsClassStatic.types
+++ b/tests/baselines/reference/jsDeclarationsClassStatic.types
@@ -36,7 +36,7 @@ const Strings = {
 module.exports = Handler;
 >module.exports = Handler : typeof Handler
 >module.exports : typeof Handler
->module : { "\"tests/cases/conformance/jsdoc/declarations/source\"": typeof Handler; }
+>module : { exports: typeof Handler; }
 >exports : typeof Handler
 >Handler : typeof Handler
 
@@ -44,7 +44,7 @@ module.exports.Strings = Strings
 >module.exports.Strings = Strings : { a: string; b: string; }
 >module.exports.Strings : { a: string; b: string; }
 >module.exports : typeof Handler
->module : { "\"tests/cases/conformance/jsdoc/declarations/source\"": typeof Handler; }
+>module : { exports: typeof Handler; }
 >exports : typeof Handler
 >Strings : { a: string; b: string; }
 >Strings : { a: string; b: string; }
diff --git a/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.symbols b/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.symbols
index f30136c90b8..c5f75ca89cb 100644
--- a/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.symbols
+++ b/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.symbols
@@ -8,9 +8,9 @@ const Thing = require('./thing').Thing
 >Thing : Symbol(Thing, Decl(thing.js, 2, 18))
 
 module.exports = { Thing }
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/reexport", Decl(reexport.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(reexport.js, 0, 0))
 >module : Symbol(module, Decl(reexport.js, 1, 38))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/reexport", Decl(reexport.js, 0, 0))
+>exports : Symbol(module.exports, Decl(reexport.js, 0, 0))
 >Thing : Symbol(Thing, Decl(reexport.js, 2, 18))
 
 === tests/cases/conformance/jsdoc/declarations/thing.js ===
@@ -19,8 +19,8 @@ class Thing {}
 >Thing : Symbol(Thing, Decl(thing.js, 0, 13))
 
 module.exports = { Thing }
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/thing", Decl(thing.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(thing.js, 0, 0))
 >module : Symbol(module, Decl(thing.js, 1, 14))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/thing", Decl(thing.js, 0, 0))
+>exports : Symbol(module.exports, Decl(thing.js, 0, 0))
 >Thing : Symbol(Thing, Decl(thing.js, 2, 18))
 
diff --git a/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.types b/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.types
index 58c31461799..79a0313df8b 100644
--- a/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.types
+++ b/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.types
@@ -11,10 +11,10 @@ const Thing = require('./thing').Thing
 >Thing : typeof Thing
 
 module.exports = { Thing }
->module.exports = { Thing } : typeof import("tests/cases/conformance/jsdoc/declarations/reexport")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/reexport")
->module : { "\"tests/cases/conformance/jsdoc/declarations/reexport\"": typeof import("tests/cases/conformance/jsdoc/declarations/reexport"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/reexport")
+>module.exports = { Thing } : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{ Thing } : { Thing: typeof Thing; }
 >Thing : typeof Thing
 
@@ -26,10 +26,10 @@ class Thing {}
 >Thing : Thing
 
 module.exports = { Thing }
->module.exports = { Thing } : typeof import("tests/cases/conformance/jsdoc/declarations/thing")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/thing")
->module : { "\"tests/cases/conformance/jsdoc/declarations/thing\"": typeof import("tests/cases/conformance/jsdoc/declarations/thing"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/thing")
+>module.exports = { Thing } : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{ Thing } : { Thing: typeof Thing; }
 >Thing : typeof Thing
 
diff --git a/tests/baselines/reference/jsDeclarationsComputedNames.symbols b/tests/baselines/reference/jsDeclarationsComputedNames.symbols
index 2abc98e4edf..ae30cbffc1c 100644
--- a/tests/baselines/reference/jsDeclarationsComputedNames.symbols
+++ b/tests/baselines/reference/jsDeclarationsComputedNames.symbols
@@ -8,7 +8,7 @@ const InnerSym = Symbol();
 >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 1, 26))
 >exports : Symbol(export=, Decl(index.js, 1, 26))
 
diff --git a/tests/baselines/reference/jsDeclarationsComputedNames.types b/tests/baselines/reference/jsDeclarationsComputedNames.types
index 02e1788a3ea..557d32c54ac 100644
--- a/tests/baselines/reference/jsDeclarationsComputedNames.types
+++ b/tests/baselines/reference/jsDeclarationsComputedNames.types
@@ -12,7 +12,7 @@ const InnerSym = Symbol();
 module.exports = {
 >module.exports = {    [TopLevelSym](x = 12) {        return x;    },    items: {        [InnerSym]: (arg = {x: 12}) => arg.x    }} : { [TopLevelSym](x?: number): number; items: { [InnerSym]: (arg?: { x: number; }) => number; }; }
 >module.exports : { [TopLevelSym](x?: number): number; items: { [InnerSym]: (arg?: { x: number; }) => number; }; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { [TopLevelSym](x?: number): number; items: { [InnerSym]: (arg?: { x: number; }) => number; }; }; }
+>module : { exports: { [TopLevelSym](x?: number): number; items: { [InnerSym]: (arg?: { x: number; }) => number; }; }; }
 >exports : { [TopLevelSym](x?: number): number; items: { [InnerSym]: (arg?: { x: number; }) => number; }; }
 >{    [TopLevelSym](x = 12) {        return x;    },    items: {        [InnerSym]: (arg = {x: 12}) => arg.x    }} : { [TopLevelSym](x?: number): number; items: { [InnerSym]: (arg?: { x: number; }) => number; }; }
 
diff --git a/tests/baselines/reference/jsDeclarationsCrossfileMerge.symbols b/tests/baselines/reference/jsDeclarationsCrossfileMerge.symbols
index 859c94328a4..5abae5d2f6a 100644
--- a/tests/baselines/reference/jsDeclarationsCrossfileMerge.symbols
+++ b/tests/baselines/reference/jsDeclarationsCrossfileMerge.symbols
@@ -5,7 +5,7 @@ const m = require("./exporter");
 >"./exporter" : Symbol(m, Decl(exporter.js, 0, 0))
 
 module.exports = m.default;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 32))
 >exports : Symbol(export=, Decl(index.js, 0, 32))
 >m.default : Symbol(m.default, Decl(exporter.js, 0, 22))
@@ -16,7 +16,7 @@ module.exports.memberName = "thing";
 >module.exports.memberName : Symbol(memberName, Decl(index.js, 2, 27))
 >module.exports : Symbol(memberName, Decl(index.js, 2, 27))
 >module : Symbol(module, Decl(index.js, 0, 32))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >memberName : Symbol(memberName, Decl(index.js, 2, 27))
 
 === tests/cases/conformance/jsdoc/declarations/exporter.js ===
diff --git a/tests/baselines/reference/jsDeclarationsCrossfileMerge.types b/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
index 83e978857ee..77735e52df0 100644
--- a/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
+++ b/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
@@ -8,7 +8,7 @@ const m = require("./exporter");
 module.exports = m.default;
 >module.exports = m.default : typeof m.default
 >module.exports : typeof m.default
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof m.default; }
+>module : { exports: typeof m.default; }
 >exports : typeof m.default
 >m.default : { (): void; memberName: string; }
 >m : typeof m
@@ -18,7 +18,7 @@ module.exports.memberName = "thing";
 >module.exports.memberName = "thing" : "thing"
 >module.exports.memberName : string
 >module.exports : typeof m.default
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof m.default; }
+>module : { exports: typeof m.default; }
 >exports : typeof m.default
 >memberName : string
 >"thing" : "thing"
diff --git a/tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.symbols b/tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.symbols
index f5977077257..626e62530cc 100644
--- a/tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.symbols
+++ b/tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.symbols
@@ -19,9 +19,9 @@ function b() {
 }
 
 module.exports = {x, b}
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index1", Decl(index1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index1.js, 0, 0))
 >module : Symbol(module, Decl(index1.js, 12, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index1", Decl(index1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index1.js, 0, 0))
 >x : Symbol(x, Decl(index1.js, 14, 18))
 >b : Symbol(b, Decl(index1.js, 14, 20))
 
diff --git a/tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.types b/tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.types
index 295015d90f3..77b15177e6e 100644
--- a/tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.types
+++ b/tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.types
@@ -23,10 +23,10 @@ function b() {
 }
 
 module.exports = {x, b}
->module.exports = {x, b} : typeof import("tests/cases/conformance/jsdoc/declarations/index1")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index1")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index1\"": typeof import("tests/cases/conformance/jsdoc/declarations/index1"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index1")
+>module.exports = {x, b} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{x, b} : { x: (a: any) => string; b: () => number; }
 >x : (a: any) => string
 >b : () => number
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpression.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpression.symbols
index 3552f73f4a5..dad52ee5af6 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpression.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpression.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/jsdoc/declarations/index.js ===
 module.exports = class Thing {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 0))
 >Thing : Symbol(Thing, Decl(index.js, 0, 16))
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpression.types b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpression.types
index 301d4f4adc5..6eceea32fd2 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpression.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpression.types
@@ -2,7 +2,7 @@
 module.exports = class Thing {
 >module.exports = class Thing {    /**     * @param {number} p     */    constructor(p) {        this.t = 12 + p;    }} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >class Thing {    /**     * @param {number} p     */    constructor(p) {        this.t = 12 + p;    }} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >Thing : typeof import("tests/cases/conformance/jsdoc/declarations/index")
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols
index b4d32907ff6..35d8ed6240f 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/jsdoc/declarations/index.js ===
 module.exports = class {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 0))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymous.types b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymous.types
index dc75cbed876..1712ef5170c 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymous.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymous.types
@@ -2,7 +2,7 @@
 module.exports = class {
 >module.exports = class {    /**     * @param {number} p     */    constructor(p) {        this.t = 12 + p;    }} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >class {    /**     * @param {number} p     */    constructor(p) {        this.t = 12 + p;    }} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols
index aa5df49712f..2af24b70c59 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/jsdoc/declarations/index.js ===
 module.exports = class {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 0))
 
@@ -21,7 +21,7 @@ module.exports.Sub = class {
 >module.exports.Sub : Symbol(Sub, Decl(index.js, 7, 1))
 >module.exports : Symbol(Sub, Decl(index.js, 7, 1))
 >module : Symbol(module, Decl(index.js, 0, 0), Decl(index.js, 10, 27))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >Sub : Symbol(Sub, Decl(index.js, 7, 1))
 
     constructor() {
@@ -29,9 +29,9 @@ module.exports.Sub = class {
 >this.instance : Symbol(Sub.instance, Decl(index.js, 9, 19))
 >this : Symbol(Sub, Decl(index.js, 8, 20))
 >instance : Symbol(Sub.instance, Decl(index.js, 9, 19))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0), Decl(index.js, 10, 27))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
     }
 }
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.types b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.types
index 904bbe06944..d5a96c5d90a 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.types
@@ -2,7 +2,7 @@
 module.exports = class {
 >module.exports = class {    /**     * @param {number} p     */    constructor(p) {        this.t = 12 + p;    }} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >class {    /**     * @param {number} p     */    constructor(p) {        this.t = 12 + p;    }} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 
@@ -26,7 +26,7 @@ module.exports.Sub = class {
 >module.exports.Sub = class {    constructor() {        this.instance = new module.exports(10);    }} : typeof Sub
 >module.exports.Sub : typeof Sub
 >module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >Sub : typeof Sub
 >class {    constructor() {        this.instance = new module.exports(10);    }} : typeof Sub
@@ -39,7 +39,7 @@ module.exports.Sub = class {
 >instance : any
 >new module.exports(10) : import("tests/cases/conformance/jsdoc/declarations/index")
 >module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >10 : 10
     }
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionShadowing.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionShadowing.symbols
index a911c06ee2e..9ca39685537 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionShadowing.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionShadowing.symbols
@@ -13,7 +13,7 @@ class Q {
 >x : Symbol(Q.x, Decl(index.js, 3, 9))
 }
 module.exports = class Q {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 5, 1))
 >exports : Symbol(export=, Decl(index.js, 5, 1))
 >Q : Symbol(Q, Decl(index.js, 6, 16))
@@ -30,7 +30,7 @@ module.exports.Another = Q;
 >module.exports.Another : Symbol(Another, Decl(index.js, 10, 1))
 >module.exports : Symbol(Another, Decl(index.js, 10, 1))
 >module : Symbol(module, Decl(index.js, 5, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >Another : Symbol(Another, Decl(index.js, 10, 1))
 >Q : Symbol(Q, Decl(index.js, 2, 1))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionShadowing.types b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionShadowing.types
index 36fdb5bfdc4..b2f0063ed4f 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionShadowing.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionShadowing.types
@@ -17,7 +17,7 @@ class Q {
 module.exports = class Q {
 >module.exports = class Q {    constructor() {        this.x = new A();    }} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >class Q {    constructor() {        this.x = new A();    }} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >Q : typeof import("tests/cases/conformance/jsdoc/declarations/index")
@@ -36,7 +36,7 @@ module.exports.Another = Q;
 >module.exports.Another = Q : typeof Q
 >module.exports.Another : typeof Q
 >module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
 >Another : typeof Q
 >Q : typeof Q
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance1.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance1.symbols
index b2812517acf..548c12ef22f 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance1.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance1.symbols
@@ -3,7 +3,7 @@ class Foo {}
 >Foo : Symbol(Foo, Decl(index.js, 0, 0))
 
 module.exports = new Foo();
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 12))
 >exports : Symbol(export=, Decl(index.js, 0, 12))
 >Foo : Symbol(Foo, Decl(index.js, 0, 0))
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance1.types b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance1.types
index 868d6e684c6..9a14b3a44d9 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance1.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance1.types
@@ -5,7 +5,7 @@ class Foo {}
 module.exports = new Foo();
 >module.exports = new Foo() : Foo
 >module.exports : Foo
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": Foo; }
+>module : { exports: Foo; }
 >exports : Foo
 >new Foo() : Foo
 >Foo : typeof Foo
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance2.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance2.symbols
index bf9e5186a9b..adc1711a2a0 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance2.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance2.symbols
@@ -10,7 +10,7 @@ class Foo {
 }
 
 module.exports = new Foo();
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 3, 1))
 >exports : Symbol(export=, Decl(index.js, 3, 1))
 >Foo : Symbol(Foo, Decl(index.js, 0, 0))
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance2.types b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance2.types
index dda0c2e18a9..9f2d7f05726 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance2.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance2.types
@@ -14,7 +14,7 @@ class Foo {
 module.exports = new Foo();
 >module.exports = new Foo() : Foo
 >module.exports : Foo
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": Foo; }
+>module : { exports: Foo; }
 >exports : Foo
 >new Foo() : Foo
 >Foo : typeof Foo
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance3.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance3.symbols
index 1da8f49afe8..fd3de426f08 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance3.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance3.symbols
@@ -10,7 +10,7 @@ class Foo {
 }
 
 module.exports = new Foo();
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 3, 1))
 >exports : Symbol(export=, Decl(index.js, 3, 1))
 >Foo : Symbol(Foo, Decl(index.js, 0, 0))
@@ -19,6 +19,6 @@ module.exports.additional = 20;
 >module.exports.additional : Symbol(additional, Decl(index.js, 5, 27))
 >module.exports : Symbol(additional, Decl(index.js, 5, 27))
 >module : Symbol(module, Decl(index.js, 3, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >additional : Symbol(additional, Decl(index.js, 5, 27))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance3.types b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance3.types
index ee1de06b04e..ec7ab8a9a3a 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance3.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassInstance3.types
@@ -14,7 +14,7 @@ class Foo {
 module.exports = new Foo();
 >module.exports = new Foo() : { member: number; additional: number; }
 >module.exports : { member: number; additional: number; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { member: number; additional: number; }; }
+>module : { exports: { member: number; additional: number; }; }
 >exports : { member: number; additional: number; }
 >new Foo() : Foo
 >Foo : typeof Foo
@@ -23,7 +23,7 @@ module.exports.additional = 20;
 >module.exports.additional = 20 : 20
 >module.exports.additional : number
 >module.exports : { member: number; additional: number; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { member: number; additional: number; }; }
+>module : { exports: { member: number; additional: number; }; }
 >exports : { member: number; additional: number; }
 >additional : number
 >20 : 20
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunction.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunction.symbols
index 77c74ae16ec..faca3eb2c96 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunction.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunction.symbols
@@ -4,7 +4,7 @@ module.exports.MyClass = function() {
 >module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunction.js, 4, 15))
 >module.exports : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunction.js, 4, 15))
 >module : Symbol(module, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
+>exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunction.js, 4, 15))
 
     this.x = 1
@@ -15,9 +15,9 @@ module.exports.MyClass = function() {
 module.exports.MyClass.prototype = {
 >module.exports.MyClass.prototype : Symbol(MyClass.prototype, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 3, 1))
 >module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunction.js, 4, 15))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >module : Symbol(module, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
+>exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunction.js, 4, 15))
 >prototype : Symbol(MyClass.prototype, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 3, 1))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunction.types b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunction.types
index d7f0ad52721..b79b7229109 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunction.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunction.types
@@ -3,9 +3,9 @@
 module.exports.MyClass = function() {
 >module.exports.MyClass = function() {    this.x = 1} : typeof MyClass
 >module.exports.MyClass : typeof MyClass
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction")
->module : { "\"tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction\"": typeof import("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >MyClass : typeof MyClass
 >function() {    this.x = 1} : typeof MyClass
 
@@ -20,9 +20,9 @@ module.exports.MyClass.prototype = {
 >module.exports.MyClass.prototype = {    a: function() {    }} : { a: () => void; }
 >module.exports.MyClass.prototype : { a: () => void; }
 >module.exports.MyClass : typeof MyClass
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction")
->module : { "\"tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction\"": typeof import("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >MyClass : typeof MyClass
 >prototype : { a: () => void; }
 >{    a: function() {    }} : { a: () => void; }
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols
index 44f53888094..ffbf6b104ca 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols
@@ -3,7 +3,7 @@
  * @param {number} p
  */
 module.exports = function (p) {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >module : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >p : Symbol(p, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 3, 27))
@@ -18,23 +18,23 @@ module.exports.Sub = function() {
 >module.exports.Sub : Symbol(Sub, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 5, 1), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 9, 15))
 >module.exports : Symbol(Sub, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 5, 1), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 9, 15))
 >module : Symbol(module, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 7, 23))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
+>exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >Sub : Symbol(Sub, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 5, 1), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 9, 15))
 
     this.instance = new module.exports(10);
 >this.instance : Symbol(Sub.instance, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 6, 33))
 >this : Symbol(Sub, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 6, 20))
 >instance : Symbol(Sub.instance, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 6, 33))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >module : Symbol(module, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 7, 23))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
+>exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 }
 module.exports.Sub.prototype = { }
 >module.exports.Sub.prototype : Symbol(Sub.prototype, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 8, 1))
 >module.exports.Sub : Symbol(Sub, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 5, 1), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 9, 15))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >module : Symbol(module, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 7, 23))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
+>exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >Sub : Symbol(Sub, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 5, 1), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 9, 15))
 >prototype : Symbol(Sub.prototype, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 8, 1))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
index ce8f71cd81c..86bafadc908 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
@@ -5,7 +5,7 @@
 module.exports = function (p) {
 >module.exports = function (p) {    this.t = 12 + p;} : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
 >module.exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub\"": { (p: number): void; new (p: number): exports; Sub: typeof Sub; }; }
+>module : { exports: { (p: number): void; new (p: number): exports; Sub: typeof Sub; }; }
 >exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
 >function (p) {    this.t = 12 + p;} : typeof exports
 >p : number
@@ -23,7 +23,7 @@ module.exports.Sub = function() {
 >module.exports.Sub = function() {    this.instance = new module.exports(10);} : typeof Sub
 >module.exports.Sub : typeof Sub
 >module.exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub\"": { (p: number): void; new (p: number): exports; Sub: typeof Sub; }; }
+>module : { exports: { (p: number): void; new (p: number): exports; Sub: typeof Sub; }; }
 >exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
 >Sub : typeof Sub
 >function() {    this.instance = new module.exports(10);} : typeof Sub
@@ -35,7 +35,7 @@ module.exports.Sub = function() {
 >instance : any
 >new module.exports(10) : exports
 >module.exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub\"": { (p: number): void; new (p: number): exports; Sub: typeof Sub; }; }
+>module : { exports: { (p: number): void; new (p: number): exports; Sub: typeof Sub; }; }
 >exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
 >10 : 10
 }
@@ -44,7 +44,7 @@ module.exports.Sub.prototype = { }
 >module.exports.Sub.prototype : {}
 >module.exports.Sub : typeof Sub
 >module.exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub\"": { (p: number): void; new (p: number): exports; Sub: typeof Sub; }; }
+>module : { exports: { (p: number): void; new (p: number): exports; Sub: typeof Sub; }; }
 >exports : { (p: number): void; new (p: number): exports; Sub: typeof Sub; }
 >Sub : typeof Sub
 >prototype : {}
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.symbols b/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.symbols
index e939df536ff..6fb12e0a9eb 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.symbols
@@ -17,14 +17,14 @@ class Container {
 }
 
 module.exports = Container;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 6, 1))
 >exports : Symbol(export=, Decl(index.js, 6, 1))
 >Container : Symbol(Container, Decl(index.js, 0, 29))
 
 === tests/cases/conformance/jsdoc/declarations/obj.js ===
 module.exports = class Obj {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/obj", Decl(obj.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(obj.js, 0, 0))
 >module : Symbol(export=, Decl(obj.js, 0, 0))
 >exports : Symbol(export=, Decl(obj.js, 0, 0))
 >Obj : Symbol(Obj, Decl(obj.js, 0, 16))
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.types b/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.types
index 179947956be..82d2ea30b94 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.types
@@ -22,7 +22,7 @@ class Container {
 module.exports = Container;
 >module.exports = Container : typeof Container
 >module.exports : typeof Container
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof Container; }
+>module : { exports: typeof Container; }
 >exports : typeof Container
 >Container : typeof Container
 
@@ -30,7 +30,7 @@ module.exports = Container;
 module.exports = class Obj {
 >module.exports = class Obj {    constructor() {        this.x = 12;    }} : typeof import("tests/cases/conformance/jsdoc/declarations/obj")
 >module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/obj")
->module : { "\"tests/cases/conformance/jsdoc/declarations/obj\"": typeof import("tests/cases/conformance/jsdoc/declarations/obj"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/declarations/obj"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/declarations/obj")
 >class Obj {    constructor() {        this.x = 12;    }} : typeof import("tests/cases/conformance/jsdoc/declarations/obj")
 >Obj : typeof import("tests/cases/conformance/jsdoc/declarations/obj")
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols b/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols
index 4d799134331..b17ccca925b 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols
@@ -10,7 +10,7 @@ const Strings = {
 
 };
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 3, 2))
 >exports : Symbol(export=, Decl(index.js, 3, 2))
 
@@ -31,7 +31,7 @@ module.exports.Strings = Strings;
 >module.exports.Strings : Symbol(Strings, Decl(index.js, 10, 2))
 >module.exports : Symbol(Strings, Decl(index.js, 10, 2))
 >module : Symbol(module, Decl(index.js, 3, 2))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >Strings : Symbol(Strings, Decl(index.js, 10, 2))
 >Strings : Symbol(Strings, Decl(index.js, 0, 5))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.types b/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.types
index 62c5a6dbe0e..746706d761f 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignmentExpressionPlusSecondary.types
@@ -15,7 +15,7 @@ const Strings = {
 module.exports = {
 >module.exports = {    thing: "ok",    also: "ok",    desc: {        item: "ok"    }} : { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }
 >module.exports : { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }; }
+>module : { exports: { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }; }
 >exports : { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }
 >{    thing: "ok",    also: "ok",    desc: {        item: "ok"    }} : { thing: string; also: string; desc: { item: string; }; }
 
@@ -40,7 +40,7 @@ module.exports.Strings = Strings;
 >module.exports.Strings = Strings : { a: string; b: string; }
 >module.exports.Strings : { a: string; b: string; }
 >module.exports : { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }; }
+>module : { exports: { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }; }
 >exports : { thing: string; also: string; desc: { item: string; }; Strings: { a: string; b: string; }; }
 >Strings : { a: string; b: string; }
 >Strings : { a: string; b: string; }
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignmentWithKeywordName.symbols b/tests/baselines/reference/jsDeclarationsExportAssignmentWithKeywordName.symbols
index 182a64ba32f..663302c925b 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignmentWithKeywordName.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportAssignmentWithKeywordName.symbols
@@ -3,7 +3,7 @@ var x = 12;
 >x : Symbol(x, Decl(index.js, 0, 3))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 11))
 >exports : Symbol(export=, Decl(index.js, 0, 11))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignmentWithKeywordName.types b/tests/baselines/reference/jsDeclarationsExportAssignmentWithKeywordName.types
index f482fa6f2eb..58970a4491b 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignmentWithKeywordName.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignmentWithKeywordName.types
@@ -6,7 +6,7 @@ var x = 12;
 module.exports = {
 >module.exports = {    extends: 'base',    more: {        others: ['strs']    },    x} : { extends: string; more: { others: string[]; }; x: number; }
 >module.exports : { extends: string; more: { others: string[]; }; x: number; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { extends: string; more: { others: string[]; }; x: number; }; }
+>module : { exports: { extends: string; more: { others: string[]; }; x: number; }; }
 >exports : { extends: string; more: { others: string[]; }; x: number; }
 >{    extends: 'base',    more: {        others: ['strs']    },    x} : { extends: string; more: { others: string[]; }; x: number; }
 
diff --git a/tests/baselines/reference/jsDeclarationsExportDefinePropertyEmit.symbols b/tests/baselines/reference/jsDeclarationsExportDefinePropertyEmit.symbols
index 03cf1ce41b5..e61546206e1 100644
--- a/tests/baselines/reference/jsDeclarationsExportDefinePropertyEmit.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportDefinePropertyEmit.symbols
@@ -3,9 +3,9 @@ Object.defineProperty(module.exports, "a", { value: function a() {} });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"a" : Symbol(a, Decl(index.js, 0, 0))
 >value : Symbol(value, Decl(index.js, 0, 44))
 >a : Symbol(a, Decl(index.js, 0, 51))
@@ -14,9 +14,9 @@ Object.defineProperty(module.exports, "b", { value: function b() {} });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"b" : Symbol(b, Decl(index.js, 0, 71), Decl(index.js, 3, 37))
 >value : Symbol(value, Decl(index.js, 2, 44))
 >b : Symbol(b, Decl(index.js, 2, 51))
@@ -26,9 +26,9 @@ Object.defineProperty(module.exports.b, "cat", { value: "cat" });
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >module.exports.b : Symbol(b, Decl(index.js, 0, 71), Decl(index.js, 3, 37))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >b : Symbol(b, Decl(index.js, 0, 71), Decl(index.js, 3, 37))
 >"cat" : Symbol(b.cat, Decl(index.js, 2, 71))
 >value : Symbol(value, Decl(index.js, 3, 48))
@@ -47,9 +47,9 @@ Object.defineProperty(module.exports, "d", { value: d });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"d" : Symbol(d, Decl(index.js, 10, 51))
 >value : Symbol(value, Decl(index.js, 11, 44))
 >d : Symbol(d, Decl(index.js, 3, 65))
@@ -70,9 +70,9 @@ Object.defineProperty(module.exports, "e", { value: e });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"e" : Symbol(e, Decl(index.js, 20, 51))
 >value : Symbol(value, Decl(index.js, 21, 44))
 >e : Symbol(e, Decl(index.js, 11, 57))
@@ -92,9 +92,9 @@ Object.defineProperty(module.exports, "f", { value: f });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"f" : Symbol(f, Decl(index.js, 29, 1), Decl(index.js, 31, 37))
 >value : Symbol(value, Decl(index.js, 30, 44))
 >f : Symbol(f, Decl(index.js, 21, 57))
@@ -104,16 +104,16 @@ Object.defineProperty(module.exports.f, "self", { value: module.exports.f });
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >module.exports.f : Symbol(f, Decl(index.js, 29, 1), Decl(index.js, 31, 37))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 29, 1), Decl(index.js, 31, 37))
 >"self" : Symbol(f.self, Decl(index.js, 30, 57))
 >value : Symbol(value, Decl(index.js, 31, 49))
 >module.exports.f : Symbol(f, Decl(index.js, 29, 1), Decl(index.js, 31, 37))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 29, 1), Decl(index.js, 31, 37))
 
 /**
@@ -137,9 +137,9 @@ Object.defineProperty(module.exports, "g", { value: g });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"g" : Symbol(g, Decl(index.js, 39, 1))
 >value : Symbol(value, Decl(index.js, 40, 44))
 >g : Symbol(g, Decl(index.js, 31, 77))
@@ -166,9 +166,9 @@ Object.defineProperty(module.exports, "h", { value: hh });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"h" : Symbol(h, Decl(index.js, 49, 1))
 >value : Symbol(value, Decl(index.js, 50, 44))
 >hh : Symbol(hh, Decl(index.js, 40, 57))
@@ -177,9 +177,9 @@ Object.defineProperty(module.exports, "i", { value: function i(){} });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"i" : Symbol(i, Decl(index.js, 50, 58))
 >value : Symbol(value, Decl(index.js, 52, 44))
 >i : Symbol(i, Decl(index.js, 52, 51))
@@ -188,15 +188,15 @@ Object.defineProperty(module.exports, "ii", { value: module.exports.i });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"ii" : Symbol(ii, Decl(index.js, 52, 70))
 >value : Symbol(value, Decl(index.js, 53, 45))
 >module.exports.i : Symbol(i, Decl(index.js, 50, 58))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >i : Symbol(i, Decl(index.js, 50, 58))
 
 // note that this last one doesn't make much sense in cjs, since exports aren't hoisted bindings
@@ -204,24 +204,24 @@ Object.defineProperty(module.exports, "jj", { value: module.exports.j });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"jj" : Symbol(jj, Decl(index.js, 53, 73))
 >value : Symbol(value, Decl(index.js, 56, 45))
 >module.exports.j : Symbol(j, Decl(index.js, 56, 73))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >j : Symbol(j, Decl(index.js, 56, 73))
 
 Object.defineProperty(module.exports, "j", { value: function j() {} });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 22), Decl(index.js, 31, 56), Decl(index.js, 53, 52), Decl(index.js, 56, 52))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >"j" : Symbol(j, Decl(index.js, 56, 73))
 >value : Symbol(value, Decl(index.js, 57, 44))
 >j : Symbol(j, Decl(index.js, 57, 51))
diff --git a/tests/baselines/reference/jsDeclarationsExportDefinePropertyEmit.types b/tests/baselines/reference/jsDeclarationsExportDefinePropertyEmit.types
index 9328ad0feec..ca0f272f55a 100644
--- a/tests/baselines/reference/jsDeclarationsExportDefinePropertyEmit.types
+++ b/tests/baselines/reference/jsDeclarationsExportDefinePropertyEmit.types
@@ -4,9 +4,9 @@ Object.defineProperty(module.exports, "a", { value: function a() {} });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"a" : "a"
 >{ value: function a() {} } : { value: () => void; }
 >value : () => void
@@ -18,9 +18,9 @@ Object.defineProperty(module.exports, "b", { value: function b() {} });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"b" : "b"
 >{ value: function b() {} } : { value: () => void; }
 >value : () => void
@@ -33,9 +33,9 @@ Object.defineProperty(module.exports.b, "cat", { value: "cat" });
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >module.exports.b : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >b : () => void
 >"cat" : "cat"
 >{ value: "cat" } : { value: string; }
@@ -59,9 +59,9 @@ Object.defineProperty(module.exports, "d", { value: d });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"d" : "d"
 >{ value: d } : { value: (a: number, b: number) => string; }
 >value : (a: number, b: number) => string
@@ -86,9 +86,9 @@ Object.defineProperty(module.exports, "e", { value: e });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"e" : "e"
 >{ value: e } : { value: <T, U>(a: T, b: U) => T & U; }
 >value : <T, U>(a: T, b: U) => T & U
@@ -110,9 +110,9 @@ Object.defineProperty(module.exports, "f", { value: f });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"f" : "f"
 >{ value: f } : { value: <T>(a: T) => T; }
 >value : <T>(a: T) => T
@@ -124,17 +124,17 @@ Object.defineProperty(module.exports.f, "self", { value: module.exports.f });
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >module.exports.f : <T>(a: T) => T
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >f : <T>(a: T) => T
 >"self" : "self"
 >{ value: module.exports.f } : { value: <T>(a: T) => T; }
 >value : <T>(a: T) => T
 >module.exports.f : <T>(a: T) => T
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >f : <T>(a: T) => T
 
 /**
@@ -161,9 +161,9 @@ Object.defineProperty(module.exports, "g", { value: g });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"g" : "g"
 >{ value: g } : { value: (a: { x: string; }, b: { y: () => void; }) => void; }
 >value : (a: { x: string; }, b: { y: () => void; }) => void
@@ -194,9 +194,9 @@ Object.defineProperty(module.exports, "h", { value: hh });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"h" : "h"
 >{ value: hh } : { value: (a: { x: string; }, b: { y: () => void; }) => void; }
 >value : (a: { x: string; }, b: { y: () => void; }) => void
@@ -207,9 +207,9 @@ Object.defineProperty(module.exports, "i", { value: function i(){} });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"i" : "i"
 >{ value: function i(){} } : { value: () => void; }
 >value : () => void
@@ -221,16 +221,16 @@ Object.defineProperty(module.exports, "ii", { value: module.exports.i });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"ii" : "ii"
 >{ value: module.exports.i } : { value: () => void; }
 >value : () => void
 >module.exports.i : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >i : () => void
 
 // note that this last one doesn't make much sense in cjs, since exports aren't hoisted bindings
@@ -239,16 +239,16 @@ Object.defineProperty(module.exports, "jj", { value: module.exports.j });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"jj" : "jj"
 >{ value: module.exports.j } : { value: () => void; }
 >value : () => void
 >module.exports.j : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >j : () => void
 
 Object.defineProperty(module.exports, "j", { value: function j() {} });
@@ -256,9 +256,9 @@ Object.defineProperty(module.exports, "j", { value: function j() {} });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"j" : "j"
 >{ value: function j() {} } : { value: () => void; }
 >value : () => void
diff --git a/tests/baselines/reference/jsDeclarationsExportDoubleAssignmentInClosure.symbols b/tests/baselines/reference/jsDeclarationsExportDoubleAssignmentInClosure.symbols
index 27d5ca6f16f..ff53604acc8 100644
--- a/tests/baselines/reference/jsDeclarationsExportDoubleAssignmentInClosure.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportDoubleAssignmentInClosure.symbols
@@ -4,7 +4,7 @@ function foo() {
 >foo : Symbol(foo, Decl(index.js, 0, 0))
 
     module.exports = exports = function (o) {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 1, 16))
 >exports : Symbol(export=, Decl(index.js, 1, 16))
 >exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
diff --git a/tests/baselines/reference/jsDeclarationsExportDoubleAssignmentInClosure.types b/tests/baselines/reference/jsDeclarationsExportDoubleAssignmentInClosure.types
index dab4aaf35fc..10a3aa89276 100644
--- a/tests/baselines/reference/jsDeclarationsExportDoubleAssignmentInClosure.types
+++ b/tests/baselines/reference/jsDeclarationsExportDoubleAssignmentInClosure.types
@@ -4,10 +4,10 @@ function foo() {
 >foo : () => void
 
     module.exports = exports = function (o) {
->module.exports = exports = function (o) {        return (o == null) ? create(base) : defineProperties(Object(o), descriptors);    } : any
->module.exports : any
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": any; }
->exports : any
+>module.exports = exports = function (o) {        return (o == null) ? create(base) : defineProperties(Object(o), descriptors);    } : { (o: any): any; methods: () => void; }
+>module.exports : { (o: any): any; methods: () => void; }
+>module : { exports: { (o: any): any; methods: () => void; }; }
+>exports : { (o: any): any; methods: () => void; }
 >exports = function (o) {        return (o == null) ? create(base) : defineProperties(Object(o), descriptors);    } : (o: any) => any
 >exports : any
 >function (o) {        return (o == null) ? create(base) : defineProperties(Object(o), descriptors);    } : (o: any) => any
diff --git a/tests/baselines/reference/jsDeclarationsExportForms.symbols b/tests/baselines/reference/jsDeclarationsExportForms.symbols
index 9196d1c8a29..4232aa53158 100644
--- a/tests/baselines/reference/jsDeclarationsExportForms.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportForms.symbols
@@ -49,9 +49,9 @@ const ns = require("./cls");
 >"./cls" : Symbol(ns, Decl(cls.js, 0, 0))
 
 module.exports = { ns };
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/cjs", Decl(cjs.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(cjs.js, 0, 0))
 >module : Symbol(module, Decl(cjs.js, 0, 28))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/cjs", Decl(cjs.js, 0, 0))
+>exports : Symbol(module.exports, Decl(cjs.js, 0, 0))
 >ns : Symbol(ns, Decl(cjs.js, 1, 18))
 
 === tests/cases/conformance/jsdoc/declarations/cjs2.js ===
@@ -61,7 +61,7 @@ const ns = require("./cls");
 >"./cls" : Symbol(ns, Decl(cls.js, 0, 0))
 
 module.exports = ns;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/cjs2", Decl(cjs2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(cjs2.js, 0, 0))
 >module : Symbol(export=, Decl(cjs2.js, 0, 28))
 >exports : Symbol(export=, Decl(cjs2.js, 0, 28))
 >ns : Symbol(ns, Decl(cjs2.js, 0, 5))
@@ -76,7 +76,7 @@ module.exports.ns = ns;
 >module.exports.ns : Symbol(ns, Decl(cjs3.js, 0, 28))
 >module.exports : Symbol(ns, Decl(cjs3.js, 0, 28))
 >module : Symbol(module, Decl(cjs3.js, 0, 28))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/cjs3", Decl(cjs3.js, 0, 0))
+>exports : Symbol(module.exports, Decl(cjs3.js, 0, 0))
 >ns : Symbol(ns, Decl(cjs3.js, 0, 28))
 >ns : Symbol(ns, Decl(cjs3.js, 0, 5))
 
@@ -90,7 +90,7 @@ module.exports.names = ns;
 >module.exports.names : Symbol(names, Decl(cjs4.js, 0, 28))
 >module.exports : Symbol(names, Decl(cjs4.js, 0, 28))
 >module : Symbol(module, Decl(cjs4.js, 0, 28))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/cjs4", Decl(cjs4.js, 0, 0))
+>exports : Symbol(module.exports, Decl(cjs4.js, 0, 0))
 >names : Symbol(names, Decl(cjs4.js, 0, 28))
 >ns : Symbol(ns, Decl(cjs4.js, 0, 5))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportForms.types b/tests/baselines/reference/jsDeclarationsExportForms.types
index 301ebc77331..910f991ef40 100644
--- a/tests/baselines/reference/jsDeclarationsExportForms.types
+++ b/tests/baselines/reference/jsDeclarationsExportForms.types
@@ -50,10 +50,10 @@ const ns = require("./cls");
 >"./cls" : "./cls"
 
 module.exports = { ns };
->module.exports = { ns } : typeof import("tests/cases/conformance/jsdoc/declarations/cjs")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/cjs")
->module : { "\"tests/cases/conformance/jsdoc/declarations/cjs\"": typeof import("tests/cases/conformance/jsdoc/declarations/cjs"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/cjs")
+>module.exports = { ns } : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{ ns } : { ns: typeof ns; }
 >ns : typeof ns
 
@@ -67,7 +67,7 @@ const ns = require("./cls");
 module.exports = ns;
 >module.exports = ns : typeof ns
 >module.exports : typeof ns
->module : { "\"tests/cases/conformance/jsdoc/declarations/cjs2\"": typeof ns; }
+>module : { exports: typeof ns; }
 >exports : typeof ns
 >ns : typeof ns
 
@@ -81,9 +81,9 @@ const ns = require("./cls");
 module.exports.ns = ns;
 >module.exports.ns = ns : typeof ns
 >module.exports.ns : typeof ns
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/cjs3")
->module : { "\"tests/cases/conformance/jsdoc/declarations/cjs3\"": typeof import("tests/cases/conformance/jsdoc/declarations/cjs3"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/cjs3")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >ns : typeof ns
 >ns : typeof ns
 
@@ -97,9 +97,9 @@ const ns = require("./cls");
 module.exports.names = ns;
 >module.exports.names = ns : typeof ns
 >module.exports.names : typeof ns
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/cjs4")
->module : { "\"tests/cases/conformance/jsdoc/declarations/cjs4\"": typeof import("tests/cases/conformance/jsdoc/declarations/cjs4"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/cjs4")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >names : typeof ns
 >ns : typeof ns
 
diff --git a/tests/baselines/reference/jsDeclarationsExportSubAssignments.symbols b/tests/baselines/reference/jsDeclarationsExportSubAssignments.symbols
index 5939221ce90..ab78b88d4c6 100644
--- a/tests/baselines/reference/jsDeclarationsExportSubAssignments.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportSubAssignments.symbols
@@ -13,7 +13,7 @@ class Foo {}
 >Foo : Symbol(Foo, Decl(cls.js, 3, 2))
 
 module.exports = Foo;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/cls", Decl(cls.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(cls.js, 0, 0))
 >module : Symbol(export=, Decl(cls.js, 4, 12))
 >exports : Symbol(export=, Decl(cls.js, 4, 12))
 >Foo : Symbol(Foo, Decl(cls.js, 3, 2))
@@ -22,7 +22,7 @@ module.exports.Strings = Strings;
 >module.exports.Strings : Symbol(Strings, Decl(cls.js, 5, 21))
 >module.exports : Symbol(Strings, Decl(cls.js, 5, 21))
 >module : Symbol(module, Decl(cls.js, 4, 12))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/cls", Decl(cls.js, 0, 0))
+>exports : Symbol(module.exports, Decl(cls.js, 0, 0))
 >Strings : Symbol(Strings, Decl(cls.js, 5, 21))
 >Strings : Symbol(Strings, Decl(cls.js, 0, 5))
 
diff --git a/tests/baselines/reference/jsDeclarationsExportSubAssignments.types b/tests/baselines/reference/jsDeclarationsExportSubAssignments.types
index 7e00db8d97b..21fdde314e8 100644
--- a/tests/baselines/reference/jsDeclarationsExportSubAssignments.types
+++ b/tests/baselines/reference/jsDeclarationsExportSubAssignments.types
@@ -18,7 +18,7 @@ class Foo {}
 module.exports = Foo;
 >module.exports = Foo : typeof Foo
 >module.exports : typeof Foo
->module : { "\"tests/cases/conformance/jsdoc/declarations/cls\"": typeof Foo; }
+>module : { exports: typeof Foo; }
 >exports : typeof Foo
 >Foo : typeof Foo
 
@@ -26,7 +26,7 @@ module.exports.Strings = Strings;
 >module.exports.Strings = Strings : { a: string; b: string; }
 >module.exports.Strings : { a: string; b: string; }
 >module.exports : typeof Foo
->module : { "\"tests/cases/conformance/jsdoc/declarations/cls\"": typeof Foo; }
+>module : { exports: typeof Foo; }
 >exports : typeof Foo
 >Strings : { a: string; b: string; }
 >Strings : { a: string; b: string; }
diff --git a/tests/baselines/reference/jsDeclarationsExportedClassAliases.symbols b/tests/baselines/reference/jsDeclarationsExportedClassAliases.symbols
index c6275c8b5af..3c3eb7bd4af 100644
--- a/tests/baselines/reference/jsDeclarationsExportedClassAliases.symbols
+++ b/tests/baselines/reference/jsDeclarationsExportedClassAliases.symbols
@@ -6,9 +6,9 @@ const errors = require("./errors");
 >"./errors" : Symbol(errors, Decl(errors.js, 0, 0))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/utils/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 1, 35))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/utils/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 
     errors
 >errors : Symbol(errors, Decl(index.js, 3, 18))
@@ -29,9 +29,9 @@ class FancyError extends Error {
 }
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/utils/errors", Decl(errors.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(errors.js, 0, 0))
 >module : Symbol(module, Decl(errors.js, 4, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/utils/errors", Decl(errors.js, 0, 0))
+>exports : Symbol(module.exports, Decl(errors.js, 0, 0))
 
     FancyError
 >FancyError : Symbol(FancyError, Decl(errors.js, 6, 18))
diff --git a/tests/baselines/reference/jsDeclarationsExportedClassAliases.types b/tests/baselines/reference/jsDeclarationsExportedClassAliases.types
index c9be4e46037..d30166f32f5 100644
--- a/tests/baselines/reference/jsDeclarationsExportedClassAliases.types
+++ b/tests/baselines/reference/jsDeclarationsExportedClassAliases.types
@@ -7,10 +7,10 @@ const errors = require("./errors");
 >"./errors" : "./errors"
 
 module.exports = {
->module.exports = {    errors} : typeof import("tests/cases/conformance/jsdoc/declarations/utils/index")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/utils/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/utils/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/utils/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/utils/index")
+>module.exports = {    errors} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    errors} : { errors: typeof errors; }
 
     errors
@@ -34,10 +34,10 @@ class FancyError extends Error {
 }
 
 module.exports = {
->module.exports = {    FancyError} : typeof import("tests/cases/conformance/jsdoc/declarations/utils/errors")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/utils/errors")
->module : { "\"tests/cases/conformance/jsdoc/declarations/utils/errors\"": typeof import("tests/cases/conformance/jsdoc/declarations/utils/errors"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/utils/errors")
+>module.exports = {    FancyError} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    FancyError} : { FancyError: typeof FancyError; }
 
     FancyError
diff --git a/tests/baselines/reference/jsDeclarationsFunctionClassesCjsExportAssignment.symbols b/tests/baselines/reference/jsDeclarationsFunctionClassesCjsExportAssignment.symbols
index d667f9d0cc2..8ec88e75f40 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionClassesCjsExportAssignment.symbols
+++ b/tests/baselines/reference/jsDeclarationsFunctionClassesCjsExportAssignment.symbols
@@ -13,7 +13,7 @@ function Timer(timeout) {
 >timeout : Symbol(timeout, Decl(timer.js, 3, 15))
 }
 module.exports = Timer;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/timer", Decl(timer.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(timer.js, 0, 0))
 >module : Symbol(export=, Decl(timer.js, 5, 1))
 >exports : Symbol(export=, Decl(timer.js, 5, 1))
 >Timer : Symbol(Timer, Decl(timer.js, 0, 0))
@@ -36,7 +36,7 @@ function Hook(handle) {
 >handle : Symbol(handle, Decl(hook.js, 6, 14))
 }
 module.exports = Hook;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/hook", Decl(hook.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(hook.js, 0, 0))
 >module : Symbol(export=, Decl(hook.js, 8, 1))
 >exports : Symbol(export=, Decl(hook.js, 8, 1))
 >Hook : Symbol(Hook, Decl(hook.js, 0, 0))
@@ -112,7 +112,7 @@ Context.prototype = {
     }
 }
 module.exports = Context;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/context", Decl(context.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(context.js, 0, 0))
 >module : Symbol(export=, Decl(context.js, 46, 1))
 >exports : Symbol(export=, Decl(context.js, 46, 1))
 >Context : Symbol(Context, Decl(context.js, 0, 0), Decl(context.js, 36, 1))
diff --git a/tests/baselines/reference/jsDeclarationsFunctionClassesCjsExportAssignment.types b/tests/baselines/reference/jsDeclarationsFunctionClassesCjsExportAssignment.types
index 3beb66f5ba9..c854b1514aa 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionClassesCjsExportAssignment.types
+++ b/tests/baselines/reference/jsDeclarationsFunctionClassesCjsExportAssignment.types
@@ -16,7 +16,7 @@ function Timer(timeout) {
 module.exports = Timer;
 >module.exports = Timer : typeof Timer
 >module.exports : typeof Timer
->module : { "\"tests/cases/conformance/jsdoc/declarations/timer\"": typeof Timer; }
+>module : { exports: typeof Timer; }
 >exports : typeof Timer
 >Timer : typeof Timer
 
@@ -41,7 +41,7 @@ function Hook(handle) {
 module.exports = Hook;
 >module.exports = Hook : typeof Hook
 >module.exports : typeof Hook
->module : { "\"tests/cases/conformance/jsdoc/declarations/hook\"": typeof Hook; }
+>module : { exports: typeof Hook; }
 >exports : typeof Hook
 >Hook : typeof Hook
 
@@ -131,7 +131,7 @@ Context.prototype = {
 module.exports = Context;
 >module.exports = Context : { (input: Input): Context; new (input: Input): Context; prototype: { construct(input: Input, handle?: import("tests/cases/conformance/jsdoc/declarations/hook").HookHandler): State; }; }
 >module.exports : { (input: Input): Context; new (input: Input): Context; prototype: { construct(input: Input, handle?: import("tests/cases/conformance/jsdoc/declarations/hook").HookHandler): State; }; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/context\"": { (input: Input): Context; new (input: Input): Context; prototype: { construct(input: Input, handle?: import("tests/cases/conformance/jsdoc/declarations/hook").HookHandler): State; }; }; }
+>module : { exports: { (input: Input): Context; new (input: Input): Context; prototype: { construct(input: Input, handle?: import("tests/cases/conformance/jsdoc/declarations/hook").HookHandler): State; }; }; }
 >exports : { (input: Input): Context; new (input: Input): Context; prototype: { construct(input: Input, handle?: import("tests/cases/conformance/jsdoc/declarations/hook").HookHandler): State; }; }
 >Context : typeof Context
 
diff --git a/tests/baselines/reference/jsDeclarationsFunctionPrototypeStatic.symbols b/tests/baselines/reference/jsDeclarationsFunctionPrototypeStatic.symbols
index 7618a933e7d..8ceb0aeeebd 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionPrototypeStatic.symbols
+++ b/tests/baselines/reference/jsDeclarationsFunctionPrototypeStatic.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/jsdoc/declarations/source.js ===
 module.exports = MyClass;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/source", Decl(source.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(source.js, 0, 0))
 >module : Symbol(export=, Decl(source.js, 0, 0))
 >exports : Symbol(export=, Decl(source.js, 0, 0))
 >MyClass : Symbol(MyClass, Decl(source.js, 0, 25), Decl(source.js, 2, 21), Decl(source.js, 4, 40))
diff --git a/tests/baselines/reference/jsDeclarationsFunctionPrototypeStatic.types b/tests/baselines/reference/jsDeclarationsFunctionPrototypeStatic.types
index 318cf0b2dca..c068755f083 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionPrototypeStatic.types
+++ b/tests/baselines/reference/jsDeclarationsFunctionPrototypeStatic.types
@@ -2,7 +2,7 @@
 module.exports = MyClass;
 >module.exports = MyClass : typeof MyClass
 >module.exports : typeof MyClass
->module : { "\"tests/cases/conformance/jsdoc/declarations/source\"": typeof MyClass; }
+>module : { exports: typeof MyClass; }
 >exports : typeof MyClass
 >MyClass : typeof MyClass
 
diff --git a/tests/baselines/reference/jsDeclarationsFunctionWithDefaultAssignedMember.symbols b/tests/baselines/reference/jsDeclarationsFunctionWithDefaultAssignedMember.symbols
index fa5211a26e1..e3398661b14 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionWithDefaultAssignedMember.symbols
+++ b/tests/baselines/reference/jsDeclarationsFunctionWithDefaultAssignedMember.symbols
@@ -15,7 +15,7 @@ foo.default = foo;
 >foo : Symbol(foo, Decl(index.js, 0, 0), Decl(index.js, 0, 17), Decl(index.js, 2, 14))
 
 module.exports = foo;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 3, 18))
 >exports : Symbol(export=, Decl(index.js, 3, 18))
 >foo : Symbol(foo, Decl(index.js, 0, 0), Decl(index.js, 0, 17), Decl(index.js, 2, 14))
diff --git a/tests/baselines/reference/jsDeclarationsFunctionWithDefaultAssignedMember.types b/tests/baselines/reference/jsDeclarationsFunctionWithDefaultAssignedMember.types
index 00203c61f0e..231acbaf887 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionWithDefaultAssignedMember.types
+++ b/tests/baselines/reference/jsDeclarationsFunctionWithDefaultAssignedMember.types
@@ -19,7 +19,7 @@ foo.default = foo;
 module.exports = foo;
 >module.exports = foo : typeof foo
 >module.exports : typeof foo
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof foo; }
+>module : { exports: typeof foo; }
 >exports : typeof foo
 >foo : typeof foo
 
diff --git a/tests/baselines/reference/jsDeclarationsFunctionsCjs.symbols b/tests/baselines/reference/jsDeclarationsFunctionsCjs.symbols
index b900de3c1f0..237e2f981ca 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionsCjs.symbols
+++ b/tests/baselines/reference/jsDeclarationsFunctionsCjs.symbols
@@ -3,7 +3,7 @@ module.exports.a = function a() {}
 >module.exports.a : Symbol(a, Decl(index.js, 0, 0))
 >module.exports : Symbol(a, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >a : Symbol(a, Decl(index.js, 0, 0))
 >a : Symbol(a, Decl(index.js, 0, 18))
 
@@ -11,16 +11,16 @@ module.exports.b = function b() {}
 >module.exports.b : Symbol(b, Decl(index.js, 0, 34), Decl(index.js, 3, 15))
 >module.exports : Symbol(b, Decl(index.js, 0, 34), Decl(index.js, 3, 15))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >b : Symbol(b, Decl(index.js, 0, 34), Decl(index.js, 3, 15))
 >b : Symbol(b, Decl(index.js, 2, 18))
 
 module.exports.b.cat = "cat";
 >module.exports.b.cat : Symbol(b.cat, Decl(index.js, 2, 34))
 >module.exports.b : Symbol(b.cat, Decl(index.js, 2, 34))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >b : Symbol(b, Decl(index.js, 0, 34), Decl(index.js, 3, 15))
 >cat : Symbol(b.cat, Decl(index.js, 2, 34))
 
@@ -28,16 +28,16 @@ module.exports.c = function c() {}
 >module.exports.c : Symbol(c, Decl(index.js, 3, 29), Decl(index.js, 6, 15))
 >module.exports : Symbol(c, Decl(index.js, 3, 29), Decl(index.js, 6, 15))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >c : Symbol(c, Decl(index.js, 3, 29), Decl(index.js, 6, 15))
 >c : Symbol(c, Decl(index.js, 5, 18))
 
 module.exports.c.Cls = class {}
 >module.exports.c.Cls : Symbol(c.Cls, Decl(index.js, 5, 34))
 >module.exports.c : Symbol(c.Cls, Decl(index.js, 5, 34))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >c : Symbol(c, Decl(index.js, 3, 29), Decl(index.js, 6, 15))
 >Cls : Symbol(c.Cls, Decl(index.js, 5, 34))
 
@@ -50,7 +50,7 @@ module.exports.d = function d(a, b) { return /** @type {*} */(null); }
 >module.exports.d : Symbol(d, Decl(index.js, 6, 31))
 >module.exports : Symbol(d, Decl(index.js, 6, 31))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >d : Symbol(d, Decl(index.js, 6, 31))
 >d : Symbol(d, Decl(index.js, 13, 18))
 >a : Symbol(a, Decl(index.js, 13, 30))
@@ -66,7 +66,7 @@ module.exports.e = function e(a, b) { return /** @type {*} */(null); }
 >module.exports.e : Symbol(e, Decl(index.js, 13, 70))
 >module.exports : Symbol(e, Decl(index.js, 13, 70))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >e : Symbol(e, Decl(index.js, 13, 70))
 >e : Symbol(e, Decl(index.js, 21, 18))
 >a : Symbol(a, Decl(index.js, 21, 30))
@@ -80,7 +80,7 @@ module.exports.f = function f(a) {
 >module.exports.f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 >module.exports : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 >f : Symbol(f, Decl(index.js, 27, 18))
 >a : Symbol(a, Decl(index.js, 27, 30))
@@ -91,15 +91,15 @@ module.exports.f = function f(a) {
 module.exports.f.self = module.exports.f;
 >module.exports.f.self : Symbol(f.self, Decl(index.js, 29, 1))
 >module.exports.f : Symbol(f.self, Decl(index.js, 29, 1))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 >self : Symbol(f.self, Decl(index.js, 29, 1))
 >module.exports.f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 
 /**
@@ -124,7 +124,7 @@ module.exports.g = g;
 >module.exports.g : Symbol(g, Decl(index.js, 38, 1))
 >module.exports : Symbol(g, Decl(index.js, 38, 1))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >g : Symbol(g, Decl(index.js, 38, 1))
 >g : Symbol(g, Decl(index.js, 30, 41))
 
@@ -150,7 +150,7 @@ module.exports.h = hh;
 >module.exports.h : Symbol(h, Decl(index.js, 48, 1))
 >module.exports : Symbol(h, Decl(index.js, 48, 1))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >h : Symbol(h, Decl(index.js, 48, 1))
 >hh : Symbol(hh, Decl(index.js, 40, 21))
 
@@ -158,7 +158,7 @@ module.exports.i = function i() {}
 >module.exports.i : Symbol(i, Decl(index.js, 50, 22))
 >module.exports : Symbol(i, Decl(index.js, 50, 22))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >i : Symbol(i, Decl(index.js, 50, 22))
 >i : Symbol(i, Decl(index.js, 52, 18))
 
@@ -166,12 +166,12 @@ module.exports.ii = module.exports.i;
 >module.exports.ii : Symbol(ii, Decl(index.js, 52, 34))
 >module.exports : Symbol(ii, Decl(index.js, 52, 34))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >ii : Symbol(ii, Decl(index.js, 52, 34))
 >module.exports.i : Symbol(i, Decl(index.js, 50, 22))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >i : Symbol(i, Decl(index.js, 50, 22))
 
 // note that this last one doesn't make much sense in cjs, since exports aren't hoisted bindings
@@ -179,19 +179,19 @@ module.exports.jj = module.exports.j;
 >module.exports.jj : Symbol(jj, Decl(index.js, 53, 37))
 >module.exports : Symbol(jj, Decl(index.js, 53, 37))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >jj : Symbol(jj, Decl(index.js, 53, 37))
 >module.exports.j : Symbol(j, Decl(index.js, 56, 37))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >j : Symbol(j, Decl(index.js, 56, 37))
 
 module.exports.j = function j() {}
 >module.exports.j : Symbol(j, Decl(index.js, 56, 37))
 >module.exports : Symbol(j, Decl(index.js, 56, 37))
 >module : Symbol(module, Decl(index.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >j : Symbol(j, Decl(index.js, 56, 37))
 >j : Symbol(j, Decl(index.js, 57, 18))
 
diff --git a/tests/baselines/reference/jsDeclarationsFunctionsCjs.types b/tests/baselines/reference/jsDeclarationsFunctionsCjs.types
index 15bba1a331d..e08e5e1ba87 100644
--- a/tests/baselines/reference/jsDeclarationsFunctionsCjs.types
+++ b/tests/baselines/reference/jsDeclarationsFunctionsCjs.types
@@ -2,9 +2,9 @@
 module.exports.a = function a() {}
 >module.exports.a = function a() {} : () => void
 >module.exports.a : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >a : () => void
 >function a() {} : () => void
 >a : () => void
@@ -12,9 +12,9 @@ module.exports.a = function a() {}
 module.exports.b = function b() {}
 >module.exports.b = function b() {} : { (): void; cat: string; }
 >module.exports.b : { (): void; cat: string; }
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >b : { (): void; cat: string; }
 >function b() {} : { (): void; cat: string; }
 >b : { (): void; cat: string; }
@@ -23,9 +23,9 @@ module.exports.b.cat = "cat";
 >module.exports.b.cat = "cat" : "cat"
 >module.exports.b.cat : string
 >module.exports.b : { (): void; cat: string; }
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >b : { (): void; cat: string; }
 >cat : string
 >"cat" : "cat"
@@ -33,9 +33,9 @@ module.exports.b.cat = "cat";
 module.exports.c = function c() {}
 >module.exports.c = function c() {} : { (): void; Cls: typeof Cls; }
 >module.exports.c : { (): void; Cls: typeof Cls; }
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >c : { (): void; Cls: typeof Cls; }
 >function c() {} : { (): void; Cls: typeof Cls; }
 >c : { (): void; Cls: typeof Cls; }
@@ -44,9 +44,9 @@ module.exports.c.Cls = class {}
 >module.exports.c.Cls = class {} : typeof Cls
 >module.exports.c.Cls : typeof Cls
 >module.exports.c : { (): void; Cls: typeof Cls; }
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >c : { (): void; Cls: typeof Cls; }
 >Cls : typeof Cls
 >class {} : typeof Cls
@@ -59,9 +59,9 @@ module.exports.c.Cls = class {}
 module.exports.d = function d(a, b) { return /** @type {*} */(null); }
 >module.exports.d = function d(a, b) { return /** @type {*} */(null); } : (a: number, b: number) => string
 >module.exports.d : (a: number, b: number) => string
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >d : (a: number, b: number) => string
 >function d(a, b) { return /** @type {*} */(null); } : (a: number, b: number) => string
 >d : (a: number, b: number) => string
@@ -79,9 +79,9 @@ module.exports.d = function d(a, b) { return /** @type {*} */(null); }
 module.exports.e = function e(a, b) { return /** @type {*} */(null); }
 >module.exports.e = function e(a, b) { return /** @type {*} */(null); } : <T, U>(a: T, b: U) => T & U
 >module.exports.e : <T, U>(a: T, b: U) => T & U
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >e : <T, U>(a: T, b: U) => T & U
 >function e(a, b) { return /** @type {*} */(null); } : <T, U>(a: T, b: U) => T & U
 >e : <T, U>(a: T, b: U) => T & U
@@ -97,9 +97,9 @@ module.exports.e = function e(a, b) { return /** @type {*} */(null); }
 module.exports.f = function f(a) {
 >module.exports.f = function f(a) {    return a;} : { <T>(a: T): T; self: any; }
 >module.exports.f : { <T>(a: T): T; self: any; }
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >f : { <T>(a: T): T; self: any; }
 >function f(a) {    return a;} : { <T>(a: T): T; self: any; }
 >f : { <T>(a: T): T; self: any; }
@@ -112,15 +112,15 @@ module.exports.f.self = module.exports.f;
 >module.exports.f.self = module.exports.f : { <T>(a: T): T; self: any; }
 >module.exports.f.self : { <T>(a: T): T; self: any; }
 >module.exports.f : { <T>(a: T): T; self: any; }
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >f : { <T>(a: T): T; self: any; }
 >self : { <T>(a: T): T; self: any; }
 >module.exports.f : { <T>(a: T): T; self: any; }
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >f : { <T>(a: T): T; self: any; }
 
 /**
@@ -146,9 +146,9 @@ function g(a, b) {
 module.exports.g = g;
 >module.exports.g = g : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
 >module.exports.g : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >g : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
 >g : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
 
@@ -175,18 +175,18 @@ function hh(a, b) {
 module.exports.h = hh;
 >module.exports.h = hh : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
 >module.exports.h : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >h : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
 >hh : (a: { x: string; }, b: { y: { (): void; cat: string; }; }) => void
 
 module.exports.i = function i() {}
 >module.exports.i = function i() {} : () => void
 >module.exports.i : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >i : () => void
 >function i() {} : () => void
 >i : () => void
@@ -194,36 +194,36 @@ module.exports.i = function i() {}
 module.exports.ii = module.exports.i;
 >module.exports.ii = module.exports.i : () => void
 >module.exports.ii : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >ii : () => void
 >module.exports.i : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >i : () => void
 
 // note that this last one doesn't make much sense in cjs, since exports aren't hoisted bindings
 module.exports.jj = module.exports.j;
 >module.exports.jj = module.exports.j : () => void
 >module.exports.jj : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >jj : () => void
 >module.exports.j : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >j : () => void
 
 module.exports.j = function j() {}
 >module.exports.j = function j() {} : () => void
 >module.exports.j : () => void
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >j : () => void
 >function j() {} : () => void
 >j : () => void
diff --git a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
index 6127c7d6af7..aad4371015d 100644
--- a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
+++ b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
@@ -39,9 +39,9 @@ function testFn(input) {
 }
 
 module.exports = {testFn, testFnTypes};
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/file2", Decl(file2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(file2.js, 0, 0))
 >module : Symbol(module, Decl(file2.js, 25, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/file2", Decl(file2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(file2.js, 0, 0))
 >testFn : Symbol(testFn, Decl(file2.js, 27, 18))
 >testFnTypes : Symbol(testFnTypes, Decl(file2.js, 27, 25))
 
diff --git a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
index df5d014acfd..3434daf8b62 100644
--- a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
+++ b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.types
@@ -47,10 +47,10 @@ function testFn(input) {
 }
 
 module.exports = {testFn, testFnTypes};
->module.exports = {testFn, testFnTypes} : typeof import("tests/cases/conformance/jsdoc/declarations/file2")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/file2")
->module : { "\"tests/cases/conformance/jsdoc/declarations/file2\"": typeof import("tests/cases/conformance/jsdoc/declarations/file2"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/file2")
+>module.exports = {testFn, testFnTypes} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{testFn, testFnTypes} : { testFn: (input: testFnTypes.input) => number; testFnTypes: { [x: string]: any; }; }
 >testFn : (input: testFnTypes.input) => number
 >testFnTypes : { [x: string]: any; }
diff --git a/tests/baselines/reference/jsDeclarationsImportTypeBundled.symbols b/tests/baselines/reference/jsDeclarationsImportTypeBundled.symbols
index 7cf1f7a1b23..3d5ffe6c367 100644
--- a/tests/baselines/reference/jsDeclarationsImportTypeBundled.symbols
+++ b/tests/baselines/reference/jsDeclarationsImportTypeBundled.symbols
@@ -10,7 +10,7 @@ const x = {x: 12};
 >x : Symbol(x, Decl(mod1.js, 6, 11))
 
 module.exports = x;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/folder/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 6, 18))
 >exports : Symbol(export=, Decl(mod1.js, 6, 18))
 >x : Symbol(x, Decl(mod1.js, 6, 5))
@@ -22,7 +22,7 @@ const items = [{x: 12}];
 >x : Symbol(x, Decl(index.js, 1, 16))
 
 module.exports = items;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 1, 24))
 >exports : Symbol(export=, Decl(index.js, 1, 24))
 >items : Symbol(items, Decl(index.js, 1, 5))
diff --git a/tests/baselines/reference/jsDeclarationsImportTypeBundled.types b/tests/baselines/reference/jsDeclarationsImportTypeBundled.types
index 66eca757812..c11b49b1c27 100644
--- a/tests/baselines/reference/jsDeclarationsImportTypeBundled.types
+++ b/tests/baselines/reference/jsDeclarationsImportTypeBundled.types
@@ -14,7 +14,7 @@ const x = {x: 12};
 module.exports = x;
 >module.exports = x : { x: number; }
 >module.exports : { x: number; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/folder/mod1\"": { x: number; }; }
+>module : { exports: { x: number; }; }
 >exports : { x: number; }
 >x : Item
 
@@ -30,7 +30,7 @@ const items = [{x: 12}];
 module.exports = items;
 >module.exports = items : { [n: number]: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; length: number; toString(): string; toLocaleString(): string; pop(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; push(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; concat(...items: ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; concat(...items: (import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item | ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>)[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; join(separator?: string): string; reverse(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; shift(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; slice(start?: number, end?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; sort(compareFn?: (a: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, b: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item) => number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount: number, ...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; unshift(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; indexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; lastIndexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; every<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, thisArg?: any): U[]; filter<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; }
 >module.exports : { [n: number]: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; length: number; toString(): string; toLocaleString(): string; pop(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; push(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; concat(...items: ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; concat(...items: (import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item | ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>)[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; join(separator?: string): string; reverse(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; shift(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; slice(start?: number, end?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; sort(compareFn?: (a: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, b: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item) => number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount: number, ...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; unshift(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; indexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; lastIndexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; every<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, thisArg?: any): U[]; filter<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { [n: number]: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; length: number; toString(): string; toLocaleString(): string; pop(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; push(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; concat(...items: ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; concat(...items: (import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item | ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>)[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; join(separator?: string): string; reverse(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; shift(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; slice(start?: number, end?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; sort(compareFn?: (a: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, b: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item) => number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount: number, ...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; unshift(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; indexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; lastIndexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; every<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, thisArg?: any): U[]; filter<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; }; }
+>module : { exports: { [n: number]: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; length: number; toString(): string; toLocaleString(): string; pop(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; push(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; concat(...items: ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; concat(...items: (import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item | ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>)[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; join(separator?: string): string; reverse(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; shift(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; slice(start?: number, end?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; sort(compareFn?: (a: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, b: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item) => number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount: number, ...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; unshift(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; indexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; lastIndexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; every<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, thisArg?: any): U[]; filter<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; }; }
 >exports : { [n: number]: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; length: number; toString(): string; toLocaleString(): string; pop(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; push(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; concat(...items: ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; concat(...items: (import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item | ConcatArray<import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>)[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; join(separator?: string): string; reverse(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; shift(): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; slice(start?: number, end?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; sort(compareFn?: (a: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, b: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item) => number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount?: number): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; splice(start: number, deleteCount: number, ...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; unshift(...items: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]): number; indexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; lastIndexOf(searchElement: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, fromIndex?: number): number; every<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, thisArg?: any): U[]; filter<S extends import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item>(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, index: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => unknown, thisArg?: any): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduce<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight(callbackfn: (previousValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, initialValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item): import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item, currentIndex: number, array: import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]) => U, initialValue: U): U; }
 >items : import("tests/cases/conformance/jsdoc/declarations/folder/mod1").Item[]
 
diff --git a/tests/baselines/reference/jsDeclarationsJson.symbols b/tests/baselines/reference/jsDeclarationsJson.symbols
index 9e276decbc6..1ce0e71b188 100644
--- a/tests/baselines/reference/jsDeclarationsJson.symbols
+++ b/tests/baselines/reference/jsDeclarationsJson.symbols
@@ -5,7 +5,7 @@ const j = require("./obj.json");
 >"./obj.json" : Symbol("tests/cases/conformance/jsdoc/declarations/obj", Decl(obj.json, 0, 0))
 
 module.exports = j;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 32))
 >exports : Symbol(export=, Decl(index.js, 0, 32))
 >j : Symbol(j, Decl(index.js, 0, 5))
diff --git a/tests/baselines/reference/jsDeclarationsJson.types b/tests/baselines/reference/jsDeclarationsJson.types
index 3294656ba33..a7c977ccb45 100644
--- a/tests/baselines/reference/jsDeclarationsJson.types
+++ b/tests/baselines/reference/jsDeclarationsJson.types
@@ -8,7 +8,7 @@ const j = require("./obj.json");
 module.exports = j;
 >module.exports = j : { x: number; y: number; obj: { items: ({ x: number; y?: undefined; err?: undefined; } | { x: number; y: number; err?: undefined; } | { x: number; err: boolean; y?: undefined; })[]; }; }
 >module.exports : { x: number; y: number; obj: { items: ({ x: number; y?: undefined; err?: undefined; } | { x: number; y: number; err?: undefined; } | { x: number; err: boolean; y?: undefined; })[]; }; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { x: number; y: number; obj: { items: ({ x: number; y?: undefined; err?: undefined; } | { x: number; y: number; err?: undefined; } | { x: number; err: boolean; y?: undefined; })[]; }; }; }
+>module : { exports: { x: number; y: number; obj: { items: ({ x: number; y?: undefined; err?: undefined; } | { x: number; y: number; err?: undefined; } | { x: number; err: boolean; y?: undefined; })[]; }; }; }
 >exports : { x: number; y: number; obj: { items: ({ x: number; y?: undefined; err?: undefined; } | { x: number; y: number; err?: undefined; } | { x: number; err: boolean; y?: undefined; })[]; }; }
 >j : { x: number; y: number; obj: { items: ({ x: number; y?: undefined; err?: undefined; } | { x: number; y: number; err?: undefined; } | { x: number; err: boolean; y?: undefined; })[]; }; }
 
diff --git a/tests/baselines/reference/jsDeclarationsPackageJson.symbols b/tests/baselines/reference/jsDeclarationsPackageJson.symbols
index 7f09a886bab..d64a82ca85c 100644
--- a/tests/baselines/reference/jsDeclarationsPackageJson.symbols
+++ b/tests/baselines/reference/jsDeclarationsPackageJson.symbols
@@ -5,7 +5,7 @@ const j = require("./package.json");
 >"./package.json" : Symbol("tests/cases/conformance/jsdoc/declarations/package", Decl(package.json, 0, 0))
 
 module.exports = j;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 36))
 >exports : Symbol(export=, Decl(index.js, 0, 36))
 >j : Symbol(j, Decl(index.js, 0, 5))
diff --git a/tests/baselines/reference/jsDeclarationsPackageJson.types b/tests/baselines/reference/jsDeclarationsPackageJson.types
index 46faaf89c8e..ce8b3808845 100644
--- a/tests/baselines/reference/jsDeclarationsPackageJson.types
+++ b/tests/baselines/reference/jsDeclarationsPackageJson.types
@@ -8,7 +8,7 @@ const j = require("./package.json");
 module.exports = j;
 >module.exports = j : { name: string; version: string; description: string; main: string; bin: { cli: string; }; engines: { node: string; }; scripts: { scriptname: string; }; devDependencies: { "@ns/dep": string; }; dependencies: { dep: string; }; repository: string; keywords: string[]; author: string; license: string; homepage: string; config: { o: string[]; }; }
 >module.exports : { name: string; version: string; description: string; main: string; bin: { cli: string; }; engines: { node: string; }; scripts: { scriptname: string; }; devDependencies: { "@ns/dep": string; }; dependencies: { dep: string; }; repository: string; keywords: string[]; author: string; license: string; homepage: string; config: { o: string[]; }; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { name: string; version: string; description: string; main: string; bin: { cli: string; }; engines: { node: string; }; scripts: { scriptname: string; }; devDependencies: { "@ns/dep": string; }; dependencies: { dep: string; }; repository: string; keywords: string[]; author: string; license: string; homepage: string; config: { o: string[]; }; }; }
+>module : { exports: { name: string; version: string; description: string; main: string; bin: { cli: string; }; engines: { node: string; }; scripts: { scriptname: string; }; devDependencies: { "@ns/dep": string; }; dependencies: { dep: string; }; repository: string; keywords: string[]; author: string; license: string; homepage: string; config: { o: string[]; }; }; }
 >exports : { name: string; version: string; description: string; main: string; bin: { cli: string; }; engines: { node: string; }; scripts: { scriptname: string; }; devDependencies: { "@ns/dep": string; }; dependencies: { dep: string; }; repository: string; keywords: string[]; author: string; license: string; homepage: string; config: { o: string[]; }; }
 >j : { name: string; version: string; description: string; main: string; bin: { cli: string; }; engines: { node: string; }; scripts: { scriptname: string; }; devDependencies: { "@ns/dep": string; }; dependencies: { dep: string; }; repository: string; keywords: string[]; author: string; license: string; homepage: string; config: { o: string[]; }; }
 
diff --git a/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols b/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols
index 0d20e28fa52..a02e7415afa 100644
--- a/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols
+++ b/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols
@@ -20,7 +20,7 @@ BaseFactory.Base = Base;
 >Base : Symbol(Base, Decl(base.js, 0, 0))
 
 module.exports = BaseFactory;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/base", Decl(base.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(base.js, 0, 0))
 >module : Symbol(export=, Decl(base.js, 8, 24))
 >exports : Symbol(export=, Decl(base.js, 8, 24))
 >BaseFactory : Symbol(BaseFactory, Decl(base.js, 4, 5), Decl(base.js, 6, 2))
diff --git a/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit1.types b/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit1.types
index 17f9522ca5c..154977f9a06 100644
--- a/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit1.types
+++ b/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit1.types
@@ -25,7 +25,7 @@ BaseFactory.Base = Base;
 module.exports = BaseFactory;
 >module.exports = BaseFactory : { (): Base; Base: typeof Base; }
 >module.exports : { (): Base; Base: typeof Base; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/base\"": { (): Base; Base: typeof Base; }; }
+>module : { exports: { (): Base; Base: typeof Base; }; }
 >exports : { (): Base; Base: typeof Base; }
 >BaseFactory : { (): Base; Base: typeof Base; }
 
diff --git a/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols b/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols
index f23f9f84f2d..01b7c3f4c51 100644
--- a/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols
+++ b/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols
@@ -20,7 +20,7 @@ BaseFactory.Base = Base;
 >Base : Symbol(Base, Decl(base.js, 0, 0))
 
 module.exports = BaseFactory;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/base", Decl(base.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(base.js, 0, 0))
 >module : Symbol(export=, Decl(base.js, 8, 24))
 >exports : Symbol(export=, Decl(base.js, 8, 24))
 >BaseFactory : Symbol(BaseFactory, Decl(base.js, 4, 5), Decl(base.js, 6, 2))
diff --git a/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit2.types b/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit2.types
index 196e7c7dff0..49d8472667c 100644
--- a/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit2.types
+++ b/tests/baselines/reference/jsDeclarationsParameterTagReusesInputNodeInEmit2.types
@@ -25,7 +25,7 @@ BaseFactory.Base = Base;
 module.exports = BaseFactory;
 >module.exports = BaseFactory : { (): Base; Base: typeof Base; }
 >module.exports : { (): Base; Base: typeof Base; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/base\"": { (): Base; Base: typeof Base; }; }
+>module : { exports: { (): Base; Base: typeof Base; }; }
 >exports : { (): Base; Base: typeof Base; }
 >BaseFactory : { (): Base; Base: typeof Base; }
 
diff --git a/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.symbols b/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.symbols
index 221e0bd0d03..8fcefa34007 100644
--- a/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.symbols
+++ b/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.symbols
@@ -3,7 +3,7 @@ class Foo {}
 >Foo : Symbol(Foo, Decl(cls.js, 0, 0))
 
 module.exports = Foo;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/cls", Decl(cls.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(cls.js, 0, 0))
 >module : Symbol(export=, Decl(cls.js, 0, 12))
 >exports : Symbol(export=, Decl(cls.js, 0, 12))
 >Foo : Symbol(Foo, Decl(cls.js, 0, 0))
diff --git a/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.types b/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.types
index 8597d00c34a..60d4c23c517 100644
--- a/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.types
+++ b/tests/baselines/reference/jsDeclarationsReexportAliasesEsModuleInterop.types
@@ -5,7 +5,7 @@ class Foo {}
 module.exports = Foo;
 >module.exports = Foo : typeof Foo
 >module.exports : typeof Foo
->module : { "\"tests/cases/conformance/jsdoc/declarations/cls\"": typeof Foo; }
+>module : { exports: typeof Foo; }
 >exports : typeof Foo
 >Foo : typeof Foo
 
diff --git a/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.symbols b/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.symbols
index 2fbefda6a0b..1b6a5d0fea4 100644
--- a/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.symbols
+++ b/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.symbols
@@ -7,9 +7,9 @@ const { SomeClass, SomeClass: Another } = require('./lib');
 >'./lib' : Symbol("tests/cases/conformance/jsdoc/declarations/lib", Decl(lib.js, 0, 0))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/main", Decl(main.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(main.js, 0, 0))
 >module : Symbol(module, Decl(main.js, 0, 59))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/main", Decl(main.js, 0, 0))
+>exports : Symbol(module.exports, Decl(main.js, 0, 0))
 
     SomeClass,
 >SomeClass : Symbol(SomeClass, Decl(main.js, 2, 18))
@@ -41,9 +41,9 @@ class SomeClass {
 }
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/lib", Decl(lib.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(lib.js, 0, 0))
 >module : Symbol(module, Decl(lib.js, 11, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/lib", Decl(lib.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lib.js, 0, 0))
 
     bar,
 >bar : Symbol(bar, Decl(lib.js, 13, 18))
diff --git a/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.types b/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.types
index 55e56a9d2e5..ec3f3f47f3f 100644
--- a/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.types
+++ b/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.types
@@ -8,10 +8,10 @@ const { SomeClass, SomeClass: Another } = require('./lib');
 >'./lib' : "./lib"
 
 module.exports = {
->module.exports = {    SomeClass,    Another} : typeof import("tests/cases/conformance/jsdoc/declarations/main")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/main")
->module : { "\"tests/cases/conformance/jsdoc/declarations/main\"": typeof import("tests/cases/conformance/jsdoc/declarations/main"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/main")
+>module.exports = {    SomeClass,    Another} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    SomeClass,    Another} : { SomeClass: typeof SomeClass; Another: typeof SomeClass; }
 
     SomeClass,
@@ -46,10 +46,10 @@ class SomeClass {
 }
 
 module.exports = {
->module.exports = {    bar,    SomeClass} : typeof import("tests/cases/conformance/jsdoc/declarations/lib")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/lib")
->module : { "\"tests/cases/conformance/jsdoc/declarations/lib\"": typeof import("tests/cases/conformance/jsdoc/declarations/lib"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/lib")
+>module.exports = {    bar,    SomeClass} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    bar,    SomeClass} : { bar: (a: string) => string; SomeClass: typeof SomeClass; }
 
     bar,
diff --git a/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.symbols b/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
index 570f2dc9e25..a645f55f6f6 100644
--- a/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
+++ b/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
@@ -34,9 +34,9 @@ class Rectangle {
 }
 
 module.exports = { Rectangle };
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/rectangle", Decl(rectangle.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(rectangle.js, 0, 0))
 >module : Symbol(module, Decl(rectangle.js, 4, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/rectangle", Decl(rectangle.js, 0, 0))
+>exports : Symbol(module.exports, Decl(rectangle.js, 0, 0))
 >Rectangle : Symbol(Rectangle, Decl(rectangle.js, 6, 18))
 
 === tests/cases/conformance/jsdoc/declarations/index.js ===
@@ -84,8 +84,8 @@ class Render {
 }
 
 module.exports = { Render };
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 20, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >Render : Symbol(Render, Decl(index.js, 22, 18))
 
diff --git a/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.types b/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.types
index 9ec6c7e94f6..5b90275da04 100644
--- a/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.types
+++ b/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.types
@@ -41,10 +41,10 @@ class Rectangle {
 }
 
 module.exports = { Rectangle };
->module.exports = { Rectangle } : typeof import("tests/cases/conformance/jsdoc/declarations/rectangle")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/rectangle")
->module : { "\"tests/cases/conformance/jsdoc/declarations/rectangle\"": typeof import("tests/cases/conformance/jsdoc/declarations/rectangle"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/rectangle")
+>module.exports = { Rectangle } : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{ Rectangle } : { Rectangle: typeof Rectangle; }
 >Rectangle : typeof Rectangle
 
@@ -98,10 +98,10 @@ class Render {
 }
 
 module.exports = { Render };
->module.exports = { Render } : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports = { Render } : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{ Render } : { Render: typeof Render; }
 >Render : typeof Render
 
diff --git a/tests/baselines/reference/jsDeclarationsTypeAliases.symbols b/tests/baselines/reference/jsDeclarationsTypeAliases.symbols
index 55e7851cc03..eb0d5dd3173 100644
--- a/tests/baselines/reference/jsDeclarationsTypeAliases.symbols
+++ b/tests/baselines/reference/jsDeclarationsTypeAliases.symbols
@@ -49,9 +49,9 @@ class ExportedThing {
 >z : Symbol(ExportedThing.z, Decl(mixed.js, 10, 21))
 }
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/mixed", Decl(mixed.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mixed.js, 0, 0))
 >module : Symbol(module, Decl(mixed.js, 12, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/mixed", Decl(mixed.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mixed.js, 0, 0))
 
     doTheThing,
 >doTheThing : Symbol(doTheThing, Decl(mixed.js, 13, 18))
diff --git a/tests/baselines/reference/jsDeclarationsTypeAliases.types b/tests/baselines/reference/jsDeclarationsTypeAliases.types
index 4684b9e6b69..a9e5e74f004 100644
--- a/tests/baselines/reference/jsDeclarationsTypeAliases.types
+++ b/tests/baselines/reference/jsDeclarationsTypeAliases.types
@@ -53,10 +53,10 @@ class ExportedThing {
 >"ok" : "ok"
 }
 module.exports = {
->module.exports = {    doTheThing,    ExportedThing,} : typeof import("tests/cases/conformance/jsdoc/declarations/mixed")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/mixed")
->module : { "\"tests/cases/conformance/jsdoc/declarations/mixed\"": typeof import("tests/cases/conformance/jsdoc/declarations/mixed"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/mixed")
+>module.exports = {    doTheThing,    ExportedThing,} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    doTheThing,    ExportedThing,} : { doTheThing: (x: number) => SomeType; ExportedThing: typeof ExportedThing; }
 
     doTheThing,
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration.symbols b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration.symbols
index 96a988e2e11..b09982ed211 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration.symbols
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration.symbols
@@ -18,7 +18,7 @@ const items = [];
 >items : Symbol(items, Decl(index.js, 1, 5))
 
 module.exports = items;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 1, 17))
 >exports : Symbol(export=, Decl(index.js, 1, 17))
 >items : Symbol(items, Decl(index.js, 1, 5))
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration.types b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration.types
index 9ff78e86ea8..47b41068bce 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration.types
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration.types
@@ -18,7 +18,7 @@ const items = [];
 module.exports = items;
 >module.exports = items : { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }
 >module.exports : { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }; }
+>module : { exports: { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }; }
 >exports : { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }
 >items : Item[]
 
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.symbols b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.symbols
index 283b16b647a..079eff57aa6 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.symbols
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.symbols
@@ -5,7 +5,7 @@ const items = require("./some-mod")();
 >"./some-mod" : Symbol("tests/cases/conformance/jsdoc/declarations/some-mod", Decl(some-mod.d.ts, 0, 0))
 
 module.exports = items;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 0, 38))
 >exports : Symbol(export=, Decl(index.js, 0, 38))
 >items : Symbol(items, Decl(index.js, 0, 5))
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
index 3675a48b2d9..1f003fc726c 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
@@ -9,7 +9,7 @@ const items = require("./some-mod")();
 module.exports = items;
 >module.exports = items : { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }
 >module.exports : { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }; }
+>module : { exports: { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }; }
 >exports : { [n: number]: Item; length: number; toString(): string; toLocaleString(): string; pop(): Item; push(...items: Item[]): number; concat(...items: ConcatArray<Item>[]): Item[]; concat(...items: (Item | ConcatArray<Item>)[]): Item[]; join(separator?: string): string; reverse(): Item[]; shift(): Item; slice(start?: number, end?: number): Item[]; sort(compareFn?: (a: Item, b: Item) => number): Item[]; splice(start: number, deleteCount?: number): Item[]; splice(start: number, deleteCount: number, ...items: Item[]): Item[]; unshift(...items: Item[]): number; indexOf(searchElement: Item, fromIndex?: number): number; lastIndexOf(searchElement: Item, fromIndex?: number): number; every<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): this is S[]; every(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; some(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): boolean; forEach(callbackfn: (value: Item, index: number, array: Item[]) => void, thisArg?: any): void; map<U>(callbackfn: (value: Item, index: number, array: Item[]) => U, thisArg?: any): U[]; filter<S extends Item>(predicate: (value: Item, index: number, array: Item[]) => value is S, thisArg?: any): S[]; filter(predicate: (value: Item, index: number, array: Item[]) => unknown, thisArg?: any): Item[]; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduce(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduce<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item): Item; reduceRight(callbackfn: (previousValue: Item, currentValue: Item, currentIndex: number, array: Item[]) => Item, initialValue: Item): Item; reduceRight<U>(callbackfn: (previousValue: U, currentValue: Item, currentIndex: number, array: Item[]) => U, initialValue: U): U; find<S extends Item>(predicate: (this: void, value: Item, index: number, obj: Item[]) => value is S, thisArg?: any): S; find(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): Item; findIndex(predicate: (value: Item, index: number, obj: Item[]) => unknown, thisArg?: any): number; fill(value: Item, start?: number, end?: number): Item[]; copyWithin(target: number, start: number, end?: number): Item[]; [Symbol.iterator](): IterableIterator<Item>; entries(): IterableIterator<[number, Item]>; keys(): IterableIterator<number>; values(): IterableIterator<Item>; [Symbol.unscopables](): { copyWithin: boolean; entries: boolean; fill: boolean; find: boolean; findIndex: boolean; keys: boolean; values: boolean; }; }
 >items : Item[]
 
diff --git a/tests/baselines/reference/jsDeclarationsTypeReferences.symbols b/tests/baselines/reference/jsDeclarationsTypeReferences.symbols
index 8c71d987023..0975f66f470 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReferences.symbols
+++ b/tests/baselines/reference/jsDeclarationsTypeReferences.symbols
@@ -13,9 +13,9 @@ const thing = new Something();
 >Something : Symbol(Something, Decl(index.js, 2, 5))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 4, 30))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 
     thing
 >thing : Symbol(thing, Decl(index.js, 6, 18))
diff --git a/tests/baselines/reference/jsDeclarationsTypeReferences.types b/tests/baselines/reference/jsDeclarationsTypeReferences.types
index 3f78aaa5274..6696dfdbeaf 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReferences.types
+++ b/tests/baselines/reference/jsDeclarationsTypeReferences.types
@@ -15,10 +15,10 @@ const thing = new Something();
 >Something : typeof Something
 
 module.exports = {
->module.exports = {    thing} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports = {    thing} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    thing} : { thing: Something; }
 
     thing
diff --git a/tests/baselines/reference/jsDeclarationsTypeReferences2.symbols b/tests/baselines/reference/jsDeclarationsTypeReferences2.symbols
index 6134c32050e..04db53fcb70 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReferences2.symbols
+++ b/tests/baselines/reference/jsDeclarationsTypeReferences2.symbols
@@ -13,9 +13,9 @@ const thing = a + m
 >m : Symbol(m, Decl(index.js, 0, 9))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 2, 19))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 
     thing
 >thing : Symbol(thing, Decl(index.js, 4, 18))
diff --git a/tests/baselines/reference/jsDeclarationsTypeReferences2.types b/tests/baselines/reference/jsDeclarationsTypeReferences2.types
index aaa5c5618b8..01ee23c5553 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReferences2.types
+++ b/tests/baselines/reference/jsDeclarationsTypeReferences2.types
@@ -15,10 +15,10 @@ const thing = a + m
 >m : number
 
 module.exports = {
->module.exports = {    thing} : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports = {    thing} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    thing} : { thing: number; }
 
     thing
diff --git a/tests/baselines/reference/jsDeclarationsTypeReferences3.symbols b/tests/baselines/reference/jsDeclarationsTypeReferences3.symbols
index 018debbe227..079178bd492 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReferences3.symbols
+++ b/tests/baselines/reference/jsDeclarationsTypeReferences3.symbols
@@ -12,15 +12,15 @@ module.exports.A = {}
 >module.exports.A : Symbol(A, Decl(index.js, 2, 42), Decl(index.js, 4, 15))
 >module.exports : Symbol(A, Decl(index.js, 2, 42), Decl(index.js, 4, 15))
 >module : Symbol(module, Decl(index.js, 2, 42))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >A : Symbol(A, Decl(index.js, 2, 42), Decl(index.js, 4, 15))
 
 module.exports.A.B = {
 >module.exports.A.B : Symbol(A.B, Decl(index.js, 3, 21))
 >module.exports.A : Symbol(A.B, Decl(index.js, 3, 21))
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(module, Decl(index.js, 2, 42))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >A : Symbol(A, Decl(index.js, 2, 42), Decl(index.js, 4, 15))
 >B : Symbol(A.B, Decl(index.js, 3, 21))
 
diff --git a/tests/baselines/reference/jsDeclarationsTypeReferences3.types b/tests/baselines/reference/jsDeclarationsTypeReferences3.types
index bb41517417b..8e19fc9fbf3 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReferences3.types
+++ b/tests/baselines/reference/jsDeclarationsTypeReferences3.types
@@ -12,9 +12,9 @@ const Something = require("fs").Something;
 module.exports.A = {}
 >module.exports.A = {} : typeof A
 >module.exports.A : typeof A
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >A : typeof A
 >{} : {}
 
@@ -22,9 +22,9 @@ module.exports.A.B = {
 >module.exports.A.B = {    thing: new Something()} : { thing: Something; }
 >module.exports.A.B : { thing: Something; }
 >module.exports.A : typeof A
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof import("tests/cases/conformance/jsdoc/declarations/index"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/index")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >A : typeof A
 >B : { thing: Something; }
 >{    thing: new Something()} : { thing: Something; }
diff --git a/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.symbols b/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.symbols
index 4a4fb51c1d3..f54c73d5354 100644
--- a/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.symbols
+++ b/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.symbols
@@ -15,7 +15,7 @@ class Conn {
 }
 
 module.exports = Conn;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/conn", Decl(conn.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(conn.js, 0, 0))
 >module : Symbol(export=, Decl(conn.js, 8, 1))
 >exports : Symbol(export=, Decl(conn.js, 8, 1))
 >Conn : Symbol(Conn, Decl(conn.js, 0, 0))
@@ -51,9 +51,9 @@ class Wrap {
 }
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/usage", Decl(usage.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(usage.js, 0, 0))
 >module : Symbol(module, Decl(usage.js, 13, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/usage", Decl(usage.js, 0, 0))
+>exports : Symbol(module.exports, Decl(usage.js, 0, 0))
 
     Wrap
 >Wrap : Symbol(Wrap, Decl(usage.js, 15, 18))
diff --git a/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.types b/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.types
index 906bdf516b2..39c4eec9d19 100644
--- a/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.types
+++ b/tests/baselines/reference/jsDeclarationsTypedefAndImportTypes.types
@@ -18,7 +18,7 @@ class Conn {
 module.exports = Conn;
 >module.exports = Conn : typeof Conn
 >module.exports : typeof Conn
->module : { "\"tests/cases/conformance/jsdoc/declarations/conn\"": typeof Conn; }
+>module : { exports: typeof Conn; }
 >exports : typeof Conn
 >Conn : typeof Conn
 
@@ -56,10 +56,10 @@ class Wrap {
 }
 
 module.exports = {
->module.exports = {    Wrap} : typeof import("tests/cases/conformance/jsdoc/declarations/usage")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/usage")
->module : { "\"tests/cases/conformance/jsdoc/declarations/usage\"": typeof import("tests/cases/conformance/jsdoc/declarations/usage"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/usage")
+>module.exports = {    Wrap} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    Wrap} : { Wrap: typeof Wrap; }
 
     Wrap
diff --git a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.symbols b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
index 8ff60344990..c41b8b567f1 100644
--- a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
+++ b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
@@ -28,7 +28,7 @@ class MainThreadTasks {
 }
 
 module.exports = MainThreadTasks;
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index", Decl(index.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 18, 1))
 >exports : Symbol(export=, Decl(index.js, 18, 1))
 >MainThreadTasks : Symbol(MainThreadTasks, Decl(index.js, 0, 61))
@@ -76,9 +76,9 @@ const taskNameToGroup = {};
 >taskNameToGroup : Symbol(taskNameToGroup, Decl(module.js, 24, 5))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/module", Decl(module.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(module.js, 0, 0))
 >module : Symbol(module, Decl(module.js, 24, 27))
->exports : Symbol("tests/cases/conformance/jsdoc/declarations/module", Decl(module.js, 0, 0))
+>exports : Symbol(module.exports, Decl(module.js, 0, 0))
 
     taskGroups,
 >taskGroups : Symbol(taskGroups, Decl(module.js, 26, 18))
diff --git a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types
index f3556aae0a4..f79cf2ecd15 100644
--- a/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types
+++ b/tests/baselines/reference/jsDeclarationsTypedefPropertyAndExportAssignment.types
@@ -31,7 +31,7 @@ class MainThreadTasks {
 module.exports = MainThreadTasks;
 >module.exports = MainThreadTasks : typeof MainThreadTasks
 >module.exports : typeof MainThreadTasks
->module : { "\"tests/cases/conformance/jsdoc/declarations/index\"": typeof MainThreadTasks; }
+>module : { exports: typeof MainThreadTasks; }
 >exports : typeof MainThreadTasks
 >MainThreadTasks : typeof MainThreadTasks
 
@@ -86,10 +86,10 @@ const taskNameToGroup = {};
 >{} : {}
 
 module.exports = {
->module.exports = {    taskGroups,    taskNameToGroup,} : typeof import("tests/cases/conformance/jsdoc/declarations/module")
->module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/module")
->module : { "\"tests/cases/conformance/jsdoc/declarations/module\"": typeof import("tests/cases/conformance/jsdoc/declarations/module"); }
->exports : typeof import("tests/cases/conformance/jsdoc/declarations/module")
+>module.exports = {    taskGroups,    taskNameToGroup,} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    taskGroups,    taskNameToGroup,} : { taskGroups: { parseHTML: { id: "parseHTML"; label: string; }; styleLayout: { id: "styleLayout"; label: string; }; }; taskNameToGroup: { [x: string]: TaskGroup; }; }
 
     taskGroups,
diff --git a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.symbols b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.symbols
index fbdb5079a30..faf6568b3b1 100644
--- a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.symbols
+++ b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.symbols
@@ -8,9 +8,9 @@ class Abcde {
 }
 
 module.exports = {
->module.exports : Symbol("/test", Decl(test.js, 0, 0), Decl(index.ts, 0, 31))
+>module.exports : Symbol("/test.js", Decl(test.js, 0, 0), Decl(index.ts, 0, 31))
 >module : Symbol(module, Decl(test.js, 3, 1))
->exports : Symbol("/test", Decl(test.js, 0, 0), Decl(index.ts, 0, 31))
+>exports : Symbol("/test.js", Decl(test.js, 0, 0), Decl(index.ts, 0, 31))
 
   Abcde
 >Abcde : Symbol(Abcde, Decl(test.js, 5, 18))
diff --git a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.types b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.types
index 3fad5767c48..7bf746fe865 100644
--- a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.types
+++ b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation.types
@@ -8,10 +8,10 @@ class Abcde {
 }
 
 module.exports = {
->module.exports = {  Abcde} : typeof import("/test")
->module.exports : typeof import("/test")
->module : { "\"/test\"": typeof import("/test"); }
->exports : typeof import("/test")
+>module.exports = {  Abcde} : typeof module."./test"
+>module.exports : typeof module."./test"
+>module : { exports: typeof module."./test"; }
+>exports : typeof module."./test"
 >{  Abcde} : { Abcde: typeof Abcde; }
 
   Abcde
diff --git a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation2.symbols b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation2.symbols
index 02da41d876c..6acf6ed8095 100644
--- a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation2.symbols
+++ b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation2.symbols
@@ -1,6 +1,6 @@
 === /test.js ===
 module.exports = {
->module.exports : Symbol("/test", Decl(test.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(test.js, 0, 0))
 >module : Symbol("/test.js", Decl(test.js, 0, 0), Decl(index.ts, 0, 27))
 >exports : Symbol("/test.js", Decl(test.js, 0, 0), Decl(index.ts, 0, 27))
 
diff --git a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation2.types b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation2.types
index fa6e940f60b..dac05b430c3 100644
--- a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation2.types
+++ b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation2.types
@@ -2,7 +2,7 @@
 module.exports = {
 >module.exports = {  a: "ok"} : { a: string | number; }
 >module.exports : { a: string | number; }
->module : { "\"/test\"": { a: string | number; }; }
+>module : { exports: { a: string | number; }; }
 >exports : { a: string | number; }
 >{  a: "ok"} : { a: string; }
 
diff --git a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation3.symbols b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation3.symbols
index c56d3898510..bf6d3fd676e 100644
--- a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation3.symbols
+++ b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation3.symbols
@@ -3,11 +3,11 @@ module.exports.x = 1;
 >module.exports.x : Symbol(x, Decl(x.js, 0, 0), Decl(y.d.ts, 0, 0))
 >module.exports : Symbol(x, Decl(x.js, 0, 0), Decl(y.d.ts, 0, 0))
 >module : Symbol(module, Decl(x.js, 0, 0))
->exports : Symbol("/x", Decl(x.js, 0, 0))
+>exports : Symbol(module.exports, Decl(x.js, 0, 0))
 >x : Symbol(x, Decl(x.js, 0, 0), Decl(y.d.ts, 0, 0))
 
 module.exports = require("./y.js");
->module.exports : Symbol("/x", Decl(x.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(x.js, 0, 0))
 >module : Symbol(export=, Decl(x.js, 0, 21))
 >exports : Symbol(export=, Decl(x.js, 0, 21))
 >require : Symbol(require)
diff --git a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation3.types b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation3.types
index 6c66c601ffc..d940bfd3689 100644
--- a/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation3.types
+++ b/tests/baselines/reference/jsExportMemberMergedWithModuleAugmentation3.types
@@ -3,7 +3,7 @@ module.exports.x = 1;
 >module.exports.x = 1 : 1
 >module.exports.x : number
 >module.exports : typeof import("/y")
->module : { "\"/x\"": typeof import("/y"); }
+>module : { exports: typeof import("/y"); }
 >exports : typeof import("/y")
 >x : number
 >1 : 1
@@ -11,7 +11,7 @@ module.exports.x = 1;
 module.exports = require("./y.js");
 >module.exports = require("./y.js") : typeof import("/y")
 >module.exports : typeof import("/y")
->module : { "\"/x\"": typeof import("/y"); }
+>module : { exports: typeof import("/y"); }
 >exports : typeof import("/y")
 >require("./y.js") : typeof import("/y")
 >require : any
diff --git a/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.symbols b/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.symbols
index 3b1f9b780f9..9585ec717a4 100644
--- a/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.symbols
+++ b/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/foo.js ===
 module.exports = function () {
->module.exports : Symbol("tests/cases/compiler/foo", Decl(foo.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(foo.js, 0, 0))
 >module : Symbol(export=, Decl(foo.js, 0, 0))
 >exports : Symbol(export=, Decl(foo.js, 0, 0))
 
diff --git a/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.types b/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.types
index c480a6e2556..52922bcefb6 100644
--- a/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.types
+++ b/tests/baselines/reference/jsFileClassPropertyInitalizationInObjectLiteral.types
@@ -2,7 +2,7 @@
 module.exports = function () {
 >module.exports = function () {  class A { }  return {    c: A.b = 1,  }} : () => { c: number; }
 >module.exports : () => { c: number; }
->module : { "\"tests/cases/compiler/foo\"": () => { c: number; }; }
+>module : { exports: () => { c: number; }; }
 >exports : () => { c: number; }
 >function () {  class A { }  return {    c: A.b = 1,  }} : () => { c: number; }
 
diff --git a/tests/baselines/reference/jsdocImportType.symbols b/tests/baselines/reference/jsdocImportType.symbols
index aeb548cd84f..51860f3f941 100644
--- a/tests/baselines/reference/jsdocImportType.symbols
+++ b/tests/baselines/reference/jsdocImportType.symbols
@@ -49,7 +49,7 @@ class Chunk {
     }
 }
 module.exports = Chunk;
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 5, 1))
 >exports : Symbol(export=, Decl(mod1.js, 5, 1))
 >Chunk : Symbol(Chunk, Decl(mod1.js, 0, 0))
diff --git a/tests/baselines/reference/jsdocImportType.types b/tests/baselines/reference/jsdocImportType.types
index b5703459955..51387f6c09a 100644
--- a/tests/baselines/reference/jsdocImportType.types
+++ b/tests/baselines/reference/jsdocImportType.types
@@ -54,7 +54,7 @@ class Chunk {
 module.exports = Chunk;
 >module.exports = Chunk : typeof Chunk
 >module.exports : typeof Chunk
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof Chunk; }
+>module : { exports: typeof Chunk; }
 >exports : typeof Chunk
 >Chunk : typeof Chunk
 
diff --git a/tests/baselines/reference/jsdocImportType2.symbols b/tests/baselines/reference/jsdocImportType2.symbols
index cecfd006ea8..1db0262b4d9 100644
--- a/tests/baselines/reference/jsdocImportType2.symbols
+++ b/tests/baselines/reference/jsdocImportType2.symbols
@@ -39,7 +39,7 @@ declare var module: { exports: any };
 === tests/cases/conformance/jsdoc/mod1.js ===
 /// <reference path='./types.d.ts'/>
 module.exports = class Chunk {
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 >Chunk : Symbol(Chunk, Decl(mod1.js, 1, 16))
diff --git a/tests/baselines/reference/jsdocImportType2.types b/tests/baselines/reference/jsdocImportType2.types
index b966871b9ef..76fe7c688ff 100644
--- a/tests/baselines/reference/jsdocImportType2.types
+++ b/tests/baselines/reference/jsdocImportType2.types
@@ -42,7 +42,7 @@ declare var module: { exports: any };
 module.exports = class Chunk {
 >module.exports = class Chunk {    constructor() {        this.chunk = 1;    }} : typeof import("tests/cases/conformance/jsdoc/mod1")
 >module.exports : typeof import("tests/cases/conformance/jsdoc/mod1")
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof import("tests/cases/conformance/jsdoc/mod1"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/mod1"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/mod1")
 >class Chunk {    constructor() {        this.chunk = 1;    }} : typeof import("tests/cases/conformance/jsdoc/mod1")
 >Chunk : typeof import("tests/cases/conformance/jsdoc/mod1")
diff --git a/tests/baselines/reference/jsdocImportTypeReferenceToClassAlias.symbols b/tests/baselines/reference/jsdocImportTypeReferenceToClassAlias.symbols
index c62d8e0676f..443724ba825 100644
--- a/tests/baselines/reference/jsdocImportTypeReferenceToClassAlias.symbols
+++ b/tests/baselines/reference/jsdocImportTypeReferenceToClassAlias.symbols
@@ -9,7 +9,7 @@ module.exports.C = C
 >module.exports.C : Symbol(C, Decl(mod1.js, 2, 1))
 >module.exports : Symbol(C, Decl(mod1.js, 2, 1))
 >module : Symbol(module, Decl(mod1.js, 2, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >C : Symbol(C, Decl(mod1.js, 2, 1))
 >C : Symbol(C, Decl(mod1.js, 0, 0))
 
diff --git a/tests/baselines/reference/jsdocImportTypeReferenceToClassAlias.types b/tests/baselines/reference/jsdocImportTypeReferenceToClassAlias.types
index 0c6d7515d30..d848122724d 100644
--- a/tests/baselines/reference/jsdocImportTypeReferenceToClassAlias.types
+++ b/tests/baselines/reference/jsdocImportTypeReferenceToClassAlias.types
@@ -8,9 +8,9 @@ class C {
 module.exports.C = C
 >module.exports.C = C : typeof C
 >module.exports.C : typeof C
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod1")
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof import("tests/cases/conformance/jsdoc/mod1"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod1")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >C : typeof C
 >C : typeof C
 
diff --git a/tests/baselines/reference/jsdocTypeFromChainedAssignment2.symbols b/tests/baselines/reference/jsdocTypeFromChainedAssignment2.symbols
index 646159ed419..36dc09ed454 100644
--- a/tests/baselines/reference/jsdocTypeFromChainedAssignment2.symbols
+++ b/tests/baselines/reference/jsdocTypeFromChainedAssignment2.symbols
@@ -44,12 +44,12 @@ module.exports.h = module.exports.i = function hi(mom) {
 >module.exports.h : Symbol(h, Decl(mod.js, 3, 1))
 >module.exports : Symbol(h, Decl(mod.js, 3, 1))
 >module : Symbol(module, Decl(mod.js, 3, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/mod", Decl(mod.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >h : Symbol(h, Decl(mod.js, 3, 1))
 >module.exports.i : Symbol(i, Decl(mod.js, 5, 18))
 >module.exports : Symbol(i, Decl(mod.js, 5, 18))
 >module : Symbol(module, Decl(mod.js, 3, 1))
->exports : Symbol("tests/cases/conformance/jsdoc/mod", Decl(mod.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >i : Symbol(i, Decl(mod.js, 5, 18))
 >hi : Symbol(hi, Decl(mod.js, 5, 37))
 >mom : Symbol(mom, Decl(mod.js, 5, 50))
diff --git a/tests/baselines/reference/jsdocTypeFromChainedAssignment2.types b/tests/baselines/reference/jsdocTypeFromChainedAssignment2.types
index 7bbcb5becab..aa98e4d224b 100644
--- a/tests/baselines/reference/jsdocTypeFromChainedAssignment2.types
+++ b/tests/baselines/reference/jsdocTypeFromChainedAssignment2.types
@@ -57,15 +57,15 @@ exports.f = exports.g = function fg(n) {
 module.exports.h = module.exports.i = function hi(mom) {
 >module.exports.h = module.exports.i = function hi(mom) {    return `hi, ${mom}!`;} : (mom: string) => string
 >module.exports.h : (mom: string) => string
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod")
->module : { "\"tests/cases/conformance/jsdoc/mod\"": typeof import("tests/cases/conformance/jsdoc/mod"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >h : (mom: string) => string
 >module.exports.i = function hi(mom) {    return `hi, ${mom}!`;} : (mom: string) => string
 >module.exports.i : (mom: string) => string
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod")
->module : { "\"tests/cases/conformance/jsdoc/mod\"": typeof import("tests/cases/conformance/jsdoc/mod"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >i : (mom: string) => string
 >function hi(mom) {    return `hi, ${mom}!`;} : (mom: string) => string
 >hi : (mom: string) => string
diff --git a/tests/baselines/reference/jsdocTypeReferenceExports.symbols b/tests/baselines/reference/jsdocTypeReferenceExports.symbols
index 0ae0a5e73a7..2e008b9a62f 100644
--- a/tests/baselines/reference/jsdocTypeReferenceExports.symbols
+++ b/tests/baselines/reference/jsdocTypeReferenceExports.symbols
@@ -1,8 +1,8 @@
 === tests/cases/conformance/jsdoc/bug27342.js ===
 module.exports = {}
->module.exports : Symbol("tests/cases/conformance/jsdoc/bug27342", Decl(bug27342.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bug27342.js, 0, 0))
 >module : Symbol(module, Decl(bug27342.js, 0, 0))
->exports : Symbol("tests/cases/conformance/jsdoc/bug27342", Decl(bug27342.js, 0, 0))
+>exports : Symbol(module.exports, Decl(bug27342.js, 0, 0))
 
 /**
  * @type {exports}
diff --git a/tests/baselines/reference/jsdocTypeReferenceExports.types b/tests/baselines/reference/jsdocTypeReferenceExports.types
index cc0fd402cdb..c141fec60db 100644
--- a/tests/baselines/reference/jsdocTypeReferenceExports.types
+++ b/tests/baselines/reference/jsdocTypeReferenceExports.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/jsdoc/bug27342.js ===
 module.exports = {}
->module.exports = {} : typeof import("tests/cases/conformance/jsdoc/bug27342")
->module.exports : typeof import("tests/cases/conformance/jsdoc/bug27342")
->module : { "\"tests/cases/conformance/jsdoc/bug27342\"": typeof import("tests/cases/conformance/jsdoc/bug27342"); }
->exports : typeof import("tests/cases/conformance/jsdoc/bug27342")
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
 /**
diff --git a/tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.symbols b/tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.symbols
index e077215aedd..26d216ce83a 100644
--- a/tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.symbols
+++ b/tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.symbols
@@ -7,7 +7,7 @@ const MW = require("./MW");
 /** @typedef {number} Cictema */
 
 module.exports = class MC {
->module.exports : Symbol("tests/cases/conformance/jsdoc/MC", Decl(MC.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(MC.js, 0, 0))
 >module : Symbol(export=, Decl(MC.js, 0, 27))
 >exports : Symbol(export=, Decl(MC.js, 0, 27))
 >MC : Symbol(MC, Decl(MC.js, 4, 16))
@@ -42,7 +42,7 @@ class MW {
 }
 
 module.exports = MW;
->module.exports : Symbol("tests/cases/conformance/jsdoc/MW", Decl(MW.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(MW.js, 0, 0))
 >module : Symbol(export=, Decl(MW.js, 9, 1))
 >exports : Symbol(export=, Decl(MW.js, 9, 1))
 >MW : Symbol(MW, Decl(MW.js, 0, 0))
diff --git a/tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.types b/tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.types
index 144cd81db37..b42dcf9bc58 100644
--- a/tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.types
+++ b/tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.types
@@ -10,7 +10,7 @@ const MW = require("./MW");
 module.exports = class MC {
 >module.exports = class MC {  watch() {    return new MW(this);  }} : typeof import("tests/cases/conformance/jsdoc/MC")
 >module.exports : typeof import("tests/cases/conformance/jsdoc/MC")
->module : { "\"tests/cases/conformance/jsdoc/MC\"": typeof import("tests/cases/conformance/jsdoc/MC"); }
+>module : { exports: typeof import("tests/cases/conformance/jsdoc/MC"); }
 >exports : typeof import("tests/cases/conformance/jsdoc/MC")
 >class MC {  watch() {    return new MW(this);  }} : typeof import("tests/cases/conformance/jsdoc/MC")
 >MC : typeof import("tests/cases/conformance/jsdoc/MC")
@@ -49,7 +49,7 @@ class MW {
 module.exports = MW;
 >module.exports = MW : typeof MW
 >module.exports : typeof MW
->module : { "\"tests/cases/conformance/jsdoc/MW\"": typeof MW; }
+>module : { exports: typeof MW; }
 >exports : typeof MW
 >MW : typeof MW
 
diff --git a/tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.symbols b/tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.symbols
index d34dcbdaf10..c903517abac 100644
--- a/tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.symbols
+++ b/tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.symbols
@@ -8,7 +8,7 @@ const MW = require("./MW");
 
 /** @class */
 module.exports = function MC() {
->module.exports : Symbol("tests/cases/conformance/jsdoc/MC", Decl(MC.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(MC.js, 0, 0))
 >module : Symbol(export=, Decl(MC.js, 0, 27))
 >exports : Symbol(export=, Decl(MC.js, 0, 27))
 >MC : Symbol(MC, Decl(MC.js, 5, 16))
@@ -44,7 +44,7 @@ class MW {
 }
 
 module.exports = MW;
->module.exports : Symbol("tests/cases/conformance/jsdoc/MW", Decl(MW.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(MW.js, 0, 0))
 >module : Symbol(export=, Decl(MW.js, 9, 1))
 >exports : Symbol(export=, Decl(MW.js, 9, 1))
 >MW : Symbol(MW, Decl(MW.js, 0, 0))
diff --git a/tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.types b/tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.types
index 5f88193871f..f28d7e5e87e 100644
--- a/tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.types
+++ b/tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.types
@@ -11,7 +11,7 @@ const MW = require("./MW");
 module.exports = function MC() {
 >module.exports = function MC() {    /** @type {any} */    var x = {}    return new MW(x);} : { (): MW; new (): MC; }
 >module.exports : { (): MW; new (): MC; }
->module : { "\"tests/cases/conformance/jsdoc/MC\"": { (): MW; new (): MC; }; }
+>module : { exports: { (): MW; new (): MC; }; }
 >exports : { (): MW; new (): MC; }
 >function MC() {    /** @type {any} */    var x = {}    return new MW(x);} : typeof MC
 >MC : typeof MC
@@ -52,7 +52,7 @@ class MW {
 module.exports = MW;
 >module.exports = MW : typeof MW
 >module.exports : typeof MW
->module : { "\"tests/cases/conformance/jsdoc/MW\"": typeof MW; }
+>module : { exports: typeof MW; }
 >exports : typeof MW
 >MW : typeof MW
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.errors.txt b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.errors.txt
index b02b8989d49..1d5eef72deb 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.errors.txt
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js(5,1): error TS7053: Element implicitly has an 'any' type because expression of type 'unique symbol' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
-  Property '[_sym]' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
-tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js(6,1): error TS7053: Element implicitly has an 'any' type because expression of type '"my-fake-sym"' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
-  Property 'my-fake-sym' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
+tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js(5,1): error TS7053: Element implicitly has an 'any' type because expression of type 'unique symbol' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js")'.
+  Property '[_sym]' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js")'.
+tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js(6,1): error TS7053: Element implicitly has an 'any' type because expression of type '"my-fake-sym"' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js")'.
+  Property 'my-fake-sym' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js")'.
 tests/cases/conformance/salsa/usage.js(2,11): error TS7053: Element implicitly has an 'any' type because expression of type '"my-fake-sym"' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
   Property 'my-fake-sym' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
 tests/cases/conformance/salsa/usage.js(3,11): error TS7053: Element implicitly has an 'any' type because expression of type 'unique symbol' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
@@ -26,10 +26,10 @@ tests/cases/conformance/salsa/usage.js(3,11): error TS7053: Element implicitly h
     
     module.exports[_sym] = "ok";
     ~~~~~~~~~~~~~~~~~~~~
-!!! error TS7053: Element implicitly has an 'any' type because expression of type 'unique symbol' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
-!!! error TS7053:   Property '[_sym]' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
+!!! error TS7053: Element implicitly has an 'any' type because expression of type 'unique symbol' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js")'.
+!!! error TS7053:   Property '[_sym]' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js")'.
     module.exports[_str] = "ok";
     ~~~~~~~~~~~~~~~~~~~~
-!!! error TS7053: Element implicitly has an 'any' type because expression of type '"my-fake-sym"' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
-!!! error TS7053:   Property 'my-fake-sym' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")'.
+!!! error TS7053: Element implicitly has an 'any' type because expression of type '"my-fake-sym"' can't be used to index type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js")'.
+!!! error TS7053:   Property 'my-fake-sym' does not exist on type 'typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2.js")'.
     module.exports.S = _sym;
\ No newline at end of file
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.symbols b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.symbols
index 5c252fe3db6..f529eb75d03 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.symbols
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.symbols
@@ -25,22 +25,22 @@ const _str = "my-fake-sym";
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport2.js, 2, 5))
 
 module.exports[_sym] = "ok";
->module.exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
 
 module.exports[_str] = "ok";
->module.exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport2.js, 2, 5))
 
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 >module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.types b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.types
index 818a0ab212e..264a0dcc174 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.types
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport2.types
@@ -33,27 +33,27 @@ const _str = "my-fake-sym";
 module.exports[_sym] = "ok";
 >module.exports[_sym] = "ok" : "ok"
 >module.exports[_sym] : any
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >_sym : unique symbol
 >"ok" : "ok"
 
 module.exports[_str] = "ok";
 >module.exports[_str] = "ok" : "ok"
 >module.exports[_str] : any
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >_str : "my-fake-sym"
 >"ok" : "ok"
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport2")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport3.symbols b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport3.symbols
index 3a9c558d360..956fbaf9728 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport3.symbols
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport3.symbols
@@ -28,9 +28,9 @@ Object.defineProperty(module.exports, _sym, { value: "ok" });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
 >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 4, 45))
 
@@ -38,9 +38,9 @@ Object.defineProperty(module.exports, _str, { value: "ok" });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->module.exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport3.js, 2, 5))
 >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 45))
 
@@ -48,7 +48,7 @@ module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 >module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport3.types b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport3.types
index 8fc76045c48..5909bdbaa63 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport3.types
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport3.types
@@ -35,9 +35,9 @@ Object.defineProperty(module.exports, _sym, { value: "ok" });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >_sym : unique symbol
 >{ value: "ok" } : { value: string; }
 >value : string
@@ -48,9 +48,9 @@ Object.defineProperty(module.exports, _str, { value: "ok" });
 >Object.defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
 >defineProperty : (o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => any
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >_str : "my-fake-sym"
 >{ value: "ok" } : { value: string; }
 >value : string
@@ -59,9 +59,9 @@ Object.defineProperty(module.exports, _str, { value: "ok" });
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport3")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport4.symbols b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport4.symbols
index fd52892f5a5..818026bbf40 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport4.symbols
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport4.symbols
@@ -63,7 +63,7 @@ module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 >module.exports : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 2, 27))
 
@@ -71,7 +71,7 @@ module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
 >module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport4.js, 1, 5))
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport4.types b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport4.types
index ab76826b9a4..d35ba15c485 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport4.types
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport4.types
@@ -78,18 +78,18 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F = F : typeof F
 >module.exports.F : typeof F
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >F : typeof F
 >F : typeof F
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport4")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport5.symbols b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport5.symbols
index 90a1f464648..3eacc09891c 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport5.symbols
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport5.symbols
@@ -64,7 +64,7 @@ module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 >module.exports : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 2, 27), Decl(lateBoundAssignmentDeclarationSupport5.js, 5, 1))
 
@@ -72,7 +72,7 @@ module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
 >module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport5.js, 1, 5))
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport5.types b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport5.types
index ec6fbfadb2a..3335150d8a6 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport5.types
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport5.types
@@ -77,18 +77,18 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F = F : typeof F
 >module.exports.F : typeof F
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >F : typeof F
 >F : typeof F
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport5")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport6.symbols b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport6.symbols
index f4feb41d11d..d36c2500c4a 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport6.symbols
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport6.symbols
@@ -77,7 +77,7 @@ module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 >module.exports : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 2, 27))
 
@@ -85,7 +85,7 @@ module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
 >module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport6.js, 1, 5))
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport6.types b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport6.types
index 8de2b0c0555..31b00f9cd77 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport6.types
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport6.types
@@ -95,18 +95,18 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F = F : typeof F
 >module.exports.F : typeof F
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >F : typeof F
 >F : typeof F
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport6")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.symbols b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.symbols
index 12281050f58..8fa7c82187b 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.symbols
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.symbols
@@ -43,7 +43,7 @@ module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 >module.exports : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 1, 27), Decl(lateBoundAssignmentDeclarationSupport7.js, 4, 1), Decl(lateBoundAssignmentDeclarationSupport7.js, 5, 15))
 
@@ -51,7 +51,7 @@ module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
 >module.exports : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
 >module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
->exports : Symbol("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
+>exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 5))
 
diff --git a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.types b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.types
index 8b0266457b6..865a576ee3a 100644
--- a/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.types
+++ b/tests/baselines/reference/lateBoundAssignmentDeclarationSupport7.types
@@ -53,18 +53,18 @@ F[_str] = "ok";
 module.exports.F = F;
 >module.exports.F = F : typeof F
 >module.exports.F : typeof F
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >F : typeof F
 >F : typeof F
 
 module.exports.S = _sym;
 >module.exports.S = _sym : unique symbol
 >module.exports.S : unique symbol
->module.exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7")
->module : { "\"tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7\"": typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7"); }
->exports : typeof import("tests/cases/conformance/salsa/lateBoundAssignmentDeclarationSupport7")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >S : unique symbol
 >_sym : unique symbol
 
diff --git a/tests/baselines/reference/moduleExportAlias.symbols b/tests/baselines/reference/moduleExportAlias.symbols
index 67720f1cde3..4fd98f2a0b7 100644
--- a/tests/baselines/reference/moduleExportAlias.symbols
+++ b/tests/baselines/reference/moduleExportAlias.symbols
@@ -120,9 +120,9 @@ exports.func2 = function () { };
 
 var moduleExportsAlias = module.exports;
 >moduleExportsAlias : Symbol(moduleExportsAlias, Decl(b.js, 4, 3))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 
 moduleExportsAlias.func3 = function () { };
 >moduleExportsAlias.func3 : Symbol(func3, Decl(b.js, 4, 40))
@@ -133,15 +133,15 @@ module.exports.func4 = function () { };
 >module.exports.func4 : Symbol(func4, Decl(b.js, 5, 43))
 >module.exports : Symbol(func4, Decl(b.js, 5, 43))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >func4 : Symbol(func4, Decl(b.js, 5, 43))
 
 var multipleDeclarationAlias1 = exports = module.exports;
 >multipleDeclarationAlias1 : Symbol(multipleDeclarationAlias1, Decl(b.js, 8, 3))
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 
 multipleDeclarationAlias1.func5 = function () { };
 >multipleDeclarationAlias1.func5 : Symbol(func5, Decl(b.js, 8, 57))
@@ -150,9 +150,9 @@ multipleDeclarationAlias1.func5 = function () { };
 
 var multipleDeclarationAlias2 = module.exports = exports;
 >multipleDeclarationAlias2 : Symbol(multipleDeclarationAlias2, Decl(b.js, 11, 3))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
 
 multipleDeclarationAlias2.func6 = function () { };
@@ -176,9 +176,9 @@ multipleDeclarationAlias3.func7 = function () { };
 var multipleDeclarationAlias4 = someOtherVariable = module.exports;
 >multipleDeclarationAlias4 : Symbol(multipleDeclarationAlias4, Decl(b.js, 18, 3))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 
 multipleDeclarationAlias4.func8 = function () { };
 >multipleDeclarationAlias4.func8 : Symbol(func8, Decl(b.js, 18, 67))
@@ -187,9 +187,9 @@ multipleDeclarationAlias4.func8 = function () { };
 
 var multipleDeclarationAlias5 = module.exports = exports = {};
 >multipleDeclarationAlias5 : Symbol(multipleDeclarationAlias5, Decl(b.js, 21, 3))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
 
 multipleDeclarationAlias5.func9 = function () { };
@@ -200,9 +200,9 @@ multipleDeclarationAlias5.func9 = function () { };
 var multipleDeclarationAlias6 = exports = module.exports = {};
 >multipleDeclarationAlias6 : Symbol(multipleDeclarationAlias6, Decl(b.js, 24, 3))
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 
 multipleDeclarationAlias6.func10 = function () { };
 >multipleDeclarationAlias6.func10 : Symbol(func10, Decl(b.js, 24, 62))
@@ -211,9 +211,9 @@ multipleDeclarationAlias6.func10 = function () { };
 
 exports = module.exports = someOtherVariable = {};
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 
 exports.func11 = function () { };
@@ -225,14 +225,14 @@ module.exports.func12 = function () { };
 >module.exports.func12 : Symbol(func12, Decl(b.js, 28, 33), Decl(b.js, 32, 33))
 >module.exports : Symbol(func12, Decl(b.js, 28, 33), Decl(b.js, 32, 33))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >func12 : Symbol(func12, Decl(b.js, 28, 33), Decl(b.js, 32, 33))
 
 exports = module.exports = someOtherVariable = {};
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 
 exports.func11 = function () { };
@@ -244,14 +244,14 @@ module.exports.func12 = function () { };
 >module.exports.func12 : Symbol(func12, Decl(b.js, 28, 33), Decl(b.js, 32, 33))
 >module.exports : Symbol(func12, Decl(b.js, 28, 33), Decl(b.js, 32, 33))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >func12 : Symbol(func12, Decl(b.js, 28, 33), Decl(b.js, 32, 33))
 
 exports = module.exports = {};
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 
 exports.func13 = function () { };
 >exports.func13 : Symbol(func13, Decl(b.js, 35, 30))
@@ -262,14 +262,14 @@ module.exports.func14 = function () { };
 >module.exports.func14 : Symbol(func14, Decl(b.js, 36, 33))
 >module.exports : Symbol(func14, Decl(b.js, 36, 33))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >func14 : Symbol(func14, Decl(b.js, 36, 33))
 
 exports = module.exports = {};
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 
 exports.func15 = function () { };
 >exports.func15 : Symbol(func15, Decl(b.js, 39, 30))
@@ -280,13 +280,13 @@ module.exports.func16 = function () { };
 >module.exports.func16 : Symbol(func16, Decl(b.js, 40, 33))
 >module.exports : Symbol(func16, Decl(b.js, 40, 33))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >func16 : Symbol(func16, Decl(b.js, 40, 33))
 
 module.exports = exports = {};
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
 
 exports.func17 = function () { };
@@ -298,13 +298,13 @@ module.exports.func18 = function () { };
 >module.exports.func18 : Symbol(func18, Decl(b.js, 44, 33))
 >module.exports : Symbol(func18, Decl(b.js, 44, 33))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >func18 : Symbol(func18, Decl(b.js, 44, 33))
 
 module.exports = {};
->module.exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 
 exports.func19 = function () { };
 >exports.func19 : Symbol(func19, Decl(b.js, 47, 20))
@@ -315,7 +315,7 @@ module.exports.func20 = function () { };
 >module.exports.func20 : Symbol(func20, Decl(b.js, 48, 33))
 >module.exports : Symbol(func20, Decl(b.js, 48, 33))
 >module : Symbol(module, Decl(b.js, 4, 24))
->exports : Symbol("tests/cases/conformance/salsa/b", Decl(b.js, 0, 0))
+>exports : Symbol(module.exports, Decl(b.js, 0, 0))
 >func20 : Symbol(func20, Decl(b.js, 48, 33))
 
 
diff --git a/tests/baselines/reference/moduleExportAlias.types b/tests/baselines/reference/moduleExportAlias.types
index 14acd06f75e..899aadd2c86 100644
--- a/tests/baselines/reference/moduleExportAlias.types
+++ b/tests/baselines/reference/moduleExportAlias.types
@@ -123,54 +123,54 @@ exports.func2 = function () { };
 >function () { } : () => void
 
 var moduleExportsAlias = module.exports;
->moduleExportsAlias : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>moduleExportsAlias : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 
 moduleExportsAlias.func3 = function () { };
 >moduleExportsAlias.func3 = function () { } : () => void
 >moduleExportsAlias.func3 : () => void
->moduleExportsAlias : typeof import("tests/cases/conformance/salsa/b")
+>moduleExportsAlias : typeof module.exports
 >func3 : () => void
 >function () { } : () => void
 
 module.exports.func4 = function () { };
 >module.exports.func4 = function () { } : () => void
 >module.exports.func4 : () => void
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >func4 : () => void
 >function () { } : () => void
 
 var multipleDeclarationAlias1 = exports = module.exports;
->multipleDeclarationAlias1 : typeof import("tests/cases/conformance/salsa/b")
->exports = module.exports : typeof import("tests/cases/conformance/salsa/b")
->exports : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
+>multipleDeclarationAlias1 : typeof module.exports
+>exports = module.exports : typeof module.exports
 >exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 
 multipleDeclarationAlias1.func5 = function () { };
 >multipleDeclarationAlias1.func5 = function () { } : () => void
 >multipleDeclarationAlias1.func5 : () => void
->multipleDeclarationAlias1 : typeof import("tests/cases/conformance/salsa/b")
+>multipleDeclarationAlias1 : typeof module.exports
 >func5 : () => void
 >function () { } : () => void
 
 var multipleDeclarationAlias2 = module.exports = exports;
->multipleDeclarationAlias2 : typeof import("tests/cases/conformance/salsa/b")
->module.exports = exports : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>multipleDeclarationAlias2 : typeof module.exports
+>module.exports = exports : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >exports : typeof import("tests/cases/conformance/salsa/b")
 
 multipleDeclarationAlias2.func6 = function () { };
 >multipleDeclarationAlias2.func6 = function () { } : () => void
 >multipleDeclarationAlias2.func6 : () => void
->multipleDeclarationAlias2 : typeof import("tests/cases/conformance/salsa/b")
+>multipleDeclarationAlias2 : typeof module.exports
 >func6 : () => void
 >function () { } : () => void
 
@@ -191,26 +191,26 @@ multipleDeclarationAlias3.func7 = function () { };
 >function () { } : () => void
 
 var multipleDeclarationAlias4 = someOtherVariable = module.exports;
->multipleDeclarationAlias4 : typeof import("tests/cases/conformance/salsa/b")
->someOtherVariable = module.exports : typeof import("tests/cases/conformance/salsa/b")
+>multipleDeclarationAlias4 : typeof module.exports
+>someOtherVariable = module.exports : typeof module.exports
 >someOtherVariable : any
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 
 multipleDeclarationAlias4.func8 = function () { };
 >multipleDeclarationAlias4.func8 = function () { } : () => void
 >multipleDeclarationAlias4.func8 : () => void
->multipleDeclarationAlias4 : typeof import("tests/cases/conformance/salsa/b")
+>multipleDeclarationAlias4 : typeof module.exports
 >func8 : () => void
 >function () { } : () => void
 
 var multipleDeclarationAlias5 = module.exports = exports = {};
->multipleDeclarationAlias5 : typeof import("tests/cases/conformance/salsa/b")
->module.exports = exports = {} : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>multipleDeclarationAlias5 : typeof module.exports
+>module.exports = exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >exports = {} : {}
 >exports : typeof import("tests/cases/conformance/salsa/b")
 >{} : {}
@@ -218,34 +218,34 @@ var multipleDeclarationAlias5 = module.exports = exports = {};
 multipleDeclarationAlias5.func9 = function () { };
 >multipleDeclarationAlias5.func9 = function () { } : () => void
 >multipleDeclarationAlias5.func9 : () => void
->multipleDeclarationAlias5 : typeof import("tests/cases/conformance/salsa/b")
+>multipleDeclarationAlias5 : typeof module.exports
 >func9 : () => void
 >function () { } : () => void
 
 var multipleDeclarationAlias6 = exports = module.exports = {};
->multipleDeclarationAlias6 : typeof import("tests/cases/conformance/salsa/b")
->exports = module.exports = {} : typeof import("tests/cases/conformance/salsa/b")
->exports : typeof import("tests/cases/conformance/salsa/b")
->module.exports = {} : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
+>multipleDeclarationAlias6 : typeof module.exports
+>exports = module.exports = {} : typeof module.exports
 >exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
 multipleDeclarationAlias6.func10 = function () { };
 >multipleDeclarationAlias6.func10 = function () { } : () => void
 >multipleDeclarationAlias6.func10 : () => void
->multipleDeclarationAlias6 : typeof import("tests/cases/conformance/salsa/b")
+>multipleDeclarationAlias6 : typeof module.exports
 >func10 : () => void
 >function () { } : () => void
 
 exports = module.exports = someOtherVariable = {};
->exports = module.exports = someOtherVariable = {} : typeof import("tests/cases/conformance/salsa/b")
->exports : typeof import("tests/cases/conformance/salsa/b")
->module.exports = someOtherVariable = {} : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
+>exports = module.exports = someOtherVariable = {} : typeof module.exports
 >exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports = someOtherVariable = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >someOtherVariable = {} : {}
 >someOtherVariable : any
 >{} : {}
@@ -260,19 +260,19 @@ exports.func11 = function () { };
 module.exports.func12 = function () { };
 >module.exports.func12 = function () { } : () => void
 >module.exports.func12 : () => void
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >func12 : () => void
 >function () { } : () => void
 
 exports = module.exports = someOtherVariable = {};
->exports = module.exports = someOtherVariable = {} : typeof import("tests/cases/conformance/salsa/b")
->exports : typeof import("tests/cases/conformance/salsa/b")
->module.exports = someOtherVariable = {} : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
+>exports = module.exports = someOtherVariable = {} : typeof module.exports
 >exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports = someOtherVariable = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >someOtherVariable = {} : {}
 >someOtherVariable : any
 >{} : {}
@@ -287,19 +287,19 @@ exports.func11 = function () { };
 module.exports.func12 = function () { };
 >module.exports.func12 = function () { } : () => void
 >module.exports.func12 : () => void
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >func12 : () => void
 >function () { } : () => void
 
 exports = module.exports = {};
->exports = module.exports = {} : typeof import("tests/cases/conformance/salsa/b")
->exports : typeof import("tests/cases/conformance/salsa/b")
->module.exports = {} : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
+>exports = module.exports = {} : typeof module.exports
 >exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
 exports.func13 = function () { };
@@ -312,19 +312,19 @@ exports.func13 = function () { };
 module.exports.func14 = function () { };
 >module.exports.func14 = function () { } : () => void
 >module.exports.func14 : () => void
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >func14 : () => void
 >function () { } : () => void
 
 exports = module.exports = {};
->exports = module.exports = {} : typeof import("tests/cases/conformance/salsa/b")
->exports : typeof import("tests/cases/conformance/salsa/b")
->module.exports = {} : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
+>exports = module.exports = {} : typeof module.exports
 >exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
 exports.func15 = function () { };
@@ -337,17 +337,17 @@ exports.func15 = function () { };
 module.exports.func16 = function () { };
 >module.exports.func16 = function () { } : () => void
 >module.exports.func16 : () => void
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >func16 : () => void
 >function () { } : () => void
 
 module.exports = exports = {};
->module.exports = exports = {} : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports = exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >exports = {} : {}
 >exports : typeof import("tests/cases/conformance/salsa/b")
 >{} : {}
@@ -362,17 +362,17 @@ exports.func17 = function () { };
 module.exports.func18 = function () { };
 >module.exports.func18 = function () { } : () => void
 >module.exports.func18 : () => void
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >func18 : () => void
 >function () { } : () => void
 
 module.exports = {};
->module.exports = {} : typeof import("tests/cases/conformance/salsa/b")
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
 exports.func19 = function () { };
@@ -385,9 +385,9 @@ exports.func19 = function () { };
 module.exports.func20 = function () { };
 >module.exports.func20 = function () { } : () => void
 >module.exports.func20 : () => void
->module.exports : typeof import("tests/cases/conformance/salsa/b")
->module : { "\"tests/cases/conformance/salsa/b\"": typeof import("tests/cases/conformance/salsa/b"); }
->exports : typeof import("tests/cases/conformance/salsa/b")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >func20 : () => void
 >function () { } : () => void
 
diff --git a/tests/baselines/reference/moduleExportAlias2.symbols b/tests/baselines/reference/moduleExportAlias2.symbols
index 2e33643aa90..1b8b80f42ad 100644
--- a/tests/baselines/reference/moduleExportAlias2.symbols
+++ b/tests/baselines/reference/moduleExportAlias2.symbols
@@ -31,7 +31,7 @@ declare var module: { exports: any };
 /// <reference path='node.d.ts' />
 exports = module.exports = C
 >exports : Symbol("tests/cases/conformance/salsa/semver", Decl(semver.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/semver", Decl(semver.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(semver.js, 0, 0))
 >module : Symbol(export=, Decl(semver.js, 1, 9))
 >exports : Symbol(export=, Decl(semver.js, 1, 9))
 >C : Symbol(C, Decl(semver.js, 2, 22))
diff --git a/tests/baselines/reference/moduleExportAlias2.types b/tests/baselines/reference/moduleExportAlias2.types
index 6f8ba54ad61..85d0ed5c569 100644
--- a/tests/baselines/reference/moduleExportAlias2.types
+++ b/tests/baselines/reference/moduleExportAlias2.types
@@ -38,7 +38,7 @@ exports = module.exports = C
 >exports : typeof C
 >module.exports = C : typeof C
 >module.exports : typeof C
->module : { "\"tests/cases/conformance/salsa/semver\"": typeof C; }
+>module : { exports: typeof C; }
 >exports : typeof C
 >C : typeof C
 
diff --git a/tests/baselines/reference/moduleExportAlias3.symbols b/tests/baselines/reference/moduleExportAlias3.symbols
index 0132c04ea53..617d05ff52e 100644
--- a/tests/baselines/reference/moduleExportAlias3.symbols
+++ b/tests/baselines/reference/moduleExportAlias3.symbols
@@ -4,9 +4,9 @@ class C {
 >C : Symbol(C, Decl(bug24062.js, 0, 0))
 }
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/salsa/bug24062", Decl(bug24062.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bug24062.js, 0, 0))
 >module : Symbol(module, Decl(bug24062.js, 2, 1))
->exports : Symbol("tests/cases/conformance/salsa/bug24062", Decl(bug24062.js, 0, 0))
+>exports : Symbol(module.exports, Decl(bug24062.js, 0, 0))
 
     C
 >C : Symbol(C, Decl(bug24062.js, 3, 18))
diff --git a/tests/baselines/reference/moduleExportAlias3.types b/tests/baselines/reference/moduleExportAlias3.types
index e5ff22316d1..20ab118c002 100644
--- a/tests/baselines/reference/moduleExportAlias3.types
+++ b/tests/baselines/reference/moduleExportAlias3.types
@@ -4,10 +4,10 @@ class C {
 >C : C
 }
 module.exports = {
->module.exports = {    C} : typeof import("tests/cases/conformance/salsa/bug24062")
->module.exports : typeof import("tests/cases/conformance/salsa/bug24062")
->module : { "\"tests/cases/conformance/salsa/bug24062\"": typeof import("tests/cases/conformance/salsa/bug24062"); }
->exports : typeof import("tests/cases/conformance/salsa/bug24062")
+>module.exports = {    C} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{    C} : { C: typeof C; }
 
     C
diff --git a/tests/baselines/reference/moduleExportAlias4.symbols b/tests/baselines/reference/moduleExportAlias4.symbols
index e7b83f18927..561d668343b 100644
--- a/tests/baselines/reference/moduleExportAlias4.symbols
+++ b/tests/baselines/reference/moduleExportAlias4.symbols
@@ -6,7 +6,7 @@ var wat = require('./bug24024')
 >'./bug24024' : Symbol("tests/cases/conformance/salsa/bug24024", Decl(bug24024.js, 0, 0))
 
 module.exports = class C {}
->module.exports : Symbol("tests/cases/conformance/salsa/bug24024", Decl(bug24024.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bug24024.js, 0, 0))
 >module : Symbol(export=, Decl(bug24024.js, 1, 31))
 >exports : Symbol(export=, Decl(bug24024.js, 1, 31))
 >C : Symbol(wat, Decl(bug24024.js, 2, 16))
@@ -15,7 +15,7 @@ module.exports.D = class D { }
 >module.exports.D : Symbol(wat.D, Decl(bug24024.js, 2, 27))
 >module.exports : Symbol(wat.D, Decl(bug24024.js, 2, 27))
 >module : Symbol(module, Decl(bug24024.js, 1, 31))
->exports : Symbol("tests/cases/conformance/salsa/bug24024", Decl(bug24024.js, 0, 0))
+>exports : Symbol(module.exports, Decl(bug24024.js, 0, 0))
 >D : Symbol(wat.D, Decl(bug24024.js, 2, 27))
 >D : Symbol(wat.D, Decl(bug24024.js, 3, 18))
 
diff --git a/tests/baselines/reference/moduleExportAlias4.types b/tests/baselines/reference/moduleExportAlias4.types
index 3f434998d6e..293080a80bb 100644
--- a/tests/baselines/reference/moduleExportAlias4.types
+++ b/tests/baselines/reference/moduleExportAlias4.types
@@ -9,7 +9,7 @@ var wat = require('./bug24024')
 module.exports = class C {}
 >module.exports = class C {} : typeof wat
 >module.exports : typeof wat
->module : { "\"tests/cases/conformance/salsa/bug24024\"": typeof wat; }
+>module : { exports: typeof wat; }
 >exports : typeof wat
 >class C {} : typeof wat
 >C : typeof wat
@@ -18,7 +18,7 @@ module.exports.D = class D { }
 >module.exports.D = class D { } : typeof wat.D
 >module.exports.D : typeof wat.D
 >module.exports : typeof wat
->module : { "\"tests/cases/conformance/salsa/bug24024\"": typeof wat; }
+>module : { exports: typeof wat; }
 >exports : typeof wat
 >D : typeof wat.D
 >class D { } : typeof wat.D
diff --git a/tests/baselines/reference/moduleExportAlias5.symbols b/tests/baselines/reference/moduleExportAlias5.symbols
index 35e27b4a642..2f5467f0666 100644
--- a/tests/baselines/reference/moduleExportAlias5.symbols
+++ b/tests/baselines/reference/moduleExportAlias5.symbols
@@ -5,7 +5,7 @@ const webpack = function (){
 }
 exports = module.exports = webpack;
 >exports : Symbol("tests/cases/conformance/salsa/bug24754", Decl(bug24754.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/bug24754", Decl(bug24754.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bug24754.js, 0, 0))
 >module : Symbol(export=, Decl(bug24754.js, 3, 9))
 >exports : Symbol(export=, Decl(bug24754.js, 3, 9))
 >webpack : Symbol(webpack, Decl(bug24754.js, 1, 5), Decl(bug24754.js, 4, 23))
diff --git a/tests/baselines/reference/moduleExportAlias5.types b/tests/baselines/reference/moduleExportAlias5.types
index e4e0b8b74b3..3a1c1a6839b 100644
--- a/tests/baselines/reference/moduleExportAlias5.types
+++ b/tests/baselines/reference/moduleExportAlias5.types
@@ -9,7 +9,7 @@ exports = module.exports = webpack;
 >exports : { (): void; WebpackOptionsDefaulter: number; version: number; }
 >module.exports = webpack : { (): void; WebpackOptionsDefaulter: number; version: number; }
 >module.exports : { (): void; WebpackOptionsDefaulter: number; version: number; }
->module : { "\"tests/cases/conformance/salsa/bug24754\"": { (): void; WebpackOptionsDefaulter: number; version: number; }; }
+>module : { exports: { (): void; WebpackOptionsDefaulter: number; version: number; }; }
 >exports : { (): void; WebpackOptionsDefaulter: number; version: number; }
 >webpack : { (): void; WebpackOptionsDefaulter: number; }
 
diff --git a/tests/baselines/reference/moduleExportAliasExports.symbols b/tests/baselines/reference/moduleExportAliasExports.symbols
index 7253e7ed5f3..07f6755d1ca 100644
--- a/tests/baselines/reference/moduleExportAliasExports.symbols
+++ b/tests/baselines/reference/moduleExportAliasExports.symbols
@@ -12,7 +12,7 @@ exports.everywhere = 2
 >everywhere : Symbol(everywhere, Decl(Eloquent.js, 2, 18))
 
 module.exports = exports
->module.exports : Symbol("tests/cases/conformance/salsa/Eloquent", Decl(Eloquent.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(Eloquent.js, 0, 0))
 >module : Symbol(export=, Decl(Eloquent.js, 3, 22))
 >exports : Symbol(export=, Decl(Eloquent.js, 3, 22))
 >exports : Symbol("tests/cases/conformance/salsa/Eloquent", Decl(Eloquent.js, 0, 0))
diff --git a/tests/baselines/reference/moduleExportAliasExports.types b/tests/baselines/reference/moduleExportAliasExports.types
index d6c015f7f22..f9d38bfdc28 100644
--- a/tests/baselines/reference/moduleExportAliasExports.types
+++ b/tests/baselines/reference/moduleExportAliasExports.types
@@ -22,7 +22,7 @@ exports.everywhere = 2
 module.exports = exports
 >module.exports = exports : typeof import("tests/cases/conformance/salsa/Eloquent")
 >module.exports : typeof import("tests/cases/conformance/salsa/Eloquent")
->module : { "\"tests/cases/conformance/salsa/Eloquent\"": typeof import("tests/cases/conformance/salsa/Eloquent"); }
+>module : { exports: typeof import("tests/cases/conformance/salsa/Eloquent"); }
 >exports : typeof import("tests/cases/conformance/salsa/Eloquent")
 >exports : typeof import("tests/cases/conformance/salsa/Eloquent")
 
diff --git a/tests/baselines/reference/moduleExportAliasImported.symbols b/tests/baselines/reference/moduleExportAliasImported.symbols
index 298e439a0d7..dbf1ca02af3 100644
--- a/tests/baselines/reference/moduleExportAliasImported.symbols
+++ b/tests/baselines/reference/moduleExportAliasImported.symbols
@@ -8,7 +8,7 @@ function alias() { }
 >alias : Symbol(alias, Decl(bug28014.js, 0, 19))
 
 module.exports = alias
->module.exports : Symbol("tests/cases/conformance/salsa/bug28014", Decl(bug28014.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bug28014.js, 0, 0))
 >module : Symbol(export=, Decl(bug28014.js, 1, 20))
 >exports : Symbol(export=, Decl(bug28014.js, 1, 20))
 >alias : Symbol(alias, Decl(bug28014.js, 0, 19))
diff --git a/tests/baselines/reference/moduleExportAliasImported.types b/tests/baselines/reference/moduleExportAliasImported.types
index 9fa087f1533..f1de74c531f 100644
--- a/tests/baselines/reference/moduleExportAliasImported.types
+++ b/tests/baselines/reference/moduleExportAliasImported.types
@@ -12,7 +12,7 @@ function alias() { }
 module.exports = alias
 >module.exports = alias : typeof alias
 >module.exports : typeof alias
->module : { "\"tests/cases/conformance/salsa/bug28014\"": typeof alias; }
+>module : { exports: typeof alias; }
 >exports : typeof alias
 >alias : typeof alias
 
diff --git a/tests/baselines/reference/moduleExportAliasUnknown.symbols b/tests/baselines/reference/moduleExportAliasUnknown.symbols
index 2913a704e10..a20f90a24a8 100644
--- a/tests/baselines/reference/moduleExportAliasUnknown.symbols
+++ b/tests/baselines/reference/moduleExportAliasUnknown.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/salsa/bug27025.js ===
 module.exports = window.nonprop;
->module.exports : Symbol("tests/cases/conformance/salsa/bug27025", Decl(bug27025.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bug27025.js, 0, 0))
 >module : Symbol(export=, Decl(bug27025.js, 0, 0))
 >exports : Symbol(export=, Decl(bug27025.js, 0, 0))
 >window : Symbol(window, Decl(lib.dom.d.ts, --, --))
diff --git a/tests/baselines/reference/moduleExportAliasUnknown.types b/tests/baselines/reference/moduleExportAliasUnknown.types
index 66f7635d2f0..5fe930905de 100644
--- a/tests/baselines/reference/moduleExportAliasUnknown.types
+++ b/tests/baselines/reference/moduleExportAliasUnknown.types
@@ -2,7 +2,7 @@
 module.exports = window.nonprop;
 >module.exports = window.nonprop : any
 >module.exports : any
->module : { "\"tests/cases/conformance/salsa/bug27025\"": any; }
+>module : { exports: any; }
 >exports : any
 >window.nonprop : any
 >window : Window & typeof globalThis
diff --git a/tests/baselines/reference/moduleExportAssignment.symbols b/tests/baselines/reference/moduleExportAssignment.symbols
index e89dabfd946..7f863792731 100644
--- a/tests/baselines/reference/moduleExportAssignment.symbols
+++ b/tests/baselines/reference/moduleExportAssignment.symbols
@@ -25,7 +25,7 @@ class EE {
 }
 var npmlog = module.exports = new EE()
 >npmlog : Symbol(npmlog, Decl(npmlog.js, 4, 3))
->module.exports : Symbol("tests/cases/conformance/salsa/npmlog", Decl(npmlog.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 >module : Symbol(npmlog, Decl(npmlog.js, 4, 12))
 >exports : Symbol(npmlog, Decl(npmlog.js, 4, 12))
 >EE : Symbol(EE, Decl(npmlog.js, 0, 0))
@@ -37,9 +37,9 @@ npmlog.on('hi') // both references should see EE.on
 
 module.exports.on('hi') // here too
 >module.exports.on : Symbol(EE.on, Decl(npmlog.js, 0, 10))
->module.exports : Symbol("tests/cases/conformance/salsa/npmlog", Decl(npmlog.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 >module : Symbol(module, Decl(npmlog.js, 4, 12))
->exports : Symbol("tests/cases/conformance/salsa/npmlog", Decl(npmlog.js, 0, 0))
+>exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 >on : Symbol(EE.on, Decl(npmlog.js, 0, 10))
 
 npmlog.x = 1
@@ -51,7 +51,7 @@ module.exports.y = 2
 >module.exports.y : Symbol(y, Decl(npmlog.js, 9, 12))
 >module.exports : Symbol(y, Decl(npmlog.js, 9, 12))
 >module : Symbol(module, Decl(npmlog.js, 4, 12))
->exports : Symbol("tests/cases/conformance/salsa/npmlog", Decl(npmlog.js, 0, 0))
+>exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 >y : Symbol(y, Decl(npmlog.js, 9, 12))
 
 npmlog.y
@@ -61,8 +61,8 @@ npmlog.y
 
 module.exports.x
 >module.exports.x : Symbol(x, Decl(npmlog.js, 7, 23))
->module.exports : Symbol("tests/cases/conformance/salsa/npmlog", Decl(npmlog.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 >module : Symbol(module, Decl(npmlog.js, 4, 12))
->exports : Symbol("tests/cases/conformance/salsa/npmlog", Decl(npmlog.js, 0, 0))
+>exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 >x : Symbol(x, Decl(npmlog.js, 7, 23))
 
diff --git a/tests/baselines/reference/moduleExportAssignment.types b/tests/baselines/reference/moduleExportAssignment.types
index 86edcb8f149..86d7fc553b4 100644
--- a/tests/baselines/reference/moduleExportAssignment.types
+++ b/tests/baselines/reference/moduleExportAssignment.types
@@ -28,7 +28,7 @@ var npmlog = module.exports = new EE()
 >npmlog : { on(s: string): void; x: number; y: number; }
 >module.exports = new EE() : { on(s: string): void; x: number; y: number; }
 >module.exports : { on(s: string): void; x: number; y: number; }
->module : { "\"tests/cases/conformance/salsa/npmlog\"": { on(s: string): void; x: number; y: number; }; }
+>module : { exports: { on(s: string): void; x: number; y: number; }; }
 >exports : { on(s: string): void; x: number; y: number; }
 >new EE() : EE
 >EE : typeof EE
@@ -44,7 +44,7 @@ module.exports.on('hi') // here too
 >module.exports.on('hi') : void
 >module.exports.on : (s: string) => void
 >module.exports : { on(s: string): void; x: number; y: number; }
->module : { "\"tests/cases/conformance/salsa/npmlog\"": { on(s: string): void; x: number; y: number; }; }
+>module : { exports: { on(s: string): void; x: number; y: number; }; }
 >exports : { on(s: string): void; x: number; y: number; }
 >on : (s: string) => void
 >'hi' : "hi"
@@ -60,7 +60,7 @@ module.exports.y = 2
 >module.exports.y = 2 : 2
 >module.exports.y : number
 >module.exports : { on(s: string): void; x: number; y: number; }
->module : { "\"tests/cases/conformance/salsa/npmlog\"": { on(s: string): void; x: number; y: number; }; }
+>module : { exports: { on(s: string): void; x: number; y: number; }; }
 >exports : { on(s: string): void; x: number; y: number; }
 >y : number
 >2 : 2
@@ -73,7 +73,7 @@ npmlog.y
 module.exports.x
 >module.exports.x : number
 >module.exports : { on(s: string): void; x: number; y: number; }
->module : { "\"tests/cases/conformance/salsa/npmlog\"": { on(s: string): void; x: number; y: number; }; }
+>module : { exports: { on(s: string): void; x: number; y: number; }; }
 >exports : { on(s: string): void; x: number; y: number; }
 >x : number
 
diff --git a/tests/baselines/reference/moduleExportAssignment2.symbols b/tests/baselines/reference/moduleExportAssignment2.symbols
index eaafdbefb1f..69a09dcf426 100644
--- a/tests/baselines/reference/moduleExportAssignment2.symbols
+++ b/tests/baselines/reference/moduleExportAssignment2.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/salsa/npm.js ===
 var npm = module.exports = function (tree) {
 >npm : Symbol(npm, Decl(npm.js, 0, 3))
->module.exports : Symbol("tests/cases/conformance/salsa/npm", Decl(npm.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(npm.js, 0, 0))
 >module : Symbol(npm, Decl(npm.js, 0, 9))
 >exports : Symbol(npm, Decl(npm.js, 0, 9))
 >tree : Symbol(tree, Decl(npm.js, 0, 37))
@@ -10,7 +10,7 @@ module.exports.asReadInstalled = function (tree) {
 >module.exports.asReadInstalled : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
 >module.exports : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
 >module : Symbol(module, Decl(npm.js, 0, 9), Decl(npm.js, 3, 13))
->exports : Symbol("tests/cases/conformance/salsa/npm", Decl(npm.js, 0, 0))
+>exports : Symbol(module.exports, Decl(npm.js, 0, 0))
 >asReadInstalled : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
 >tree : Symbol(tree, Decl(npm.js, 2, 43))
 
@@ -19,9 +19,9 @@ module.exports.asReadInstalled = function (tree) {
 >tree : Symbol(tree, Decl(npm.js, 2, 43))
 
     module.exports(tree)
->module.exports : Symbol("tests/cases/conformance/salsa/npm", Decl(npm.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(npm.js, 0, 0))
 >module : Symbol(module, Decl(npm.js, 0, 9), Decl(npm.js, 3, 13))
->exports : Symbol("tests/cases/conformance/salsa/npm", Decl(npm.js, 0, 0))
+>exports : Symbol(module.exports, Decl(npm.js, 0, 0))
 >tree : Symbol(tree, Decl(npm.js, 2, 43))
 }
 
diff --git a/tests/baselines/reference/moduleExportAssignment2.types b/tests/baselines/reference/moduleExportAssignment2.types
index bee712fc2b0..817c1578fb8 100644
--- a/tests/baselines/reference/moduleExportAssignment2.types
+++ b/tests/baselines/reference/moduleExportAssignment2.types
@@ -3,7 +3,7 @@ var npm = module.exports = function (tree) {
 >npm : { (tree: any): void; asReadInstalled: (tree: any) => void; }
 >module.exports = function (tree) {} : { (tree: any): void; asReadInstalled: (tree: any) => void; }
 >module.exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
->module : { "\"tests/cases/conformance/salsa/npm\"": { (tree: any): void; asReadInstalled: (tree: any) => void; }; }
+>module : { exports: { (tree: any): void; asReadInstalled: (tree: any) => void; }; }
 >exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
 >function (tree) {} : (tree: any) => void
 >tree : any
@@ -12,7 +12,7 @@ module.exports.asReadInstalled = function (tree) {
 >module.exports.asReadInstalled = function (tree) {    npm(tree) // both references should be callable    module.exports(tree)} : (tree: any) => void
 >module.exports.asReadInstalled : (tree: any) => void
 >module.exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
->module : { "\"tests/cases/conformance/salsa/npm\"": { (tree: any): void; asReadInstalled: (tree: any) => void; }; }
+>module : { exports: { (tree: any): void; asReadInstalled: (tree: any) => void; }; }
 >exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
 >asReadInstalled : (tree: any) => void
 >function (tree) {    npm(tree) // both references should be callable    module.exports(tree)} : (tree: any) => void
@@ -26,7 +26,7 @@ module.exports.asReadInstalled = function (tree) {
     module.exports(tree)
 >module.exports(tree) : void
 >module.exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
->module : { "\"tests/cases/conformance/salsa/npm\"": { (tree: any): void; asReadInstalled: (tree: any) => void; }; }
+>module : { exports: { (tree: any): void; asReadInstalled: (tree: any) => void; }; }
 >exports : { (tree: any): void; asReadInstalled: (tree: any) => void; }
 >tree : any
 }
diff --git a/tests/baselines/reference/moduleExportAssignment3.symbols b/tests/baselines/reference/moduleExportAssignment3.symbols
index 8fe824814ba..80aceb88c0e 100644
--- a/tests/baselines/reference/moduleExportAssignment3.symbols
+++ b/tests/baselines/reference/moduleExportAssignment3.symbols
@@ -9,13 +9,13 @@ mod() // should be callable from here too
 
 === tests/cases/conformance/salsa/mod.js ===
 module.exports = function x() { }
->module.exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >module : Symbol(export=, Decl(mod.js, 0, 0))
 >exports : Symbol(export=, Decl(mod.js, 0, 0))
 >x : Symbol(x, Decl(mod.js, 0, 16))
 
 module.exports() // should be callable
->module.exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >module : Symbol(module, Decl(mod.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 
diff --git a/tests/baselines/reference/moduleExportAssignment3.types b/tests/baselines/reference/moduleExportAssignment3.types
index 80c99d0a377..d652ac47c29 100644
--- a/tests/baselines/reference/moduleExportAssignment3.types
+++ b/tests/baselines/reference/moduleExportAssignment3.types
@@ -13,7 +13,7 @@ mod() // should be callable from here too
 module.exports = function x() { }
 >module.exports = function x() { } : () => void
 >module.exports : () => void
->module : { "\"tests/cases/conformance/salsa/mod\"": () => void; }
+>module : { exports: () => void; }
 >exports : () => void
 >function x() { } : () => void
 >x : () => void
@@ -21,6 +21,6 @@ module.exports = function x() { }
 module.exports() // should be callable
 >module.exports() : void
 >module.exports : () => void
->module : { "\"tests/cases/conformance/salsa/mod\"": () => void; }
+>module : { exports: () => void; }
 >exports : () => void
 
diff --git a/tests/baselines/reference/moduleExportAssignment4.symbols b/tests/baselines/reference/moduleExportAssignment4.symbols
index 530b452c200..d387cc3deeb 100644
--- a/tests/baselines/reference/moduleExportAssignment4.symbols
+++ b/tests/baselines/reference/moduleExportAssignment4.symbols
@@ -6,7 +6,7 @@ exports.default = { m: 1, a: 1 }
 >a : Symbol(a, Decl(async.js, 0, 25))
 
 module.exports = exports['default'];
->module.exports : Symbol("tests/cases/conformance/salsa/async", Decl(async.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(async.js, 0, 0))
 >module : Symbol(export=, Decl(async.js, 0, 32))
 >exports : Symbol(export=, Decl(async.js, 0, 32))
 >exports : Symbol("tests/cases/conformance/salsa/async", Decl(async.js, 0, 0))
diff --git a/tests/baselines/reference/moduleExportAssignment4.types b/tests/baselines/reference/moduleExportAssignment4.types
index 16053f1cc41..465aaa78e27 100644
--- a/tests/baselines/reference/moduleExportAssignment4.types
+++ b/tests/baselines/reference/moduleExportAssignment4.types
@@ -11,9 +11,9 @@ exports.default = { m: 1, a: 1 }
 >1 : 1
 
 module.exports = exports['default'];
->module.exports = exports['default'] : any
->module.exports : any
->module : { "\"tests/cases/conformance/salsa/async\"": any; }
+>module.exports = exports['default'] : error
+>module.exports : error
+>module : { exports: any; }
 >exports : any
 >exports['default'] : any
 >exports : any
diff --git a/tests/baselines/reference/moduleExportAssignment5.symbols b/tests/baselines/reference/moduleExportAssignment5.symbols
index 318b02b9185..73c06b8fcc1 100644
--- a/tests/baselines/reference/moduleExportAssignment5.symbols
+++ b/tests/baselines/reference/moduleExportAssignment5.symbols
@@ -18,7 +18,7 @@ axios.m()
 >m : Symbol(Axios.m, Decl(axios.js, 2, 5))
 
 module.exports = axios;
->module.exports : Symbol("tests/cases/conformance/salsa/axios", Decl(axios.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(axios.js, 0, 0))
 >module : Symbol(export=, Decl(axios.js, 7, 9))
 >exports : Symbol(export=, Decl(axios.js, 7, 9))
 >axios : Symbol(axios, Decl(axios.js, 5, 3))
@@ -27,7 +27,7 @@ module.exports.default = axios;
 >module.exports.default : Symbol(default, Decl(axios.js, 8, 23))
 >module.exports : Symbol(default, Decl(axios.js, 8, 23))
 >module : Symbol(module, Decl(axios.js, 7, 9))
->exports : Symbol("tests/cases/conformance/salsa/axios", Decl(axios.js, 0, 0))
+>exports : Symbol(module.exports, Decl(axios.js, 0, 0))
 >default : Symbol(default, Decl(axios.js, 8, 23))
 >axios : Symbol(axios, Decl(axios.js, 5, 3))
 
diff --git a/tests/baselines/reference/moduleExportAssignment5.types b/tests/baselines/reference/moduleExportAssignment5.types
index 07f36a230b2..eeaf014ec17 100644
--- a/tests/baselines/reference/moduleExportAssignment5.types
+++ b/tests/baselines/reference/moduleExportAssignment5.types
@@ -22,7 +22,7 @@ axios.m()
 module.exports = axios;
 >module.exports = axios : { m(): void; default: Axios; }
 >module.exports : { m(): void; default: Axios; }
->module : { "\"tests/cases/conformance/salsa/axios\"": { m(): void; default: Axios; }; }
+>module : { exports: { m(): void; default: Axios; }; }
 >exports : { m(): void; default: Axios; }
 >axios : Axios
 
@@ -30,7 +30,7 @@ module.exports.default = axios;
 >module.exports.default = axios : Axios
 >module.exports.default : Axios
 >module.exports : { m(): void; default: Axios; }
->module : { "\"tests/cases/conformance/salsa/axios\"": { m(): void; default: Axios; }; }
+>module : { exports: { m(): void; default: Axios; }; }
 >exports : { m(): void; default: Axios; }
 >default : Axios
 >axios : Axios
diff --git a/tests/baselines/reference/moduleExportNestedNamespaces.symbols b/tests/baselines/reference/moduleExportNestedNamespaces.symbols
index f2719df9487..af7c29bde1a 100644
--- a/tests/baselines/reference/moduleExportNestedNamespaces.symbols
+++ b/tests/baselines/reference/moduleExportNestedNamespaces.symbols
@@ -3,15 +3,15 @@ module.exports.n = {};
 >module.exports.n : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 15))
 >module.exports : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 15))
 >module : Symbol(module, Decl(mod.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >n : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 15))
 
 module.exports.n.K = function C() {
 >module.exports.n.K : Symbol(n.K, Decl(mod.js, 0, 22))
 >module.exports.n : Symbol(n.K, Decl(mod.js, 0, 22))
->module.exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >module : Symbol(module, Decl(mod.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >n : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 15))
 >K : Symbol(n.K, Decl(mod.js, 0, 22))
 >C : Symbol(C, Decl(mod.js, 1, 20))
@@ -25,7 +25,7 @@ module.exports.Classic = class {
 >module.exports.Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 >module.exports : Symbol(Classic, Decl(mod.js, 3, 1))
 >module : Symbol(module, Decl(mod.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 
     constructor() {
diff --git a/tests/baselines/reference/moduleExportNestedNamespaces.types b/tests/baselines/reference/moduleExportNestedNamespaces.types
index 17f6bf86e90..7e402963154 100644
--- a/tests/baselines/reference/moduleExportNestedNamespaces.types
+++ b/tests/baselines/reference/moduleExportNestedNamespaces.types
@@ -2,9 +2,9 @@
 module.exports.n = {};
 >module.exports.n = {} : typeof n
 >module.exports.n : typeof n
->module.exports : typeof import("tests/cases/conformance/salsa/mod")
->module : { "\"tests/cases/conformance/salsa/mod\"": typeof import("tests/cases/conformance/salsa/mod"); }
->exports : typeof import("tests/cases/conformance/salsa/mod")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >n : typeof n
 >{} : {}
 
@@ -12,9 +12,9 @@ module.exports.n.K = function C() {
 >module.exports.n.K = function C() {    this.x = 10;} : typeof C
 >module.exports.n.K : typeof C
 >module.exports.n : typeof n
->module.exports : typeof import("tests/cases/conformance/salsa/mod")
->module : { "\"tests/cases/conformance/salsa/mod\"": typeof import("tests/cases/conformance/salsa/mod"); }
->exports : typeof import("tests/cases/conformance/salsa/mod")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >n : typeof n
 >K : typeof C
 >function C() {    this.x = 10;} : typeof C
@@ -30,9 +30,9 @@ module.exports.n.K = function C() {
 module.exports.Classic = class {
 >module.exports.Classic = class {    constructor() {        this.p = 1    }} : typeof Classic
 >module.exports.Classic : typeof Classic
->module.exports : typeof import("tests/cases/conformance/salsa/mod")
->module : { "\"tests/cases/conformance/salsa/mod\"": typeof import("tests/cases/conformance/salsa/mod"); }
->exports : typeof import("tests/cases/conformance/salsa/mod")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >Classic : typeof Classic
 >class {    constructor() {        this.p = 1    }} : typeof Classic
 
diff --git a/tests/baselines/reference/moduleExportPropertyAssignmentDefault.symbols b/tests/baselines/reference/moduleExportPropertyAssignmentDefault.symbols
index 0645e00f000..03c01f48237 100644
--- a/tests/baselines/reference/moduleExportPropertyAssignmentDefault.symbols
+++ b/tests/baselines/reference/moduleExportPropertyAssignmentDefault.symbols
@@ -3,7 +3,7 @@ var axios = {}
 >axios : Symbol(axios, Decl(axios.js, 0, 3))
 
 module.exports = axios // both assignments should be ok
->module.exports : Symbol("tests/cases/conformance/salsa/axios", Decl(axios.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(axios.js, 0, 0))
 >module : Symbol(export=, Decl(axios.js, 0, 14))
 >exports : Symbol(export=, Decl(axios.js, 0, 14))
 >axios : Symbol(axios, Decl(axios.js, 0, 3))
@@ -12,7 +12,7 @@ module.exports.default = axios
 >module.exports.default : Symbol(default, Decl(axios.js, 1, 22))
 >module.exports : Symbol(default, Decl(axios.js, 1, 22))
 >module : Symbol(module, Decl(axios.js, 0, 14))
->exports : Symbol("tests/cases/conformance/salsa/axios", Decl(axios.js, 0, 0))
+>exports : Symbol(module.exports, Decl(axios.js, 0, 0))
 >default : Symbol(default, Decl(axios.js, 1, 22))
 >axios : Symbol(axios, Decl(axios.js, 0, 3))
 
diff --git a/tests/baselines/reference/moduleExportPropertyAssignmentDefault.types b/tests/baselines/reference/moduleExportPropertyAssignmentDefault.types
index ee1f2dfeb2b..b13aca86124 100644
--- a/tests/baselines/reference/moduleExportPropertyAssignmentDefault.types
+++ b/tests/baselines/reference/moduleExportPropertyAssignmentDefault.types
@@ -6,7 +6,7 @@ var axios = {}
 module.exports = axios // both assignments should be ok
 >module.exports = axios : typeof axios
 >module.exports : typeof axios
->module : { "\"tests/cases/conformance/salsa/axios\"": typeof axios; }
+>module : { exports: typeof axios; }
 >exports : typeof axios
 >axios : typeof axios
 
@@ -14,7 +14,7 @@ module.exports.default = axios
 >module.exports.default = axios : typeof axios
 >module.exports.default : typeof axios
 >module.exports : typeof axios
->module : { "\"tests/cases/conformance/salsa/axios\"": typeof axios; }
+>module : { exports: typeof axios; }
 >exports : typeof axios
 >default : typeof axios
 >axios : typeof axios
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment.symbols b/tests/baselines/reference/moduleExportWithExportPropertyAssignment.symbols
index c65205747a6..5560e727afc 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment.symbols
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment.symbols
@@ -25,7 +25,7 @@ declare function require(name: string): any;
 === tests/cases/conformance/salsa/mod1.js ===
 /// <reference path='./requires.d.ts' />
 module.exports = function () { }
->module.exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 
@@ -34,7 +34,7 @@ module.exports.f = function (a) { }
 >module.exports.f : Symbol(f, Decl(mod1.js, 1, 32))
 >module.exports : Symbol(f, Decl(mod1.js, 1, 32))
 >module : Symbol(module, Decl(mod1.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >f : Symbol(f, Decl(mod1.js, 1, 32))
 >a : Symbol(a, Decl(mod1.js, 3, 29))
 
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment.types b/tests/baselines/reference/moduleExportWithExportPropertyAssignment.types
index 21dc567a685..c58c815fb04 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment.types
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment.types
@@ -30,7 +30,7 @@ declare function require(name: string): any;
 module.exports = function () { }
 >module.exports = function () { } : { (): void; f: (a: number) => void; }
 >module.exports : { (): void; f: (a: number) => void; }
->module : { "\"tests/cases/conformance/salsa/mod1\"": { (): void; f: (a: number) => void; }; }
+>module : { exports: { (): void; f: (a: number) => void; }; }
 >exports : { (): void; f: (a: number) => void; }
 >function () { } : () => void
 
@@ -39,7 +39,7 @@ module.exports.f = function (a) { }
 >module.exports.f = function (a) { } : (a: number) => void
 >module.exports.f : (a: number) => void
 >module.exports : { (): void; f: (a: number) => void; }
->module : { "\"tests/cases/conformance/salsa/mod1\"": { (): void; f: (a: number) => void; }; }
+>module : { exports: { (): void; f: (a: number) => void; }; }
 >exports : { (): void; f: (a: number) => void; }
 >f : (a: number) => void
 >function (a) { } : (a: number) => void
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.symbols b/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.symbols
index 584bf77b334..782725aa7fa 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.symbols
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.symbols
@@ -25,13 +25,13 @@ declare function require(name: string): any;
 === tests/cases/conformance/salsa/mod1.js ===
 /// <reference path='./requires.d.ts' />
 module.exports = 1
->module.exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 
 module.exports.f = function () { }
 >module.exports : Symbol(f, Decl(mod1.js, 1, 18))
 >module : Symbol(module, Decl(mod1.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >f : Symbol(f, Decl(mod1.js, 1, 18))
 
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.types b/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.types
index 58ef2440b47..49a9a88c378 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.types
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment2.types
@@ -33,7 +33,7 @@ declare function require(name: string): any;
 module.exports = 1
 >module.exports = 1 : number
 >module.exports : number
->module : { "\"tests/cases/conformance/salsa/mod1\"": number; }
+>module : { exports: number; }
 >exports : number
 >1 : 1
 
@@ -41,7 +41,7 @@ module.exports.f = function () { }
 >module.exports.f = function () { } : () => void
 >module.exports.f : any
 >module.exports : number
->module : { "\"tests/cases/conformance/salsa/mod1\"": number; }
+>module : { exports: number; }
 >exports : number
 >f : any
 >function () { } : () => void
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.symbols b/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.symbols
index 6006339a0b4..2ee7a9ecdd6 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.symbols
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.symbols
@@ -44,11 +44,11 @@ module.exports.bothBefore = 'string'
 >module.exports.bothBefore : Symbol(bothBefore, Decl(mod1.js, 3, 18), Decl(mod1.js, 0, 0))
 >module.exports : Symbol(bothBefore, Decl(mod1.js, 0, 0))
 >module : Symbol(module, Decl(mod1.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >bothBefore : Symbol(bothBefore, Decl(mod1.js, 0, 0))
 
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 1, 36))
 >exports : Symbol(export=, Decl(mod1.js, 1, 36))
 
@@ -65,13 +65,13 @@ module.exports.bothAfter = 'string'
 >module.exports.bothAfter : Symbol(bothAfter, Decl(mod1.js, 4, 18), Decl(mod1.js, 6, 1))
 >module.exports : Symbol(bothAfter, Decl(mod1.js, 6, 1))
 >module : Symbol(module, Decl(mod1.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >bothAfter : Symbol(bothAfter, Decl(mod1.js, 6, 1))
 
 module.exports.justProperty = 'string'
 >module.exports.justProperty : Symbol(justProperty, Decl(mod1.js, 7, 35))
 >module.exports : Symbol(justProperty, Decl(mod1.js, 7, 35))
 >module : Symbol(module, Decl(mod1.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >justProperty : Symbol(justProperty, Decl(mod1.js, 7, 35))
 
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.types b/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.types
index d627b9f6de1..ff2457f3ef6 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.types
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment3.types
@@ -52,7 +52,7 @@ module.exports.bothBefore = 'string'
 >module.exports.bothBefore = 'string' : "string"
 >module.exports.bothBefore : string | number
 >module.exports : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
->module : { "\"tests/cases/conformance/salsa/mod1\"": { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }; }
+>module : { exports: { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }; }
 >exports : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
 >bothBefore : string | number
 >'string' : "string"
@@ -60,7 +60,7 @@ module.exports.bothBefore = 'string'
 module.exports = {
 >module.exports = {    justExport: 1,    bothBefore: 2,    bothAfter: 3,} : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
 >module.exports : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
->module : { "\"tests/cases/conformance/salsa/mod1\"": { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }; }
+>module : { exports: { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }; }
 >exports : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
 >{    justExport: 1,    bothBefore: 2,    bothAfter: 3,} : { justExport: number; bothBefore: number; bothAfter: number; }
 
@@ -80,7 +80,7 @@ module.exports.bothAfter = 'string'
 >module.exports.bothAfter = 'string' : "string"
 >module.exports.bothAfter : string | number
 >module.exports : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
->module : { "\"tests/cases/conformance/salsa/mod1\"": { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }; }
+>module : { exports: { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }; }
 >exports : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
 >bothAfter : string | number
 >'string' : "string"
@@ -89,7 +89,7 @@ module.exports.justProperty = 'string'
 >module.exports.justProperty = 'string' : "string"
 >module.exports.justProperty : string
 >module.exports : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
->module : { "\"tests/cases/conformance/salsa/mod1\"": { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }; }
+>module : { exports: { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }; }
 >exports : { justExport: number; bothBefore: string | number; bothAfter: string | number; justProperty: string; }
 >justProperty : string
 >'string' : "string"
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
index 5f7dbc398dc..672489268d0 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
@@ -44,7 +44,7 @@ module.exports.bothBefore = 'string'
 >module.exports.bothBefore : Symbol(bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 >module.exports : Symbol(bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 >module : Symbol(module, Decl(mod1.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >bothBefore : Symbol(bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 
 A.justExport = 4
@@ -63,7 +63,7 @@ A.bothAfter = 3
 >bothAfter : Symbol(bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 
 module.exports = A
->module.exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 4, 15))
 >exports : Symbol(export=, Decl(mod1.js, 4, 15))
 >A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36), Decl(mod1.js, 2, 16), Decl(mod1.js, 3, 16))
@@ -80,13 +80,13 @@ module.exports.bothAfter = 'string'
 >module.exports.bothAfter : Symbol(bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 >module.exports : Symbol(bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 >module : Symbol(module, Decl(mod1.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >bothAfter : Symbol(bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 
 module.exports.justProperty = 'string'
 >module.exports.justProperty : Symbol(justProperty, Decl(mod1.js, 9, 35))
 >module.exports : Symbol(justProperty, Decl(mod1.js, 9, 35))
 >module : Symbol(module, Decl(mod1.js, 0, 0))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >justProperty : Symbol(justProperty, Decl(mod1.js, 9, 35))
 
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.types b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.types
index d74a430cc15..de971c31243 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.types
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.types
@@ -52,7 +52,7 @@ module.exports.bothBefore = 'string'
 >module.exports.bothBefore = 'string' : "string"
 >module.exports.bothBefore : string | number
 >module.exports : typeof A
->module : { "\"tests/cases/conformance/salsa/mod1\"": typeof A; }
+>module : { exports: typeof A; }
 >exports : typeof A
 >bothBefore : string | number
 >'string' : "string"
@@ -81,7 +81,7 @@ A.bothAfter = 3
 module.exports = A
 >module.exports = A : typeof A
 >module.exports : typeof A
->module : { "\"tests/cases/conformance/salsa/mod1\"": typeof A; }
+>module : { exports: typeof A; }
 >exports : typeof A
 >A : typeof A
 
@@ -99,7 +99,7 @@ module.exports.bothAfter = 'string'
 >module.exports.bothAfter = 'string' : "string"
 >module.exports.bothAfter : string | number
 >module.exports : typeof A
->module : { "\"tests/cases/conformance/salsa/mod1\"": typeof A; }
+>module : { exports: typeof A; }
 >exports : typeof A
 >bothAfter : string | number
 >'string' : "string"
@@ -108,7 +108,7 @@ module.exports.justProperty = 'string'
 >module.exports.justProperty = 'string' : "string"
 >module.exports.justProperty : string
 >module.exports : typeof A
->module : { "\"tests/cases/conformance/salsa/mod1\"": typeof A; }
+>module : { exports: typeof A; }
 >exports : typeof A
 >justProperty : string
 >'string' : "string"
diff --git a/tests/baselines/reference/moduleExportsElementAccessAssignment.symbols b/tests/baselines/reference/moduleExportsElementAccessAssignment.symbols
index a13575852f0..f7721f6366a 100644
--- a/tests/baselines/reference/moduleExportsElementAccessAssignment.symbols
+++ b/tests/baselines/reference/moduleExportsElementAccessAssignment.symbols
@@ -54,21 +54,21 @@ exports["default"] = { x: "x" };
 >x : Symbol(x, Decl(mod1.js, 2, 22))
 
 module.exports["c"] = { x: "x" };
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(module, Decl(mod1.js, 2, 32))
->exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >"c" : Symbol("c", Decl(mod1.js, 2, 32))
 >x : Symbol(x, Decl(mod1.js, 3, 23))
 
 module["exports"]["d"] = {};
 >module : Symbol(module, Decl(mod1.js, 2, 32))
->"exports" : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>"exports" : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >"d" : Symbol("d", Decl(mod1.js, 3, 33), Decl(mod1.js, 5, 18))
 
 module["exports"]["d"].e = 0;
 >module["exports"]["d"].e : Symbol("d".e, Decl(mod1.js, 4, 28))
 >module : Symbol(module, Decl(mod1.js, 2, 32))
->"exports" : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>"exports" : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >"d" : Symbol("d", Decl(mod1.js, 3, 33), Decl(mod1.js, 5, 18))
 >e : Symbol("d".e, Decl(mod1.js, 4, 28))
 
diff --git a/tests/baselines/reference/moduleExportsElementAccessAssignment.types b/tests/baselines/reference/moduleExportsElementAccessAssignment.types
index b5f4c3e0e5a..030a05cdbc7 100644
--- a/tests/baselines/reference/moduleExportsElementAccessAssignment.types
+++ b/tests/baselines/reference/moduleExportsElementAccessAssignment.types
@@ -68,9 +68,9 @@ exports["default"] = { x: "x" };
 module.exports["c"] = { x: "x" };
 >module.exports["c"] = { x: "x" } : { x: string; }
 >module.exports["c"] : { x: string; }
->module.exports : typeof import("tests/cases/conformance/jsdoc/mod1")
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof import("tests/cases/conformance/jsdoc/mod1"); }
->exports : typeof import("tests/cases/conformance/jsdoc/mod1")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >"c" : "c"
 >{ x: "x" } : { x: string; }
 >x : string
@@ -79,8 +79,8 @@ module.exports["c"] = { x: "x" };
 module["exports"]["d"] = {};
 >module["exports"]["d"] = {} : typeof "d"
 >module["exports"]["d"] : typeof "d"
->module["exports"] : typeof import("tests/cases/conformance/jsdoc/mod1")
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof import("tests/cases/conformance/jsdoc/mod1"); }
+>module["exports"] : typeof module.exports
+>module : { exports: typeof module.exports; }
 >"exports" : "exports"
 >"d" : "d"
 >{} : {}
@@ -89,8 +89,8 @@ module["exports"]["d"].e = 0;
 >module["exports"]["d"].e = 0 : 0
 >module["exports"]["d"].e : number
 >module["exports"]["d"] : typeof "d"
->module["exports"] : typeof import("tests/cases/conformance/jsdoc/mod1")
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof import("tests/cases/conformance/jsdoc/mod1"); }
+>module["exports"] : typeof module.exports
+>module : { exports: typeof module.exports; }
 >"exports" : "exports"
 >"d" : "d"
 >e : number
diff --git a/tests/baselines/reference/nestedDestructuringOfRequire.symbols b/tests/baselines/reference/nestedDestructuringOfRequire.symbols
index 88261e51d1e..920b3fa5bae 100644
--- a/tests/baselines/reference/nestedDestructuringOfRequire.symbols
+++ b/tests/baselines/reference/nestedDestructuringOfRequire.symbols
@@ -25,7 +25,7 @@ module.exports.chalk = chalk
 >module.exports.chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
 >module.exports : Symbol(chalk, Decl(mod1.js, 2, 2))
 >module : Symbol(module, Decl(mod1.js, 2, 2))
->exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
 >chalk : Symbol(chalk, Decl(mod1.js, 0, 5))
 
diff --git a/tests/baselines/reference/nestedDestructuringOfRequire.types b/tests/baselines/reference/nestedDestructuringOfRequire.types
index fd97ba75a65..5e906928fb3 100644
--- a/tests/baselines/reference/nestedDestructuringOfRequire.types
+++ b/tests/baselines/reference/nestedDestructuringOfRequire.types
@@ -28,9 +28,9 @@ const chalk = {
 module.exports.chalk = chalk
 >module.exports.chalk = chalk : { grey: {}; }
 >module.exports.chalk : { grey: {}; }
->module.exports : typeof import("tests/cases/conformance/salsa/mod1")
->module : { "\"tests/cases/conformance/salsa/mod1\"": typeof import("tests/cases/conformance/salsa/mod1"); }
->exports : typeof import("tests/cases/conformance/salsa/mod1")
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >chalk : { grey: {}; }
 >chalk : { grey: {}; }
 
diff --git a/tests/baselines/reference/paramTagTypeResolution.symbols b/tests/baselines/reference/paramTagTypeResolution.symbols
index 0622abf2c41..8e0c7a28035 100644
--- a/tests/baselines/reference/paramTagTypeResolution.symbols
+++ b/tests/baselines/reference/paramTagTypeResolution.symbols
@@ -14,7 +14,7 @@ f(1, n => { })
  * @param {(t: T) => void} k
  */
 module.exports = function (x, k) { return k(x) }
->module.exports : Symbol("tests/cases/conformance/jsdoc/first", Decl(first.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(first.js, 0, 0))
 >module : Symbol(export=, Decl(first.js, 0, 0))
 >exports : Symbol(export=, Decl(first.js, 0, 0))
 >x : Symbol(x, Decl(first.js, 4, 27))
diff --git a/tests/baselines/reference/paramTagTypeResolution.types b/tests/baselines/reference/paramTagTypeResolution.types
index 5a0bbd321aa..6cd76e46c59 100644
--- a/tests/baselines/reference/paramTagTypeResolution.types
+++ b/tests/baselines/reference/paramTagTypeResolution.types
@@ -20,7 +20,7 @@ f(1, n => { })
 module.exports = function (x, k) { return k(x) }
 >module.exports = function (x, k) { return k(x) } : <T>(x: T, k: (t: T) => void) => void
 >module.exports : <T>(x: T, k: (t: T) => void) => void
->module : { "\"tests/cases/conformance/jsdoc/first\"": <T>(x: T, k: (t: T) => void) => void; }
+>module : { exports: <T>(x: T, k: (t: T) => void) => void; }
 >exports : <T>(x: T, k: (t: T) => void) => void
 >function (x, k) { return k(x) } : <T>(x: T, k: (t: T) => void) => void
 >x : T
diff --git a/tests/baselines/reference/requireOfJsonFileInJsFile.symbols b/tests/baselines/reference/requireOfJsonFileInJsFile.symbols
index 2a1e9b6ebd3..481a055197e 100644
--- a/tests/baselines/reference/requireOfJsonFileInJsFile.symbols
+++ b/tests/baselines/reference/requireOfJsonFileInJsFile.symbols
@@ -43,7 +43,7 @@ js1.b;
 
 === /js.js ===
 module.exports = { a: 0 };
->module.exports : Symbol("/js", Decl(js.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(js.js, 0, 0))
 >module : Symbol(export=, Decl(js.js, 0, 0))
 >exports : Symbol(export=, Decl(js.js, 0, 0))
 >a : Symbol(a, Decl(js.js, 0, 18))
diff --git a/tests/baselines/reference/requireOfJsonFileInJsFile.types b/tests/baselines/reference/requireOfJsonFileInJsFile.types
index 0e8e9b847ab..92199139c05 100644
--- a/tests/baselines/reference/requireOfJsonFileInJsFile.types
+++ b/tests/baselines/reference/requireOfJsonFileInJsFile.types
@@ -55,7 +55,7 @@ js1.b;
 module.exports = { a: 0 };
 >module.exports = { a: 0 } : { a: number; }
 >module.exports : { a: number; }
->module : { "\"/js\"": { a: number; }; }
+>module : { exports: { a: number; }; }
 >exports : { a: number; }
 >{ a: 0 } : { a: number; }
 >a : number
diff --git a/tests/baselines/reference/requireTwoPropertyAccesses.symbols b/tests/baselines/reference/requireTwoPropertyAccesses.symbols
index 9102201a101..870a2f97eec 100644
--- a/tests/baselines/reference/requireTwoPropertyAccesses.symbols
+++ b/tests/baselines/reference/requireTwoPropertyAccesses.symbols
@@ -17,7 +17,7 @@ console.log(value)
 === tests/cases/conformance/salsa/mod.js ===
 // @declaration
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >module : Symbol(export=, Decl(mod.js, 0, 0))
 >exports : Symbol(export=, Decl(mod.js, 0, 0))
 
diff --git a/tests/baselines/reference/requireTwoPropertyAccesses.types b/tests/baselines/reference/requireTwoPropertyAccesses.types
index c16098568ba..15609c96db7 100644
--- a/tests/baselines/reference/requireTwoPropertyAccesses.types
+++ b/tests/baselines/reference/requireTwoPropertyAccesses.types
@@ -21,7 +21,7 @@ console.log(value)
 module.exports = {
 >module.exports = {    x: {        y: "value"    }} : { x: { y: string; }; }
 >module.exports : { x: { y: string; }; }
->module : { "\"tests/cases/conformance/salsa/mod\"": { x: { y: string; }; }; }
+>module : { exports: { x: { y: string; }; }; }
 >exports : { x: { y: string; }; }
 >{    x: {        y: "value"    }} : { x: { y: string; }; }
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment17.symbols b/tests/baselines/reference/typeFromPropertyAssignment17.symbols
index b6121ee2507..007ddf6d277 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment17.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment17.symbols
@@ -38,7 +38,7 @@ declare var module: any;
 === tests/cases/conformance/salsa/minimatch.js ===
 /// <reference path='./types.d.ts'/>
 module.exports = minimatch
->module.exports : Symbol("tests/cases/conformance/salsa/minimatch", Decl(minimatch.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(minimatch.js, 0, 0))
 >module : Symbol(export=, Decl(minimatch.js, 0, 0))
 >exports : Symbol(export=, Decl(minimatch.js, 0, 0))
 >minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26), Decl(minimatch.js, 2, 15))
diff --git a/tests/baselines/reference/typeFromPropertyAssignment17.types b/tests/baselines/reference/typeFromPropertyAssignment17.types
index 86f6b6346f1..a6a907f7c77 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment17.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment17.types
@@ -45,7 +45,7 @@ declare var module: any;
 module.exports = minimatch
 >module.exports = minimatch : typeof minimatch
 >module.exports : typeof minimatch
->module : { "\"tests/cases/conformance/salsa/minimatch\"": typeof minimatch; }
+>module : { exports: typeof minimatch; }
 >exports : typeof minimatch
 >minimatch : typeof minimatch
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment19.symbols b/tests/baselines/reference/typeFromPropertyAssignment19.symbols
index 4b89af4a62e..f8f40e0dbc5 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment19.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment19.symbols
@@ -22,7 +22,7 @@ declare var module: any;
 /// <reference path='./types.d.ts'/>
 exports = module.exports = C
 >exports : Symbol("tests/cases/conformance/salsa/semver", Decl(semver.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/semver", Decl(semver.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(semver.js, 0, 0))
 >module : Symbol(export=, Decl(semver.js, 1, 9))
 >exports : Symbol(export=, Decl(semver.js, 1, 9))
 >C : Symbol(C, Decl(semver.js, 2, 16), Decl(semver.js, 1, 28))
diff --git a/tests/baselines/reference/typeFromPropertyAssignment19.types b/tests/baselines/reference/typeFromPropertyAssignment19.types
index a82897616e3..57c15b658a0 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment19.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment19.types
@@ -28,7 +28,7 @@ exports = module.exports = C
 >exports : typeof C
 >module.exports = C : typeof C
 >module.exports : typeof C
->module : { "\"tests/cases/conformance/salsa/semver\"": typeof C; }
+>module : { exports: typeof C; }
 >exports : typeof C
 >C : typeof C
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment37.symbols b/tests/baselines/reference/typeFromPropertyAssignment37.symbols
index 909ded56c27..dd5667fc4f5 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment37.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment37.symbols
@@ -21,9 +21,9 @@ util.existy // no error
 const util = exports = module.exports = {}
 >util : Symbol(util, Decl(mod.js, 0, 5))
 >exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
->module.exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 >module : Symbol(module, Decl(mod.js, 0, 22))
->exports : Symbol("tests/cases/conformance/salsa/mod", Decl(mod.js, 0, 0))
+>exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 
 if (!!false) {
     util.existy = function () { }
diff --git a/tests/baselines/reference/typeFromPropertyAssignment37.types b/tests/baselines/reference/typeFromPropertyAssignment37.types
index 2813969da82..df245806612 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment37.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment37.types
@@ -20,13 +20,13 @@ util.existy // no error
 
 === tests/cases/conformance/salsa/mod.js ===
 const util = exports = module.exports = {}
->util : typeof import("tests/cases/conformance/salsa/mod")
->exports = module.exports = {} : typeof import("tests/cases/conformance/salsa/mod")
->exports : typeof import("tests/cases/conformance/salsa/mod")
->module.exports = {} : typeof import("tests/cases/conformance/salsa/mod")
->module.exports : typeof import("tests/cases/conformance/salsa/mod")
->module : { "\"tests/cases/conformance/salsa/mod\"": typeof import("tests/cases/conformance/salsa/mod"); }
+>util : typeof module.exports
+>exports = module.exports = {} : typeof module.exports
 >exports : typeof import("tests/cases/conformance/salsa/mod")
+>module.exports = {} : typeof module.exports
+>module.exports : typeof module.exports
+>module : { exports: typeof module.exports; }
+>exports : typeof module.exports
 >{} : {}
 
 if (!!false) {
@@ -37,7 +37,7 @@ if (!!false) {
     util.existy = function () { }
 >util.existy = function () { } : () => void
 >util.existy : () => void
->util : typeof import("tests/cases/conformance/salsa/mod")
+>util : typeof module.exports
 >existy : () => void
 >function () { } : () => void
 }
diff --git a/tests/baselines/reference/typeTagModuleExports.symbols b/tests/baselines/reference/typeTagModuleExports.symbols
index a625e8dd77b..9b660c0554b 100644
--- a/tests/baselines/reference/typeTagModuleExports.symbols
+++ b/tests/baselines/reference/typeTagModuleExports.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/jsdoc/bug27327.js ===
 /** @type {string} */
 module.exports = 0;
->module.exports : Symbol("tests/cases/conformance/jsdoc/bug27327", Decl(bug27327.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(bug27327.js, 0, 0))
 >module : Symbol(export=, Decl(bug27327.js, 0, 0))
 >exports : Symbol(export=, Decl(bug27327.js, 0, 0))
 
diff --git a/tests/baselines/reference/typeTagModuleExports.types b/tests/baselines/reference/typeTagModuleExports.types
index 20da526f474..bf7206042cb 100644
--- a/tests/baselines/reference/typeTagModuleExports.types
+++ b/tests/baselines/reference/typeTagModuleExports.types
@@ -3,7 +3,7 @@
 module.exports = 0;
 >module.exports = 0 : string
 >module.exports : string
->module : { "\"tests/cases/conformance/jsdoc/bug27327\"": string; }
+>module : { exports: string; }
 >exports : string
 >0 : 0
 
diff --git a/tests/baselines/reference/typedefCrossModule.symbols b/tests/baselines/reference/typedefCrossModule.symbols
index aa3c9d5784a..73bb067e52b 100644
--- a/tests/baselines/reference/typedefCrossModule.symbols
+++ b/tests/baselines/reference/typedefCrossModule.symbols
@@ -9,7 +9,7 @@ declare var module: { exports: any};
 /** @typedef {{ type: "b", y: 1 }} B */
 /** @typedef {A | B} Both */
 module.exports = C
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 >C : Symbol(C, Decl(mod1.js, 4, 18))
diff --git a/tests/baselines/reference/typedefCrossModule.types b/tests/baselines/reference/typedefCrossModule.types
index fdc8314c064..31dabc4acfd 100644
--- a/tests/baselines/reference/typedefCrossModule.types
+++ b/tests/baselines/reference/typedefCrossModule.types
@@ -11,7 +11,7 @@ declare var module: { exports: any};
 module.exports = C
 >module.exports = C : typeof C
 >module.exports : typeof C
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": typeof C; }
+>module : { exports: typeof C; }
 >exports : typeof C
 >C : typeof C
 
diff --git a/tests/baselines/reference/typedefCrossModule2.symbols b/tests/baselines/reference/typedefCrossModule2.symbols
index a473991f8c4..adea03ca980 100644
--- a/tests/baselines/reference/typedefCrossModule2.symbols
+++ b/tests/baselines/reference/typedefCrossModule2.symbols
@@ -31,7 +31,7 @@ exports.Bar = class { }
 
 /** @typedef {number} Baz */
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 6, 23), Decl(mod1.js, 19, 17))
 >exports : Symbol(export=, Decl(mod1.js, 6, 23), Decl(mod1.js, 19, 17))
 
@@ -53,7 +53,7 @@ exports.Quid = 2;
 
 /** @typedef {number} Quack */
 module.exports = {
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 6, 23), Decl(mod1.js, 19, 17))
 >exports : Symbol(export=, Decl(mod1.js, 6, 23), Decl(mod1.js, 19, 17))
 
diff --git a/tests/baselines/reference/typedefCrossModule2.types b/tests/baselines/reference/typedefCrossModule2.types
index 02aa91c0798..d38cc33a6d7 100644
--- a/tests/baselines/reference/typedefCrossModule2.types
+++ b/tests/baselines/reference/typedefCrossModule2.types
@@ -39,7 +39,7 @@ exports.Bar = class { }
 module.exports = {
 >module.exports = {    Baz: class { }} : { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }
 >module.exports : { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }; }
+>module : { exports: { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }; }
 >exports : { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }
 >{    Baz: class { }} : { Baz: typeof Baz; }
 
@@ -67,7 +67,7 @@ exports.Quid = 2;
 module.exports = {
 >module.exports = {    Quack: 2} : { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }
 >module.exports : { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }
->module : { "\"tests/cases/conformance/jsdoc/mod1\"": { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }; }
+>module : { exports: { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }; }
 >exports : { Baz: typeof Baz; Bar: typeof Bar; Quid: number; } | { Quack: number; Bar: typeof Bar; Quid: number; }
 >{    Quack: 2} : { Quack: number; }
 
diff --git a/tests/baselines/reference/typedefCrossModule3.symbols b/tests/baselines/reference/typedefCrossModule3.symbols
index e4085c79bf1..1cb42970940 100644
--- a/tests/baselines/reference/typedefCrossModule3.symbols
+++ b/tests/baselines/reference/typedefCrossModule3.symbols
@@ -9,7 +9,7 @@ ns.Foo = class {}
 >Foo : Symbol(Foo, Decl(mod2.js, 1, 14), Decl(mod2.js, 0, 4))
 
 module.exports = ns;
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod2", Decl(mod2.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod2.js, 0, 0))
 >module : Symbol(export=, Decl(mod2.js, 2, 17))
 >exports : Symbol(export=, Decl(mod2.js, 2, 17))
 >ns : Symbol(ns, Decl(mod2.js, 1, 5), Decl(mod2.js, 1, 14))
diff --git a/tests/baselines/reference/typedefCrossModule3.types b/tests/baselines/reference/typedefCrossModule3.types
index bca3cb15698..8b3b349f277 100644
--- a/tests/baselines/reference/typedefCrossModule3.types
+++ b/tests/baselines/reference/typedefCrossModule3.types
@@ -14,7 +14,7 @@ ns.Foo = class {}
 module.exports = ns;
 >module.exports = ns : typeof ns
 >module.exports : typeof ns
->module : { "\"tests/cases/conformance/jsdoc/mod2\"": typeof ns; }
+>module : { exports: typeof ns; }
 >exports : typeof ns
 >ns : typeof ns
 
diff --git a/tests/baselines/reference/typedefCrossModule4.symbols b/tests/baselines/reference/typedefCrossModule4.symbols
index bc68e509d77..a4762172f17 100644
--- a/tests/baselines/reference/typedefCrossModule4.symbols
+++ b/tests/baselines/reference/typedefCrossModule4.symbols
@@ -4,7 +4,7 @@ class Bar { }
 >Bar : Symbol(Bar, Decl(mod3.js, 0, 0))
 
 module.exports = { Foo: Bar };
->module.exports : Symbol("tests/cases/conformance/jsdoc/mod3", Decl(mod3.js, 0, 0))
+>module.exports : Symbol(module.exports, Decl(mod3.js, 0, 0))
 >module : Symbol(export=, Decl(mod3.js, 1, 13))
 >exports : Symbol(export=, Decl(mod3.js, 1, 13))
 >Foo : Symbol(Foo, Decl(mod3.js, 2, 18))
diff --git a/tests/baselines/reference/typedefCrossModule4.types b/tests/baselines/reference/typedefCrossModule4.types
index eb01fe95625..b107c80e624 100644
--- a/tests/baselines/reference/typedefCrossModule4.types
+++ b/tests/baselines/reference/typedefCrossModule4.types
@@ -6,7 +6,7 @@ class Bar { }
 module.exports = { Foo: Bar };
 >module.exports = { Foo: Bar } : { Foo: typeof Bar; }
 >module.exports : { Foo: typeof Bar; }
->module : { "\"tests/cases/conformance/jsdoc/mod3\"": { Foo: typeof Bar; }; }
+>module : { exports: { Foo: typeof Bar; }; }
 >exports : { Foo: typeof Bar; }
 >{ Foo: Bar } : { Foo: typeof Bar; }
 >Foo : typeof Bar