diff --git a/internal/checker/checker.go b/internal/checker/checker.go
index 2ad083e6f2..c9bb8dabd7 100644
--- a/internal/checker/checker.go
+++ b/internal/checker/checker.go
@@ -30749,6 +30749,9 @@ func (c *Checker) getSymbolOfNameOrPropertyAccessExpression(name *ast.Node) *ast
 			}
 			meaning := core.IfElse(isJSDoc, ast.SymbolFlagsValue|ast.SymbolFlagsType|ast.SymbolFlagsNamespace, ast.SymbolFlagsValue)
 			result := c.resolveEntityName(name, meaning, true /*ignoreErrors*/, true /*dontResolveAlias*/, nil /*location*/)
+			if result != nil && result.Flags&ast.SymbolFlagsModuleExports != 0 {
+				result = result.ValueDeclaration.Symbol() // Symbol of the module source file
+			}
 			if result == nil && isJSDoc {
 				if container := ast.FindAncestor(name, ast.IsClassOrInterfaceLike); container != nil {
 					symbol := c.getSymbolOfDeclaration(container)
diff --git a/internal/fourslash/_scripts/failingTests.txt b/internal/fourslash/_scripts/failingTests.txt
index 7db9cd9788..1b4cf178bd 100644
--- a/internal/fourslash/_scripts/failingTests.txt
+++ b/internal/fourslash/_scripts/failingTests.txt
@@ -231,7 +231,6 @@ TestDoubleUnderscoreCompletions
 TestEditJsdocType
 TestExportDefaultClass
 TestExportDefaultFunction
-TestFindAllRefsModuleDotExports
 TestFindReferencesBindingPatternInJsdocNoCrash1
 TestFindReferencesBindingPatternInJsdocNoCrash2
 TestGenericCombinatorWithConstraints1
diff --git a/internal/fourslash/tests/gen/findAllRefsModuleDotExports_test.go b/internal/fourslash/tests/gen/findAllRefsModuleDotExports_test.go
index e2fa622891..97fa6533ec 100644
--- a/internal/fourslash/tests/gen/findAllRefsModuleDotExports_test.go
+++ b/internal/fourslash/tests/gen/findAllRefsModuleDotExports_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestFindAllRefsModuleDotExports(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @allowJs: true
 // @Filename: /a.js
diff --git a/internal/ls/findallreferences.go b/internal/ls/findallreferences.go
index 85d18cee0e..b2353aba28 100644
--- a/internal/ls/findallreferences.go
+++ b/internal/ls/findallreferences.go
@@ -753,7 +753,7 @@ func (l *LanguageService) getReferencedSymbolsForModuleIfDeclaredBySourceFile(ct
 	exportEquals := symbol.Exports[ast.InternalSymbolNameExportEquals]
 	// If exportEquals != nil, we're about to add references to `import("mod")` anyway, so don't double-count them.
 	moduleReferences := l.getReferencedSymbolsForModule(ctx, program, symbol, exportEquals != nil, sourceFiles, sourceFilesSet)
-	if exportEquals == nil || !sourceFilesSet.Has(moduleSourceFileName) {
+	if exportEquals == nil || exportEquals.Flags&ast.SymbolFlagsAlias == 0 || !sourceFilesSet.Has(moduleSourceFileName) {
 		return moduleReferences
 	}
 	symbol, _ = checker.ResolveAlias(exportEquals)
diff --git a/internal/ls/hover.go b/internal/ls/hover.go
index 736f4c31a9..d8bd1862a2 100644
--- a/internal/ls/hover.go
+++ b/internal/ls/hover.go
@@ -189,7 +189,11 @@ func getQuickInfoAndDeclarationAtLocation(c *checker.Checker, symbol *ast.Symbol
 				}
 			}
 		}
-		b.WriteString(c.SymbolToStringEx(symbol, container, ast.SymbolFlagsNone, symbolFormatFlags))
+		if symbol.Name == ast.InternalSymbolNameExportEquals && symbol.Parent != nil && symbol.Parent.Flags&ast.SymbolFlagsModule != 0 {
+			b.WriteString("exports")
+		} else {
+			b.WriteString(c.SymbolToStringEx(symbol, container, ast.SymbolFlagsNone, symbolFormatFlags))
+		}
 		b.WriteString(": ")
 		if callNode := getCallOrNewExpression(node); callNode != nil {
 			b.WriteString(c.SignatureToStringEx(c.GetResolvedSignature(callNode), container, typeFormatFlags|checker.TypeFormatFlagsWriteCallStyleSignature|checker.TypeFormatFlagsWriteTypeArgumentsOfSignature|checker.TypeFormatFlagsWriteArrowStyleSignature))
diff --git a/testdata/baselines/reference/compiler/erasableSyntaxOnlyJS.symbols b/testdata/baselines/reference/compiler/erasableSyntaxOnlyJS.symbols
index b6dffa7f87..7aac5d5b51 100644
--- a/testdata/baselines/reference/compiler/erasableSyntaxOnlyJS.symbols
+++ b/testdata/baselines/reference/compiler/erasableSyntaxOnlyJS.symbols
@@ -11,7 +11,7 @@ import foo = require("./foo.js");
 === bar.cjs ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(bar.cjs, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bar", Decl(bar.cjs, 0, 0))
 >exports : Symbol(export=, Decl(bar.cjs, 0, 0))
 
     a: 1,
@@ -21,7 +21,7 @@ module.exports = {
 === foo.js ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(foo.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("foo", Decl(foo.js, 0, 0))
 >exports : Symbol(export=, Decl(foo.js, 0, 0))
 
     b: 2,
diff --git a/testdata/baselines/reference/compiler/panicSatisfiesOnExportEqualsDeclaration.symbols b/testdata/baselines/reference/compiler/panicSatisfiesOnExportEqualsDeclaration.symbols
index 8ebafccf77..7b8a395a97 100644
--- a/testdata/baselines/reference/compiler/panicSatisfiesOnExportEqualsDeclaration.symbols
+++ b/testdata/baselines/reference/compiler/panicSatisfiesOnExportEqualsDeclaration.symbols
@@ -6,6 +6,6 @@
  */
 module.exports = {};
 >module.exports : Symbol(export=, Decl(panicSatisfiesOnExportEqualsDeclaration.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("panicSatisfiesOnExportEqualsDeclaration", Decl(panicSatisfiesOnExportEqualsDeclaration.js, 0, 0))
 >exports : Symbol(export=, Decl(panicSatisfiesOnExportEqualsDeclaration.js, 0, 0))
 
diff --git a/testdata/baselines/reference/fourslash/documentHighlights/emptyExportFindReferences.baseline.jsonc b/testdata/baselines/reference/fourslash/documentHighlights/emptyExportFindReferences.baseline.jsonc
index d013f7427a..ededeb5e3c 100644
--- a/testdata/baselines/reference/fourslash/documentHighlights/emptyExportFindReferences.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/documentHighlights/emptyExportFindReferences.baseline.jsonc
@@ -1,5 +1,5 @@
 // === documentHighlights ===
 // === /Foo.js ===
-// /*HIGHLIGHTS*/module.exports = {
+// /*HIGHLIGHTS*/[|module.exports = {
 // 
-// }
\ No newline at end of file
+// }|]
\ No newline at end of file
diff --git a/testdata/baselines/reference/fourslash/findAllReferences/findAllRefsModuleDotExports.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllReferences/findAllRefsModuleDotExports.baseline.jsonc
new file mode 100644
index 0000000000..8303effda7
--- /dev/null
+++ b/testdata/baselines/reference/fourslash/findAllReferences/findAllRefsModuleDotExports.baseline.jsonc
@@ -0,0 +1,21 @@
+// === findAllReferences ===
+// === /a.js ===
+// /*FIND ALL REFS*/const [|b|] = require("./b");
+
+
+
+// === findAllReferences ===
+// === /a.js ===
+// const b = require("/*FIND ALL REFS*/[|./b|]");
+
+// === /b.js ===
+// [|module.exports = 0|];
+
+
+
+// === findAllReferences ===
+// === /a.js ===
+// const b = require("[|./b|]");
+
+// === /b.js ===
+// /*FIND ALL REFS*/[|module.exports = 0|];
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols b/testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols
index c90d580369..7fa07cda56 100644
--- a/testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols
+++ b/testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols
@@ -25,6 +25,6 @@ export = Foo;
 
 module.exports = /** @type {FooFun} */(void 0);
 >module.exports : Symbol(export=, Decl(something.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("something", Decl(something.js, 0, 0))
 >exports : Symbol(export=, Decl(something.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols.diff b/testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols.diff
index 17636a88ef..813dfd8e80 100644
--- a/testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols.diff
@@ -7,5 +7,5 @@
 ->module.exports : Symbol(module.exports, Decl(something.js, 0, 0))
 ->module : Symbol(export=, Decl(something.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(something.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("something", Decl(something.js, 0, 0))
  >exports : Symbol(export=, Decl(something.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/commonJsExportTypeDeclarationError.symbols b/testdata/baselines/reference/submodule/compiler/commonJsExportTypeDeclarationError.symbols
index 1af9d4e786..de91cecb7b 100644
--- a/testdata/baselines/reference/submodule/compiler/commonJsExportTypeDeclarationError.symbols
+++ b/testdata/baselines/reference/submodule/compiler/commonJsExportTypeDeclarationError.symbols
@@ -3,7 +3,7 @@
 === test.js ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(test.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("test", Decl(test.js, 0, 0))
 >exports : Symbol(export=, Decl(test.js, 0, 0))
 
    message: ""
diff --git a/testdata/baselines/reference/submodule/compiler/commonJsExportTypeDeclarationError.symbols.diff b/testdata/baselines/reference/submodule/compiler/commonJsExportTypeDeclarationError.symbols.diff
index 5e8d38822d..85970bee8a 100644
--- a/testdata/baselines/reference/submodule/compiler/commonJsExportTypeDeclarationError.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/commonJsExportTypeDeclarationError.symbols.diff
@@ -9,7 +9,7 @@
 ->module.exports : Symbol(module.exports, Decl(test.js, 0, 0))
 ->module : Symbol(export=, Decl(test.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(test.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("test", Decl(test.js, 0, 0))
  >exports : Symbol(export=, Decl(test.js, 0, 0))
 
     message: ""
diff --git a/testdata/baselines/reference/submodule/compiler/commonJsIsolatedModules.symbols b/testdata/baselines/reference/submodule/compiler/commonJsIsolatedModules.symbols
index dc49742761..09356557f8 100644
--- a/testdata/baselines/reference/submodule/compiler/commonJsIsolatedModules.symbols
+++ b/testdata/baselines/reference/submodule/compiler/commonJsIsolatedModules.symbols
@@ -3,7 +3,7 @@
 === index.js ===
 module.exports = {}
 >module.exports : Symbol(export=, Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 0))
 
 var x = 1
diff --git a/testdata/baselines/reference/submodule/compiler/commonJsIsolatedModules.symbols.diff b/testdata/baselines/reference/submodule/compiler/commonJsIsolatedModules.symbols.diff
index c71f401a4e..65ee97be44 100644
--- a/testdata/baselines/reference/submodule/compiler/commonJsIsolatedModules.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/commonJsIsolatedModules.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(export=, Decl(index.js, 0, 0))
 
  var x = 1
diff --git a/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols b/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
index 80be37a2c3..2e7e01a49b 100644
--- a/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
+++ b/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
@@ -8,7 +8,7 @@ const _item = require("./namespacer");
 
 module.exports = 12;
 >module.exports : Symbol(export=, Decl(index.js, 0, 38))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 38))
 
 Object.defineProperty(module, "exports", { value: "oh no" });
@@ -29,7 +29,7 @@ A.bar = class Q {}
 
 module.exports = A;
 >module.exports : Symbol(A, Decl(namespacey.js, 0, 5))
->module : Symbol(module.exports)
+>module : Symbol("namespacey", Decl(namespacey.js, 0, 0))
 >exports : Symbol(A, Decl(namespacey.js, 0, 5))
 >A : Symbol(A, Decl(namespacey.js, 0, 5))
 
@@ -53,7 +53,7 @@ Object.defineProperty(B, "NS", { value: "why though", writable: true });
 
 module.exports = B;
 >module.exports : Symbol(B, Decl(namespacer.js, 0, 5))
->module : Symbol(module.exports)
+>module : Symbol("namespacer", Decl(namespacer.js, 0, 0))
 >exports : Symbol(B, Decl(namespacer.js, 0, 5))
 >B : Symbol(B, Decl(namespacer.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols.diff b/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols.diff
index b61e4fb453..cbe9872090 100644
--- a/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 0, 38))
 +>module.exports : Symbol(export=, Decl(index.js, 0, 38))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 0, 38))
 
  Object.defineProperty(module, "exports", { value: "oh no" });
@@ -38,7 +38,7 @@
 ->exports : Symbol(export=, Decl(namespacey.js, 1, 18))
 ->A : Symbol(A, Decl(namespacey.js, 0, 5), Decl(namespacey.js, 0, 12))
 +>module.exports : Symbol(A, Decl(namespacey.js, 0, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("namespacey", Decl(namespacey.js, 0, 0))
 +>exports : Symbol(A, Decl(namespacey.js, 0, 5))
 +>A : Symbol(A, Decl(namespacey.js, 0, 5))
 
@@ -73,6 +73,6 @@
 ->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))
 +>module.exports : Symbol(B, Decl(namespacer.js, 0, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("namespacer", Decl(namespacer.js, 0, 0))
 +>exports : Symbol(B, Decl(namespacer.js, 0, 5))
 +>B : Symbol(B, Decl(namespacer.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesJs.symbols b/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesJs.symbols
index 814586c8ea..e61e42ed24 100644
--- a/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesJs.symbols
+++ b/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesJs.symbols
@@ -71,7 +71,7 @@ function foo() {
  */
 module.exports = {
 >module.exports : Symbol(export=, Decl(input.js, 42, 1))
->module : Symbol(module.exports)
+>module : Symbol("input", Decl(input.js, 0, 0))
 >exports : Symbol(export=, Decl(input.js, 42, 1))
 
     color: "red"
@@ -82,6 +82,6 @@ expectLiteral({ props: module.exports });
 >expectLiteral : Symbol(expectLiteral, Decl(input.js, 27, 27))
 >props : Symbol(props, Decl(input.js, 51, 15))
 >module.exports : Symbol(export=, Decl(input.js, 42, 1))
->module : Symbol(module.exports)
+>module : Symbol("input", Decl(input.js, 0, 0))
 >exports : Symbol(export=, Decl(input.js, 42, 1))
 
diff --git a/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesJs.symbols.diff b/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesJs.symbols.diff
index b80e0680f8..7e898bf0fd 100644
--- a/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesJs.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesJs.symbols.diff
@@ -61,7 +61,7 @@
 ->module.exports : Symbol(module.exports, Decl(input.js, 0, 0))
 ->module : Symbol(export=, Decl(input.js, 42, 1))
 +>module.exports : Symbol(export=, Decl(input.js, 42, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("input", Decl(input.js, 0, 0))
  >exports : Symbol(export=, Decl(input.js, 42, 1))
 
      color: "red"
@@ -73,5 +73,5 @@
 ->module : Symbol(module, Decl(input.js, 42, 1), Decl(input.js, 51, 22))
 ->exports : Symbol(module.exports, Decl(input.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(input.js, 42, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("input", Decl(input.js, 0, 0))
 +>exports : Symbol(export=, Decl(input.js, 42, 1))
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=false).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=false).symbols
index 285cda7771..bb4cf4e782 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=false).symbols
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=false).symbols
@@ -18,7 +18,7 @@ class Bar extends Foo {}
 
 module.exports = Bar;
 >module.exports : Symbol(Bar, Decl(index.js, 0, 12))
->module : Symbol(module.exports)
+>module : Symbol("/index", Decl(index.js, 0, 0))
 >exports : Symbol(Bar, Decl(index.js, 0, 12))
 >Bar : Symbol(Bar, Decl(index.js, 0, 12))
 
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=false).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=false).symbols.diff
index 570acccb4c..28919c3444 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=false).symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=false).symbols.diff
@@ -17,6 +17,6 @@
 ->module : Symbol(export=, Decl(index.js, 2, 24))
 ->exports : Symbol(export=, Decl(index.js, 2, 24))
 +>module.exports : Symbol(Bar, Decl(index.js, 0, 12))
-+>module : Symbol(module.exports)
++>module : Symbol("/index", Decl(index.js, 0, 0))
 +>exports : Symbol(Bar, Decl(index.js, 0, 12))
  >Bar : Symbol(Bar, Decl(index.js, 0, 12))
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=true).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=true).symbols
index 285cda7771..bb4cf4e782 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=true).symbols
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=true).symbols
@@ -18,7 +18,7 @@ class Bar extends Foo {}
 
 module.exports = Bar;
 >module.exports : Symbol(Bar, Decl(index.js, 0, 12))
->module : Symbol(module.exports)
+>module : Symbol("/index", Decl(index.js, 0, 0))
 >exports : Symbol(Bar, Decl(index.js, 0, 12))
 >Bar : Symbol(Bar, Decl(index.js, 0, 12))
 
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=true).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=true).symbols.diff
index a473a8cb48..ecbde6fafc 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=true).symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersCommonJSJavaScript(verbatimmodulesyntax=true).symbols.diff
@@ -17,6 +17,6 @@
 ->module : Symbol(export=, Decl(index.js, 2, 24))
 ->exports : Symbol(export=, Decl(index.js, 2, 24))
 +>module.exports : Symbol(Bar, Decl(index.js, 0, 12))
-+>module : Symbol(module.exports)
++>module : Symbol("/index", Decl(index.js, 0, 0))
 +>exports : Symbol(Bar, Decl(index.js, 0, 12))
  >Bar : Symbol(Bar, Decl(index.js, 0, 12))
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember12.symbols b/testdata/baselines/reference/submodule/compiler/importNonExportedMember12.symbols
index 657f6d3f03..9aca857846 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember12.symbols
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember12.symbols
@@ -3,7 +3,7 @@
 === /node_modules/foo/src/index.js ===
 module.exports = 1;
 >module.exports : Symbol(export=, Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("/node_modules/foo/src/index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 0))
 
 === /a.js ===
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember12.symbols.diff b/testdata/baselines/reference/submodule/compiler/importNonExportedMember12.symbols.diff
index 9417643c99..64fff670ef 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember12.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember12.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("/node_modules/foo/src/index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 0, 0))
 
  === /a.js ===
diff --git a/testdata/baselines/reference/submodule/compiler/javascriptCommonjsModule.symbols b/testdata/baselines/reference/submodule/compiler/javascriptCommonjsModule.symbols
index bf438af52c..9d62a03803 100644
--- a/testdata/baselines/reference/submodule/compiler/javascriptCommonjsModule.symbols
+++ b/testdata/baselines/reference/submodule/compiler/javascriptCommonjsModule.symbols
@@ -10,7 +10,7 @@ class Bar extends Foo {}
 
 module.exports = Bar;
 >module.exports : Symbol(Bar, Decl(index.js, 0, 12))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(Bar, Decl(index.js, 0, 12))
 >Bar : Symbol(Bar, Decl(index.js, 0, 12))
 
diff --git a/testdata/baselines/reference/submodule/compiler/javascriptCommonjsModule.symbols.diff b/testdata/baselines/reference/submodule/compiler/javascriptCommonjsModule.symbols.diff
index 39829663de..59cd1ad165 100644
--- a/testdata/baselines/reference/submodule/compiler/javascriptCommonjsModule.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/javascriptCommonjsModule.symbols.diff
@@ -8,6 +8,6 @@
 ->module : Symbol(export=, Decl(index.js, 2, 24))
 ->exports : Symbol(export=, Decl(index.js, 2, 24))
 +>module.exports : Symbol(Bar, Decl(index.js, 0, 12))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(Bar, Decl(index.js, 0, 12))
  >Bar : Symbol(Bar, Decl(index.js, 0, 12))
diff --git a/testdata/baselines/reference/submodule/compiler/javascriptImportDefaultBadExport.symbols b/testdata/baselines/reference/submodule/compiler/javascriptImportDefaultBadExport.symbols
index e1364018d2..33b60d814f 100644
--- a/testdata/baselines/reference/submodule/compiler/javascriptImportDefaultBadExport.symbols
+++ b/testdata/baselines/reference/submodule/compiler/javascriptImportDefaultBadExport.symbols
@@ -6,7 +6,7 @@ const alias = {};
 
 module.exports = alias;
 >module.exports : Symbol(alias, Decl(a.js, 0, 5))
->module : Symbol(module.exports)
+>module : Symbol("/a", Decl(a.js, 0, 0))
 >exports : Symbol(alias, Decl(a.js, 0, 5))
 >alias : Symbol(alias, Decl(a.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/compiler/javascriptImportDefaultBadExport.symbols.diff b/testdata/baselines/reference/submodule/compiler/javascriptImportDefaultBadExport.symbols.diff
index b111a514cb..fdd8244b28 100644
--- a/testdata/baselines/reference/submodule/compiler/javascriptImportDefaultBadExport.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/javascriptImportDefaultBadExport.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(a.js, 0, 17))
 ->exports : Symbol(export=, Decl(a.js, 0, 17))
 +>module.exports : Symbol(alias, Decl(a.js, 0, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("/a", Decl(a.js, 0, 0))
 +>exports : Symbol(alias, Decl(a.js, 0, 5))
  >alias : Symbol(alias, Decl(a.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedArray.symbols b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedArray.symbols
index e26a7ebdd3..b95894b8c9 100644
--- a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedArray.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedArray.symbols
@@ -3,7 +3,7 @@
 === file.js ===
 module.exports = [{ name: 'other', displayName: 'Other', defaultEnabled: true }];
 >module.exports : Symbol(export=, Decl(file.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("file", Decl(file.js, 0, 0))
 >exports : Symbol(export=, Decl(file.js, 0, 0))
 >name : Symbol(name, Decl(file.js, 0, 19))
 >displayName : Symbol(displayName, Decl(file.js, 0, 34))
diff --git a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedArray.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedArray.symbols.diff
index 86cebb8e70..bbce79bbae 100644
--- a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedArray.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedArray.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(file.js, 0, 0))
 ->module : Symbol(export=, Decl(file.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(file.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("file", Decl(file.js, 0, 0))
  >exports : Symbol(export=, Decl(file.js, 0, 0))
  >name : Symbol(name, Decl(file.js, 0, 19))
  >displayName : Symbol(displayName, Decl(file.js, 0, 34))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedFunctionWithExtraTypedefsMembers.symbols b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedFunctionWithExtraTypedefsMembers.symbols
index 8e050faae9..39730ae9d2 100644
--- a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedFunctionWithExtraTypedefsMembers.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedFunctionWithExtraTypedefsMembers.symbols
@@ -11,7 +11,7 @@
  */
 module.exports = function loader(options) {}
 >module.exports : Symbol(export=, Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 0))
 >loader : Symbol(loader, Decl(index.js, 8, 16))
 >options : Symbol(options, Decl(index.js, 8, 33))
diff --git a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedFunctionWithExtraTypedefsMembers.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedFunctionWithExtraTypedefsMembers.symbols.diff
index 341416ad03..8d1d235861 100644
--- a/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedFunctionWithExtraTypedefsMembers.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsDeclarationEmitExportAssignedFunctionWithExtraTypedefsMembers.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 0, 0))
  >loader : Symbol(loader, Decl(index.js, 8, 16))
  >options : Symbol(options, Decl(index.js, 8, 33))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols
index 916f7562f3..97e0d789a1 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols
@@ -8,7 +8,7 @@ const customSymbol = Symbol("custom");
 // This is a common pattern in Node’s built-in modules:
 module.exports = {
 >module.exports : Symbol(export=, Decl(file.js, 0, 38))
->module : Symbol(module.exports)
+>module : Symbol("file", Decl(file.js, 0, 0))
 >exports : Symbol(export=, Decl(file.js, 0, 38))
 
     customSymbol,
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols.diff
index a3d9141331..eaa913850e 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsExportAssignmentNonMutableLocation.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(file.js, 0, 38))
 ->exports : Symbol(module.exports, Decl(file.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(file.js, 0, 38))
-+>module : Symbol(module.exports)
++>module : Symbol("file", Decl(file.js, 0, 0))
 +>exports : Symbol(export=, Decl(file.js, 0, 38))
 
      customSymbol,
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.symbols b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.symbols
index 59a81b14aa..f93ac01044 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.symbols
@@ -11,7 +11,7 @@ class Abcde {
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(test.js, 3, 1))
->module : Symbol(module.exports)
+>module : Symbol("/test", Decl(test.js, 0, 0))
 >exports : Symbol(export=, Decl(test.js, 3, 1))
 
   Abcde
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.symbols.diff
index 4ca5aa83b5..76c3d4efcc 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation.symbols.diff
@@ -17,7 +17,7 @@
 ->module : Symbol(module, Decl(test.js, 3, 1))
 ->exports : Symbol("/test.js", Decl(test.js, 0, 0), Decl(index.ts, 0, 31))
 +>module.exports : Symbol(export=, Decl(test.js, 3, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("/test", Decl(test.js, 0, 0))
 +>exports : Symbol(export=, Decl(test.js, 3, 1))
 
    Abcde
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation2.symbols b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation2.symbols
index affbb5282d..ecf70c434b 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation2.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation2.symbols
@@ -3,7 +3,7 @@
 === /test.js ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(test.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("/test", Decl(test.js, 0, 0))
 >exports : Symbol(export=, Decl(test.js, 0, 0))
 
   a: "ok"
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation2.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation2.symbols.diff
index 9ae26854b6..b51576a353 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation2.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation2.symbols.diff
@@ -8,7 +8,7 @@
 ->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))
 +>module.exports : Symbol(export=, Decl(test.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("/test", Decl(test.js, 0, 0))
 +>exports : Symbol(export=, Decl(test.js, 0, 0))
 
    a: "ok"
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.symbols b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.symbols
index ec76d78072..8baf80c215 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.symbols
@@ -3,12 +3,12 @@
 === /x.js ===
 module.exports.x = 1;
 >module.exports : Symbol(export=, Decl(x.js, 0, 21))
->module : Symbol(module.exports)
+>module : Symbol("/x", Decl(x.js, 0, 0))
 >exports : Symbol(export=, Decl(x.js, 0, 21))
 
 module.exports = require("./y.js");
 >module.exports : Symbol(export=, Decl(x.js, 0, 21))
->module : Symbol(module.exports)
+>module : Symbol("/x", Decl(x.js, 0, 0))
 >exports : Symbol(export=, Decl(x.js, 0, 21))
 >require : Symbol(require)
 
diff --git a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.symbols.diff
index 4f7e0ab0db..948a04b845 100644
--- a/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsExportMemberMergedWithModuleAugmentation3.symbols.diff
@@ -10,14 +10,14 @@
 ->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 : Symbol(export=, Decl(x.js, 0, 21))
-+>module : Symbol(module.exports)
++>module : Symbol("/x", Decl(x.js, 0, 0))
 +>exports : Symbol(export=, Decl(x.js, 0, 21))
 
  module.exports = require("./y.js");
 ->module.exports : Symbol(module.exports, Decl(x.js, 0, 0))
 ->module : Symbol(export=, Decl(x.js, 0, 21))
 +>module.exports : Symbol(export=, Decl(x.js, 0, 21))
-+>module : Symbol(module.exports)
++>module : Symbol("/x", Decl(x.js, 0, 0))
  >exports : Symbol(export=, Decl(x.js, 0, 21))
  >require : Symbol(require)
 ->"./y.js" : Symbol("/y", Decl(y.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/jsFileClassPropertyInitalizationInObjectLiteral.symbols b/testdata/baselines/reference/submodule/compiler/jsFileClassPropertyInitalizationInObjectLiteral.symbols
index 0d43d5d884..dfaa58631f 100644
--- a/testdata/baselines/reference/submodule/compiler/jsFileClassPropertyInitalizationInObjectLiteral.symbols
+++ b/testdata/baselines/reference/submodule/compiler/jsFileClassPropertyInitalizationInObjectLiteral.symbols
@@ -3,7 +3,7 @@
 === foo.js ===
 module.exports = function () {
 >module.exports : Symbol(export=, Decl(foo.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("foo", Decl(foo.js, 0, 0))
 >exports : Symbol(export=, Decl(foo.js, 0, 0))
 
   class A { }
diff --git a/testdata/baselines/reference/submodule/compiler/jsFileClassPropertyInitalizationInObjectLiteral.symbols.diff b/testdata/baselines/reference/submodule/compiler/jsFileClassPropertyInitalizationInObjectLiteral.symbols.diff
index 4a77227c48..b0e5ce1d65 100644
--- a/testdata/baselines/reference/submodule/compiler/jsFileClassPropertyInitalizationInObjectLiteral.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsFileClassPropertyInitalizationInObjectLiteral.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(foo.js, 0, 0))
 ->module : Symbol(export=, Decl(foo.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(foo.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("foo", Decl(foo.js, 0, 0))
  >exports : Symbol(export=, Decl(foo.js, 0, 0))
 
    class A { }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols
index 5ea722d79d..28c07c4bde 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols
+++ b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols
@@ -34,7 +34,7 @@ const allRules = {
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(eslint-plugin-react.js, 6, 1))
->module : Symbol(module.exports)
+>module : Symbol("eslint-plugin-react", Decl(eslint-plugin-react.js, 0, 0))
 >exports : Symbol(export=, Decl(eslint-plugin-react.js, 6, 1))
 
   plugins: {
@@ -72,7 +72,7 @@ function config(...configs) { }
 
 module.exports = { config };
 >module.exports : Symbol(export=, Decl(typescript-eslint.js, 11, 31))
->module : Symbol(module.exports)
+>module : Symbol("typescript-eslint", Decl(typescript-eslint.js, 0, 0))
 >exports : Symbol(export=, Decl(typescript-eslint.js, 11, 31))
 >config : Symbol(config, Decl(typescript-eslint.js, 13, 18))
 
diff --git a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols.diff
index c3a004ee08..a6b1f99470 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/moduleExportsTypeNoExcessPropertyCheckFromContainedLiteral.symbols.diff
@@ -23,7 +23,7 @@
 ->module.exports : Symbol(module.exports, Decl(eslint-plugin-react.js, 0, 0))
 ->module : Symbol(export=, Decl(eslint-plugin-react.js, 6, 1))
 +>module.exports : Symbol(export=, Decl(eslint-plugin-react.js, 6, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("eslint-plugin-react", Decl(eslint-plugin-react.js, 0, 0))
  >exports : Symbol(export=, Decl(eslint-plugin-react.js, 6, 1))
 
    plugins: {
@@ -35,6 +35,6 @@
 ->module : Symbol(module, Decl(typescript-eslint.js, 11, 31))
 ->exports : Symbol(module.exports, Decl(typescript-eslint.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(typescript-eslint.js, 11, 31))
-+>module : Symbol(module.exports)
++>module : Symbol("typescript-eslint", Decl(typescript-eslint.js, 0, 0))
 +>exports : Symbol(export=, Decl(typescript-eslint.js, 11, 31))
  >config : Symbol(config, Decl(typescript-eslint.js, 13, 18))
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols b/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols
index 3cace490b3..28668d1cb5 100644
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols
@@ -7,7 +7,7 @@ export const x = 0;
 module.exports.y = 0; // Error
 >module.exports.y : Symbol(y, Decl(a.js, 0, 19))
 >module.exports : Symbol("/a", Decl(a.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("/a", Decl(a.js, 0, 0))
 >exports : Symbol("/a", Decl(a.js, 0, 0))
 >y : Symbol(y, Decl(a.js, 0, 19))
 
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols.diff b/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols.diff
index 6d95c25f3d..828cbd5cba 100644
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve4.symbols.diff
@@ -6,7 +6,7 @@
  module.exports.y = 0; // Error
 +>module.exports.y : Symbol(y, Decl(a.js, 0, 19))
 +>module.exports : Symbol("/a", Decl(a.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("/a", Decl(a.js, 0, 0))
 +>exports : Symbol("/a", Decl(a.js, 0, 0))
 +>y : Symbol(y, Decl(a.js, 0, 19))
 
diff --git a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols
index 738988b717..dd745da626 100644
--- a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols
+++ b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols
@@ -3,7 +3,7 @@
 === bar.js ===
 module.exports = function () {};
 >module.exports : Symbol(export=, Decl(bar.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bar", Decl(bar.js, 0, 0))
 >exports : Symbol(export=, Decl(bar.js, 0, 0))
 
 exports.blah = exports.someProp;
diff --git a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols.diff b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols.diff
index 0866617f76..62f2f2d904 100644
--- a/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/pushTypeGetTypeOfAlias.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(bar.js, 0, 0))
 ->module : Symbol(export=, Decl(bar.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(bar.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("bar", Decl(bar.js, 0, 0))
  >exports : Symbol(export=, Decl(bar.js, 0, 0))
 
  exports.blah = exports.someProp;
diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols
index 9f3eb97f2f..8af4d4d6d5 100644
--- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols
+++ b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols
@@ -44,7 +44,7 @@ js1.b;
 === /js.js ===
 module.exports = { a: 0 };
 >module.exports : Symbol(export=, Decl(js.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("/js", Decl(js.js, 0, 0))
 >exports : Symbol(export=, Decl(js.js, 0, 0))
 >a : Symbol(a, Decl(js.js, 0, 18))
 
diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols.diff b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols.diff
index 4c49920155..e487d3ce81 100644
--- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.symbols.diff
@@ -23,6 +23,6 @@
 ->module.exports : Symbol(module.exports, Decl(js.js, 0, 0))
 ->module : Symbol(export=, Decl(js.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(js.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("/js", Decl(js.js, 0, 0))
  >exports : Symbol(export=, Decl(js.js, 0, 0))
  >a : Symbol(a, Decl(js.js, 0, 18))
diff --git a/testdata/baselines/reference/submodule/compiler/truthinessCallExpressionCoercion4.symbols b/testdata/baselines/reference/submodule/compiler/truthinessCallExpressionCoercion4.symbols
index e7ec94d877..ea8e176ada 100644
--- a/testdata/baselines/reference/submodule/compiler/truthinessCallExpressionCoercion4.symbols
+++ b/testdata/baselines/reference/submodule/compiler/truthinessCallExpressionCoercion4.symbols
@@ -6,12 +6,12 @@ function fn() {}
 
 if (typeof module === 'object' && module.exports) {
 >module.exports : Symbol(fn, Decl(a.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("a", Decl(a.js, 0, 0))
 >exports : Symbol(fn, Decl(a.js, 0, 0))
 
     module.exports = fn;
 >module.exports : Symbol(fn, Decl(a.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("a", Decl(a.js, 0, 0))
 >exports : Symbol(fn, Decl(a.js, 0, 0))
 >fn : Symbol(fn, Decl(a.js, 0, 0))
 }
diff --git a/testdata/baselines/reference/submodule/compiler/truthinessCallExpressionCoercion4.symbols.diff b/testdata/baselines/reference/submodule/compiler/truthinessCallExpressionCoercion4.symbols.diff
index ccfdab49c9..e92d618df2 100644
--- a/testdata/baselines/reference/submodule/compiler/truthinessCallExpressionCoercion4.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/truthinessCallExpressionCoercion4.symbols.diff
@@ -9,7 +9,7 @@
 ->module : Symbol(module, Decl(a.js, 2, 51))
 ->exports : Symbol(module.exports, Decl(a.js, 0, 0))
 +>module.exports : Symbol(fn, Decl(a.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("a", Decl(a.js, 0, 0))
 +>exports : Symbol(fn, Decl(a.js, 0, 0))
 
      module.exports = fn;
@@ -17,7 +17,7 @@
 ->module : Symbol(export=, Decl(a.js, 2, 51))
 ->exports : Symbol(export=, Decl(a.js, 2, 51))
 +>module.exports : Symbol(fn, Decl(a.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("a", Decl(a.js, 0, 0))
 +>exports : Symbol(fn, Decl(a.js, 0, 0))
  >fn : Symbol(fn, Decl(a.js, 0, 0))
  }
diff --git a/testdata/baselines/reference/submodule/conformance/binderUninitializedModuleExportsAssignment.symbols b/testdata/baselines/reference/submodule/conformance/binderUninitializedModuleExportsAssignment.symbols
index cf0725a551..740d241763 100644
--- a/testdata/baselines/reference/submodule/conformance/binderUninitializedModuleExportsAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/binderUninitializedModuleExportsAssignment.symbols
@@ -11,7 +11,7 @@ var loop2 = loop1;
 
 module.exports = loop2;
 >module.exports : Symbol(loop2, Decl(loop.js, 1, 3))
->module : Symbol(module.exports)
+>module : Symbol("loop", Decl(loop.js, 0, 0))
 >exports : Symbol(loop2, Decl(loop.js, 1, 3))
 >loop2 : Symbol(loop2, Decl(loop.js, 1, 3))
 
diff --git a/testdata/baselines/reference/submodule/conformance/binderUninitializedModuleExportsAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/binderUninitializedModuleExportsAssignment.symbols.diff
index 105de64132..e4389239d1 100644
--- a/testdata/baselines/reference/submodule/conformance/binderUninitializedModuleExportsAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/binderUninitializedModuleExportsAssignment.symbols.diff
@@ -8,6 +8,6 @@
 ->module : Symbol(export=, Decl(loop.js, 1, 18))
 ->exports : Symbol(export=, Decl(loop.js, 1, 18))
 +>module.exports : Symbol(loop2, Decl(loop.js, 1, 3))
-+>module : Symbol(module.exports)
++>module : Symbol("loop", Decl(loop.js, 0, 0))
 +>exports : Symbol(loop2, Decl(loop.js, 1, 3))
  >loop2 : Symbol(loop2, Decl(loop.js, 1, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/callbackCrossModule.symbols b/testdata/baselines/reference/submodule/conformance/callbackCrossModule.symbols
index a3c308ae21..b930760652 100644
--- a/testdata/baselines/reference/submodule/conformance/callbackCrossModule.symbols
+++ b/testdata/baselines/reference/submodule/conformance/callbackCrossModule.symbols
@@ -7,7 +7,7 @@
  */
 module.exports = C
 >module.exports : Symbol(C, Decl(mod1.js, 4, 18))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(C, Decl(mod1.js, 4, 18))
 >C : Symbol(C, Decl(mod1.js, 4, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/callbackCrossModule.symbols.diff b/testdata/baselines/reference/submodule/conformance/callbackCrossModule.symbols.diff
index e8ddccd577..1bd0b80a93 100644
--- a/testdata/baselines/reference/submodule/conformance/callbackCrossModule.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/callbackCrossModule.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(mod1.js, 0, 0))
 ->exports : Symbol(export=, Decl(mod1.js, 0, 0))
 +>module.exports : Symbol(C, Decl(mod1.js, 4, 18))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(C, Decl(mod1.js, 4, 18))
  >C : Symbol(C, Decl(mod1.js, 4, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/checkExportsObjectAssignPrototypeProperty.symbols b/testdata/baselines/reference/submodule/conformance/checkExportsObjectAssignPrototypeProperty.symbols
index c43fdf5376..d776587aff 100644
--- a/testdata/baselines/reference/submodule/conformance/checkExportsObjectAssignPrototypeProperty.symbols
+++ b/testdata/baselines/reference/submodule/conformance/checkExportsObjectAssignPrototypeProperty.symbols
@@ -131,7 +131,7 @@ Object.defineProperty(Person.prototype, "setonlyAccessor", {
 });
 module.exports = Person;
 >module.exports : Symbol(Person, Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(Person, Decl(mod1.js, 0, 0))
 >Person : Symbol(Person, Decl(mod1.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/checkExportsObjectAssignPrototypeProperty.symbols.diff b/testdata/baselines/reference/submodule/conformance/checkExportsObjectAssignPrototypeProperty.symbols.diff
index f0c9826113..4e120b6e72 100644
--- a/testdata/baselines/reference/submodule/conformance/checkExportsObjectAssignPrototypeProperty.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/checkExportsObjectAssignPrototypeProperty.symbols.diff
@@ -152,6 +152,6 @@
 ->module : Symbol(export=, Decl(mod1.js, 19, 3))
 ->exports : Symbol(export=, Decl(mod1.js, 19, 3))
 +>module.exports : Symbol(Person, Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(Person, Decl(mod1.js, 0, 0))
  >Person : Symbol(Person, Decl(mod1.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/checkObjectDefineProperty.symbols b/testdata/baselines/reference/submodule/conformance/checkObjectDefineProperty.symbols
index dd596e3b36..993921305b 100644
--- a/testdata/baselines/reference/submodule/conformance/checkObjectDefineProperty.symbols
+++ b/testdata/baselines/reference/submodule/conformance/checkObjectDefineProperty.symbols
@@ -162,7 +162,7 @@ match(() => expected, (x = expected) => void 0);
 
 module.exports = x;
 >module.exports : Symbol(x, Decl(index.js, 0, 5))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(x, Decl(index.js, 0, 5))
 >x : Symbol(x, Decl(index.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/checkObjectDefineProperty.symbols.diff b/testdata/baselines/reference/submodule/conformance/checkObjectDefineProperty.symbols.diff
index 774dcb2bfd..ad4ad1b84c 100644
--- a/testdata/baselines/reference/submodule/conformance/checkObjectDefineProperty.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/checkObjectDefineProperty.symbols.diff
@@ -188,6 +188,6 @@
 ->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)
 +>module.exports : Symbol(x, Decl(index.js, 0, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(x, Decl(index.js, 0, 5))
 +>x : Symbol(x, Decl(index.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols
index 8c3b8e0421..e5ca91a267 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols
+++ b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols
@@ -29,13 +29,13 @@ function funky(declaration) {
 }
 module.exports = donkey;
 >module.exports : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
->module : Symbol(module.exports)
+>module : Symbol("commonJSAliasedExport", Decl(commonJSAliasedExport.js, 0, 0))
 >exports : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
 >donkey : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
 
 module.exports.funky = funky;
 >module.exports : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
->module : Symbol(module.exports)
+>module : Symbol("commonJSAliasedExport", Decl(commonJSAliasedExport.js, 0, 0))
 >exports : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
 >funky : Symbol(funky, Decl(commonJSAliasedExport.js, 0, 29))
 
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols.diff b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols.diff
index 57e789428e..c694dc5357 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(commonJSAliasedExport.js, 4, 1))
 ->exports : Symbol(export=, Decl(commonJSAliasedExport.js, 4, 1))
 +>module.exports : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("commonJSAliasedExport", Decl(commonJSAliasedExport.js, 0, 0))
 +>exports : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
  >donkey : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
 
@@ -19,6 +19,6 @@
 ->exports : Symbol(module.exports, Decl(commonJSAliasedExport.js, 0, 0))
 ->funky : Symbol(funky, Decl(commonJSAliasedExport.js, 5, 24))
 +>module.exports : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("commonJSAliasedExport", Decl(commonJSAliasedExport.js, 0, 0))
 +>exports : Symbol(donkey, Decl(commonJSAliasedExport.js, 0, 5))
  >funky : Symbol(funky, Decl(commonJSAliasedExport.js, 0, 29))
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSReexport.symbols b/testdata/baselines/reference/submodule/conformance/commonJSReexport.symbols
index a9258f816a..5b0a21b748 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSReexport.symbols
+++ b/testdata/baselines/reference/submodule/conformance/commonJSReexport.symbols
@@ -17,7 +17,7 @@ const hardline = { type: "hard" }
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(first.js, 0, 33))
->module : Symbol(module.exports)
+>module : Symbol("first", Decl(first.js, 0, 0))
 >exports : Symbol(export=, Decl(first.js, 0, 33))
 
   hardline
@@ -28,7 +28,7 @@ module.exports = {
 === second.js ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(second.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("second", Decl(second.js, 0, 0))
 >exports : Symbol(export=, Decl(second.js, 0, 0))
 
   nested: require('./first')
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSReexport.symbols.diff b/testdata/baselines/reference/submodule/conformance/commonJSReexport.symbols.diff
index bd49fde05b..0714c3be17 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJSReexport.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/commonJSReexport.symbols.diff
@@ -16,7 +16,7 @@
 ->module : Symbol(module, Decl(first.js, 0, 33))
 ->exports : Symbol(module.exports, Decl(first.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(first.js, 0, 33))
-+>module : Symbol(module.exports)
++>module : Symbol("first", Decl(first.js, 0, 0))
 +>exports : Symbol(export=, Decl(first.js, 0, 33))
 
    hardline
@@ -28,7 +28,7 @@
 ->module.exports : Symbol(module.exports, Decl(second.js, 0, 0))
 ->module : Symbol(export=, Decl(second.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(second.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("second", Decl(second.js, 0, 0))
  >exports : Symbol(export=, Decl(second.js, 0, 0))
 
    nested: require('./first')
diff --git a/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.symbols b/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.symbols
index 183b4d35fd..42d4617b13 100644
--- a/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.symbols
+++ b/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.symbols
@@ -9,7 +9,7 @@ export function abc(a, b, c) { return 5; }
 
 module.exports = { abc };
 >module.exports : Symbol(export=, Decl(bug24934.js, 0, 42))
->module : Symbol(module.exports)
+>module : Symbol("bug24934", Decl(bug24934.js, 0, 0))
 >exports : Symbol(export=, Decl(bug24934.js, 0, 42))
 >abc : Symbol(abc, Decl(bug24934.js, 1, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.symbols.diff b/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.symbols.diff
index ffd519adfd..cdfe1bb42c 100644
--- a/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/conflictingCommonJSES2015Exports.symbols.diff
@@ -5,7 +5,7 @@
 
  module.exports = { abc };
 +>module.exports : Symbol(export=, Decl(bug24934.js, 0, 42))
-+>module : Symbol(module.exports)
++>module : Symbol("bug24934", Decl(bug24934.js, 0, 0))
 +>exports : Symbol(export=, Decl(bug24934.js, 0, 42))
  >abc : Symbol(abc, Decl(bug24934.js, 1, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols b/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols
index 8b686083ff..cbd4e9a9a4 100644
--- a/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols
@@ -43,7 +43,7 @@ function A() { this.id = 1; }
 
 module.exports = A;
 >module.exports : Symbol(A, Decl(other.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("other", Decl(other.js, 0, 0))
 >exports : Symbol(A, Decl(other.js, 0, 0))
 >A : Symbol(A, Decl(other.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols.diff b/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols.diff
index 48e391f261..005bcd43a2 100644
--- a/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/constructorFunctions2.symbols.diff
@@ -50,6 +50,6 @@
 ->module : Symbol(export=, Decl(other.js, 0, 29))
 ->exports : Symbol(export=, Decl(other.js, 0, 29))
 +>module.exports : Symbol(A, Decl(other.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("other", Decl(other.js, 0, 0))
 +>exports : Symbol(A, Decl(other.js, 0, 0))
  >A : Symbol(A, Decl(other.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols
index 36332f0b2b..0c53649f0f 100644
--- a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols
@@ -104,7 +104,7 @@ exports.x
 module.exports.y = {
 >module.exports.y : Symbol(y, Decl(test.js, 45, 9))
 >module.exports : Symbol("test", Decl(test.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("test", Decl(test.js, 0, 0))
 >exports : Symbol("test", Decl(test.js, 0, 0))
 >y : Symbol(y, Decl(test.js, 45, 9))
 
@@ -118,7 +118,7 @@ module.exports.y = {
 module.exports.y
 >module.exports.y : Symbol(y, Decl(test.js, 45, 9))
 >module.exports : Symbol("test", Decl(test.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("test", Decl(test.js, 0, 0))
 >exports : Symbol("test", Decl(test.js, 0, 0))
 >y : Symbol(y, Decl(test.js, 45, 9))
 
@@ -164,7 +164,7 @@ F.prototype = {
 /** @type {{ status: 'done', m(n: number): void }} */
 module.exports = {
 >module.exports : Symbol(export=, Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol(export=, Decl(mod.js, 0, 0))
 
     status: "done",
diff --git a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols.diff
index 29f9b8d203..03b0f042a1 100644
--- a/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/contextualTypedSpecialAssignment.symbols.diff
@@ -61,7 +61,7 @@
 ->module : Symbol(module, Decl(test.js, 45, 9))
 ->exports : Symbol(module.exports, Decl(test.js, 0, 0))
 +>module.exports : Symbol("test", Decl(test.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("test", Decl(test.js, 0, 0))
 +>exports : Symbol("test", Decl(test.js, 0, 0))
  >y : Symbol(y, Decl(test.js, 45, 9))
 
@@ -74,7 +74,7 @@
 ->module : Symbol(module, Decl(test.js, 45, 9))
 ->exports : Symbol(module.exports, Decl(test.js, 0, 0))
 +>module.exports : Symbol("test", Decl(test.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("test", Decl(test.js, 0, 0))
 +>exports : Symbol("test", Decl(test.js, 0, 0))
  >y : Symbol(y, Decl(test.js, 45, 9))
 
@@ -120,7 +120,7 @@
 ->module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 ->module : Symbol(export=, Decl(mod.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
  >exports : Symbol(export=, Decl(mod.js, 0, 0))
 
      status: "done",
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols
index fb9a7f22ad..8720f111c4 100644
--- a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols
+++ b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols
@@ -11,7 +11,7 @@ exports.a = {};
 module.exports.b = {};
 >module.exports.b : Symbol(b, Decl(enumTagOnExports.js, 1, 15))
 >module.exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 >exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 >b : Symbol(b, Decl(enumTagOnExports.js, 1, 15))
 
diff --git a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols.diff b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols.diff
index b19e94ec50..6e791a795e 100644
--- a/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/enumTagOnExports.symbols.diff
@@ -20,6 +20,6 @@
 ->b : Symbol(b, Decl(enumTagOnExports.js, 1, 15), Decl(enumTagOnExports.js, 4, 15), Decl(enumTagOnExports.js, 3, 4))
 +>module.exports.b : Symbol(b, Decl(enumTagOnExports.js, 1, 15))
 +>module.exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 +>exports : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 +>b : Symbol(b, Decl(enumTagOnExports.js, 1, 15))
diff --git a/testdata/baselines/reference/submodule/conformance/enumTagOnExports2.symbols b/testdata/baselines/reference/submodule/conformance/enumTagOnExports2.symbols
index 740a47d149..2b613ca927 100644
--- a/testdata/baselines/reference/submodule/conformance/enumTagOnExports2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/enumTagOnExports2.symbols
@@ -4,6 +4,6 @@
 /** @enum {string} */
 module.exports = {};
 >module.exports : Symbol(export=, Decl(enumTagOnExports.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 >exports : Symbol(export=, Decl(enumTagOnExports.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/enumTagOnExports2.symbols.diff b/testdata/baselines/reference/submodule/conformance/enumTagOnExports2.symbols.diff
index cc0ea1a985..7c0fe0c58f 100644
--- a/testdata/baselines/reference/submodule/conformance/enumTagOnExports2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/enumTagOnExports2.symbols.diff
@@ -8,5 +8,5 @@
 ->module : Symbol(module, Decl(enumTagOnExports.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(enumTagOnExports.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(enumTagOnExports.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
 +>exports : Symbol(export=, Decl(enumTagOnExports.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols
index 84112b66c1..ccfc7ba36c 100644
--- a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols
+++ b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols
@@ -4,7 +4,7 @@
 module.exports.D = class { }
 >module.exports.D : Symbol(D, Decl(bug24492.js, 0, 0))
 >module.exports : Symbol("bug24492", Decl(bug24492.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bug24492", Decl(bug24492.js, 0, 0))
 >exports : Symbol("bug24492", Decl(bug24492.js, 0, 0))
 >D : Symbol(D, Decl(bug24492.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols.diff b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols.diff
index b4f8fb2594..69204282fe 100644
--- a/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportPropertyAssignmentNameResolution.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(bug24492.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(bug24492.js, 0, 0))
 +>module.exports : Symbol("bug24492", Decl(bug24492.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("bug24492", Decl(bug24492.js, 0, 0))
 +>exports : Symbol("bug24492", Decl(bug24492.js, 0, 0))
  >D : Symbol(D, Decl(bug24492.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/globalMergeWithCommonJSAssignmentDeclaration.symbols b/testdata/baselines/reference/submodule/conformance/globalMergeWithCommonJSAssignmentDeclaration.symbols
index 901f4c4261..92a33b772b 100644
--- a/testdata/baselines/reference/submodule/conformance/globalMergeWithCommonJSAssignmentDeclaration.symbols
+++ b/testdata/baselines/reference/submodule/conformance/globalMergeWithCommonJSAssignmentDeclaration.symbols
@@ -13,7 +13,7 @@ window.console; // should not have error: Property 'console' does not exist on t
 
 module.exports = 'anything';
 >module.exports : Symbol(export=, Decl(bug27099.js, 1, 15))
->module : Symbol(module.exports)
+>module : Symbol("bug27099", Decl(bug27099.js, 0, 0))
 >exports : Symbol(export=, Decl(bug27099.js, 1, 15))
 
 
diff --git a/testdata/baselines/reference/submodule/conformance/globalMergeWithCommonJSAssignmentDeclaration.symbols.diff b/testdata/baselines/reference/submodule/conformance/globalMergeWithCommonJSAssignmentDeclaration.symbols.diff
index 672f1ad80a..2ac7c38641 100644
--- a/testdata/baselines/reference/submodule/conformance/globalMergeWithCommonJSAssignmentDeclaration.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/globalMergeWithCommonJSAssignmentDeclaration.symbols.diff
@@ -18,6 +18,6 @@
 ->module.exports : Symbol(module.exports, Decl(bug27099.js, 0, 0))
 ->module : Symbol(export=, Decl(bug27099.js, 1, 15))
 +>module.exports : Symbol(export=, Decl(bug27099.js, 1, 15))
-+>module : Symbol(module.exports)
++>module : Symbol("bug27099", Decl(bug27099.js, 0, 0))
  >exports : Symbol(export=, Decl(bug27099.js, 1, 15))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAliasModuleExports.symbols b/testdata/baselines/reference/submodule/conformance/importAliasModuleExports.symbols
index cb1ab82710..26d9c1ab63 100644
--- a/testdata/baselines/reference/submodule/conformance/importAliasModuleExports.symbols
+++ b/testdata/baselines/reference/submodule/conformance/importAliasModuleExports.symbols
@@ -9,7 +9,7 @@ class Alias {
 }
 module.exports = Alias;
 >module.exports : Symbol(Alias, Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(Alias, Decl(mod1.js, 0, 0))
 >Alias : Symbol(Alias, Decl(mod1.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/importAliasModuleExports.symbols.diff b/testdata/baselines/reference/submodule/conformance/importAliasModuleExports.symbols.diff
index c3ddb5e4c4..19ee49eea3 100644
--- a/testdata/baselines/reference/submodule/conformance/importAliasModuleExports.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAliasModuleExports.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(mod1.js, 2, 1))
 ->exports : Symbol(export=, Decl(mod1.js, 2, 1))
 +>module.exports : Symbol(Alias, Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(Alias, Decl(mod1.js, 0, 0))
  >Alias : Symbol(Alias, Decl(mod1.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols
index bd1cc110ec..601eaea4f0 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols
@@ -22,13 +22,13 @@ class Foo extends Bar {}
 
 module.exports = Foo;
 >module.exports : Symbol(Foo, Decl(cls.js, 4, 2))
->module : Symbol(module.exports)
+>module : Symbol("cls", Decl(cls.js, 0, 0))
 >exports : Symbol(Foo, Decl(cls.js, 4, 2))
 >Foo : Symbol(Foo, Decl(cls.js, 4, 2))
 
 module.exports.Strings = Strings;
 >module.exports : Symbol(Foo, Decl(cls.js, 4, 2))
->module : Symbol(module.exports)
+>module : Symbol("cls", Decl(cls.js, 0, 0))
 >exports : Symbol(Foo, Decl(cls.js, 4, 2))
 >Strings : Symbol(Strings, Decl(cls.js, 1, 5))
 
@@ -38,7 +38,7 @@ class Bar {}
 
 module.exports = Bar;
 >module.exports : Symbol(Bar, Decl(bar.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bar", Decl(bar.js, 0, 0))
 >exports : Symbol(Bar, Decl(bar.js, 0, 0))
 >Bar : Symbol(Bar, Decl(bar.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols.diff
index 92f53b9b9c..f18766bd4f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassExtendsVisibility.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(cls.js, 5, 24))
 ->exports : Symbol(export=, Decl(cls.js, 5, 24))
 +>module.exports : Symbol(Foo, Decl(cls.js, 4, 2))
-+>module : Symbol(module.exports)
++>module : Symbol("cls", Decl(cls.js, 0, 0))
 +>exports : Symbol(Foo, Decl(cls.js, 4, 2))
  >Foo : Symbol(Foo, Decl(cls.js, 4, 2))
 
@@ -19,7 +19,7 @@
 ->exports : Symbol(module.exports, Decl(cls.js, 0, 0))
 ->Strings : Symbol(Strings, Decl(cls.js, 6, 21))
 +>module.exports : Symbol(Foo, Decl(cls.js, 4, 2))
-+>module : Symbol(module.exports)
++>module : Symbol("cls", Decl(cls.js, 0, 0))
 +>exports : Symbol(Foo, Decl(cls.js, 4, 2))
  >Strings : Symbol(Strings, Decl(cls.js, 1, 5))
 
@@ -32,6 +32,6 @@
 ->module : Symbol(export=, Decl(bar.js, 0, 12))
 ->exports : Symbol(export=, Decl(bar.js, 0, 12))
 +>module.exports : Symbol(Bar, Decl(bar.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("bar", Decl(bar.js, 0, 0))
 +>exports : Symbol(Bar, Decl(bar.js, 0, 0))
  >Bar : Symbol(Bar, Decl(bar.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.symbols
index 65f7ccf234..f276ec9977 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.symbols
@@ -31,13 +31,13 @@ const Strings = {
 
 module.exports = Handler;
 >module.exports : Symbol(Handler, Decl(source.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("source", Decl(source.js, 0, 0))
 >exports : Symbol(Handler, Decl(source.js, 0, 0))
 >Handler : Symbol(Handler, Decl(source.js, 0, 0))
 
 module.exports.Strings = Strings
 >module.exports : Symbol(Handler, Decl(source.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("source", Decl(source.js, 0, 0))
 >exports : Symbol(Handler, Decl(source.js, 0, 0))
 >Strings : Symbol(Strings, Decl(source.js, 9, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.symbols.diff
index 5acb6eecd1..83a99f81bf 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.symbols.diff
@@ -27,7 +27,7 @@
 ->exports : Symbol(export=, Decl(source.js, 12, 1))
 ->Handler : Symbol(Handler, Decl(source.js, 0, 0), Decl(source.js, 7, 1))
 +>module.exports : Symbol(Handler, Decl(source.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("source", Decl(source.js, 0, 0))
 +>exports : Symbol(Handler, Decl(source.js, 0, 0))
 +>Handler : Symbol(Handler, Decl(source.js, 0, 0))
 
@@ -38,7 +38,7 @@
 ->exports : Symbol(module.exports, Decl(source.js, 0, 0))
 ->Strings : Symbol(Strings, Decl(source.js, 14, 25))
 +>module.exports : Symbol(Handler, Decl(source.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("source", Decl(source.js, 0, 0))
 +>exports : Symbol(Handler, Decl(source.js, 0, 0))
  >Strings : Symbol(Strings, Decl(source.js, 9, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsCommonjsRelativePath.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsCommonjsRelativePath.symbols
index c23777b7c5..c8982bdc3d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsCommonjsRelativePath.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsCommonjsRelativePath.symbols
@@ -10,7 +10,7 @@ const Thing = require('./thing').Thing
 
 module.exports = { Thing }
 >module.exports : Symbol(export=, Decl(reexport.js, 1, 38))
->module : Symbol(module.exports)
+>module : Symbol("reexport", Decl(reexport.js, 0, 0))
 >exports : Symbol(export=, Decl(reexport.js, 1, 38))
 >Thing : Symbol(Thing, Decl(reexport.js, 2, 18))
 
@@ -21,7 +21,7 @@ class Thing {}
 
 module.exports = { Thing }
 >module.exports : Symbol(export=, Decl(thing.js, 1, 14))
->module : Symbol(module.exports)
+>module : Symbol("thing", Decl(thing.js, 0, 0))
 >exports : Symbol(export=, Decl(thing.js, 1, 14))
 >Thing : Symbol(Thing, Decl(thing.js, 2, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsCommonjsRelativePath.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsCommonjsRelativePath.symbols.diff
index af6fef4536..e8ab726efa 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsCommonjsRelativePath.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsCommonjsRelativePath.symbols.diff
@@ -12,7 +12,7 @@
 ->module : Symbol(module, Decl(reexport.js, 1, 38))
 ->exports : Symbol(module.exports, Decl(reexport.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(reexport.js, 1, 38))
-+>module : Symbol(module.exports)
++>module : Symbol("reexport", Decl(reexport.js, 0, 0))
 +>exports : Symbol(export=, Decl(reexport.js, 1, 38))
  >Thing : Symbol(Thing, Decl(reexport.js, 2, 18))
 
@@ -25,6 +25,6 @@
 ->module : Symbol(module, Decl(thing.js, 1, 14))
 ->exports : Symbol(module.exports, Decl(thing.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(thing.js, 1, 14))
-+>module : Symbol(module.exports)
++>module : Symbol("thing", Decl(thing.js, 0, 0))
 +>exports : Symbol(export=, Decl(thing.js, 1, 14))
  >Thing : Symbol(Thing, Decl(thing.js, 2, 18))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsComputedNames.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsComputedNames.symbols
index a2057ad45b..dd6fbdb970 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsComputedNames.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsComputedNames.symbols
@@ -11,7 +11,7 @@ const InnerSym = Symbol();
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(index.js, 1, 26))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 1, 26))
 
     [TopLevelSym](x = 12) {
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsComputedNames.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsComputedNames.symbols.diff
index 6c39381079..4d90395682 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsComputedNames.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsComputedNames.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 1, 26))
 +>module.exports : Symbol(export=, Decl(index.js, 1, 26))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 1, 26))
 
      [TopLevelSym](x = 12) {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsCrossfileMerge.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsCrossfileMerge.symbols
index 928bcb992e..3964f7167d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsCrossfileMerge.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsCrossfileMerge.symbols
@@ -8,7 +8,7 @@ const m = require("./exporter");
 
 module.exports = m.default;
 >module.exports : Symbol(m.default, Decl(exporter.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(m.default, Decl(exporter.js, 0, 0))
 >m.default : Symbol(m.default, Decl(exporter.js, 0, 22))
 >m : Symbol(m, Decl(index.js, 0, 5))
@@ -16,7 +16,7 @@ module.exports = m.default;
 
 module.exports.memberName = "thing";
 >module.exports : Symbol(m.default, Decl(exporter.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(m.default, Decl(exporter.js, 0, 0))
 
 === exporter.js ===
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsCrossfileMerge.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsCrossfileMerge.symbols.diff
index c0ef67eb01..ce86d34b77 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsCrossfileMerge.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsCrossfileMerge.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 0, 32))
 ->exports : Symbol(export=, Decl(index.js, 0, 32))
 +>module.exports : Symbol(m.default, Decl(exporter.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(m.default, Decl(exporter.js, 0, 0))
  >m.default : Symbol(m.default, Decl(exporter.js, 0, 22))
  >m : Symbol(m, Decl(index.js, 0, 5))
@@ -21,7 +21,7 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->memberName : Symbol(memberName, Decl(index.js, 2, 27))
 +>module.exports : Symbol(m.default, Decl(exporter.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(m.default, Decl(exporter.js, 0, 0))
 
  === exporter.js ===
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.symbols
index de1c0f5ef2..ad6789dc5d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.symbols
@@ -22,7 +22,7 @@ function b() {
 
 module.exports = {x, b}
 >module.exports : Symbol(export=, Decl(index1.js, 12, 1))
->module : Symbol(module.exports)
+>module : Symbol("index1", Decl(index1.js, 0, 0))
 >exports : Symbol(export=, Decl(index1.js, 12, 1))
 >x : Symbol(x, Decl(index1.js, 14, 18))
 >b : Symbol(b, Decl(index1.js, 14, 20))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.symbols.diff
index c5aa75f9cb..7eb2964787 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDocCommentsOnConsts.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(index1.js, 12, 1))
 ->exports : Symbol(module.exports, Decl(index1.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(index1.js, 12, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("index1", Decl(index1.js, 0, 0))
 +>exports : Symbol(export=, Decl(index1.js, 12, 1))
  >x : Symbol(x, Decl(index1.js, 14, 18))
  >b : Symbol(b, Decl(index1.js, 14, 20))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpression.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpression.symbols
index b38614ad83..e5db0f7c5e 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpression.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpression.symbols
@@ -3,7 +3,7 @@
 === index.js ===
 module.exports = class Thing {
 >module.exports : Symbol(Thing, Decl(index.js, 0, 16))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(Thing, Decl(index.js, 0, 16))
 >Thing : Symbol(Thing, Decl(index.js, 0, 16))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpression.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpression.symbols.diff
index f5c3a6e751..d145f5140e 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpression.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpression.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 0, 0))
 ->exports : Symbol(export=, Decl(index.js, 0, 0))
 +>module.exports : Symbol(Thing, Decl(index.js, 0, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(Thing, Decl(index.js, 0, 16))
  >Thing : Symbol(Thing, Decl(index.js, 0, 16))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols
index 2291fd599b..a458d96153 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols
@@ -3,7 +3,7 @@
 === index.js ===
 module.exports = class {
 >module.exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
 
     /**
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols.diff
index f36c42b522..fb02cc8c49 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymous.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 0, 0))
 ->exports : Symbol(export=, Decl(index.js, 0, 0))
 +>module.exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
 
      /**
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols
index c3b3253c5c..6bc6beee96 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols
@@ -3,7 +3,7 @@
 === index.js ===
 module.exports = class {
 >module.exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
 
     /**
@@ -21,7 +21,7 @@ module.exports = class {
 }
 module.exports.Sub = class {
 >module.exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
 
     constructor() {
@@ -30,7 +30,7 @@ module.exports.Sub = class {
 >this : Symbol(Sub, Decl(index.js, 8, 20))
 >instance : Symbol(Sub.instance, Decl(index.js, 9, 19))
 >module.exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
     }
 }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols.diff
index 0d3f1ea9a6..1509abd495 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 0, 0))
 ->exports : Symbol(export=, Decl(index.js, 0, 0))
 +>module.exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
 
      /**
@@ -23,7 +23,7 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->Sub : Symbol(Sub, Decl(index.js, 7, 1))
 +>module.exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
 
      constructor() {
@@ -35,7 +35,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0), Decl(index.js, 10, 27))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol((Anonymous class), Decl(index.js, 0, 16))
      }
  }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionShadowing.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionShadowing.symbols
index e34c8b0e89..568d395845 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionShadowing.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionShadowing.symbols
@@ -16,7 +16,7 @@ class Q {
 }
 module.exports = class Q {
 >module.exports : Symbol(Q, Decl(index.js, 6, 16))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(Q, Decl(index.js, 6, 16))
 >Q : Symbol(Q, Decl(index.js, 6, 16))
 
@@ -30,7 +30,7 @@ module.exports = class Q {
 }
 module.exports.Another = Q;
 >module.exports : Symbol(Q, Decl(index.js, 6, 16))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(Q, Decl(index.js, 6, 16))
 >Q : Symbol(Q, Decl(index.js, 2, 1))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionShadowing.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionShadowing.symbols.diff
index ead22a05aa..282bfe261c 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionShadowing.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassExpressionShadowing.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 5, 1))
 ->exports : Symbol(export=, Decl(index.js, 5, 1))
 +>module.exports : Symbol(Q, Decl(index.js, 6, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(Q, Decl(index.js, 6, 16))
  >Q : Symbol(Q, Decl(index.js, 6, 16))
 
@@ -23,6 +23,6 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->Another : Symbol(Another, Decl(index.js, 10, 1))
 +>module.exports : Symbol(Q, Decl(index.js, 6, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(Q, Decl(index.js, 6, 16))
  >Q : Symbol(Q, Decl(index.js, 2, 1))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance1.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance1.symbols
index b70cc9e426..970b96532b 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance1.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance1.symbols
@@ -6,7 +6,7 @@ class Foo {}
 
 module.exports = new Foo();
 >module.exports : Symbol(export=, Decl(index.js, 0, 12))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 12))
 >Foo : Symbol(Foo, Decl(index.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance1.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance1.symbols.diff
index 965edbb81b..ceca31cc75 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance1.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance1.symbols.diff
@@ -7,6 +7,6 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 0, 12))
 +>module.exports : Symbol(export=, Decl(index.js, 0, 12))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 0, 12))
  >Foo : Symbol(Foo, Decl(index.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance2.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance2.symbols
index 8ab8c222ef..ba72a3587f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance2.symbols
@@ -13,7 +13,7 @@ class Foo {
 
 module.exports = new Foo();
 >module.exports : Symbol(export=, Decl(index.js, 3, 1))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 3, 1))
 >Foo : Symbol(Foo, Decl(index.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance2.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance2.symbols.diff
index f943bfb234..22c4538f80 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance2.symbols.diff
@@ -7,6 +7,6 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 3, 1))
 +>module.exports : Symbol(export=, Decl(index.js, 3, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 3, 1))
  >Foo : Symbol(Foo, Decl(index.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance3.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance3.symbols
index 375993ea64..4f50fdd162 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance3.symbols
@@ -13,12 +13,12 @@ class Foo {
 
 module.exports = new Foo();
 >module.exports : Symbol(export=, Decl(index.js, 3, 1))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 3, 1))
 >Foo : Symbol(Foo, Decl(index.js, 0, 0))
 
 module.exports.additional = 20;
 >module.exports : Symbol(export=, Decl(index.js, 3, 1))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 3, 1))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance3.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance3.symbols.diff
index 7775a0ad23..4cff291693 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedClassInstance3.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 3, 1))
 +>module.exports : Symbol(export=, Decl(index.js, 3, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 3, 1))
  >Foo : Symbol(Foo, Decl(index.js, 0, 0))
 
@@ -18,5 +18,5 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->additional : Symbol(additional, Decl(index.js, 5, 27))
 +>module.exports : Symbol(export=, Decl(index.js, 3, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(export=, Decl(index.js, 3, 1))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols
index da1bfef234..1b7a319675 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols
@@ -5,7 +5,7 @@
 module.exports.MyClass = function() {
 >module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >module.exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 
@@ -15,7 +15,7 @@ module.exports.MyClass.prototype = {
 >module.exports.MyClass.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
 >module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >module.exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols.diff
index 186e299fad..6a4f9baba4 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunction.symbols.diff
@@ -11,7 +11,7 @@
 ->MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunction.js, 4, 15))
 +>module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>module.exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 
@@ -31,7 +31,7 @@
 +>module.exports.MyClass.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
 +>module.exports.MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>module.exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>exports : Symbol("jsDeclarationsExportAssignedConstructorFunction", Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>MyClass : Symbol(MyClass, Decl(jsDeclarationsExportAssignedConstructorFunction.js, 0, 0))
 +>prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols
index 472779ff9e..484d33715e 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols
@@ -6,7 +6,7 @@
  */
 module.exports = function (p) {
 >module.exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >p : Symbol(p, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 3, 27))
 
@@ -15,16 +15,16 @@ module.exports = function (p) {
 }
 module.exports.Sub = function() {
 >module.exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 
     this.instance = new module.exports(10);
 >module.exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 }
 module.exports.Sub.prototype = { }
 >module.exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 >exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols.diff
index c239422c61..2d27d981a5 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedConstructorFunctionWithSub.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 ->module : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
  >exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
  >p : Symbol(p, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 3, 27))
 
@@ -24,7 +24,7 @@
 ->exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 ->Sub : Symbol(Sub, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 5, 1), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 9, 15))
 +>module.exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 +>exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 
      this.instance = new module.exports(10);
@@ -35,7 +35,7 @@
 ->module : Symbol(module, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 7, 23))
 ->exports : Symbol(module.exports, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 +>exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
  }
  module.exports.Sub.prototype = { }
@@ -47,5 +47,5 @@
 ->Sub : Symbol(Sub, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 5, 1), Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 9, 15))
 ->prototype : Symbol(Sub.prototype, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 8, 1))
 +>module.exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("jsDeclarationsExportAssignedConstructorFunctionWithSub", Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
 +>exports : Symbol(export=, Decl(jsDeclarationsExportAssignedConstructorFunctionWithSub.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols
index 4d591c1910..6bc191fabf 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols
@@ -20,14 +20,14 @@ class Container {
 
 module.exports = Container;
 >module.exports : Symbol(Container, Decl(index.js, 0, 29))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(Container, Decl(index.js, 0, 29))
 >Container : Symbol(Container, Decl(index.js, 0, 29))
 
 === obj.js ===
 module.exports = class Obj {
 >module.exports : Symbol(Obj, Decl(obj.js, 0, 16))
->module : Symbol(module.exports)
+>module : Symbol("obj", Decl(obj.js, 0, 0))
 >exports : Symbol(Obj, Decl(obj.js, 0, 16))
 >Obj : Symbol(Obj, Decl(obj.js, 0, 16))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols.diff
index b3fc6d29e6..c7f0077dcc 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignedVisibility.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 6, 1))
 ->exports : Symbol(export=, Decl(index.js, 6, 1))
 +>module.exports : Symbol(Container, Decl(index.js, 0, 29))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(Container, Decl(index.js, 0, 29))
  >Container : Symbol(Container, Decl(index.js, 0, 29))
 
@@ -18,7 +18,7 @@
 ->module : Symbol(export=, Decl(obj.js, 0, 0))
 ->exports : Symbol(export=, Decl(obj.js, 0, 0))
 +>module.exports : Symbol(Obj, Decl(obj.js, 0, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("obj", Decl(obj.js, 0, 0))
 +>exports : Symbol(Obj, Decl(obj.js, 0, 16))
  >Obj : Symbol(Obj, Decl(obj.js, 0, 16))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols
index b2e68c2f07..703c68aff7 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols
@@ -13,7 +13,7 @@ const Strings = {
 };
 module.exports = {
 >module.exports : Symbol(export=, Decl(index.js, 3, 2))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 3, 2))
 
     thing: "ok",
@@ -31,7 +31,7 @@ module.exports = {
 };
 module.exports.Strings = Strings;
 >module.exports : Symbol(export=, Decl(index.js, 3, 2))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 3, 2))
 >Strings : Symbol(Strings, Decl(index.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols.diff
index d625cf320c..05d3888a6f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentExpressionPlusSecondary.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 3, 2))
 +>module.exports : Symbol(export=, Decl(index.js, 3, 2))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 3, 2))
 
      thing: "ok",
@@ -21,6 +21,6 @@
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->Strings : Symbol(Strings, Decl(index.js, 10, 2))
 +>module.exports : Symbol(export=, Decl(index.js, 3, 2))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(export=, Decl(index.js, 3, 2))
  >Strings : Symbol(Strings, Decl(index.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.symbols
index cf7d4d171d..c8dc74d22c 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.symbols
@@ -6,7 +6,7 @@ var x = 12;
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(index.js, 0, 11))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 0, 11))
 
     extends: 'base',
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.symbols.diff
index 752437031e..64fcf8f4d4 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportAssignmentWithKeywordName.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 0, 11))
 +>module.exports : Symbol(export=, Decl(index.js, 0, 11))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 0, 11))
 
      extends: 'base',
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols
index d03e2da5ce..30838f726a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols
@@ -7,7 +7,7 @@ function foo() {
 
     module.exports = exports = function (o) {
 >module.exports : Symbol(export=, Decl(index.js, 1, 16))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 1, 16))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >o : Symbol(o, Decl(index.js, 2, 41))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols.diff
index 10a3348251..914bb480a5 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportDoubleAssignmentInClosure.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(index.js, 0, 0))
 ->module : Symbol(export=, Decl(index.js, 1, 16))
 +>module.exports : Symbol(export=, Decl(index.js, 1, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
  >exports : Symbol(export=, Decl(index.js, 1, 16))
  >exports : Symbol("index", Decl(index.js, 0, 0))
  >o : Symbol(o, Decl(index.js, 2, 41))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols
index d5eac93130..3a10825e99 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols
@@ -54,7 +54,7 @@ const ns = require("./cls");
 
 module.exports = { ns };
 >module.exports : Symbol(export=, Decl(cjs.js, 0, 28))
->module : Symbol(module.exports)
+>module : Symbol("cjs", Decl(cjs.js, 0, 0))
 >exports : Symbol(export=, Decl(cjs.js, 0, 28))
 >ns : Symbol(ns, Decl(cjs.js, 1, 18))
 
@@ -66,7 +66,7 @@ const ns = require("./cls");
 
 module.exports = ns;
 >module.exports : Symbol(ns, Decl(cls.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("cjs2", Decl(cjs2.js, 0, 0))
 >exports : Symbol(ns, Decl(cls.js, 0, 0))
 >ns : Symbol(ns, Decl(cjs2.js, 0, 5))
 
@@ -79,7 +79,7 @@ const ns = require("./cls");
 module.exports.ns = ns;
 >module.exports.ns : Symbol(ns, Decl(cjs3.js, 0, 28))
 >module.exports : Symbol("cjs3", Decl(cjs3.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("cjs3", Decl(cjs3.js, 0, 0))
 >exports : Symbol("cjs3", Decl(cjs3.js, 0, 0))
 >ns : Symbol(ns, Decl(cjs3.js, 0, 28))
 >ns : Symbol(ns, Decl(cjs3.js, 0, 5))
@@ -93,7 +93,7 @@ const ns = require("./cls");
 module.exports.names = ns;
 >module.exports.names : Symbol(names, Decl(cjs4.js, 0, 28))
 >module.exports : Symbol("cjs4", Decl(cjs4.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("cjs4", Decl(cjs4.js, 0, 0))
 >exports : Symbol("cjs4", Decl(cjs4.js, 0, 0))
 >names : Symbol(names, Decl(cjs4.js, 0, 28))
 >ns : Symbol(ns, Decl(cjs4.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols.diff
index 164e13b025..66f71e7a1a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(cjs.js, 0, 28))
 ->exports : Symbol(module.exports, Decl(cjs.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(cjs.js, 0, 28))
-+>module : Symbol(module.exports)
++>module : Symbol("cjs", Decl(cjs.js, 0, 0))
 +>exports : Symbol(export=, Decl(cjs.js, 0, 28))
  >ns : Symbol(ns, Decl(cjs.js, 1, 18))
 
@@ -21,7 +21,7 @@
 ->module : Symbol(export=, Decl(cjs2.js, 0, 28))
 ->exports : Symbol(export=, Decl(cjs2.js, 0, 28))
 +>module.exports : Symbol(ns, Decl(cls.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("cjs2", Decl(cjs2.js, 0, 0))
 +>exports : Symbol(ns, Decl(cls.js, 0, 0))
  >ns : Symbol(ns, Decl(cjs2.js, 0, 5))
 
@@ -34,7 +34,7 @@
 ->module : Symbol(module, Decl(cjs3.js, 0, 28))
 ->exports : Symbol(module.exports, Decl(cjs3.js, 0, 0))
 +>module.exports : Symbol("cjs3", Decl(cjs3.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("cjs3", Decl(cjs3.js, 0, 0))
 +>exports : Symbol("cjs3", Decl(cjs3.js, 0, 0))
  >ns : Symbol(ns, Decl(cjs3.js, 0, 28))
  >ns : Symbol(ns, Decl(cjs3.js, 0, 5))
@@ -47,7 +47,7 @@
 ->module : Symbol(module, Decl(cjs4.js, 0, 28))
 ->exports : Symbol(module.exports, Decl(cjs4.js, 0, 0))
 +>module.exports : Symbol("cjs4", Decl(cjs4.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("cjs4", Decl(cjs4.js, 0, 0))
 +>exports : Symbol("cjs4", Decl(cjs4.js, 0, 0))
  >names : Symbol(names, Decl(cjs4.js, 0, 28))
  >ns : Symbol(ns, Decl(cjs4.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.symbols
index 7e60646d8b..408c587bc1 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.symbols
@@ -17,7 +17,7 @@ import * as ns from "./cls";
 
 module.exports = ns; // We refuse to bind cjs module exports assignments in the same file we find an import in
 >module.exports : Symbol(ns, Decl(cls.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bin", Decl(bin.js, 0, 0))
 >exports : Symbol(ns, Decl(cls.js, 0, 0))
 >ns : Symbol(ns, Decl(bin.js, 0, 6))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.symbols.diff
index 581f4189bc..8b6ac12a75 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.symbols.diff
@@ -5,7 +5,7 @@
 
  module.exports = ns; // We refuse to bind cjs module exports assignments in the same file we find an import in
 +>module.exports : Symbol(ns, Decl(cls.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("bin", Decl(bin.js, 0, 0))
 +>exports : Symbol(ns, Decl(cls.js, 0, 0))
  >ns : Symbol(ns, Decl(bin.js, 0, 6))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSubAssignments.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSubAssignments.symbols
index b68cc7cae5..bdeba80b7f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSubAssignments.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSubAssignments.symbols
@@ -16,13 +16,13 @@ class Foo {}
 
 module.exports = Foo;
 >module.exports : Symbol(Foo, Decl(cls.js, 3, 2))
->module : Symbol(module.exports)
+>module : Symbol("cls", Decl(cls.js, 0, 0))
 >exports : Symbol(Foo, Decl(cls.js, 3, 2))
 >Foo : Symbol(Foo, Decl(cls.js, 3, 2))
 
 module.exports.Strings = Strings;
 >module.exports : Symbol(Foo, Decl(cls.js, 3, 2))
->module : Symbol(module.exports)
+>module : Symbol("cls", Decl(cls.js, 0, 0))
 >exports : Symbol(Foo, Decl(cls.js, 3, 2))
 >Strings : Symbol(Strings, Decl(cls.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSubAssignments.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSubAssignments.symbols.diff
index fbda01c9ed..334c7a553d 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSubAssignments.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportSubAssignments.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(cls.js, 4, 12))
 ->exports : Symbol(export=, Decl(cls.js, 4, 12))
 +>module.exports : Symbol(Foo, Decl(cls.js, 3, 2))
-+>module : Symbol(module.exports)
++>module : Symbol("cls", Decl(cls.js, 0, 0))
 +>exports : Symbol(Foo, Decl(cls.js, 3, 2))
  >Foo : Symbol(Foo, Decl(cls.js, 3, 2))
 
@@ -19,6 +19,6 @@
 ->exports : Symbol(module.exports, Decl(cls.js, 0, 0))
 ->Strings : Symbol(Strings, Decl(cls.js, 5, 21))
 +>module.exports : Symbol(Foo, Decl(cls.js, 3, 2))
-+>module : Symbol(module.exports)
++>module : Symbol("cls", Decl(cls.js, 0, 0))
 +>exports : Symbol(Foo, Decl(cls.js, 3, 2))
  >Strings : Symbol(Strings, Decl(cls.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols
index 6a59046478..79d3b629aa 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols
@@ -9,7 +9,7 @@ const errors = require("./errors");
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(index.js, 1, 35))
->module : Symbol(module.exports)
+>module : Symbol("utils/index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 1, 35))
 
     errors
@@ -32,7 +32,7 @@ class FancyError extends Error {
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(errors.js, 4, 1))
->module : Symbol(module.exports)
+>module : Symbol("utils/errors", Decl(errors.js, 0, 0))
 >exports : Symbol(export=, Decl(errors.js, 4, 1))
 
     FancyError
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols.diff
index 84b38aaf06..c2d51101c1 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportedClassAliases.symbols.diff
@@ -12,7 +12,7 @@
 ->module : Symbol(module, Decl(index.js, 1, 35))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(index.js, 1, 35))
-+>module : Symbol(module.exports)
++>module : Symbol("utils/index", Decl(index.js, 0, 0))
 +>exports : Symbol(export=, Decl(index.js, 1, 35))
 
      errors
@@ -25,7 +25,7 @@
 ->module : Symbol(module, Decl(errors.js, 4, 1))
 ->exports : Symbol(module.exports, Decl(errors.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(errors.js, 4, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("utils/errors", Decl(errors.js, 0, 0))
 +>exports : Symbol(export=, Decl(errors.js, 4, 1))
 
      FancyError
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionClassesCjsExportAssignment.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionClassesCjsExportAssignment.symbols
index d4b1fa71a0..e138768697 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionClassesCjsExportAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionClassesCjsExportAssignment.symbols
@@ -13,7 +13,7 @@ function Timer(timeout) {
 }
 module.exports = Timer;
 >module.exports : Symbol(Timer, Decl(timer.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("timer", Decl(timer.js, 0, 0))
 >exports : Symbol(Timer, Decl(timer.js, 0, 0))
 >Timer : Symbol(Timer, Decl(timer.js, 0, 0))
 
@@ -33,7 +33,7 @@ function Hook(handle) {
 }
 module.exports = Hook;
 >module.exports : Symbol(Hook, Decl(hook.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("hook", Decl(hook.js, 0, 0))
 >exports : Symbol(Hook, Decl(hook.js, 0, 0))
 >Hook : Symbol(Hook, Decl(hook.js, 0, 0))
 
@@ -104,7 +104,7 @@ Context.prototype = {
 }
 module.exports = Context;
 >module.exports : Symbol(Context, Decl(context.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("context", Decl(context.js, 0, 0))
 >exports : Symbol(Context, Decl(context.js, 0, 0))
 >Context : Symbol(Context, Decl(context.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionClassesCjsExportAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionClassesCjsExportAssignment.symbols.diff
index ea488bc1a9..9866e56b07 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionClassesCjsExportAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionClassesCjsExportAssignment.symbols.diff
@@ -14,7 +14,7 @@
 ->module : Symbol(export=, Decl(timer.js, 5, 1))
 ->exports : Symbol(export=, Decl(timer.js, 5, 1))
 +>module.exports : Symbol(Timer, Decl(timer.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("timer", Decl(timer.js, 0, 0))
 +>exports : Symbol(Timer, Decl(timer.js, 0, 0))
  >Timer : Symbol(Timer, Decl(timer.js, 0, 0))
 
@@ -33,7 +33,7 @@
 ->module : Symbol(export=, Decl(hook.js, 8, 1))
 ->exports : Symbol(export=, Decl(hook.js, 8, 1))
 +>module.exports : Symbol(Hook, Decl(hook.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("hook", Decl(hook.js, 0, 0))
 +>exports : Symbol(Hook, Decl(hook.js, 0, 0))
  >Hook : Symbol(Hook, Decl(hook.js, 0, 0))
 
@@ -79,6 +79,6 @@
 ->exports : Symbol(export=, Decl(context.js, 46, 1))
 ->Context : Symbol(Context, Decl(context.js, 0, 0), Decl(context.js, 36, 1))
 +>module.exports : Symbol(Context, Decl(context.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("context", Decl(context.js, 0, 0))
 +>exports : Symbol(Context, Decl(context.js, 0, 0))
 +>Context : Symbol(Context, Decl(context.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.symbols
index a83e341126..bc63fed828 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.symbols
@@ -3,7 +3,7 @@
 === source.js ===
 module.exports = MyClass;
 >module.exports : Symbol(MyClass, Decl(source.js, 0, 25))
->module : Symbol(module.exports)
+>module : Symbol("source", Decl(source.js, 0, 0))
 >exports : Symbol(MyClass, Decl(source.js, 0, 25))
 >MyClass : Symbol(MyClass, Decl(source.js, 0, 25))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.symbols.diff
index 08d2c533b5..2a5caecbb2 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.symbols.diff
@@ -9,7 +9,7 @@
 ->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))
 +>module.exports : Symbol(MyClass, Decl(source.js, 0, 25))
-+>module : Symbol(module.exports)
++>module : Symbol("source", Decl(source.js, 0, 0))
 +>exports : Symbol(MyClass, Decl(source.js, 0, 25))
 +>MyClass : Symbol(MyClass, Decl(source.js, 0, 25))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionWithDefaultAssignedMember.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionWithDefaultAssignedMember.symbols
index ca4a39d0b6..dafbaf2524 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionWithDefaultAssignedMember.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionWithDefaultAssignedMember.symbols
@@ -18,7 +18,7 @@ foo.default = foo;
 
 module.exports = foo;
 >module.exports : Symbol(foo, Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(foo, Decl(index.js, 0, 0))
 >foo : Symbol(foo, Decl(index.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionWithDefaultAssignedMember.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionWithDefaultAssignedMember.symbols.diff
index 4a464ae19a..ad6d5d1e0c 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionWithDefaultAssignedMember.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionWithDefaultAssignedMember.symbols.diff
@@ -29,6 +29,6 @@
 ->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))
 +>module.exports : Symbol(foo, Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(foo, Decl(index.js, 0, 0))
 +>foo : Symbol(foo, Decl(index.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols
index d198a27aee..745896e058 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols
@@ -4,7 +4,7 @@
 module.exports.a = function a() {}
 >module.exports.a : Symbol(a, Decl(index.js, 0, 0))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >a : Symbol(a, Decl(index.js, 0, 0))
 >a : Symbol(a, Decl(index.js, 0, 18))
@@ -12,7 +12,7 @@ module.exports.a = function a() {}
 module.exports.b = function b() {}
 >module.exports.b : Symbol(b, Decl(index.js, 0, 34))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >b : Symbol(b, Decl(index.js, 0, 34))
 >b : Symbol(b, Decl(index.js, 2, 18))
@@ -20,14 +20,14 @@ module.exports.b = function b() {}
 module.exports.b.cat = "cat";
 >module.exports.b : Symbol(b, Decl(index.js, 0, 34))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >b : Symbol(b, Decl(index.js, 0, 34))
 
 module.exports.c = function c() {}
 >module.exports.c : Symbol(c, Decl(index.js, 3, 29))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >c : Symbol(c, Decl(index.js, 3, 29))
 >c : Symbol(c, Decl(index.js, 5, 18))
@@ -35,7 +35,7 @@ module.exports.c = function c() {}
 module.exports.c.Cls = class {}
 >module.exports.c : Symbol(c, Decl(index.js, 3, 29))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >c : Symbol(c, Decl(index.js, 3, 29))
 
@@ -47,7 +47,7 @@ module.exports.c.Cls = class {}
 module.exports.d = function d(a, b) { return /** @type {*} */(null); }
 >module.exports.d : Symbol(d, Decl(index.js, 6, 31))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >d : Symbol(d, Decl(index.js, 6, 31))
 >d : Symbol(d, Decl(index.js, 13, 18))
@@ -63,7 +63,7 @@ module.exports.d = function d(a, b) { return /** @type {*} */(null); }
 module.exports.e = function e(a, b) { return /** @type {*} */(null); }
 >module.exports.e : Symbol(e, Decl(index.js, 13, 70))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >e : Symbol(e, Decl(index.js, 13, 70))
 >e : Symbol(e, Decl(index.js, 21, 18))
@@ -77,7 +77,7 @@ module.exports.e = function e(a, b) { return /** @type {*} */(null); }
 module.exports.f = function f(a) {
 >module.exports.f : Symbol(f, Decl(index.js, 21, 70))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70))
 >f : Symbol(f, Decl(index.js, 27, 18))
@@ -89,12 +89,12 @@ module.exports.f = function f(a) {
 module.exports.f.self = module.exports.f;
 >module.exports.f : Symbol(f, Decl(index.js, 21, 70))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70))
 >module.exports.f : Symbol(f, Decl(index.js, 21, 70))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >f : Symbol(f, Decl(index.js, 21, 70))
 
@@ -119,7 +119,7 @@ function g(a, b) {
 module.exports.g = g;
 >module.exports.g : Symbol(g, Decl(index.js, 38, 1))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >g : Symbol(g, Decl(index.js, 38, 1))
 >g : Symbol(g, Decl(index.js, 30, 41))
@@ -145,7 +145,7 @@ function hh(a, b) {
 module.exports.h = hh;
 >module.exports.h : Symbol(h, Decl(index.js, 48, 1))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >h : Symbol(h, Decl(index.js, 48, 1))
 >hh : Symbol(hh, Decl(index.js, 40, 21))
@@ -153,7 +153,7 @@ module.exports.h = hh;
 module.exports.i = function i() {}
 >module.exports.i : Symbol(i, Decl(index.js, 50, 22))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >i : Symbol(i, Decl(index.js, 50, 22))
 >i : Symbol(i, Decl(index.js, 52, 18))
@@ -161,12 +161,12 @@ module.exports.i = function i() {}
 module.exports.ii = module.exports.i;
 >module.exports.ii : Symbol(ii, Decl(index.js, 52, 34))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >ii : Symbol(ii, Decl(index.js, 52, 34))
 >module.exports.i : Symbol(i, Decl(index.js, 50, 22))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >i : Symbol(i, Decl(index.js, 50, 22))
 
@@ -174,19 +174,19 @@ module.exports.ii = module.exports.i;
 module.exports.jj = module.exports.j;
 >module.exports.jj : Symbol(jj, Decl(index.js, 53, 37))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >jj : Symbol(jj, Decl(index.js, 53, 37))
 >module.exports.j : Symbol(j, Decl(index.js, 56, 37))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >j : Symbol(j, Decl(index.js, 56, 37))
 
 module.exports.j = function j() {}
 >module.exports.j : Symbol(j, Decl(index.js, 56, 37))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >j : Symbol(j, Decl(index.js, 56, 37))
 >j : Symbol(j, Decl(index.js, 57, 18))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols.diff
index 004154e4b3..a3a8c570c5 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionsCjs.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >a : Symbol(a, Decl(index.js, 0, 0))
  >a : Symbol(a, Decl(index.js, 0, 18))
@@ -21,7 +21,7 @@
 ->b : Symbol(b, Decl(index.js, 0, 34), Decl(index.js, 3, 15))
 +>module.exports.b : Symbol(b, Decl(index.js, 0, 34))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>b : Symbol(b, Decl(index.js, 0, 34))
  >b : Symbol(b, Decl(index.js, 2, 18))
@@ -36,7 +36,7 @@
 ->cat : Symbol(b.cat, Decl(index.js, 2, 34))
 +>module.exports.b : Symbol(b, Decl(index.js, 0, 34))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>b : Symbol(b, Decl(index.js, 0, 34))
 
@@ -48,7 +48,7 @@
 ->c : Symbol(c, Decl(index.js, 3, 29), Decl(index.js, 6, 15))
 +>module.exports.c : Symbol(c, Decl(index.js, 3, 29))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>c : Symbol(c, Decl(index.js, 3, 29))
  >c : Symbol(c, Decl(index.js, 5, 18))
@@ -63,7 +63,7 @@
 ->Cls : Symbol(c.Cls, Decl(index.js, 5, 34))
 +>module.exports.c : Symbol(c, Decl(index.js, 3, 29))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>c : Symbol(c, Decl(index.js, 3, 29))
 
@@ -77,7 +77,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >d : Symbol(d, Decl(index.js, 6, 31))
  >d : Symbol(d, Decl(index.js, 13, 18))
@@ -90,7 +90,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >e : Symbol(e, Decl(index.js, 13, 70))
  >e : Symbol(e, Decl(index.js, 21, 18))
@@ -106,7 +106,7 @@
 ->f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 +>module.exports.f : Symbol(f, Decl(index.js, 21, 70))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>f : Symbol(f, Decl(index.js, 21, 70))
  >f : Symbol(f, Decl(index.js, 27, 18))
@@ -130,12 +130,12 @@
 ->f : Symbol(f, Decl(index.js, 21, 70), Decl(index.js, 30, 15))
 +>module.exports.f : Symbol(f, Decl(index.js, 21, 70))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>f : Symbol(f, Decl(index.js, 21, 70))
 +>module.exports.f : Symbol(f, Decl(index.js, 21, 70))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>f : Symbol(f, Decl(index.js, 21, 70))
 
@@ -149,7 +149,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >g : Symbol(g, Decl(index.js, 38, 1))
  >g : Symbol(g, Decl(index.js, 30, 41))
@@ -162,7 +162,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >h : Symbol(h, Decl(index.js, 48, 1))
  >hh : Symbol(hh, Decl(index.js, 40, 21))
@@ -173,7 +173,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >i : Symbol(i, Decl(index.js, 50, 22))
  >i : Symbol(i, Decl(index.js, 52, 18))
@@ -184,7 +184,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >ii : Symbol(ii, Decl(index.js, 52, 34))
  >module.exports.i : Symbol(i, Decl(index.js, 50, 22))
@@ -192,7 +192,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >i : Symbol(i, Decl(index.js, 50, 22))
 
@@ -203,7 +203,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >jj : Symbol(jj, Decl(index.js, 53, 37))
  >module.exports.j : Symbol(j, Decl(index.js, 56, 37))
@@ -211,7 +211,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >j : Symbol(j, Decl(index.js, 56, 37))
 
@@ -221,7 +221,7 @@
 ->module : Symbol(module, Decl(index.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
  >j : Symbol(j, Decl(index.js, 56, 37))
  >j : Symbol(j, Decl(index.js, 57, 18))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
index 3882b91669..3ef76c974e 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols
@@ -42,7 +42,7 @@ function testFn(input) {
 
 module.exports = {testFn, testFnTypes};
 >module.exports : Symbol(export=, Decl(file2.js, 25, 1))
->module : Symbol(module.exports)
+>module : Symbol("file2", Decl(file2.js, 0, 0))
 >exports : Symbol(export=, Decl(file2.js, 25, 1))
 >testFn : Symbol(testFn, Decl(file2.js, 27, 18))
 >testFnTypes : Symbol(testFnTypes, Decl(file2.js, 27, 25))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols.diff
index a6952ae113..e1914d5a7a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsImportAliasExposedWithinNamespaceCjs.symbols.diff
@@ -17,7 +17,7 @@
 ->module : Symbol(module, Decl(file2.js, 25, 1))
 ->exports : Symbol(module.exports, Decl(file2.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(file2.js, 25, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("file2", Decl(file2.js, 0, 0))
 +>exports : Symbol(export=, Decl(file2.js, 25, 1))
  >testFn : Symbol(testFn, Decl(file2.js, 27, 18))
  >testFnTypes : Symbol(testFnTypes, Decl(file2.js, 27, 25))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsJson.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsJson.symbols
index f61b44a266..e5c0967129 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsJson.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsJson.symbols
@@ -8,7 +8,7 @@ const j = require("./obj.json");
 
 module.exports = j;
 >module.exports : Symbol(j, Decl(obj.json, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(j, Decl(obj.json, 0, 0))
 >j : Symbol(j, Decl(index.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsJson.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsJson.symbols.diff
index 871b8e8fd6..b038d0394e 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsJson.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsJson.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 0, 32))
 ->exports : Symbol(export=, Decl(index.js, 0, 32))
 +>module.exports : Symbol(j, Decl(obj.json, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(j, Decl(obj.json, 0, 0))
  >j : Symbol(j, Decl(index.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsPackageJson.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsPackageJson.symbols
index 0feb495560..8352dff94b 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsPackageJson.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsPackageJson.symbols
@@ -8,7 +8,7 @@ const j = require("./package.json");
 
 module.exports = j;
 >module.exports : Symbol(j, Decl(package.json, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(j, Decl(package.json, 0, 0))
 >j : Symbol(j, Decl(index.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsPackageJson.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsPackageJson.symbols.diff
index 420f3354d0..85e0f208e0 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsPackageJson.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsPackageJson.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 0, 36))
 ->exports : Symbol(export=, Decl(index.js, 0, 36))
 +>module.exports : Symbol(j, Decl(package.json, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(j, Decl(package.json, 0, 0))
  >j : Symbol(j, Decl(index.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols
index 1dbddaa48e..7a2623ddb0 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols
@@ -23,7 +23,7 @@ BaseFactory.Base = Base;
 
 module.exports = BaseFactory;
 >module.exports : Symbol(BaseFactory, Decl(base.js, 4, 5))
->module : Symbol(module.exports)
+>module : Symbol("base", Decl(base.js, 0, 0))
 >exports : Symbol(BaseFactory, Decl(base.js, 4, 5))
 >BaseFactory : Symbol(BaseFactory, Decl(base.js, 4, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols.diff
index 2174131db3..f7df814f1f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit1.symbols.diff
@@ -24,7 +24,7 @@
 ->exports : Symbol(export=, Decl(base.js, 8, 24))
 ->BaseFactory : Symbol(BaseFactory, Decl(base.js, 4, 5), Decl(base.js, 6, 2))
 +>module.exports : Symbol(BaseFactory, Decl(base.js, 4, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("base", Decl(base.js, 0, 0))
 +>exports : Symbol(BaseFactory, Decl(base.js, 4, 5))
 +>BaseFactory : Symbol(BaseFactory, Decl(base.js, 4, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols
index 79831388df..c093e5f3f8 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols
@@ -23,7 +23,7 @@ BaseFactory.Base = Base;
 
 module.exports = BaseFactory;
 >module.exports : Symbol(BaseFactory, Decl(base.js, 4, 5))
->module : Symbol(module.exports)
+>module : Symbol("base", Decl(base.js, 0, 0))
 >exports : Symbol(BaseFactory, Decl(base.js, 4, 5))
 >BaseFactory : Symbol(BaseFactory, Decl(base.js, 4, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols.diff
index 305dbe6e3a..1bc0d9d5f2 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsParameterTagReusesInputNodeInEmit2.symbols.diff
@@ -24,7 +24,7 @@
 ->exports : Symbol(export=, Decl(base.js, 8, 24))
 ->BaseFactory : Symbol(BaseFactory, Decl(base.js, 4, 5), Decl(base.js, 6, 2))
 +>module.exports : Symbol(BaseFactory, Decl(base.js, 4, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("base", Decl(base.js, 0, 0))
 +>exports : Symbol(BaseFactory, Decl(base.js, 4, 5))
 +>BaseFactory : Symbol(BaseFactory, Decl(base.js, 4, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliasesEsModuleInterop.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliasesEsModuleInterop.symbols
index 87ad80b3c1..c4c03f4bfa 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliasesEsModuleInterop.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliasesEsModuleInterop.symbols
@@ -6,7 +6,7 @@ class Foo {}
 
 module.exports = Foo;
 >module.exports : Symbol(Foo, Decl(cls.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("cls", Decl(cls.js, 0, 0))
 >exports : Symbol(Foo, Decl(cls.js, 0, 0))
 >Foo : Symbol(Foo, Decl(cls.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliasesEsModuleInterop.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliasesEsModuleInterop.symbols.diff
index 99b02488ec..55c08336bb 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliasesEsModuleInterop.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliasesEsModuleInterop.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(cls.js, 0, 12))
 ->exports : Symbol(export=, Decl(cls.js, 0, 12))
 +>module.exports : Symbol(Foo, Decl(cls.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("cls", Decl(cls.js, 0, 0))
 +>exports : Symbol(Foo, Decl(cls.js, 0, 0))
  >Foo : Symbol(Foo, Decl(cls.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols
index 513254653c..92c2c8d8de 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols
@@ -10,7 +10,7 @@ const { SomeClass, SomeClass: Another } = require('./lib');
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(main.js, 0, 59))
->module : Symbol(module.exports)
+>module : Symbol("main", Decl(main.js, 0, 0))
 >exports : Symbol(export=, Decl(main.js, 0, 59))
 
     SomeClass,
@@ -44,7 +44,7 @@ class SomeClass {
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(lib.js, 11, 1))
->module : Symbol(module.exports)
+>module : Symbol("lib", Decl(lib.js, 0, 0))
 >exports : Symbol(export=, Decl(lib.js, 11, 1))
 
     bar,
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols.diff
index 36e6c88bd9..26bcc3f4c0 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportedCjsAlias.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(main.js, 0, 59))
 ->exports : Symbol(module.exports, Decl(main.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(main.js, 0, 59))
-+>module : Symbol(module.exports)
++>module : Symbol("main", Decl(main.js, 0, 0))
 +>exports : Symbol(export=, Decl(main.js, 0, 59))
 
      SomeClass,
@@ -21,7 +21,7 @@
 ->module : Symbol(module, Decl(lib.js, 11, 1))
 ->exports : Symbol(module.exports, Decl(lib.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(lib.js, 11, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("lib", Decl(lib.js, 0, 0))
 +>exports : Symbol(export=, Decl(lib.js, 11, 1))
 
      bar,
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
index 45beb47533..a1403a6d42 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols
@@ -37,7 +37,7 @@ class Rectangle {
 
 module.exports = { Rectangle };
 >module.exports : Symbol(export=, Decl(rectangle.js, 4, 1))
->module : Symbol(module.exports)
+>module : Symbol("rectangle", Decl(rectangle.js, 0, 0))
 >exports : Symbol(export=, Decl(rectangle.js, 4, 1))
 >Rectangle : Symbol(Rectangle, Decl(rectangle.js, 6, 18))
 
@@ -87,7 +87,7 @@ class Render {
 
 module.exports = { Render };
 >module.exports : Symbol(export=, Decl(index.js, 20, 1))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 20, 1))
 >Render : Symbol(Render, Decl(index.js, 22, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols.diff
index 37af48659b..684b287722 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReferenceToClassInstanceCrossFile.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(rectangle.js, 4, 1))
 ->exports : Symbol(module.exports, Decl(rectangle.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(rectangle.js, 4, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("rectangle", Decl(rectangle.js, 0, 0))
 +>exports : Symbol(export=, Decl(rectangle.js, 4, 1))
  >Rectangle : Symbol(Rectangle, Decl(rectangle.js, 6, 18))
 
@@ -21,6 +21,6 @@
 ->module : Symbol(module, Decl(index.js, 20, 1))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(index.js, 20, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(export=, Decl(index.js, 20, 1))
  >Render : Symbol(Render, Decl(index.js, 22, 18))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.symbols
index 5e371564ae..21a03729fe 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.symbols
@@ -53,7 +53,7 @@ class ExportedThing {
 }
 module.exports = {
 >module.exports : Symbol(export=, Decl(mixed.js, 12, 1))
->module : Symbol(module.exports)
+>module : Symbol("mixed", Decl(mixed.js, 0, 0))
 >exports : Symbol(export=, Decl(mixed.js, 12, 1))
 
     doTheThing,
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.symbols.diff
index 4af0959aa8..761fe3a629 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeAliases.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(mixed.js, 12, 1))
 ->exports : Symbol(module.exports, Decl(mixed.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(mixed.js, 12, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("mixed", Decl(mixed.js, 0, 0))
 +>exports : Symbol(export=, Decl(mixed.js, 12, 1))
 
      doTheThing,
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration.symbols
index e15b5745fe..4526a827fc 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration.symbols
@@ -21,7 +21,7 @@ const items = [];
 
 module.exports = items;
 >module.exports : Symbol(items, Decl(index.js, 1, 5))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(items, Decl(index.js, 1, 5))
 >items : Symbol(items, Decl(index.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration.symbols.diff
index 791befb908..15420244d6 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration.symbols.diff
@@ -8,6 +8,6 @@
 ->module : Symbol(export=, Decl(index.js, 1, 17))
 ->exports : Symbol(export=, Decl(index.js, 1, 17))
 +>module.exports : Symbol(items, Decl(index.js, 1, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(items, Decl(index.js, 1, 5))
  >items : Symbol(items, Decl(index.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration2.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration2.symbols
index 8c49059007..d2f17db475 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration2.symbols
@@ -7,7 +7,7 @@ const items = require("./some-mod")();
 
 module.exports = items;
 >module.exports : Symbol(items, Decl(index.js, 0, 5))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(items, Decl(index.js, 0, 5))
 >items : Symbol(items, Decl(index.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration2.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration2.symbols.diff
index c4653d7f16..6c4137eef1 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReassignmentFromDeclaration2.symbols.diff
@@ -11,7 +11,7 @@
 ->module : Symbol(export=, Decl(index.js, 0, 38))
 ->exports : Symbol(export=, Decl(index.js, 0, 38))
 +>module.exports : Symbol(items, Decl(index.js, 0, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(items, Decl(index.js, 0, 5))
  >items : Symbol(items, Decl(index.js, 0, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences.symbols
index 68dd5b7a69..1a4305fa59 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences.symbols
@@ -15,7 +15,7 @@ const thing = new Something();
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(index.js, 4, 30))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 4, 30))
 
     thing
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences.symbols.diff
index 1b31a5b511..a3d3d5300b 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences.symbols.diff
@@ -16,7 +16,7 @@
 ->module : Symbol(module, Decl(index.js, 4, 30))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(index.js, 4, 30))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(export=, Decl(index.js, 4, 30))
 
      thing
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.symbols
index b1a048e93e..ff8bc93c78 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.symbols
@@ -15,7 +15,7 @@ const thing = a + m
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(index.js, 2, 19))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(export=, Decl(index.js, 2, 19))
 
     thing
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.symbols.diff
index e54e92eec2..e80851ba2a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences2.symbols.diff
@@ -16,7 +16,7 @@
 ->module : Symbol(module, Decl(index.js, 2, 19))
 ->exports : Symbol(module.exports, Decl(index.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(index.js, 2, 19))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(export=, Decl(index.js, 2, 19))
 
      thing
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols
index 5e1941f2a7..adaef70032 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols
@@ -12,14 +12,14 @@ const Something = require("fs").Something;
 module.exports.A = {}
 >module.exports.A : Symbol(A, Decl(index.js, 2, 42))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >A : Symbol(A, Decl(index.js, 2, 42))
 
 module.exports.A.B = {
 >module.exports.A : Symbol(A, Decl(index.js, 2, 42))
 >module.exports : Symbol("index", Decl(index.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol("index", Decl(index.js, 0, 0))
 >A : Symbol(A, Decl(index.js, 2, 42))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols.diff
index 59f65b82ab..32647eab62 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypeReferences3.symbols.diff
@@ -15,7 +15,7 @@
 ->A : Symbol(A, Decl(index.js, 2, 42), Decl(index.js, 4, 15))
 +>module.exports.A : Symbol(A, Decl(index.js, 2, 42))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>A : Symbol(A, Decl(index.js, 2, 42))
 
@@ -29,7 +29,7 @@
 ->B : Symbol(A.B, Decl(index.js, 3, 21))
 +>module.exports.A : Symbol(A, Decl(index.js, 2, 42))
 +>module.exports : Symbol("index", Decl(index.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol("index", Decl(index.js, 0, 0))
 +>A : Symbol(A, Decl(index.js, 2, 42))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.symbols
index 215878df17..9da073d086 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.symbols
@@ -18,7 +18,7 @@ class Conn {
 
 module.exports = Conn;
 >module.exports : Symbol(Conn, Decl(conn.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("conn", Decl(conn.js, 0, 0))
 >exports : Symbol(Conn, Decl(conn.js, 0, 0))
 >Conn : Symbol(Conn, Decl(conn.js, 0, 0))
 
@@ -54,7 +54,7 @@ class Wrap {
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(usage.js, 13, 1))
->module : Symbol(module.exports)
+>module : Symbol("usage", Decl(usage.js, 0, 0))
 >exports : Symbol(export=, Decl(usage.js, 13, 1))
 
     Wrap
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.symbols.diff
index da078e1d8c..e2fd83d9ee 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndImportTypes.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(conn.js, 8, 1))
 ->exports : Symbol(export=, Decl(conn.js, 8, 1))
 +>module.exports : Symbol(Conn, Decl(conn.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("conn", Decl(conn.js, 0, 0))
 +>exports : Symbol(Conn, Decl(conn.js, 0, 0))
  >Conn : Symbol(Conn, Decl(conn.js, 0, 0))
 
@@ -21,7 +21,7 @@
 ->module : Symbol(module, Decl(usage.js, 13, 1))
 ->exports : Symbol(module.exports, Decl(usage.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(usage.js, 13, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("usage", Decl(usage.js, 0, 0))
 +>exports : Symbol(export=, Decl(usage.js, 13, 1))
 
      Wrap
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols
index 466a84dc81..8ff3c06dc2 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols
@@ -42,7 +42,7 @@ class LazySet {
 
 module.exports = LazySet;
 >module.exports : Symbol(LazySet, Decl(LazySet.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("LazySet", Decl(LazySet.js, 0, 0))
 >exports : Symbol(LazySet, Decl(LazySet.js, 0, 0))
 >LazySet : Symbol(LazySet, Decl(LazySet.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols.diff
index 8079b204f3..fbedf8ac20 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefAndLatebound.symbols.diff
@@ -8,6 +8,6 @@
 ->module : Symbol(export=, Decl(LazySet.js, 10, 1))
 ->exports : Symbol(export=, Decl(LazySet.js, 10, 1))
 +>module.exports : Symbol(LazySet, Decl(LazySet.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("LazySet", Decl(LazySet.js, 0, 0))
 +>exports : Symbol(LazySet, Decl(LazySet.js, 0, 0))
  >LazySet : Symbol(LazySet, Decl(LazySet.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
index 383deeead4..7f994c7a77 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols
@@ -31,7 +31,7 @@ class MainThreadTasks {
 
 module.exports = MainThreadTasks;
 >module.exports : Symbol(MainThreadTasks, Decl(index.js, 0, 61))
->module : Symbol(module.exports)
+>module : Symbol("index", Decl(index.js, 0, 0))
 >exports : Symbol(MainThreadTasks, Decl(index.js, 0, 61))
 >MainThreadTasks : Symbol(MainThreadTasks, Decl(index.js, 0, 61))
 
@@ -79,7 +79,7 @@ const taskNameToGroup = {};
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(module.js, 24, 27))
->module : Symbol(module.exports)
+>module : Symbol("module", Decl(module.js, 0, 0))
 >exports : Symbol(export=, Decl(module.js, 24, 27))
 
     taskGroups,
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols.diff
index ec22f5af98..c3bacf4d8f 100644
--- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsTypedefPropertyAndExportAssignment.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(index.js, 18, 1))
 ->exports : Symbol(export=, Decl(index.js, 18, 1))
 +>module.exports : Symbol(MainThreadTasks, Decl(index.js, 0, 61))
-+>module : Symbol(module.exports)
++>module : Symbol("index", Decl(index.js, 0, 0))
 +>exports : Symbol(MainThreadTasks, Decl(index.js, 0, 61))
  >MainThreadTasks : Symbol(MainThreadTasks, Decl(index.js, 0, 61))
 
@@ -21,7 +21,7 @@
 ->module : Symbol(module, Decl(module.js, 24, 27))
 ->exports : Symbol(module.exports, Decl(module.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(module.js, 24, 27))
-+>module : Symbol(module.exports)
++>module : Symbol("module", Decl(module.js, 0, 0))
 +>exports : Symbol(export=, Decl(module.js, 24, 27))
 
      taskGroups,
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols b/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols
index 7961257a02..082673ef9b 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols
@@ -52,7 +52,7 @@ class Chunk {
 }
 module.exports = Chunk;
 >module.exports : Symbol(Chunk, Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(Chunk, Decl(mod1.js, 0, 0))
 >Chunk : Symbol(Chunk, Decl(mod1.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols.diff
index 58bdbe81a5..731b39fc50 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportType.symbols.diff
@@ -8,6 +8,6 @@
 ->module : Symbol(export=, Decl(mod1.js, 5, 1))
 ->exports : Symbol(export=, Decl(mod1.js, 5, 1))
 +>module.exports : Symbol(Chunk, Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(Chunk, Decl(mod1.js, 0, 0))
  >Chunk : Symbol(Chunk, Decl(mod1.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols b/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols
index 5db36136d1..129f96dc14 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols
@@ -42,7 +42,7 @@ declare var module: { exports: any };
 /// <reference path='./types.d.ts'/>
 module.exports = class Chunk {
 >module.exports : Symbol(Chunk, Decl(mod1.js, 1, 16))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(Chunk, Decl(mod1.js, 1, 16))
 >Chunk : Symbol(Chunk, Decl(mod1.js, 1, 16))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols.diff
index eaf50f13ef..415929acf6 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportType2.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(mod1.js, 0, 0))
 ->exports : Symbol(export=, Decl(mod1.js, 0, 0))
 +>module.exports : Symbol(Chunk, Decl(mod1.js, 1, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(Chunk, Decl(mod1.js, 1, 16))
  >Chunk : Symbol(Chunk, Decl(mod1.js, 1, 16))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols
index 260e541451..9022f92cc7 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols
@@ -10,7 +10,7 @@ class C {
 module.exports.C = C
 >module.exports.C : Symbol(C, Decl(mod1.js, 2, 1))
 >module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol("mod1", Decl(mod1.js, 0, 0))
 >C : Symbol(C, Decl(mod1.js, 2, 1))
 >C : Symbol(C, Decl(mod1.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols.diff
index 58da185c0a..aa4806630c 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocImportTypeReferenceToClassAlias.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(mod1.js, 2, 1))
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 +>module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
  >C : Symbol(C, Decl(mod1.js, 2, 1))
  >C : Symbol(C, Decl(mod1.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols
index 033590b2aa..6ae093d390 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols
@@ -39,11 +39,11 @@ exports.f = exports.g = function fg(n) {
 module.exports.h = module.exports.i = function hi(mom) {
 >module.exports.h : Symbol(h, Decl(mod.js, 3, 1))
 >module.exports : Symbol("mod", Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol("mod", Decl(mod.js, 0, 0))
 >h : Symbol(h, Decl(mod.js, 3, 1))
 >module.exports : Symbol("mod", Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol("mod", Decl(mod.js, 0, 0))
 >hi : Symbol(hi, Decl(mod.js, 5, 37))
 >mom : Symbol(mom, Decl(mod.js, 5, 50))
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols.diff
index 45429a4144..e839522264 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeFromChainedAssignment2.symbols.diff
@@ -40,7 +40,7 @@
 ->module : Symbol(module, Decl(mod.js, 3, 1))
 ->exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 +>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
 +>exports : Symbol("mod", Decl(mod.js, 0, 0))
  >h : Symbol(h, Decl(mod.js, 3, 1))
 ->module.exports.i : Symbol(i, Decl(mod.js, 5, 18))
@@ -49,7 +49,7 @@
 ->exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 ->i : Symbol(i, Decl(mod.js, 5, 18))
 +>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
 +>exports : Symbol("mod", Decl(mod.js, 0, 0))
  >hi : Symbol(hi, Decl(mod.js, 5, 37))
  >mom : Symbol(mom, Decl(mod.js, 5, 50))
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceExports.symbols b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceExports.symbols
index 19deb87c3b..c26c6858e1 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceExports.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceExports.symbols
@@ -3,7 +3,7 @@
 === bug27342.js ===
 module.exports = {}
 >module.exports : Symbol(export=, Decl(bug27342.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bug27342", Decl(bug27342.js, 0, 0))
 >exports : Symbol(export=, Decl(bug27342.js, 0, 0))
 
 /**
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceExports.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceExports.symbols.diff
index 27844b5968..6b35522c8e 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceExports.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceExports.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(bug27342.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(bug27342.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(bug27342.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("bug27342", Decl(bug27342.js, 0, 0))
 +>exports : Symbol(export=, Decl(bug27342.js, 0, 0))
 
  /**
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols
index 9e9d853774..b7921125e3 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols
@@ -10,7 +10,7 @@ const MW = require("./MW");
 
 module.exports = class MC {
 >module.exports : Symbol(MC, Decl(MC.js, 4, 16))
->module : Symbol(module.exports)
+>module : Symbol("MC", Decl(MC.js, 0, 0))
 >exports : Symbol(MC, Decl(MC.js, 4, 16))
 >MC : Symbol(MC, Decl(MC.js, 4, 16))
 
@@ -45,7 +45,7 @@ class MW {
 
 module.exports = MW;
 >module.exports : Symbol(MW, Decl(MW.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("MW", Decl(MW.js, 0, 0))
 >exports : Symbol(MW, Decl(MW.js, 0, 0))
 >MW : Symbol(MW, Decl(MW.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols.diff
index 8c74d87ddb..83ed667c5b 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfClassExpression.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(MC.js, 0, 27))
 ->exports : Symbol(export=, Decl(MC.js, 0, 27))
 +>module.exports : Symbol(MC, Decl(MC.js, 4, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("MC", Decl(MC.js, 0, 0))
 +>exports : Symbol(MC, Decl(MC.js, 4, 16))
  >MC : Symbol(MC, Decl(MC.js, 4, 16))
 
@@ -21,6 +21,6 @@
 ->module : Symbol(export=, Decl(MW.js, 9, 1))
 ->exports : Symbol(export=, Decl(MW.js, 9, 1))
 +>module.exports : Symbol(MW, Decl(MW.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("MW", Decl(MW.js, 0, 0))
 +>exports : Symbol(MW, Decl(MW.js, 0, 0))
  >MW : Symbol(MW, Decl(MW.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols
index c26128dd85..e309908ae2 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols
@@ -11,7 +11,7 @@ const MW = require("./MW");
 /** @class */
 module.exports = function MC() {
 >module.exports : Symbol(export=, Decl(MC.js, 0, 27))
->module : Symbol(module.exports)
+>module : Symbol("MC", Decl(MC.js, 0, 0))
 >exports : Symbol(export=, Decl(MC.js, 0, 27))
 >MC : Symbol(MC, Decl(MC.js, 5, 16))
 
@@ -47,7 +47,7 @@ class MW {
 
 module.exports = MW;
 >module.exports : Symbol(MW, Decl(MW.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("MW", Decl(MW.js, 0, 0))
 >exports : Symbol(MW, Decl(MW.js, 0, 0))
 >MW : Symbol(MW, Decl(MW.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols.diff
index 648ac23411..eb7efad30a 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeReferenceToImportOfFunctionExpression.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(MC.js, 0, 0))
 ->module : Symbol(export=, Decl(MC.js, 0, 27))
 +>module.exports : Symbol(export=, Decl(MC.js, 0, 27))
-+>module : Symbol(module.exports)
++>module : Symbol("MC", Decl(MC.js, 0, 0))
  >exports : Symbol(export=, Decl(MC.js, 0, 27))
  >MC : Symbol(MC, Decl(MC.js, 5, 16))
 
@@ -19,6 +19,6 @@
 ->module : Symbol(export=, Decl(MW.js, 9, 1))
 ->exports : Symbol(export=, Decl(MW.js, 9, 1))
 +>module.exports : Symbol(MW, Decl(MW.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("MW", Decl(MW.js, 0, 0))
 +>exports : Symbol(MW, Decl(MW.js, 0, 0))
  >MW : Symbol(MW, Decl(MW.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols
index 40d007ddf0..9587ae75da 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols
@@ -28,20 +28,20 @@ const _str = "my-fake-sym";
 
 module.exports[_sym] = "ok";
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
 
 module.exports[_str] = "ok";
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport2.js, 2, 5))
 
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols.diff
index ea61a161e6..564920259e 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport2.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
 
@@ -17,7 +17,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
  >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport2.js, 2, 5))
 
@@ -27,7 +27,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport2", Decl(lateBoundAssignmentDeclarationSupport2.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport2.js, 5, 28))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport2.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols
index 0042bfa852..fb3d156cea 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols
@@ -31,7 +31,7 @@ Object.defineProperty(module.exports, _sym, { value: "ok" });
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
 >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 4, 45))
@@ -41,7 +41,7 @@ Object.defineProperty(module.exports, _str, { value: "ok" });
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport3.js, 2, 5))
 >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 45))
@@ -49,7 +49,7 @@ Object.defineProperty(module.exports, _str, { value: "ok" });
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols.diff
index e1875fe9e9..4302534287 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport3.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
  >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 4, 45))
@@ -21,7 +21,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
  >_str : Symbol(_str, Decl(lateBoundAssignmentDeclarationSupport3.js, 2, 5))
  >value : Symbol(value, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 45))
@@ -32,7 +32,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport3", Decl(lateBoundAssignmentDeclarationSupport3.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport3.js, 5, 61))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport3.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols
index 3cd2ec6331..9d80f583e6 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols
@@ -64,7 +64,7 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 2, 27))
@@ -72,7 +72,7 @@ module.exports.F = F;
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport4.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols.diff
index a2cb603930..0693038e03 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport4.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport4.js, 2, 27))
@@ -19,7 +19,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport4.js, 10, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport4", Decl(lateBoundAssignmentDeclarationSupport4.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport4.js, 11, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport4.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols
index bfb9059745..46a80c16e1 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols
@@ -65,7 +65,7 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 2, 27))
@@ -73,7 +73,7 @@ module.exports.F = F;
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport5.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols.diff
index da3e923b0f..2c1e0cc769 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport5.symbols.diff
@@ -31,7 +31,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 ->F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport5.js, 2, 27), Decl(lateBoundAssignmentDeclarationSupport5.js, 5, 1))
@@ -43,7 +43,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport5.js, 12, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport5", Decl(lateBoundAssignmentDeclarationSupport5.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport5.js, 13, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport5.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols
index c2449f4ba8..508f35ee24 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols
@@ -77,7 +77,7 @@ const _z = inst[_sym];
 module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 2, 27))
@@ -85,7 +85,7 @@ module.exports.F = F;
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport6.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols.diff
index 03282bced5..786ada5232 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport6.symbols.diff
@@ -20,7 +20,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport6.js, 2, 27))
@@ -31,7 +31,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport6.js, 11, 22))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport6", Decl(lateBoundAssignmentDeclarationSupport6.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport6.js, 12, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport6.js, 1, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols
index eba0c9f488..5e54fb5797 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols
@@ -44,7 +44,7 @@ F[_str] = "ok";
 module.exports.F = F;
 >module.exports.F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 1, 27))
@@ -52,7 +52,7 @@ module.exports.F = F;
 module.exports.S = _sym;
 >module.exports.S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
 >module.exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
 >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols.diff b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols.diff
index 00bc1adc0c..0654af2377 100644
--- a/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/lateBoundAssignmentDeclarationSupport7.symbols.diff
@@ -32,7 +32,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
  >F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 ->F : Symbol(F, Decl(lateBoundAssignmentDeclarationSupport7.js, 1, 27), Decl(lateBoundAssignmentDeclarationSupport7.js, 4, 1), Decl(lateBoundAssignmentDeclarationSupport7.js, 5, 15))
@@ -44,7 +44,7 @@
 ->module : Symbol(module, Decl(lateBoundAssignmentDeclarationSupport7.js, 6, 15))
 ->exports : Symbol(module.exports, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 +>module.exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
 +>exports : Symbol("lateBoundAssignmentDeclarationSupport7", Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 0))
  >S : Symbol(S, Decl(lateBoundAssignmentDeclarationSupport7.js, 7, 21))
  >_sym : Symbol(_sym, Decl(lateBoundAssignmentDeclarationSupport7.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols
index db9cea396e..e1b0d0aabb 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols
@@ -79,7 +79,7 @@ exports.func2 = function () { };
 var moduleExportsAlias = module.exports;
 >moduleExportsAlias : Symbol(moduleExportsAlias, Decl(b.js, 4, 3))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 moduleExportsAlias.func3 = function () { };
@@ -87,14 +87,14 @@ moduleExportsAlias.func3 = function () { };
 
 module.exports.func4 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 var multipleDeclarationAlias1 = exports = module.exports;
 >multipleDeclarationAlias1 : Symbol(multipleDeclarationAlias1, Decl(b.js, 8, 3))
 >exports : Symbol("b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 multipleDeclarationAlias1.func5 = function () { };
@@ -103,7 +103,7 @@ multipleDeclarationAlias1.func5 = function () { };
 var multipleDeclarationAlias2 = module.exports = exports;
 >multipleDeclarationAlias2 : Symbol(multipleDeclarationAlias2, Decl(b.js, 11, 3))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 >exports : Symbol("b", Decl(b.js, 0, 0))
 
@@ -125,7 +125,7 @@ var multipleDeclarationAlias4 = someOtherVariable = module.exports;
 >multipleDeclarationAlias4 : Symbol(multipleDeclarationAlias4, Decl(b.js, 18, 3))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 multipleDeclarationAlias4.func8 = function () { };
@@ -134,7 +134,7 @@ multipleDeclarationAlias4.func8 = function () { };
 var multipleDeclarationAlias5 = module.exports = exports = {};
 >multipleDeclarationAlias5 : Symbol(multipleDeclarationAlias5, Decl(b.js, 21, 3))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 >exports : Symbol("b", Decl(b.js, 0, 0))
 
@@ -145,7 +145,7 @@ var multipleDeclarationAlias6 = exports = module.exports = {};
 >multipleDeclarationAlias6 : Symbol(multipleDeclarationAlias6, Decl(b.js, 24, 3))
 >exports : Symbol("b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 multipleDeclarationAlias6.func10 = function () { };
@@ -154,7 +154,7 @@ multipleDeclarationAlias6.func10 = function () { };
 exports = module.exports = someOtherVariable = {};
 >exports : Symbol("b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 
@@ -163,13 +163,13 @@ exports.func11 = function () { };
 
 module.exports.func12 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports = module.exports = someOtherVariable = {};
 >exports : Symbol("b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 >someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 
@@ -178,13 +178,13 @@ exports.func11 = function () { };
 
 module.exports.func12 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports = module.exports = {};
 >exports : Symbol("b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports.func13 = function () { };
@@ -192,13 +192,13 @@ exports.func13 = function () { };
 
 module.exports.func14 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports = module.exports = {};
 >exports : Symbol("b", Decl(b.js, 0, 0))
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports.func15 = function () { };
@@ -206,12 +206,12 @@ exports.func15 = function () { };
 
 module.exports.func16 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 module.exports = exports = {};
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 >exports : Symbol("b", Decl(b.js, 0, 0))
 
@@ -220,12 +220,12 @@ exports.func17 = function () { };
 
 module.exports.func18 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 module.exports = {};
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 exports.func19 = function () { };
@@ -233,7 +233,7 @@ exports.func19 = function () { };
 
 module.exports.func20 = function () { };
 >module.exports : Symbol(export=, Decl(b.js, 41, 40))
->module : Symbol(module.exports)
+>module : Symbol("b", Decl(b.js, 0, 0))
 >exports : Symbol(export=, Decl(b.js, 41, 40))
 
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols.diff
index 7c68f5c1af..8252b2c22c 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias.symbols.diff
@@ -125,7 +125,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  moduleExportsAlias.func3 = function () { };
@@ -140,7 +140,7 @@
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->func4 : Symbol(func4, Decl(b.js, 5, 43))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  var multipleDeclarationAlias1 = exports = module.exports;
@@ -150,7 +150,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  multipleDeclarationAlias1.func5 = function () { };
@@ -164,7 +164,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
  >exports : Symbol("b", Decl(b.js, 0, 0))
 
@@ -190,7 +190,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  multipleDeclarationAlias4.func8 = function () { };
@@ -204,7 +204,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
  >exports : Symbol("b", Decl(b.js, 0, 0))
 
@@ -220,7 +220,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  multipleDeclarationAlias6.func10 = function () { };
@@ -269,7 +269,7 @@
 +exports = module.exports = someOtherVariable = {};
 +>exports : Symbol("b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 +>someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 +
@@ -278,13 +278,13 @@
 +
 +module.exports.func12 = function () { };
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 +
 +exports = module.exports = someOtherVariable = {};
 +>exports : Symbol("b", Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 +>someOtherVariable : Symbol(someOtherVariable, Decl(b.js, 14, 3))
 +
@@ -293,7 +293,7 @@
 +
 +module.exports.func12 = function () { };
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  exports = module.exports = {};
@@ -302,7 +302,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  exports.func13 = function () { };
@@ -318,7 +318,7 @@
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->func14 : Symbol(func14, Decl(b.js, 36, 33))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  exports = module.exports = {};
@@ -327,7 +327,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  exports.func15 = function () { };
@@ -343,7 +343,7 @@
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->func16 : Symbol(func16, Decl(b.js, 40, 33))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  module.exports = exports = {};
@@ -351,7 +351,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
  >exports : Symbol("b", Decl(b.js, 0, 0))
 
@@ -368,7 +368,7 @@
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->func18 : Symbol(func18, Decl(b.js, 44, 33))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  module.exports = {};
@@ -376,7 +376,7 @@
 ->module : Symbol(module, Decl(b.js, 4, 24))
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
  exports.func19 = function () { };
@@ -392,6 +392,6 @@
 ->exports : Symbol(module.exports, Decl(b.js, 0, 0))
 ->func20 : Symbol(func20, Decl(b.js, 48, 33))
 +>module.exports : Symbol(export=, Decl(b.js, 41, 40))
-+>module : Symbol(module.exports)
++>module : Symbol("b", Decl(b.js, 0, 0))
 +>exports : Symbol(export=, Decl(b.js, 41, 40))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols
index efe1cb3025..018e9cdf0e 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols
@@ -34,7 +34,7 @@ declare var module: { exports: any };
 exports = module.exports = C
 >exports : Symbol("semver", Decl(semver.js, 0, 0))
 >module.exports : Symbol("semver", Decl(semver.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("semver", Decl(semver.js, 0, 0))
 >exports : Symbol("semver", Decl(semver.js, 0, 0))
 >C : Symbol(C, Decl(semver.js, 2, 22))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols.diff
index 0a1a2a7d7c..adb5187e6b 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias2.symbols.diff
@@ -17,7 +17,7 @@
 ->module : Symbol(export=, Decl(semver.js, 1, 9))
 ->exports : Symbol(export=, Decl(semver.js, 1, 9))
 +>module.exports : Symbol("semver", Decl(semver.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("semver", Decl(semver.js, 0, 0))
 +>exports : Symbol("semver", Decl(semver.js, 0, 0))
  >C : Symbol(C, Decl(semver.js, 2, 22))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.symbols
index 4cd9a45599..8015fd390d 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.symbols
@@ -7,7 +7,7 @@ class C {
 }
 module.exports = {
 >module.exports : Symbol(export=, Decl(bug24062.js, 2, 1))
->module : Symbol(module.exports)
+>module : Symbol("bug24062", Decl(bug24062.js, 0, 0))
 >exports : Symbol(export=, Decl(bug24062.js, 2, 1))
 
     C
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.symbols.diff
index cca2eb32d8..c01f3edc1f 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias3.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(bug24062.js, 2, 1))
 ->exports : Symbol(module.exports, Decl(bug24062.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(bug24062.js, 2, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("bug24062", Decl(bug24062.js, 0, 0))
 +>exports : Symbol(export=, Decl(bug24062.js, 2, 1))
 
      C
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols
index a9cab75a98..3cd1a6bcb6 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols
@@ -9,13 +9,13 @@ var wat = require('./bug24024')
 
 module.exports = class C {}
 >module.exports : Symbol(wat, Decl(bug24024.js, 2, 16))
->module : Symbol(module.exports)
+>module : Symbol("bug24024", Decl(bug24024.js, 0, 0))
 >exports : Symbol(wat, Decl(bug24024.js, 2, 16))
 >C : Symbol(C, Decl(bug24024.js, 2, 16))
 
 module.exports.D = class D { }
 >module.exports : Symbol(wat, Decl(bug24024.js, 2, 16))
->module : Symbol(module.exports)
+>module : Symbol("bug24024", Decl(bug24024.js, 0, 0))
 >exports : Symbol(wat, Decl(bug24024.js, 2, 16))
 >D : Symbol(D, Decl(bug24024.js, 3, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols.diff
index 8a574736aa..1369e4b0ec 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias4.symbols.diff
@@ -9,7 +9,7 @@
 ->exports : Symbol(export=, Decl(bug24024.js, 1, 31))
 ->C : Symbol(wat, Decl(bug24024.js, 2, 16))
 +>module.exports : Symbol(wat, Decl(bug24024.js, 2, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("bug24024", Decl(bug24024.js, 0, 0))
 +>exports : Symbol(wat, Decl(bug24024.js, 2, 16))
 +>C : Symbol(C, Decl(bug24024.js, 2, 16))
 
@@ -21,6 +21,6 @@
 ->D : Symbol(wat.D, Decl(bug24024.js, 2, 27))
 ->D : Symbol(wat.D, Decl(bug24024.js, 3, 18))
 +>module.exports : Symbol(wat, Decl(bug24024.js, 2, 16))
-+>module : Symbol(module.exports)
++>module : Symbol("bug24024", Decl(bug24024.js, 0, 0))
 +>exports : Symbol(wat, Decl(bug24024.js, 2, 16))
 +>D : Symbol(D, Decl(bug24024.js, 3, 18))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols
index 9a8873d427..2abd69871d 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols
@@ -8,7 +8,7 @@ const webpack = function (){
 exports = module.exports = webpack;
 >exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
 >module.exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bug24754", Decl(bug24754.js, 0, 0))
 >exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
 >webpack : Symbol(webpack, Decl(bug24754.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols.diff
index 40a2d99fcf..743e5d4fb8 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAlias5.symbols.diff
@@ -14,7 +14,7 @@
 ->exports : Symbol(export=, Decl(bug24754.js, 3, 9))
 ->webpack : Symbol(webpack, Decl(bug24754.js, 1, 5), Decl(bug24754.js, 4, 23))
 +>module.exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("bug24754", Decl(bug24754.js, 0, 0))
 +>exports : Symbol("bug24754", Decl(bug24754.js, 0, 0))
 +>webpack : Symbol(webpack, Decl(bug24754.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols
index 373a830db8..4ec0d40759 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols
@@ -15,7 +15,7 @@ exports.everywhere = 2
 
 module.exports = exports
 >module.exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
 >exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
 >exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols.diff
index d9b5824e33..cdec0b4368 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasExports.symbols.diff
@@ -19,7 +19,7 @@
 ->module : Symbol(export=, Decl(Eloquent.js, 3, 22))
 ->exports : Symbol(export=, Decl(Eloquent.js, 3, 22))
 +>module.exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
 +>exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
  >exports : Symbol("Eloquent", Decl(Eloquent.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols
index eed33947c6..5adf80048f 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols
@@ -9,7 +9,7 @@ function alias() { }
 
 module.exports = alias
 >module.exports : Symbol(alias, Decl(bug28014.js, 0, 19))
->module : Symbol(module.exports)
+>module : Symbol("bug28014", Decl(bug28014.js, 0, 0))
 >exports : Symbol(alias, Decl(bug28014.js, 0, 19))
 >alias : Symbol(alias, Decl(bug28014.js, 0, 19))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols.diff
index db6b4bdc5c..99aa7d6029 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasImported.symbols.diff
@@ -17,7 +17,7 @@
 ->module : Symbol(export=, Decl(bug28014.js, 1, 20))
 ->exports : Symbol(export=, Decl(bug28014.js, 1, 20))
 +>module.exports : Symbol(alias, Decl(bug28014.js, 0, 19))
-+>module : Symbol(module.exports)
++>module : Symbol("bug28014", Decl(bug28014.js, 0, 0))
 +>exports : Symbol(alias, Decl(bug28014.js, 0, 19))
  >alias : Symbol(alias, Decl(bug28014.js, 0, 19))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols
index 33e6b8ac42..184fac3313 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols
@@ -3,7 +3,7 @@
 === bug27025.js ===
 module.exports = window.nonprop;
 >module.exports : Symbol(unknown)
->module : Symbol(module.exports)
+>module : Symbol("bug27025", Decl(bug27025.js, 0, 0))
 >exports : Symbol(unknown)
 >window : Symbol(window, Decl(lib.dom.d.ts, --, --))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols.diff
index 179701bcbd..585550c7c0 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAliasUnknown.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(bug27025.js, 0, 0))
 ->exports : Symbol(export=, Decl(bug27025.js, 0, 0))
 +>module.exports : Symbol(unknown)
-+>module : Symbol(module.exports)
++>module : Symbol("bug27025", Decl(bug27025.js, 0, 0))
 +>exports : Symbol(unknown)
  >window : Symbol(window, Decl(lib.dom.d.ts, --, --))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols
index d3908ce024..09448fa003 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols
@@ -24,7 +24,7 @@ class EE {
 var npmlog = module.exports = new EE()
 >npmlog : Symbol(npmlog, Decl(npmlog.js, 4, 3))
 >module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 >exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 >EE : Symbol(EE, Decl(npmlog.js, 0, 0))
 
@@ -35,7 +35,7 @@ npmlog.on('hi') // both references should see EE.on
 
 module.exports.on('hi') // here too
 >module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 >exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 
 npmlog.x = 1
@@ -44,7 +44,7 @@ npmlog.x = 1
 module.exports.y = 2
 >module.exports.y : Symbol(y, Decl(npmlog.js, 9, 12))
 >module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 >exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 >y : Symbol(y, Decl(npmlog.js, 9, 12))
 
@@ -53,6 +53,6 @@ npmlog.y
 
 module.exports.x
 >module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 >exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols.diff
index 298239bc3b..fd22517a5a 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment.symbols.diff
@@ -27,7 +27,7 @@
 ->module : Symbol(npmlog, Decl(npmlog.js, 4, 12))
 ->exports : Symbol(npmlog, Decl(npmlog.js, 4, 12))
 +>module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 +>exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
  >EE : Symbol(EE, Decl(npmlog.js, 0, 0))
 
@@ -42,7 +42,7 @@
 ->exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 ->on : Symbol(EE.on, Decl(npmlog.js, 0, 10))
 +>module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 +>exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 
  npmlog.x = 1
@@ -56,7 +56,7 @@
 ->module : Symbol(module, Decl(npmlog.js, 4, 12))
 ->exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 +>module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 +>exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
  >y : Symbol(y, Decl(npmlog.js, 9, 12))
 
@@ -72,5 +72,5 @@
 ->exports : Symbol(module.exports, Decl(npmlog.js, 0, 0))
 ->x : Symbol(x, Decl(npmlog.js, 7, 23))
 +>module.exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("npmlog", Decl(npmlog.js, 0, 0))
 +>exports : Symbol("npmlog", Decl(npmlog.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols
index 78fa43931d..df38c84dc0 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols
@@ -4,14 +4,14 @@
 var npm = module.exports = function (tree) {
 >npm : Symbol(npm, Decl(npm.js, 0, 3))
 >module.exports : Symbol("npm", Decl(npm.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("npm", Decl(npm.js, 0, 0))
 >exports : Symbol("npm", Decl(npm.js, 0, 0))
 >tree : Symbol(tree, Decl(npm.js, 0, 37))
 }
 module.exports.asReadInstalled = function (tree) {
 >module.exports.asReadInstalled : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
 >module.exports : Symbol("npm", Decl(npm.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("npm", Decl(npm.js, 0, 0))
 >exports : Symbol("npm", Decl(npm.js, 0, 0))
 >asReadInstalled : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
 >tree : Symbol(tree, Decl(npm.js, 2, 43))
@@ -22,7 +22,7 @@ module.exports.asReadInstalled = function (tree) {
 
     module.exports(tree)
 >module.exports : Symbol("npm", Decl(npm.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("npm", Decl(npm.js, 0, 0))
 >exports : Symbol("npm", Decl(npm.js, 0, 0))
 >tree : Symbol(tree, Decl(npm.js, 2, 43))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols.diff
index 2304305f4c..7bbd7791d0 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment2.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(npm, Decl(npm.js, 0, 9))
 ->exports : Symbol(npm, Decl(npm.js, 0, 9))
 +>module.exports : Symbol("npm", Decl(npm.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("npm", Decl(npm.js, 0, 0))
 +>exports : Symbol("npm", Decl(npm.js, 0, 0))
  >tree : Symbol(tree, Decl(npm.js, 0, 37))
  }
@@ -18,7 +18,7 @@
 ->module : Symbol(module, Decl(npm.js, 0, 9), Decl(npm.js, 3, 13))
 ->exports : Symbol(module.exports, Decl(npm.js, 0, 0))
 +>module.exports : Symbol("npm", Decl(npm.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("npm", Decl(npm.js, 0, 0))
 +>exports : Symbol("npm", Decl(npm.js, 0, 0))
  >asReadInstalled : Symbol(asReadInstalled, Decl(npm.js, 1, 1))
  >tree : Symbol(tree, Decl(npm.js, 2, 43))
@@ -31,7 +31,7 @@
 ->module : Symbol(module, Decl(npm.js, 0, 9), Decl(npm.js, 3, 13))
 ->exports : Symbol(module.exports, Decl(npm.js, 0, 0))
 +>module.exports : Symbol("npm", Decl(npm.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("npm", Decl(npm.js, 0, 0))
 +>exports : Symbol("npm", Decl(npm.js, 0, 0))
  >tree : Symbol(tree, Decl(npm.js, 2, 43))
  }
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols
index 6c48dba82f..be0cc8c99a 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols
@@ -12,12 +12,12 @@ mod() // should be callable from here too
 === mod.js ===
 module.exports = function x() { }
 >module.exports : Symbol(export=, Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", 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(export=, Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol(export=, Decl(mod.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols.diff
index 8f69b075c9..bb237297b3 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment3.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 ->module : Symbol(export=, Decl(mod.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
  >exports : Symbol(export=, Decl(mod.js, 0, 0))
  >x : Symbol(x, Decl(mod.js, 0, 16))
 
@@ -16,5 +16,5 @@
 ->module : Symbol(module, Decl(mod.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
 +>exports : Symbol(export=, Decl(mod.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols
index 723e4e6100..051c5d593f 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols
@@ -8,7 +8,7 @@ exports.default = { m: 1, a: 1 }
 
 module.exports = exports['default'];
 >module.exports : Symbol(export=, Decl(async.js, 0, 32))
->module : Symbol(module.exports)
+>module : Symbol("async", Decl(async.js, 0, 0))
 >exports : Symbol(export=, Decl(async.js, 0, 32))
 >exports : Symbol("async", Decl(async.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols.diff
index 2ea079bfe5..ed507e532c 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment4.symbols.diff
@@ -14,6 +14,6 @@
 ->module.exports : Symbol(module.exports, Decl(async.js, 0, 0))
 ->module : Symbol(export=, Decl(async.js, 0, 32))
 +>module.exports : Symbol(export=, Decl(async.js, 0, 32))
-+>module : Symbol(module.exports)
++>module : Symbol("async", Decl(async.js, 0, 0))
  >exports : Symbol(export=, Decl(async.js, 0, 32))
  >exports : Symbol("async", Decl(async.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment5.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment5.symbols
index 88729680b4..b3a4c7baaf 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment5.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment5.symbols
@@ -21,13 +21,13 @@ axios.m()
 
 module.exports = axios;
 >module.exports : Symbol(axios, Decl(axios.js, 5, 3))
->module : Symbol(module.exports)
+>module : Symbol("axios", Decl(axios.js, 0, 0))
 >exports : Symbol(axios, Decl(axios.js, 5, 3))
 >axios : Symbol(axios, Decl(axios.js, 5, 3))
 
 module.exports.default = axios;
 >module.exports : Symbol(axios, Decl(axios.js, 5, 3))
->module : Symbol(module.exports)
+>module : Symbol("axios", Decl(axios.js, 0, 0))
 >exports : Symbol(axios, Decl(axios.js, 5, 3))
 >axios : Symbol(axios, Decl(axios.js, 5, 3))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment5.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment5.symbols.diff
index ce752a732b..8275026f54 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment5.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment5.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(axios.js, 7, 9))
 ->exports : Symbol(export=, Decl(axios.js, 7, 9))
 +>module.exports : Symbol(axios, Decl(axios.js, 5, 3))
-+>module : Symbol(module.exports)
++>module : Symbol("axios", Decl(axios.js, 0, 0))
 +>exports : Symbol(axios, Decl(axios.js, 5, 3))
  >axios : Symbol(axios, Decl(axios.js, 5, 3))
 
@@ -19,6 +19,6 @@
 ->exports : Symbol(module.exports, Decl(axios.js, 0, 0))
 ->default : Symbol(default, Decl(axios.js, 8, 23))
 +>module.exports : Symbol(axios, Decl(axios.js, 5, 3))
-+>module : Symbol(module.exports)
++>module : Symbol("axios", Decl(axios.js, 0, 0))
 +>exports : Symbol(axios, Decl(axios.js, 5, 3))
  >axios : Symbol(axios, Decl(axios.js, 5, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.symbols
index 3234127e91..02c9e60dff 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.symbols
@@ -18,7 +18,7 @@ function bar() { return 4 }
 /** @typedef {() => number} buz */
 module.exports = {
 >module.exports : Symbol(export=, Decl(mod.js, 3, 27))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol(export=, Decl(mod.js, 3, 27))
 
     Thing,
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.symbols.diff
index 01e08c6e10..63cbc827a3 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportAssignment7.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 ->module : Symbol(export=, Decl(mod.js, 3, 27))
 +>module.exports : Symbol(export=, Decl(mod.js, 3, 27))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
  >exports : Symbol(export=, Decl(mod.js, 3, 27))
 
      Thing,
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols
index 6441cf72c8..6450f513e5 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols
@@ -13,7 +13,7 @@ apply()
 module.exports.apply = undefined;
 >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >undefined : Symbol(undefined)
@@ -24,7 +24,7 @@ function a() { }
 module.exports.apply = a;
 >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 33))
@@ -32,7 +32,7 @@ module.exports.apply = a;
 module.exports.apply = a;
 >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 33))
@@ -40,7 +40,7 @@ module.exports.apply = a;
 module.exports.apply()
 >module.exports.apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 >module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols.diff
index 265c5d3763..3f73d440d1 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
  >undefined : Symbol(undefined)
@@ -21,7 +21,7 @@
 ->module : Symbol(module, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
  >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 33))
@@ -32,7 +32,7 @@
 ->module : Symbol(module, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
  >a : Symbol(a, Decl(moduleExportAliasDuplicateAlias.js, 0, 33))
@@ -43,6 +43,6 @@
 ->module : Symbol(module, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>module.exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
 +>exports : Symbol("moduleExportAliasDuplicateAlias", Decl(moduleExportAliasDuplicateAlias.js, 0, 0))
  >apply : Symbol(apply, Decl(moduleExportAliasDuplicateAlias.js, 0, 0), Decl(moduleExportAliasDuplicateAlias.js, 1, 16), Decl(moduleExportAliasDuplicateAlias.js, 2, 25))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols
index 70e1943890..663b3b799d 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols
@@ -4,14 +4,14 @@
 module.exports.n = {};
 >module.exports.n : Symbol(n, Decl(mod.js, 0, 0))
 >module.exports : Symbol("mod", Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol("mod", Decl(mod.js, 0, 0))
 >n : Symbol(n, Decl(mod.js, 0, 0))
 
 module.exports.n.K = function C() {
 >module.exports.n : Symbol(n, Decl(mod.js, 0, 0))
 >module.exports : Symbol("mod", Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol("mod", Decl(mod.js, 0, 0))
 >n : Symbol(n, Decl(mod.js, 0, 0))
 >C : Symbol(C, Decl(mod.js, 1, 20))
@@ -21,7 +21,7 @@ module.exports.n.K = function C() {
 module.exports.Classic = class {
 >module.exports.Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 >module.exports : Symbol("mod", Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol("mod", Decl(mod.js, 0, 0))
 >Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols.diff
index 2595bc30e5..cac6137bf8 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportNestedNamespaces.symbols.diff
@@ -11,7 +11,7 @@
 ->n : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 15))
 +>module.exports.n : Symbol(n, Decl(mod.js, 0, 0))
 +>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
 +>exports : Symbol("mod", Decl(mod.js, 0, 0))
 +>n : Symbol(n, Decl(mod.js, 0, 0))
 
@@ -25,7 +25,7 @@
 ->K : Symbol(n.K, Decl(mod.js, 0, 22))
 +>module.exports.n : Symbol(n, Decl(mod.js, 0, 0))
 +>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
 +>exports : Symbol("mod", Decl(mod.js, 0, 0))
 +>n : Symbol(n, Decl(mod.js, 0, 0))
  >C : Symbol(C, Decl(mod.js, 1, 20))
@@ -41,7 +41,7 @@
 ->module : Symbol(module, Decl(mod.js, 0, 0))
 ->exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 +>module.exports : Symbol("mod", Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
 +>exports : Symbol("mod", Decl(mod.js, 0, 0))
  >Classic : Symbol(Classic, Decl(mod.js, 3, 1))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportPropertyAssignmentDefault.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportPropertyAssignmentDefault.symbols
index 49ff0d0d69..cb362de5d2 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportPropertyAssignmentDefault.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportPropertyAssignmentDefault.symbols
@@ -6,13 +6,13 @@ var axios = {}
 
 module.exports = axios // both assignments should be ok
 >module.exports : Symbol(axios, Decl(axios.js, 0, 3))
->module : Symbol(module.exports)
+>module : Symbol("axios", Decl(axios.js, 0, 0))
 >exports : Symbol(axios, Decl(axios.js, 0, 3))
 >axios : Symbol(axios, Decl(axios.js, 0, 3))
 
 module.exports.default = axios
 >module.exports : Symbol(axios, Decl(axios.js, 0, 3))
->module : Symbol(module.exports)
+>module : Symbol("axios", Decl(axios.js, 0, 0))
 >exports : Symbol(axios, Decl(axios.js, 0, 3))
 >axios : Symbol(axios, Decl(axios.js, 0, 3))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportPropertyAssignmentDefault.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportPropertyAssignmentDefault.symbols.diff
index d12f7626db..1ab00d8e21 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportPropertyAssignmentDefault.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportPropertyAssignmentDefault.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(axios.js, 0, 14))
 ->exports : Symbol(export=, Decl(axios.js, 0, 14))
 +>module.exports : Symbol(axios, Decl(axios.js, 0, 3))
-+>module : Symbol(module.exports)
++>module : Symbol("axios", Decl(axios.js, 0, 0))
 +>exports : Symbol(axios, Decl(axios.js, 0, 3))
  >axios : Symbol(axios, Decl(axios.js, 0, 3))
 
@@ -19,6 +19,6 @@
 ->exports : Symbol(module.exports, Decl(axios.js, 0, 0))
 ->default : Symbol(default, Decl(axios.js, 1, 22))
 +>module.exports : Symbol(axios, Decl(axios.js, 0, 3))
-+>module : Symbol(module.exports)
++>module : Symbol("axios", Decl(axios.js, 0, 0))
 +>exports : Symbol(axios, Decl(axios.js, 0, 3))
  >axios : Symbol(axios, Decl(axios.js, 0, 3))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols
index 72949ef09f..d3c02b70a9 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols
@@ -26,13 +26,13 @@ declare function require(name: string): any;
 /// <reference path='./requires.d.ts' />
 module.exports = function () { }
 >module.exports : Symbol(export=, Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 
 /** @param {number} a */
 module.exports.f = function (a) { }
 >module.exports : Symbol(export=, Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 >a : Symbol(a, Decl(mod1.js, 3, 29))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols.diff
index 1f47a437b4..81efbac992 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment.symbols.diff
@@ -17,7 +17,7 @@
 ->module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->module : Symbol(export=, Decl(mod1.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
  >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 
  /** @param {number} a */
@@ -28,6 +28,6 @@
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->f : Symbol(f, Decl(mod1.js, 1, 32))
 +>module.exports : Symbol(export=, Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(export=, Decl(mod1.js, 0, 0))
  >a : Symbol(a, Decl(mod1.js, 3, 29))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols
index 8d1c032884..dd66d191ee 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols
@@ -28,11 +28,11 @@ declare function require(name: string): any;
 /// <reference path='./requires.d.ts' />
 module.exports = 1
 >module.exports : Symbol(export=, Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 
 module.exports.f = function () { }
 >module.exports : Symbol(export=, Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols.diff
index 7ae0287637..a491c61f72 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment2.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->module : Symbol(export=, Decl(mod1.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
  >exports : Symbol(export=, Decl(mod1.js, 0, 0))
 
  module.exports.f = function () { }
@@ -16,5 +16,5 @@
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->f : Symbol(f, Decl(mod1.js, 1, 18))
 +>module.exports : Symbol(export=, Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(export=, Decl(mod1.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols
index 87abe7abea..192a2bc5aa 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols
@@ -45,13 +45,13 @@ declare function require(name: string): any;
 module.exports.bothBefore = 'string'
 >module.exports.bothBefore : Symbol(bothBefore, Decl(mod1.js, 3, 18))
 >module.exports : Symbol(export=, Decl(mod1.js, 1, 36))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 1, 36))
 >bothBefore : Symbol(bothBefore, Decl(mod1.js, 3, 18))
 
 module.exports = {
 >module.exports : Symbol(export=, Decl(mod1.js, 1, 36))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 1, 36))
 
     justExport: 1,
@@ -66,12 +66,12 @@ module.exports = {
 module.exports.bothAfter = 'string'
 >module.exports.bothAfter : Symbol(bothAfter, Decl(mod1.js, 4, 18))
 >module.exports : Symbol(export=, Decl(mod1.js, 1, 36))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 1, 36))
 >bothAfter : Symbol(bothAfter, Decl(mod1.js, 4, 18))
 
 module.exports.justProperty = 'string'
 >module.exports : Symbol(export=, Decl(mod1.js, 1, 36))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 1, 36))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols.diff
index 5899a74aff..2a7693d4d4 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment3.symbols.diff
@@ -41,7 +41,7 @@
 ->bothBefore : Symbol(bothBefore, Decl(mod1.js, 0, 0))
 +>module.exports.bothBefore : Symbol(bothBefore, Decl(mod1.js, 3, 18))
 +>module.exports : Symbol(export=, Decl(mod1.js, 1, 36))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(export=, Decl(mod1.js, 1, 36))
 +>bothBefore : Symbol(bothBefore, Decl(mod1.js, 3, 18))
 
@@ -49,7 +49,7 @@
 ->module.exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->module : Symbol(export=, Decl(mod1.js, 1, 36))
 +>module.exports : Symbol(export=, Decl(mod1.js, 1, 36))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
  >exports : Symbol(export=, Decl(mod1.js, 1, 36))
 
      justExport: 1,
@@ -64,7 +64,7 @@
 ->bothAfter : Symbol(bothAfter, Decl(mod1.js, 6, 1))
 +>module.exports.bothAfter : Symbol(bothAfter, Decl(mod1.js, 4, 18))
 +>module.exports : Symbol(export=, Decl(mod1.js, 1, 36))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(export=, Decl(mod1.js, 1, 36))
 +>bothAfter : Symbol(bothAfter, Decl(mod1.js, 4, 18))
 
@@ -75,5 +75,5 @@
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->justProperty : Symbol(justProperty, Decl(mod1.js, 7, 35))
 +>module.exports : Symbol(export=, Decl(mod1.js, 1, 36))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(export=, Decl(mod1.js, 1, 36))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols
index ae3aed29be..b1275397bc 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols
@@ -45,7 +45,7 @@ declare function require(name: string): any;
 module.exports.bothBefore = 'string'
 >module.exports.bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16))
 >module.exports : Symbol(A, Decl(mod1.js, 5, 18))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(A, Decl(mod1.js, 5, 18))
 >bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16))
 
@@ -66,7 +66,7 @@ A.bothAfter = 3
 
 module.exports = A
 >module.exports : Symbol(A, Decl(mod1.js, 5, 18))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(A, Decl(mod1.js, 5, 18))
 >A : Symbol(A, Decl(mod1.js, 5, 18))
 
@@ -78,12 +78,12 @@ function A() {
 module.exports.bothAfter = 'string'
 >module.exports.bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16))
 >module.exports : Symbol(A, Decl(mod1.js, 5, 18))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(A, Decl(mod1.js, 5, 18))
 >bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16))
 
 module.exports.justProperty = 'string'
 >module.exports : Symbol(A, Decl(mod1.js, 5, 18))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(A, Decl(mod1.js, 5, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols.diff
index a1473001d8..6164d664a7 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportWithExportPropertyAssignment4.symbols.diff
@@ -41,7 +41,7 @@
 ->bothBefore : Symbol(bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 +>module.exports.bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16))
 +>module.exports : Symbol(A, Decl(mod1.js, 5, 18))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(A, Decl(mod1.js, 5, 18))
 +>bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16))
 
@@ -73,7 +73,7 @@
 ->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))
 +>module.exports : Symbol(A, Decl(mod1.js, 5, 18))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(A, Decl(mod1.js, 5, 18))
 +>A : Symbol(A, Decl(mod1.js, 5, 18))
 
@@ -94,7 +94,7 @@
 ->bothAfter : Symbol(bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 +>module.exports.bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16))
 +>module.exports : Symbol(A, Decl(mod1.js, 5, 18))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(A, Decl(mod1.js, 5, 18))
 +>bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16))
 
@@ -105,5 +105,5 @@
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->justProperty : Symbol(justProperty, Decl(mod1.js, 9, 35))
 +>module.exports : Symbol(A, Decl(mod1.js, 5, 18))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(A, Decl(mod1.js, 5, 18))
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols
index de860794dd..f133604c4a 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols
@@ -55,18 +55,18 @@ exports["default"] = { x: "x" };
 
 module.exports["c"] = { x: "x" };
 >module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol("mod1", Decl(mod1.js, 0, 0))
 >"c" : Symbol("c", Decl(mod1.js, 2, 32))
 >x : Symbol(x, Decl(mod1.js, 3, 23))
 
 module["exports"]["d"] = {};
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >"exports" : Symbol("mod1", Decl(mod1.js, 0, 0))
 >"d" : Symbol("d", Decl(mod1.js, 3, 33))
 
 module["exports"]["d"].e = 0;
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >"exports" : Symbol("mod1", Decl(mod1.js, 0, 0))
 >"d" : Symbol("d", Decl(mod1.js, 3, 33))
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols.diff
index 9cffee87ba..8fc3793344 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportsElementAccessAssignment.symbols.diff
@@ -38,7 +38,7 @@
 ->module : Symbol(module, Decl(mod1.js, 2, 32))
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 +>module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
  >"c" : Symbol("c", Decl(mod1.js, 2, 32))
  >x : Symbol(x, Decl(mod1.js, 3, 23))
@@ -47,7 +47,7 @@
 ->module : Symbol(module, Decl(mod1.js, 2, 32))
 ->"exports" : Symbol(module.exports, Decl(mod1.js, 0, 0))
 ->"d" : Symbol("d", Decl(mod1.js, 3, 33), Decl(mod1.js, 5, 18))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>"exports" : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>"d" : Symbol("d", Decl(mod1.js, 3, 33))
 
@@ -57,6 +57,6 @@
 ->"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))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>"exports" : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>"d" : Symbol("d", Decl(mod1.js, 3, 33))
diff --git a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols
index 3a19abbb9b..28c4b3952c 100644
--- a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols
+++ b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols
@@ -26,7 +26,7 @@ const chalk = {
 module.exports.chalk = chalk
 >module.exports.chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
 >module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol("mod1", Decl(mod1.js, 0, 0))
 >chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
 >chalk : Symbol(chalk, Decl(mod1.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols.diff b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols.diff
index 63b4392e35..89f4935a22 100644
--- a/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nestedDestructuringOfRequire.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(module, Decl(mod1.js, 2, 2))
 ->exports : Symbol(module.exports, Decl(mod1.js, 0, 0))
 +>module.exports : Symbol("mod1", Decl(mod1.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol("mod1", Decl(mod1.js, 0, 0))
  >chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
  >chalk : Symbol(chalk, Decl(mod1.js, 0, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).symbols
index 406c1eb55f..d3940d330e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).symbols
@@ -15,7 +15,7 @@ const a = {};
 
 module.exports = a;
 >module.exports : Symbol(a, Decl(file.js, 1, 5))
->module : Symbol(module.exports)
+>module : Symbol("subfolder/file", Decl(file.js, 0, 0))
 >exports : Symbol(a, Decl(file.js, 1, 5))
 >a : Symbol(a, Decl(file.js, 1, 5))
 
@@ -35,7 +35,7 @@ const a = {};
 
 module.exports = a;
 >module.exports : Symbol(a, Decl(file.js, 2, 5))
->module : Symbol(module.exports)
+>module : Symbol("file", Decl(file.js, 0, 0))
 >exports : Symbol(a, Decl(file.js, 2, 5))
 >a : Symbol(a, Decl(file.js, 2, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).symbols.diff
index b08530b975..8fcb7c1f3b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(file.js, 1, 13))
 ->exports : Symbol(export=, Decl(file.js, 1, 13))
 +>module.exports : Symbol(a, Decl(file.js, 1, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("subfolder/file", Decl(file.js, 0, 0))
 +>exports : Symbol(a, Decl(file.js, 1, 5))
  >a : Symbol(a, Decl(file.js, 1, 5))
 
@@ -18,6 +18,6 @@
 
  module.exports = a;
 +>module.exports : Symbol(a, Decl(file.js, 2, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("file", Decl(file.js, 0, 0))
 +>exports : Symbol(a, Decl(file.js, 2, 5))
  >a : Symbol(a, Decl(file.js, 2, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).symbols
index 406c1eb55f..d3940d330e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).symbols
@@ -15,7 +15,7 @@ const a = {};
 
 module.exports = a;
 >module.exports : Symbol(a, Decl(file.js, 1, 5))
->module : Symbol(module.exports)
+>module : Symbol("subfolder/file", Decl(file.js, 0, 0))
 >exports : Symbol(a, Decl(file.js, 1, 5))
 >a : Symbol(a, Decl(file.js, 1, 5))
 
@@ -35,7 +35,7 @@ const a = {};
 
 module.exports = a;
 >module.exports : Symbol(a, Decl(file.js, 2, 5))
->module : Symbol(module.exports)
+>module : Symbol("file", Decl(file.js, 0, 0))
 >exports : Symbol(a, Decl(file.js, 2, 5))
 >a : Symbol(a, Decl(file.js, 2, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).symbols.diff
index ead06d0c05..6fb73df45b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(file.js, 1, 13))
 ->exports : Symbol(export=, Decl(file.js, 1, 13))
 +>module.exports : Symbol(a, Decl(file.js, 1, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("subfolder/file", Decl(file.js, 0, 0))
 +>exports : Symbol(a, Decl(file.js, 1, 5))
  >a : Symbol(a, Decl(file.js, 1, 5))
 
@@ -18,6 +18,6 @@
 
  module.exports = a;
 +>module.exports : Symbol(a, Decl(file.js, 2, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("file", Decl(file.js, 0, 0))
 +>exports : Symbol(a, Decl(file.js, 2, 5))
  >a : Symbol(a, Decl(file.js, 2, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).symbols
index 406c1eb55f..d3940d330e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).symbols
@@ -15,7 +15,7 @@ const a = {};
 
 module.exports = a;
 >module.exports : Symbol(a, Decl(file.js, 1, 5))
->module : Symbol(module.exports)
+>module : Symbol("subfolder/file", Decl(file.js, 0, 0))
 >exports : Symbol(a, Decl(file.js, 1, 5))
 >a : Symbol(a, Decl(file.js, 1, 5))
 
@@ -35,7 +35,7 @@ const a = {};
 
 module.exports = a;
 >module.exports : Symbol(a, Decl(file.js, 2, 5))
->module : Symbol(module.exports)
+>module : Symbol("file", Decl(file.js, 0, 0))
 >exports : Symbol(a, Decl(file.js, 2, 5))
 >a : Symbol(a, Decl(file.js, 2, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).symbols.diff
index fc851ba9d3..ff471797df 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(file.js, 1, 13))
 ->exports : Symbol(export=, Decl(file.js, 1, 13))
 +>module.exports : Symbol(a, Decl(file.js, 1, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("subfolder/file", Decl(file.js, 0, 0))
 +>exports : Symbol(a, Decl(file.js, 1, 5))
  >a : Symbol(a, Decl(file.js, 1, 5))
 
@@ -18,6 +18,6 @@
 
  module.exports = a;
 +>module.exports : Symbol(a, Decl(file.js, 2, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("file", Decl(file.js, 0, 0))
 +>exports : Symbol(a, Decl(file.js, 2, 5))
  >a : Symbol(a, Decl(file.js, 2, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).symbols
index 406c1eb55f..d3940d330e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).symbols
@@ -15,7 +15,7 @@ const a = {};
 
 module.exports = a;
 >module.exports : Symbol(a, Decl(file.js, 1, 5))
->module : Symbol(module.exports)
+>module : Symbol("subfolder/file", Decl(file.js, 0, 0))
 >exports : Symbol(a, Decl(file.js, 1, 5))
 >a : Symbol(a, Decl(file.js, 1, 5))
 
@@ -35,7 +35,7 @@ const a = {};
 
 module.exports = a;
 >module.exports : Symbol(a, Decl(file.js, 2, 5))
->module : Symbol(module.exports)
+>module : Symbol("file", Decl(file.js, 0, 0))
 >exports : Symbol(a, Decl(file.js, 2, 5))
 >a : Symbol(a, Decl(file.js, 2, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).symbols.diff
index 7da4e3ecb1..1e30b29f22 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(file.js, 1, 13))
 ->exports : Symbol(export=, Decl(file.js, 1, 13))
 +>module.exports : Symbol(a, Decl(file.js, 1, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("subfolder/file", Decl(file.js, 0, 0))
 +>exports : Symbol(a, Decl(file.js, 1, 5))
  >a : Symbol(a, Decl(file.js, 1, 5))
 
@@ -18,6 +18,6 @@
 
  module.exports = a;
 +>module.exports : Symbol(a, Decl(file.js, 2, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("file", Decl(file.js, 0, 0))
 +>exports : Symbol(a, Decl(file.js, 2, 5))
  >a : Symbol(a, Decl(file.js, 2, 5))
diff --git a/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols b/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols
index 27794910c7..c48e0f82bf 100644
--- a/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols
+++ b/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols
@@ -17,7 +17,7 @@ f(1, n => { })
  */
 module.exports = function (x, k) { return k(x) }
 >module.exports : Symbol(export=, Decl(first.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("first", Decl(first.js, 0, 0))
 >exports : Symbol(export=, Decl(first.js, 0, 0))
 >x : Symbol(x, Decl(first.js, 4, 27))
 >k : Symbol(k, Decl(first.js, 4, 29))
diff --git a/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols.diff b/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols.diff
index 6752d4cbb7..d9e9869fe9 100644
--- a/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/paramTagTypeResolution.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(first.js, 0, 0))
 ->module : Symbol(export=, Decl(first.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(first.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("first", Decl(first.js, 0, 0))
  >exports : Symbol(export=, Decl(first.js, 0, 0))
  >x : Symbol(x, Decl(first.js, 4, 27))
  >k : Symbol(k, Decl(first.js, 4, 29))
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.symbols b/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.symbols
index 80a283d7cd..fbbc8cd341 100644
--- a/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.symbols
+++ b/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.symbols
@@ -3,7 +3,7 @@
 === /lib/constants.js ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(constants.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("/lib/constants", Decl(constants.js, 0, 0))
 >exports : Symbol(export=, Decl(constants.js, 0, 0))
 
   str: 'x',
diff --git a/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.symbols.diff b/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.symbols.diff
index a967823ae7..4b7af45ed9 100644
--- a/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(constants.js, 0, 0))
 ->module : Symbol(export=, Decl(constants.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(constants.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("/lib/constants", Decl(constants.js, 0, 0))
  >exports : Symbol(export=, Decl(constants.js, 0, 0))
 
    str: 'x',
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/requireTwoPropertyAccesses.symbols b/testdata/baselines/reference/submodule/conformance/requireTwoPropertyAccesses.symbols
index ca428e12a7..c6093879d9 100644
--- a/testdata/baselines/reference/submodule/conformance/requireTwoPropertyAccesses.symbols
+++ b/testdata/baselines/reference/submodule/conformance/requireTwoPropertyAccesses.symbols
@@ -18,7 +18,7 @@ console.log(value)
 === mod.js ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(mod.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("mod", Decl(mod.js, 0, 0))
 >exports : Symbol(export=, Decl(mod.js, 0, 0))
 
     x: {
diff --git a/testdata/baselines/reference/submodule/conformance/requireTwoPropertyAccesses.symbols.diff b/testdata/baselines/reference/submodule/conformance/requireTwoPropertyAccesses.symbols.diff
index 3a813aa2e6..1e315295a7 100644
--- a/testdata/baselines/reference/submodule/conformance/requireTwoPropertyAccesses.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/requireTwoPropertyAccesses.symbols.diff
@@ -15,7 +15,7 @@
 ->module.exports : Symbol(module.exports, Decl(mod.js, 0, 0))
 ->module : Symbol(export=, Decl(mod.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(mod.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("mod", Decl(mod.js, 0, 0))
  >exports : Symbol(export=, Decl(mod.js, 0, 0))
 
      x: {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols
index 25919e7a12..8a9bc98176 100644
--- a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols
@@ -39,7 +39,7 @@ declare var module: any;
 /// <reference path='./types.d.ts'/>
 module.exports = minimatch
 >module.exports : Symbol(minimatch, Decl(minimatch.js, 6, 1))
->module : Symbol(module.exports)
+>module : Symbol("minimatch", Decl(minimatch.js, 0, 0))
 >exports : Symbol(minimatch, Decl(minimatch.js, 6, 1))
 >minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1))
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols.diff b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols.diff
index a8bd929f5f..57a1638d96 100644
--- a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.symbols.diff
@@ -19,7 +19,7 @@
 ->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))
 +>module.exports : Symbol(minimatch, Decl(minimatch.js, 6, 1))
-+>module : Symbol(module.exports)
++>module : Symbol("minimatch", Decl(minimatch.js, 0, 0))
 +>exports : Symbol(minimatch, Decl(minimatch.js, 6, 1))
 +>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1))
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeTagModuleExports.symbols b/testdata/baselines/reference/submodule/conformance/typeTagModuleExports.symbols
index 67612a6178..e7ec1c9fbc 100644
--- a/testdata/baselines/reference/submodule/conformance/typeTagModuleExports.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typeTagModuleExports.symbols
@@ -4,6 +4,6 @@
 /** @type {string} */
 module.exports = 0;
 >module.exports : Symbol(export=, Decl(bug27327.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bug27327", Decl(bug27327.js, 0, 0))
 >exports : Symbol(export=, Decl(bug27327.js, 0, 0))
 
diff --git a/testdata/baselines/reference/submodule/conformance/typeTagModuleExports.symbols.diff b/testdata/baselines/reference/submodule/conformance/typeTagModuleExports.symbols.diff
index e53a2c5f49..b1345f2869 100644
--- a/testdata/baselines/reference/submodule/conformance/typeTagModuleExports.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typeTagModuleExports.symbols.diff
@@ -7,5 +7,5 @@
 ->module.exports : Symbol(module.exports, Decl(bug27327.js, 0, 0))
 ->module : Symbol(export=, Decl(bug27327.js, 0, 0))
 +>module.exports : Symbol(export=, Decl(bug27327.js, 0, 0))
-+>module : Symbol(module.exports)
++>module : Symbol("bug27327", Decl(bug27327.js, 0, 0))
  >exports : Symbol(export=, Decl(bug27327.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols
index 32a138e1d0..13b3e5ac90 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols
@@ -12,7 +12,7 @@ declare var module: { exports: any};
 /** @typedef {A | B} Both */
 module.exports = C
 >module.exports : Symbol(C, Decl(mod1.js, 4, 18))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(C, Decl(mod1.js, 4, 18))
 >C : Symbol(C, Decl(mod1.js, 4, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols.diff b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols.diff
index 41eb9130b5..5715111117 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule.symbols.diff
@@ -8,7 +8,7 @@
 ->module : Symbol(export=, Decl(mod1.js, 0, 0))
 ->exports : Symbol(export=, Decl(mod1.js, 0, 0))
 +>module.exports : Symbol(C, Decl(mod1.js, 4, 18))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(C, Decl(mod1.js, 4, 18))
  >C : Symbol(C, Decl(mod1.js, 4, 18))
 
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols
index 2104a285c8..9d110aa536 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols
@@ -34,7 +34,7 @@ exports.Bar = class { }
 /** @typedef {number} Baz */
 module.exports = {
 >module.exports : Symbol(export=, Decl(mod1.js, 6, 23))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 6, 23))
 
     Baz: class { }
@@ -54,7 +54,7 @@ exports.Quid = 2;
 /** @typedef {number} Quack */
 module.exports = {
 >module.exports : Symbol(export=, Decl(mod1.js, 6, 23))
->module : Symbol(module.exports)
+>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 >exports : Symbol(export=, Decl(mod1.js, 6, 23))
 
     Quack: 2
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols.diff b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols.diff
index b01cc9dce5..056aa427ec 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule2.symbols.diff
@@ -31,7 +31,7 @@
 ->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))
 +>module.exports : Symbol(export=, Decl(mod1.js, 6, 23))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(export=, Decl(mod1.js, 6, 23))
 
      Baz: class { }
@@ -56,7 +56,7 @@
 ->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))
 +>module.exports : Symbol(export=, Decl(mod1.js, 6, 23))
-+>module : Symbol(module.exports)
++>module : Symbol("mod1", Decl(mod1.js, 0, 0))
 +>exports : Symbol(export=, Decl(mod1.js, 6, 23))
 
      Quack: 2
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule3.symbols b/testdata/baselines/reference/submodule/conformance/typedefCrossModule3.symbols
index 55b621c775..9eeddc372f 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule3.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule3.symbols
@@ -12,7 +12,7 @@ ns.Foo = class {}
 
 module.exports = ns;
 >module.exports : Symbol(ns, Decl(mod2.js, 1, 5))
->module : Symbol(module.exports)
+>module : Symbol("mod2", Decl(mod2.js, 0, 0))
 >exports : Symbol(ns, Decl(mod2.js, 1, 5))
 >ns : Symbol(ns, Decl(mod2.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule3.symbols.diff b/testdata/baselines/reference/submodule/conformance/typedefCrossModule3.symbols.diff
index 31e98d5c03..48d4f270b2 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule3.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule3.symbols.diff
@@ -21,7 +21,7 @@
 ->exports : Symbol(export=, Decl(mod2.js, 2, 17))
 ->ns : Symbol(ns, Decl(mod2.js, 1, 5), Decl(mod2.js, 1, 14))
 +>module.exports : Symbol(ns, Decl(mod2.js, 1, 5))
-+>module : Symbol(module.exports)
++>module : Symbol("mod2", Decl(mod2.js, 0, 0))
 +>exports : Symbol(ns, Decl(mod2.js, 1, 5))
 +>ns : Symbol(ns, Decl(mod2.js, 1, 5))
 
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule4.symbols b/testdata/baselines/reference/submodule/conformance/typedefCrossModule4.symbols
index df71c02b02..9c19f2c706 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule4.symbols
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule4.symbols
@@ -7,7 +7,7 @@ class Bar { }
 
 module.exports = { Foo: Bar };
 >module.exports : Symbol(export=, Decl(mod3.js, 1, 13))
->module : Symbol(module.exports)
+>module : Symbol("mod3", Decl(mod3.js, 0, 0))
 >exports : Symbol(export=, Decl(mod3.js, 1, 13))
 >Foo : Symbol(Foo, Decl(mod3.js, 2, 18))
 >Bar : Symbol(Bar, Decl(mod3.js, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/typedefCrossModule4.symbols.diff b/testdata/baselines/reference/submodule/conformance/typedefCrossModule4.symbols.diff
index 1324f7e5ba..d2d4cf6c02 100644
--- a/testdata/baselines/reference/submodule/conformance/typedefCrossModule4.symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/typedefCrossModule4.symbols.diff
@@ -7,7 +7,7 @@
 ->module.exports : Symbol(module.exports, Decl(mod3.js, 0, 0))
 ->module : Symbol(export=, Decl(mod3.js, 1, 13))
 +>module.exports : Symbol(export=, Decl(mod3.js, 1, 13))
-+>module : Symbol(module.exports)
++>module : Symbol("mod3", Decl(mod3.js, 0, 0))
  >exports : Symbol(export=, Decl(mod3.js, 1, 13))
  >Foo : Symbol(Foo, Decl(mod3.js, 2, 18))
  >Bar : Symbol(Bar, Decl(mod3.js, 0, 0))
\ No newline at end of file