diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 17eda776bda..bc25bfd12d6 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -52,7 +52,7 @@ class TypeWriterWalker {
     }
 
     private *visitNode(node: ts.Node, isSymbolWalk: boolean): IterableIterator<TypeWriterResult> {
-        if (ts.isExpressionNode(node) || node.kind === ts.SyntaxKind.Identifier) {
+        if (ts.isExpressionNode(node) || node.kind === ts.SyntaxKind.Identifier || ts.isDeclarationName(node)) {
             const result = this.writeTypeOrSymbol(node, isSymbolWalk);
             if (result) {
                 yield result;
@@ -122,4 +122,4 @@ class TypeWriterWalker {
             symbol: symbolString
         };
     }
-}
\ No newline at end of file
+}
diff --git a/tests/baselines/reference/ClassDeclaration21.symbols b/tests/baselines/reference/ClassDeclaration21.symbols
index f9bd42a3a4f..3d0b571ea37 100644
--- a/tests/baselines/reference/ClassDeclaration21.symbols
+++ b/tests/baselines/reference/ClassDeclaration21.symbols
@@ -3,5 +3,8 @@ class C {
 >C : Symbol(C, Decl(ClassDeclaration21.ts, 0, 0))
 
     0();
+>0 : Symbol(C[0], Decl(ClassDeclaration21.ts, 0, 9))
+
     1() { }
+>1 : Symbol(C[1], Decl(ClassDeclaration21.ts, 1, 8))
 }
diff --git a/tests/baselines/reference/ClassDeclaration21.types b/tests/baselines/reference/ClassDeclaration21.types
index fa41bb54676..32ed0db413e 100644
--- a/tests/baselines/reference/ClassDeclaration21.types
+++ b/tests/baselines/reference/ClassDeclaration21.types
@@ -3,5 +3,8 @@ class C {
 >C : C
 
     0();
+>0 : () => any
+
     1() { }
+>1 : () => void
 }
diff --git a/tests/baselines/reference/ClassDeclaration22.symbols b/tests/baselines/reference/ClassDeclaration22.symbols
index 059ff9e825c..b53258c6ee5 100644
--- a/tests/baselines/reference/ClassDeclaration22.symbols
+++ b/tests/baselines/reference/ClassDeclaration22.symbols
@@ -3,5 +3,8 @@ class C {
 >C : Symbol(C, Decl(ClassDeclaration22.ts, 0, 0))
 
     "foo"();
+>"foo" : Symbol(C["foo"], Decl(ClassDeclaration22.ts, 0, 9))
+
     "bar"() { }
+>"bar" : Symbol(C["bar"], Decl(ClassDeclaration22.ts, 1, 12))
 }
diff --git a/tests/baselines/reference/ClassDeclaration22.types b/tests/baselines/reference/ClassDeclaration22.types
index 359ac950462..768160a8ac9 100644
--- a/tests/baselines/reference/ClassDeclaration22.types
+++ b/tests/baselines/reference/ClassDeclaration22.types
@@ -3,5 +3,8 @@ class C {
 >C : C
 
     "foo"();
+>"foo" : () => any
+
     "bar"() { }
+>"bar" : () => void
 }
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.symbols b/tests/baselines/reference/aliasOnMergedModuleInterface.symbols
index c4f5c0730a1..253c5639f5d 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.symbols
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.symbols
@@ -19,6 +19,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 
 === tests/cases/compiler/aliasOnMergedModuleInterface_0.ts ===
 declare module "foo"
+>"foo" : Symbol("foo", Decl(aliasOnMergedModuleInterface_0.ts, 0, 0))
 {
     module B {
 >B : Symbol(B, Decl(aliasOnMergedModuleInterface_0.ts, 1, 1), Decl(aliasOnMergedModuleInterface_0.ts, 5, 5))
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.types b/tests/baselines/reference/aliasOnMergedModuleInterface.types
index 9ba023a8dd8..fb9c197feec 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.types
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.types
@@ -26,6 +26,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 
 === tests/cases/compiler/aliasOnMergedModuleInterface_0.ts ===
 declare module "foo"
+>"foo" : typeof "foo"
 {
     module B {
 >B : any
diff --git a/tests/baselines/reference/ambientDeclarations.symbols b/tests/baselines/reference/ambientDeclarations.symbols
index ef5c5403ccf..1436c698cff 100644
--- a/tests/baselines/reference/ambientDeclarations.symbols
+++ b/tests/baselines/reference/ambientDeclarations.symbols
@@ -160,6 +160,8 @@ var q = M1.fn();
 // Ambient external module in the global module
 // Ambient external module with a string literal name that is a top level external module name
 declare module 'external1' {
+>'external1' : Symbol('external1', Decl(ambientDeclarations.ts, 67, 16))
+
     var q;
 >q : Symbol(q, Decl(ambientDeclarations.ts, 72, 7))
 }
diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types
index a571eb9fa7b..3d0b53ee19d 100644
--- a/tests/baselines/reference/ambientDeclarations.types
+++ b/tests/baselines/reference/ambientDeclarations.types
@@ -163,6 +163,8 @@ var q = M1.fn();
 // Ambient external module in the global module
 // Ambient external module with a string literal name that is a top level external module name
 declare module 'external1' {
+>'external1' : typeof 'external1'
+
     var q;
 >q : any
 }
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.symbols b/tests/baselines/reference/ambientDeclarationsExternal.symbols
index 57d3fdf914f..49f0775e136 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.symbols
+++ b/tests/baselines/reference/ambientDeclarationsExternal.symbols
@@ -20,6 +20,8 @@ var n: number;
 === tests/cases/conformance/ambient/decls.ts ===
 // Ambient external module with export assignment
 declare module 'equ' {
+>'equ' : Symbol('equ', Decl(decls.ts, 0, 0))
+
     var x;
 >x : Symbol(x, Decl(decls.ts, 2, 7))
 
@@ -28,6 +30,8 @@ declare module 'equ' {
 }
 
 declare module 'equ2' {
+>'equ2' : Symbol('equ2', Decl(decls.ts, 4, 1))
+
     var x: number;
 >x : Symbol(x, Decl(decls.ts, 7, 7))
 }
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.types b/tests/baselines/reference/ambientDeclarationsExternal.types
index 4cf7d6b0bcb..522c9bd1442 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.types
+++ b/tests/baselines/reference/ambientDeclarationsExternal.types
@@ -20,6 +20,8 @@ var n: number;
 === tests/cases/conformance/ambient/decls.ts ===
 // Ambient external module with export assignment
 declare module 'equ' {
+>'equ' : typeof 'equ'
+
     var x;
 >x : any
 
@@ -28,6 +30,8 @@ declare module 'equ' {
 }
 
 declare module 'equ2' {
+>'equ2' : typeof 'equ2'
+
     var x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.symbols b/tests/baselines/reference/ambientDeclarationsPatterns.symbols
index 4c0acc93f8f..22fc2937872 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.symbols
+++ b/tests/baselines/reference/ambientDeclarationsPatterns.symbols
@@ -25,23 +25,31 @@ foo(fileText);
 
 === tests/cases/conformance/ambient/declarations.d.ts ===
 declare module "foo*baz" {
+>"foo*baz" : Symbol("foo*baz", Decl(declarations.d.ts, 0, 0), Decl(declarations.d.ts, 2, 1))
+
     export function foo(s: string): void;
 >foo : Symbol(foo, Decl(declarations.d.ts, 0, 26))
 >s : Symbol(s, Decl(declarations.d.ts, 1, 24))
 }
 // Augmentations still work
 declare module "foo*baz" {
+>"foo*baz" : Symbol("foo*baz", Decl(declarations.d.ts, 0, 0), Decl(declarations.d.ts, 2, 1))
+
     export const baz: string;
 >baz : Symbol(baz, Decl(declarations.d.ts, 5, 16))
 }
 
 // Longest prefix wins
 declare module "foos*" {
+>"foos*" : Symbol("foos*", Decl(declarations.d.ts, 6, 1))
+
     export const foos: string;
 >foos : Symbol(foos, Decl(declarations.d.ts, 10, 16))
 }
 
 declare module "*!text" {
+>"*!text" : Symbol("*!text", Decl(declarations.d.ts, 11, 1))
+
     const x: string;
 >x : Symbol(x, Decl(declarations.d.ts, 14, 9))
 
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.types b/tests/baselines/reference/ambientDeclarationsPatterns.types
index adf8ae1ab3b..77cef7515b2 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.types
+++ b/tests/baselines/reference/ambientDeclarationsPatterns.types
@@ -28,23 +28,31 @@ foo(fileText);
 
 === tests/cases/conformance/ambient/declarations.d.ts ===
 declare module "foo*baz" {
+>"foo*baz" : typeof "foo*baz"
+
     export function foo(s: string): void;
 >foo : (s: string) => void
 >s : string
 }
 // Augmentations still work
 declare module "foo*baz" {
+>"foo*baz" : typeof "foo*baz"
+
     export const baz: string;
 >baz : string
 }
 
 // Longest prefix wins
 declare module "foos*" {
+>"foos*" : typeof "foos*"
+
     export const foos: string;
 >foos : string
 }
 
 declare module "*!text" {
+>"*!text" : typeof "*!text"
+
     const x: string;
 >x : string
 
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.symbols b/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.symbols
index 63d50b6c85e..1ebc29ee92a 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.symbols
+++ b/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.symbols
@@ -1,4 +1,4 @@
 === tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts ===
 declare module "too*many*asterisks" { }
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"too*many*asterisks" : Symbol("too*many*asterisks", Decl(ambientDeclarationsPatterns_tooManyAsterisks.ts, 0, 0))
+
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types b/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types
index 63d50b6c85e..93ea5f185d0 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types
+++ b/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts ===
 declare module "too*many*asterisks" { }
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"too*many*asterisks" : typeof "too*many*asterisks"
+
diff --git a/tests/baselines/reference/ambientErrors.symbols b/tests/baselines/reference/ambientErrors.symbols
index 684e87b1fd4..d9c3647fcc6 100644
--- a/tests/baselines/reference/ambientErrors.symbols
+++ b/tests/baselines/reference/ambientErrors.symbols
@@ -90,13 +90,17 @@ module M2 {
 >M2 : Symbol(M2, Decl(ambientErrors.ts, 42, 1))
 
     declare module 'nope' { }
+>'nope' : Symbol('nope', Decl(ambientErrors.ts, 45, 11))
 }
 
 // Ambient external module with a string literal name that isn't a top level external module name
 declare module '../foo' { }
+>'../foo' : Symbol('../foo', Decl(ambientErrors.ts, 47, 1))
 
 // Ambient external module with export assignment and other exported members
 declare module 'bar' {
+>'bar' : Symbol('bar', Decl(ambientErrors.ts, 50, 27))
+
     var n;
 >n : Symbol(n, Decl(ambientErrors.ts, 54, 7))
 
diff --git a/tests/baselines/reference/ambientErrors.types b/tests/baselines/reference/ambientErrors.types
index 3cd46066219..bd4033e9397 100644
--- a/tests/baselines/reference/ambientErrors.types
+++ b/tests/baselines/reference/ambientErrors.types
@@ -97,13 +97,17 @@ module M2 {
 >M2 : any
 
     declare module 'nope' { }
+>'nope' : typeof 'nope'
 }
 
 // Ambient external module with a string literal name that isn't a top level external module name
 declare module '../foo' { }
+>'../foo' : typeof '../foo'
 
 // Ambient external module with export assignment and other exported members
 declare module 'bar' {
+>'bar' : typeof 'bar'
+
     var n;
 >n : any
 
diff --git a/tests/baselines/reference/ambientExportDefaultErrors.symbols b/tests/baselines/reference/ambientExportDefaultErrors.symbols
index bfec3520347..b3e6b79cd3e 100644
--- a/tests/baselines/reference/ambientExportDefaultErrors.symbols
+++ b/tests/baselines/reference/ambientExportDefaultErrors.symbols
@@ -18,6 +18,8 @@ export as namespace Foo2;
 === tests/cases/compiler/indirection.d.ts ===
 /// <reference path="./foo.d.ts" />
 declare module "indirect" {
+>"indirect" : Symbol("indirect", Decl(indirection.d.ts, 0, 0))
+
     export default typeof Foo.default;
 >Foo.default : Symbol(Foo.default, Decl(foo.d.ts, 0, 0))
 >Foo : Symbol(Foo, Decl(foo.d.ts, 0, 21))
@@ -27,6 +29,8 @@ declare module "indirect" {
 === tests/cases/compiler/indirection2.d.ts ===
 /// <reference path="./foo2.d.ts" />
 declare module "indirect2" {
+>"indirect2" : Symbol("indirect2", Decl(indirection2.d.ts, 0, 0))
+
     export = typeof Foo2;
 >Foo2 : Symbol(Foo2, Decl(foo2.d.ts, 0, 15))
 }
diff --git a/tests/baselines/reference/ambientExportDefaultErrors.types b/tests/baselines/reference/ambientExportDefaultErrors.types
index 97d2051a70a..c9c2351d444 100644
--- a/tests/baselines/reference/ambientExportDefaultErrors.types
+++ b/tests/baselines/reference/ambientExportDefaultErrors.types
@@ -26,6 +26,8 @@ export as namespace Foo2;
 === tests/cases/compiler/indirection.d.ts ===
 /// <reference path="./foo.d.ts" />
 declare module "indirect" {
+>"indirect" : typeof "indirect"
+
     export default typeof Foo.default;
 >typeof Foo.default : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >Foo.default : number
@@ -36,6 +38,8 @@ declare module "indirect" {
 === tests/cases/compiler/indirection2.d.ts ===
 /// <reference path="./foo2.d.ts" />
 declare module "indirect2" {
+>"indirect2" : typeof "indirect2"
+
     export = typeof Foo2;
 >typeof Foo2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >Foo2 : number
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.symbols b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.symbols
index 7ab22e063e3..837de2d5ddc 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.symbols
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.symbols
@@ -6,6 +6,8 @@ export = D;
 >D : Symbol(D, Decl(ambientExternalModuleInAnotherExternalModule.ts, 0, 0))
 
 declare module "ext" {
+>"ext" : Symbol("ext", Decl(ambientExternalModuleInAnotherExternalModule.ts, 1, 11))
+
     export class C { }
 >C : Symbol(C, Decl(ambientExternalModuleInAnotherExternalModule.ts, 3, 22))
 }
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types
index e7d852d7a3d..f335f5255d2 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types
@@ -6,6 +6,8 @@ export = D;
 >D : D
 
 declare module "ext" {
+>"ext" : typeof "ext"
+
     export class C { }
 >C : C
 }
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.symbols b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.symbols
index a2b535c5b80..bb83ea46ae1 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.symbols
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.symbols
@@ -3,4 +3,5 @@ module M {
 >M : Symbol(M, Decl(ambientExternalModuleInsideNonAmbient.ts, 0, 0))
 
     export declare module "M" { }
+>"M" : Symbol("M", Decl(ambientExternalModuleInsideNonAmbient.ts, 0, 10))
 }
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
index d635bfd1d1e..be88c42d3f9 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
@@ -3,4 +3,5 @@ module M {
 >M : any
 
     export declare module "M" { }
+>"M" : typeof "M"
 }
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.symbols b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.symbols
index 10841ebc4cd..8ef83c37ebf 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.symbols
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.symbols
@@ -1,3 +1,4 @@
 === tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts ===
 export declare module "M" { }
-No type information for this code.
\ No newline at end of file
+>"M" : Symbol("M", Decl(ambientExternalModuleInsideNonAmbientExternalModule.ts, 0, 0))
+
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.types b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.types
index 10841ebc4cd..9a4bb0c94ef 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.types
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.types
@@ -1,3 +1,4 @@
 === tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts ===
 export declare module "M" { }
-No type information for this code.
\ No newline at end of file
+>"M" : any
+
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.symbols b/tests/baselines/reference/ambientExternalModuleMerging.symbols
index 7fea7fea89f..b99157b1142 100644
--- a/tests/baselines/reference/ambientExternalModuleMerging.symbols
+++ b/tests/baselines/reference/ambientExternalModuleMerging.symbols
@@ -17,12 +17,16 @@ var y = M.y;
 
 === tests/cases/conformance/ambient/ambientExternalModuleMerging_declare.ts ===
 declare module "M" {
+>"M" : Symbol("M", Decl(ambientExternalModuleMerging_declare.ts, 0, 0), Decl(ambientExternalModuleMerging_declare.ts, 2, 1))
+
     export var x: string;
 >x : Symbol(x, Decl(ambientExternalModuleMerging_declare.ts, 1, 14))
 }
 
 // Merge
 declare module "M" {
+>"M" : Symbol("M", Decl(ambientExternalModuleMerging_declare.ts, 0, 0), Decl(ambientExternalModuleMerging_declare.ts, 2, 1))
+
     export var y: string;
 >y : Symbol(y, Decl(ambientExternalModuleMerging_declare.ts, 6, 14))
 }
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.types b/tests/baselines/reference/ambientExternalModuleMerging.types
index 1c1be0fd256..8150f6c6dfc 100644
--- a/tests/baselines/reference/ambientExternalModuleMerging.types
+++ b/tests/baselines/reference/ambientExternalModuleMerging.types
@@ -17,12 +17,16 @@ var y = M.y;
 
 === tests/cases/conformance/ambient/ambientExternalModuleMerging_declare.ts ===
 declare module "M" {
+>"M" : typeof "M"
+
     export var x: string;
 >x : string
 }
 
 // Merge
 declare module "M" {
+>"M" : typeof "M"
+
     export var y: string;
 >y : string
 }
diff --git a/tests/baselines/reference/ambientExternalModuleReopen.symbols b/tests/baselines/reference/ambientExternalModuleReopen.symbols
index a2a1ba72fab..74bc430550b 100644
--- a/tests/baselines/reference/ambientExternalModuleReopen.symbols
+++ b/tests/baselines/reference/ambientExternalModuleReopen.symbols
@@ -1,9 +1,13 @@
 === tests/cases/compiler/ambientExternalModuleReopen.ts ===
 declare module "fs" {
+>"fs" : Symbol("fs", Decl(ambientExternalModuleReopen.ts, 0, 0), Decl(ambientExternalModuleReopen.ts, 2, 1))
+
     var x: string;
 >x : Symbol(x, Decl(ambientExternalModuleReopen.ts, 1, 7))
 }
 declare module 'fs' {
+>'fs' : Symbol("fs", Decl(ambientExternalModuleReopen.ts, 0, 0), Decl(ambientExternalModuleReopen.ts, 2, 1))
+
     var y: number;
 >y : Symbol(y, Decl(ambientExternalModuleReopen.ts, 4, 7))
 }
diff --git a/tests/baselines/reference/ambientExternalModuleReopen.types b/tests/baselines/reference/ambientExternalModuleReopen.types
index 842d634344c..dffba752e05 100644
--- a/tests/baselines/reference/ambientExternalModuleReopen.types
+++ b/tests/baselines/reference/ambientExternalModuleReopen.types
@@ -1,9 +1,13 @@
 === tests/cases/compiler/ambientExternalModuleReopen.ts ===
 declare module "fs" {
+>"fs" : typeof "fs"
+
     var x: string;
 >x : string
 }
 declare module 'fs' {
+>'fs' : typeof "fs"
+
     var y: number;
 >y : number
 }
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols
index d7e3b5925b1..621c7b3ebfc 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols
@@ -9,6 +9,8 @@ var c = new A();
 
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_0.ts ===
 declare module 'M' {
+>'M' : Symbol('M', Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 0, 0))
+
     module C {
 >C : Symbol(C, Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 3, 5))
 
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
index 4e9043d1b75..17372294131 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
@@ -10,6 +10,8 @@ var c = new A();
 
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_0.ts ===
 declare module 'M' {
+>'M' : typeof 'M'
+
     module C {
 >C : typeof C
 
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.symbols
index 1e8ad3c5fa5..3c7754d0135 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.symbols
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts ===
 declare module "OuterModule" {
+>"OuterModule" : Symbol("OuterModule", Decl(ambientExternalModuleWithRelativeExternalImportDeclaration.ts, 0, 0))
+
     import m2 = require("./SubModule");
 >m2 : Symbol(m2, Decl(ambientExternalModuleWithRelativeExternalImportDeclaration.ts, 0, 30))
 
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
index 0d173e5e7a9..4072b2fcedd 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts ===
 declare module "OuterModule" {
+>"OuterModule" : typeof "OuterModule"
+
     import m2 = require("./SubModule");
 >m2 : any
 
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.symbols b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.symbols
index a8ef371e805..350a84a0b4a 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.symbols
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.symbols
@@ -1,10 +1,14 @@
 === tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts ===
 declare module "./relativeModule" {
+>"./relativeModule" : Symbol("./relativeModule", Decl(ambientExternalModuleWithRelativeModuleName.ts, 0, 0))
+
     var x: string;
 >x : Symbol(x, Decl(ambientExternalModuleWithRelativeModuleName.ts, 1, 7))
 }
 
 declare module ".\\relativeModule" {
+>".\\relativeModule" : Symbol(".\\relativeModule", Decl(ambientExternalModuleWithRelativeModuleName.ts, 2, 1))
+
     var x: string;
 >x : Symbol(x, Decl(ambientExternalModuleWithRelativeModuleName.ts, 5, 7))
 }
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types
index ab0f2b62f58..d585e8ed6a1 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types
@@ -1,10 +1,14 @@
 === tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts ===
 declare module "./relativeModule" {
+>"./relativeModule" : typeof "./relativeModule"
+
     var x: string;
 >x : string
 }
 
 declare module ".\\relativeModule" {
+>".\\relativeModule" : typeof ".\\relativeModule"
+
     var x: string;
 >x : string
 }
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols
index 15ddf4ac488..6827122959d 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols
@@ -9,6 +9,8 @@ var c = new A();
 
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_0.ts ===
 declare module 'M' {
+>'M' : Symbol('M', Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 0, 0))
+
     module C {
 >C : Symbol(C, Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 3, 5))
 
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
index 0029817400b..c943603fb52 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
@@ -10,6 +10,8 @@ var c = new A();
 
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_0.ts ===
 declare module 'M' {
+>'M' : typeof 'M'
+
     module C {
 >C : typeof C
 
diff --git a/tests/baselines/reference/ambientRequireFunction.symbols b/tests/baselines/reference/ambientRequireFunction.symbols
index 11f91a66357..b2e94e89a2c 100644
--- a/tests/baselines/reference/ambientRequireFunction.symbols
+++ b/tests/baselines/reference/ambientRequireFunction.symbols
@@ -18,6 +18,8 @@ declare function require(moduleName: string): any;
 >moduleName : Symbol(moduleName, Decl(node.d.ts, 0, 25))
 
 declare module "fs" {
+>"fs" : Symbol("fs", Decl(node.d.ts, 0, 50))
+
     export function readFileSync(s: string): string;
 >readFileSync : Symbol(readFileSync, Decl(node.d.ts, 2, 21))
 >s : Symbol(s, Decl(node.d.ts, 3, 33))
diff --git a/tests/baselines/reference/ambientRequireFunction.types b/tests/baselines/reference/ambientRequireFunction.types
index 5ae9a85188c..ed34aa4309f 100644
--- a/tests/baselines/reference/ambientRequireFunction.types
+++ b/tests/baselines/reference/ambientRequireFunction.types
@@ -21,6 +21,8 @@ declare function require(moduleName: string): any;
 >moduleName : string
 
 declare module "fs" {
+>"fs" : typeof "fs"
+
     export function readFileSync(s: string): string;
 >readFileSync : (s: string) => string
 >s : string
diff --git a/tests/baselines/reference/ambientShorthand.symbols b/tests/baselines/reference/ambientShorthand.symbols
index 6747fd65173..c2231ac5c3d 100644
--- a/tests/baselines/reference/ambientShorthand.symbols
+++ b/tests/baselines/reference/ambientShorthand.symbols
@@ -18,7 +18,9 @@ foo(bar, baz, boom);
 
 === tests/cases/conformance/ambient/declarations.d.ts ===
 declare module "jquery"
-No type information for this code.// Semicolon is optional
-No type information for this code.declare module "fs";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"jquery" : Symbol("jquery", Decl(declarations.d.ts, 0, 0))
+
+// Semicolon is optional
+declare module "fs";
+>"fs" : Symbol("fs", Decl(declarations.d.ts, 0, 23))
+
diff --git a/tests/baselines/reference/ambientShorthand.types b/tests/baselines/reference/ambientShorthand.types
index 054349b1a6a..4c93cc7fd8f 100644
--- a/tests/baselines/reference/ambientShorthand.types
+++ b/tests/baselines/reference/ambientShorthand.types
@@ -19,7 +19,9 @@ foo(bar, baz, boom);
 
 === tests/cases/conformance/ambient/declarations.d.ts ===
 declare module "jquery"
-No type information for this code.// Semicolon is optional
-No type information for this code.declare module "fs";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"jquery" : any
+
+// Semicolon is optional
+declare module "fs";
+>"fs" : any
+
diff --git a/tests/baselines/reference/ambientShorthand_declarationEmit.symbols b/tests/baselines/reference/ambientShorthand_declarationEmit.symbols
index f1b3284b0f2..f1eabac0e9e 100644
--- a/tests/baselines/reference/ambientShorthand_declarationEmit.symbols
+++ b/tests/baselines/reference/ambientShorthand_declarationEmit.symbols
@@ -1,4 +1,4 @@
 === tests/cases/conformance/ambient/ambientShorthand_declarationEmit.ts ===
 declare module "foo";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"foo" : Symbol("foo", Decl(ambientShorthand_declarationEmit.ts, 0, 0))
+
diff --git a/tests/baselines/reference/ambientShorthand_declarationEmit.types b/tests/baselines/reference/ambientShorthand_declarationEmit.types
index f1b3284b0f2..c5c8411bb03 100644
--- a/tests/baselines/reference/ambientShorthand_declarationEmit.types
+++ b/tests/baselines/reference/ambientShorthand_declarationEmit.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/ambient/ambientShorthand_declarationEmit.ts ===
 declare module "foo";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"foo" : any
+
diff --git a/tests/baselines/reference/ambientShorthand_duplicate.symbols b/tests/baselines/reference/ambientShorthand_duplicate.symbols
index 05856b47b92..6d5716a193c 100644
--- a/tests/baselines/reference/ambientShorthand_duplicate.symbols
+++ b/tests/baselines/reference/ambientShorthand_duplicate.symbols
@@ -6,5 +6,5 @@ import foo from "foo";
 
 === tests/cases/conformance/ambient/declarations1.d.ts ===
 declare module "foo";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"foo" : Symbol("foo", Decl(declarations1.d.ts, 0, 0))
+
diff --git a/tests/baselines/reference/ambientShorthand_duplicate.types b/tests/baselines/reference/ambientShorthand_duplicate.types
index 1520c5447ec..8abf9f7b230 100644
--- a/tests/baselines/reference/ambientShorthand_duplicate.types
+++ b/tests/baselines/reference/ambientShorthand_duplicate.types
@@ -6,5 +6,5 @@ import foo from "foo";
 
 === tests/cases/conformance/ambient/declarations1.d.ts ===
 declare module "foo";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"foo" : any
+
diff --git a/tests/baselines/reference/ambientShorthand_merging.symbols b/tests/baselines/reference/ambientShorthand_merging.symbols
index 8a0ca5acb74..d37bdb06078 100644
--- a/tests/baselines/reference/ambientShorthand_merging.symbols
+++ b/tests/baselines/reference/ambientShorthand_merging.symbols
@@ -7,5 +7,5 @@ import foo, {bar} from "foo";
 
 === tests/cases/conformance/ambient/declarations1.d.ts ===
 declare module "foo";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"foo" : Symbol("foo", Decl(declarations1.d.ts, 0, 0))
+
diff --git a/tests/baselines/reference/ambientShorthand_merging.types b/tests/baselines/reference/ambientShorthand_merging.types
index 78390a35dd8..ad9827f47eb 100644
--- a/tests/baselines/reference/ambientShorthand_merging.types
+++ b/tests/baselines/reference/ambientShorthand_merging.types
@@ -7,5 +7,5 @@ import foo, {bar} from "foo";
 
 === tests/cases/conformance/ambient/declarations1.d.ts ===
 declare module "foo";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"foo" : any
+
diff --git a/tests/baselines/reference/ambientShorthand_reExport.symbols b/tests/baselines/reference/ambientShorthand_reExport.symbols
index 1e8d5318011..3aa3ddcec3d 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.symbols
+++ b/tests/baselines/reference/ambientShorthand_reExport.symbols
@@ -1,7 +1,8 @@
 === tests/cases/conformance/ambient/declarations.d.ts ===
 declare module "jquery";
-No type information for this code.
-No type information for this code.=== tests/cases/conformance/ambient/reExportX.ts ===
+>"jquery" : Symbol("jquery", Decl(declarations.d.ts, 0, 0))
+
+=== tests/cases/conformance/ambient/reExportX.ts ===
 export {x} from "jquery";
 >x : Symbol(x, Decl(reExportX.ts, 0, 8))
 
diff --git a/tests/baselines/reference/ambientShorthand_reExport.types b/tests/baselines/reference/ambientShorthand_reExport.types
index 5765c7e0331..e3e6c9742fd 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.types
+++ b/tests/baselines/reference/ambientShorthand_reExport.types
@@ -1,7 +1,8 @@
 === tests/cases/conformance/ambient/declarations.d.ts ===
 declare module "jquery";
-No type information for this code.
-No type information for this code.=== tests/cases/conformance/ambient/reExportX.ts ===
+>"jquery" : any
+
+=== tests/cases/conformance/ambient/reExportX.ts ===
 export {x} from "jquery";
 >x : any
 
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.symbols b/tests/baselines/reference/arityAndOrderCompatibility01.symbols
index 3a5d55dc1e6..16c1118738e 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.symbols
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.symbols
@@ -4,7 +4,11 @@ interface StrNum extends Array<string|number> {
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: string;
+>0 : Symbol(StrNum[0], Decl(arityAndOrderCompatibility01.ts, 0, 47))
+
     1: number;
+>1 : Symbol(StrNum[1], Decl(arityAndOrderCompatibility01.ts, 1, 14))
+
     length: 2;
 >length : Symbol(StrNum.length, Decl(arityAndOrderCompatibility01.ts, 2, 14))
 }
@@ -20,7 +24,11 @@ var z: {
 >z : Symbol(z, Decl(arityAndOrderCompatibility01.ts, 8, 3))
 
     0: string;
+>0 : Symbol(0, Decl(arityAndOrderCompatibility01.ts, 8, 8))
+
     1: number;
+>1 : Symbol(1, Decl(arityAndOrderCompatibility01.ts, 9, 14))
+
     length: 2;
 >length : Symbol(length, Decl(arityAndOrderCompatibility01.ts, 10, 14))
 }
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.types b/tests/baselines/reference/arityAndOrderCompatibility01.types
index 80e91fbd2e7..6fdbab7a587 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.types
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.types
@@ -4,7 +4,11 @@ interface StrNum extends Array<string|number> {
 >Array : T[]
 
     0: string;
+>0 : string
+
     1: number;
+>1 : number
+
     length: 2;
 >length : 2
 }
@@ -20,7 +24,11 @@ var z: {
 >z : { 0: string; 1: number; length: 2; }
 
     0: string;
+>0 : string
+
     1: number;
+>1 : number
+
     length: 2;
 >length : 2
 }
diff --git a/tests/baselines/reference/arrayLiterals3.symbols b/tests/baselines/reference/arrayLiterals3.symbols
index 8a94e9ee462..d1773ef97d7 100644
--- a/tests/baselines/reference/arrayLiterals3.symbols
+++ b/tests/baselines/reference/arrayLiterals3.symbols
@@ -38,7 +38,10 @@ interface tup {
 >tup : Symbol(tup, Decl(arrayLiterals3.ts, 23, 67))
 
     0: number[]|string[];
+>0 : Symbol(tup[0], Decl(arrayLiterals3.ts, 25, 15))
+
     1: number[]|string[];
+>1 : Symbol(tup[1], Decl(arrayLiterals3.ts, 26, 25))
 }
 interface myArray extends Array<Number> { }
 >myArray : Symbol(myArray, Decl(arrayLiterals3.ts, 28, 1))
diff --git a/tests/baselines/reference/arrayLiterals3.types b/tests/baselines/reference/arrayLiterals3.types
index 926f1448a44..7d890f38fb4 100644
--- a/tests/baselines/reference/arrayLiterals3.types
+++ b/tests/baselines/reference/arrayLiterals3.types
@@ -64,7 +64,10 @@ interface tup {
 >tup : tup
 
     0: number[]|string[];
+>0 : number[] | string[]
+
     1: number[]|string[];
+>1 : number[] | string[]
 }
 interface myArray extends Array<Number> { }
 >myArray : myArray
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols
index ce633683339..4bd6397936d 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols
@@ -4,9 +4,11 @@
 
 class S { 1: string; }
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 0, 0))
+>1 : Symbol(S[1], Decl(assignmentCompatWithObjectMembersNumericNames.ts, 3, 9))
 
 class T { 1.: string; }
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 3, 22))
+>1. : Symbol(T[1.], Decl(assignmentCompatWithObjectMembersNumericNames.ts, 4, 9))
 
 var s: S;
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 5, 3))
@@ -18,10 +20,12 @@ var t: T;
 
 interface S2 { 1: string; bar?: string }
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 6, 9))
+>1 : Symbol(S2[1], Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 14))
 >bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 25))
 
 interface T2 { 1.0: string; baz?: string }
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 40))
+>1.0 : Symbol(T2[1.0], Decl(assignmentCompatWithObjectMembersNumericNames.ts, 9, 14))
 >baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 9, 27))
 
 var s2: S2;
@@ -34,17 +38,21 @@ var t2: T2;
 
 var a: { 1.: string; bar?: string }
 >a : Symbol(a, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 13, 3))
+>1. : Symbol(1., Decl(assignmentCompatWithObjectMembersNumericNames.ts, 13, 8))
 >bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 13, 20))
 
 var b: { 1.0: string; baz?: string }
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 14, 3))
+>1.0 : Symbol(1.0, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 14, 8))
 >baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 14, 21))
 
 var a2 = { 1.0: '' };
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 16, 3))
+>1.0 : Symbol(1.0, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 16, 10))
 
 var b2 = { 1: '' };
 >b2 : Symbol(b2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 17, 3))
+>1 : Symbol(1, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 17, 10))
 
 s = t;
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 5, 3))
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types
index 0c44316d324..aea92a9aa3f 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types
@@ -4,9 +4,11 @@
 
 class S { 1: string; }
 >S : S
+>1 : string
 
 class T { 1.: string; }
 >T : T
+>1. : string
 
 var s: S;
 >s : S
@@ -18,10 +20,12 @@ var t: T;
 
 interface S2 { 1: string; bar?: string }
 >S2 : S2
+>1 : string
 >bar : string
 
 interface T2 { 1.0: string; baz?: string }
 >T2 : T2
+>1.0 : string
 >baz : string
 
 var s2: S2;
@@ -34,20 +38,24 @@ var t2: T2;
 
 var a: { 1.: string; bar?: string }
 >a : { 1.: string; bar?: string; }
+>1. : string
 >bar : string
 
 var b: { 1.0: string; baz?: string }
 >b : { 1.0: string; baz?: string; }
+>1.0 : string
 >baz : string
 
 var a2 = { 1.0: '' };
 >a2 : { 1.0: string; }
 >{ 1.0: '' } : { 1.0: string; }
+>1.0 : string
 >'' : ""
 
 var b2 = { 1: '' };
 >b2 : { 1: string; }
 >{ 1: '' } : { 1: string; }
+>1 : string
 >'' : ""
 
 s = t;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols
index b33dd82f99a..a55c665b085 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols
@@ -7,9 +7,11 @@ module JustStrings {
 
     class S { '1': string; }
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 3, 20))
+>'1' : Symbol(S['1'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 4, 13))
 
     class T { '1.': string; }
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 4, 28))
+>'1.' : Symbol(T['1.'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 5, 13))
 
     var s: S;
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7))
@@ -21,10 +23,12 @@ module JustStrings {
 
     interface S2 { '1': string; bar?: string }
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 13))
+>'1' : Symbol(S2['1'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 9, 18))
 >bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 9, 31))
 
     interface T2 { '1.0': string; baz?: string }
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 9, 46))
+>'1.0' : Symbol(T2['1.0'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 10, 18))
 >baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 10, 33))
 
     var s2: S2;
@@ -37,17 +41,21 @@ module JustStrings {
 
     var a: { '1.': string; bar?: string }
 >a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 7))
+>'1.' : Symbol('1.', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 12))
 >bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 14, 26))
 
     var b: { '1.0': string; baz?: string }
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 7))
+>'1.0' : Symbol('1.0', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 12))
 >baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 15, 27))
 
     var a2 = { '1.0': '' };
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 7))
+>'1.0' : Symbol('1.0', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 17, 14))
 
     var b2 = { '1': '' };
 >b2 : Symbol(b2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 18, 7))
+>'1' : Symbol('1', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 18, 14))
 
     s = t;
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7))
@@ -131,9 +139,11 @@ module NumbersAndStrings {
 
     class S { '1': string; }
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 44, 26))
+>'1' : Symbol(S['1'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 45, 13))
 
     class T { 1: string; }
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 45, 28))
+>1 : Symbol(T[1], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 46, 13))
 
     var s: S;
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7))
@@ -145,10 +155,12 @@ module NumbersAndStrings {
 
     interface S2 { '1': string; bar?: string }
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 13))
+>'1' : Symbol(S2['1'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 50, 18))
 >bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 50, 31))
 
     interface T2 { 1.0: string; baz?: string }
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 50, 46))
+>1.0 : Symbol(T2[1.0], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 51, 18))
 >baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 51, 31))
 
     var s2: S2;
@@ -161,17 +173,21 @@ module NumbersAndStrings {
 
     var a: { '1.': string; bar?: string }
 >a : Symbol(a, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 7))
+>'1.' : Symbol('1.', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 12))
 >bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 55, 26))
 
     var b: { 1.0: string; baz?: string }
 >b : Symbol(b, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 7))
+>1.0 : Symbol(1.0, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 12))
 >baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 56, 25))
 
     var a2 = { '1.0': '' };
 >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 7))
+>'1.0' : Symbol('1.0', Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 58, 14))
 
     var b2 = { 1.: '' };
 >b2 : Symbol(b2, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 59, 7))
+>1. : Symbol(1., Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 59, 14))
 
     s = t; // ok
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7))
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
index 6d021b024cb..a8be024ca60 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
@@ -7,9 +7,11 @@ module JustStrings {
 
     class S { '1': string; }
 >S : S
+>'1' : string
 
     class T { '1.': string; }
 >T : T
+>'1.' : string
 
     var s: S;
 >s : S
@@ -21,10 +23,12 @@ module JustStrings {
 
     interface S2 { '1': string; bar?: string }
 >S2 : S2
+>'1' : string
 >bar : string
 
     interface T2 { '1.0': string; baz?: string }
 >T2 : T2
+>'1.0' : string
 >baz : string
 
     var s2: S2;
@@ -37,20 +41,24 @@ module JustStrings {
 
     var a: { '1.': string; bar?: string }
 >a : { '1.': string; bar?: string; }
+>'1.' : string
 >bar : string
 
     var b: { '1.0': string; baz?: string }
 >b : { '1.0': string; baz?: string; }
+>'1.0' : string
 >baz : string
 
     var a2 = { '1.0': '' };
 >a2 : { '1.0': string; }
 >{ '1.0': '' } : { '1.0': string; }
+>'1.0' : string
 >'' : ""
 
     var b2 = { '1': '' };
 >b2 : { '1': string; }
 >{ '1': '' } : { '1': string; }
+>'1' : string
 >'' : ""
 
     s = t;
@@ -154,9 +162,11 @@ module NumbersAndStrings {
 
     class S { '1': string; }
 >S : S
+>'1' : string
 
     class T { 1: string; }
 >T : T
+>1 : string
 
     var s: S;
 >s : S
@@ -168,10 +178,12 @@ module NumbersAndStrings {
 
     interface S2 { '1': string; bar?: string }
 >S2 : S2
+>'1' : string
 >bar : string
 
     interface T2 { 1.0: string; baz?: string }
 >T2 : T2
+>1.0 : string
 >baz : string
 
     var s2: S2;
@@ -184,20 +196,24 @@ module NumbersAndStrings {
 
     var a: { '1.': string; bar?: string }
 >a : { '1.': string; bar?: string; }
+>'1.' : string
 >bar : string
 
     var b: { 1.0: string; baz?: string }
 >b : { 1.0: string; baz?: string; }
+>1.0 : string
 >baz : string
 
     var a2 = { '1.0': '' };
 >a2 : { '1.0': string; }
 >{ '1.0': '' } : { '1.0': string; }
+>'1.0' : string
 >'' : ""
 
     var b2 = { 1.: '' };
 >b2 : { 1.: string; }
 >{ 1.: '' } : { 1.: string; }
+>1. : string
 >'' : ""
 
     s = t; // ok
diff --git a/tests/baselines/reference/augmentExportEquals1.symbols b/tests/baselines/reference/augmentExportEquals1.symbols
index 84ec06ca7fe..b2bda7590cd 100644
--- a/tests/baselines/reference/augmentExportEquals1.symbols
+++ b/tests/baselines/reference/augmentExportEquals1.symbols
@@ -20,6 +20,8 @@ import x = require("./file1");
 // augmentation for './file1'
 // should error since './file1' does not have namespace meaning
 declare module "./file1" {
+>"./file1" : Symbol("./file1", Decl(file2.ts, 0, 30))
+
     interface A { a }
 >A : Symbol(A, Decl(file2.ts, 4, 26))
 >a : Symbol(A.a, Decl(file2.ts, 5, 17))
diff --git a/tests/baselines/reference/augmentExportEquals1.types b/tests/baselines/reference/augmentExportEquals1.types
index afb5dd1edc9..3c9872c8afe 100644
--- a/tests/baselines/reference/augmentExportEquals1.types
+++ b/tests/baselines/reference/augmentExportEquals1.types
@@ -23,6 +23,8 @@ import x = require("./file1");
 // augmentation for './file1'
 // should error since './file1' does not have namespace meaning
 declare module "./file1" {
+>"./file1" : any
+
     interface A { a }
 >A : A
 >a : any
diff --git a/tests/baselines/reference/augmentExportEquals1_1.symbols b/tests/baselines/reference/augmentExportEquals1_1.symbols
index df793ca841c..6d1ca82a086 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.symbols
+++ b/tests/baselines/reference/augmentExportEquals1_1.symbols
@@ -8,6 +8,8 @@ let a: x.A; // should not work
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : Symbol("file1", Decl(file1.d.ts, 0, 0))
+
     var x: number;
 >x : Symbol(x, Decl(file1.d.ts, 1, 7))
 
@@ -23,6 +25,8 @@ import x = require("file1");
 // augmentation for 'file1'
 // should error since 'file1' does not have namespace meaning
 declare module "file1" {
+>"file1" : Symbol("file1", Decl(file2.ts, 1, 28))
+
     interface A { a }
 >A : Symbol(A, Decl(file2.ts, 5, 24))
 >a : Symbol(A.a, Decl(file2.ts, 6, 17))
diff --git a/tests/baselines/reference/augmentExportEquals1_1.types b/tests/baselines/reference/augmentExportEquals1_1.types
index f771e815743..9077a27d327 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.types
+++ b/tests/baselines/reference/augmentExportEquals1_1.types
@@ -10,6 +10,8 @@ let a: x.A; // should not work
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : typeof "file1"
+
     var x: number;
 >x : number
 
@@ -25,6 +27,8 @@ import x = require("file1");
 // augmentation for 'file1'
 // should error since 'file1' does not have namespace meaning
 declare module "file1" {
+>"file1" : any
+
     interface A { a }
 >A : A
 >a : any
diff --git a/tests/baselines/reference/augmentExportEquals2.symbols b/tests/baselines/reference/augmentExportEquals2.symbols
index 29f85da0e1f..18dc793b5c2 100644
--- a/tests/baselines/reference/augmentExportEquals2.symbols
+++ b/tests/baselines/reference/augmentExportEquals2.symbols
@@ -19,6 +19,8 @@ import x = require("./file1");
 
 // should error since './file1' does not have namespace meaning
 declare module "./file1" {
+>"./file1" : Symbol("./file1", Decl(file2.ts, 0, 30))
+
     interface A { a }
 >A : Symbol(A, Decl(file2.ts, 3, 26))
 >a : Symbol(A.a, Decl(file2.ts, 4, 17))
diff --git a/tests/baselines/reference/augmentExportEquals2.types b/tests/baselines/reference/augmentExportEquals2.types
index 658579598ae..03424f0b6a5 100644
--- a/tests/baselines/reference/augmentExportEquals2.types
+++ b/tests/baselines/reference/augmentExportEquals2.types
@@ -21,6 +21,8 @@ import x = require("./file1");
 
 // should error since './file1' does not have namespace meaning
 declare module "./file1" {
+>"./file1" : any
+
     interface A { a }
 >A : A
 >a : any
diff --git a/tests/baselines/reference/augmentExportEquals2_1.symbols b/tests/baselines/reference/augmentExportEquals2_1.symbols
index 99ce1e5c85c..4eb0675cf64 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.symbols
+++ b/tests/baselines/reference/augmentExportEquals2_1.symbols
@@ -8,6 +8,8 @@ let a: x.A; // should not work
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : Symbol("file1", Decl(file1.d.ts, 0, 0))
+
     function foo(): void;
 >foo : Symbol(foo, Decl(file1.d.ts, 0, 24))
 
@@ -22,6 +24,8 @@ import x = require("file1");
 
 // should error since './file1' does not have namespace meaning
 declare module "file1" {
+>"file1" : Symbol("file1", Decl(file2.ts, 1, 28))
+
     interface A { a }
 >A : Symbol(A, Decl(file2.ts, 4, 24))
 >a : Symbol(A.a, Decl(file2.ts, 5, 17))
diff --git a/tests/baselines/reference/augmentExportEquals2_1.types b/tests/baselines/reference/augmentExportEquals2_1.types
index e47ed79f584..9a619638a01 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.types
+++ b/tests/baselines/reference/augmentExportEquals2_1.types
@@ -10,6 +10,8 @@ let a: x.A; // should not work
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : typeof "file1"
+
     function foo(): void;
 >foo : () => void
 
@@ -24,6 +26,8 @@ import x = require("file1");
 
 // should error since './file1' does not have namespace meaning
 declare module "file1" {
+>"file1" : any
+
     interface A { a }
 >A : A
 >a : any
diff --git a/tests/baselines/reference/augmentExportEquals3.symbols b/tests/baselines/reference/augmentExportEquals3.symbols
index 06ac04b39f3..e4e7a8e1a5f 100644
--- a/tests/baselines/reference/augmentExportEquals3.symbols
+++ b/tests/baselines/reference/augmentExportEquals3.symbols
@@ -22,6 +22,8 @@ x.b = 1;
 
 // OK - './file1' is a namespace
 declare module "./file1" {
+>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 17), Decl(file2.ts, 1, 8))
+
     interface A { a }
 >A : Symbol(A, Decl(file2.ts, 4, 26))
 >a : Symbol(A.a, Decl(file2.ts, 5, 17))
diff --git a/tests/baselines/reference/augmentExportEquals3.types b/tests/baselines/reference/augmentExportEquals3.types
index 37362bc9649..67aa8399af3 100644
--- a/tests/baselines/reference/augmentExportEquals3.types
+++ b/tests/baselines/reference/augmentExportEquals3.types
@@ -25,6 +25,8 @@ x.b = 1;
 
 // OK - './file1' is a namespace
 declare module "./file1" {
+>"./file1" : typeof x
+
     interface A { a }
 >A : A
 >a : any
diff --git a/tests/baselines/reference/augmentExportEquals3_1.symbols b/tests/baselines/reference/augmentExportEquals3_1.symbols
index ad3505c2835..2431b293dea 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.symbols
+++ b/tests/baselines/reference/augmentExportEquals3_1.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : Symbol("file1", Decl(file1.d.ts, 0, 0))
+
     function foo(): void;
 >foo : Symbol(foo, Decl(file1.d.ts, 0, 24), Decl(file1.d.ts, 1, 25), Decl(file2.ts, 2, 8))
 
@@ -26,6 +28,8 @@ x.b = 1;
 
 // OK - './file1' is a namespace
 declare module "file1" {
+>"file1" : Symbol(x, Decl(file1.d.ts, 0, 24), Decl(file1.d.ts, 1, 25), Decl(file2.ts, 2, 8))
+
     interface A { a }
 >A : Symbol(A, Decl(file2.ts, 5, 24))
 >a : Symbol(A.a, Decl(file2.ts, 6, 17))
diff --git a/tests/baselines/reference/augmentExportEquals3_1.types b/tests/baselines/reference/augmentExportEquals3_1.types
index 2457e91530a..f841fb31535 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.types
+++ b/tests/baselines/reference/augmentExportEquals3_1.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : typeof "file1"
+
     function foo(): void;
 >foo : typeof foo
 
@@ -28,6 +30,8 @@ x.b = 1;
 
 // OK - './file1' is a namespace
 declare module "file1" {
+>"file1" : typeof x
+
     interface A { a }
 >A : A
 >a : any
diff --git a/tests/baselines/reference/augmentExportEquals4.symbols b/tests/baselines/reference/augmentExportEquals4.symbols
index 2a4e3dbc147..f1f63762545 100644
--- a/tests/baselines/reference/augmentExportEquals4.symbols
+++ b/tests/baselines/reference/augmentExportEquals4.symbols
@@ -22,6 +22,8 @@ x.b = 1;
 
 // OK - './file1' is a namespace
 declare module "./file1" {
+>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 8))
+
     interface A { a }
 >A : Symbol(A, Decl(file2.ts, 4, 26))
 >a : Symbol(A.a, Decl(file2.ts, 5, 17))
diff --git a/tests/baselines/reference/augmentExportEquals4.types b/tests/baselines/reference/augmentExportEquals4.types
index 295156ffb59..c2823d794e0 100644
--- a/tests/baselines/reference/augmentExportEquals4.types
+++ b/tests/baselines/reference/augmentExportEquals4.types
@@ -25,6 +25,8 @@ x.b = 1;
 
 // OK - './file1' is a namespace
 declare module "./file1" {
+>"./file1" : typeof x
+
     interface A { a }
 >A : A
 >a : any
diff --git a/tests/baselines/reference/augmentExportEquals4_1.symbols b/tests/baselines/reference/augmentExportEquals4_1.symbols
index 1488645898c..d2a3c001825 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.symbols
+++ b/tests/baselines/reference/augmentExportEquals4_1.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : Symbol("file1", Decl(file1.d.ts, 0, 0))
+
     class foo {}
 >foo : Symbol(foo, Decl(file1.d.ts, 0, 24), Decl(file1.d.ts, 1, 16), Decl(file2.ts, 2, 8))
 
@@ -26,6 +28,8 @@ x.b = 1;
 
 // OK - './file1' is a namespace
 declare module "file1" {
+>"file1" : Symbol(x, Decl(file1.d.ts, 0, 24), Decl(file1.d.ts, 1, 16), Decl(file2.ts, 2, 8))
+
     interface A { a }
 >A : Symbol(A, Decl(file2.ts, 5, 24))
 >a : Symbol(A.a, Decl(file2.ts, 6, 17))
diff --git a/tests/baselines/reference/augmentExportEquals4_1.types b/tests/baselines/reference/augmentExportEquals4_1.types
index 8eaf1c6cbba..9daf444e419 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.types
+++ b/tests/baselines/reference/augmentExportEquals4_1.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : typeof "file1"
+
     class foo {}
 >foo : foo
 
@@ -28,6 +30,8 @@ x.b = 1;
 
 // OK - './file1' is a namespace
 declare module "file1" {
+>"file1" : typeof x
+
     interface A { a }
 >A : A
 >a : any
diff --git a/tests/baselines/reference/augmentExportEquals5.symbols b/tests/baselines/reference/augmentExportEquals5.symbols
index d55e8eed021..0bf821f6cad 100644
--- a/tests/baselines/reference/augmentExportEquals5.symbols
+++ b/tests/baselines/reference/augmentExportEquals5.symbols
@@ -13,6 +13,8 @@ declare module Express {
 }
 
 declare module "express" {
+>"express" : Symbol("express", Decl(express.d.ts, 4, 1))
+
     function e(): e.Express;
 >e : Symbol(e, Decl(express.d.ts, 6, 26), Decl(express.d.ts, 7, 28), Decl(augmentation.ts, 1, 29))
 >e : Symbol(e, Decl(express.d.ts, 6, 26), Decl(express.d.ts, 7, 28))
@@ -167,6 +169,8 @@ import * as e from "express";
 >e : Symbol(e, Decl(augmentation.ts, 1, 6))
 
 declare module "express" {
+>"express" : Symbol(e, Decl(express.d.ts, 6, 26), Decl(express.d.ts, 7, 28), Decl(augmentation.ts, 1, 29))
+
     interface Request {
 >Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26))
 
diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types
index c0444d35358..eaa956e1d4e 100644
--- a/tests/baselines/reference/augmentExportEquals5.types
+++ b/tests/baselines/reference/augmentExportEquals5.types
@@ -13,6 +13,8 @@ declare module Express {
 }
 
 declare module "express" {
+>"express" : typeof "express"
+
     function e(): e.Express;
 >e : typeof e
 >e : any
@@ -167,6 +169,8 @@ import * as e from "express";
 >e : typeof e
 
 declare module "express" {
+>"express" : typeof e
+
     interface Request {
 >Request : Request
 
diff --git a/tests/baselines/reference/augmentExportEquals6.symbols b/tests/baselines/reference/augmentExportEquals6.symbols
index 33ec14ed334..2125b650464 100644
--- a/tests/baselines/reference/augmentExportEquals6.symbols
+++ b/tests/baselines/reference/augmentExportEquals6.symbols
@@ -28,6 +28,8 @@ x.B.b = 1;
 
 // OK - './file1' is a namespace
 declare module "./file1" {
+>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 10))
+
     interface A { a: number }
 >A : Symbol(A, Decl(file1.ts, 1, 15), Decl(file2.ts, 4, 26))
 >a : Symbol(A.a, Decl(file2.ts, 5, 17))
diff --git a/tests/baselines/reference/augmentExportEquals6.types b/tests/baselines/reference/augmentExportEquals6.types
index 01b7095b169..6948535c6da 100644
--- a/tests/baselines/reference/augmentExportEquals6.types
+++ b/tests/baselines/reference/augmentExportEquals6.types
@@ -30,6 +30,8 @@ x.B.b = 1;
 
 // OK - './file1' is a namespace
 declare module "./file1" {
+>"./file1" : typeof x
+
     interface A { a: number }
 >A : A
 >a : number
diff --git a/tests/baselines/reference/augmentExportEquals6_1.symbols b/tests/baselines/reference/augmentExportEquals6_1.symbols
index 60f8b845657..b75f8131c01 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.symbols
+++ b/tests/baselines/reference/augmentExportEquals6_1.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : Symbol("file1", Decl(file1.d.ts, 0, 0))
+
     class foo {}
 >foo : Symbol(foo, Decl(file1.d.ts, 0, 24), Decl(file1.d.ts, 1, 16), Decl(file2.ts, 1, 28))
 
@@ -21,6 +23,8 @@ import x = require("file1");
 
 // OK - './file1' is a namespace
 declare module "file1" {
+>"file1" : Symbol(x, Decl(file1.d.ts, 0, 24), Decl(file1.d.ts, 1, 16), Decl(file2.ts, 1, 28))
+
     interface A { a: number }
 >A : Symbol(A, Decl(file1.d.ts, 2, 19), Decl(file2.ts, 4, 24))
 >a : Symbol(A.a, Decl(file2.ts, 5, 17))
diff --git a/tests/baselines/reference/augmentExportEquals6_1.types b/tests/baselines/reference/augmentExportEquals6_1.types
index a6041ecda81..6929d99ad51 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.types
+++ b/tests/baselines/reference/augmentExportEquals6_1.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
+>"file1" : typeof "file1"
+
     class foo {}
 >foo : foo
 
@@ -21,6 +23,8 @@ import x = require("file1");
 
 // OK - './file1' is a namespace
 declare module "file1" {
+>"file1" : typeof x
+
     interface A { a: number }
 >A : A
 >a : number
diff --git a/tests/baselines/reference/augmentExportEquals7.symbols b/tests/baselines/reference/augmentExportEquals7.symbols
index 42156dafaed..cdcd430e7af 100644
--- a/tests/baselines/reference/augmentExportEquals7.symbols
+++ b/tests/baselines/reference/augmentExportEquals7.symbols
@@ -13,6 +13,8 @@ import * as lib from "lib";
 >lib : Symbol(lib, Decl(index.d.ts, 0, 6))
 
 declare module "lib" {
+>"lib" : Symbol("lib", Decl(index.d.ts, 0, 27))
+
     export function fn(): void;
 >fn : Symbol(fn, Decl(index.d.ts, 1, 22))
 }
diff --git a/tests/baselines/reference/augmentExportEquals7.types b/tests/baselines/reference/augmentExportEquals7.types
index f2870eab8df..4311a3c112e 100644
--- a/tests/baselines/reference/augmentExportEquals7.types
+++ b/tests/baselines/reference/augmentExportEquals7.types
@@ -13,6 +13,8 @@ import * as lib from "lib";
 >lib : () => void
 
 declare module "lib" {
+>"lib" : typeof "lib"
+
     export function fn(): void;
 >fn : () => void
 }
diff --git a/tests/baselines/reference/bangInModuleName.symbols b/tests/baselines/reference/bangInModuleName.symbols
index 08bcf487cc8..ca3d4a161f5 100644
--- a/tests/baselines/reference/bangInModuleName.symbols
+++ b/tests/baselines/reference/bangInModuleName.symbols
@@ -6,9 +6,12 @@ import * as http from 'intern/dojo/node!http';
 
 === tests/cases/compiler/a.d.ts ===
 declare module "http" {
+>"http" : Symbol("http", Decl(a.d.ts, 0, 0))
 }
 
 declare module 'intern/dojo/node!http' {
+>'intern/dojo/node!http' : Symbol('intern/dojo/node!http', Decl(a.d.ts, 1, 1))
+
     import http = require('http');
 >http : Symbol(http, Decl(a.d.ts, 3, 40))
 
diff --git a/tests/baselines/reference/bangInModuleName.types b/tests/baselines/reference/bangInModuleName.types
index 93115f76a0e..691ac6add00 100644
--- a/tests/baselines/reference/bangInModuleName.types
+++ b/tests/baselines/reference/bangInModuleName.types
@@ -6,9 +6,12 @@ import * as http from 'intern/dojo/node!http';
 
 === tests/cases/compiler/a.d.ts ===
 declare module "http" {
+>"http" : typeof "http"
 }
 
 declare module 'intern/dojo/node!http' {
+>'intern/dojo/node!http' : typeof 'intern/dojo/node!http'
+
     import http = require('http');
 >http : typeof http
 
diff --git a/tests/baselines/reference/binaryIntegerLiteral.symbols b/tests/baselines/reference/binaryIntegerLiteral.symbols
index 31e28819657..fb15a8b6e6c 100644
--- a/tests/baselines/reference/binaryIntegerLiteral.symbols
+++ b/tests/baselines/reference/binaryIntegerLiteral.symbols
@@ -15,6 +15,8 @@ var obj1 = {
 >obj1 : Symbol(obj1, Decl(binaryIntegerLiteral.ts, 5, 3))
 
     0b11010: "Hello",
+>0b11010 : Symbol(0b11010, Decl(binaryIntegerLiteral.ts, 5, 12))
+
     a: bin1,
 >a : Symbol(a, Decl(binaryIntegerLiteral.ts, 6, 21))
 >bin1 : Symbol(bin1, Decl(binaryIntegerLiteral.ts, 0, 3))
@@ -26,12 +28,15 @@ var obj1 = {
 >b : Symbol(b, Decl(binaryIntegerLiteral.ts, 8, 9))
 
     0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true,
+>0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111 : Symbol(0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111, Decl(binaryIntegerLiteral.ts, 9, 15))
 }
 
 var obj2 = {
 >obj2 : Symbol(obj2, Decl(binaryIntegerLiteral.ts, 13, 3))
 
     0B11010: "World",
+>0B11010 : Symbol(0B11010, Decl(binaryIntegerLiteral.ts, 13, 12))
+
     a: bin2,
 >a : Symbol(a, Decl(binaryIntegerLiteral.ts, 14, 21))
 >bin2 : Symbol(bin2, Decl(binaryIntegerLiteral.ts, 1, 3))
@@ -43,6 +48,7 @@ var obj2 = {
 >b : Symbol(b, Decl(binaryIntegerLiteral.ts, 16, 9))
 
     0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false,
+>0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111 : Symbol(0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111, Decl(binaryIntegerLiteral.ts, 17, 15))
 }
 
 obj1[0b11010];    // string
diff --git a/tests/baselines/reference/binaryIntegerLiteral.types b/tests/baselines/reference/binaryIntegerLiteral.types
index 5cee371fdbe..070ae22d796 100644
--- a/tests/baselines/reference/binaryIntegerLiteral.types
+++ b/tests/baselines/reference/binaryIntegerLiteral.types
@@ -20,6 +20,7 @@ var obj1 = {
 >{    0b11010: "Hello",    a: bin1,    bin1,    b: 0b11010,    0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true,} : { 0b11010: string; a: number; bin1: number; b: number; 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: boolean; }
 
     0b11010: "Hello",
+>0b11010 : string
 >"Hello" : "Hello"
 
     a: bin1,
@@ -34,6 +35,7 @@ var obj1 = {
 >0b11010 : 26
 
     0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true,
+>0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111 : boolean
 >true : true
 }
 
@@ -42,6 +44,7 @@ var obj2 = {
 >{    0B11010: "World",    a: bin2,    bin2,    b: 0B11010,    0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false,} : { 0B11010: string; a: number; bin2: number; b: number; 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: boolean; }
 
     0B11010: "World",
+>0B11010 : string
 >"World" : "World"
 
     a: bin2,
@@ -56,6 +59,7 @@ var obj2 = {
 >0B11010 : 26
 
     0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false,
+>0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111 : boolean
 >false : false
 }
 
diff --git a/tests/baselines/reference/binaryIntegerLiteralES6.symbols b/tests/baselines/reference/binaryIntegerLiteralES6.symbols
index 4fb7aaff82d..15c8c633019 100644
--- a/tests/baselines/reference/binaryIntegerLiteralES6.symbols
+++ b/tests/baselines/reference/binaryIntegerLiteralES6.symbols
@@ -15,6 +15,8 @@ var obj1 = {
 >obj1 : Symbol(obj1, Decl(binaryIntegerLiteralES6.ts, 5, 3))
 
     0b11010: "Hello",
+>0b11010 : Symbol(0b11010, Decl(binaryIntegerLiteralES6.ts, 5, 12))
+
     a: bin1,
 >a : Symbol(a, Decl(binaryIntegerLiteralES6.ts, 6, 21))
 >bin1 : Symbol(bin1, Decl(binaryIntegerLiteralES6.ts, 0, 3))
@@ -26,12 +28,15 @@ var obj1 = {
 >b : Symbol(b, Decl(binaryIntegerLiteralES6.ts, 8, 9))
 
     0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true,
+>0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111 : Symbol(0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111, Decl(binaryIntegerLiteralES6.ts, 9, 15))
 }
 
 var obj2 = {
 >obj2 : Symbol(obj2, Decl(binaryIntegerLiteralES6.ts, 13, 3))
 
     0B11010: "World",
+>0B11010 : Symbol(0B11010, Decl(binaryIntegerLiteralES6.ts, 13, 12))
+
     a: bin2,
 >a : Symbol(a, Decl(binaryIntegerLiteralES6.ts, 14, 21))
 >bin2 : Symbol(bin2, Decl(binaryIntegerLiteralES6.ts, 1, 3))
@@ -43,6 +48,7 @@ var obj2 = {
 >b : Symbol(b, Decl(binaryIntegerLiteralES6.ts, 16, 9))
 
     0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false,
+>0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111 : Symbol(0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111, Decl(binaryIntegerLiteralES6.ts, 17, 15))
 }
 
 obj1[0b11010];    // string
diff --git a/tests/baselines/reference/binaryIntegerLiteralES6.types b/tests/baselines/reference/binaryIntegerLiteralES6.types
index ab28010283b..fe9f65a1f71 100644
--- a/tests/baselines/reference/binaryIntegerLiteralES6.types
+++ b/tests/baselines/reference/binaryIntegerLiteralES6.types
@@ -20,6 +20,7 @@ var obj1 = {
 >{    0b11010: "Hello",    a: bin1,    bin1,    b: 0b11010,    0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true,} : { 0b11010: string; a: number; bin1: number; b: number; 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: boolean; }
 
     0b11010: "Hello",
+>0b11010 : string
 >"Hello" : "Hello"
 
     a: bin1,
@@ -34,6 +35,7 @@ var obj1 = {
 >0b11010 : 26
 
     0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true,
+>0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111 : boolean
 >true : true
 }
 
@@ -42,6 +44,7 @@ var obj2 = {
 >{    0B11010: "World",    a: bin2,    bin2,    b: 0B11010,    0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false,} : { 0B11010: string; a: number; bin2: number; b: number; 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: boolean; }
 
     0B11010: "World",
+>0B11010 : string
 >"World" : "World"
 
     a: bin2,
@@ -56,6 +59,7 @@ var obj2 = {
 >0B11010 : 26
 
     0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false,
+>0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111 : boolean
 >false : false
 }
 
diff --git a/tests/baselines/reference/binaryIntegerLiteralError.symbols b/tests/baselines/reference/binaryIntegerLiteralError.symbols
index bd40cecff8d..dca3aa3d9ff 100644
--- a/tests/baselines/reference/binaryIntegerLiteralError.symbols
+++ b/tests/baselines/reference/binaryIntegerLiteralError.symbols
@@ -10,7 +10,13 @@ var obj1 = {
 >obj1 : Symbol(obj1, Decl(binaryIntegerLiteralError.ts, 4, 3))
 
     0b11010: "hi",
+>0b11010 : Symbol(0b11010, Decl(binaryIntegerLiteralError.ts, 4, 12), Decl(binaryIntegerLiteralError.ts, 5, 18), Decl(binaryIntegerLiteralError.ts, 6, 16))
+
     26: "Hello",
+>26 : Symbol(0b11010, Decl(binaryIntegerLiteralError.ts, 4, 12), Decl(binaryIntegerLiteralError.ts, 5, 18), Decl(binaryIntegerLiteralError.ts, 6, 16))
+
     "26": "world",
+>"26" : Symbol(0b11010, Decl(binaryIntegerLiteralError.ts, 4, 12), Decl(binaryIntegerLiteralError.ts, 5, 18), Decl(binaryIntegerLiteralError.ts, 6, 16))
+
 };
 
diff --git a/tests/baselines/reference/binaryIntegerLiteralError.types b/tests/baselines/reference/binaryIntegerLiteralError.types
index 5ab51f74666..6d53b3e515e 100644
--- a/tests/baselines/reference/binaryIntegerLiteralError.types
+++ b/tests/baselines/reference/binaryIntegerLiteralError.types
@@ -15,12 +15,15 @@ var obj1 = {
 >{    0b11010: "hi",    26: "Hello",    "26": "world",} : { 0b11010: string; }
 
     0b11010: "hi",
+>0b11010 : string
 >"hi" : "hi"
 
     26: "Hello",
+>26 : string
 >"Hello" : "Hello"
 
     "26": "world",
+>"26" : string
 >"world" : "world"
 
 };
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.symbols
index 24783a153ae..e734966c594 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.symbols
@@ -5,6 +5,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(bitwiseNotOperatorWithEnumType.ts, 0, 0))
 >A : Symbol(ENUM1.A, Decl(bitwiseNotOperatorWithEnumType.ts, 2, 12))
 >B : Symbol(ENUM1.B, Decl(bitwiseNotOperatorWithEnumType.ts, 2, 15))
+>"" : Symbol(ENUM1[""], Decl(bitwiseNotOperatorWithEnumType.ts, 2, 18))
 
 // enum type var
 var ResultIsNumber1 = ~ENUM1;
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.types b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.types
index 03008f67d11..266c62de93e 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.types
@@ -5,6 +5,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // enum type var
 var ResultIsNumber1 = ~ENUM1;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols
index b09c819cf65..e55bfd99aa8 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols
@@ -27,6 +27,7 @@ class C {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: number;
+>0 : Symbol(C[0], Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 8, 24))
 }
 
 interface I {
@@ -51,6 +52,7 @@ interface I {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: number;
+>0 : Symbol(I[0], Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 17, 24))
 }
 
 var c: C;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
index 272ba94f7f2..65e01240b72 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
@@ -29,6 +29,7 @@ class C {
 >Object : Object
 
     0: number;
+>0 : number
 }
 
 interface I {
@@ -53,6 +54,7 @@ interface I {
 >Object : Object
 
     0: number;
+>0 : number
 }
 
 var c: C;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols
index 80658b0531c..ab337787517 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols
@@ -27,6 +27,7 @@ class C {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: number;
+>0 : Symbol(C[0], Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 8, 24))
 
     public static foo: string; // doesn't effect equivalence
 >foo : Symbol(C.foo, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 9, 14))
@@ -54,6 +55,7 @@ interface I {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: number;
+>0 : Symbol(I[0], Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 19, 24))
 }
 
 var c: C;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
index 22440da1768..a5fbc06e0af 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
@@ -29,6 +29,7 @@ class C {
 >Object : Object
 
     0: number;
+>0 : number
 
     public static foo: string; // doesn't effect equivalence
 >foo : string
@@ -56,6 +57,7 @@ interface I {
 >Object : Object
 
     0: number;
+>0 : number
 }
 
 var c: C;
diff --git a/tests/baselines/reference/commonSourceDirectory.symbols b/tests/baselines/reference/commonSourceDirectory.symbols
index 5409286ede5..89233ddd3cc 100644
--- a/tests/baselines/reference/commonSourceDirectory.symbols
+++ b/tests/baselines/reference/commonSourceDirectory.symbols
@@ -18,6 +18,8 @@ export const x = 0;
 
 === /types/bar.d.ts ===
 declare module "bar" {
+>"bar" : Symbol("bar", Decl(bar.d.ts, 0, 0))
+
     export const y = 0;
 >y : Symbol(y, Decl(bar.d.ts, 1, 16))
 }
diff --git a/tests/baselines/reference/commonSourceDirectory.types b/tests/baselines/reference/commonSourceDirectory.types
index ce0169582d7..ea16e24b851 100644
--- a/tests/baselines/reference/commonSourceDirectory.types
+++ b/tests/baselines/reference/commonSourceDirectory.types
@@ -20,6 +20,8 @@ export const x = 0;
 
 === /types/bar.d.ts ===
 declare module "bar" {
+>"bar" : typeof "bar"
+
     export const y = 0;
 >y : 0
 >0 : 0
diff --git a/tests/baselines/reference/complexRecursiveCollections.symbols b/tests/baselines/reference/complexRecursiveCollections.symbols
index 8533f5220a2..6e0bc95a292 100644
--- a/tests/baselines/reference/complexRecursiveCollections.symbols
+++ b/tests/baselines/reference/complexRecursiveCollections.symbols
@@ -3800,6 +3800,8 @@ declare module Immutable {
   }
 }
 declare module "immutable" {
+>"immutable" : Symbol("immutable", Decl(immutable.ts, 506, 1))
+
   export = Immutable
 >Immutable : Symbol(Immutable, Decl(immutable.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/complexRecursiveCollections.types b/tests/baselines/reference/complexRecursiveCollections.types
index e3d4a01196e..1622d9ce360 100644
--- a/tests/baselines/reference/complexRecursiveCollections.types
+++ b/tests/baselines/reference/complexRecursiveCollections.types
@@ -3800,6 +3800,8 @@ declare module Immutable {
   }
 }
 declare module "immutable" {
+>"immutable" : typeof "immutable"
+
   export = Immutable
 >Immutable : typeof Immutable
 }
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.symbols b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.symbols
index 10864291be1..e3a6c214404 100644
--- a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.symbols
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.symbols
@@ -16,6 +16,7 @@ let {["bar"]: bar2} = {bar: "bar"};
 let {[11]: bar2_1} = {11: "bar"};
 >11 : Symbol(bar2_1, Decl(computedPropertiesInDestructuring1_ES6.ts, 5, 5))
 >bar2_1 : Symbol(bar2_1, Decl(computedPropertiesInDestructuring1_ES6.ts, 5, 5))
+>11 : Symbol(11, Decl(computedPropertiesInDestructuring1_ES6.ts, 5, 22))
 
 let foo2 = () => "bar";
 >foo2 : Symbol(foo2, Decl(computedPropertiesInDestructuring1_ES6.ts, 7, 3))
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.types b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.types
index 79fb8372023..0197c0b4a82 100644
--- a/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.types
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1_ES6.types
@@ -22,6 +22,7 @@ let {[11]: bar2_1} = {11: "bar"};
 >11 : 11
 >bar2_1 : string
 >{11: "bar"} : { 11: string; }
+>11 : string
 >"bar" : "bar"
 
 let foo2 = () => "bar";
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.symbols b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.symbols
index fb303b1f8b3..23179820592 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.symbols
@@ -23,6 +23,8 @@ foo({
 >p : Symbol(p, Decl(computedPropertyNamesContextualType6_ES5.ts, 6, 5))
 
     0: () => { },
+>0 : Symbol(0, Decl(computedPropertyNamesContextualType6_ES5.ts, 7, 10))
+
     ["hi" + "bye"]: true,
     [0 + 1]: 0,
     [+"hi"]: [0]
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
index 9c89065ac02..5c46bee4ccf 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
@@ -26,6 +26,7 @@ foo({
 >"" : ""
 
     0: () => { },
+>0 : () => void
 >() => { } : () => void
 
     ["hi" + "bye"]: true,
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.symbols b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.symbols
index b3e371447e2..d441c593fb3 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.symbols
@@ -23,6 +23,8 @@ foo({
 >p : Symbol(p, Decl(computedPropertyNamesContextualType6_ES6.ts, 6, 5))
 
     0: () => { },
+>0 : Symbol(0, Decl(computedPropertyNamesContextualType6_ES6.ts, 7, 10))
+
     ["hi" + "bye"]: true,
     [0 + 1]: 0,
     [+"hi"]: [0]
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
index 03295db5f70..f0e56a954cb 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
@@ -26,6 +26,7 @@ foo({
 >"" : ""
 
     0: () => { },
+>0 : () => void
 >() => { } : () => void
 
     ["hi" + "bye"]: true,
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.symbols b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.symbols
index d6889f9912d..77e87a5bf48 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.symbols
@@ -36,6 +36,8 @@ foo({
 >foo : Symbol(foo, Decl(computedPropertyNamesContextualType7_ES5.ts, 5, 1))
 
     0: () => { },
+>0 : Symbol(0, Decl(computedPropertyNamesContextualType7_ES5.ts, 10, 5))
+
     ["hi" + "bye"]: true,
     [0 + 1]: 0,
     [+"hi"]: [0]
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
index b77a129a0b4..e838c06bfa1 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
@@ -38,6 +38,7 @@ foo({
 >{    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: number | boolean | (() => void) | number[]; [x: number]: number | (() => void) | number[]; 0: () => void; }
 
     0: () => { },
+>0 : () => void
 >() => { } : () => void
 
     ["hi" + "bye"]: true,
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.symbols b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.symbols
index d04c8f913bd..5f798731dba 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.symbols
@@ -36,6 +36,8 @@ foo({
 >foo : Symbol(foo, Decl(computedPropertyNamesContextualType7_ES6.ts, 5, 1))
 
     0: () => { },
+>0 : Symbol(0, Decl(computedPropertyNamesContextualType7_ES6.ts, 10, 5))
+
     ["hi" + "bye"]: true,
     [0 + 1]: 0,
     [+"hi"]: [0]
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
index f041b2b4eb4..ace52b05bcb 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
@@ -38,6 +38,7 @@ foo({
 >{    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: number | boolean | (() => void) | number[]; [x: number]: number | (() => void) | number[]; 0: () => void; }
 
     0: () => { },
+>0 : () => void
 >() => { } : () => void
 
     ["hi" + "bye"]: true,
diff --git a/tests/baselines/reference/constEnumPropertyAccess1.symbols b/tests/baselines/reference/constEnumPropertyAccess1.symbols
index 63861a94ae1..a2b4ed6a9a1 100644
--- a/tests/baselines/reference/constEnumPropertyAccess1.symbols
+++ b/tests/baselines/reference/constEnumPropertyAccess1.symbols
@@ -30,6 +30,8 @@ var o: {
 
 } = {
         1: true
+>1 : Symbol(1, Decl(constEnumPropertyAccess1.ts, 13, 5))
+
     };
 
 var a = G.A;
diff --git a/tests/baselines/reference/constEnumPropertyAccess1.types b/tests/baselines/reference/constEnumPropertyAccess1.types
index af9aacd279c..9a210c646c7 100644
--- a/tests/baselines/reference/constEnumPropertyAccess1.types
+++ b/tests/baselines/reference/constEnumPropertyAccess1.types
@@ -37,6 +37,7 @@ var o: {
 >{        1: true    } : { 1: true; }
 
         1: true
+>1 : true
 >true : true
 
     };
diff --git a/tests/baselines/reference/constIndexedAccess.symbols b/tests/baselines/reference/constIndexedAccess.symbols
index ef2be6368e3..658a30c99a6 100644
--- a/tests/baselines/reference/constIndexedAccess.symbols
+++ b/tests/baselines/reference/constIndexedAccess.symbols
@@ -13,7 +13,10 @@ interface indexAccess {
 >indexAccess : Symbol(indexAccess, Decl(constIndexedAccess.ts, 3, 1))
 
     0: string;
+>0 : Symbol(indexAccess[0], Decl(constIndexedAccess.ts, 5, 23))
+
     1: number;
+>1 : Symbol(indexAccess[1], Decl(constIndexedAccess.ts, 6, 14))
 }
 
 let test: indexAccess;
diff --git a/tests/baselines/reference/constIndexedAccess.types b/tests/baselines/reference/constIndexedAccess.types
index e63852c1ab1..2a753814d40 100644
--- a/tests/baselines/reference/constIndexedAccess.types
+++ b/tests/baselines/reference/constIndexedAccess.types
@@ -13,7 +13,10 @@ interface indexAccess {
 >indexAccess : indexAccess
 
     0: string;
+>0 : string
+
     1: number;
+>1 : number
 }
 
 let test: indexAccess;
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols
index 45a894d8895..56b4bb3c7fa 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts ===
 declare module "fs" {
+>"fs" : Symbol("fs", Decl(constructorWithIncompleteTypeAnnotation.ts, 0, 0))
+
     export class File {
 >File : Symbol(File, Decl(constructorWithIncompleteTypeAnnotation.ts, 0, 21))
 
@@ -171,6 +173,7 @@ module TypeScriptAllInOne {
 
             var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; },  instanceof : () => 'objLit{42}' };
 >objLit : Symbol(objLit, Decl(constructorWithIncompleteTypeAnnotation.ts, 82, 15))
+>"var" : Symbol("var", Decl(constructorWithIncompleteTypeAnnotation.ts, 82, 26))
 >number : Symbol(number, Decl(constructorWithIncompleteTypeAnnotation.ts, 97, 15))
 >equals : Symbol(equals, Decl(constructorWithIncompleteTypeAnnotation.ts, 82, 46))
 >x : Symbol(x, Decl(constructorWithIncompleteTypeAnnotation.ts, 82, 65))
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index d1b7c98087f..78235027dd6 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts ===
 declare module "fs" {
+>"fs" : typeof "fs"
+
     export class File {
 >File : File
 
@@ -249,6 +251,7 @@ module TypeScriptAllInOne {
             var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; },  instanceof : () => 'objLit{42}' };
 >objLit : { "var": number; equals: (x: any) => boolean; instanceof: () => string; }
 >{ "var": number = 42, equals: function (x) { return x["var"] === 42; },  instanceof : () => 'objLit{42}' } : { "var": number; equals: (x: any) => boolean; instanceof: () => string; }
+>"var" : number
 >number = 42 : 42
 >number : number
 >42 : 42
diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.symbols b/tests/baselines/reference/contextualTypeArrayReturnType.symbols
index 2982a1ce893..0688e810c08 100644
--- a/tests/baselines/reference/contextualTypeArrayReturnType.symbols
+++ b/tests/baselines/reference/contextualTypeArrayReturnType.symbols
@@ -33,6 +33,8 @@ var style: IBookStyle = {
 
         return [
             {'ry': null }
+>'ry' : Symbol('ry', Decl(contextualTypeArrayReturnType.ts, 15, 13))
+
         ];
     }
 }
diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.types b/tests/baselines/reference/contextualTypeArrayReturnType.types
index 6c91fd7b8b9..aee8eae59f5 100644
--- a/tests/baselines/reference/contextualTypeArrayReturnType.types
+++ b/tests/baselines/reference/contextualTypeArrayReturnType.types
@@ -38,6 +38,7 @@ var style: IBookStyle = {
 
             {'ry': null }
 >{'ry': null } : { 'ry': null; }
+>'ry' : null
 >null : null
 
         ];
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols
index 985bb52f243..207b4dab689 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols
@@ -24,6 +24,7 @@ interface IWithNoNumberIndexSignature {
 >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1))
 
     0: string;
+>0 : Symbol(IWithNoNumberIndexSignature[0], Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 12, 39))
 }
 interface IWithStringIndexSignature1 {
 >IWithStringIndexSignature1 : Symbol(IWithStringIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 14, 1))
@@ -113,6 +114,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }
 >x3 : Symbol(x3, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 3))
 >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1))
 >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1))
+>1 : Symbol(1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 68))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 71))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 71))
 
@@ -120,6 +122,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }
 >x3 : Symbol(x3, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 3))
 >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1))
 >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1))
+>0 : Symbol(0, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 68))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 71))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 71))
 
@@ -127,11 +130,13 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello"
 >x3 : Symbol(x3, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 3))
 >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1))
 >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1))
+>0 : Symbol(0, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 68))
 
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.toString() }; // a should be number
 >x4 : Symbol(x4, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 3))
 >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1))
 >IWithNumberIndexSignature2 : Symbol(IWithNumberIndexSignature2, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 23, 1))
+>1 : Symbol(1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 67))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 70))
 >a.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 70))
@@ -141,6 +146,7 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a };
 >x4 : Symbol(x4, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 3))
 >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1))
 >IWithNumberIndexSignature2 : Symbol(IWithNumberIndexSignature2, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 23, 1))
+>1 : Symbol(1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 67))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 70))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 70))
 
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
index 97c5f0fdf90..c44afae7cd5 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
@@ -24,6 +24,7 @@ interface IWithNoNumberIndexSignature {
 >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
 
     0: string;
+>0 : string
 }
 interface IWithStringIndexSignature1 {
 >IWithStringIndexSignature1 : IWithStringIndexSignature1
@@ -125,6 +126,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }
 >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >{ 1: a => a } : { 1: (a: number) => number; }
+>1 : (a: number) => number
 >a => a : (a: number) => number
 >a : number
 >a : number
@@ -134,6 +136,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }
 >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >{ 0: a => a } : { 0: (a: any) => any; }
+>0 : (a: any) => any
 >a => a : (a: any) => any
 >a : any
 >a : any
@@ -143,6 +146,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello"
 >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >{ 0: "hello" } : { 0: string; }
+>0 : string
 >"hello" : "hello"
 
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.toString() }; // a should be number
@@ -150,6 +154,7 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.to
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >IWithNumberIndexSignature2 : IWithNumberIndexSignature2
 >{ 1: a => a.toString() } : { 1: (a: number) => string; }
+>1 : (a: number) => string
 >a => a.toString() : (a: number) => string
 >a : number
 >a.toString() : string
@@ -162,6 +167,7 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a };
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >IWithNumberIndexSignature2 : IWithNumberIndexSignature2
 >{ 1: a => a } : { 1: (a: number) => number; }
+>1 : (a: number) => number
 >a => a : (a: number) => number
 >a : number
 >a : number
diff --git a/tests/baselines/reference/convertKeywordsYes.symbols b/tests/baselines/reference/convertKeywordsYes.symbols
index 8049c747efb..27e5774b1f7 100644
--- a/tests/baselines/reference/convertKeywordsYes.symbols
+++ b/tests/baselines/reference/convertKeywordsYes.symbols
@@ -505,6 +505,8 @@ class bigClass {
 >bigClass : Symbol(bigClass, Decl(convertKeywordsYes.ts, 171, 1))
 
     public "constructor" = 0;
+>"constructor" : Symbol(bigClass["constructor"], Decl(convertKeywordsYes.ts, 173, 16))
+
     public any = 0;
 >any : Symbol(bigClass.any, Decl(convertKeywordsYes.ts, 174, 29))
 
diff --git a/tests/baselines/reference/convertKeywordsYes.types b/tests/baselines/reference/convertKeywordsYes.types
index 3ed4f9ae903..b7b3989df4e 100644
--- a/tests/baselines/reference/convertKeywordsYes.types
+++ b/tests/baselines/reference/convertKeywordsYes.types
@@ -578,6 +578,7 @@ class bigClass {
 >bigClass : bigClass
 
     public "constructor" = 0;
+>"constructor" : number
 >0 : 0
 
     public any = 0;
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences1.symbols b/tests/baselines/reference/correctlyMarkAliasAsReferences1.symbols
index b0338f1c803..f8a1dfe2ef4 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences1.symbols
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences1.symbols
@@ -25,5 +25,5 @@ let k = <button {...buttonProps}>
 
 === tests/cases/conformance/jsx/declaration.d.ts ===
 declare module "classnames";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"classnames" : Symbol("classnames", Decl(declaration.d.ts, 0, 0))
+
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences1.types b/tests/baselines/reference/correctlyMarkAliasAsReferences1.types
index dbcad2fdc3c..4dd55f7e7c3 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences1.types
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences1.types
@@ -31,5 +31,5 @@ let k = <button {...buttonProps}>
 
 === tests/cases/conformance/jsx/declaration.d.ts ===
 declare module "classnames";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"classnames" : any
+
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences2.symbols b/tests/baselines/reference/correctlyMarkAliasAsReferences2.symbols
index 7e131bde878..c316837d7c1 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences2.symbols
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences2.symbols
@@ -26,5 +26,5 @@ let k = <button {...buttonProps}>
 
 === tests/cases/conformance/jsx/declaration.d.ts ===
 declare module "classnames";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"classnames" : Symbol("classnames", Decl(declaration.d.ts, 0, 0))
+
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences2.types b/tests/baselines/reference/correctlyMarkAliasAsReferences2.types
index cfaba960da2..3880a2002e5 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences2.types
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences2.types
@@ -32,5 +32,5 @@ let k = <button {...buttonProps}>
 
 === tests/cases/conformance/jsx/declaration.d.ts ===
 declare module "classnames";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"classnames" : any
+
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences3.symbols b/tests/baselines/reference/correctlyMarkAliasAsReferences3.symbols
index 4002c29b3c6..0c7fe97979f 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences3.symbols
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences3.symbols
@@ -25,5 +25,5 @@ let k = <button {...buttonProps}>
 
 === tests/cases/conformance/jsx/declaration.d.ts ===
 declare module "classnames";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"classnames" : Symbol("classnames", Decl(declaration.d.ts, 0, 0))
+
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences3.types b/tests/baselines/reference/correctlyMarkAliasAsReferences3.types
index cca59ae2f5e..fa16d7d814b 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences3.types
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences3.types
@@ -31,5 +31,5 @@ let k = <button {...buttonProps}>
 
 === tests/cases/conformance/jsx/declaration.d.ts ===
 declare module "classnames";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"classnames" : any
+
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences4.symbols b/tests/baselines/reference/correctlyMarkAliasAsReferences4.symbols
index 0253e34533f..95a50b0b3d3 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences4.symbols
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences4.symbols
@@ -20,5 +20,5 @@ let k = <button {...buttonProps} className={cx('class1', { class2: true })} />;
 
 === tests/cases/conformance/jsx/declaration.d.ts ===
 declare module "classnames";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"classnames" : Symbol("classnames", Decl(declaration.d.ts, 0, 0))
+
diff --git a/tests/baselines/reference/correctlyMarkAliasAsReferences4.types b/tests/baselines/reference/correctlyMarkAliasAsReferences4.types
index 334444b8e22..c72301bae24 100644
--- a/tests/baselines/reference/correctlyMarkAliasAsReferences4.types
+++ b/tests/baselines/reference/correctlyMarkAliasAsReferences4.types
@@ -25,5 +25,5 @@ let k = <button {...buttonProps} className={cx('class1', { class2: true })} />;
 
 === tests/cases/conformance/jsx/declaration.d.ts ===
 declare module "classnames";
-No type information for this code.
-No type information for this code.
\ No newline at end of file
+>"classnames" : any
+
diff --git a/tests/baselines/reference/cyclicModuleImport.symbols b/tests/baselines/reference/cyclicModuleImport.symbols
index 14bdf2d47d3..58f64f386f2 100644
--- a/tests/baselines/reference/cyclicModuleImport.symbols
+++ b/tests/baselines/reference/cyclicModuleImport.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/cyclicModuleImport.ts ===
 declare module "SubModule" {
+>"SubModule" : Symbol("SubModule", Decl(cyclicModuleImport.ts, 0, 0))
+
     import MainModule = require('MainModule');
 >MainModule : Symbol(MainModule, Decl(cyclicModuleImport.ts, 0, 28))
 
@@ -22,6 +24,8 @@ declare module "SubModule" {
 >SubModule : Symbol(SubModule, Decl(cyclicModuleImport.ts, 1, 46))
 }
 declare module "MainModule" {
+>"MainModule" : Symbol("MainModule", Decl(cyclicModuleImport.ts, 9, 1))
+
     import SubModule = require('SubModule');
 >SubModule : Symbol(SubModule, Decl(cyclicModuleImport.ts, 10, 29))
 
diff --git a/tests/baselines/reference/cyclicModuleImport.types b/tests/baselines/reference/cyclicModuleImport.types
index c581dd63c6d..6d4d08084a3 100644
--- a/tests/baselines/reference/cyclicModuleImport.types
+++ b/tests/baselines/reference/cyclicModuleImport.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/cyclicModuleImport.ts ===
 declare module "SubModule" {
+>"SubModule" : typeof "SubModule"
+
     import MainModule = require('MainModule');
 >MainModule : typeof MainModule
 
@@ -22,6 +24,8 @@ declare module "SubModule" {
 >SubModule : SubModule
 }
 declare module "MainModule" {
+>"MainModule" : typeof "MainModule"
+
     import SubModule = require('SubModule');
 >SubModule : typeof SubModule
 
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols
index 16cd0938541..49be7f52c2b 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts ===
 declare module "test" {
+>"test" : Symbol("test", Decl(declFileAliasUseBeforeDeclaration2.ts, 0, 0))
+
     module A {
 >A : Symbol(A, Decl(declFileAliasUseBeforeDeclaration2.ts, 0, 23))
 
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types
index a51c79e044c..0666cf30124 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts ===
 declare module "test" {
+>"test" : typeof "test"
+
     module A {
 >A : typeof A
 
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols
index 942d4a155f2..ee60eed18d5 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols
@@ -13,6 +13,8 @@ export var x: SubModule.m.m3.c;
 
 === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.ts ===
 declare module "SubModule" {
+>"SubModule" : Symbol("SubModule", Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 0, 0))
+
     export module m {
 >m : Symbol(m, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 0, 28))
 
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
index 2332302cead..d60bed7c414 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
@@ -13,6 +13,8 @@ export var x: SubModule.m.m3.c;
 
 === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.ts ===
 declare module "SubModule" {
+>"SubModule" : typeof "SubModule"
+
     export module m {
 >m : any
 
diff --git a/tests/baselines/reference/declFileEnums.symbols b/tests/baselines/reference/declFileEnums.symbols
index e236509f6b1..4b1721d7a57 100644
--- a/tests/baselines/reference/declFileEnums.symbols
+++ b/tests/baselines/reference/declFileEnums.symbols
@@ -66,9 +66,16 @@ enum e5 {
 >e5 : Symbol(e5, Decl(declFileEnums.ts, 24, 1))
 
     "Friday",
+>"Friday" : Symbol(e5["Friday"], Decl(declFileEnums.ts, 26, 9))
+
     "Saturday",
+>"Saturday" : Symbol(e5["Saturday"], Decl(declFileEnums.ts, 27, 13))
+
     "Sunday",
+>"Sunday" : Symbol(e5["Sunday"], Decl(declFileEnums.ts, 28, 15))
+
     "Weekend days"
+>"Weekend days" : Symbol(e5["Weekend days"], Decl(declFileEnums.ts, 29, 13))
 }
 
 
diff --git a/tests/baselines/reference/declFileEnums.types b/tests/baselines/reference/declFileEnums.types
index eb13d3bbf67..21578650934 100644
--- a/tests/baselines/reference/declFileEnums.types
+++ b/tests/baselines/reference/declFileEnums.types
@@ -74,9 +74,16 @@ enum e5 {
 >e5 : e5
 
     "Friday",
+>"Friday" : e5.Friday
+
     "Saturday",
+>"Saturday" : e5.Saturday
+
     "Sunday",
+>"Sunday" : e5.Sunday
+
     "Weekend days"
+>"Weekend days" : e5.Weekend days
 }
 
 
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.symbols b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.symbols
index 9efd94c029e..f9ee7a85bcd 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.symbols
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.symbols
@@ -4,12 +4,16 @@ class List<T> { }
 >T : Symbol(T, Decl(declFileImportedTypeUseInTypeArgPosition.ts, 0, 11))
 
 declare module 'mod1' {
+>'mod1' : Symbol('mod1', Decl(declFileImportedTypeUseInTypeArgPosition.ts, 0, 17))
+
     class Foo {
 >Foo : Symbol(Foo, Decl(declFileImportedTypeUseInTypeArgPosition.ts, 1, 23))
     }
 }
 
 declare module 'moo' {
+>'moo' : Symbol('moo', Decl(declFileImportedTypeUseInTypeArgPosition.ts, 4, 1))
+
     import x = require('mod1');
 >x : Symbol(x, Decl(declFileImportedTypeUseInTypeArgPosition.ts, 6, 22))
 
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
index 317f071efc0..705cb99417d 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
@@ -4,12 +4,16 @@ class List<T> { }
 >T : T
 
 declare module 'mod1' {
+>'mod1' : typeof 'mod1'
+
     class Foo {
 >Foo : Foo
     }
 }
 
 declare module 'moo' {
+>'moo' : typeof 'moo'
+
     import x = require('mod1');
 >x : typeof x
 
diff --git a/tests/baselines/reference/declarationEmitRelativeModuleError.symbols b/tests/baselines/reference/declarationEmitRelativeModuleError.symbols
index d07a145116a..243457a4f92 100644
--- a/tests/baselines/reference/declarationEmitRelativeModuleError.symbols
+++ b/tests/baselines/reference/declarationEmitRelativeModuleError.symbols
@@ -1,9 +1,10 @@
 === tests/cases/compiler/declarationEmitRelativeModuleError.ts ===
 declare module "b:block" { // <-- no error anymore
-No type information for this code.    
-No type information for this code.}
-No type information for this code.
-No type information for this code.declare module "b:/block" { // <-- still an error
-No type information for this code.    
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"b:block" : Symbol("b:block", Decl(declarationEmitRelativeModuleError.ts, 0, 0))
+    
+}
+
+declare module "b:/block" { // <-- still an error
+>"b:/block" : Symbol("b:/block", Decl(declarationEmitRelativeModuleError.ts, 2, 1))
+    
+}
diff --git a/tests/baselines/reference/declarationEmitRelativeModuleError.types b/tests/baselines/reference/declarationEmitRelativeModuleError.types
index d07a145116a..56cb018c9b9 100644
--- a/tests/baselines/reference/declarationEmitRelativeModuleError.types
+++ b/tests/baselines/reference/declarationEmitRelativeModuleError.types
@@ -1,9 +1,10 @@
 === tests/cases/compiler/declarationEmitRelativeModuleError.ts ===
 declare module "b:block" { // <-- no error anymore
-No type information for this code.    
-No type information for this code.}
-No type information for this code.
-No type information for this code.declare module "b:/block" { // <-- still an error
-No type information for this code.    
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"b:block" : typeof "b:block"
+    
+}
+
+declare module "b:/block" { // <-- still an error
+>"b:/block" : typeof "b:/block"
+    
+}
diff --git a/tests/baselines/reference/declarationMerging2.symbols b/tests/baselines/reference/declarationMerging2.symbols
index 3a740300633..a289a194bb2 100644
--- a/tests/baselines/reference/declarationMerging2.symbols
+++ b/tests/baselines/reference/declarationMerging2.symbols
@@ -15,6 +15,8 @@ export class A {
 === tests/cases/compiler/b.ts ===
 export {}
 declare module "./a" {
+>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 9))
+
     interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22))
 
diff --git a/tests/baselines/reference/declarationMerging2.types b/tests/baselines/reference/declarationMerging2.types
index 3d30bf89904..890b1e3faa7 100644
--- a/tests/baselines/reference/declarationMerging2.types
+++ b/tests/baselines/reference/declarationMerging2.types
@@ -15,6 +15,8 @@ export class A {
 === tests/cases/compiler/b.ts ===
 export {}
 declare module "./a" {
+>"./a" : typeof "tests/cases/compiler/a"
+
     interface A {
 >A : A
 
diff --git a/tests/baselines/reference/declarationsAndAssignments.symbols b/tests/baselines/reference/declarationsAndAssignments.symbols
index 2765808d79d..60518a541f8 100644
--- a/tests/baselines/reference/declarationsAndAssignments.symbols
+++ b/tests/baselines/reference/declarationsAndAssignments.symbols
@@ -210,6 +210,8 @@ function f9() {
     var [c, d] = { 0: 10, 1: 20 };  // Error, not array type
 >c : Symbol(c, Decl(declarationsAndAssignments.ts, 67, 9))
 >d : Symbol(d, Decl(declarationsAndAssignments.ts, 67, 11))
+>0 : Symbol(0, Decl(declarationsAndAssignments.ts, 67, 18))
+>1 : Symbol(1, Decl(declarationsAndAssignments.ts, 67, 25))
 
     var [e, f] = [10, 20];
 >e : Symbol(e, Decl(declarationsAndAssignments.ts, 68, 9))
@@ -242,10 +244,14 @@ function f11() {
     var { 0: a, 1: b } = { 0: 10, 1: "hello" };
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 77, 9), Decl(declarationsAndAssignments.ts, 78, 9), Decl(declarationsAndAssignments.ts, 79, 9), Decl(declarationsAndAssignments.ts, 80, 9), Decl(declarationsAndAssignments.ts, 81, 7))
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 77, 15), Decl(declarationsAndAssignments.ts, 78, 15), Decl(declarationsAndAssignments.ts, 79, 17), Decl(declarationsAndAssignments.ts, 80, 15), Decl(declarationsAndAssignments.ts, 82, 7))
+>0 : Symbol(0, Decl(declarationsAndAssignments.ts, 78, 26))
+>1 : Symbol(1, Decl(declarationsAndAssignments.ts, 78, 33))
 
     var { "<": a, ">": b } = { "<": 10, ">": "hello" };
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 77, 9), Decl(declarationsAndAssignments.ts, 78, 9), Decl(declarationsAndAssignments.ts, 79, 9), Decl(declarationsAndAssignments.ts, 80, 9), Decl(declarationsAndAssignments.ts, 81, 7))
 >b : Symbol(b, Decl(declarationsAndAssignments.ts, 77, 15), Decl(declarationsAndAssignments.ts, 78, 15), Decl(declarationsAndAssignments.ts, 79, 17), Decl(declarationsAndAssignments.ts, 80, 15), Decl(declarationsAndAssignments.ts, 82, 7))
+>"<" : Symbol("<", Decl(declarationsAndAssignments.ts, 79, 30))
+>">" : Symbol(">", Decl(declarationsAndAssignments.ts, 79, 39))
 
     var { 0: a, 1: b } = [10, "hello"];
 >a : Symbol(a, Decl(declarationsAndAssignments.ts, 77, 9), Decl(declarationsAndAssignments.ts, 78, 9), Decl(declarationsAndAssignments.ts, 79, 9), Decl(declarationsAndAssignments.ts, 80, 9), Decl(declarationsAndAssignments.ts, 81, 7))
diff --git a/tests/baselines/reference/declarationsAndAssignments.types b/tests/baselines/reference/declarationsAndAssignments.types
index 31e9920c630..10571cf4312 100644
--- a/tests/baselines/reference/declarationsAndAssignments.types
+++ b/tests/baselines/reference/declarationsAndAssignments.types
@@ -280,7 +280,9 @@ function f9() {
 >c : number
 >d : number
 >{ 0: 10, 1: 20 } : { 0: number; 1: number; }
+>0 : number
 >10 : 10
+>1 : number
 >20 : 20
 
     var [e, f] = [10, 20];
@@ -323,14 +325,18 @@ function f11() {
 >a : number
 >b : string
 >{ 0: 10, 1: "hello" } : { 0: number; 1: string; }
+>0 : number
 >10 : 10
+>1 : string
 >"hello" : "hello"
 
     var { "<": a, ">": b } = { "<": 10, ">": "hello" };
 >a : number
 >b : string
 >{ "<": 10, ">": "hello" } : { "<": number; ">": string; }
+>"<" : number
 >10 : 10
+>">" : string
 >"hello" : "hello"
 
     var { 0: a, 1: b } = [10, "hello"];
diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols
index af691ce828c..5aeb48b32a7 100644
--- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols
+++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts ===
 declare module "express" {
+>"express" : Symbol("express", Decl(declareExternalModuleWithExportAssignedFundule.ts, 0, 0))
 
     export = express;
 >express : Symbol(express, Decl(declareExternalModuleWithExportAssignedFundule.ts, 2, 21), Decl(declareExternalModuleWithExportAssignedFundule.ts, 4, 46))
diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
index 2206c804448..e0936614fb2 100644
--- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
+++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
@@ -1,5 +1,6 @@
 === tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts ===
 declare module "express" {
+>"express" : typeof "express"
 
     export = express;
 >express : typeof express
diff --git a/tests/baselines/reference/declaredExternalModule.symbols b/tests/baselines/reference/declaredExternalModule.symbols
index fb331ecf011..9d60a99a2c2 100644
--- a/tests/baselines/reference/declaredExternalModule.symbols
+++ b/tests/baselines/reference/declaredExternalModule.symbols
@@ -1,5 +1,6 @@
 === tests/cases/compiler/declaredExternalModule.ts ===
 declare module 'connect' {
+>'connect' : Symbol('connect', Decl(declaredExternalModule.ts, 0, 0))
 
     interface connectModule {
 >connectModule : Symbol(connectModule, Decl(declaredExternalModule.ts, 0, 26))
diff --git a/tests/baselines/reference/declaredExternalModule.types b/tests/baselines/reference/declaredExternalModule.types
index 5ce504e7f4b..4ac6fcb8be5 100644
--- a/tests/baselines/reference/declaredExternalModule.types
+++ b/tests/baselines/reference/declaredExternalModule.types
@@ -1,5 +1,6 @@
 === tests/cases/compiler/declaredExternalModule.ts ===
 declare module 'connect' {
+>'connect' : typeof 'connect'
 
     interface connectModule {
 >connectModule : connectModule
diff --git a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols
index efba0c20c41..955cc2489d2 100644
--- a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols
+++ b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts ===
 declare module 'connect' {
+>'connect' : Symbol('connect', Decl(declaredExternalModuleWithExportAssignment.ts, 0, 0))
+
     interface connectModule {
 >connectModule : Symbol(connectModule, Decl(declaredExternalModuleWithExportAssignment.ts, 0, 26))
 
diff --git a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types
index e550e8ee13d..b020c11ab62 100644
--- a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types
+++ b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts ===
 declare module 'connect' {
+>'connect' : typeof 'connect'
+
     interface connectModule {
 >connectModule : connectModule
 
diff --git a/tests/baselines/reference/decrementOperatorWithEnumType.symbols b/tests/baselines/reference/decrementOperatorWithEnumType.symbols
index b2ad713ce8a..d7b4e2f5d30 100644
--- a/tests/baselines/reference/decrementOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/decrementOperatorWithEnumType.symbols
@@ -5,6 +5,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(decrementOperatorWithEnumType.ts, 0, 0))
 >A : Symbol(ENUM1.A, Decl(decrementOperatorWithEnumType.ts, 2, 12))
 >B : Symbol(ENUM1.B, Decl(decrementOperatorWithEnumType.ts, 2, 15))
+>"" : Symbol(ENUM1[""], Decl(decrementOperatorWithEnumType.ts, 2, 18))
 
 // expression
 var ResultIsNumber1 = --ENUM1["A"];
diff --git a/tests/baselines/reference/decrementOperatorWithEnumType.types b/tests/baselines/reference/decrementOperatorWithEnumType.types
index a8def8a7f21..ba9db0156e3 100644
--- a/tests/baselines/reference/decrementOperatorWithEnumType.types
+++ b/tests/baselines/reference/decrementOperatorWithEnumType.types
@@ -5,6 +5,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // expression
 var ResultIsNumber1 = --ENUM1["A"];
diff --git a/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.symbols b/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.symbols
index 4c8db60b271..ffa4eb37c06 100644
--- a/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.symbols
+++ b/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.symbols
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(decrementOperatorWithEnumTypeInvalidOperations.ts, 2, 14))
 >A : Symbol(ENUM1.A, Decl(decrementOperatorWithEnumTypeInvalidOperations.ts, 3, 12))
 >B : Symbol(ENUM1.B, Decl(decrementOperatorWithEnumTypeInvalidOperations.ts, 3, 15))
+>"" : Symbol(ENUM1[""], Decl(decrementOperatorWithEnumTypeInvalidOperations.ts, 3, 18))
 
 // enum type var
 var ResultIsNumber1 = --ENUM;
diff --git a/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.types b/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.types
index 3f05e92a3d1..66c71837550 100644
--- a/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.types
+++ b/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.types
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // enum type var
 var ResultIsNumber1 = --ENUM;
diff --git a/tests/baselines/reference/deleteOperatorWithEnumType.symbols b/tests/baselines/reference/deleteOperatorWithEnumType.symbols
index bdef75325da..a4da508e710 100644
--- a/tests/baselines/reference/deleteOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/deleteOperatorWithEnumType.symbols
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(deleteOperatorWithEnumType.ts, 2, 14))
 >A : Symbol(ENUM1.A, Decl(deleteOperatorWithEnumType.ts, 3, 12))
 >B : Symbol(ENUM1.B, Decl(deleteOperatorWithEnumType.ts, 3, 15))
+>"" : Symbol(ENUM1[""], Decl(deleteOperatorWithEnumType.ts, 3, 18))
 
 // enum type var
 var ResultIsBoolean1 = delete ENUM;
diff --git a/tests/baselines/reference/deleteOperatorWithEnumType.types b/tests/baselines/reference/deleteOperatorWithEnumType.types
index 5248ef6d46e..7a067bc61a0 100644
--- a/tests/baselines/reference/deleteOperatorWithEnumType.types
+++ b/tests/baselines/reference/deleteOperatorWithEnumType.types
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // enum type var
 var ResultIsBoolean1 = delete ENUM;
diff --git a/tests/baselines/reference/deleteReadonly.symbols b/tests/baselines/reference/deleteReadonly.symbols
index 5f8a6507174..b6711f279fc 100644
--- a/tests/baselines/reference/deleteReadonly.symbols
+++ b/tests/baselines/reference/deleteReadonly.symbols
@@ -31,6 +31,8 @@ var b: B = {
 >B : Symbol(B, Decl(deleteReadonly.ts, 7, 11))
 
   'test': 'test'
+>'test' : Symbol('test', Decl(deleteReadonly.ts, 13, 12))
+
 };
 
 delete b['test'];
diff --git a/tests/baselines/reference/deleteReadonly.types b/tests/baselines/reference/deleteReadonly.types
index 77295796afd..0a91ee912c5 100644
--- a/tests/baselines/reference/deleteReadonly.types
+++ b/tests/baselines/reference/deleteReadonly.types
@@ -35,6 +35,7 @@ var b: B = {
 >{  'test': 'test'} : { 'test': string; }
 
   'test': 'test'
+>'test' : string
 >'test' : "test"
 
 };
diff --git a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.symbols b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.symbols
index c6cba53af43..0bc37451cd0 100644
--- a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.symbols
+++ b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.symbols
@@ -17,6 +17,7 @@ interface Derived extends Base {
 >Base : Symbol(Base, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 0, 0))
 
     1: { y: number } // error
+>1 : Symbol(Derived[1], Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 5, 32))
 >y : Symbol(y, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 6, 8))
 }
 
@@ -25,6 +26,7 @@ interface Derived2 extends Base {
 >Base : Symbol(Base, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 0, 0))
 
     '1': { y: number } // error
+>'1' : Symbol(Derived2['1'], Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 9, 33))
 >y : Symbol(y, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 10, 10))
 }
 
@@ -52,6 +54,7 @@ interface Derived5 extends Base {
 >Base : Symbol(Base, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 0, 0))
 
     1: { x: number } // error
+>1 : Symbol(Derived5[1], Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 22, 33), Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 26, 33))
 >x : Symbol(x, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 23, 8))
 }
 
@@ -60,5 +63,6 @@ interface Derived5 extends Base {
 >Base : Symbol(Base, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 0, 0))
 
     '1': { x: number } // error
+>'1' : Symbol(Derived5[1], Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 22, 33), Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 26, 33))
 >x : Symbol(x, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 27, 10))
 }
diff --git a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types
index f4a2a536789..c5078ef2616 100644
--- a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types
+++ b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types
@@ -17,6 +17,7 @@ interface Derived extends Base {
 >Base : Base
 
     1: { y: number } // error
+>1 : { y: number; }
 >y : number
 }
 
@@ -25,6 +26,7 @@ interface Derived2 extends Base {
 >Base : Base
 
     '1': { y: number } // error
+>'1' : { y: number; }
 >y : number
 }
 
@@ -52,6 +54,7 @@ interface Derived5 extends Base {
 >Base : Base
 
     1: { x: number } // error
+>1 : { x: number; }
 >x : number
 }
 
@@ -60,5 +63,6 @@ interface Derived5 extends Base {
 >Base : Base
 
     '1': { x: number } // error
+>'1' : { x: number; }
 >x : number
 }
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.symbols b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.symbols
index def4a3b2e2e..b8ec6437e10 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.symbols
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.symbols
@@ -24,6 +24,7 @@ interface J extends Array<Number> {
 >Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     2: number;
+>2 : Symbol(J[2], Decl(destructuringArrayBindingPatternAndAssignment2.ts, 9, 35))
 }
 
 function bar(): J {
@@ -67,6 +68,7 @@ function foo(idx: number): F {
 
     return {
         2: true
+>2 : Symbol(2, Decl(destructuringArrayBindingPatternAndAssignment2.ts, 29, 12))
     }
 }
 var [c4, c5, c6] = foo(1);  // Error
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
index 73640f27a59..1a8eb31fd80 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
@@ -29,6 +29,7 @@ interface J extends Array<Number> {
 >Number : Number
 
     2: number;
+>2 : number
 }
 
 function bar(): J {
@@ -89,6 +90,7 @@ function foo(idx: number): F {
 >{        2: true    } : { 2: true; }
 
         2: true
+>2 : true
 >true : true
     }
 }
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols
index 718af66047d..ccf9841eba0 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols
@@ -27,6 +27,7 @@ var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
 
 var {1: b3} = { 1: "string" };
 >b3 : Symbol(b3, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 13, 5))
+>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 13, 15))
 
 var {b4 = 1}: any = { b4: 100000 };
 >b4 : Symbol(b4, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 14, 5))
@@ -55,6 +56,8 @@ function foo(): F {
 
     return {
         1: true
+>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 26, 12))
+
     };
 }
 
@@ -64,6 +67,8 @@ function bar(): F {
 
     return {
         2: true
+>2 : Symbol(2, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 32, 12))
+
     };
 }
 var {1: c0} = foo();
@@ -90,6 +95,7 @@ function foo1(): F1 {
 
     return {
         "prop1": 2
+>"prop1" : Symbol("prop1", Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 47, 12))
     }
 }
 
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
index 203815fa9c8..e2ed5129850 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
@@ -36,6 +36,7 @@ var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
 var {1: b3} = { 1: "string" };
 >b3 : string
 >{ 1: "string" } : { 1: string; }
+>1 : string
 >"string" : "string"
 
 var {b4 = 1}: any = { b4: 100000 };
@@ -72,6 +73,7 @@ function foo(): F {
 >{        1: true    } : { 1: true; }
 
         1: true
+>1 : true
 >true : true
 
     };
@@ -85,6 +87,7 @@ function bar(): F {
 >{        2: true    } : { 2: true; }
 
         2: true
+>2 : true
 >true : true
 
     };
@@ -117,6 +120,7 @@ function foo1(): F1 {
 >{        "prop1": 2    } : { "prop1": number; }
 
         "prop1": 2
+>"prop1" : number
 >2 : 2
     }
 }
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols
index 57d739cbbfc..4e1987a06ef 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols
@@ -27,6 +27,7 @@ var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
 
 var {1: b3} = { 1: "string" };
 >b3 : Symbol(b3, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 13, 5))
+>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 13, 15))
 
 var {b4 = 1}: any = { b4: 100000 };
 >b4 : Symbol(b4, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 14, 5))
@@ -55,6 +56,8 @@ function foo(): F {
 
     return {
         1: true
+>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 26, 12))
+
     };
 }
 
@@ -64,6 +67,8 @@ function bar(): F {
 
     return {
         2: true
+>2 : Symbol(2, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 32, 12))
+
     };
 }
 var {1: c0} = foo();
@@ -90,6 +95,7 @@ function foo1(): F1 {
 
     return {
         "prop1": 2
+>"prop1" : Symbol("prop1", Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 47, 12))
     }
 }
 
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
index 1c3d1f4d00c..248dc6c44d6 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
@@ -36,6 +36,7 @@ var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
 var {1: b3} = { 1: "string" };
 >b3 : string
 >{ 1: "string" } : { 1: string; }
+>1 : string
 >"string" : "string"
 
 var {b4 = 1}: any = { b4: 100000 };
@@ -72,6 +73,7 @@ function foo(): F {
 >{        1: true    } : { 1: true; }
 
         1: true
+>1 : true
 >true : true
 
     };
@@ -85,6 +87,7 @@ function bar(): F {
 >{        2: true    } : { 2: true; }
 
         2: true
+>2 : true
 >true : true
 
     };
@@ -117,6 +120,7 @@ function foo1(): F1 {
 >{        "prop1": 2    } : { "prop1": number; }
 
         "prop1": 2
+>"prop1" : number
 >2 : 2
     }
 }
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.symbols b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.symbols
index b4d7266fe47..d909081a288 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.symbols
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.symbols
@@ -19,7 +19,9 @@ var { f2: {f21} = { f212: "string" } }: any = undefined;
 
 var {1} = { 1 };
 > : Symbol((Missing), Decl(destructuringObjectBindingPatternAndAssignment3.ts, 5, 5), Decl(destructuringObjectBindingPatternAndAssignment3.ts, 6, 5))
+>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment3.ts, 5, 11))
 
 var {"prop"} = { "prop": 1 };
 > : Symbol((Missing), Decl(destructuringObjectBindingPatternAndAssignment3.ts, 5, 5), Decl(destructuringObjectBindingPatternAndAssignment3.ts, 6, 5))
+>"prop" : Symbol("prop", Decl(destructuringObjectBindingPatternAndAssignment3.ts, 6, 16))
 
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.types
index b421306325e..89348936509 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.types
@@ -29,10 +29,12 @@ var { f2: {f21} = { f212: "string" } }: any = undefined;
 var {1} = { 1 };
 > : any
 >{ 1 } : { 1: any; }
+>1 : any
 > : any
 
 var {"prop"} = { "prop": 1 };
 > : any
 >{ "prop": 1 } : { "prop": number; }
+>"prop" : number
 >1 : 1
 
diff --git a/tests/baselines/reference/destructuringParameterProperties1.symbols b/tests/baselines/reference/destructuringParameterProperties1.symbols
index 00f047f0930..02f78879253 100644
--- a/tests/baselines/reference/destructuringParameterProperties1.symbols
+++ b/tests/baselines/reference/destructuringParameterProperties1.symbols
@@ -78,6 +78,7 @@ c3 = new C3({x: 0, "y": "y", z: true});
 >c3 : Symbol(c3, Decl(destructuringParameterProperties1.ts, 26, 3))
 >C3 : Symbol(C3, Decl(destructuringParameterProperties1.ts, 12, 52))
 >x : Symbol(x, Decl(destructuringParameterProperties1.ts, 27, 13))
+>"y" : Symbol("y", Decl(destructuringParameterProperties1.ts, 27, 18))
 >z : Symbol(z, Decl(destructuringParameterProperties1.ts, 27, 28))
 
 var [c3_x, c3_y, c3_z] = [c3.x, c3.y, c3.z];
diff --git a/tests/baselines/reference/destructuringParameterProperties1.types b/tests/baselines/reference/destructuringParameterProperties1.types
index e4c9964fb13..e5b056505b4 100644
--- a/tests/baselines/reference/destructuringParameterProperties1.types
+++ b/tests/baselines/reference/destructuringParameterProperties1.types
@@ -120,6 +120,7 @@ c3 = new C3({x: 0, "y": "y", z: true});
 >{x: 0, "y": "y", z: true} : { x: number; "y": string; z: true; }
 >x : number
 >0 : 0
+>"y" : string
 >"y" : "y"
 >z : true
 >true : true
diff --git a/tests/baselines/reference/doubleUnderscoreEnumEmit.symbols b/tests/baselines/reference/doubleUnderscoreEnumEmit.symbols
index 4e430a29b3f..4d748d28b47 100644
--- a/tests/baselines/reference/doubleUnderscoreEnumEmit.symbols
+++ b/tests/baselines/reference/doubleUnderscoreEnumEmit.symbols
@@ -3,9 +3,16 @@ enum Foo {
 >Foo : Symbol(Foo, Decl(doubleUnderscoreEnumEmit.ts, 0, 0), Decl(doubleUnderscoreEnumEmit.ts, 5, 1))
 
     "__a" = 1,
+>"__a" : Symbol(Foo["__a"], Decl(doubleUnderscoreEnumEmit.ts, 0, 10))
+
     "(Anonymous function)" = 2,
+>"(Anonymous function)" : Symbol(Foo["(Anonymous function)"], Decl(doubleUnderscoreEnumEmit.ts, 1, 14))
+
     "(Anonymous class)" = 4,
+>"(Anonymous class)" : Symbol(Foo["(Anonymous class)"], Decl(doubleUnderscoreEnumEmit.ts, 2, 31))
+
     "__call" = 10
+>"__call" : Symbol(Foo["__call"], Decl(doubleUnderscoreEnumEmit.ts, 3, 28))
 }
 namespace Foo {
 >Foo : Symbol(Foo, Decl(doubleUnderscoreEnumEmit.ts, 0, 0), Decl(doubleUnderscoreEnumEmit.ts, 5, 1))
diff --git a/tests/baselines/reference/doubleUnderscoreEnumEmit.types b/tests/baselines/reference/doubleUnderscoreEnumEmit.types
index 550b520c6bb..7dcfc70820a 100644
--- a/tests/baselines/reference/doubleUnderscoreEnumEmit.types
+++ b/tests/baselines/reference/doubleUnderscoreEnumEmit.types
@@ -3,15 +3,19 @@ enum Foo {
 >Foo : Foo
 
     "__a" = 1,
+>"__a" : Foo.__a
 >1 : 1
 
     "(Anonymous function)" = 2,
+>"(Anonymous function)" : Foo.(Anonymous function)
 >2 : 2
 
     "(Anonymous class)" = 4,
+>"(Anonymous class)" : Foo.(Anonymous class)
 >4 : 4
 
     "__call" = 10
+>"__call" : Foo.__call
 >10 : 10
 }
 namespace Foo {
diff --git a/tests/baselines/reference/duplicateIdentifierDifferentSpelling.symbols b/tests/baselines/reference/duplicateIdentifierDifferentSpelling.symbols
index 2dbc075b106..dd770b13abd 100644
--- a/tests/baselines/reference/duplicateIdentifierDifferentSpelling.symbols
+++ b/tests/baselines/reference/duplicateIdentifierDifferentSpelling.symbols
@@ -3,9 +3,14 @@ class A {
 >A : Symbol(A, Decl(duplicateIdentifierDifferentSpelling.ts, 0, 0))
 
   0b11 = '';
+>0b11 : Symbol(A[0b11], Decl(duplicateIdentifierDifferentSpelling.ts, 0, 9), Decl(duplicateIdentifierDifferentSpelling.ts, 1, 12))
+
   3 = '';
+>3 : Symbol(A[0b11], Decl(duplicateIdentifierDifferentSpelling.ts, 0, 9), Decl(duplicateIdentifierDifferentSpelling.ts, 1, 12))
 }
 
 var X = { 0b11: '', 3: '' };
 >X : Symbol(X, Decl(duplicateIdentifierDifferentSpelling.ts, 5, 3))
+>0b11 : Symbol(0b11, Decl(duplicateIdentifierDifferentSpelling.ts, 5, 9), Decl(duplicateIdentifierDifferentSpelling.ts, 5, 19))
+>3 : Symbol(0b11, Decl(duplicateIdentifierDifferentSpelling.ts, 5, 9), Decl(duplicateIdentifierDifferentSpelling.ts, 5, 19))
 
diff --git a/tests/baselines/reference/duplicateIdentifierDifferentSpelling.types b/tests/baselines/reference/duplicateIdentifierDifferentSpelling.types
index 82200862f4f..54023d8a7e0 100644
--- a/tests/baselines/reference/duplicateIdentifierDifferentSpelling.types
+++ b/tests/baselines/reference/duplicateIdentifierDifferentSpelling.types
@@ -3,15 +3,19 @@ class A {
 >A : A
 
   0b11 = '';
+>0b11 : string
 >'' : ""
 
   3 = '';
+>3 : string
 >'' : ""
 }
 
 var X = { 0b11: '', 3: '' };
 >X : { 0b11: string; }
 >{ 0b11: '', 3: '' } : { 0b11: string; }
+>0b11 : string
 >'' : ""
+>3 : string
 >'' : ""
 
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty.symbols b/tests/baselines/reference/duplicateObjectLiteralProperty.symbols
index 3f16ce4ea20..37e68e0af04 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty.symbols
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty.symbols
@@ -21,6 +21,7 @@ var x = {
 >c : Symbol(c, Decl(duplicateObjectLiteralProperty.ts, 5, 8), Decl(duplicateObjectLiteralProperty.ts, 6, 13))
 
         "c": 56, // Duplicate
+>"c" : Symbol(c, Decl(duplicateObjectLiteralProperty.ts, 5, 8), Decl(duplicateObjectLiteralProperty.ts, 6, 13))
     }
 };
 
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty.types b/tests/baselines/reference/duplicateObjectLiteralProperty.types
index 212fe3cf736..4431a52c196 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty.types
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty.types
@@ -28,6 +28,7 @@ var x = {
 >1 : 1
 
         "c": 56, // Duplicate
+>"c" : number
 >56 : 56
     }
 };
diff --git a/tests/baselines/reference/duplicateStringNamedProperty1.symbols b/tests/baselines/reference/duplicateStringNamedProperty1.symbols
index fb1100161c1..f3c2a373f22 100644
--- a/tests/baselines/reference/duplicateStringNamedProperty1.symbols
+++ b/tests/baselines/reference/duplicateStringNamedProperty1.symbols
@@ -3,6 +3,8 @@ export interface Album {
 >Album : Symbol(Album, Decl(duplicateStringNamedProperty1.ts, 0, 0))
 
     "artist": string;
+>"artist" : Symbol(Album["artist"], Decl(duplicateStringNamedProperty1.ts, 0, 24), Decl(duplicateStringNamedProperty1.ts, 1, 21))
+
     artist: string;
 >artist : Symbol(Album["artist"], Decl(duplicateStringNamedProperty1.ts, 0, 24), Decl(duplicateStringNamedProperty1.ts, 1, 21))
 }
diff --git a/tests/baselines/reference/duplicateStringNamedProperty1.types b/tests/baselines/reference/duplicateStringNamedProperty1.types
index c045f30bd43..f3402f931a8 100644
--- a/tests/baselines/reference/duplicateStringNamedProperty1.types
+++ b/tests/baselines/reference/duplicateStringNamedProperty1.types
@@ -3,6 +3,8 @@ export interface Album {
 >Album : Album
 
     "artist": string;
+>"artist" : string
+
     artist: string;
 >artist : string
 }
diff --git a/tests/baselines/reference/dynamicNames.symbols b/tests/baselines/reference/dynamicNames.symbols
index 2f545c919e3..f5242a7013d 100644
--- a/tests/baselines/reference/dynamicNames.symbols
+++ b/tests/baselines/reference/dynamicNames.symbols
@@ -202,6 +202,8 @@ interface T12 {
 >a : Symbol(T12.a, Decl(main.ts, 49, 15))
 
     1: string;
+>1 : Symbol(T12[1], Decl(main.ts, 50, 14))
+
     [s2]: boolean;
 >s2 : Symbol(s2, Decl(main.ts, 29, 12))
 }
@@ -213,6 +215,8 @@ declare class T13 implements T2 {
 >a : Symbol(T13.a, Decl(main.ts, 54, 33))
 
     1: string;
+>1 : Symbol(T13[1], Decl(main.ts, 55, 14))
+
     [s2]: boolean;
 >s2 : Symbol(s2, Decl(main.ts, 29, 12))
 }
@@ -227,6 +231,8 @@ declare type T15 = {
 >a : Symbol(a, Decl(main.ts, 61, 20))
 
     1: string;
+>1 : Symbol(1, Decl(main.ts, 62, 14))
+
     [s2]: boolean;
 >s2 : Symbol(s2, Decl(main.ts, 29, 12))
 
@@ -239,6 +245,8 @@ declare class C {
 >a : Symbol(C.a, Decl(main.ts, 67, 17))
 
     static 1: string;
+>1 : Symbol(C[1], Decl(main.ts, 68, 21))
+
     static [s2]: boolean;
 >s2 : Symbol(s2, Decl(main.ts, 29, 12))
 }
diff --git a/tests/baselines/reference/dynamicNames.types b/tests/baselines/reference/dynamicNames.types
index f3c66457911..be142c30ed0 100644
--- a/tests/baselines/reference/dynamicNames.types
+++ b/tests/baselines/reference/dynamicNames.types
@@ -209,6 +209,8 @@ interface T12 {
 >a : number
 
     1: string;
+>1 : string
+
     [s2]: boolean;
 >s2 : unique symbol
 }
@@ -220,6 +222,8 @@ declare class T13 implements T2 {
 >a : number
 
     1: string;
+>1 : string
+
     [s2]: boolean;
 >s2 : unique symbol
 }
@@ -234,6 +238,8 @@ declare type T15 = {
 >a : number
 
     1: string;
+>1 : string
+
     [s2]: boolean;
 >s2 : unique symbol
 
@@ -246,6 +252,8 @@ declare class C {
 >a : number
 
     static 1: string;
+>1 : string
+
     static [s2]: boolean;
 >s2 : unique symbol
 }
diff --git a/tests/baselines/reference/dynamicNamesErrors.symbols b/tests/baselines/reference/dynamicNamesErrors.symbols
index 30ba78a99a3..9d00d294343 100644
--- a/tests/baselines/reference/dynamicNamesErrors.symbols
+++ b/tests/baselines/reference/dynamicNamesErrors.symbols
@@ -12,6 +12,7 @@ interface T0 {
 >c0 : Symbol(c0, Decl(dynamicNamesErrors.ts, 0, 5))
 
     1: number;
+>1 : Symbol(T0[1], Decl(dynamicNamesErrors.ts, 4, 17))
 }
 
 interface T1 {
diff --git a/tests/baselines/reference/dynamicNamesErrors.types b/tests/baselines/reference/dynamicNamesErrors.types
index 3e3f71ec141..be2cb4e8906 100644
--- a/tests/baselines/reference/dynamicNamesErrors.types
+++ b/tests/baselines/reference/dynamicNamesErrors.types
@@ -14,6 +14,7 @@ interface T0 {
 >c0 : "1"
 
     1: number;
+>1 : number
 }
 
 interface T1 {
diff --git a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.symbols b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.symbols
index 36803f00490..ae5c2b4d71c 100644
--- a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.symbols
+++ b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.symbols
@@ -1,10 +1,14 @@
 === tests/cases/compiler/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts ===
 (x) => ({ "1": "one", "2": "two" } as { [key: string]: string })[x];
 >x : Symbol(x, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 0, 1))
+>"1" : Symbol("1", Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 0, 9))
+>"2" : Symbol("2", Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 0, 21))
 >key : Symbol(key, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 0, 41))
 >x : Symbol(x, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 0, 1))
 
 (x) => ({ "1": "one", "2": "two" } as { [key: string]: string }).x;
 >x : Symbol(x, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 1, 1))
+>"1" : Symbol("1", Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 1, 9))
+>"2" : Symbol("2", Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 1, 21))
 >key : Symbol(key, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.ts, 1, 41))
 
diff --git a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.types b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.types
index 83637f261de..629c56389c5 100644
--- a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.types
+++ b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES5.types
@@ -6,7 +6,9 @@
 >({ "1": "one", "2": "two" } as { [key: string]: string }) : { [key: string]: string; }
 >{ "1": "one", "2": "two" } as { [key: string]: string } : { [key: string]: string; }
 >{ "1": "one", "2": "two" } : { "1": string; "2": string; }
+>"1" : string
 >"one" : "one"
+>"2" : string
 >"two" : "two"
 >key : string
 >x : any
@@ -18,7 +20,9 @@
 >({ "1": "one", "2": "two" } as { [key: string]: string }) : { [key: string]: string; }
 >{ "1": "one", "2": "two" } as { [key: string]: string } : { [key: string]: string; }
 >{ "1": "one", "2": "two" } : { "1": string; "2": string; }
+>"1" : string
 >"one" : "one"
+>"2" : string
 >"two" : "two"
 >key : string
 >x : string
diff --git a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.symbols b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.symbols
index 20b10f84a22..77ed54addd9 100644
--- a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.symbols
+++ b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.symbols
@@ -1,10 +1,14 @@
 === tests/cases/compiler/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts ===
 (x) => ({ "1": "one", "2": "two" } as { [key: string]: string })[x];
 >x : Symbol(x, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 0, 1))
+>"1" : Symbol("1", Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 0, 9))
+>"2" : Symbol("2", Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 0, 21))
 >key : Symbol(key, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 0, 41))
 >x : Symbol(x, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 0, 1))
 
 (x) => ({ "1": "one", "2": "two" } as { [key: string]: string }).x;
 >x : Symbol(x, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 1, 1))
+>"1" : Symbol("1", Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 1, 9))
+>"2" : Symbol("2", Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 1, 21))
 >key : Symbol(key, Decl(emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.ts, 1, 41))
 
diff --git a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.types b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.types
index f19255cd724..47093bbffe4 100644
--- a/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.types
+++ b/tests/baselines/reference/emitAccessExpressionOfCastedObjectLiteralExpressionInArrowFunctionES6.types
@@ -6,7 +6,9 @@
 >({ "1": "one", "2": "two" } as { [key: string]: string }) : { [key: string]: string; }
 >{ "1": "one", "2": "two" } as { [key: string]: string } : { [key: string]: string; }
 >{ "1": "one", "2": "two" } : { "1": string; "2": string; }
+>"1" : string
 >"one" : "one"
+>"2" : string
 >"two" : "two"
 >key : string
 >x : any
@@ -18,7 +20,9 @@
 >({ "1": "one", "2": "two" } as { [key: string]: string }) : { [key: string]: string; }
 >{ "1": "one", "2": "two" } as { [key: string]: string } : { [key: string]: string; }
 >{ "1": "one", "2": "two" } : { "1": string; "2": string; }
+>"1" : string
 >"one" : "one"
+>"2" : string
 >"two" : "two"
 >key : string
 >x : string
diff --git a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols
index cb716163d6a..781ae784930 100644
--- a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols
@@ -3,17 +3,38 @@ class B {
 >B : Symbol(B, Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 0, 0))
 
     "hello" = 10;
+>"hello" : Symbol(B["hello"], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 0, 9))
+
     0b110 = "world";
+>0b110 : Symbol(B[0b110], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 1, 17))
+
     0o23534 = "WORLD";
+>0o23534 : Symbol(B[0o23534], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 2, 20))
+
     20 = "twenty";
+>20 : Symbol(B[20], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 3, 22))
+
     "foo"() { }
+>"foo" : Symbol(B["foo"], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 4, 18))
+
     0b1110() {}
+>0b1110 : Symbol(B[0b1110], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 5, 15))
+
     11() { }
+>11 : Symbol(B[11], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 6, 15))
+
     interface() { }
 >interface : Symbol(B.interface, Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 7, 12))
 
     static "hi" = 10000;
+>"hi" : Symbol(B["hi"], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 8, 19))
+
     static 22 = "twenty-two";
+>22 : Symbol(B[22], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 9, 24))
+
     static 0b101 = "binary";
+>0b101 : Symbol(B[0b101], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 10, 29))
+
     static 0o3235 = "octal";
+>0o3235 : Symbol(B[0o3235], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 11, 28))
 }
diff --git a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types
index 203d5071a15..a2236b561e7 100644
--- a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types
@@ -3,32 +3,46 @@ class B {
 >B : B
 
     "hello" = 10;
+>"hello" : number
 >10 : 10
 
     0b110 = "world";
+>0b110 : string
 >"world" : "world"
 
     0o23534 = "WORLD";
+>0o23534 : string
 >"WORLD" : "WORLD"
 
     20 = "twenty";
+>20 : string
 >"twenty" : "twenty"
 
     "foo"() { }
+>"foo" : () => void
+
     0b1110() {}
+>0b1110 : () => void
+
     11() { }
+>11 : () => void
+
     interface() { }
 >interface : () => void
 
     static "hi" = 10000;
+>"hi" : number
 >10000 : 10000
 
     static 22 = "twenty-two";
+>22 : string
 >"twenty-two" : "twenty-two"
 
     static 0b101 = "binary";
+>0b101 : string
 >"binary" : "binary"
 
     static 0o3235 = "octal";
+>0o3235 : string
 >"octal" : "octal"
 }
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.symbols b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.symbols
index 923c0bac1ef..661ead70c89 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.symbols
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.symbols
@@ -9,6 +9,7 @@ function foo() {
 >globalCounter : Symbol(globalCounter, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS2.ts, 0, 3))
 
     return { 0: 2 };
+>0 : Symbol(0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS2.ts, 3, 12))
 }
 foo()[0] **= foo()[0];
 >foo : Symbol(foo, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS2.ts, 0, 22))
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.types b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.types
index cd057d31390..53914f558c9 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.types
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.types
@@ -13,6 +13,7 @@ function foo() {
 
     return { 0: 2 };
 >{ 0: 2 } : { 0: number; }
+>0 : number
 >2 : 2
 }
 foo()[0] **= foo()[0];
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols
index ac738dbf477..d61ece96d18 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols
@@ -6,9 +6,12 @@ var object = {
 >_0 : Symbol(_0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 0, 14))
 
     get 0() {
+>0 : Symbol(0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 10), Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 4, 6))
+
         return this._0;
     },
     set 0(x: number) {
+>0 : Symbol(0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 10), Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 4, 6))
 >x : Symbol(x, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 5, 10))
 
         this._0 = x;
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types
index 0dfd96393c9..2a1651581f3 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types
@@ -8,6 +8,8 @@ var object = {
 >2 : 2
 
     get 0() {
+>0 : number
+
         return this._0;
 >this._0 : any
 >this : any
@@ -15,6 +17,7 @@ var object = {
 
     },
     set 0(x: number) {
+>0 : number
 >x : number
 
         this._0 = x;
diff --git a/tests/baselines/reference/enumIdentifierLiterals.symbols b/tests/baselines/reference/enumIdentifierLiterals.symbols
index 20560e0dce9..e138c6afc56 100644
--- a/tests/baselines/reference/enumIdentifierLiterals.symbols
+++ b/tests/baselines/reference/enumIdentifierLiterals.symbols
@@ -3,8 +3,17 @@ enum Nums {
 >Nums : Symbol(Nums, Decl(enumIdentifierLiterals.ts, 0, 0))
 
     1.0,
+>1.0 : Symbol(Nums[1.0], Decl(enumIdentifierLiterals.ts, 0, 11))
+
     11e-1,
+>11e-1 : Symbol(Nums[11e-1], Decl(enumIdentifierLiterals.ts, 1, 8))
+
     0.12e1,
+>0.12e1 : Symbol(Nums[0.12e1], Decl(enumIdentifierLiterals.ts, 2, 10))
+
     "13e-1",
+>"13e-1" : Symbol(Nums["13e-1"], Decl(enumIdentifierLiterals.ts, 3, 11))
+
     0xF00D
+>0xF00D : Symbol(Nums[0xF00D], Decl(enumIdentifierLiterals.ts, 4, 12))
 }
diff --git a/tests/baselines/reference/enumIdentifierLiterals.types b/tests/baselines/reference/enumIdentifierLiterals.types
index b259e57d1dd..1971920483c 100644
--- a/tests/baselines/reference/enumIdentifierLiterals.types
+++ b/tests/baselines/reference/enumIdentifierLiterals.types
@@ -3,8 +3,17 @@ enum Nums {
 >Nums : Nums
 
     1.0,
+>1.0 : Nums.1
+
     11e-1,
+>11e-1 : Nums.1.1
+
     0.12e1,
+>0.12e1 : Nums.1.2
+
     "13e-1",
+>"13e-1" : Nums.13e-1
+
     0xF00D
+>0xF00D : Nums.61453
 }
diff --git a/tests/baselines/reference/enumWithNegativeInfinityProperty.symbols b/tests/baselines/reference/enumWithNegativeInfinityProperty.symbols
index 51c61196ca6..f57daaeba01 100644
--- a/tests/baselines/reference/enumWithNegativeInfinityProperty.symbols
+++ b/tests/baselines/reference/enumWithNegativeInfinityProperty.symbols
@@ -3,5 +3,6 @@ enum A {
 >A : Symbol(A, Decl(enumWithNegativeInfinityProperty.ts, 0, 0))
 
     "-Infinity" = 1
+>"-Infinity" : Symbol(A["-Infinity"], Decl(enumWithNegativeInfinityProperty.ts, 0, 8))
 }
 
diff --git a/tests/baselines/reference/enumWithNegativeInfinityProperty.types b/tests/baselines/reference/enumWithNegativeInfinityProperty.types
index dad61ad87cc..951f8969769 100644
--- a/tests/baselines/reference/enumWithNegativeInfinityProperty.types
+++ b/tests/baselines/reference/enumWithNegativeInfinityProperty.types
@@ -3,6 +3,7 @@ enum A {
 >A : A
 
     "-Infinity" = 1
+>"-Infinity" : A
 >1 : 1
 }
 
diff --git a/tests/baselines/reference/enumWithQuotedElementName1.symbols b/tests/baselines/reference/enumWithQuotedElementName1.symbols
index 48f861f9726..70efcaa4ddf 100644
--- a/tests/baselines/reference/enumWithQuotedElementName1.symbols
+++ b/tests/baselines/reference/enumWithQuotedElementName1.symbols
@@ -3,4 +3,5 @@ enum E {
 >E : Symbol(E, Decl(enumWithQuotedElementName1.ts, 0, 0))
 
    'fo"o',
+>'fo"o' : Symbol(E['fo"o'], Decl(enumWithQuotedElementName1.ts, 0, 8))
 }
diff --git a/tests/baselines/reference/enumWithQuotedElementName1.types b/tests/baselines/reference/enumWithQuotedElementName1.types
index 135a74a5103..4e3db0ca482 100644
--- a/tests/baselines/reference/enumWithQuotedElementName1.types
+++ b/tests/baselines/reference/enumWithQuotedElementName1.types
@@ -3,4 +3,5 @@ enum E {
 >E : E
 
    'fo"o',
+>'fo"o' : E
 }
diff --git a/tests/baselines/reference/enumWithQuotedElementName2.symbols b/tests/baselines/reference/enumWithQuotedElementName2.symbols
index 245eaa55748..0e6e43aa3d4 100644
--- a/tests/baselines/reference/enumWithQuotedElementName2.symbols
+++ b/tests/baselines/reference/enumWithQuotedElementName2.symbols
@@ -3,4 +3,5 @@ enum E {
 >E : Symbol(E, Decl(enumWithQuotedElementName2.ts, 0, 0))
 
    "fo'o",
+>"fo'o" : Symbol(E["fo'o"], Decl(enumWithQuotedElementName2.ts, 0, 8))
 }
diff --git a/tests/baselines/reference/enumWithQuotedElementName2.types b/tests/baselines/reference/enumWithQuotedElementName2.types
index ab222764f75..9b07138e5ab 100644
--- a/tests/baselines/reference/enumWithQuotedElementName2.types
+++ b/tests/baselines/reference/enumWithQuotedElementName2.types
@@ -3,4 +3,5 @@ enum E {
 >E : E
 
    "fo'o",
+>"fo'o" : E
 }
diff --git a/tests/baselines/reference/enumWithUnicodeEscape1.symbols b/tests/baselines/reference/enumWithUnicodeEscape1.symbols
index a146f87247d..dd419df5345 100644
--- a/tests/baselines/reference/enumWithUnicodeEscape1.symbols
+++ b/tests/baselines/reference/enumWithUnicodeEscape1.symbols
@@ -3,5 +3,6 @@ enum E {
 >E : Symbol(E, Decl(enumWithUnicodeEscape1.ts, 0, 0))
 
   'gold \u2730'
+>'gold \u2730' : Symbol(E['gold u2730'], Decl(enumWithUnicodeEscape1.ts, 0, 8))
 }
 
diff --git a/tests/baselines/reference/enumWithUnicodeEscape1.types b/tests/baselines/reference/enumWithUnicodeEscape1.types
index 8376685ca6b..ee9dbbf5c2a 100644
--- a/tests/baselines/reference/enumWithUnicodeEscape1.types
+++ b/tests/baselines/reference/enumWithUnicodeEscape1.types
@@ -3,5 +3,6 @@ enum E {
 >E : E
 
   'gold \u2730'
+>'gold \u2730' : E
 }
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
index 12afdf653ea..c4cbd99046b 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts ===
 declare module "foo" {
+>"foo" : Symbol("foo", Decl(es5ExportDefaultClassDeclaration4.ts, 0, 0))
+
     export var before: C;
 >before : Symbol(before, Decl(es5ExportDefaultClassDeclaration4.ts, 1, 14))
 >C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 1, 25))
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
index 12a8c0b4a49..3ff3bbfe502 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts ===
 declare module "foo" {
+>"foo" : typeof "foo"
+
     export var before: C;
 >before : C
 >C : C
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols
index a694dba8abe..977d3ece287 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts ===
 declare module "bar" {
+>"bar" : Symbol("bar", Decl(es5ExportDefaultFunctionDeclaration4.ts, 0, 0))
+
     var before: typeof func;
 >before : Symbol(before, Decl(es5ExportDefaultFunctionDeclaration4.ts, 1, 7))
 >func : Symbol(func, Decl(es5ExportDefaultFunctionDeclaration4.ts, 1, 28))
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
index 22961c061de..88240e7861e 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts ===
 declare module "bar" {
+>"bar" : typeof "bar"
+
     var before: typeof func;
 >before : () => typeof func
 >func : () => typeof func
diff --git a/tests/baselines/reference/es6ExportAssignment4.symbols b/tests/baselines/reference/es6ExportAssignment4.symbols
index 099892c706e..1f6d9609f16 100644
--- a/tests/baselines/reference/es6ExportAssignment4.symbols
+++ b/tests/baselines/reference/es6ExportAssignment4.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "a" {
+>"a" : Symbol("a", Decl(modules.d.ts, 0, 0))
+
     var a: number;
 >a : Symbol(a, Decl(modules.d.ts, 1, 7))
 
diff --git a/tests/baselines/reference/es6ExportAssignment4.types b/tests/baselines/reference/es6ExportAssignment4.types
index e42fadc2944..7265f066c8d 100644
--- a/tests/baselines/reference/es6ExportAssignment4.types
+++ b/tests/baselines/reference/es6ExportAssignment4.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "a" {
+>"a" : typeof "a"
+
     var a: number;
 >a : number
 
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.symbols b/tests/baselines/reference/es6ExportEqualsInterop.symbols
index dd3063af448..0687da5ec39 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.symbols
+++ b/tests/baselines/reference/es6ExportEqualsInterop.symbols
@@ -304,6 +304,8 @@ export * from "class-module";
 
 === tests/cases/compiler/modules.d.ts ===
 declare module "interface" {
+>"interface" : Symbol("interface", Decl(modules.d.ts, 0, 0))
+
     interface Foo {
 >Foo : Symbol(Foo, Decl(modules.d.ts, 0, 28))
 
@@ -318,6 +320,8 @@ declare module "interface" {
 }
 
 declare module "variable" {
+>"variable" : Symbol("variable", Decl(modules.d.ts, 6, 1))
+
     var Foo: {
 >Foo : Symbol(Foo, Decl(modules.d.ts, 9, 7))
 
@@ -332,6 +336,8 @@ declare module "variable" {
 }
 
 declare module "interface-variable" {
+>"interface-variable" : Symbol("interface-variable", Decl(modules.d.ts, 14, 1))
+
     interface Foo {
 >Foo : Symbol(Foo, Decl(modules.d.ts, 16, 37), Decl(modules.d.ts, 21, 7))
 
@@ -355,6 +361,8 @@ declare module "interface-variable" {
 }
 
 declare module "module" {
+>"module" : Symbol("module", Decl(modules.d.ts, 26, 1))
+
     module Foo {
 >Foo : Symbol(Foo, Decl(modules.d.ts, 28, 25))
 
@@ -369,6 +377,8 @@ declare module "module" {
 }
 
 declare module "interface-module" {
+>"interface-module" : Symbol("interface-module", Decl(modules.d.ts, 34, 1))
+
     interface Foo {
 >Foo : Symbol(Foo, Decl(modules.d.ts, 36, 35), Decl(modules.d.ts, 40, 5))
 
@@ -392,6 +402,8 @@ declare module "interface-module" {
 }
 
 declare module "variable-module" {
+>"variable-module" : Symbol("variable-module", Decl(modules.d.ts, 46, 1))
+
     module Foo {
 >Foo : Symbol(Foo, Decl(modules.d.ts, 48, 34), Decl(modules.d.ts, 55, 7))
 
@@ -419,6 +431,8 @@ declare module "variable-module" {
 }
 
 declare module "function" {
+>"function" : Symbol("function", Decl(modules.d.ts, 60, 1))
+
     function foo();
 >foo : Symbol(foo, Decl(modules.d.ts, 62, 27))
 
@@ -427,6 +441,8 @@ declare module "function" {
 }
 
 declare module "function-module" {
+>"function-module" : Symbol("function-module", Decl(modules.d.ts, 65, 1))
+
     function foo();
 >foo : Symbol(foo, Decl(modules.d.ts, 67, 34), Decl(modules.d.ts, 68, 19))
 
@@ -444,6 +460,8 @@ declare module "function-module" {
 }
 
 declare module "class" {
+>"class" : Symbol("class", Decl(modules.d.ts, 74, 1))
+
     class Foo {
 >Foo : Symbol(Foo, Decl(modules.d.ts, 76, 24))
 
@@ -458,6 +476,8 @@ declare module "class" {
 }
 
 declare module "class-module" {
+>"class-module" : Symbol("class-module", Decl(modules.d.ts, 82, 1))
+
     class Foo {
 >Foo : Symbol(Foo, Decl(modules.d.ts, 84, 31), Decl(modules.d.ts, 88, 5))
 
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.types b/tests/baselines/reference/es6ExportEqualsInterop.types
index a20f53009c4..112d317c228 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.types
+++ b/tests/baselines/reference/es6ExportEqualsInterop.types
@@ -320,6 +320,8 @@ export * from "class-module";
 
 === tests/cases/compiler/modules.d.ts ===
 declare module "interface" {
+>"interface" : typeof "interface"
+
     interface Foo {
 >Foo : Foo
 
@@ -334,6 +336,8 @@ declare module "interface" {
 }
 
 declare module "variable" {
+>"variable" : typeof "variable"
+
     var Foo: {
 >Foo : { a: number; b: number; }
 
@@ -348,6 +352,8 @@ declare module "variable" {
 }
 
 declare module "interface-variable" {
+>"interface-variable" : typeof "interface-variable"
+
     interface Foo {
 >Foo : Foo
 
@@ -371,6 +377,8 @@ declare module "interface-variable" {
 }
 
 declare module "module" {
+>"module" : typeof "module"
+
     module Foo {
 >Foo : typeof Foo
 
@@ -385,6 +393,8 @@ declare module "module" {
 }
 
 declare module "interface-module" {
+>"interface-module" : typeof "interface-module"
+
     interface Foo {
 >Foo : Foo
 
@@ -408,6 +418,8 @@ declare module "interface-module" {
 }
 
 declare module "variable-module" {
+>"variable-module" : typeof "variable-module"
+
     module Foo {
 >Foo : { a: number; b: number; }
 
@@ -435,6 +447,8 @@ declare module "variable-module" {
 }
 
 declare module "function" {
+>"function" : typeof "function"
+
     function foo();
 >foo : () => any
 
@@ -443,6 +457,8 @@ declare module "function" {
 }
 
 declare module "function-module" {
+>"function-module" : typeof "function-module"
+
     function foo();
 >foo : typeof foo
 
@@ -460,6 +476,8 @@ declare module "function-module" {
 }
 
 declare module "class" {
+>"class" : typeof "class"
+
     class Foo {
 >Foo : Foo
 
@@ -474,6 +492,8 @@ declare module "class" {
 }
 
 declare module "class-module" {
+>"class-module" : typeof "class-module"
+
     class Foo {
 >Foo : Foo
 
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols b/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols
index d751025baf3..10b1412290a 100644
--- a/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols
+++ b/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols
@@ -1,10 +1,14 @@
 === tests/cases/compiler/server.d.ts ===
 declare module "other" {
+>"other" : Symbol("other", Decl(server.d.ts, 0, 0))
+
     export class C { }
 >C : Symbol(C, Decl(server.d.ts, 0, 24))
 }
 
 declare module "server" {
+>"server" : Symbol("server", Decl(server.d.ts, 2, 1))
+
     import events = require("other"); // Ambient declaration, no error expected.
 >events : Symbol(events, Decl(server.d.ts, 4, 25))
 
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.types b/tests/baselines/reference/es6ImportEqualsDeclaration2.types
index 93d47a330d6..a3af23e6c1d 100644
--- a/tests/baselines/reference/es6ImportEqualsDeclaration2.types
+++ b/tests/baselines/reference/es6ImportEqualsDeclaration2.types
@@ -1,10 +1,14 @@
 === tests/cases/compiler/server.d.ts ===
 declare module "other" {
+>"other" : typeof "other"
+
     export class C { }
 >C : C
 }
 
 declare module "server" {
+>"server" : typeof "server"
+
     import events = require("other"); // Ambient declaration, no error expected.
 >events : typeof events
 
diff --git a/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.symbols b/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.symbols
index b629c5bd875..ece199dbfc0 100644
--- a/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.symbols
+++ b/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.symbols
@@ -7,6 +7,8 @@ var o = {
 >o : Symbol(o, Decl(escapedReservedCompilerNamedIdentifier.ts, 2, 3))
 
     "__proto__": 0
+>"__proto__" : Symbol("__proto__", Decl(escapedReservedCompilerNamedIdentifier.ts, 2, 9))
+
 };
 var b = o["__proto__"];
 >b : Symbol(b, Decl(escapedReservedCompilerNamedIdentifier.ts, 5, 3))
@@ -33,6 +35,8 @@ var o2 = {
 >o2 : Symbol(o2, Decl(escapedReservedCompilerNamedIdentifier.ts, 12, 3))
 
     "___proto__": 0
+>"___proto__" : Symbol("___proto__", Decl(escapedReservedCompilerNamedIdentifier.ts, 12, 10))
+
 };
 var b2 = o2["___proto__"];
 >b2 : Symbol(b2, Decl(escapedReservedCompilerNamedIdentifier.ts, 15, 3))
@@ -59,6 +63,8 @@ var o4 = {
 >o4 : Symbol(o4, Decl(escapedReservedCompilerNamedIdentifier.ts, 22, 3))
 
     "_proto__": 0
+>"_proto__" : Symbol("_proto__", Decl(escapedReservedCompilerNamedIdentifier.ts, 22, 10))
+
 };
 var b4 = o4["_proto__"];
 >b4 : Symbol(b4, Decl(escapedReservedCompilerNamedIdentifier.ts, 25, 3))
diff --git a/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.types b/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.types
index 8af18376619..ef648a5b351 100644
--- a/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.types
+++ b/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.types
@@ -9,6 +9,7 @@ var o = {
 >{    "__proto__": 0} : { "__proto__": number; }
 
     "__proto__": 0
+>"__proto__" : number
 >0 : 0
 
 };
@@ -43,6 +44,7 @@ var o2 = {
 >{    "___proto__": 0} : { "___proto__": number; }
 
     "___proto__": 0
+>"___proto__" : number
 >0 : 0
 
 };
@@ -77,6 +79,7 @@ var o4 = {
 >{    "_proto__": 0} : { "_proto__": number; }
 
     "_proto__": 0
+>"_proto__" : number
 >0 : 0
 
 };
diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.symbols b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.symbols
index df2028de153..8ebd210c701 100644
--- a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.symbols
+++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts ===
 declare module "mod" {
+>"mod" : Symbol("mod", Decl(exportDeclarationsInAmbientNamespaces2.ts, 0, 0))
+
     export var x: number;
 >x : Symbol(x, Decl(exportDeclarationsInAmbientNamespaces2.ts, 1, 14))
 }
diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.types b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.types
index f9998fc6efa..c0e629f7d35 100644
--- a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.types
+++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts ===
 declare module "mod" {
+>"mod" : typeof "mod"
+
     export var x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/exportDefaultProperty.symbols b/tests/baselines/reference/exportDefaultProperty.symbols
index f9edcd154cc..709bf6c3f37 100644
--- a/tests/baselines/reference/exportDefaultProperty.symbols
+++ b/tests/baselines/reference/exportDefaultProperty.symbols
@@ -53,6 +53,8 @@ declare namespace foo.bar {
 }
 
 declare module "foobar" {
+>"foobar" : Symbol("foobar", Decl(declarations.d.ts, 5, 1))
+
     export default foo.bar;
 >foo.bar : Symbol(default, Decl(declarations.d.ts, 2, 22))
 >foo : Symbol(foo, Decl(declarations.d.ts, 0, 0))
@@ -60,6 +62,8 @@ declare module "foobar" {
 }
 
 declare module "foobarx" {
+>"foobarx" : Symbol("foobarx", Decl(declarations.d.ts, 9, 1))
+
     export default foo.bar.X;
 >foo.bar.X : Symbol(default, Decl(declarations.d.ts, 2, 27), Decl(declarations.d.ts, 4, 16))
 >foo.bar : Symbol(foo.bar, Decl(declarations.d.ts, 2, 22))
diff --git a/tests/baselines/reference/exportDefaultProperty.types b/tests/baselines/reference/exportDefaultProperty.types
index 67de741fde4..c7439f7050c 100644
--- a/tests/baselines/reference/exportDefaultProperty.types
+++ b/tests/baselines/reference/exportDefaultProperty.types
@@ -56,6 +56,8 @@ declare namespace foo.bar {
 }
 
 declare module "foobar" {
+>"foobar" : typeof "foobar"
+
     export default foo.bar;
 >foo.bar : typeof default
 >foo : typeof foo
@@ -63,6 +65,8 @@ declare module "foobar" {
 }
 
 declare module "foobarx" {
+>"foobarx" : typeof "foobarx"
+
     export default foo.bar.X;
 >foo.bar.X : number
 >foo.bar : typeof foo.bar
diff --git a/tests/baselines/reference/exportDefaultVariable.symbols b/tests/baselines/reference/exportDefaultVariable.symbols
index 9c924c32f4e..bed0641334b 100644
--- a/tests/baselines/reference/exportDefaultVariable.symbols
+++ b/tests/baselines/reference/exportDefaultVariable.symbols
@@ -5,6 +5,8 @@ declare var io: any;
 >io : Symbol(io, Decl(exportDefaultVariable.ts, 2, 11))
 
 declare module 'module' {
+>'module' : Symbol('module', Decl(exportDefaultVariable.ts, 2, 20))
+
     export default io;
 >io : Symbol(io, Decl(exportDefaultVariable.ts, 2, 11))
 }
diff --git a/tests/baselines/reference/exportDefaultVariable.types b/tests/baselines/reference/exportDefaultVariable.types
index a61c64b4685..109ff9e0f93 100644
--- a/tests/baselines/reference/exportDefaultVariable.types
+++ b/tests/baselines/reference/exportDefaultVariable.types
@@ -5,6 +5,8 @@ declare var io: any;
 >io : any
 
 declare module 'module' {
+>'module' : typeof 'module'
+
     export default io;
 >io : any
 }
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.symbols b/tests/baselines/reference/exportEqualsDefaultProperty.symbols
index 99f4cb22530..157f1e8100b 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.symbols
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.symbols
@@ -3,7 +3,11 @@ var x = {
 >x : Symbol(x, Decl(exp.ts, 0, 3))
 
     "greeting": "hello, world",
+>"greeting" : Symbol("greeting", Decl(exp.ts, 0, 9))
+
     "default": 42
+>"default" : Symbol("default", Decl(exp.ts, 1, 31))
+
 };
 
 export = x
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.types b/tests/baselines/reference/exportEqualsDefaultProperty.types
index 57fe40a833a..4e4b6ae7939 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.types
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.types
@@ -4,9 +4,11 @@ var x = {
 >{    "greeting": "hello, world",    "default": 42} : { "greeting": string; "default": number; }
 
     "greeting": "hello, world",
+>"greeting" : string
 >"hello, world" : "hello, world"
 
     "default": 42
+>"default" : number
 >42 : 42
 
 };
diff --git a/tests/baselines/reference/exportEqualsOfModule.symbols b/tests/baselines/reference/exportEqualsOfModule.symbols
index 20548930f03..f664137d18b 100644
--- a/tests/baselines/reference/exportEqualsOfModule.symbols
+++ b/tests/baselines/reference/exportEqualsOfModule.symbols
@@ -1,10 +1,14 @@
 === tests/cases/compiler/exportEqualsOfModule.ts ===
 declare module '~popsicle/dist/request' {
+>'~popsicle/dist/request' : Symbol('~popsicle/dist/request', Decl(exportEqualsOfModule.ts, 0, 0))
+
     export class Request {}
 >Request : Symbol(Request, Decl(exportEqualsOfModule.ts, 0, 41))
 }
 
 declare module '~popsicle/dist/common' {
+>'~popsicle/dist/common' : Symbol('~popsicle/dist/common', Decl(exportEqualsOfModule.ts, 2, 1))
+
     import { Request } from '~popsicle/dist/request';
 >Request : Symbol(Request, Decl(exportEqualsOfModule.ts, 5, 12))
 
@@ -13,6 +17,8 @@ declare module '~popsicle/dist/common' {
 }
 
 declare module 'popsicle' {
+>'popsicle' : Symbol('popsicle', Decl(exportEqualsOfModule.ts, 7, 1))
+
     import alias = require('~popsicle/dist/common');
 >alias : Symbol(alias, Decl(exportEqualsOfModule.ts, 9, 27))
 
@@ -21,6 +27,8 @@ declare module 'popsicle' {
 }
 
 declare module 'popsicle-proxy-agent' {
+>'popsicle-proxy-agent' : Symbol('popsicle-proxy-agent', Decl(exportEqualsOfModule.ts, 12, 1))
+
     import { Request } from 'popsicle';
 >Request : Symbol(Request, Decl(exportEqualsOfModule.ts, 15, 12))
 
diff --git a/tests/baselines/reference/exportEqualsOfModule.types b/tests/baselines/reference/exportEqualsOfModule.types
index d96557c93be..8356742f0e5 100644
--- a/tests/baselines/reference/exportEqualsOfModule.types
+++ b/tests/baselines/reference/exportEqualsOfModule.types
@@ -1,10 +1,14 @@
 === tests/cases/compiler/exportEqualsOfModule.ts ===
 declare module '~popsicle/dist/request' {
+>'~popsicle/dist/request' : typeof '~popsicle/dist/request'
+
     export class Request {}
 >Request : Request
 }
 
 declare module '~popsicle/dist/common' {
+>'~popsicle/dist/common' : typeof '~popsicle/dist/common'
+
     import { Request } from '~popsicle/dist/request';
 >Request : typeof Request
 
@@ -13,6 +17,8 @@ declare module '~popsicle/dist/common' {
 }
 
 declare module 'popsicle' {
+>'popsicle' : typeof 'popsicle'
+
     import alias = require('~popsicle/dist/common');
 >alias : typeof alias
 
@@ -21,6 +27,8 @@ declare module 'popsicle' {
 }
 
 declare module 'popsicle-proxy-agent' {
+>'popsicle-proxy-agent' : typeof 'popsicle-proxy-agent'
+
     import { Request } from 'popsicle';
 >Request : typeof Request
 
diff --git a/tests/baselines/reference/exportEqualsProperty.symbols b/tests/baselines/reference/exportEqualsProperty.symbols
index 43c9ed32518..7c1c08c520b 100644
--- a/tests/baselines/reference/exportEqualsProperty.symbols
+++ b/tests/baselines/reference/exportEqualsProperty.symbols
@@ -48,6 +48,8 @@ declare namespace foo.bar {
 }
 
 declare module "foobar" {
+>"foobar" : Symbol("foobar", Decl(declarations.d.ts, 5, 1))
+
     export = foo.bar;
 >foo.bar : Symbol(foo.bar, Decl(declarations.d.ts, 2, 22))
 >foo : Symbol(foo, Decl(declarations.d.ts, 0, 0))
@@ -55,6 +57,8 @@ declare module "foobar" {
 }
 
 declare module "foobarx" {
+>"foobarx" : Symbol("foobarx", Decl(declarations.d.ts, 9, 1))
+
     export = foo.bar.X;
 >foo.bar.X : Symbol(foo.bar.X, Decl(declarations.d.ts, 2, 27), Decl(declarations.d.ts, 4, 16))
 >foo.bar : Symbol(foo.bar, Decl(declarations.d.ts, 2, 22))
diff --git a/tests/baselines/reference/exportEqualsProperty.types b/tests/baselines/reference/exportEqualsProperty.types
index 9386a60a7f9..cb89e4c1df0 100644
--- a/tests/baselines/reference/exportEqualsProperty.types
+++ b/tests/baselines/reference/exportEqualsProperty.types
@@ -51,6 +51,8 @@ declare namespace foo.bar {
 }
 
 declare module "foobar" {
+>"foobar" : typeof "foobar"
+
     export = foo.bar;
 >foo.bar : typeof foo.bar
 >foo : typeof foo
@@ -58,6 +60,8 @@ declare module "foobar" {
 }
 
 declare module "foobarx" {
+>"foobarx" : typeof "foobarx"
+
     export = foo.bar.X;
 >foo.bar.X : number
 >foo.bar : typeof foo.bar
diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols
index 7e2de735c47..0afd5fe3046 100644
--- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols
+++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts ===
 declare module "m2" {
+>"m2" : Symbol("m2", Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 0), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 7, 1))
+
     export module X {
 >X : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12))
 
@@ -20,6 +22,8 @@ declare module "m2" {
 }
 
 declare module "m2" {
+>"m2" : Symbol("m2", Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 0), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 7, 1))
+
     function Z2(): X.I;
 >Z2 : Symbol(Z2, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 9, 21))
 >X : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12))
diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
index 931552819c7..a7c05f2c722 100644
--- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts ===
 declare module "m2" {
+>"m2" : typeof "m2"
+
     export module X {
 >X : () => any
 
@@ -20,6 +22,8 @@ declare module "m2" {
 }
 
 declare module "m2" {
+>"m2" : typeof "m2"
+
     function Z2(): X.I;
 >Z2 : () => X.I
 >X : any
diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols
index 002ce3737af..828abbb3b3b 100644
--- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols
+++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts ===
 declare module "m2" {
+>"m2" : Symbol("m2", Decl(exportSpecifierAndLocalMemberDeclaration.ts, 0, 0), Decl(exportSpecifierAndLocalMemberDeclaration.ts, 7, 1))
+
     module X {
 >X : Symbol(X, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 0, 21))
 
@@ -20,6 +22,8 @@ declare module "m2" {
 }
 
 declare module "m2" {
+>"m2" : Symbol("m2", Decl(exportSpecifierAndLocalMemberDeclaration.ts, 0, 0), Decl(exportSpecifierAndLocalMemberDeclaration.ts, 7, 1))
+
     function Z2(): X.I;
 >Z2 : Symbol(Z2, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 9, 21))
 }
diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
index e146f5fb937..70fd8921c0a 100644
--- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts ===
 declare module "m2" {
+>"m2" : typeof "m2"
+
     module X {
 >X : any
 
@@ -20,6 +22,8 @@ declare module "m2" {
 }
 
 declare module "m2" {
+>"m2" : typeof "m2"
+
     function Z2(): X.I;
 >Z2 : () => any
 >X : any
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.symbols b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.symbols
index 16abde86d32..dd586f52d78 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.symbols
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.symbols
@@ -4,6 +4,8 @@ declare module X { export interface bar { } }
 >bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 18))
 
 declare module "m" {
+>"m" : Symbol("m", Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 45))
+
     export { X };
 >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 2, 12))
 
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
index be03554a1b0..067667b0218 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
@@ -4,6 +4,8 @@ declare module X { export interface bar { } }
 >bar : bar
 
 declare module "m" {
+>"m" : typeof "m"
+
     export { X };
 >X : any
 
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.symbols b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.symbols
index c6679d82965..faee05a935c 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.symbols
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.symbols
@@ -4,6 +4,8 @@ declare module X { export interface bar { } }
 >bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 0, 18))
 
 declare module "m" {
+>"m" : Symbol("m", Decl(exportSpecifierReferencingOuterDeclaration3.ts, 0, 45))
+
     module X { export interface foo { } }
 >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 1, 20))
 >foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 2, 14))
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
index efe5ca200e9..3d2cf9d96d3 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
@@ -4,6 +4,8 @@ declare module X { export interface bar { } }
 >bar : bar
 
 declare module "m" {
+>"m" : typeof "m"
+
     module X { export interface foo { } }
 >X : any
 >foo : foo
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.symbols b/tests/baselines/reference/exportsAndImportsWithUnderscores1.symbols
index 45795fd5dce..912287a9982 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.symbols
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.symbols
@@ -6,8 +6,13 @@ export default R = {
 >R : Symbol(R, Decl(m1.ts, 0, 3))
 
     "__": 20,
+>"__" : Symbol("__", Decl(m1.ts, 1, 20))
+
     "_": 10
+>"_" : Symbol("_", Decl(m1.ts, 2, 13))
+
     "___": 30
+>"___" : Symbol("___", Decl(m1.ts, 3, 11))
 }
 
 === tests/cases/conformance/es6/modules/m2.ts ===
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.types b/tests/baselines/reference/exportsAndImportsWithUnderscores1.types
index bf4d067836b..7dbec8682a6 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.types
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.types
@@ -8,12 +8,15 @@ export default R = {
 >{    "__": 20,    "_": 10    "___": 30} : { "__": number; "_": number; "___": number; }
 
     "__": 20,
+>"__" : number
 >20 : 20
 
     "_": 10
+>"_" : number
 >10 : 10
 
     "___": 30
+>"___" : number
 >30 : 30
 }
 
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols b/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols
index 7121472886a..2d32da807bf 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols
@@ -6,7 +6,10 @@ export default R = {
 >R : Symbol(R, Decl(m1.ts, 0, 3))
 
     "__esmodule": true,
+>"__esmodule" : Symbol("__esmodule", Decl(m1.ts, 1, 20))
+
     "__proto__": {}
+>"__proto__" : Symbol("__proto__", Decl(m1.ts, 2, 23))
 }
 
 === tests/cases/conformance/es6/modules/m2.ts ===
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.types b/tests/baselines/reference/exportsAndImportsWithUnderscores2.types
index e38209b842f..57b11f67113 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.types
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.types
@@ -8,9 +8,11 @@ export default R = {
 >{    "__esmodule": true,    "__proto__": {}} : { "__esmodule": boolean; "__proto__": {}; }
 
     "__esmodule": true,
+>"__esmodule" : boolean
 >true : true
 
     "__proto__": {}
+>"__proto__" : {}
 >{} : {}
 }
 
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols b/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols
index c58f1a11f76..2cdc37ba8b0 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols
@@ -6,8 +6,13 @@ export default R = {
 >R : Symbol(R, Decl(m1.ts, 0, 3))
 
     "___": 30,
+>"___" : Symbol("___", Decl(m1.ts, 1, 20))
+
     "___hello": 21,
+>"___hello" : Symbol("___hello", Decl(m1.ts, 2, 14))
+
     "_hi": 40,
+>"_hi" : Symbol("_hi", Decl(m1.ts, 3, 19))
 }
 
 === tests/cases/conformance/es6/modules/m2.ts ===
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.types b/tests/baselines/reference/exportsAndImportsWithUnderscores3.types
index 0e6bb895237..0e8b3bf61f6 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.types
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.types
@@ -8,12 +8,15 @@ export default R = {
 >{    "___": 30,    "___hello": 21,    "_hi": 40,} : { "___": number; "___hello": number; "_hi": number; }
 
     "___": 30,
+>"___" : number
 >30 : 30
 
     "___hello": 21,
+>"___hello" : number
 >21 : 21
 
     "_hi": 40,
+>"_hi" : number
 >40 : 40
 }
 
diff --git a/tests/baselines/reference/exportsInAmbientModules1.symbols b/tests/baselines/reference/exportsInAmbientModules1.symbols
index eee96af50f9..f85d6994460 100644
--- a/tests/baselines/reference/exportsInAmbientModules1.symbols
+++ b/tests/baselines/reference/exportsInAmbientModules1.symbols
@@ -4,6 +4,8 @@ export var x: number
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
+>"M" : Symbol("M", Decl(main.ts, 0, 0))
+
     export {x} from "external"
 >x : Symbol(x, Decl(main.ts, 1, 12))
 }
diff --git a/tests/baselines/reference/exportsInAmbientModules1.types b/tests/baselines/reference/exportsInAmbientModules1.types
index 4d0c1cbd26e..468ffb682fc 100644
--- a/tests/baselines/reference/exportsInAmbientModules1.types
+++ b/tests/baselines/reference/exportsInAmbientModules1.types
@@ -4,6 +4,8 @@ export var x: number
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
+>"M" : typeof "M"
+
     export {x} from "external"
 >x : number
 }
diff --git a/tests/baselines/reference/exportsInAmbientModules2.symbols b/tests/baselines/reference/exportsInAmbientModules2.symbols
index 3cad91fab62..41ffd8b8c15 100644
--- a/tests/baselines/reference/exportsInAmbientModules2.symbols
+++ b/tests/baselines/reference/exportsInAmbientModules2.symbols
@@ -4,6 +4,7 @@ export default class C {}
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
-No type information for this code.    export * from "external"
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"M" : Symbol("M", Decl(main.ts, 0, 0))
+
+    export * from "external"
+}
diff --git a/tests/baselines/reference/exportsInAmbientModules2.types b/tests/baselines/reference/exportsInAmbientModules2.types
index 0c32c1c62a8..bd764d02ce0 100644
--- a/tests/baselines/reference/exportsInAmbientModules2.types
+++ b/tests/baselines/reference/exportsInAmbientModules2.types
@@ -4,6 +4,7 @@ export default class C {}
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
-No type information for this code.    export * from "external"
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"M" : typeof "M"
+
+    export * from "external"
+}
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
index fcf5a71330a..39606b9f4dc 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
@@ -28,9 +28,11 @@ var moduleMap: { [key: string]: IHasVisualizationModel } = {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 79))
 
     "moduleA": moduleA,
+>"moduleA" : Symbol("moduleA", Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 7, 60))
 >moduleA : Symbol(moduleA, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 81))
 
     "moduleB": moduleB
+>"moduleB" : Symbol("moduleB", Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 8, 23))
 >moduleB : Symbol(moduleB, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 1, 79))
 
 };
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
index 9825a75a220..21893a33f75 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
@@ -29,9 +29,11 @@ var moduleMap: { [key: string]: IHasVisualizationModel } = {
 >{    "moduleA": moduleA,    "moduleB": moduleB} : { "moduleA": typeof moduleA; "moduleB": typeof moduleB; }
 
     "moduleA": moduleA,
+>"moduleA" : typeof moduleA
 >moduleA : typeof moduleA
 
     "moduleB": moduleB
+>"moduleB" : typeof moduleB
 >moduleB : typeof moduleB
 
 };
diff --git a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols
index d4b995af6b2..7abc62fd422 100644
--- a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols
+++ b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/externalModuleReferenceDoubleUnderscore1.ts ===
 declare module 'timezonecomplete' {
+>'timezonecomplete' : Symbol('timezonecomplete', Decl(externalModuleReferenceDoubleUnderscore1.ts, 0, 0))
+
     import basics = require("__timezonecomplete/basics");
 >basics : Symbol(basics, Decl(externalModuleReferenceDoubleUnderscore1.ts, 0, 35))
 
@@ -10,6 +12,8 @@ declare module 'timezonecomplete' {
 }
 
 declare module '__timezonecomplete/basics' {
+>'__timezonecomplete/basics' : Symbol('__timezonecomplete/basics', Decl(externalModuleReferenceDoubleUnderscore1.ts, 3, 1))
+
     export enum TimeUnit {
 >TimeUnit : Symbol(TimeUnit, Decl(externalModuleReferenceDoubleUnderscore1.ts, 5, 44))
 
diff --git a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types
index ad292656d25..5452c6afcbb 100644
--- a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types
+++ b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/externalModuleReferenceDoubleUnderscore1.ts ===
 declare module 'timezonecomplete' {
+>'timezonecomplete' : typeof 'timezonecomplete'
+
     import basics = require("__timezonecomplete/basics");
 >basics : typeof basics
 
@@ -10,6 +12,8 @@ declare module 'timezonecomplete' {
 }
 
 declare module '__timezonecomplete/basics' {
+>'__timezonecomplete/basics' : typeof '__timezonecomplete/basics'
+
     export enum TimeUnit {
 >TimeUnit : TimeUnit
 
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.symbols b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.symbols
index a180bfc0baa..7a15af167fb 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.symbols
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.symbols
@@ -18,6 +18,8 @@ export function foo() { };
 
 === tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts ===
 declare module "externalModuleRefernceResolutionOrderInImportDeclaration_file1" {
+>"externalModuleRefernceResolutionOrderInImportDeclaration_file1" : Symbol("externalModuleRefernceResolutionOrderInImportDeclaration_file1", Decl(externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts, 0, 0))
+
     export function bar();
 >bar : Symbol(bar, Decl(externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts, 0, 81))
 }
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.types b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.types
index b1440cac1ab..9095955caac 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.types
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.types
@@ -22,6 +22,8 @@ export function foo() { };
 
 === tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts ===
 declare module "externalModuleRefernceResolutionOrderInImportDeclaration_file1" {
+>"externalModuleRefernceResolutionOrderInImportDeclaration_file1" : typeof "externalModuleRefernceResolutionOrderInImportDeclaration_file1"
+
     export function bar();
 >bar : () => any
 }
diff --git a/tests/baselines/reference/fixSignatureCaching.symbols b/tests/baselines/reference/fixSignatureCaching.symbols
index 87cf8d0c44e..71c282f83cb 100644
--- a/tests/baselines/reference/fixSignatureCaching.symbols
+++ b/tests/baselines/reference/fixSignatureCaching.symbols
@@ -17,275 +17,742 @@ define(function () {
 >impl : Symbol(impl, Decl(fixSignatureCaching.ts, 6, 7))
 
     "phones": {
+>"phones" : Symbol("phones", Decl(fixSignatureCaching.ts, 8, 30))
+
         "iPhone": "\\biPhone\\b|\\biPod\\b",
+>"iPhone" : Symbol("iPhone", Decl(fixSignatureCaching.ts, 9, 15))
+
         "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+",
+>"BlackBerry" : Symbol("BlackBerry", Decl(fixSignatureCaching.ts, 10, 44))
+
         "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m",
+>"HTC" : Symbol("HTC", Decl(fixSignatureCaching.ts, 11, 56))
+
         "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6",
+>"Nexus" : Symbol("Nexus", Decl(fixSignatureCaching.ts, 12, 277))
+
         "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b",
+>"Dell" : Symbol("Dell", Decl(fixSignatureCaching.ts, 13, 98))
+
         "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b",
+>"Motorola" : Symbol("Motorola", Decl(fixSignatureCaching.ts, 14, 153))
+
         "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F",
+>"Samsung" : Symbol("Samsung", Decl(fixSignatureCaching.ts, 15, 687))
+
         "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)",
+>"LG" : Symbol("LG", Decl(fixSignatureCaching.ts, 16, 5336))
+
         "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533",
+>"Sony" : Symbol("Sony", Decl(fixSignatureCaching.ts, 17, 541))
+
         "Asus": "Asus.*Galaxy|PadFone.*Mobile",
+>"Asus" : Symbol("Asus", Decl(fixSignatureCaching.ts, 18, 141))
+
         "NokiaLumia": "Lumia [0-9]{3,4}",
+>"NokiaLumia" : Symbol("NokiaLumia", Decl(fixSignatureCaching.ts, 19, 47))
+
         "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b",
+>"Micromax" : Symbol("Micromax", Decl(fixSignatureCaching.ts, 20, 41))
+
         "Palm": "PalmSource|Palm",
+>"Palm" : Symbol("Palm", Decl(fixSignatureCaching.ts, 21, 132))
+
         "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature",
+>"Vertu" : Symbol("Vertu", Decl(fixSignatureCaching.ts, 22, 34))
+
         "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790",
+>"Pantech" : Symbol("Pantech", Decl(fixSignatureCaching.ts, 23, 125))
+
         "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250",
+>"Fly" : Symbol("Fly", Decl(fixSignatureCaching.ts, 24, 444))
+
         "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM",
+>"Wiko" : Symbol("Wiko", Decl(fixSignatureCaching.ts, 25, 131))
+
         "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)",
+>"iMobile" : Symbol("iMobile", Decl(fixSignatureCaching.ts, 26, 253))
+
         "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b",
+>"SimValley" : Symbol("SimValley", Decl(fixSignatureCaching.ts, 27, 57))
+
         "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q",
+>"Wolfgang" : Symbol("Wolfgang", Decl(fixSignatureCaching.ts, 28, 139))
+
         "Alcatel": "Alcatel",
+>"Alcatel" : Symbol("Alcatel", Decl(fixSignatureCaching.ts, 29, 86))
+
         "Nintendo": "Nintendo 3DS",
+>"Nintendo" : Symbol("Nintendo", Decl(fixSignatureCaching.ts, 30, 29))
+
         "Amoi": "Amoi",
+>"Amoi" : Symbol("Amoi", Decl(fixSignatureCaching.ts, 31, 35))
+
         "INQ": "INQ",
+>"INQ" : Symbol("INQ", Decl(fixSignatureCaching.ts, 32, 23))
+
         "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"
+>"GenericPhone" : Symbol("GenericPhone", Decl(fixSignatureCaching.ts, 33, 21))
+
     },
     "tablets": {
+>"tablets" : Symbol("tablets", Decl(fixSignatureCaching.ts, 35, 6))
+
         "iPad": "iPad|iPad.*Mobile",
+>"iPad" : Symbol("iPad", Decl(fixSignatureCaching.ts, 36, 16))
+
         "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)",
+>"NexusTablet" : Symbol("NexusTablet", Decl(fixSignatureCaching.ts, 37, 36))
+
         "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561",
+>"SamsungTablet" : Symbol("SamsungTablet", Decl(fixSignatureCaching.ts, 38, 54))
+
         "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b",
+>"Kindle" : Symbol("Kindle", Decl(fixSignatureCaching.ts, 39, 1622))
+
         "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)",
+>"SurfaceTablet" : Symbol("SurfaceTablet", Decl(fixSignatureCaching.ts, 40, 160))
+
         "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10",
+>"HPTablet" : Symbol("HPTablet", Decl(fixSignatureCaching.ts, 41, 69))
+
         "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA",
+>"AsusTablet" : Symbol("AsusTablet", Decl(fixSignatureCaching.ts, 42, 113))
+
         "BlackBerryTablet": "PlayBook|RIM Tablet",
+>"BlackBerryTablet" : Symbol("BlackBerryTablet", Decl(fixSignatureCaching.ts, 43, 409))
+
         "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410",
+>"HTCtablet" : Symbol("HTCtablet", Decl(fixSignatureCaching.ts, 44, 50))
+
         "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617",
+>"MotorolaTablet" : Symbol("MotorolaTablet", Decl(fixSignatureCaching.ts, 45, 104))
+
         "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2",
+>"NookTablet" : Symbol("NookTablet", Decl(fixSignatureCaching.ts, 46, 125))
+
         "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20",
+>"AcerTablet" : Symbol("AcerTablet", Decl(fixSignatureCaching.ts, 47, 125))
+
         "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO",
+>"ToshibaTablet" : Symbol("ToshibaTablet", Decl(fixSignatureCaching.ts, 48, 236))
+
         "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b",
+>"LGTablet" : Symbol("LGTablet", Decl(fixSignatureCaching.ts, 49, 131))
+
         "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b",
+>"FujitsuTablet" : Symbol("FujitsuTablet", Decl(fixSignatureCaching.ts, 50, 99))
+
         "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002",
+>"PrestigioTablet" : Symbol("PrestigioTablet", Decl(fixSignatureCaching.ts, 51, 78))
+
         "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)",
+>"LenovoTablet" : Symbol("LenovoTablet", Decl(fixSignatureCaching.ts, 52, 443))
+
         "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7",
+>"DellTablet" : Symbol("DellTablet", Decl(fixSignatureCaching.ts, 53, 236))
+
         "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b",
+>"YarvikTablet" : Symbol("YarvikTablet", Decl(fixSignatureCaching.ts, 54, 78))
+
         "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB",
+>"MedionTablet" : Symbol("MedionTablet", Decl(fixSignatureCaching.ts, 55, 521))
+
         "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2",
+>"ArnovaTablet" : Symbol("ArnovaTablet", Decl(fixSignatureCaching.ts, 56, 85))
+
         "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004",
+>"IntensoTablet" : Symbol("IntensoTablet", Decl(fixSignatureCaching.ts, 57, 127))
+
         "IRUTablet": "M702pro",
+>"IRUTablet" : Symbol("IRUTablet", Decl(fixSignatureCaching.ts, 58, 76))
+
         "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b",
+>"MegafonTablet" : Symbol("MegafonTablet", Decl(fixSignatureCaching.ts, 59, 31))
+
         "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)",
+>"EbodaTablet" : Symbol("EbodaTablet", Decl(fixSignatureCaching.ts, 60, 71))
+
         "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)",
+>"AllViewTablet" : Symbol("AllViewTablet", Decl(fixSignatureCaching.ts, 61, 73))
+
         "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b",
+>"ArchosTablet" : Symbol("ArchosTablet", Decl(fixSignatureCaching.ts, 62, 100))
+
         "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark",
+>"AinolTablet" : Symbol("AinolTablet", Decl(fixSignatureCaching.ts, 63, 200))
+
         "NokiaLumiaTablet": "Lumia 2520",
+>"NokiaLumiaTablet" : Symbol("NokiaLumiaTablet", Decl(fixSignatureCaching.ts, 64, 92))
+
         "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31",
+>"SonyTablet" : Symbol("SonyTablet", Decl(fixSignatureCaching.ts, 65, 41))
+
         "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b",
+>"PhilipsTablet" : Symbol("PhilipsTablet", Decl(fixSignatureCaching.ts, 66, 307))
+
         "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT",
+>"CubeTablet" : Symbol("CubeTablet", Decl(fixSignatureCaching.ts, 67, 112))
+
         "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010",
+>"CobyTablet" : Symbol("CobyTablet", Decl(fixSignatureCaching.ts, 68, 103))
+
         "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10",
+>"MIDTablet" : Symbol("MIDTablet", Decl(fixSignatureCaching.ts, 69, 192))
+
         "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b",
+>"MSITablet" : Symbol("MSITablet", Decl(fixSignatureCaching.ts, 70, 287))
+
         "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)",
+>"SMiTTablet" : Symbol("SMiTTablet", Decl(fixSignatureCaching.ts, 71, 163))
+
         "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A",
+>"RockChipTablet" : Symbol("RockChipTablet", Decl(fixSignatureCaching.ts, 72, 95))
+
         "FlyTablet": "IQ310|Fly Vision",
+>"FlyTablet" : Symbol("FlyTablet", Decl(fixSignatureCaching.ts, 73, 83))
+
         "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus",
+>"bqTablet" : Symbol("bqTablet", Decl(fixSignatureCaching.ts, 74, 40))
+
         "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim",
+>"HuaweiTablet" : Symbol("HuaweiTablet", Decl(fixSignatureCaching.ts, 75, 178))
+
         "NecTablet": "\\bN-06D|\\bN-08D",
+>"NecTablet" : Symbol("NecTablet", Decl(fixSignatureCaching.ts, 76, 127))
+
         "PantechTablet": "Pantech.*P4100",
+>"PantechTablet" : Symbol("PantechTablet", Decl(fixSignatureCaching.ts, 77, 41))
+
         "BronchoTablet": "Broncho.*(N701|N708|N802|a710)",
+>"BronchoTablet" : Symbol("BronchoTablet", Decl(fixSignatureCaching.ts, 78, 42))
+
         "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b",
+>"VersusTablet" : Symbol("VersusTablet", Decl(fixSignatureCaching.ts, 79, 58))
+
         "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900",
+>"ZyncTablet" : Symbol("ZyncTablet", Decl(fixSignatureCaching.ts, 80, 59))
+
         "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA",
+>"PositivoTablet" : Symbol("PositivoTablet", Decl(fixSignatureCaching.ts, 81, 71))
+
         "NabiTablet": "Android.*\\bNabi",
+>"NabiTablet" : Symbol("NabiTablet", Decl(fixSignatureCaching.ts, 82, 60))
+
         "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build",
+>"KoboTablet" : Symbol("KoboTablet", Decl(fixSignatureCaching.ts, 83, 41))
+
         "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b",
+>"DanewTablet" : Symbol("DanewTablet", Decl(fixSignatureCaching.ts, 84, 78))
+
         "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE",
+>"TexetTablet" : Symbol("TexetTablet", Decl(fixSignatureCaching.ts, 85, 97))
+
         "PlaystationTablet": "Playstation.*(Portable|Vita)",
+>"PlaystationTablet" : Symbol("PlaystationTablet", Decl(fixSignatureCaching.ts, 86, 641))
+
         "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab",
+>"TrekstorTablet" : Symbol("TrekstorTablet", Decl(fixSignatureCaching.ts, 87, 60))
+
         "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b",
+>"PyleAudioTablet" : Symbol("PyleAudioTablet", Decl(fixSignatureCaching.ts, 88, 133))
+
         "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ",
+>"AdvanTablet" : Symbol("AdvanTablet", Decl(fixSignatureCaching.ts, 89, 136))
+
         "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1",
+>"DanyTechTablet" : Symbol("DanyTechTablet", Decl(fixSignatureCaching.ts, 90, 152))
+
         "GalapadTablet": "Android.*\\bG1\\b",
+>"GalapadTablet" : Symbol("GalapadTablet", Decl(fixSignatureCaching.ts, 91, 159))
+
         "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b",
+>"MicromaxTablet" : Symbol("MicromaxTablet", Decl(fixSignatureCaching.ts, 92, 45))
+
         "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b",
+>"KarbonnTablet" : Symbol("KarbonnTablet", Decl(fixSignatureCaching.ts, 93, 99))
+
         "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide",
+>"AllFineTablet" : Symbol("AllFineTablet", Decl(fixSignatureCaching.ts, 94, 91))
+
         "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b",
+>"PROSCANTablet" : Symbol("PROSCANTablet", Decl(fixSignatureCaching.ts, 95, 108))
+
         "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026",
+>"YONESTablet" : Symbol("YONESTablet", Decl(fixSignatureCaching.ts, 96, 405))
+
         "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503",
+>"ChangJiaTablet" : Symbol("ChangJiaTablet", Decl(fixSignatureCaching.ts, 97, 128))
+
         "GUTablet": "TX-A1301|TX-M9002|Q702|kf026",
+>"GUTablet" : Symbol("GUTablet", Decl(fixSignatureCaching.ts, 98, 357))
+
         "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10",
+>"PointOfViewTablet" : Symbol("PointOfViewTablet", Decl(fixSignatureCaching.ts, 99, 51))
+
         "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)",
+>"OvermaxTablet" : Symbol("OvermaxTablet", Decl(fixSignatureCaching.ts, 100, 360))
+
         "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync",
+>"HCLTablet" : Symbol("HCLTablet", Decl(fixSignatureCaching.ts, 101, 152))
+
         "DPSTablet": "DPS Dream 9|DPS Dual 7",
+>"DPSTablet" : Symbol("DPSTablet", Decl(fixSignatureCaching.ts, 102, 145))
+
         "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10",
+>"VistureTablet" : Symbol("VistureTablet", Decl(fixSignatureCaching.ts, 103, 46))
+
         "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989",
+>"CrestaTablet" : Symbol("CrestaTablet", Decl(fixSignatureCaching.ts, 104, 87))
+
         "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b",
+>"MediatekTablet" : Symbol("MediatekTablet", Decl(fixSignatureCaching.ts, 105, 136))
+
         "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan",
+>"ConcordeTablet" : Symbol("ConcordeTablet", Decl(fixSignatureCaching.ts, 106, 62))
+
         "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042",
+>"GoCleverTablet" : Symbol("GoCleverTablet", Decl(fixSignatureCaching.ts, 107, 64))
+
         "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003",
+>"ModecomTablet" : Symbol("ModecomTablet", Decl(fixSignatureCaching.ts, 108, 482))
+
         "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b",
+>"VoninoTablet" : Symbol("VoninoTablet", Decl(fixSignatureCaching.ts, 109, 299))
+
         "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1",
+>"ECSTablet" : Symbol("ECSTablet", Decl(fixSignatureCaching.ts, 110, 296))
+
         "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab",
+>"StorexTablet" : Symbol("StorexTablet", Decl(fixSignatureCaching.ts, 111, 52))
+
         "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497",
+>"VodafoneTablet" : Symbol("VodafoneTablet", Decl(fixSignatureCaching.ts, 112, 74))
+
         "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2",
+>"EssentielBTablet" : Symbol("EssentielBTablet", Decl(fixSignatureCaching.ts, 113, 83))
+
         "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711",
+>"RossMoorTablet" : Symbol("RossMoorTablet", Decl(fixSignatureCaching.ts, 114, 71))
+
         "iMobileTablet": "i-mobile i-note",
+>"iMobileTablet" : Symbol("iMobileTablet", Decl(fixSignatureCaching.ts, 115, 101))
+
         "TolinoTablet": "tolino tab [0-9.]+|tolino shine",
+>"TolinoTablet" : Symbol("TolinoTablet", Decl(fixSignatureCaching.ts, 116, 43))
+
         "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b",
+>"AudioSonicTablet" : Symbol("AudioSonicTablet", Decl(fixSignatureCaching.ts, 117, 58))
+
         "AMPETablet": "Android.* A78 ",
+>"AMPETablet" : Symbol("AMPETablet", Decl(fixSignatureCaching.ts, 118, 60))
+
         "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)",
+>"SkkTablet" : Symbol("SkkTablet", Decl(fixSignatureCaching.ts, 119, 39))
+
         "TecnoTablet": "TECNO P9",
+>"TecnoTablet" : Symbol("TecnoTablet", Decl(fixSignatureCaching.ts, 120, 58))
+
         "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b",
+>"JXDTablet" : Symbol("JXDTablet", Decl(fixSignatureCaching.ts, 121, 34))
+
         "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)",
+>"iJoyTablet" : Symbol("iJoyTablet", Decl(fixSignatureCaching.ts, 122, 253))
+
         "FX2Tablet": "FX2 PAD7|FX2 PAD10",
+>"FX2Tablet" : Symbol("FX2Tablet", Decl(fixSignatureCaching.ts, 123, 526))
+
         "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151",
+>"XoroTablet" : Symbol("XoroTablet", Decl(fixSignatureCaching.ts, 124, 42))
+
         "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a",
+>"ViewsonicTablet" : Symbol("ViewsonicTablet", Decl(fixSignatureCaching.ts, 125, 368))
+
         "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10",
+>"OdysTablet" : Symbol("OdysTablet", Decl(fixSignatureCaching.ts, 126, 134))
+
         "CaptivaTablet": "CAPTIVA PAD",
+>"CaptivaTablet" : Symbol("CaptivaTablet", Decl(fixSignatureCaching.ts, 127, 141))
+
         "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S",
+>"IconbitTablet" : Symbol("IconbitTablet", Decl(fixSignatureCaching.ts, 128, 39))
+
         "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi",
+>"TeclastTablet" : Symbol("TeclastTablet", Decl(fixSignatureCaching.ts, 129, 186))
+
         "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+",
+>"OndaTablet" : Symbol("OndaTablet", Decl(fixSignatureCaching.ts, 130, 931))
+
         "JaytechTablet": "TPC-PA762",
+>"JaytechTablet" : Symbol("JaytechTablet", Decl(fixSignatureCaching.ts, 131, 334))
+
         "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010",
+>"BlaupunktTablet" : Symbol("BlaupunktTablet", Decl(fixSignatureCaching.ts, 132, 37))
+
         "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b",
+>"DigmaTablet" : Symbol("DigmaTablet", Decl(fixSignatureCaching.ts, 133, 60))
+
         "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b",
+>"EvolioTablet" : Symbol("EvolioTablet", Decl(fixSignatureCaching.ts, 134, 123))
+
         "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b",
+>"LavaTablet" : Symbol("LavaTablet", Decl(fixSignatureCaching.ts, 135, 110))
+
         "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712",
+>"AocTablet" : Symbol("AocTablet", Decl(fixSignatureCaching.ts, 136, 71))
+
         "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010",
+>"MpmanTablet" : Symbol("MpmanTablet", Decl(fixSignatureCaching.ts, 137, 87))
+
         "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b",
+>"CelkonTablet" : Symbol("CelkonTablet", Decl(fixSignatureCaching.ts, 138, 292))
+
         "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b",
+>"WolderTablet" : Symbol("WolderTablet", Decl(fixSignatureCaching.ts, 139, 111))
+
         "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b",
+>"MiTablet" : Symbol("MiTablet", Decl(fixSignatureCaching.ts, 140, 306))
+
         "NibiruTablet": "Nibiru M1|Nibiru Jupiter One",
+>"NibiruTablet" : Symbol("NibiruTablet", Decl(fixSignatureCaching.ts, 141, 52))
+
         "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI",
+>"NexoTablet" : Symbol("NexoTablet", Decl(fixSignatureCaching.ts, 142, 55))
+
         "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100",
+>"LeaderTablet" : Symbol("LeaderTablet", Decl(fixSignatureCaching.ts, 143, 119))
+
         "UbislateTablet": "UbiSlate[\\s]?7C",
+>"UbislateTablet" : Symbol("UbislateTablet", Decl(fixSignatureCaching.ts, 144, 167))
+
         "PocketBookTablet": "Pocketbook",
+>"PocketBookTablet" : Symbol("PocketBookTablet", Decl(fixSignatureCaching.ts, 145, 45))
+
         "KocasoTablet": "\\b(TB-1207)\\b",
+>"KocasoTablet" : Symbol("KocasoTablet", Decl(fixSignatureCaching.ts, 146, 41))
+
         "Hudl": "Hudl HT7S3|Hudl 2",
+>"Hudl" : Symbol("Hudl", Decl(fixSignatureCaching.ts, 147, 42))
+
         "TelstraTablet": "T-Hub2",
+>"TelstraTablet" : Symbol("TelstraTablet", Decl(fixSignatureCaching.ts, 148, 36))
+
         "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"
+>"GenericTablet" : Symbol("GenericTablet", Decl(fixSignatureCaching.ts, 149, 34))
+
     },
     "oss": {
+>"oss" : Symbol("oss", Decl(fixSignatureCaching.ts, 151, 6))
+
         "AndroidOS": "Android",
+>"AndroidOS" : Symbol("AndroidOS", Decl(fixSignatureCaching.ts, 152, 12))
+
         "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os",
+>"BlackBerryOS" : Symbol("BlackBerryOS", Decl(fixSignatureCaching.ts, 153, 31))
+
         "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino",
+>"PalmOS" : Symbol("PalmOS", Decl(fixSignatureCaching.ts, 154, 62))
+
         "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b",
+>"SymbianOS" : Symbol("SymbianOS", Decl(fixSignatureCaching.ts, 155, 75))
+
         "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;",
+>"WindowsMobileOS" : Symbol("WindowsMobileOS", Decl(fixSignatureCaching.ts, 156, 77))
+
         "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;",
+>"WindowsPhoneOS" : Symbol("WindowsPhoneOS", Decl(fixSignatureCaching.ts, 157, 124))
+
         "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad",
+>"iOS" : Symbol("iOS", Decl(fixSignatureCaching.ts, 158, 139))
+
         "MeeGoOS": "MeeGo",
+>"MeeGoOS" : Symbol("MeeGoOS", Decl(fixSignatureCaching.ts, 159, 51))
+
         "MaemoOS": "Maemo",
+>"MaemoOS" : Symbol("MaemoOS", Decl(fixSignatureCaching.ts, 160, 27))
+
         "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b",
+>"JavaOS" : Symbol("JavaOS", Decl(fixSignatureCaching.ts, 161, 27))
+
         "webOS": "webOS|hpwOS",
+>"webOS" : Symbol("webOS", Decl(fixSignatureCaching.ts, 162, 49))
+
         "badaOS": "\\bBada\\b",
+>"badaOS" : Symbol("badaOS", Decl(fixSignatureCaching.ts, 163, 31))
+
         "BREWOS": "BREW"
+>"BREWOS" : Symbol("BREWOS", Decl(fixSignatureCaching.ts, 164, 31))
+
     },
     "uas": {
+>"uas" : Symbol("uas", Decl(fixSignatureCaching.ts, 166, 6))
+
         "Vivaldi": "Vivaldi",
+>"Vivaldi" : Symbol("Vivaldi", Decl(fixSignatureCaching.ts, 167, 12))
+
         "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?",
+>"Chrome" : Symbol("Chrome", Decl(fixSignatureCaching.ts, 168, 29))
+
         "Dolfin": "\\bDolfin\\b",
+>"Dolfin" : Symbol("Dolfin", Decl(fixSignatureCaching.ts, 169, 72))
+
         "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+",
+>"Opera" : Symbol("Opera", Decl(fixSignatureCaching.ts, 170, 33))
+
         "Skyfire": "Skyfire",
+>"Skyfire" : Symbol("Skyfire", Decl(fixSignatureCaching.ts, 171, 94))
+
         "Edge": "Mobile Safari\/[.0-9]* Edge",
+>"Edge" : Symbol("Edge", Decl(fixSignatureCaching.ts, 172, 29))
+
         "IE": "IEMobile|MSIEMobile",
+>"IE" : Symbol("IE", Decl(fixSignatureCaching.ts, 173, 46))
+
         "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile",
+>"Firefox" : Symbol("Firefox", Decl(fixSignatureCaching.ts, 174, 36))
+
         "Bolt": "bolt",
+>"Bolt" : Symbol("Bolt", Decl(fixSignatureCaching.ts, 175, 84))
+
         "TeaShark": "teashark",
+>"TeaShark" : Symbol("TeaShark", Decl(fixSignatureCaching.ts, 176, 23))
+
         "Blazer": "Blazer",
+>"Blazer" : Symbol("Blazer", Decl(fixSignatureCaching.ts, 177, 31))
+
         "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari",
+>"Safari" : Symbol("Safari", Decl(fixSignatureCaching.ts, 178, 27))
+
         "Tizen": "Tizen",
+>"Tizen" : Symbol("Tizen", Decl(fixSignatureCaching.ts, 179, 72))
+
         "UCBrowser": "UC.*Browser|UCWEB",
+>"UCBrowser" : Symbol("UCBrowser", Decl(fixSignatureCaching.ts, 180, 25))
+
         "baiduboxapp": "baiduboxapp",
+>"baiduboxapp" : Symbol("baiduboxapp", Decl(fixSignatureCaching.ts, 181, 41))
+
         "baidubrowser": "baidubrowser",
+>"baidubrowser" : Symbol("baidubrowser", Decl(fixSignatureCaching.ts, 182, 37))
+
         "DiigoBrowser": "DiigoBrowser",
+>"DiigoBrowser" : Symbol("DiigoBrowser", Decl(fixSignatureCaching.ts, 183, 39))
+
         "Puffin": "Puffin",
+>"Puffin" : Symbol("Puffin", Decl(fixSignatureCaching.ts, 184, 39))
+
         "Mercury": "\\bMercury\\b",
+>"Mercury" : Symbol("Mercury", Decl(fixSignatureCaching.ts, 185, 27))
+
         "ObigoBrowser": "Obigo",
+>"ObigoBrowser" : Symbol("ObigoBrowser", Decl(fixSignatureCaching.ts, 186, 35))
+
         "NetFront": "NF-Browser",
+>"NetFront" : Symbol("NetFront", Decl(fixSignatureCaching.ts, 187, 32))
+
         "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger",
+>"GenericBrowser" : Symbol("GenericBrowser", Decl(fixSignatureCaching.ts, 188, 33))
+
         "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon"
+>"PaleMoon" : Symbol("PaleMoon", Decl(fixSignatureCaching.ts, 189, 160))
+
     },
     "props": {
+>"props" : Symbol("props", Decl(fixSignatureCaching.ts, 191, 6))
+
         "Mobile": "Mobile\/[VER]",
+>"Mobile" : Symbol("Mobile", Decl(fixSignatureCaching.ts, 192, 14))
+
         "Build": "Build\/[VER]",
+>"Build" : Symbol("Build", Decl(fixSignatureCaching.ts, 193, 34))
+
         "Version": "Version\/[VER]",
+>"Version" : Symbol("Version", Decl(fixSignatureCaching.ts, 194, 32))
+
         "VendorID": "VendorID\/[VER]",
+>"VendorID" : Symbol("VendorID", Decl(fixSignatureCaching.ts, 195, 36))
+
         "iPad": "iPad.*CPU[a-z ]+[VER]",
+>"iPad" : Symbol("iPad", Decl(fixSignatureCaching.ts, 196, 38))
+
         "iPhone": "iPhone.*CPU[a-z ]+[VER]",
+>"iPhone" : Symbol("iPhone", Decl(fixSignatureCaching.ts, 197, 40))
+
         "iPod": "iPod.*CPU[a-z ]+[VER]",
+>"iPod" : Symbol("iPod", Decl(fixSignatureCaching.ts, 198, 44))
+
         "Kindle": "Kindle\/[VER]",
+>"Kindle" : Symbol("Kindle", Decl(fixSignatureCaching.ts, 199, 40))
+
         "Chrome": [
+>"Chrome" : Symbol("Chrome", Decl(fixSignatureCaching.ts, 200, 34))
+
             "Chrome\/[VER]",
             "CriOS\/[VER]",
             "CrMo\/[VER]"
         ],
         "Coast": [
+>"Coast" : Symbol("Coast", Decl(fixSignatureCaching.ts, 205, 10))
+
             "Coast\/[VER]"
         ],
         "Dolfin": "Dolfin\/[VER]",
+>"Dolfin" : Symbol("Dolfin", Decl(fixSignatureCaching.ts, 208, 10))
+
         "Firefox": "Firefox\/[VER]",
+>"Firefox" : Symbol("Firefox", Decl(fixSignatureCaching.ts, 209, 34))
+
         "Fennec": "Fennec\/[VER]",
+>"Fennec" : Symbol("Fennec", Decl(fixSignatureCaching.ts, 210, 36))
+
         "Edge": "Edge\/[VER]",
+>"Edge" : Symbol("Edge", Decl(fixSignatureCaching.ts, 211, 34))
+
         "IE": [
+>"IE" : Symbol("IE", Decl(fixSignatureCaching.ts, 212, 30))
+
             "IEMobile\/[VER];",
             "IEMobile [VER]",
             "MSIE [VER];",
             "Trident\/[0-9.]+;.*rv:[VER]"
         ],
         "NetFront": "NetFront\/[VER]",
+>"NetFront" : Symbol("NetFront", Decl(fixSignatureCaching.ts, 218, 10))
+
         "NokiaBrowser": "NokiaBrowser\/[VER]",
+>"NokiaBrowser" : Symbol("NokiaBrowser", Decl(fixSignatureCaching.ts, 219, 38))
+
         "Opera": [
+>"Opera" : Symbol("Opera", Decl(fixSignatureCaching.ts, 220, 46))
+
             " OPR\/[VER]",
             "Opera Mini\/[VER]",
             "Version\/[VER]"
         ],
         "Opera Mini": "Opera Mini\/[VER]",
+>"Opera Mini" : Symbol("Opera Mini", Decl(fixSignatureCaching.ts, 225, 10))
+
         "Opera Mobi": "Version\/[VER]",
+>"Opera Mobi" : Symbol("Opera Mobi", Decl(fixSignatureCaching.ts, 226, 42))
+
         "UC Browser": "UC Browser[VER]",
+>"UC Browser" : Symbol("UC Browser", Decl(fixSignatureCaching.ts, 227, 39))
+
         "MQQBrowser": "MQQBrowser\/[VER]",
+>"MQQBrowser" : Symbol("MQQBrowser", Decl(fixSignatureCaching.ts, 228, 40))
+
         "MicroMessenger": "MicroMessenger\/[VER]",
+>"MicroMessenger" : Symbol("MicroMessenger", Decl(fixSignatureCaching.ts, 229, 42))
+
         "baiduboxapp": "baiduboxapp\/[VER]",
+>"baiduboxapp" : Symbol("baiduboxapp", Decl(fixSignatureCaching.ts, 230, 50))
+
         "baidubrowser": "baidubrowser\/[VER]",
+>"baidubrowser" : Symbol("baidubrowser", Decl(fixSignatureCaching.ts, 231, 44))
+
         "Iron": "Iron\/[VER]",
+>"Iron" : Symbol("Iron", Decl(fixSignatureCaching.ts, 232, 46))
+
         "Safari": [
+>"Safari" : Symbol("Safari", Decl(fixSignatureCaching.ts, 233, 30))
+
             "Version\/[VER]",
             "Safari\/[VER]"
         ],
         "Skyfire": "Skyfire\/[VER]",
+>"Skyfire" : Symbol("Skyfire", Decl(fixSignatureCaching.ts, 237, 10))
+
         "Tizen": "Tizen\/[VER]",
+>"Tizen" : Symbol("Tizen", Decl(fixSignatureCaching.ts, 238, 36))
+
         "Webkit": "webkit[ \/][VER]",
+>"Webkit" : Symbol("Webkit", Decl(fixSignatureCaching.ts, 239, 32))
+
         "PaleMoon": "PaleMoon\/[VER]",
+>"PaleMoon" : Symbol("PaleMoon", Decl(fixSignatureCaching.ts, 240, 37))
+
         "Gecko": "Gecko\/[VER]",
+>"Gecko" : Symbol("Gecko", Decl(fixSignatureCaching.ts, 241, 38))
+
         "Trident": "Trident\/[VER]",
+>"Trident" : Symbol("Trident", Decl(fixSignatureCaching.ts, 242, 32))
+
         "Presto": "Presto\/[VER]",
+>"Presto" : Symbol("Presto", Decl(fixSignatureCaching.ts, 243, 36))
+
         "Goanna": "Goanna\/[VER]",
+>"Goanna" : Symbol("Goanna", Decl(fixSignatureCaching.ts, 244, 34))
+
         "iOS": " \\bi?OS\\b [VER][ ;]{1}",
+>"iOS" : Symbol("iOS", Decl(fixSignatureCaching.ts, 245, 34))
+
         "Android": "Android [VER]",
+>"Android" : Symbol("Android", Decl(fixSignatureCaching.ts, 246, 42))
+
         "BlackBerry": [
+>"BlackBerry" : Symbol("BlackBerry", Decl(fixSignatureCaching.ts, 247, 35))
+
             "BlackBerry[\\w]+\/[VER]",
             "BlackBerry.*Version\/[VER]",
             "Version\/[VER]"
         ],
         "BREW": "BREW [VER]",
+>"BREW" : Symbol("BREW", Decl(fixSignatureCaching.ts, 252, 10))
+
         "Java": "Java\/[VER]",
+>"Java" : Symbol("Java", Decl(fixSignatureCaching.ts, 253, 29))
+
         "Windows Phone OS": [
+>"Windows Phone OS" : Symbol("Windows Phone OS", Decl(fixSignatureCaching.ts, 254, 30))
+
             "Windows Phone OS [VER]",
             "Windows Phone [VER]"
         ],
         "Windows Phone": "Windows Phone [VER]",
+>"Windows Phone" : Symbol("Windows Phone", Decl(fixSignatureCaching.ts, 258, 10))
+
         "Windows CE": "Windows CE\/[VER]",
+>"Windows CE" : Symbol("Windows CE", Decl(fixSignatureCaching.ts, 259, 47))
+
         "Windows NT": "Windows NT [VER]",
+>"Windows NT" : Symbol("Windows NT", Decl(fixSignatureCaching.ts, 260, 42))
+
         "Symbian": [
+>"Symbian" : Symbol("Symbian", Decl(fixSignatureCaching.ts, 261, 41))
+
             "SymbianOS\/[VER]",
             "Symbian\/[VER]"
         ],
         "webOS": [
+>"webOS" : Symbol("webOS", Decl(fixSignatureCaching.ts, 265, 10))
+
             "webOS\/[VER]",
             "hpwOS\/[VER];"
         ]
     },
     "utils": {
+>"utils" : Symbol("utils", Decl(fixSignatureCaching.ts, 270, 6))
+
         "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom",
+>"Bot" : Symbol("Bot", Decl(fixSignatureCaching.ts, 271, 14))
+
         "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2",
+>"MobileBot" : Symbol("MobileBot", Decl(fixSignatureCaching.ts, 272, 273))
+
         "DesktopMode": "WPDesktop",
+>"DesktopMode" : Symbol("DesktopMode", Decl(fixSignatureCaching.ts, 273, 84))
+
         "TV": "SonyDTV|HbbTV",
+>"TV" : Symbol("TV", Decl(fixSignatureCaching.ts, 274, 35))
+
         "WebKit": "(webkit)[ \/]([\\w.]+)",
+>"WebKit" : Symbol("WebKit", Decl(fixSignatureCaching.ts, 275, 30))
+
         "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b",
+>"Console" : Symbol("Console", Decl(fixSignatureCaching.ts, 276, 43))
+
         "Watch": "SM-V700"
+>"Watch" : Symbol("Watch", Decl(fixSignatureCaching.ts, 277, 82))
     }
 };
 
diff --git a/tests/baselines/reference/fixSignatureCaching.types b/tests/baselines/reference/fixSignatureCaching.types
index 60502cae583..c3f4dbc1522 100644
--- a/tests/baselines/reference/fixSignatureCaching.types
+++ b/tests/baselines/reference/fixSignatureCaching.types
@@ -28,574 +28,763 @@ define(function () {
 >{    "phones": {        "iPhone": "\\biPhone\\b|\\biPod\\b",        "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+",        "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m",        "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6",        "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b",        "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b",        "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F",        "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)",        "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533",        "Asus": "Asus.*Galaxy|PadFone.*Mobile",        "NokiaLumia": "Lumia [0-9]{3,4}",        "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b",        "Palm": "PalmSource|Palm",        "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature",        "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790",        "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250",        "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM",        "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)",        "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b",        "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q",        "Alcatel": "Alcatel",        "Nintendo": "Nintendo 3DS",        "Amoi": "Amoi",        "INQ": "INQ",        "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"    },    "tablets": {        "iPad": "iPad|iPad.*Mobile",        "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)",        "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561",        "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b",        "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)",        "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10",        "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA",        "BlackBerryTablet": "PlayBook|RIM Tablet",        "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410",        "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617",        "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2",        "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20",        "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO",        "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b",        "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b",        "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002",        "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)",        "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7",        "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b",        "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB",        "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2",        "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004",        "IRUTablet": "M702pro",        "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b",        "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)",        "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)",        "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b",        "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark",        "NokiaLumiaTablet": "Lumia 2520",        "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31",        "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b",        "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT",        "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010",        "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10",        "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b",        "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)",        "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A",        "FlyTablet": "IQ310|Fly Vision",        "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus",        "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim",        "NecTablet": "\\bN-06D|\\bN-08D",        "PantechTablet": "Pantech.*P4100",        "BronchoTablet": "Broncho.*(N701|N708|N802|a710)",        "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b",        "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900",        "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA",        "NabiTablet": "Android.*\\bNabi",        "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build",        "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b",        "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE",        "PlaystationTablet": "Playstation.*(Portable|Vita)",        "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab",        "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b",        "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ",        "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1",        "GalapadTablet": "Android.*\\bG1\\b",        "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b",        "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b",        "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide",        "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b",        "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026",        "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503",        "GUTablet": "TX-A1301|TX-M9002|Q702|kf026",        "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10",        "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)",        "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync",        "DPSTablet": "DPS Dream 9|DPS Dual 7",        "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10",        "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989",        "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b",        "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan",        "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042",        "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003",        "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b",        "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1",        "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab",        "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497",        "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2",        "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711",        "iMobileTablet": "i-mobile i-note",        "TolinoTablet": "tolino tab [0-9.]+|tolino shine",        "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b",        "AMPETablet": "Android.* A78 ",        "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)",        "TecnoTablet": "TECNO P9",        "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b",        "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)",        "FX2Tablet": "FX2 PAD7|FX2 PAD10",        "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151",        "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a",        "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10",        "CaptivaTablet": "CAPTIVA PAD",        "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S",        "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi",        "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+",        "JaytechTablet": "TPC-PA762",        "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010",        "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b",        "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b",        "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b",        "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712",        "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010",        "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b",        "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b",        "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b",        "NibiruTablet": "Nibiru M1|Nibiru Jupiter One",        "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI",        "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100",        "UbislateTablet": "UbiSlate[\\s]?7C",        "PocketBookTablet": "Pocketbook",        "KocasoTablet": "\\b(TB-1207)\\b",        "Hudl": "Hudl HT7S3|Hudl 2",        "TelstraTablet": "T-Hub2",        "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"    },    "oss": {        "AndroidOS": "Android",        "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os",        "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino",        "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b",        "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;",        "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;",        "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad",        "MeeGoOS": "MeeGo",        "MaemoOS": "Maemo",        "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b",        "webOS": "webOS|hpwOS",        "badaOS": "\\bBada\\b",        "BREWOS": "BREW"    },    "uas": {        "Vivaldi": "Vivaldi",        "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?",        "Dolfin": "\\bDolfin\\b",        "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+",        "Skyfire": "Skyfire",        "Edge": "Mobile Safari\/[.0-9]* Edge",        "IE": "IEMobile|MSIEMobile",        "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile",        "Bolt": "bolt",        "TeaShark": "teashark",        "Blazer": "Blazer",        "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari",        "Tizen": "Tizen",        "UCBrowser": "UC.*Browser|UCWEB",        "baiduboxapp": "baiduboxapp",        "baidubrowser": "baidubrowser",        "DiigoBrowser": "DiigoBrowser",        "Puffin": "Puffin",        "Mercury": "\\bMercury\\b",        "ObigoBrowser": "Obigo",        "NetFront": "NF-Browser",        "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger",        "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon"    },    "props": {        "Mobile": "Mobile\/[VER]",        "Build": "Build\/[VER]",        "Version": "Version\/[VER]",        "VendorID": "VendorID\/[VER]",        "iPad": "iPad.*CPU[a-z ]+[VER]",        "iPhone": "iPhone.*CPU[a-z ]+[VER]",        "iPod": "iPod.*CPU[a-z ]+[VER]",        "Kindle": "Kindle\/[VER]",        "Chrome": [            "Chrome\/[VER]",            "CriOS\/[VER]",            "CrMo\/[VER]"        ],        "Coast": [            "Coast\/[VER]"        ],        "Dolfin": "Dolfin\/[VER]",        "Firefox": "Firefox\/[VER]",        "Fennec": "Fennec\/[VER]",        "Edge": "Edge\/[VER]",        "IE": [            "IEMobile\/[VER];",            "IEMobile [VER]",            "MSIE [VER];",            "Trident\/[0-9.]+;.*rv:[VER]"        ],        "NetFront": "NetFront\/[VER]",        "NokiaBrowser": "NokiaBrowser\/[VER]",        "Opera": [            " OPR\/[VER]",            "Opera Mini\/[VER]",            "Version\/[VER]"        ],        "Opera Mini": "Opera Mini\/[VER]",        "Opera Mobi": "Version\/[VER]",        "UC Browser": "UC Browser[VER]",        "MQQBrowser": "MQQBrowser\/[VER]",        "MicroMessenger": "MicroMessenger\/[VER]",        "baiduboxapp": "baiduboxapp\/[VER]",        "baidubrowser": "baidubrowser\/[VER]",        "Iron": "Iron\/[VER]",        "Safari": [            "Version\/[VER]",            "Safari\/[VER]"        ],        "Skyfire": "Skyfire\/[VER]",        "Tizen": "Tizen\/[VER]",        "Webkit": "webkit[ \/][VER]",        "PaleMoon": "PaleMoon\/[VER]",        "Gecko": "Gecko\/[VER]",        "Trident": "Trident\/[VER]",        "Presto": "Presto\/[VER]",        "Goanna": "Goanna\/[VER]",        "iOS": " \\bi?OS\\b [VER][ ;]{1}",        "Android": "Android [VER]",        "BlackBerry": [            "BlackBerry[\\w]+\/[VER]",            "BlackBerry.*Version\/[VER]",            "Version\/[VER]"        ],        "BREW": "BREW [VER]",        "Java": "Java\/[VER]",        "Windows Phone OS": [            "Windows Phone OS [VER]",            "Windows Phone [VER]"        ],        "Windows Phone": "Windows Phone [VER]",        "Windows CE": "Windows CE\/[VER]",        "Windows NT": "Windows NT [VER]",        "Symbian": [            "SymbianOS\/[VER]",            "Symbian\/[VER]"        ],        "webOS": [            "webOS\/[VER]",            "hpwOS\/[VER];"        ]    },    "utils": {        "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom",        "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2",        "DesktopMode": "WPDesktop",        "TV": "SonyDTV|HbbTV",        "WebKit": "(webkit)[ \/]([\\w.]+)",        "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b",        "Watch": "SM-V700"    }} : { "phones": { "iPhone": string; "BlackBerry": string; "HTC": string; "Nexus": string; "Dell": string; "Motorola": string; "Samsung": string; "LG": string; "Sony": string; "Asus": string; "NokiaLumia": string; "Micromax": string; "Palm": string; "Vertu": string; "Pantech": string; "Fly": string; "Wiko": string; "iMobile": string; "SimValley": string; "Wolfgang": string; "Alcatel": string; "Nintendo": string; "Amoi": string; "INQ": string; "GenericPhone": string; }; "tablets": { "iPad": string; "NexusTablet": string; "SamsungTablet": string; "Kindle": string; "SurfaceTablet": string; "HPTablet": string; "AsusTablet": string; "BlackBerryTablet": string; "HTCtablet": string; "MotorolaTablet": string; "NookTablet": string; "AcerTablet": string; "ToshibaTablet": string; "LGTablet": string; "FujitsuTablet": string; "PrestigioTablet": string; "LenovoTablet": string; "DellTablet": string; "YarvikTablet": string; "MedionTablet": string; "ArnovaTablet": string; "IntensoTablet": string; "IRUTablet": string; "MegafonTablet": string; "EbodaTablet": string; "AllViewTablet": string; "ArchosTablet": string; "AinolTablet": string; "NokiaLumiaTablet": string; "SonyTablet": string; "PhilipsTablet": string; "CubeTablet": string; "CobyTablet": string; "MIDTablet": string; "MSITablet": string; "SMiTTablet": string; "RockChipTablet": string; "FlyTablet": string; "bqTablet": string; "HuaweiTablet": string; "NecTablet": string; "PantechTablet": string; "BronchoTablet": string; "VersusTablet": string; "ZyncTablet": string; "PositivoTablet": string; "NabiTablet": string; "KoboTablet": string; "DanewTablet": string; "TexetTablet": string; "PlaystationTablet": string; "TrekstorTablet": string; "PyleAudioTablet": string; "AdvanTablet": string; "DanyTechTablet": string; "GalapadTablet": string; "MicromaxTablet": string; "KarbonnTablet": string; "AllFineTablet": string; "PROSCANTablet": string; "YONESTablet": string; "ChangJiaTablet": string; "GUTablet": string; "PointOfViewTablet": string; "OvermaxTablet": string; "HCLTablet": string; "DPSTablet": string; "VistureTablet": string; "CrestaTablet": string; "MediatekTablet": string; "ConcordeTablet": string; "GoCleverTablet": string; "ModecomTablet": string; "VoninoTablet": string; "ECSTablet": string; "StorexTablet": string; "VodafoneTablet": string; "EssentielBTablet": string; "RossMoorTablet": string; "iMobileTablet": string; "TolinoTablet": string; "AudioSonicTablet": string; "AMPETablet": string; "SkkTablet": string; "TecnoTablet": string; "JXDTablet": string; "iJoyTablet": string; "FX2Tablet": string; "XoroTablet": string; "ViewsonicTablet": string; "OdysTablet": string; "CaptivaTablet": string; "IconbitTablet": string; "TeclastTablet": string; "OndaTablet": string; "JaytechTablet": string; "BlaupunktTablet": string; "DigmaTablet": string; "EvolioTablet": string; "LavaTablet": string; "AocTablet": string; "MpmanTablet": string; "CelkonTablet": string; "WolderTablet": string; "MiTablet": string; "NibiruTablet": string; "NexoTablet": string; "LeaderTablet": string; "UbislateTablet": string; "PocketBookTablet": string; "KocasoTablet": string; "Hudl": string; "TelstraTablet": string; "GenericTablet": string; }; "oss": { "AndroidOS": string; "BlackBerryOS": string; "PalmOS": string; "SymbianOS": string; "WindowsMobileOS": string; "WindowsPhoneOS": string; "iOS": string; "MeeGoOS": string; "MaemoOS": string; "JavaOS": string; "webOS": string; "badaOS": string; "BREWOS": string; }; "uas": { "Vivaldi": string; "Chrome": string; "Dolfin": string; "Opera": string; "Skyfire": string; "Edge": string; "IE": string; "Firefox": string; "Bolt": string; "TeaShark": string; "Blazer": string; "Safari": string; "Tizen": string; "UCBrowser": string; "baiduboxapp": string; "baidubrowser": string; "DiigoBrowser": string; "Puffin": string; "Mercury": string; "ObigoBrowser": string; "NetFront": string; "GenericBrowser": string; "PaleMoon": string; }; "props": { "Mobile": string; "Build": string; "Version": string; "VendorID": string; "iPad": string; "iPhone": string; "iPod": string; "Kindle": string; "Chrome": string[]; "Coast": string[]; "Dolfin": string; "Firefox": string; "Fennec": string; "Edge": string; "IE": string[]; "NetFront": string; "NokiaBrowser": string; "Opera": string[]; "Opera Mini": string; "Opera Mobi": string; "UC Browser": string; "MQQBrowser": string; "MicroMessenger": string; "baiduboxapp": string; "baidubrowser": string; "Iron": string; "Safari": string[]; "Skyfire": string; "Tizen": string; "Webkit": string; "PaleMoon": string; "Gecko": string; "Trident": string; "Presto": string; "Goanna": string; "iOS": string; "Android": string; "BlackBerry": string[]; "BREW": string; "Java": string; "Windows Phone OS": string[]; "Windows Phone": string; "Windows CE": string; "Windows NT": string; "Symbian": string[]; "webOS": string[]; }; "utils": { "Bot": string; "MobileBot": string; "DesktopMode": string; "TV": string; "WebKit": string; "Console": string; "Watch": string; }; }
 
     "phones": {
+>"phones" : { "iPhone": string; "BlackBerry": string; "HTC": string; "Nexus": string; "Dell": string; "Motorola": string; "Samsung": string; "LG": string; "Sony": string; "Asus": string; "NokiaLumia": string; "Micromax": string; "Palm": string; "Vertu": string; "Pantech": string; "Fly": string; "Wiko": string; "iMobile": string; "SimValley": string; "Wolfgang": string; "Alcatel": string; "Nintendo": string; "Amoi": string; "INQ": string; "GenericPhone": string; }
 >{        "iPhone": "\\biPhone\\b|\\biPod\\b",        "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+",        "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m",        "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6",        "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b",        "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b",        "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F",        "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)",        "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533",        "Asus": "Asus.*Galaxy|PadFone.*Mobile",        "NokiaLumia": "Lumia [0-9]{3,4}",        "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b",        "Palm": "PalmSource|Palm",        "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature",        "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790",        "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250",        "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM",        "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)",        "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b",        "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q",        "Alcatel": "Alcatel",        "Nintendo": "Nintendo 3DS",        "Amoi": "Amoi",        "INQ": "INQ",        "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"    } : { "iPhone": string; "BlackBerry": string; "HTC": string; "Nexus": string; "Dell": string; "Motorola": string; "Samsung": string; "LG": string; "Sony": string; "Asus": string; "NokiaLumia": string; "Micromax": string; "Palm": string; "Vertu": string; "Pantech": string; "Fly": string; "Wiko": string; "iMobile": string; "SimValley": string; "Wolfgang": string; "Alcatel": string; "Nintendo": string; "Amoi": string; "INQ": string; "GenericPhone": string; }
 
         "iPhone": "\\biPhone\\b|\\biPod\\b",
+>"iPhone" : string
 >"\\biPhone\\b|\\biPod\\b" : "\\biPhone\\b|\\biPod\\b"
 
         "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+",
+>"BlackBerry" : string
 >"BlackBerry|\\bBB10\\b|rim[0-9]+" : "BlackBerry|\\bBB10\\b|rim[0-9]+"
 
         "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m",
+>"HTC" : string
 >"HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m" : "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m"
 
         "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6",
+>"Nexus" : string
 >"Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6" : "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6"
 
         "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b",
+>"Dell" : string
 >"Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b" : "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b"
 
         "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b",
+>"Motorola" : string
 >"Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b" : "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b"
 
         "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F",
+>"Samsung" : string
 >"Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F" : "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F"
 
         "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)",
+>"LG" : string
 >"\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)" : "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)"
 
         "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533",
+>"Sony" : string
 >"SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533" : "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533"
 
         "Asus": "Asus.*Galaxy|PadFone.*Mobile",
+>"Asus" : string
 >"Asus.*Galaxy|PadFone.*Mobile" : "Asus.*Galaxy|PadFone.*Mobile"
 
         "NokiaLumia": "Lumia [0-9]{3,4}",
+>"NokiaLumia" : string
 >"Lumia [0-9]{3,4}" : "Lumia [0-9]{3,4}"
 
         "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b",
+>"Micromax" : string
 >"Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b" : "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b"
 
         "Palm": "PalmSource|Palm",
+>"Palm" : string
 >"PalmSource|Palm" : "PalmSource|Palm"
 
         "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature",
+>"Vertu" : string
 >"Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature" : "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature"
 
         "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790",
+>"Pantech" : string
 >"PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790" : "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790"
 
         "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250",
+>"Fly" : string
 >"IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250" : "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250"
 
         "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM",
+>"Wiko" : string
 >"KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM" : "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM"
 
         "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)",
+>"iMobile" : string
 >"i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)" : "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)"
 
         "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b",
+>"SimValley" : string
 >"\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b" : "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b"
 
         "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q",
+>"Wolfgang" : string
 >"AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q" : "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q"
 
         "Alcatel": "Alcatel",
+>"Alcatel" : string
 >"Alcatel" : "Alcatel"
 
         "Nintendo": "Nintendo 3DS",
+>"Nintendo" : string
 >"Nintendo 3DS" : "Nintendo 3DS"
 
         "Amoi": "Amoi",
+>"Amoi" : string
 >"Amoi" : "Amoi"
 
         "INQ": "INQ",
+>"INQ" : string
 >"INQ" : "INQ"
 
         "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"
+>"GenericPhone" : string
 >"Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" : "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"
 
     },
     "tablets": {
+>"tablets" : { "iPad": string; "NexusTablet": string; "SamsungTablet": string; "Kindle": string; "SurfaceTablet": string; "HPTablet": string; "AsusTablet": string; "BlackBerryTablet": string; "HTCtablet": string; "MotorolaTablet": string; "NookTablet": string; "AcerTablet": string; "ToshibaTablet": string; "LGTablet": string; "FujitsuTablet": string; "PrestigioTablet": string; "LenovoTablet": string; "DellTablet": string; "YarvikTablet": string; "MedionTablet": string; "ArnovaTablet": string; "IntensoTablet": string; "IRUTablet": string; "MegafonTablet": string; "EbodaTablet": string; "AllViewTablet": string; "ArchosTablet": string; "AinolTablet": string; "NokiaLumiaTablet": string; "SonyTablet": string; "PhilipsTablet": string; "CubeTablet": string; "CobyTablet": string; "MIDTablet": string; "MSITablet": string; "SMiTTablet": string; "RockChipTablet": string; "FlyTablet": string; "bqTablet": string; "HuaweiTablet": string; "NecTablet": string; "PantechTablet": string; "BronchoTablet": string; "VersusTablet": string; "ZyncTablet": string; "PositivoTablet": string; "NabiTablet": string; "KoboTablet": string; "DanewTablet": string; "TexetTablet": string; "PlaystationTablet": string; "TrekstorTablet": string; "PyleAudioTablet": string; "AdvanTablet": string; "DanyTechTablet": string; "GalapadTablet": string; "MicromaxTablet": string; "KarbonnTablet": string; "AllFineTablet": string; "PROSCANTablet": string; "YONESTablet": string; "ChangJiaTablet": string; "GUTablet": string; "PointOfViewTablet": string; "OvermaxTablet": string; "HCLTablet": string; "DPSTablet": string; "VistureTablet": string; "CrestaTablet": string; "MediatekTablet": string; "ConcordeTablet": string; "GoCleverTablet": string; "ModecomTablet": string; "VoninoTablet": string; "ECSTablet": string; "StorexTablet": string; "VodafoneTablet": string; "EssentielBTablet": string; "RossMoorTablet": string; "iMobileTablet": string; "TolinoTablet": string; "AudioSonicTablet": string; "AMPETablet": string; "SkkTablet": string; "TecnoTablet": string; "JXDTablet": string; "iJoyTablet": string; "FX2Tablet": string; "XoroTablet": string; "ViewsonicTablet": string; "OdysTablet": string; "CaptivaTablet": string; "IconbitTablet": string; "TeclastTablet": string; "OndaTablet": string; "JaytechTablet": string; "BlaupunktTablet": string; "DigmaTablet": string; "EvolioTablet": string; "LavaTablet": string; "AocTablet": string; "MpmanTablet": string; "CelkonTablet": string; "WolderTablet": string; "MiTablet": string; "NibiruTablet": string; "NexoTablet": string; "LeaderTablet": string; "UbislateTablet": string; "PocketBookTablet": string; "KocasoTablet": string; "Hudl": string; "TelstraTablet": string; "GenericTablet": string; }
 >{        "iPad": "iPad|iPad.*Mobile",        "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)",        "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561",        "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b",        "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)",        "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10",        "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA",        "BlackBerryTablet": "PlayBook|RIM Tablet",        "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410",        "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617",        "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2",        "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20",        "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO",        "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b",        "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b",        "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002",        "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)",        "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7",        "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b",        "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB",        "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2",        "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004",        "IRUTablet": "M702pro",        "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b",        "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)",        "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)",        "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b",        "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark",        "NokiaLumiaTablet": "Lumia 2520",        "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31",        "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b",        "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT",        "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010",        "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10",        "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b",        "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)",        "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A",        "FlyTablet": "IQ310|Fly Vision",        "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus",        "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim",        "NecTablet": "\\bN-06D|\\bN-08D",        "PantechTablet": "Pantech.*P4100",        "BronchoTablet": "Broncho.*(N701|N708|N802|a710)",        "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b",        "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900",        "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA",        "NabiTablet": "Android.*\\bNabi",        "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build",        "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b",        "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE",        "PlaystationTablet": "Playstation.*(Portable|Vita)",        "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab",        "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b",        "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ",        "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1",        "GalapadTablet": "Android.*\\bG1\\b",        "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b",        "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b",        "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide",        "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b",        "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026",        "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503",        "GUTablet": "TX-A1301|TX-M9002|Q702|kf026",        "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10",        "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)",        "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync",        "DPSTablet": "DPS Dream 9|DPS Dual 7",        "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10",        "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989",        "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b",        "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan",        "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042",        "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003",        "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b",        "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1",        "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab",        "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497",        "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2",        "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711",        "iMobileTablet": "i-mobile i-note",        "TolinoTablet": "tolino tab [0-9.]+|tolino shine",        "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b",        "AMPETablet": "Android.* A78 ",        "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)",        "TecnoTablet": "TECNO P9",        "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b",        "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)",        "FX2Tablet": "FX2 PAD7|FX2 PAD10",        "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151",        "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a",        "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10",        "CaptivaTablet": "CAPTIVA PAD",        "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S",        "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi",        "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+",        "JaytechTablet": "TPC-PA762",        "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010",        "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b",        "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b",        "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b",        "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712",        "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010",        "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b",        "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b",        "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b",        "NibiruTablet": "Nibiru M1|Nibiru Jupiter One",        "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI",        "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100",        "UbislateTablet": "UbiSlate[\\s]?7C",        "PocketBookTablet": "Pocketbook",        "KocasoTablet": "\\b(TB-1207)\\b",        "Hudl": "Hudl HT7S3|Hudl 2",        "TelstraTablet": "T-Hub2",        "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"    } : { "iPad": string; "NexusTablet": string; "SamsungTablet": string; "Kindle": string; "SurfaceTablet": string; "HPTablet": string; "AsusTablet": string; "BlackBerryTablet": string; "HTCtablet": string; "MotorolaTablet": string; "NookTablet": string; "AcerTablet": string; "ToshibaTablet": string; "LGTablet": string; "FujitsuTablet": string; "PrestigioTablet": string; "LenovoTablet": string; "DellTablet": string; "YarvikTablet": string; "MedionTablet": string; "ArnovaTablet": string; "IntensoTablet": string; "IRUTablet": string; "MegafonTablet": string; "EbodaTablet": string; "AllViewTablet": string; "ArchosTablet": string; "AinolTablet": string; "NokiaLumiaTablet": string; "SonyTablet": string; "PhilipsTablet": string; "CubeTablet": string; "CobyTablet": string; "MIDTablet": string; "MSITablet": string; "SMiTTablet": string; "RockChipTablet": string; "FlyTablet": string; "bqTablet": string; "HuaweiTablet": string; "NecTablet": string; "PantechTablet": string; "BronchoTablet": string; "VersusTablet": string; "ZyncTablet": string; "PositivoTablet": string; "NabiTablet": string; "KoboTablet": string; "DanewTablet": string; "TexetTablet": string; "PlaystationTablet": string; "TrekstorTablet": string; "PyleAudioTablet": string; "AdvanTablet": string; "DanyTechTablet": string; "GalapadTablet": string; "MicromaxTablet": string; "KarbonnTablet": string; "AllFineTablet": string; "PROSCANTablet": string; "YONESTablet": string; "ChangJiaTablet": string; "GUTablet": string; "PointOfViewTablet": string; "OvermaxTablet": string; "HCLTablet": string; "DPSTablet": string; "VistureTablet": string; "CrestaTablet": string; "MediatekTablet": string; "ConcordeTablet": string; "GoCleverTablet": string; "ModecomTablet": string; "VoninoTablet": string; "ECSTablet": string; "StorexTablet": string; "VodafoneTablet": string; "EssentielBTablet": string; "RossMoorTablet": string; "iMobileTablet": string; "TolinoTablet": string; "AudioSonicTablet": string; "AMPETablet": string; "SkkTablet": string; "TecnoTablet": string; "JXDTablet": string; "iJoyTablet": string; "FX2Tablet": string; "XoroTablet": string; "ViewsonicTablet": string; "OdysTablet": string; "CaptivaTablet": string; "IconbitTablet": string; "TeclastTablet": string; "OndaTablet": string; "JaytechTablet": string; "BlaupunktTablet": string; "DigmaTablet": string; "EvolioTablet": string; "LavaTablet": string; "AocTablet": string; "MpmanTablet": string; "CelkonTablet": string; "WolderTablet": string; "MiTablet": string; "NibiruTablet": string; "NexoTablet": string; "LeaderTablet": string; "UbislateTablet": string; "PocketBookTablet": string; "KocasoTablet": string; "Hudl": string; "TelstraTablet": string; "GenericTablet": string; }
 
         "iPad": "iPad|iPad.*Mobile",
+>"iPad" : string
 >"iPad|iPad.*Mobile" : "iPad|iPad.*Mobile"
 
         "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)",
+>"NexusTablet" : string
 >"Android.*Nexus[\\s]+(7|9|10)" : "Android.*Nexus[\\s]+(7|9|10)"
 
         "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561",
+>"SamsungTablet" : string
 >"SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561" : "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561"
 
         "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b",
+>"Kindle" : string
 >"Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b" : "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b"
 
         "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)",
+>"SurfaceTablet" : string
 >"Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)" : "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)"
 
         "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10",
+>"HPTablet" : string
 >"HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10" : "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10"
 
         "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA",
+>"AsusTablet" : string
 >"^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA" : "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA"
 
         "BlackBerryTablet": "PlayBook|RIM Tablet",
+>"BlackBerryTablet" : string
 >"PlayBook|RIM Tablet" : "PlayBook|RIM Tablet"
 
         "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410",
+>"HTCtablet" : string
 >"HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410" : "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410"
 
         "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617",
+>"MotorolaTablet" : string
 >"xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617" : "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617"
 
         "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2",
+>"NookTablet" : string
 >"Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2" : "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2"
 
         "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20",
+>"AcerTablet" : string
 >"Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20" : "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20"
 
         "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO",
+>"ToshibaTablet" : string
 >"Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO" : "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO"
 
         "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b",
+>"LGTablet" : string
 >"\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b" : "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b"
 
         "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b",
+>"FujitsuTablet" : string
 >"Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b" : "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b"
 
         "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002",
+>"PrestigioTablet" : string
 >"PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002" : "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002"
 
         "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)",
+>"LenovoTablet" : string
 >"Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)" : "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)"
 
         "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7",
+>"DellTablet" : string
 >"Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7" : "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7"
 
         "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b",
+>"YarvikTablet" : string
 >"Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b" : "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b"
 
         "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB",
+>"MedionTablet" : string
 >"Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB" : "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB"
 
         "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2",
+>"ArnovaTablet" : string
 >"AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2" : "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2"
 
         "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004",
+>"IntensoTablet" : string
 >"INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004" : "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004"
 
         "IRUTablet": "M702pro",
+>"IRUTablet" : string
 >"M702pro" : "M702pro"
 
         "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b",
+>"MegafonTablet" : string
 >"MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b" : "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b"
 
         "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)",
+>"EbodaTablet" : string
 >"E-Boda (Supreme|Impresspeed|Izzycomm|Essential)" : "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)"
 
         "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)",
+>"AllViewTablet" : string
 >"Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)" : "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)"
 
         "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b",
+>"ArchosTablet" : string
 >"\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b" : "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b"
 
         "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark",
+>"AinolTablet" : string
 >"NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark" : "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark"
 
         "NokiaLumiaTablet": "Lumia 2520",
+>"NokiaLumiaTablet" : string
 >"Lumia 2520" : "Lumia 2520"
 
         "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31",
+>"SonyTablet" : string
 >"Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31" : "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31"
 
         "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b",
+>"PhilipsTablet" : string
 >"\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b" : "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b"
 
         "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT",
+>"CubeTablet" : string
 >"Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT" : "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT"
 
         "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010",
+>"CobyTablet" : string
 >"MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010" : "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010"
 
         "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10",
+>"MIDTablet" : string
 >"M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10" : "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10"
 
         "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b",
+>"MSITablet" : string
 >"MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b" : "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b"
 
         "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)",
+>"SMiTTablet" : string
 >"Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)" : "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)"
 
         "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A",
+>"RockChipTablet" : string
 >"Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A" : "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A"
 
         "FlyTablet": "IQ310|Fly Vision",
+>"FlyTablet" : string
 >"IQ310|Fly Vision" : "IQ310|Fly Vision"
 
         "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus",
+>"bqTablet" : string
 >"Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus" : "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus"
 
         "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim",
+>"HuaweiTablet" : string
 >"MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim" : "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim"
 
         "NecTablet": "\\bN-06D|\\bN-08D",
+>"NecTablet" : string
 >"\\bN-06D|\\bN-08D" : "\\bN-06D|\\bN-08D"
 
         "PantechTablet": "Pantech.*P4100",
+>"PantechTablet" : string
 >"Pantech.*P4100" : "Pantech.*P4100"
 
         "BronchoTablet": "Broncho.*(N701|N708|N802|a710)",
+>"BronchoTablet" : string
 >"Broncho.*(N701|N708|N802|a710)" : "Broncho.*(N701|N708|N802|a710)"
 
         "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b",
+>"VersusTablet" : string
 >"TOUCHPAD.*[78910]|\\bTOUCHTAB\\b" : "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b"
 
         "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900",
+>"ZyncTablet" : string
 >"z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900" : "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900"
 
         "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA",
+>"PositivoTablet" : string
 >"TB07STA|TB10STA|TB07FTA|TB10FTA" : "TB07STA|TB10STA|TB07FTA|TB10FTA"
 
         "NabiTablet": "Android.*\\bNabi",
+>"NabiTablet" : string
 >"Android.*\\bNabi" : "Android.*\\bNabi"
 
         "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build",
+>"KoboTablet" : string
 >"Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build" : "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build"
 
         "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b",
+>"DanewTablet" : string
 >"DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b" : "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b"
 
         "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE",
+>"TexetTablet" : string
 >"NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE" : "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE"
 
         "PlaystationTablet": "Playstation.*(Portable|Vita)",
+>"PlaystationTablet" : string
 >"Playstation.*(Portable|Vita)" : "Playstation.*(Portable|Vita)"
 
         "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab",
+>"TrekstorTablet" : string
 >"ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab" : "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab"
 
         "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b",
+>"PyleAudioTablet" : string
 >"\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b" : "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b"
 
         "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ",
+>"AdvanTablet" : string
 >"Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b " : "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b "
 
         "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1",
+>"DanyTechTablet" : string
 >"Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1" : "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1"
 
         "GalapadTablet": "Android.*\\bG1\\b",
+>"GalapadTablet" : string
 >"Android.*\\bG1\\b" : "Android.*\\bG1\\b"
 
         "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b",
+>"MicromaxTablet" : string
 >"Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b" : "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b"
 
         "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b",
+>"KarbonnTablet" : string
 >"Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b" : "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b"
 
         "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide",
+>"AllFineTablet" : string
 >"Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide" : "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide"
 
         "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b",
+>"PROSCANTablet" : string
 >"\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b" : "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b"
 
         "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026",
+>"YONESTablet" : string
 >"BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026" : "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026"
 
         "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503",
+>"ChangJiaTablet" : string
 >"TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503" : "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503"
 
         "GUTablet": "TX-A1301|TX-M9002|Q702|kf026",
+>"GUTablet" : string
 >"TX-A1301|TX-M9002|Q702|kf026" : "TX-A1301|TX-M9002|Q702|kf026"
 
         "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10",
+>"PointOfViewTablet" : string
 >"TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10" : "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10"
 
         "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)",
+>"OvermaxTablet" : string
 >"OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)" : "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)"
 
         "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync",
+>"HCLTablet" : string
 >"HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync" : "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync"
 
         "DPSTablet": "DPS Dream 9|DPS Dual 7",
+>"DPSTablet" : string
 >"DPS Dream 9|DPS Dual 7" : "DPS Dream 9|DPS Dual 7"
 
         "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10",
+>"VistureTablet" : string
 >"V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10" : "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10"
 
         "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989",
+>"CrestaTablet" : string
 >"CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989" : "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989"
 
         "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b",
+>"MediatekTablet" : string
 >"\\bMT8125|MT8389|MT8135|MT8377\\b" : "\\bMT8125|MT8389|MT8135|MT8377\\b"
 
         "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan",
+>"ConcordeTablet" : string
 >"Concorde([ ]+)?Tab|ConCorde ReadMan" : "Concorde([ ]+)?Tab|ConCorde ReadMan"
 
         "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042",
+>"GoCleverTablet" : string
 >"GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042" : "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042"
 
         "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003",
+>"ModecomTablet" : string
 >"FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003" : "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003"
 
         "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b",
+>"VoninoTablet" : string
 >"\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b" : "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b"
 
         "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1",
+>"ECSTablet" : string
 >"V07OT2|TM105A|S10OT1|TR10CS1" : "V07OT2|TM105A|S10OT1|TR10CS1"
 
         "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab",
+>"StorexTablet" : string
 >"eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab" : "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab"
 
         "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497",
+>"VodafoneTablet" : string
 >"SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497" : "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497"
 
         "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2",
+>"EssentielBTablet" : string
 >"Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2" : "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2"
 
         "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711",
+>"RossMoorTablet" : string
 >"RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711" : "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711"
 
         "iMobileTablet": "i-mobile i-note",
+>"iMobileTablet" : string
 >"i-mobile i-note" : "i-mobile i-note"
 
         "TolinoTablet": "tolino tab [0-9.]+|tolino shine",
+>"TolinoTablet" : string
 >"tolino tab [0-9.]+|tolino shine" : "tolino tab [0-9.]+|tolino shine"
 
         "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b",
+>"AudioSonicTablet" : string
 >"\\bC-22Q|T7-QC|T-17B|T-17P\\b" : "\\bC-22Q|T7-QC|T-17B|T-17P\\b"
 
         "AMPETablet": "Android.* A78 ",
+>"AMPETablet" : string
 >"Android.* A78 " : "Android.* A78 "
 
         "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)",
+>"SkkTablet" : string
 >"Android.* (SKYPAD|PHOENIX|CYCLOPS)" : "Android.* (SKYPAD|PHOENIX|CYCLOPS)"
 
         "TecnoTablet": "TECNO P9",
+>"TecnoTablet" : string
 >"TECNO P9" : "TECNO P9"
 
         "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b",
+>"JXDTablet" : string
 >"Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b" : "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b"
 
         "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)",
+>"iJoyTablet" : string
 >"Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)" : "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)"
 
         "FX2Tablet": "FX2 PAD7|FX2 PAD10",
+>"FX2Tablet" : string
 >"FX2 PAD7|FX2 PAD10" : "FX2 PAD7|FX2 PAD10"
 
         "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151",
+>"XoroTablet" : string
 >"KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151" : "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151"
 
         "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a",
+>"ViewsonicTablet" : string
 >"ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a" : "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a"
 
         "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10",
+>"OdysTablet" : string
 >"LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10" : "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10"
 
         "CaptivaTablet": "CAPTIVA PAD",
+>"CaptivaTablet" : string
 >"CAPTIVA PAD" : "CAPTIVA PAD"
 
         "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S",
+>"IconbitTablet" : string
 >"NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S" : "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S"
 
         "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi",
+>"TeclastTablet" : string
 >"T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi" : "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi"
 
         "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+",
+>"OndaTablet" : string
 >"\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+" : "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+"
 
         "JaytechTablet": "TPC-PA762",
+>"JaytechTablet" : string
 >"TPC-PA762" : "TPC-PA762"
 
         "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010",
+>"BlaupunktTablet" : string
 >"Endeavour 800NG|Endeavour 1010" : "Endeavour 800NG|Endeavour 1010"
 
         "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b",
+>"DigmaTablet" : string
 >"\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b" : "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b"
 
         "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b",
+>"EvolioTablet" : string
 >"ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b" : "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b"
 
         "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b",
+>"LavaTablet" : string
 >"QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b" : "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b"
 
         "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712",
+>"AocTablet" : string
 >"MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712" : "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712"
 
         "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010",
+>"MpmanTablet" : string
 >"MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010" : "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010"
 
         "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b",
+>"CelkonTablet" : string
 >"CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b" : "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b"
 
         "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b",
+>"WolderTablet" : string
 >"miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b" : "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b"
 
         "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b",
+>"MiTablet" : string
 >"\\bMI PAD\\b|\\bHM NOTE 1W\\b" : "\\bMI PAD\\b|\\bHM NOTE 1W\\b"
 
         "NibiruTablet": "Nibiru M1|Nibiru Jupiter One",
+>"NibiruTablet" : string
 >"Nibiru M1|Nibiru Jupiter One" : "Nibiru M1|Nibiru Jupiter One"
 
         "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI",
+>"NexoTablet" : string
 >"NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI" : "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI"
 
         "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100",
+>"LeaderTablet" : string
 >"TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100" : "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100"
 
         "UbislateTablet": "UbiSlate[\\s]?7C",
+>"UbislateTablet" : string
 >"UbiSlate[\\s]?7C" : "UbiSlate[\\s]?7C"
 
         "PocketBookTablet": "Pocketbook",
+>"PocketBookTablet" : string
 >"Pocketbook" : "Pocketbook"
 
         "KocasoTablet": "\\b(TB-1207)\\b",
+>"KocasoTablet" : string
 >"\\b(TB-1207)\\b" : "\\b(TB-1207)\\b"
 
         "Hudl": "Hudl HT7S3|Hudl 2",
+>"Hudl" : string
 >"Hudl HT7S3|Hudl 2" : "Hudl HT7S3|Hudl 2"
 
         "TelstraTablet": "T-Hub2",
+>"TelstraTablet" : string
 >"T-Hub2" : "T-Hub2"
 
         "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"
+>"GenericTablet" : string
 >"Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" : "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b"
 
     },
     "oss": {
+>"oss" : { "AndroidOS": string; "BlackBerryOS": string; "PalmOS": string; "SymbianOS": string; "WindowsMobileOS": string; "WindowsPhoneOS": string; "iOS": string; "MeeGoOS": string; "MaemoOS": string; "JavaOS": string; "webOS": string; "badaOS": string; "BREWOS": string; }
 >{        "AndroidOS": "Android",        "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os",        "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino",        "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b",        "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;",        "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;",        "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad",        "MeeGoOS": "MeeGo",        "MaemoOS": "Maemo",        "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b",        "webOS": "webOS|hpwOS",        "badaOS": "\\bBada\\b",        "BREWOS": "BREW"    } : { "AndroidOS": string; "BlackBerryOS": string; "PalmOS": string; "SymbianOS": string; "WindowsMobileOS": string; "WindowsPhoneOS": string; "iOS": string; "MeeGoOS": string; "MaemoOS": string; "JavaOS": string; "webOS": string; "badaOS": string; "BREWOS": string; }
 
         "AndroidOS": "Android",
+>"AndroidOS" : string
 >"Android" : "Android"
 
         "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os",
+>"BlackBerryOS" : string
 >"blackberry|\\bBB10\\b|rim tablet os" : "blackberry|\\bBB10\\b|rim tablet os"
 
         "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino",
+>"PalmOS" : string
 >"PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino" : "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino"
 
         "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b",
+>"SymbianOS" : string
 >"Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b" : "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b"
 
         "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;",
+>"WindowsMobileOS" : string
 >"Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;" : "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;"
 
         "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;",
+>"WindowsPhoneOS" : string
 >"Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;" : "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;"
 
         "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad",
+>"iOS" : string
 >"\\biPhone.*Mobile|\\biPod|\\biPad" : "\\biPhone.*Mobile|\\biPod|\\biPad"
 
         "MeeGoOS": "MeeGo",
+>"MeeGoOS" : string
 >"MeeGo" : "MeeGo"
 
         "MaemoOS": "Maemo",
+>"MaemoOS" : string
 >"Maemo" : "Maemo"
 
         "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b",
+>"JavaOS" : string
 >"J2ME\/|\\bMIDP\\b|\\bCLDC\\b" : "J2ME/|\\bMIDP\\b|\\bCLDC\\b"
 
         "webOS": "webOS|hpwOS",
+>"webOS" : string
 >"webOS|hpwOS" : "webOS|hpwOS"
 
         "badaOS": "\\bBada\\b",
+>"badaOS" : string
 >"\\bBada\\b" : "\\bBada\\b"
 
         "BREWOS": "BREW"
+>"BREWOS" : string
 >"BREW" : "BREW"
 
     },
     "uas": {
+>"uas" : { "Vivaldi": string; "Chrome": string; "Dolfin": string; "Opera": string; "Skyfire": string; "Edge": string; "IE": string; "Firefox": string; "Bolt": string; "TeaShark": string; "Blazer": string; "Safari": string; "Tizen": string; "UCBrowser": string; "baiduboxapp": string; "baidubrowser": string; "DiigoBrowser": string; "Puffin": string; "Mercury": string; "ObigoBrowser": string; "NetFront": string; "GenericBrowser": string; "PaleMoon": string; }
 >{        "Vivaldi": "Vivaldi",        "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?",        "Dolfin": "\\bDolfin\\b",        "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+",        "Skyfire": "Skyfire",        "Edge": "Mobile Safari\/[.0-9]* Edge",        "IE": "IEMobile|MSIEMobile",        "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile",        "Bolt": "bolt",        "TeaShark": "teashark",        "Blazer": "Blazer",        "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari",        "Tizen": "Tizen",        "UCBrowser": "UC.*Browser|UCWEB",        "baiduboxapp": "baiduboxapp",        "baidubrowser": "baidubrowser",        "DiigoBrowser": "DiigoBrowser",        "Puffin": "Puffin",        "Mercury": "\\bMercury\\b",        "ObigoBrowser": "Obigo",        "NetFront": "NF-Browser",        "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger",        "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon"    } : { "Vivaldi": string; "Chrome": string; "Dolfin": string; "Opera": string; "Skyfire": string; "Edge": string; "IE": string; "Firefox": string; "Bolt": string; "TeaShark": string; "Blazer": string; "Safari": string; "Tizen": string; "UCBrowser": string; "baiduboxapp": string; "baidubrowser": string; "DiigoBrowser": string; "Puffin": string; "Mercury": string; "ObigoBrowser": string; "NetFront": string; "GenericBrowser": string; "PaleMoon": string; }
 
         "Vivaldi": "Vivaldi",
+>"Vivaldi" : string
 >"Vivaldi" : "Vivaldi"
 
         "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?",
+>"Chrome" : string
 >"\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?" : "\\bCrMo\\b|CriOS|Android.*Chrome/[.0-9]* (Mobile)?"
 
         "Dolfin": "\\bDolfin\\b",
+>"Dolfin" : string
 >"\\bDolfin\\b" : "\\bDolfin\\b"
 
         "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+",
+>"Opera" : string
 >"Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+" : "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR/[0-9.]+|Coast/[0-9.]+"
 
         "Skyfire": "Skyfire",
+>"Skyfire" : string
 >"Skyfire" : "Skyfire"
 
         "Edge": "Mobile Safari\/[.0-9]* Edge",
+>"Edge" : string
 >"Mobile Safari\/[.0-9]* Edge" : "Mobile Safari/[.0-9]* Edge"
 
         "IE": "IEMobile|MSIEMobile",
+>"IE" : string
 >"IEMobile|MSIEMobile" : "IEMobile|MSIEMobile"
 
         "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile",
+>"Firefox" : string
 >"fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile" : "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile"
 
         "Bolt": "bolt",
+>"Bolt" : string
 >"bolt" : "bolt"
 
         "TeaShark": "teashark",
+>"TeaShark" : string
 >"teashark" : "teashark"
 
         "Blazer": "Blazer",
+>"Blazer" : string
 >"Blazer" : "Blazer"
 
         "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari",
+>"Safari" : string
 >"Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari" : "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari"
 
         "Tizen": "Tizen",
+>"Tizen" : string
 >"Tizen" : "Tizen"
 
         "UCBrowser": "UC.*Browser|UCWEB",
+>"UCBrowser" : string
 >"UC.*Browser|UCWEB" : "UC.*Browser|UCWEB"
 
         "baiduboxapp": "baiduboxapp",
+>"baiduboxapp" : string
 >"baiduboxapp" : "baiduboxapp"
 
         "baidubrowser": "baidubrowser",
+>"baidubrowser" : string
 >"baidubrowser" : "baidubrowser"
 
         "DiigoBrowser": "DiigoBrowser",
+>"DiigoBrowser" : string
 >"DiigoBrowser" : "DiigoBrowser"
 
         "Puffin": "Puffin",
+>"Puffin" : string
 >"Puffin" : "Puffin"
 
         "Mercury": "\\bMercury\\b",
+>"Mercury" : string
 >"\\bMercury\\b" : "\\bMercury\\b"
 
         "ObigoBrowser": "Obigo",
+>"ObigoBrowser" : string
 >"Obigo" : "Obigo"
 
         "NetFront": "NF-Browser",
+>"NetFront" : string
 >"NF-Browser" : "NF-Browser"
 
         "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger",
+>"GenericBrowser" : string
 >"NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger" : "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger"
 
         "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon"
+>"PaleMoon" : string
 >"Android.*PaleMoon|Mobile.*PaleMoon" : "Android.*PaleMoon|Mobile.*PaleMoon"
 
     },
     "props": {
+>"props" : { "Mobile": string; "Build": string; "Version": string; "VendorID": string; "iPad": string; "iPhone": string; "iPod": string; "Kindle": string; "Chrome": string[]; "Coast": string[]; "Dolfin": string; "Firefox": string; "Fennec": string; "Edge": string; "IE": string[]; "NetFront": string; "NokiaBrowser": string; "Opera": string[]; "Opera Mini": string; "Opera Mobi": string; "UC Browser": string; "MQQBrowser": string; "MicroMessenger": string; "baiduboxapp": string; "baidubrowser": string; "Iron": string; "Safari": string[]; "Skyfire": string; "Tizen": string; "Webkit": string; "PaleMoon": string; "Gecko": string; "Trident": string; "Presto": string; "Goanna": string; "iOS": string; "Android": string; "BlackBerry": string[]; "BREW": string; "Java": string; "Windows Phone OS": string[]; "Windows Phone": string; "Windows CE": string; "Windows NT": string; "Symbian": string[]; "webOS": string[]; }
 >{        "Mobile": "Mobile\/[VER]",        "Build": "Build\/[VER]",        "Version": "Version\/[VER]",        "VendorID": "VendorID\/[VER]",        "iPad": "iPad.*CPU[a-z ]+[VER]",        "iPhone": "iPhone.*CPU[a-z ]+[VER]",        "iPod": "iPod.*CPU[a-z ]+[VER]",        "Kindle": "Kindle\/[VER]",        "Chrome": [            "Chrome\/[VER]",            "CriOS\/[VER]",            "CrMo\/[VER]"        ],        "Coast": [            "Coast\/[VER]"        ],        "Dolfin": "Dolfin\/[VER]",        "Firefox": "Firefox\/[VER]",        "Fennec": "Fennec\/[VER]",        "Edge": "Edge\/[VER]",        "IE": [            "IEMobile\/[VER];",            "IEMobile [VER]",            "MSIE [VER];",            "Trident\/[0-9.]+;.*rv:[VER]"        ],        "NetFront": "NetFront\/[VER]",        "NokiaBrowser": "NokiaBrowser\/[VER]",        "Opera": [            " OPR\/[VER]",            "Opera Mini\/[VER]",            "Version\/[VER]"        ],        "Opera Mini": "Opera Mini\/[VER]",        "Opera Mobi": "Version\/[VER]",        "UC Browser": "UC Browser[VER]",        "MQQBrowser": "MQQBrowser\/[VER]",        "MicroMessenger": "MicroMessenger\/[VER]",        "baiduboxapp": "baiduboxapp\/[VER]",        "baidubrowser": "baidubrowser\/[VER]",        "Iron": "Iron\/[VER]",        "Safari": [            "Version\/[VER]",            "Safari\/[VER]"        ],        "Skyfire": "Skyfire\/[VER]",        "Tizen": "Tizen\/[VER]",        "Webkit": "webkit[ \/][VER]",        "PaleMoon": "PaleMoon\/[VER]",        "Gecko": "Gecko\/[VER]",        "Trident": "Trident\/[VER]",        "Presto": "Presto\/[VER]",        "Goanna": "Goanna\/[VER]",        "iOS": " \\bi?OS\\b [VER][ ;]{1}",        "Android": "Android [VER]",        "BlackBerry": [            "BlackBerry[\\w]+\/[VER]",            "BlackBerry.*Version\/[VER]",            "Version\/[VER]"        ],        "BREW": "BREW [VER]",        "Java": "Java\/[VER]",        "Windows Phone OS": [            "Windows Phone OS [VER]",            "Windows Phone [VER]"        ],        "Windows Phone": "Windows Phone [VER]",        "Windows CE": "Windows CE\/[VER]",        "Windows NT": "Windows NT [VER]",        "Symbian": [            "SymbianOS\/[VER]",            "Symbian\/[VER]"        ],        "webOS": [            "webOS\/[VER]",            "hpwOS\/[VER];"        ]    } : { "Mobile": string; "Build": string; "Version": string; "VendorID": string; "iPad": string; "iPhone": string; "iPod": string; "Kindle": string; "Chrome": string[]; "Coast": string[]; "Dolfin": string; "Firefox": string; "Fennec": string; "Edge": string; "IE": string[]; "NetFront": string; "NokiaBrowser": string; "Opera": string[]; "Opera Mini": string; "Opera Mobi": string; "UC Browser": string; "MQQBrowser": string; "MicroMessenger": string; "baiduboxapp": string; "baidubrowser": string; "Iron": string; "Safari": string[]; "Skyfire": string; "Tizen": string; "Webkit": string; "PaleMoon": string; "Gecko": string; "Trident": string; "Presto": string; "Goanna": string; "iOS": string; "Android": string; "BlackBerry": string[]; "BREW": string; "Java": string; "Windows Phone OS": string[]; "Windows Phone": string; "Windows CE": string; "Windows NT": string; "Symbian": string[]; "webOS": string[]; }
 
         "Mobile": "Mobile\/[VER]",
+>"Mobile" : string
 >"Mobile\/[VER]" : "Mobile/[VER]"
 
         "Build": "Build\/[VER]",
+>"Build" : string
 >"Build\/[VER]" : "Build/[VER]"
 
         "Version": "Version\/[VER]",
+>"Version" : string
 >"Version\/[VER]" : "Version/[VER]"
 
         "VendorID": "VendorID\/[VER]",
+>"VendorID" : string
 >"VendorID\/[VER]" : "VendorID/[VER]"
 
         "iPad": "iPad.*CPU[a-z ]+[VER]",
+>"iPad" : string
 >"iPad.*CPU[a-z ]+[VER]" : "iPad.*CPU[a-z ]+[VER]"
 
         "iPhone": "iPhone.*CPU[a-z ]+[VER]",
+>"iPhone" : string
 >"iPhone.*CPU[a-z ]+[VER]" : "iPhone.*CPU[a-z ]+[VER]"
 
         "iPod": "iPod.*CPU[a-z ]+[VER]",
+>"iPod" : string
 >"iPod.*CPU[a-z ]+[VER]" : "iPod.*CPU[a-z ]+[VER]"
 
         "Kindle": "Kindle\/[VER]",
+>"Kindle" : string
 >"Kindle\/[VER]" : "Kindle/[VER]"
 
         "Chrome": [
+>"Chrome" : string[]
 >[            "Chrome\/[VER]",            "CriOS\/[VER]",            "CrMo\/[VER]"        ] : string[]
 
             "Chrome\/[VER]",
@@ -609,6 +798,7 @@ define(function () {
 
         ],
         "Coast": [
+>"Coast" : string[]
 >[            "Coast\/[VER]"        ] : string[]
 
             "Coast\/[VER]"
@@ -616,18 +806,23 @@ define(function () {
 
         ],
         "Dolfin": "Dolfin\/[VER]",
+>"Dolfin" : string
 >"Dolfin\/[VER]" : "Dolfin/[VER]"
 
         "Firefox": "Firefox\/[VER]",
+>"Firefox" : string
 >"Firefox\/[VER]" : "Firefox/[VER]"
 
         "Fennec": "Fennec\/[VER]",
+>"Fennec" : string
 >"Fennec\/[VER]" : "Fennec/[VER]"
 
         "Edge": "Edge\/[VER]",
+>"Edge" : string
 >"Edge\/[VER]" : "Edge/[VER]"
 
         "IE": [
+>"IE" : string[]
 >[            "IEMobile\/[VER];",            "IEMobile [VER]",            "MSIE [VER];",            "Trident\/[0-9.]+;.*rv:[VER]"        ] : string[]
 
             "IEMobile\/[VER];",
@@ -644,12 +839,15 @@ define(function () {
 
         ],
         "NetFront": "NetFront\/[VER]",
+>"NetFront" : string
 >"NetFront\/[VER]" : "NetFront/[VER]"
 
         "NokiaBrowser": "NokiaBrowser\/[VER]",
+>"NokiaBrowser" : string
 >"NokiaBrowser\/[VER]" : "NokiaBrowser/[VER]"
 
         "Opera": [
+>"Opera" : string[]
 >[            " OPR\/[VER]",            "Opera Mini\/[VER]",            "Version\/[VER]"        ] : string[]
 
             " OPR\/[VER]",
@@ -663,30 +861,39 @@ define(function () {
 
         ],
         "Opera Mini": "Opera Mini\/[VER]",
+>"Opera Mini" : string
 >"Opera Mini\/[VER]" : "Opera Mini/[VER]"
 
         "Opera Mobi": "Version\/[VER]",
+>"Opera Mobi" : string
 >"Version\/[VER]" : "Version/[VER]"
 
         "UC Browser": "UC Browser[VER]",
+>"UC Browser" : string
 >"UC Browser[VER]" : "UC Browser[VER]"
 
         "MQQBrowser": "MQQBrowser\/[VER]",
+>"MQQBrowser" : string
 >"MQQBrowser\/[VER]" : "MQQBrowser/[VER]"
 
         "MicroMessenger": "MicroMessenger\/[VER]",
+>"MicroMessenger" : string
 >"MicroMessenger\/[VER]" : "MicroMessenger/[VER]"
 
         "baiduboxapp": "baiduboxapp\/[VER]",
+>"baiduboxapp" : string
 >"baiduboxapp\/[VER]" : "baiduboxapp/[VER]"
 
         "baidubrowser": "baidubrowser\/[VER]",
+>"baidubrowser" : string
 >"baidubrowser\/[VER]" : "baidubrowser/[VER]"
 
         "Iron": "Iron\/[VER]",
+>"Iron" : string
 >"Iron\/[VER]" : "Iron/[VER]"
 
         "Safari": [
+>"Safari" : string[]
 >[            "Version\/[VER]",            "Safari\/[VER]"        ] : string[]
 
             "Version\/[VER]",
@@ -697,36 +904,47 @@ define(function () {
 
         ],
         "Skyfire": "Skyfire\/[VER]",
+>"Skyfire" : string
 >"Skyfire\/[VER]" : "Skyfire/[VER]"
 
         "Tizen": "Tizen\/[VER]",
+>"Tizen" : string
 >"Tizen\/[VER]" : "Tizen/[VER]"
 
         "Webkit": "webkit[ \/][VER]",
+>"Webkit" : string
 >"webkit[ \/][VER]" : "webkit[ /][VER]"
 
         "PaleMoon": "PaleMoon\/[VER]",
+>"PaleMoon" : string
 >"PaleMoon\/[VER]" : "PaleMoon/[VER]"
 
         "Gecko": "Gecko\/[VER]",
+>"Gecko" : string
 >"Gecko\/[VER]" : "Gecko/[VER]"
 
         "Trident": "Trident\/[VER]",
+>"Trident" : string
 >"Trident\/[VER]" : "Trident/[VER]"
 
         "Presto": "Presto\/[VER]",
+>"Presto" : string
 >"Presto\/[VER]" : "Presto/[VER]"
 
         "Goanna": "Goanna\/[VER]",
+>"Goanna" : string
 >"Goanna\/[VER]" : "Goanna/[VER]"
 
         "iOS": " \\bi?OS\\b [VER][ ;]{1}",
+>"iOS" : string
 >" \\bi?OS\\b [VER][ ;]{1}" : " \\bi?OS\\b [VER][ ;]{1}"
 
         "Android": "Android [VER]",
+>"Android" : string
 >"Android [VER]" : "Android [VER]"
 
         "BlackBerry": [
+>"BlackBerry" : string[]
 >[            "BlackBerry[\\w]+\/[VER]",            "BlackBerry.*Version\/[VER]",            "Version\/[VER]"        ] : string[]
 
             "BlackBerry[\\w]+\/[VER]",
@@ -740,12 +958,15 @@ define(function () {
 
         ],
         "BREW": "BREW [VER]",
+>"BREW" : string
 >"BREW [VER]" : "BREW [VER]"
 
         "Java": "Java\/[VER]",
+>"Java" : string
 >"Java\/[VER]" : "Java/[VER]"
 
         "Windows Phone OS": [
+>"Windows Phone OS" : string[]
 >[            "Windows Phone OS [VER]",            "Windows Phone [VER]"        ] : string[]
 
             "Windows Phone OS [VER]",
@@ -756,15 +977,19 @@ define(function () {
 
         ],
         "Windows Phone": "Windows Phone [VER]",
+>"Windows Phone" : string
 >"Windows Phone [VER]" : "Windows Phone [VER]"
 
         "Windows CE": "Windows CE\/[VER]",
+>"Windows CE" : string
 >"Windows CE\/[VER]" : "Windows CE/[VER]"
 
         "Windows NT": "Windows NT [VER]",
+>"Windows NT" : string
 >"Windows NT [VER]" : "Windows NT [VER]"
 
         "Symbian": [
+>"Symbian" : string[]
 >[            "SymbianOS\/[VER]",            "Symbian\/[VER]"        ] : string[]
 
             "SymbianOS\/[VER]",
@@ -775,6 +1000,7 @@ define(function () {
 
         ],
         "webOS": [
+>"webOS" : string[]
 >[            "webOS\/[VER]",            "hpwOS\/[VER];"        ] : string[]
 
             "webOS\/[VER]",
@@ -786,27 +1012,35 @@ define(function () {
         ]
     },
     "utils": {
+>"utils" : { "Bot": string; "MobileBot": string; "DesktopMode": string; "TV": string; "WebKit": string; "Console": string; "Watch": string; }
 >{        "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom",        "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2",        "DesktopMode": "WPDesktop",        "TV": "SonyDTV|HbbTV",        "WebKit": "(webkit)[ \/]([\\w.]+)",        "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b",        "Watch": "SM-V700"    } : { "Bot": string; "MobileBot": string; "DesktopMode": string; "TV": string; "WebKit": string; "Console": string; "Watch": string; }
 
         "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom",
+>"Bot" : string
 >"Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom" : "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom"
 
         "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2",
+>"MobileBot" : string
 >"Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2" : "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker/M1A1-R2D2"
 
         "DesktopMode": "WPDesktop",
+>"DesktopMode" : string
 >"WPDesktop" : "WPDesktop"
 
         "TV": "SonyDTV|HbbTV",
+>"TV" : string
 >"SonyDTV|HbbTV" : "SonyDTV|HbbTV"
 
         "WebKit": "(webkit)[ \/]([\\w.]+)",
+>"WebKit" : string
 >"(webkit)[ \/]([\\w.]+)" : "(webkit)[ /]([\\w.]+)"
 
         "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b",
+>"Console" : string
 >"\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b" : "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b"
 
         "Watch": "SM-V700"
+>"Watch" : string
 >"SM-V700" : "SM-V700"
     }
 };
diff --git a/tests/baselines/reference/implicitIndexSignatures.symbols b/tests/baselines/reference/implicitIndexSignatures.symbols
index a014e7e942c..1c8f06acc11 100644
--- a/tests/baselines/reference/implicitIndexSignatures.symbols
+++ b/tests/baselines/reference/implicitIndexSignatures.symbols
@@ -137,10 +137,14 @@ function f4() {
 
     const o1 = { 0: "0", 1: "1", count: 2 };
 >o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 38, 9))
+>0 : Symbol(0, Decl(implicitIndexSignatures.ts, 38, 16))
+>1 : Symbol(1, Decl(implicitIndexSignatures.ts, 38, 24))
 >count : Symbol(count, Decl(implicitIndexSignatures.ts, 38, 32))
 
     let o2: { 0: string, 1: string, count: number };    
 >o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 39, 7))
+>0 : Symbol(0, Decl(implicitIndexSignatures.ts, 39, 13))
+>1 : Symbol(1, Decl(implicitIndexSignatures.ts, 39, 24))
 >count : Symbol(count, Decl(implicitIndexSignatures.ts, 39, 35))
 
     const v1 = getStringIndexValue(o1);
diff --git a/tests/baselines/reference/implicitIndexSignatures.types b/tests/baselines/reference/implicitIndexSignatures.types
index 0b68f136e2e..d9b7b57a16b 100644
--- a/tests/baselines/reference/implicitIndexSignatures.types
+++ b/tests/baselines/reference/implicitIndexSignatures.types
@@ -165,13 +165,17 @@ function f4() {
     const o1 = { 0: "0", 1: "1", count: 2 };
 >o1 : { 0: string; 1: string; count: number; }
 >{ 0: "0", 1: "1", count: 2 } : { 0: string; 1: string; count: number; }
+>0 : string
 >"0" : "0"
+>1 : string
 >"1" : "1"
 >count : number
 >2 : 2
 
     let o2: { 0: string, 1: string, count: number };    
 >o2 : { 0: string; 1: string; count: number; }
+>0 : string
+>1 : string
 >count : number
 
     const v1 = getStringIndexValue(o1);
diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.symbols b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.symbols
index bfa36e9c06e..fb1cbae851d 100644
--- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.symbols
+++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.symbols
@@ -3,6 +3,8 @@ import b = require("externalModule");
 >b : Symbol(b, Decl(importDeclRefereingExternalModuleWithNoResolve.ts, 0, 0))
 
 declare module "m1" {
+>"m1" : Symbol("m1", Decl(importDeclRefereingExternalModuleWithNoResolve.ts, 0, 37))
+
     import im2 = require("externalModule");
 >im2 : Symbol(im2, Decl(importDeclRefereingExternalModuleWithNoResolve.ts, 1, 21))
 }
diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.types b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.types
index 6bb4d6d1935..f8cfaf69731 100644
--- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.types
+++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.types
@@ -3,6 +3,8 @@ import b = require("externalModule");
 >b : any
 
 declare module "m1" {
+>"m1" : any
+
     import im2 = require("externalModule");
 >im2 : any
 }
diff --git a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.symbols b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.symbols
index 37a98cea81c..f30fb2ba1fd 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.symbols
+++ b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts ===
 declare module "m" {
+>"m" : Symbol("m", Decl(importDeclWithDeclareModifierInAmbientContext.ts, 0, 0))
+
     module x {
 >x : Symbol(x, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 0, 20))
 
diff --git a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
index 4e258a78989..1721f8cdfe3 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts ===
 declare module "m" {
+>"m" : typeof "m"
+
     module x {
 >x : any
 
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.symbols b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.symbols
index d7eb5fdc4d3..9b1923e4616 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.symbols
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts ===
 declare module "m" {
+>"m" : Symbol("m", Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 0, 0))
+
     module x {
 >x : Symbol(x, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 0, 20))
 
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
index 932619ea5f0..7ba42021954 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts ===
 declare module "m" {
+>"m" : typeof "m"
+
     module x {
 >x : any
 
diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols
index 892cbf7464e..95d49477493 100644
--- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols
+++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts ===
 declare module "m" {
+>"m" : Symbol("m", Decl(importDeclWithExportModifierInAmbientContext.ts, 0, 0))
+
     module x {
 >x : Symbol(x, Decl(importDeclWithExportModifierInAmbientContext.ts, 0, 20))
 
diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
index 617c133aeee..4818b04acb4 100644
--- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts ===
 declare module "m" {
+>"m" : typeof "m"
+
     module x {
 >x : any
 
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols
index c8de5db1707..413ed1dfd68 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols
@@ -15,6 +15,8 @@ var p = testData[0].name;
  
 === tests/cases/compiler/b.ts ===
 declare module "ITest" {
+>"ITest" : Symbol("ITest", Decl(b.ts, 0, 0))
+
     interface Name {
 >Name : Symbol(Name, Decl(b.ts, 0, 24))
 
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
index 0449bfd16bf..986c65ca0fe 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
@@ -17,6 +17,8 @@ var p = testData[0].name;
  
 === tests/cases/compiler/b.ts ===
 declare module "ITest" {
+>"ITest" : typeof "ITest"
+
     interface Name {
 >Name : Name
 
diff --git a/tests/baselines/reference/importsInAmbientModules1.symbols b/tests/baselines/reference/importsInAmbientModules1.symbols
index 4622747ecee..0d4813372fe 100644
--- a/tests/baselines/reference/importsInAmbientModules1.symbols
+++ b/tests/baselines/reference/importsInAmbientModules1.symbols
@@ -4,6 +4,8 @@ export var x: number
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
+>"M" : Symbol("M", Decl(main.ts, 0, 0))
+
     import {x} from "external"
 >x : Symbol(x, Decl(main.ts, 1, 12))
 }
diff --git a/tests/baselines/reference/importsInAmbientModules1.types b/tests/baselines/reference/importsInAmbientModules1.types
index 1d3aa843c9c..e0775f26ca5 100644
--- a/tests/baselines/reference/importsInAmbientModules1.types
+++ b/tests/baselines/reference/importsInAmbientModules1.types
@@ -4,6 +4,8 @@ export var x: number
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
+>"M" : typeof "M"
+
     import {x} from "external"
 >x : number
 }
diff --git a/tests/baselines/reference/importsInAmbientModules2.symbols b/tests/baselines/reference/importsInAmbientModules2.symbols
index 68d5bb210aa..c723261cbfe 100644
--- a/tests/baselines/reference/importsInAmbientModules2.symbols
+++ b/tests/baselines/reference/importsInAmbientModules2.symbols
@@ -4,6 +4,8 @@ export default class C {}
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
+>"M" : Symbol("M", Decl(main.ts, 0, 0))
+
     import C from "external"
 >C : Symbol(C, Decl(main.ts, 1, 10))
 }
diff --git a/tests/baselines/reference/importsInAmbientModules2.types b/tests/baselines/reference/importsInAmbientModules2.types
index 93dda11f672..344c7ed87f0 100644
--- a/tests/baselines/reference/importsInAmbientModules2.types
+++ b/tests/baselines/reference/importsInAmbientModules2.types
@@ -4,6 +4,8 @@ export default class C {}
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
+>"M" : typeof "M"
+
     import C from "external"
 >C : typeof C
 }
diff --git a/tests/baselines/reference/importsInAmbientModules3.symbols b/tests/baselines/reference/importsInAmbientModules3.symbols
index b75ba644a05..72c038539b7 100644
--- a/tests/baselines/reference/importsInAmbientModules3.symbols
+++ b/tests/baselines/reference/importsInAmbientModules3.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/main.ts ===
 declare module "M" {
+>"M" : Symbol("M", Decl(main.ts, 0, 0))
+
     import C = require("external");
 >C : Symbol(C, Decl(main.ts, 0, 20))
 }
diff --git a/tests/baselines/reference/importsInAmbientModules3.types b/tests/baselines/reference/importsInAmbientModules3.types
index a9b19b19fbc..cecc08cf09b 100644
--- a/tests/baselines/reference/importsInAmbientModules3.types
+++ b/tests/baselines/reference/importsInAmbientModules3.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/main.ts ===
 declare module "M" {
+>"M" : typeof "M"
+
     import C = require("external");
 >C : typeof C
 }
diff --git a/tests/baselines/reference/inOperatorWithFunction.symbols b/tests/baselines/reference/inOperatorWithFunction.symbols
index 1e915ba107d..cc1cfe4daf0 100644
--- a/tests/baselines/reference/inOperatorWithFunction.symbols
+++ b/tests/baselines/reference/inOperatorWithFunction.symbols
@@ -6,4 +6,5 @@ var fn = function (val: boolean) { return val; }
 
 fn("a" in { "a": true });
 >fn : Symbol(fn, Decl(inOperatorWithFunction.ts, 0, 3))
+>"a" : Symbol("a", Decl(inOperatorWithFunction.ts, 1, 11))
 
diff --git a/tests/baselines/reference/inOperatorWithFunction.types b/tests/baselines/reference/inOperatorWithFunction.types
index 21e9da3f040..353a7165d7a 100644
--- a/tests/baselines/reference/inOperatorWithFunction.types
+++ b/tests/baselines/reference/inOperatorWithFunction.types
@@ -11,5 +11,6 @@ fn("a" in { "a": true });
 >"a" in { "a": true } : boolean
 >"a" : "a"
 >{ "a": true } : { "a": boolean; }
+>"a" : boolean
 >true : true
 
diff --git a/tests/baselines/reference/incompatibleExports1.symbols b/tests/baselines/reference/incompatibleExports1.symbols
index bc69907d298..134ed0cd135 100644
--- a/tests/baselines/reference/incompatibleExports1.symbols
+++ b/tests/baselines/reference/incompatibleExports1.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/incompatibleExports1.ts ===
 declare module "foo" { 
+>"foo" : Symbol("foo", Decl(incompatibleExports1.ts, 0, 0))
+
     export interface x { a: string } 
 >x : Symbol(x, Decl(incompatibleExports1.ts, 0, 22))
 >a : Symbol(x.a, Decl(incompatibleExports1.ts, 1, 24))
@@ -14,6 +16,8 @@ declare module "foo" {
 }
  
 declare module "baz" {
+>"baz" : Symbol("baz", Decl(incompatibleExports1.ts, 4, 1))
+
     export module a {
 >a : Symbol(a, Decl(incompatibleExports1.ts, 6, 22))
 
diff --git a/tests/baselines/reference/incompatibleExports1.types b/tests/baselines/reference/incompatibleExports1.types
index 820a5701827..3d3acd936d6 100644
--- a/tests/baselines/reference/incompatibleExports1.types
+++ b/tests/baselines/reference/incompatibleExports1.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/incompatibleExports1.ts ===
 declare module "foo" { 
+>"foo" : typeof "foo"
+
     export interface x { a: string } 
 >x : x
 >a : string
@@ -14,6 +16,8 @@ declare module "foo" {
 }
  
 declare module "baz" {
+>"baz" : typeof "baz"
+
     export module a {
 >a : typeof a
 
diff --git a/tests/baselines/reference/incompatibleExports2.symbols b/tests/baselines/reference/incompatibleExports2.symbols
index bedba8db191..2defea47b83 100644
--- a/tests/baselines/reference/incompatibleExports2.symbols
+++ b/tests/baselines/reference/incompatibleExports2.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/incompatibleExports2.ts ===
 declare module "foo" { 
+>"foo" : Symbol("foo", Decl(incompatibleExports2.ts, 0, 0))
+
     export interface x { a: string } 
 >x : Symbol(x, Decl(incompatibleExports2.ts, 0, 22))
 >a : Symbol(x.a, Decl(incompatibleExports2.ts, 1, 24))
diff --git a/tests/baselines/reference/incompatibleExports2.types b/tests/baselines/reference/incompatibleExports2.types
index 3e34a0af2f9..554f6ce2583 100644
--- a/tests/baselines/reference/incompatibleExports2.types
+++ b/tests/baselines/reference/incompatibleExports2.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/incompatibleExports2.ts ===
 declare module "foo" { 
+>"foo" : typeof "foo"
+
     export interface x { a: string } 
 >x : x
 >a : string
diff --git a/tests/baselines/reference/incrementOperatorWithEnumType.symbols b/tests/baselines/reference/incrementOperatorWithEnumType.symbols
index 4844c78f99e..127d7e4b3ef 100644
--- a/tests/baselines/reference/incrementOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/incrementOperatorWithEnumType.symbols
@@ -5,6 +5,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(incrementOperatorWithEnumType.ts, 0, 0))
 >A : Symbol(ENUM1.A, Decl(incrementOperatorWithEnumType.ts, 2, 12))
 >B : Symbol(ENUM1.B, Decl(incrementOperatorWithEnumType.ts, 2, 15))
+>"" : Symbol(ENUM1[""], Decl(incrementOperatorWithEnumType.ts, 2, 18))
 
 // expression
 var ResultIsNumber1 = ++ENUM1["B"];
diff --git a/tests/baselines/reference/incrementOperatorWithEnumType.types b/tests/baselines/reference/incrementOperatorWithEnumType.types
index 1d87221eba8..ddf30aaf12e 100644
--- a/tests/baselines/reference/incrementOperatorWithEnumType.types
+++ b/tests/baselines/reference/incrementOperatorWithEnumType.types
@@ -5,6 +5,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // expression
 var ResultIsNumber1 = ++ENUM1["B"];
diff --git a/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.symbols b/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.symbols
index fd09d8738ff..d11a18de3f4 100644
--- a/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.symbols
+++ b/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.symbols
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(incrementOperatorWithEnumTypeInvalidOperations.ts, 2, 14))
 >A : Symbol(ENUM1.A, Decl(incrementOperatorWithEnumTypeInvalidOperations.ts, 3, 12))
 >B : Symbol(ENUM1.B, Decl(incrementOperatorWithEnumTypeInvalidOperations.ts, 3, 15))
+>"" : Symbol(ENUM1[""], Decl(incrementOperatorWithEnumTypeInvalidOperations.ts, 3, 18))
 
 // enum type var
 var ResultIsNumber1 = ++ENUM;
diff --git a/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.types b/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.types
index 15b162bacfe..020d77a18b5 100644
--- a/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.types
+++ b/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.types
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // enum type var
 var ResultIsNumber1 = ++ENUM;
diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.symbols b/tests/baselines/reference/indexSignaturesInferentialTyping.symbols
index 754fe0390a4..dcb329f74ca 100644
--- a/tests/baselines/reference/indexSignaturesInferentialTyping.symbols
+++ b/tests/baselines/reference/indexSignaturesInferentialTyping.symbols
@@ -20,10 +20,14 @@ function bar<T>(items: { [index: string]: T }): T { return undefined; }
 var x1 = foo({ 0: 0, 1: 1 });       // type should be number
 >x1 : Symbol(x1, Decl(indexSignaturesInferentialTyping.ts, 3, 3))
 >foo : Symbol(foo, Decl(indexSignaturesInferentialTyping.ts, 0, 0))
+>0 : Symbol(0, Decl(indexSignaturesInferentialTyping.ts, 3, 14))
+>1 : Symbol(1, Decl(indexSignaturesInferentialTyping.ts, 3, 20))
 
 var x2 = bar({ 0: 0, 1: 1 });
 >x2 : Symbol(x2, Decl(indexSignaturesInferentialTyping.ts, 4, 3))
 >bar : Symbol(bar, Decl(indexSignaturesInferentialTyping.ts, 0, 71))
+>0 : Symbol(0, Decl(indexSignaturesInferentialTyping.ts, 4, 14))
+>1 : Symbol(1, Decl(indexSignaturesInferentialTyping.ts, 4, 20))
 
 var x3 = bar({ zero: 0, one: 1 });  // type should be number
 >x3 : Symbol(x3, Decl(indexSignaturesInferentialTyping.ts, 5, 3))
diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.types b/tests/baselines/reference/indexSignaturesInferentialTyping.types
index 202e1489818..594dab7c3e6 100644
--- a/tests/baselines/reference/indexSignaturesInferentialTyping.types
+++ b/tests/baselines/reference/indexSignaturesInferentialTyping.types
@@ -22,7 +22,9 @@ var x1 = foo({ 0: 0, 1: 1 });       // type should be number
 >foo({ 0: 0, 1: 1 }) : number
 >foo : <T>(items: { [index: number]: T; }) => T
 >{ 0: 0, 1: 1 } : { 0: number; 1: number; }
+>0 : number
 >0 : 0
+>1 : number
 >1 : 1
 
 var x2 = bar({ 0: 0, 1: 1 });
@@ -30,7 +32,9 @@ var x2 = bar({ 0: 0, 1: 1 });
 >bar({ 0: 0, 1: 1 }) : number
 >bar : <T>(items: { [index: string]: T; }) => T
 >{ 0: 0, 1: 1 } : { 0: number; 1: number; }
+>0 : number
 >0 : 0
+>1 : number
 >1 : 1
 
 var x3 = bar({ zero: 0, one: 1 });  // type should be number
diff --git a/tests/baselines/reference/indexer.symbols b/tests/baselines/reference/indexer.symbols
index a713beadccd..7dc0545d3a1 100644
--- a/tests/baselines/reference/indexer.symbols
+++ b/tests/baselines/reference/indexer.symbols
@@ -17,7 +17,9 @@ interface JQuery {
 var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >jq : Symbol(jq, Decl(indexer.ts, 8, 3))
 >JQuery : Symbol(JQuery, Decl(indexer.ts, 2, 1))
+>0 : Symbol(0, Decl(indexer.ts, 8, 15))
 >id : Symbol(id, Decl(indexer.ts, 8, 20))
+>1 : Symbol(1, Decl(indexer.ts, 8, 32))
 >id : Symbol(id, Decl(indexer.ts, 8, 37))
 
 jq[0].id;
diff --git a/tests/baselines/reference/indexer.types b/tests/baselines/reference/indexer.types
index 6f648d8d232..b7576baefa0 100644
--- a/tests/baselines/reference/indexer.types
+++ b/tests/baselines/reference/indexer.types
@@ -18,9 +18,11 @@ var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >jq : JQuery
 >JQuery : JQuery
 >{ 0: { id : "a" }, 1: { id : "b" } } : { 0: { id: string; }; 1: { id: string; }; }
+>0 : { id: string; }
 >{ id : "a" } : { id: string; }
 >id : string
 >"a" : "a"
+>1 : { id: string; }
 >{ id : "b" } : { id: string; }
 >id : string
 >"b" : "b"
diff --git a/tests/baselines/reference/indexerA.symbols b/tests/baselines/reference/indexerA.symbols
index b254618673a..3911906ec34 100644
--- a/tests/baselines/reference/indexerA.symbols
+++ b/tests/baselines/reference/indexerA.symbols
@@ -17,7 +17,9 @@ class JQuery {
 var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >jq : Symbol(jq, Decl(indexerA.ts, 8, 3))
 >JQuery : Symbol(JQuery, Decl(indexerA.ts, 2, 1))
+>0 : Symbol(0, Decl(indexerA.ts, 8, 15))
 >id : Symbol(id, Decl(indexerA.ts, 8, 20))
+>1 : Symbol(1, Decl(indexerA.ts, 8, 32))
 >id : Symbol(id, Decl(indexerA.ts, 8, 37))
 
 jq[0].id;
diff --git a/tests/baselines/reference/indexerA.types b/tests/baselines/reference/indexerA.types
index e0eadbc06b4..ec252833152 100644
--- a/tests/baselines/reference/indexerA.types
+++ b/tests/baselines/reference/indexerA.types
@@ -18,9 +18,11 @@ var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >jq : JQuery
 >JQuery : JQuery
 >{ 0: { id : "a" }, 1: { id : "b" } } : { 0: { id: string; }; 1: { id: string; }; }
+>0 : { id: string; }
 >{ id : "a" } : { id: string; }
 >id : string
 >"a" : "a"
+>1 : { id: string; }
 >{ id : "b" } : { id: string; }
 >id : string
 >"b" : "b"
diff --git a/tests/baselines/reference/indexersInClassType.symbols b/tests/baselines/reference/indexersInClassType.symbols
index c57c7cf7522..ac03f6f2dcf 100644
--- a/tests/baselines/reference/indexersInClassType.symbols
+++ b/tests/baselines/reference/indexersInClassType.symbols
@@ -11,9 +11,11 @@ class C {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     1: Date;
+>1 : Symbol(C[1], Decl(indexersInClassType.ts, 2, 24))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     'a': {}
+>'a' : Symbol(C['a'], Decl(indexersInClassType.ts, 3, 12))
 
     fn() {
 >fn : Symbol(C.fn, Decl(indexersInClassType.ts, 4, 11))
diff --git a/tests/baselines/reference/indexersInClassType.types b/tests/baselines/reference/indexersInClassType.types
index 02316d810b9..0898d070382 100644
--- a/tests/baselines/reference/indexersInClassType.types
+++ b/tests/baselines/reference/indexersInClassType.types
@@ -11,9 +11,11 @@ class C {
 >Object : Object
 
     1: Date;
+>1 : Date
 >Date : Date
 
     'a': {}
+>'a' : {}
 
     fn() {
 >fn : () => this
diff --git a/tests/baselines/reference/inferringAnyFunctionType1.symbols b/tests/baselines/reference/inferringAnyFunctionType1.symbols
index 6a43952d770..e8710a132be 100644
--- a/tests/baselines/reference/inferringAnyFunctionType1.symbols
+++ b/tests/baselines/reference/inferringAnyFunctionType1.symbols
@@ -2,6 +2,7 @@
 function f<T extends { "0": (p1: number) => number }>(p: T): T {
 >f : Symbol(f, Decl(inferringAnyFunctionType1.ts, 0, 0))
 >T : Symbol(T, Decl(inferringAnyFunctionType1.ts, 0, 11))
+>"0" : Symbol("0", Decl(inferringAnyFunctionType1.ts, 0, 22))
 >p1 : Symbol(p1, Decl(inferringAnyFunctionType1.ts, 0, 29))
 >p : Symbol(p, Decl(inferringAnyFunctionType1.ts, 0, 54))
 >T : Symbol(T, Decl(inferringAnyFunctionType1.ts, 0, 11))
diff --git a/tests/baselines/reference/inferringAnyFunctionType1.types b/tests/baselines/reference/inferringAnyFunctionType1.types
index 16402cc3ced..a898685db2d 100644
--- a/tests/baselines/reference/inferringAnyFunctionType1.types
+++ b/tests/baselines/reference/inferringAnyFunctionType1.types
@@ -2,6 +2,7 @@
 function f<T extends { "0": (p1: number) => number }>(p: T): T {
 >f : <T extends { "0": (p1: number) => number; }>(p: T) => T
 >T : T
+>"0" : (p1: number) => number
 >p1 : number
 >p : T
 >T : T
diff --git a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.symbols b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.symbols
index f0fcc70e63f..31c503cc73f 100644
--- a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.symbols
+++ b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.symbols
@@ -42,6 +42,7 @@ interface E {
 >E : Symbol(E, Decl(inheritedMembersAndIndexSignaturesFromDifferentBases.ts, 16, 31))
 
     0: {};
+>0 : Symbol(E[0], Decl(inheritedMembersAndIndexSignaturesFromDifferentBases.ts, 18, 13))
 }
 
 interface F extends A, B, E { } // error because 0 is not a subtype of {a; b;}
diff --git a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.types b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.types
index 3844bb1afd3..f1c025a56e8 100644
--- a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.types
+++ b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.types
@@ -42,6 +42,7 @@ interface E {
 >E : E
 
     0: {};
+>0 : {}
 }
 
 interface F extends A, B, E { } // error because 0 is not a subtype of {a; b;}
diff --git a/tests/baselines/reference/initializersInDeclarations.symbols b/tests/baselines/reference/initializersInDeclarations.symbols
index 99c741362ea..0f3a325a79c 100644
--- a/tests/baselines/reference/initializersInDeclarations.symbols
+++ b/tests/baselines/reference/initializersInDeclarations.symbols
@@ -8,6 +8,8 @@ declare class Foo {
 >name : Symbol(Foo.name, Decl(file1.d.ts, 2, 19))
 
 	"some prop" = 42;
+>"some prop" : Symbol(Foo["some prop"], Decl(file1.d.ts, 3, 15))
+
 	fn(): boolean {
 >fn : Symbol(Foo.fn, Decl(file1.d.ts, 4, 18))
 
diff --git a/tests/baselines/reference/initializersInDeclarations.types b/tests/baselines/reference/initializersInDeclarations.types
index 3e062b0846a..7c26981e99e 100644
--- a/tests/baselines/reference/initializersInDeclarations.types
+++ b/tests/baselines/reference/initializersInDeclarations.types
@@ -9,6 +9,7 @@ declare class Foo {
 >"test" : "test"
 
 	"some prop" = 42;
+>"some prop" : number
 >42 : 42
 
 	fn(): boolean {
diff --git a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.symbols b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.symbols
index f8b7faeb04d..ade96a3c486 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.symbols
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.symbols
@@ -36,6 +36,7 @@ interface I3 extends T3 { length: string }
 interface I4 extends T4 { 0: number }
 >I4 : Symbol(I4, Decl(interfaceExtendsObjectIntersectionErrors.ts, 8, 42))
 >T4 : Symbol(T4, Decl(interfaceExtendsObjectIntersectionErrors.ts, 2, 19))
+>0 : Symbol(I4[0], Decl(interfaceExtendsObjectIntersectionErrors.ts, 9, 25))
 
 interface I5 extends T5 { c: number }
 >I5 : Symbol(I5, Decl(interfaceExtendsObjectIntersectionErrors.ts, 9, 37))
@@ -75,6 +76,7 @@ class C4 extends Constructor<T4>() { 0: number }
 >C4 : Symbol(C4, Decl(interfaceExtendsObjectIntersectionErrors.ts, 17, 53))
 >Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
 >T4 : Symbol(T4, Decl(interfaceExtendsObjectIntersectionErrors.ts, 2, 19))
+>0 : Symbol(C4[0], Decl(interfaceExtendsObjectIntersectionErrors.ts, 18, 36))
 
 class C5 extends Constructor<T5>() { c: number }
 >C5 : Symbol(C5, Decl(interfaceExtendsObjectIntersectionErrors.ts, 18, 48))
diff --git a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.types b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.types
index 13ea6b59132..7c65bdda170 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.types
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.types
@@ -36,6 +36,7 @@ interface I3 extends T3 { length: string }
 interface I4 extends T4 { 0: number }
 >I4 : I4
 >T4 : [string, number]
+>0 : number
 
 interface I5 extends T5 { c: number }
 >I5 : I5
@@ -79,6 +80,7 @@ class C4 extends Constructor<T4>() { 0: number }
 >Constructor<T4>() : [string, number]
 >Constructor : <T>() => Constructor<T>
 >T4 : [string, number]
+>0 : number
 
 class C5 extends Constructor<T5>() { c: number }
 >C5 : C5
diff --git a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.symbols b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.symbols
index c96b461d47f..4e9a07a98fe 100644
--- a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.symbols
+++ b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.symbols
@@ -36,6 +36,8 @@ interface Derived extends Base {
     }
     // error
     1: {
+>1 : Symbol(Derived[1], Decl(interfaceWithStringIndexerHidingBaseTypeIndexer2.ts, 14, 5))
+
         a: number;
 >a : Symbol(a, Decl(interfaceWithStringIndexerHidingBaseTypeIndexer2.ts, 16, 8))
     }
diff --git a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.types b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.types
index d4caea52e85..cbebb9ad3f5 100644
--- a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.types
+++ b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.types
@@ -36,6 +36,8 @@ interface Derived extends Base {
     }
     // error
     1: {
+>1 : { a: number; }
+
         a: number;
 >a : number
     }
diff --git a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.symbols b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.symbols
index 15b16d200bc..24d99b0de6b 100644
--- a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.symbols
+++ b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.symbols
@@ -7,6 +7,8 @@ interface Base {
 >a : Symbol(a, Decl(interfaceWithStringIndexerHidingBaseTypeIndexer3.ts, 1, 18))
 
     1: {
+>1 : Symbol(Base[1], Decl(interfaceWithStringIndexerHidingBaseTypeIndexer3.ts, 1, 30))
+
         a: number; b: number;
 >a : Symbol(a, Decl(interfaceWithStringIndexerHidingBaseTypeIndexer3.ts, 2, 8))
 >b : Symbol(b, Decl(interfaceWithStringIndexerHidingBaseTypeIndexer3.ts, 3, 18))
@@ -27,6 +29,8 @@ interface Derived extends Base {
     };
     // error
     2: {
+>2 : Symbol(Derived[2], Decl(interfaceWithStringIndexerHidingBaseTypeIndexer3.ts, 10, 6))
+
         a: number;
 >a : Symbol(a, Decl(interfaceWithStringIndexerHidingBaseTypeIndexer3.ts, 12, 8))
     }
diff --git a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.types b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.types
index 5122bed91e9..b6248892dcd 100644
--- a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.types
+++ b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.types
@@ -7,6 +7,8 @@ interface Base {
 >a : number
 
     1: {
+>1 : { a: number; b: number; }
+
         a: number; b: number;
 >a : number
 >b : number
@@ -27,6 +29,8 @@ interface Derived extends Base {
     };
     // error
     2: {
+>2 : { a: number; }
+
         a: number;
 >a : number
     }
diff --git a/tests/baselines/reference/invalidNumberAssignments.symbols b/tests/baselines/reference/invalidNumberAssignments.symbols
index 3ebdf8d47f3..757aeb1aaa0 100644
--- a/tests/baselines/reference/invalidNumberAssignments.symbols
+++ b/tests/baselines/reference/invalidNumberAssignments.symbols
@@ -43,6 +43,7 @@ var g: { baz: string } = 1;
 
 var g2: { 0: number } = 1;
 >g2 : Symbol(g2, Decl(invalidNumberAssignments.ts, 14, 3))
+>0 : Symbol(0, Decl(invalidNumberAssignments.ts, 14, 9))
 
 module M { export var x = 1; }
 >M : Symbol(M, Decl(invalidNumberAssignments.ts, 14, 26))
diff --git a/tests/baselines/reference/invalidNumberAssignments.types b/tests/baselines/reference/invalidNumberAssignments.types
index be4d9b02f37..bca147eca0f 100644
--- a/tests/baselines/reference/invalidNumberAssignments.types
+++ b/tests/baselines/reference/invalidNumberAssignments.types
@@ -45,6 +45,7 @@ var g: { baz: string } = 1;
 
 var g2: { 0: number } = 1;
 >g2 : { 0: number; }
+>0 : number
 >1 : 1
 
 module M { export var x = 1; }
diff --git a/tests/baselines/reference/invalidStringAssignments.symbols b/tests/baselines/reference/invalidStringAssignments.symbols
index 66e7f35e218..a5ff1cda543 100644
--- a/tests/baselines/reference/invalidStringAssignments.symbols
+++ b/tests/baselines/reference/invalidStringAssignments.symbols
@@ -43,6 +43,7 @@ var g: { baz: string } = 1;
 
 var g2: { 0: number } = 1;
 >g2 : Symbol(g2, Decl(invalidStringAssignments.ts, 14, 3))
+>0 : Symbol(0, Decl(invalidStringAssignments.ts, 14, 9))
 
 module M { export var x = 1; }
 >M : Symbol(M, Decl(invalidStringAssignments.ts, 14, 26))
diff --git a/tests/baselines/reference/invalidStringAssignments.types b/tests/baselines/reference/invalidStringAssignments.types
index 32c8a42a62a..361f367e77e 100644
--- a/tests/baselines/reference/invalidStringAssignments.types
+++ b/tests/baselines/reference/invalidStringAssignments.types
@@ -45,6 +45,7 @@ var g: { baz: string } = 1;
 
 var g2: { 0: number } = 1;
 >g2 : { 0: number; }
+>0 : number
 >1 : 1
 
 module M { export var x = 1; }
diff --git a/tests/baselines/reference/invalidVoidAssignments.symbols b/tests/baselines/reference/invalidVoidAssignments.symbols
index e416b5b199d..f9e60cd7c2e 100644
--- a/tests/baselines/reference/invalidVoidAssignments.symbols
+++ b/tests/baselines/reference/invalidVoidAssignments.symbols
@@ -43,6 +43,7 @@ var g: { baz: string } = 1;
 
 var g2: { 0: number } = 1;
 >g2 : Symbol(g2, Decl(invalidVoidAssignments.ts, 14, 3))
+>0 : Symbol(0, Decl(invalidVoidAssignments.ts, 14, 9))
 
 module M { export var x = 1; }
 >M : Symbol(M, Decl(invalidVoidAssignments.ts, 14, 26))
diff --git a/tests/baselines/reference/invalidVoidAssignments.types b/tests/baselines/reference/invalidVoidAssignments.types
index d5dfd424830..3009ff1fdde 100644
--- a/tests/baselines/reference/invalidVoidAssignments.types
+++ b/tests/baselines/reference/invalidVoidAssignments.types
@@ -44,6 +44,7 @@ var g: { baz: string } = 1;
 
 var g2: { 0: number } = 1;
 >g2 : { 0: number; }
+>0 : number
 >1 : 1
 
 module M { export var x = 1; }
diff --git a/tests/baselines/reference/iterableArrayPattern21.symbols b/tests/baselines/reference/iterableArrayPattern21.symbols
index 70c366ae6fe..4680086de04 100644
--- a/tests/baselines/reference/iterableArrayPattern21.symbols
+++ b/tests/baselines/reference/iterableArrayPattern21.symbols
@@ -2,4 +2,6 @@
 var [a, b] = { 0: "", 1: true };
 >a : Symbol(a, Decl(iterableArrayPattern21.ts, 0, 5))
 >b : Symbol(b, Decl(iterableArrayPattern21.ts, 0, 7))
+>0 : Symbol(0, Decl(iterableArrayPattern21.ts, 0, 14))
+>1 : Symbol(1, Decl(iterableArrayPattern21.ts, 0, 21))
 
diff --git a/tests/baselines/reference/iterableArrayPattern21.types b/tests/baselines/reference/iterableArrayPattern21.types
index 9d7bdd2126b..aefaec14194 100644
--- a/tests/baselines/reference/iterableArrayPattern21.types
+++ b/tests/baselines/reference/iterableArrayPattern21.types
@@ -3,6 +3,8 @@ var [a, b] = { 0: "", 1: true };
 >a : string
 >b : boolean
 >{ 0: "", 1: true } : { 0: string; 1: boolean; }
+>0 : string
 >"" : ""
+>1 : boolean
 >true : true
 
diff --git a/tests/baselines/reference/iterableArrayPattern22.symbols b/tests/baselines/reference/iterableArrayPattern22.symbols
index 2994fc76697..02abc9b922e 100644
--- a/tests/baselines/reference/iterableArrayPattern22.symbols
+++ b/tests/baselines/reference/iterableArrayPattern22.symbols
@@ -1,4 +1,6 @@
 === tests/cases/conformance/es6/destructuring/iterableArrayPattern22.ts ===
 var [...a] = { 0: "", 1: true };
 >a : Symbol(a, Decl(iterableArrayPattern22.ts, 0, 5))
+>0 : Symbol(0, Decl(iterableArrayPattern22.ts, 0, 14))
+>1 : Symbol(1, Decl(iterableArrayPattern22.ts, 0, 21))
 
diff --git a/tests/baselines/reference/iterableArrayPattern22.types b/tests/baselines/reference/iterableArrayPattern22.types
index 58081fb4ef2..a81dc781736 100644
--- a/tests/baselines/reference/iterableArrayPattern22.types
+++ b/tests/baselines/reference/iterableArrayPattern22.types
@@ -2,6 +2,8 @@
 var [...a] = { 0: "", 1: true };
 >a : any[]
 >{ 0: "", 1: true } : { 0: string; 1: boolean; }
+>0 : string
 >"" : ""
+>1 : boolean
 >true : true
 
diff --git a/tests/baselines/reference/iterableArrayPattern23.symbols b/tests/baselines/reference/iterableArrayPattern23.symbols
index 31b048d0820..97dfcd74d91 100644
--- a/tests/baselines/reference/iterableArrayPattern23.symbols
+++ b/tests/baselines/reference/iterableArrayPattern23.symbols
@@ -6,4 +6,6 @@ var a: string, b: boolean;
 [a, b] = { 0: "", 1: true };
 >a : Symbol(a, Decl(iterableArrayPattern23.ts, 0, 3))
 >b : Symbol(b, Decl(iterableArrayPattern23.ts, 0, 14))
+>0 : Symbol(0, Decl(iterableArrayPattern23.ts, 1, 10))
+>1 : Symbol(1, Decl(iterableArrayPattern23.ts, 1, 17))
 
diff --git a/tests/baselines/reference/iterableArrayPattern23.types b/tests/baselines/reference/iterableArrayPattern23.types
index 83345816b91..05136b404a1 100644
--- a/tests/baselines/reference/iterableArrayPattern23.types
+++ b/tests/baselines/reference/iterableArrayPattern23.types
@@ -9,6 +9,8 @@ var a: string, b: boolean;
 >a : string
 >b : boolean
 >{ 0: "", 1: true } : { 0: string; 1: true; }
+>0 : string
 >"" : ""
+>1 : true
 >true : true
 
diff --git a/tests/baselines/reference/iterableArrayPattern24.symbols b/tests/baselines/reference/iterableArrayPattern24.symbols
index 36e48d900d0..cec2c709d27 100644
--- a/tests/baselines/reference/iterableArrayPattern24.symbols
+++ b/tests/baselines/reference/iterableArrayPattern24.symbols
@@ -6,4 +6,6 @@ var a: string, b: boolean[];
 [a, ...b] = { 0: "", 1: true };
 >a : Symbol(a, Decl(iterableArrayPattern24.ts, 0, 3))
 >b : Symbol(b, Decl(iterableArrayPattern24.ts, 0, 14))
+>0 : Symbol(0, Decl(iterableArrayPattern24.ts, 1, 13))
+>1 : Symbol(1, Decl(iterableArrayPattern24.ts, 1, 20))
 
diff --git a/tests/baselines/reference/iterableArrayPattern24.types b/tests/baselines/reference/iterableArrayPattern24.types
index 3d8824ba98e..ebcc055836e 100644
--- a/tests/baselines/reference/iterableArrayPattern24.types
+++ b/tests/baselines/reference/iterableArrayPattern24.types
@@ -10,6 +10,8 @@ var a: string, b: boolean[];
 >...b : boolean
 >b : boolean[]
 >{ 0: "", 1: true } : { 0: string; 1: true; }
+>0 : string
 >"" : ""
+>1 : true
 >true : true
 
diff --git a/tests/baselines/reference/jsxImportInAttribute.symbols b/tests/baselines/reference/jsxImportInAttribute.symbols
index 44c746c7de6..8f35f213f03 100644
--- a/tests/baselines/reference/jsxImportInAttribute.symbols
+++ b/tests/baselines/reference/jsxImportInAttribute.symbols
@@ -14,6 +14,8 @@ let x = Test; // emit test_1.default
 
 === tests/cases/compiler/component.d.ts ===
 declare module "Test" {
+>"Test" : Symbol("Test", Decl(component.d.ts, 0, 0))
+
 	export default class Text { }
 >Text : Symbol(Text, Decl(component.d.ts, 0, 23))
 }
diff --git a/tests/baselines/reference/jsxImportInAttribute.types b/tests/baselines/reference/jsxImportInAttribute.types
index 0c24f0156ba..1b774110e6d 100644
--- a/tests/baselines/reference/jsxImportInAttribute.types
+++ b/tests/baselines/reference/jsxImportInAttribute.types
@@ -15,6 +15,8 @@ let x = Test; // emit test_1.default
 
 === tests/cases/compiler/component.d.ts ===
 declare module "Test" {
+>"Test" : typeof "Test"
+
 	export default class Text { }
 >Text : Text
 }
diff --git a/tests/baselines/reference/jsxViaImport.2.symbols b/tests/baselines/reference/jsxViaImport.2.symbols
index 40c38b9e4d5..44af83f9ca0 100644
--- a/tests/baselines/reference/jsxViaImport.2.symbols
+++ b/tests/baselines/reference/jsxViaImport.2.symbols
@@ -34,6 +34,8 @@ declare module React {
 >U : Symbol(U, Decl(component.d.ts, 4, 20))
 }
 declare module "BaseComponent" {
+>"BaseComponent" : Symbol("BaseComponent", Decl(component.d.ts, 5, 1))
+
     export default class extends React.Component<any, {}> {
 >React.Component : Symbol(React.Component, Decl(component.d.ts, 3, 22))
 >React : Symbol(React, Decl(component.d.ts, 2, 1))
diff --git a/tests/baselines/reference/jsxViaImport.2.types b/tests/baselines/reference/jsxViaImport.2.types
index 396c4d381a0..2d2e3bb32bc 100644
--- a/tests/baselines/reference/jsxViaImport.2.types
+++ b/tests/baselines/reference/jsxViaImport.2.types
@@ -35,6 +35,8 @@ declare module React {
 >U : U
 }
 declare module "BaseComponent" {
+>"BaseComponent" : typeof "BaseComponent"
+
     export default class extends React.Component<any, {}> {
 >React.Component : React.Component<any, {}>
 >React : typeof React
diff --git a/tests/baselines/reference/jsxViaImport.symbols b/tests/baselines/reference/jsxViaImport.symbols
index fd55a97e743..dfc56430a72 100644
--- a/tests/baselines/reference/jsxViaImport.symbols
+++ b/tests/baselines/reference/jsxViaImport.symbols
@@ -34,6 +34,8 @@ declare module React {
 >U : Symbol(U, Decl(component.d.ts, 4, 20))
 }
 declare module "BaseComponent" {
+>"BaseComponent" : Symbol("BaseComponent", Decl(component.d.ts, 5, 1))
+
     var base: React.Component<any, {}>;
 >base : Symbol(base, Decl(component.d.ts, 7, 7))
 >React : Symbol(React, Decl(component.d.ts, 2, 1))
diff --git a/tests/baselines/reference/jsxViaImport.types b/tests/baselines/reference/jsxViaImport.types
index 8e01c29d887..17f594536c0 100644
--- a/tests/baselines/reference/jsxViaImport.types
+++ b/tests/baselines/reference/jsxViaImport.types
@@ -35,6 +35,8 @@ declare module React {
 >U : U
 }
 declare module "BaseComponent" {
+>"BaseComponent" : typeof "BaseComponent"
+
     var base: React.Component<any, {}>;
 >base : React.Component<any, {}>
 >React : any
diff --git a/tests/baselines/reference/limitDeepInstantiations.symbols b/tests/baselines/reference/limitDeepInstantiations.symbols
index 356540d2cf2..f254cb9ee74 100644
--- a/tests/baselines/reference/limitDeepInstantiations.symbols
+++ b/tests/baselines/reference/limitDeepInstantiations.symbols
@@ -5,6 +5,7 @@ type Foo<T extends "true", B> = { "true": Foo<T, Foo<T, B>> }[T];
 >Foo : Symbol(Foo, Decl(limitDeepInstantiations.ts, 0, 0))
 >T : Symbol(T, Decl(limitDeepInstantiations.ts, 2, 9))
 >B : Symbol(B, Decl(limitDeepInstantiations.ts, 2, 26))
+>"true" : Symbol("true", Decl(limitDeepInstantiations.ts, 2, 33))
 >Foo : Symbol(Foo, Decl(limitDeepInstantiations.ts, 0, 0))
 >T : Symbol(T, Decl(limitDeepInstantiations.ts, 2, 9))
 >Foo : Symbol(Foo, Decl(limitDeepInstantiations.ts, 0, 0))
diff --git a/tests/baselines/reference/limitDeepInstantiations.types b/tests/baselines/reference/limitDeepInstantiations.types
index bd24b372f3a..65245a20e50 100644
--- a/tests/baselines/reference/limitDeepInstantiations.types
+++ b/tests/baselines/reference/limitDeepInstantiations.types
@@ -5,6 +5,7 @@ type Foo<T extends "true", B> = { "true": Foo<T, Foo<T, B>> }[T];
 >Foo : { "true": any[T]; }[T]
 >T : T
 >B : B
+>"true" : { "true": any[T]; }[T]
 >Foo : { "true": any[T]; }[T]
 >T : T
 >Foo : { "true": any[T]; }[T]
diff --git a/tests/baselines/reference/literalsInComputedProperties1.symbols b/tests/baselines/reference/literalsInComputedProperties1.symbols
index 501b969706a..6a384b6f70c 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.symbols
+++ b/tests/baselines/reference/literalsInComputedProperties1.symbols
@@ -3,10 +3,14 @@ let x = {
 >x : Symbol(x, Decl(literalsInComputedProperties1.ts, 0, 3))
 
     1:1,
+>1 : Symbol(1, Decl(literalsInComputedProperties1.ts, 0, 9))
+
     [2]:1,
 >2 : Symbol([2], Decl(literalsInComputedProperties1.ts, 1, 8))
 
     "3":1,
+>"3" : Symbol("3", Decl(literalsInComputedProperties1.ts, 2, 10))
+
     ["4"]:1
 >"4" : Symbol(["4"], Decl(literalsInComputedProperties1.ts, 3, 10))
 }
@@ -38,10 +42,14 @@ interface A {
 >A : Symbol(A, Decl(literalsInComputedProperties1.ts, 9, 21))
 
     1:number;
+>1 : Symbol(A[1], Decl(literalsInComputedProperties1.ts, 11, 13))
+
     [2]:number;
 >2 : Symbol(A[2], Decl(literalsInComputedProperties1.ts, 12, 13))
 
     "3":number;
+>"3" : Symbol(A["3"], Decl(literalsInComputedProperties1.ts, 13, 15))
+
     ["4"]:number;
 >"4" : Symbol(A["4"], Decl(literalsInComputedProperties1.ts, 14, 15))
 }
@@ -78,10 +86,14 @@ class C {
 >C : Symbol(C, Decl(literalsInComputedProperties1.ts, 22, 21))
 
     1:number;
+>1 : Symbol(C[1], Decl(literalsInComputedProperties1.ts, 24, 9))
+
     [2]:number;
 >2 : Symbol(C[2], Decl(literalsInComputedProperties1.ts, 25, 13))
 
     "3":number;
+>"3" : Symbol(C["3"], Decl(literalsInComputedProperties1.ts, 26, 15))
+
     ["4"]:number;
 >"4" : Symbol(C["4"], Decl(literalsInComputedProperties1.ts, 27, 15))
 }
@@ -118,14 +130,20 @@ enum X {
 >X : Symbol(X, Decl(literalsInComputedProperties1.ts, 35, 21))
 
     1 = 1,
+>1 : Symbol(X[1], Decl(literalsInComputedProperties1.ts, 37, 8))
+
     [2] = 2,
 >2 : Symbol(X[2], Decl(literalsInComputedProperties1.ts, 38, 10))
 
     "3" = 3,
+>"3" : Symbol(X["3"], Decl(literalsInComputedProperties1.ts, 39, 12))
+
     ["4"] = 4,
 >"4" : Symbol(X["4"], Decl(literalsInComputedProperties1.ts, 40, 12))
 
     "foo" = 5,
+>"foo" : Symbol(X["foo"], Decl(literalsInComputedProperties1.ts, 41, 14))
+
     ["bar"] = 6
 >"bar" : Symbol(X["bar"], Decl(literalsInComputedProperties1.ts, 42, 14))
 }
diff --git a/tests/baselines/reference/literalsInComputedProperties1.types b/tests/baselines/reference/literalsInComputedProperties1.types
index d258e71d6fc..aead4bc35fd 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.types
+++ b/tests/baselines/reference/literalsInComputedProperties1.types
@@ -4,6 +4,7 @@ let x = {
 >{    1:1,    [2]:1,    "3":1,    ["4"]:1} : { 1: number; [2]: number; "3": number; ["4"]: number; }
 
     1:1,
+>1 : number
 >1 : 1
 
     [2]:1,
@@ -11,6 +12,7 @@ let x = {
 >1 : 1
 
     "3":1,
+>"3" : number
 >1 : 1
 
     ["4"]:1
@@ -53,10 +55,14 @@ interface A {
 >A : A
 
     1:number;
+>1 : number
+
     [2]:number;
 >2 : 2
 
     "3":number;
+>"3" : number
+
     ["4"]:number;
 >"4" : "4"
 }
@@ -101,10 +107,14 @@ class C {
 >C : C
 
     1:number;
+>1 : number
+
     [2]:number;
 >2 : 2
 
     "3":number;
+>"3" : number
+
     ["4"]:number;
 >"4" : "4"
 }
@@ -149,6 +159,7 @@ enum X {
 >X : X
 
     1 = 1,
+>1 : X.1
 >1 : 1
 
     [2] = 2,
@@ -156,6 +167,7 @@ enum X {
 >2 : 2
 
     "3" = 3,
+>"3" : X.3
 >3 : 3
 
     ["4"] = 4,
@@ -163,6 +175,7 @@ enum X {
 >4 : 4
 
     "foo" = 5,
+>"foo" : X.foo
 >5 : 5
 
     ["bar"] = 6
diff --git a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.symbols b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.symbols
index 6b55c94eda1..1c251802a25 100644
--- a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.symbols
+++ b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.symbols
@@ -14,6 +14,8 @@ foo.y // ignored from shortid/index.js
 
 === /typings/index.d.ts ===
 declare module "shortid" {
+>"shortid" : Symbol("shortid", Decl(index.d.ts, 0, 0))
+
     export var x: number;
 >x : Symbol(x, Decl(index.d.ts, 1, 14))
 }
diff --git a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.types b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.types
index f4420651751..0dfbbb9877f 100644
--- a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.types
+++ b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.types
@@ -16,6 +16,8 @@ foo.y // ignored from shortid/index.js
 
 === /typings/index.d.ts ===
 declare module "shortid" {
+>"shortid" : typeof "shortid"
+
     export var x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/mergedDeclarations6.symbols b/tests/baselines/reference/mergedDeclarations6.symbols
index 7a10ff260a2..bfac9d27d9b 100644
--- a/tests/baselines/reference/mergedDeclarations6.symbols
+++ b/tests/baselines/reference/mergedDeclarations6.symbols
@@ -22,6 +22,8 @@ import {A} from './a';
 >A : Symbol(A, Decl(b.ts, 0, 8))
 
 declare module "./a" {
+>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 22))
+
     interface A { }
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 2, 22))
 }
diff --git a/tests/baselines/reference/mergedDeclarations6.types b/tests/baselines/reference/mergedDeclarations6.types
index d6c109f6597..89c0d0f4997 100644
--- a/tests/baselines/reference/mergedDeclarations6.types
+++ b/tests/baselines/reference/mergedDeclarations6.types
@@ -23,6 +23,8 @@ import {A} from './a';
 >A : typeof A
 
 declare module "./a" {
+>"./a" : typeof "tests/cases/compiler/a"
+
     interface A { }
 >A : A
 }
diff --git a/tests/baselines/reference/mergedDeclarations7.symbols b/tests/baselines/reference/mergedDeclarations7.symbols
index 8b4662fc6c1..dbc437d4f81 100644
--- a/tests/baselines/reference/mergedDeclarations7.symbols
+++ b/tests/baselines/reference/mergedDeclarations7.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/passport.d.ts ===
 declare module 'passport' {
+>'passport' : Symbol('passport', Decl(passport.d.ts, 0, 0))
+
     namespace passport {
 >passport : Symbol(passport, Decl(passport.d.ts, 0, 27), Decl(passport.d.ts, 11, 9))
 
diff --git a/tests/baselines/reference/mergedDeclarations7.types b/tests/baselines/reference/mergedDeclarations7.types
index 047894485ff..416b5e1221f 100644
--- a/tests/baselines/reference/mergedDeclarations7.types
+++ b/tests/baselines/reference/mergedDeclarations7.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/passport.d.ts ===
 declare module 'passport' {
+>'passport' : typeof 'passport'
+
     namespace passport {
 >passport : PassportStatic
 
diff --git a/tests/baselines/reference/mergedInterfacesWithIndexers2.symbols b/tests/baselines/reference/mergedInterfacesWithIndexers2.symbols
index 09b297e48da..312f6711b02 100644
--- a/tests/baselines/reference/mergedInterfacesWithIndexers2.symbols
+++ b/tests/baselines/reference/mergedInterfacesWithIndexers2.symbols
@@ -24,6 +24,7 @@ interface A2 {
 >x : Symbol(x, Decl(mergedInterfacesWithIndexers2.ts, 12, 5))
 
     'a': number; //error
+>'a' : Symbol(A2['a'], Decl(mergedInterfacesWithIndexers2.ts, 12, 24))
 }
 
 
@@ -35,6 +36,7 @@ interface A2 {
 >length : Symbol(length, Decl(mergedInterfacesWithIndexers2.ts, 18, 18))
 
     1: { length: number }; // error
+>1 : Symbol(A2[1], Decl(mergedInterfacesWithIndexers2.ts, 18, 36))
 >length : Symbol(length, Decl(mergedInterfacesWithIndexers2.ts, 19, 8))
 }
 
diff --git a/tests/baselines/reference/mergedInterfacesWithIndexers2.types b/tests/baselines/reference/mergedInterfacesWithIndexers2.types
index f6f37dea5fe..7a65c8ce757 100644
--- a/tests/baselines/reference/mergedInterfacesWithIndexers2.types
+++ b/tests/baselines/reference/mergedInterfacesWithIndexers2.types
@@ -24,6 +24,7 @@ interface A2 {
 >x : number
 
     'a': number; //error
+>'a' : number
 }
 
 
@@ -35,6 +36,7 @@ interface A2 {
 >length : number
 
     1: { length: number }; // error
+>1 : { length: number; }
 >length : number
 }
 
diff --git a/tests/baselines/reference/missingFunctionImplementation2.symbols b/tests/baselines/reference/missingFunctionImplementation2.symbols
index 6d63ddf46fe..b053a5b3256 100644
--- a/tests/baselines/reference/missingFunctionImplementation2.symbols
+++ b/tests/baselines/reference/missingFunctionImplementation2.symbols
@@ -1,6 +1,8 @@
 === tests/cases/compiler/missingFunctionImplementation2_a.ts ===
 export {};
 declare module "./missingFunctionImplementation2_b" {
+>"./missingFunctionImplementation2_b" : Symbol("tests/cases/compiler/missingFunctionImplementation2_b", Decl(missingFunctionImplementation2_b.ts, 0, 0), Decl(missingFunctionImplementation2_a.ts, 0, 10))
+
   export function f(a, b): void;
 >f : Symbol(f, Decl(missingFunctionImplementation2_b.ts, 0, 0), Decl(missingFunctionImplementation2_a.ts, 1, 53))
 >a : Symbol(a, Decl(missingFunctionImplementation2_a.ts, 2, 20))
diff --git a/tests/baselines/reference/missingFunctionImplementation2.types b/tests/baselines/reference/missingFunctionImplementation2.types
index 20daa1b304e..2eae6187560 100644
--- a/tests/baselines/reference/missingFunctionImplementation2.types
+++ b/tests/baselines/reference/missingFunctionImplementation2.types
@@ -1,6 +1,8 @@
 === tests/cases/compiler/missingFunctionImplementation2_a.ts ===
 export {};
 declare module "./missingFunctionImplementation2_b" {
+>"./missingFunctionImplementation2_b" : typeof "tests/cases/compiler/missingFunctionImplementation2_b"
+
   export function f(a, b): void;
 >f : { (a?: any, b?: any): any; (a: any, b: any): void; }
 >a : any
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.symbols b/tests/baselines/reference/missingImportAfterModuleImport.symbols
index 1b8de78e41b..164c2e297e3 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.symbols
+++ b/tests/baselines/reference/missingImportAfterModuleImport.symbols
@@ -19,6 +19,8 @@ export = MainModule;
 
 === tests/cases/compiler/missingImportAfterModuleImport_0.ts ===
 declare module "SubModule" {
+>"SubModule" : Symbol("SubModule", Decl(missingImportAfterModuleImport_0.ts, 0, 0))
+
     class SubModule {
 >SubModule : Symbol(SubModule, Decl(missingImportAfterModuleImport_0.ts, 0, 28))
 
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.types b/tests/baselines/reference/missingImportAfterModuleImport.types
index 41cdc9195d4..3af7f2b1795 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.types
+++ b/tests/baselines/reference/missingImportAfterModuleImport.types
@@ -19,6 +19,8 @@ export = MainModule;
 
 === tests/cases/compiler/missingImportAfterModuleImport_0.ts ===
 declare module "SubModule" {
+>"SubModule" : typeof "SubModule"
+
     class SubModule {
 >SubModule : SubModule
 
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.symbols b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.symbols
index 88a610901ed..699156acb43 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.symbols
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.symbols
@@ -8,6 +8,8 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
+>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map1.ts, 2, 48), Decl(map2.ts, 2, 48))
+
     interface I {x0}
 >I : Symbol(I, Decl(map1.ts, 4, 31), Decl(map2.ts, 4, 31))
 >x0 : Symbol(I.x0, Decl(map1.ts, 5, 17))
@@ -23,6 +25,8 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
+>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map1.ts, 2, 48), Decl(map2.ts, 2, 48))
+
     interface I {x1}
 >I : Symbol(I, Decl(map1.ts, 4, 31), Decl(map2.ts, 4, 31))
 >x1 : Symbol(I.x1, Decl(map2.ts, 5, 17))
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
index a6069712269..14a155b2035 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
@@ -14,6 +14,8 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
+>"./observable" : typeof "tests/cases/compiler/observable"
+
     interface I {x0}
 >I : I
 >x0 : any
@@ -35,6 +37,8 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
+>"./observable" : typeof "tests/cases/compiler/observable"
+
     interface I {x1}
 >I : I
 >x1 : any
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols
index 5f619a0cdf4..5a6130d6739 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols
@@ -8,6 +8,8 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
+>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 5, 25))
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
index 471e3ed38c3..4818543dc85 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
@@ -14,6 +14,8 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
+>"./observable" : typeof "tests/cases/compiler/observable"
+
     interface Observable<T> {
 >Observable : Observable<T>
 >T : T
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols
index ad2f467dbe7..cc789447246 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols
@@ -8,6 +8,8 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
+>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 5, 25))
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
index bc17a6823f0..fc0cbc5c8df 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
@@ -14,6 +14,8 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
+>"./observable" : typeof "tests/cases/compiler/observable"
+
     interface Observable<T> {
 >Observable : Observable<T>
 >T : T
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.symbols b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.symbols
index 87eec13573e..e509de89fe3 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.symbols
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.symbols
@@ -11,6 +11,8 @@ namespace N1 {
 }
 
 declare module "./observable" {
+>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(x.ts, 2, 1))
+
     var x: number;
 >x : Symbol(x, Decl(x.ts, 5, 7))
 
@@ -68,6 +70,8 @@ declare module "./observable" {
 }
 
 declare module "./test" {
+>"./test" : Symbol("tests/cases/compiler/test", Decl(test.ts, 0, 0), Decl(x.ts, 20, 1))
+
     export = N1;
 >N1 : Symbol(N1, Decl(x.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
index 560a7647426..ca439263aac 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
@@ -13,6 +13,8 @@ namespace N1 {
 }
 
 declare module "./observable" {
+>"./observable" : typeof "tests/cases/compiler/observable"
+
     var x: number;
 >x : number
 
@@ -70,6 +72,8 @@ declare module "./observable" {
 }
 
 declare module "./test" {
+>"./test" : typeof "tests/cases/compiler/test"
+
     export = N1;
 >N1 : typeof N1
 }
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols
index 3a632fce461..a846d2e8383 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols
@@ -27,6 +27,8 @@ import { Observable } from "observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "observable" {
+>"observable" : Symbol("observable", Decl(observable.d.ts, 0, 0), Decl(map.ts, 2, 48))
+
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.d.ts, 0, 29), Decl(observable.d.ts, 3, 5), Decl(map.ts, 4, 29), Decl(map.ts, 7, 5))
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 5, 25))
@@ -51,6 +53,8 @@ declare module "observable" {
 
 === tests/cases/compiler/observable.d.ts ===
 declare module "observable" {
+>"observable" : Symbol("observable", Decl(observable.d.ts, 0, 0), Decl(map.ts, 2, 48))
+
     class Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.d.ts, 0, 29), Decl(observable.d.ts, 3, 5), Decl(map.ts, 4, 29), Decl(map.ts, 7, 5))
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 5, 25))
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
index f27a85de25a..408429076c4 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
@@ -37,6 +37,8 @@ import { Observable } from "observable"
 >function() { } : () => void
 
 declare module "observable" {
+>"observable" : typeof "observable"
+
     interface Observable<T> {
 >Observable : Observable<T>
 >T : T
@@ -61,6 +63,8 @@ declare module "observable" {
 
 === tests/cases/compiler/observable.d.ts ===
 declare module "observable" {
+>"observable" : typeof "observable"
+
     class Observable<T> {
 >Observable : Observable<T>
 >T : T
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols
index c7bf4920208..14667bd4440 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols
@@ -43,6 +43,8 @@ import { Observable } from "observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "observable" {
+>"observable" : Symbol("observable", Decl(observable.d.ts, 0, 0), Decl(map.ts, 2, 48))
+
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.d.ts, 0, 29), Decl(observable.d.ts, 3, 5), Decl(map.ts, 4, 29), Decl(map.ts, 7, 5))
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 5, 25))
@@ -67,6 +69,8 @@ declare module "observable" {
 
 === tests/cases/compiler/observable.d.ts ===
 declare module "observable" {
+>"observable" : Symbol("observable", Decl(observable.d.ts, 0, 0), Decl(map.ts, 2, 48))
+
     class Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.d.ts, 0, 29), Decl(observable.d.ts, 3, 5), Decl(map.ts, 4, 29), Decl(map.ts, 7, 5))
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 5, 25))
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
index 2c82dcbf849..b81ac9dba69 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
@@ -55,6 +55,8 @@ import { Observable } from "observable"
 >function() { } : () => void
 
 declare module "observable" {
+>"observable" : typeof "observable"
+
     interface Observable<T> {
 >Observable : Observable<T>
 >T : T
@@ -79,6 +81,8 @@ declare module "observable" {
 
 === tests/cases/compiler/observable.d.ts ===
 declare module "observable" {
+>"observable" : typeof "observable"
+
     class Observable<T> {
 >Observable : Observable<T>
 >T : T
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols b/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols
index 5f619a0cdf4..5a6130d6739 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols
@@ -8,6 +8,8 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
+>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 5, 25))
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.types b/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
index 471e3ed38c3..4818543dc85 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
@@ -14,6 +14,8 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
+>"./observable" : typeof "tests/cases/compiler/observable"
+
     interface Observable<T> {
 >Observable : Observable<T>
 >T : T
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols b/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols
index ad2f467dbe7..cc789447246 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols
@@ -8,6 +8,8 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
+>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 4, 31), Decl(map.ts, 7, 5))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 5, 25))
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.types b/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
index bc17a6823f0..fc0cbc5c8df 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
@@ -14,6 +14,8 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
+>"./observable" : typeof "tests/cases/compiler/observable"
+
     interface Observable<T> {
 >Observable : Observable<T>
 >T : T
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.symbols b/tests/baselines/reference/moduleAugmentationGlobal5.symbols
index ad5ab1cd4cd..cafb662e14f 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.symbols
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.symbols
@@ -7,6 +7,8 @@ No type information for this code.
 No type information for this code.
 No type information for this code.=== tests/cases/compiler/f1.d.ts ===
 declare module "A" {
+>"A" : Symbol("A", Decl(f1.d.ts, 0, 0))
+
     global {
 >global : Symbol(global, Decl(f1.d.ts, 0, 20))
 
@@ -17,6 +19,8 @@ declare module "A" {
 }
 === tests/cases/compiler/f2.d.ts ===
 declare module "B" {
+>"B" : Symbol("B", Decl(f2.d.ts, 0, 0))
+
     global {
 >global : Symbol(global, Decl(f2.d.ts, 0, 20))
 
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.types b/tests/baselines/reference/moduleAugmentationGlobal5.types
index 8cb9fdeb3f9..a7a24f1dbce 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.types
@@ -7,6 +7,8 @@ No type information for this code.
 No type information for this code.
 No type information for this code.=== tests/cases/compiler/f1.d.ts ===
 declare module "A" {
+>"A" : typeof "A"
+
     global {
 >global : any
 
@@ -17,6 +19,8 @@ declare module "A" {
 }
 === tests/cases/compiler/f2.d.ts ===
 declare module "B" {
+>"B" : typeof "B"
+
     global {
 >global : any
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols
index db4af0fa34e..ccba13e1bd6 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols
@@ -26,6 +26,8 @@ A.prototype.foo = function () { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./f1" {
+>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 3, 51))
+
     interface A {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 4, 23))
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.types b/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
index 5ab340b3aed..f210ce5cdc5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
@@ -28,6 +28,8 @@ A.prototype.foo = function () { return undefined; }
 >undefined : undefined
 
 declare module "./f1" {
+>"./f1" : typeof "tests/cases/compiler/f1"
+
     interface A {
 >A : A
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports2.symbols
index 1b5c2960b9b..2e8d17ee354 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.symbols
@@ -33,6 +33,8 @@ namespace N {
 }
 
 declare module "./f1" {
+>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
+
     import {B} from "./f2";
 >B : Symbol(B, Decl(f3.ts, 10, 12))
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
index 7b67e96fd6e..becef65c2fc 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
@@ -37,6 +37,8 @@ namespace N {
 }
 
 declare module "./f1" {
+>"./f1" : typeof "tests/cases/compiler/f1"
+
     import {B} from "./f2";
 >B : any
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports3.symbols
index e54083e0bd0..f28f846de18 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.symbols
@@ -35,6 +35,8 @@ namespace N {
 }
 
 declare module "./f1" {
+>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 7, 1))
+
     import {B} from "./f2";
 >B : Symbol(B, Decl(f3.ts, 10, 12))
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
index 894b6c60362..ef956ef5e91 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
@@ -37,6 +37,8 @@ namespace N {
 }
 
 declare module "./f1" {
+>"./f1" : typeof "tests/cases/compiler/f1"
+
     import {B} from "./f2";
 >B : any
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols
index a65f0e4f339..c5e5a5dfcf6 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols
@@ -47,6 +47,8 @@ import C = N.Cls;
 >Cls : Symbol(C, Decl(f3.ts, 6, 39))
 
 declare module "./f1" {
+>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+
     interface A {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.types b/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
index 1dc7a9da1e8..fdda015987a 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
@@ -49,6 +49,8 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
+>"./f1" : typeof "tests/cases/compiler/f1"
+
     interface A {
 >A : A
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports5.symbols
index a65f0e4f339..c5e5a5dfcf6 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.symbols
@@ -47,6 +47,8 @@ import C = N.Cls;
 >Cls : Symbol(C, Decl(f3.ts, 6, 39))
 
 declare module "./f1" {
+>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+
     interface A {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.types b/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
index 1dc7a9da1e8..fdda015987a 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
@@ -49,6 +49,8 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
+>"./f1" : typeof "tests/cases/compiler/f1"
+
     interface A {
 >A : A
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols
index 5e4ead631bc..f556393c0b0 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols
@@ -47,6 +47,8 @@ import C = N.Cls;
 >Cls : Symbol(C, Decl(f3.ts, 6, 39))
 
 declare module "./f1" {
+>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17))
+
     interface A {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.types b/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
index 544514d2855..5631272a776 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
@@ -49,6 +49,8 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
+>"./f1" : typeof "tests/cases/compiler/f1"
+
     interface A {
 >A : A
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols
index b4f22e07d4c..10bee8f1b2e 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols
@@ -17,21 +17,29 @@ x.foo().x;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28))
+
     class Observable {}
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25))
 }
 
 declare module "M" {
+>"M" : Symbol("M", Decl(O.d.ts, 2, 1))
+
     class Cls { x: number }
 >Cls : Symbol(Cls, Decl(O.d.ts, 4, 20))
 >x : Symbol(Cls.x, Decl(O.d.ts, 5, 15))
 }
 
 declare module "Map" {
+>"Map" : Symbol("Map", Decl(O.d.ts, 6, 1))
+
     import { Cls } from "M";
 >Cls : Symbol(Cls, Decl(O.d.ts, 9, 12))
 
     module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28))
+
         interface Observable {
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25))
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.types b/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
index 5c0d6cb29c6..a5de2d5e0c9 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
@@ -18,21 +18,29 @@ x.foo().x;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
+>"Observable" : typeof "Observable"
+
     class Observable {}
 >Observable : Observable
 }
 
 declare module "M" {
+>"M" : typeof "M"
+
     class Cls { x: number }
 >Cls : Cls
 >x : number
 }
 
 declare module "Map" {
+>"Map" : typeof "Map"
+
     import { Cls } from "M";
 >Cls : typeof Cls
 
     module "Observable" {
+>"Observable" : typeof "Observable"
+
         interface Observable {
 >Observable : Observable
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols
index 07758a58469..de7d6fdbaaf 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols
@@ -18,21 +18,29 @@ x.foo().x;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28))
+
     class Observable {}
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25))
 }
 
 declare module "M" {
+>"M" : Symbol("M", Decl(O.d.ts, 2, 1))
+
     class Cls { x: number }
 >Cls : Symbol(Cls, Decl(O.d.ts, 4, 20))
 >x : Symbol(Cls.x, Decl(O.d.ts, 5, 15))
 }
 
 declare module "Map" {
+>"Map" : Symbol("Map", Decl(O.d.ts, 6, 1))
+
     import { Cls } from "M";
 >Cls : Symbol(Cls, Decl(O.d.ts, 9, 12))
 
     module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28))
+
         interface Observable {
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25))
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.types b/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
index e72a8b66fdb..bc43861af89 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
@@ -19,21 +19,29 @@ x.foo().x;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
+>"Observable" : typeof "Observable"
+
     class Observable {}
 >Observable : Observable
 }
 
 declare module "M" {
+>"M" : typeof "M"
+
     class Cls { x: number }
 >Cls : Cls
 >x : number
 }
 
 declare module "Map" {
+>"Map" : typeof "Map"
+
     import { Cls } from "M";
 >Cls : typeof Cls
 
     module "Observable" {
+>"Observable" : typeof "Observable"
+
         interface Observable {
 >Observable : Observable
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols
index 6fd1f788377..b916be32567 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols
@@ -25,21 +25,29 @@ x.foo2().x2;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28), Decl(O.d.ts, 18, 29))
+
     class Observable {}
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25), Decl(O.d.ts, 19, 25))
 }
 
 declare module "M" {
+>"M" : Symbol("M", Decl(O.d.ts, 2, 1))
+
     class Cls { x: number }
 >Cls : Symbol(Cls, Decl(O.d.ts, 4, 20))
 >x : Symbol(Cls.x, Decl(O.d.ts, 5, 15))
 }
 
 declare module "Map" {
+>"Map" : Symbol("Map", Decl(O.d.ts, 6, 1), Decl(O.d.ts, 15, 1))
+
     import { Cls } from "M";
 >Cls : Symbol(Cls, Decl(O.d.ts, 9, 12))
 
     module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28), Decl(O.d.ts, 18, 29))
+
         interface Observable {
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25), Decl(O.d.ts, 19, 25))
 
@@ -51,11 +59,15 @@ declare module "Map" {
 }
 
 declare module "Map" {
+>"Map" : Symbol("Map", Decl(O.d.ts, 6, 1), Decl(O.d.ts, 15, 1))
+
     class Cls2 { x2: number }
 >Cls2 : Symbol(Cls2, Decl(O.d.ts, 17, 22))
 >x2 : Symbol(Cls2.x2, Decl(O.d.ts, 18, 16))
 
     module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28), Decl(O.d.ts, 18, 29))
+
         interface Observable {
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25), Decl(O.d.ts, 19, 25))
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.types b/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
index 56dca6707e9..e2f336101cb 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
@@ -27,21 +27,29 @@ x.foo2().x2;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
+>"Observable" : typeof "Observable"
+
     class Observable {}
 >Observable : Observable
 }
 
 declare module "M" {
+>"M" : typeof "M"
+
     class Cls { x: number }
 >Cls : Cls
 >x : number
 }
 
 declare module "Map" {
+>"Map" : typeof "Map"
+
     import { Cls } from "M";
 >Cls : typeof Cls
 
     module "Observable" {
+>"Observable" : typeof "Observable"
+
         interface Observable {
 >Observable : Observable
 
@@ -53,11 +61,15 @@ declare module "Map" {
 }
 
 declare module "Map" {
+>"Map" : typeof "Map"
+
     class Cls2 { x2: number }
 >Cls2 : Cls2
 >x2 : number
 
     module "Observable" {
+>"Observable" : typeof "Observable"
+
         interface Observable {
 >Observable : Observable
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols
index 5d19e07ebbb..65b28cd2605 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols
@@ -26,21 +26,29 @@ x.foo2().x2;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28), Decl(O2.d.ts, 1, 29))
+
     class Observable {}
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25), Decl(O2.d.ts, 2, 25))
 }
 
 declare module "M" {
+>"M" : Symbol("M", Decl(O.d.ts, 2, 1))
+
     class Cls { x: number }
 >Cls : Symbol(Cls, Decl(O.d.ts, 4, 20))
 >x : Symbol(Cls.x, Decl(O.d.ts, 5, 15))
 }
 
 declare module "Map" {
+>"Map" : Symbol("Map", Decl(O.d.ts, 6, 1), Decl(O2.d.ts, 0, 0))
+
     import { Cls } from "M";
 >Cls : Symbol(Cls, Decl(O.d.ts, 9, 12))
 
     module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28), Decl(O2.d.ts, 1, 29))
+
         interface Observable {
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25), Decl(O2.d.ts, 2, 25))
 
@@ -53,11 +61,15 @@ declare module "Map" {
 
 === tests/cases/compiler/O2.d.ts ===
 declare module "Map" {
+>"Map" : Symbol("Map", Decl(O.d.ts, 6, 1), Decl(O2.d.ts, 0, 0))
+
     class Cls2 { x2: number }
 >Cls2 : Symbol(Cls2, Decl(O2.d.ts, 0, 22))
 >x2 : Symbol(Cls2.x2, Decl(O2.d.ts, 1, 16))
 
     module "Observable" {
+>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 9, 28), Decl(O2.d.ts, 1, 29))
+
         interface Observable {
 >Observable : Symbol(Observable, Decl(O.d.ts, 0, 29), Decl(O.d.ts, 10, 25), Decl(O2.d.ts, 2, 25))
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.types b/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
index d8158cef618..e6b6b522784 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
@@ -28,21 +28,29 @@ x.foo2().x2;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
+>"Observable" : typeof "Observable"
+
     class Observable {}
 >Observable : Observable
 }
 
 declare module "M" {
+>"M" : typeof "M"
+
     class Cls { x: number }
 >Cls : Cls
 >x : number
 }
 
 declare module "Map" {
+>"Map" : typeof "Map"
+
     import { Cls } from "M";
 >Cls : typeof Cls
 
     module "Observable" {
+>"Observable" : typeof "Observable"
+
         interface Observable {
 >Observable : Observable
 
@@ -55,11 +63,15 @@ declare module "Map" {
 
 === tests/cases/compiler/O2.d.ts ===
 declare module "Map" {
+>"Map" : typeof "Map"
+
     class Cls2 { x2: number }
 >Cls2 : Cls2
 >x2 : number
 
     module "Observable" {
+>"Observable" : typeof "Observable"
+
         interface Observable {
 >Observable : Observable
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols
index 59d3002dd1c..6518d795ae1 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols
@@ -15,12 +15,16 @@ let y = x.getA().x;
 
 === tests/cases/compiler/array.d.ts ===
 declare module "A" {
+>"A" : Symbol("A", Decl(array.d.ts, 0, 0))
+
     class A { x: number; }
 >A : Symbol(A, Decl(array.d.ts, 0, 20))
 >x : Symbol(A.x, Decl(array.d.ts, 1, 13))
 }
 
 declare module "array" {
+>"array" : Symbol("array", Decl(array.d.ts, 2, 1))
+
     import {A} from "A";
 >A : Symbol(A, Decl(array.d.ts, 5, 12))
 
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
index 513bf35460d..a0ccf73fbc4 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
@@ -18,12 +18,16 @@ let y = x.getA().x;
 
 === tests/cases/compiler/array.d.ts ===
 declare module "A" {
+>"A" : typeof "A"
+
     class A { x: number; }
 >A : A
 >x : number
 }
 
 declare module "array" {
+>"array" : typeof "array"
+
     import {A} from "A";
 >A : typeof A
 
diff --git a/tests/baselines/reference/moduleAugmentationInDependency.symbols b/tests/baselines/reference/moduleAugmentationInDependency.symbols
index 82f1faedbf5..1913a2fbda6 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency.symbols
+++ b/tests/baselines/reference/moduleAugmentationInDependency.symbols
@@ -1,8 +1,9 @@
 === /node_modules/A/index.d.ts ===
 declare module "ext" {
-No type information for this code.}
-No type information for this code.export {};
-No type information for this code.
-No type information for this code.=== /src/app.ts ===
+>"ext" : Symbol("ext", Decl(index.d.ts, 0, 0))
+}
+export {};
+
+=== /src/app.ts ===
 import "A"
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationInDependency.types b/tests/baselines/reference/moduleAugmentationInDependency.types
index 82f1faedbf5..7dfd3b02a00 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency.types
+++ b/tests/baselines/reference/moduleAugmentationInDependency.types
@@ -1,8 +1,9 @@
 === /node_modules/A/index.d.ts ===
 declare module "ext" {
-No type information for this code.}
-No type information for this code.export {};
-No type information for this code.
-No type information for this code.=== /src/app.ts ===
+>"ext" : any
+}
+export {};
+
+=== /src/app.ts ===
 import "A"
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.symbols b/tests/baselines/reference/moduleAugmentationInDependency2.symbols
index 2d78da3ce6b..dc540ea909f 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency2.symbols
+++ b/tests/baselines/reference/moduleAugmentationInDependency2.symbols
@@ -1,8 +1,9 @@
 === /node_modules/A/index.ts ===
 declare module "ext" {
-No type information for this code.}
-No type information for this code.export {};
-No type information for this code.
-No type information for this code.=== /src/app.ts ===
+>"ext" : Symbol("ext", Decl(index.ts, 0, 0))
+}
+export {};
+
+=== /src/app.ts ===
 import "A"
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.types b/tests/baselines/reference/moduleAugmentationInDependency2.types
index 2d78da3ce6b..41942d083bc 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency2.types
+++ b/tests/baselines/reference/moduleAugmentationInDependency2.types
@@ -1,8 +1,9 @@
 === /node_modules/A/index.ts ===
 declare module "ext" {
-No type information for this code.}
-No type information for this code.export {};
-No type information for this code.
-No type information for this code.=== /src/app.ts ===
+>"ext" : any
+}
+export {};
+
+=== /src/app.ts ===
 import "A"
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.symbols b/tests/baselines/reference/moduleAugmentationNoNewNames.symbols
index beb60f82972..95285294403 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.symbols
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.symbols
@@ -8,6 +8,8 @@ import { Observable } from "./observable"
 >prototype : Symbol(Observable.prototype)
 
 declare module "./observable" {
+>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 2, 48))
+
     interface Observable<T> {
 >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(map.ts, 4, 31))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 5, 25))
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.types b/tests/baselines/reference/moduleAugmentationNoNewNames.types
index 17eadaee707..5fb6b32ce40 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.types
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.types
@@ -14,6 +14,8 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
+>"./observable" : typeof "tests/cases/compiler/observable"
+
     interface Observable<T> {
 >Observable : Observable<T>
 >T : T
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols b/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols
index b701349c5f1..6cff1090df8 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols
@@ -18,6 +18,8 @@ import {Cls} from "./m1";
 >prototype : Symbol(Cls.prototype)
 
 declare module "./m1" {
+>"./m1" : Symbol("tests/cases/compiler/m1", Decl(m1.ts, 0, 0), Decl(m2.ts, 2, 54), Decl(m2.ts, 8, 1), Decl(m4.ts, 3, 60), Decl(m4.ts, 9, 1))
+
     interface Cls {
 >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23))
 
@@ -27,6 +29,8 @@ declare module "./m1" {
 }
 
 declare module "./m1" {
+>"./m1" : Symbol("tests/cases/compiler/m1", Decl(m1.ts, 0, 0), Decl(m2.ts, 2, 54), Decl(m2.ts, 8, 1), Decl(m4.ts, 3, 60), Decl(m4.ts, 9, 1))
+
     interface Cls {
 >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23))
 
@@ -65,6 +69,8 @@ import {C1, C2} from "./m3";
 >undefined : Symbol(undefined)
 
 declare module "./m1" {
+>"./m1" : Symbol("tests/cases/compiler/m1", Decl(m1.ts, 0, 0), Decl(m2.ts, 2, 54), Decl(m2.ts, 8, 1), Decl(m4.ts, 3, 60), Decl(m4.ts, 9, 1))
+
     interface Cls {
 >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23))
 
@@ -75,6 +81,8 @@ declare module "./m1" {
 }
 
 declare module "./m1" {
+>"./m1" : Symbol("tests/cases/compiler/m1", Decl(m1.ts, 0, 0), Decl(m2.ts, 2, 54), Decl(m2.ts, 8, 1), Decl(m4.ts, 3, 60), Decl(m4.ts, 9, 1))
+
     interface Cls {
 >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23))
 
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
index 8e0effacb44..7199fd26c08 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
@@ -32,6 +32,8 @@ import {Cls} from "./m1";
 >"1" : "1"
 
 declare module "./m1" {
+>"./m1" : typeof "tests/cases/compiler/m1"
+
     interface Cls {
 >Cls : Cls
 
@@ -41,6 +43,8 @@ declare module "./m1" {
 }
 
 declare module "./m1" {
+>"./m1" : typeof "tests/cases/compiler/m1"
+
     interface Cls {
 >Cls : Cls
 
@@ -91,6 +95,8 @@ import {C1, C2} from "./m3";
 >undefined : undefined
 
 declare module "./m1" {
+>"./m1" : typeof "tests/cases/compiler/m1"
+
     interface Cls {
 >Cls : Cls
 
@@ -101,6 +107,8 @@ declare module "./m1" {
 }
 
 declare module "./m1" {
+>"./m1" : typeof "tests/cases/compiler/m1"
+
     interface Cls {
 >Cls : Cls
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.symbols b/tests/baselines/reference/moduleAugmentationsImports1.symbols
index 4a91852b8d7..6491300b32d 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.symbols
+++ b/tests/baselines/reference/moduleAugmentationsImports1.symbols
@@ -9,6 +9,8 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
+>"C" : Symbol("C", Decl(c.d.ts, 0, 0))
+
     class Cls {y: string; }
 >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20))
 >y : Symbol(Cls.y, Decl(c.d.ts, 1, 15))
@@ -43,6 +45,8 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./a" {
+>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.ts, 7, 54), Decl(d.ts, 13, 1))
+
     interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 9, 22), Decl(d.ts, 15, 22))
 
@@ -53,6 +57,8 @@ declare module "./a" {
 }
 
 declare module "./a" {
+>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.ts, 7, 54), Decl(d.ts, 13, 1))
+
     interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 9, 22), Decl(d.ts, 15, 22))
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.types b/tests/baselines/reference/moduleAugmentationsImports1.types
index e708b574aaf..1ad997647f4 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.types
+++ b/tests/baselines/reference/moduleAugmentationsImports1.types
@@ -9,6 +9,8 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
+>"C" : typeof "C"
+
     class Cls {y: string; }
 >Cls : Cls
 >y : string
@@ -47,6 +49,8 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : undefined
 
 declare module "./a" {
+>"./a" : typeof "tests/cases/compiler/a"
+
     interface A {
 >A : A
 
@@ -57,6 +61,8 @@ declare module "./a" {
 }
 
 declare module "./a" {
+>"./a" : typeof "tests/cases/compiler/a"
+
     interface A {
 >A : A
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.symbols b/tests/baselines/reference/moduleAugmentationsImports2.symbols
index ef023427597..2d43ea3c348 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.symbols
+++ b/tests/baselines/reference/moduleAugmentationsImports2.symbols
@@ -9,6 +9,8 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
+>"C" : Symbol("C", Decl(c.d.ts, 0, 0))
+
     class Cls {y: string; }
 >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20))
 >y : Symbol(Cls.y, Decl(c.d.ts, 1, 15))
@@ -32,6 +34,8 @@ A.prototype.getB = function () { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./a" {
+>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.ts, 5, 52), Decl(e.ts, 3, 54))
+
     interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 7, 22), Decl(e.ts, 5, 22))
 
@@ -57,6 +61,8 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./a" {
+>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.ts, 5, 52), Decl(e.ts, 3, 54))
+
     interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 7, 22), Decl(e.ts, 5, 22))
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.types b/tests/baselines/reference/moduleAugmentationsImports2.types
index 70d7e8a7600..e331dbc4054 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.types
+++ b/tests/baselines/reference/moduleAugmentationsImports2.types
@@ -9,6 +9,8 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
+>"C" : typeof "C"
+
     class Cls {y: string; }
 >Cls : Cls
 >y : string
@@ -34,6 +36,8 @@ A.prototype.getB = function () { return undefined; }
 >undefined : undefined
 
 declare module "./a" {
+>"./a" : typeof "tests/cases/compiler/a"
+
     interface A {
 >A : A
 
@@ -61,6 +65,8 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : undefined
 
 declare module "./a" {
+>"./a" : typeof "tests/cases/compiler/a"
+
     interface A {
 >A : A
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.symbols b/tests/baselines/reference/moduleAugmentationsImports3.symbols
index 4118ce3e9f2..3be5f3d5af1 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.symbols
+++ b/tests/baselines/reference/moduleAugmentationsImports3.symbols
@@ -41,6 +41,8 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
+>"C" : Symbol("C", Decl(c.d.ts, 0, 0))
+
     class Cls {y: string; }
 >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20))
 >y : Symbol(Cls.y, Decl(c.d.ts, 1, 15))
@@ -48,6 +50,8 @@ declare module "C" {
 
 === tests/cases/compiler/d.d.ts ===
 declare module "D" {
+>"D" : Symbol("D", Decl(d.d.ts, 0, 0))
+
     import {A} from "a";
 >A : Symbol(A, Decl(d.d.ts, 1, 12))
 
@@ -55,6 +59,8 @@ declare module "D" {
 >B : Symbol(B, Decl(d.d.ts, 2, 12))
 
     module "a" {
+>"a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.d.ts, 2, 24), Decl(e.ts, 4, 54))
+
         interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.ts, 6, 22))
 
@@ -82,6 +88,8 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./a" {
+>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.d.ts, 2, 24), Decl(e.ts, 4, 54))
+
     interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.ts, 6, 22))
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.types b/tests/baselines/reference/moduleAugmentationsImports3.types
index 030d2af80da..eb460364caa 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.types
+++ b/tests/baselines/reference/moduleAugmentationsImports3.types
@@ -45,6 +45,8 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
+>"C" : typeof "C"
+
     class Cls {y: string; }
 >Cls : Cls
 >y : string
@@ -52,6 +54,8 @@ declare module "C" {
 
 === tests/cases/compiler/d.d.ts ===
 declare module "D" {
+>"D" : typeof "D"
+
     import {A} from "a";
 >A : typeof A
 
@@ -59,6 +63,8 @@ declare module "D" {
 >B : typeof B
 
     module "a" {
+>"a" : typeof "tests/cases/compiler/a"
+
         interface A {
 >A : A
 
@@ -88,6 +94,8 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : undefined
 
 declare module "./a" {
+>"./a" : typeof "tests/cases/compiler/a"
+
     interface A {
 >A : A
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.symbols b/tests/baselines/reference/moduleAugmentationsImports4.symbols
index 0c92e2c510b..56acb7627c5 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.symbols
+++ b/tests/baselines/reference/moduleAugmentationsImports4.symbols
@@ -42,6 +42,8 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
+>"C" : Symbol("C", Decl(c.d.ts, 0, 0))
+
     class Cls {y: string; }
 >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20))
 >y : Symbol(Cls.y, Decl(c.d.ts, 1, 15))
@@ -49,6 +51,8 @@ declare module "C" {
 
 === tests/cases/compiler/d.d.ts ===
 declare module "D" {
+>"D" : Symbol("D", Decl(d.d.ts, 0, 0))
+
     import {A} from "a";
 >A : Symbol(A, Decl(d.d.ts, 1, 12))
 
@@ -56,6 +60,8 @@ declare module "D" {
 >B : Symbol(B, Decl(d.d.ts, 2, 12))
 
     module "a" {
+>"a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.d.ts, 2, 24), Decl(e.d.ts, 3, 26))
+
         interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.d.ts, 5, 16))
 
@@ -69,6 +75,8 @@ declare module "D" {
 === tests/cases/compiler/e.d.ts ===
 /// <reference path="c.d.ts"/>
 declare module "E" {
+>"E" : Symbol("E", Decl(e.d.ts, 0, 0))
+
     import {A} from "a";
 >A : Symbol(A, Decl(e.d.ts, 2, 12))
 
@@ -76,6 +84,8 @@ declare module "E" {
 >Cls : Symbol(Cls, Decl(e.d.ts, 3, 12))
 
     module "a" {
+>"a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.d.ts, 2, 24), Decl(e.d.ts, 3, 26))
+
         interface A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.d.ts, 5, 16))
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.types b/tests/baselines/reference/moduleAugmentationsImports4.types
index 7f4a190291f..db56fa15aec 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.types
+++ b/tests/baselines/reference/moduleAugmentationsImports4.types
@@ -46,6 +46,8 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
+>"C" : typeof "C"
+
     class Cls {y: string; }
 >Cls : Cls
 >y : string
@@ -53,6 +55,8 @@ declare module "C" {
 
 === tests/cases/compiler/d.d.ts ===
 declare module "D" {
+>"D" : typeof "D"
+
     import {A} from "a";
 >A : typeof A
 
@@ -60,6 +64,8 @@ declare module "D" {
 >B : typeof B
 
     module "a" {
+>"a" : typeof "tests/cases/compiler/a"
+
         interface A {
 >A : A
 
@@ -73,6 +79,8 @@ declare module "D" {
 === tests/cases/compiler/e.d.ts ===
 /// <reference path="c.d.ts"/>
 declare module "E" {
+>"E" : typeof "E"
+
     import {A} from "a";
 >A : typeof A
 
@@ -80,6 +88,8 @@ declare module "E" {
 >Cls : typeof Cls
 
     module "a" {
+>"a" : typeof "tests/cases/compiler/a"
+
         interface A {
 >A : A
 
diff --git a/tests/baselines/reference/moduleElementsInWrongContext.symbols b/tests/baselines/reference/moduleElementsInWrongContext.symbols
index fb16c209975..734712e1e28 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext.symbols
+++ b/tests/baselines/reference/moduleElementsInWrongContext.symbols
@@ -15,6 +15,7 @@
 >K : Symbol(K, Decl(moduleElementsInWrongContext.ts, 6, 16))
 
     declare module "ambient" {
+>"ambient" : Symbol(Foo, Decl(moduleElementsInWrongContext.ts, 6, 21))
 
     }
 
diff --git a/tests/baselines/reference/moduleElementsInWrongContext.types b/tests/baselines/reference/moduleElementsInWrongContext.types
index 0f9a802758c..2a4dbcbcc9d 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext.types
+++ b/tests/baselines/reference/moduleElementsInWrongContext.types
@@ -15,6 +15,7 @@
 >K : any
 
     declare module "ambient" {
+>"ambient" : typeof Foo
 
     }
 
diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.symbols b/tests/baselines/reference/moduleElementsInWrongContext2.symbols
index 6d4ea47320c..2fc47ae7e1f 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.symbols
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.symbols
@@ -17,6 +17,7 @@ function blah () {
 >K : Symbol(K, Decl(moduleElementsInWrongContext2.ts, 6, 16))
 
     declare module "ambient" {
+>"ambient" : Symbol("ambient", Decl(moduleElementsInWrongContext2.ts, 6, 21))
 
     }
 
diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.types b/tests/baselines/reference/moduleElementsInWrongContext2.types
index cf3d6c2a512..1f5ead89235 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.types
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.types
@@ -17,6 +17,7 @@ function blah () {
 >K : any
 
     declare module "ambient" {
+>"ambient" : typeof "ambient"
 
     }
 
diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.symbols b/tests/baselines/reference/moduleElementsInWrongContext3.symbols
index 6c27d03b2aa..a34d5502457 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.symbols
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.symbols
@@ -17,6 +17,7 @@ module P {
 >K : Symbol(K, Decl(moduleElementsInWrongContext3.ts, 7, 20))
 
         declare module "ambient" {
+>"ambient" : Symbol("ambient", Decl(moduleElementsInWrongContext3.ts, 7, 25))
 
         }
 
diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.types b/tests/baselines/reference/moduleElementsInWrongContext3.types
index 06453463eda..86dfa2ddc22 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.types
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.types
@@ -17,6 +17,7 @@ module P {
 >K : any
 
         declare module "ambient" {
+>"ambient" : typeof "ambient"
 
         }
 
diff --git a/tests/baselines/reference/moduleMergeConstructor.symbols b/tests/baselines/reference/moduleMergeConstructor.symbols
index bad5f3d14f4..f3d9e514f90 100644
--- a/tests/baselines/reference/moduleMergeConstructor.symbols
+++ b/tests/baselines/reference/moduleMergeConstructor.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/foo.d.ts ===
 declare module "foo" {
+>"foo" : Symbol("foo", Decl(foo.d.ts, 0, 0), Decl(foo-ext.d.ts, 0, 0))
+
     export class Foo {
 >Foo : Symbol(Foo, Decl(foo.d.ts, 0, 22), Decl(foo-ext.d.ts, 0, 22))
 
@@ -11,6 +13,8 @@ declare module "foo" {
 
 === tests/cases/compiler/foo-ext.d.ts ===
 declare module "foo" {
+>"foo" : Symbol("foo", Decl(foo.d.ts, 0, 0), Decl(foo-ext.d.ts, 0, 0))
+
     export interface Foo {
 >Foo : Symbol(Foo, Decl(foo.d.ts, 0, 22), Decl(foo-ext.d.ts, 0, 22))
 
diff --git a/tests/baselines/reference/moduleMergeConstructor.types b/tests/baselines/reference/moduleMergeConstructor.types
index 5de02bba55c..b7e61da4687 100644
--- a/tests/baselines/reference/moduleMergeConstructor.types
+++ b/tests/baselines/reference/moduleMergeConstructor.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/foo.d.ts ===
 declare module "foo" {
+>"foo" : typeof "foo"
+
     export class Foo {
 >Foo : Foo
 
@@ -11,6 +13,8 @@ declare module "foo" {
 
 === tests/cases/compiler/foo-ext.d.ts ===
 declare module "foo" {
+>"foo" : typeof "foo"
+
     export interface Foo {
 >Foo : Foo
 
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.symbols b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.symbols
index 1259c83ccde..09ae8fd7b82 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.symbols
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.symbols
@@ -5,6 +5,8 @@ import { x } from "js";
 
 === /declarations.d.ts ===
 declare module "js" {
+>"js" : Symbol("js", Decl(declarations.d.ts, 0, 0))
+
     export const x = 0;
 >x : Symbol(x, Decl(declarations.d.ts, 1, 16))
 }
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types
index 1e5af4e7579..23c4b4164e7 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types
@@ -5,6 +5,8 @@ import { x } from "js";
 
 === /declarations.d.ts ===
 declare module "js" {
+>"js" : typeof "js"
+
     export const x = 0;
 >x : 0
 >0 : 0
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.symbols b/tests/baselines/reference/module_augmentUninstantiatedModule.symbols
index 4ea073b0254..e75f6b5567c 100644
--- a/tests/baselines/reference/module_augmentUninstantiatedModule.symbols
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/module_augmentUninstantiatedModule.ts ===
 declare module "foo" {
+>"foo" : Symbol("foo", Decl(module_augmentUninstantiatedModule.ts, 0, 0))
+
    namespace M {}
 >M : Symbol(M, Decl(module_augmentUninstantiatedModule.ts, 0, 22), Decl(module_augmentUninstantiatedModule.ts, 2, 6), Decl(module_augmentUninstantiatedModule.ts, 6, 22))
 
@@ -11,5 +13,8 @@ declare module "foo" {
 }
 
 declare module "bar" {
+>"bar" : Symbol("bar", Decl(module_augmentUninstantiatedModule.ts, 4, 1))
+
     module "foo" {}
+>"foo" : Symbol(M, Decl(module_augmentUninstantiatedModule.ts, 0, 22), Decl(module_augmentUninstantiatedModule.ts, 2, 6), Decl(module_augmentUninstantiatedModule.ts, 6, 22))
 }
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.types b/tests/baselines/reference/module_augmentUninstantiatedModule.types
index 0c27cc3acf9..1fad9ee8609 100644
--- a/tests/baselines/reference/module_augmentUninstantiatedModule.types
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/module_augmentUninstantiatedModule.ts ===
 declare module "foo" {
+>"foo" : typeof "foo"
+
    namespace M {}
 >M : any
 
@@ -11,5 +13,8 @@ declare module "foo" {
 }
 
 declare module "bar" {
+>"bar" : typeof "bar"
+
     module "foo" {}
+>"foo" : any
 }
diff --git a/tests/baselines/reference/moduledecl.symbols b/tests/baselines/reference/moduledecl.symbols
index 2fd96aee321..9407058910e 100644
--- a/tests/baselines/reference/moduledecl.symbols
+++ b/tests/baselines/reference/moduledecl.symbols
@@ -300,6 +300,8 @@ declare module m55 {
 }
 
 declare module "m3" {
+>"m3" : Symbol("m3", Decl(moduledecl.ts, 131, 1))
+
     export var b: number;
 >b : Symbol(b, Decl(moduledecl.ts, 134, 14))
 }
diff --git a/tests/baselines/reference/moduledecl.types b/tests/baselines/reference/moduledecl.types
index 4dfd012356f..567ef6b8c54 100644
--- a/tests/baselines/reference/moduledecl.types
+++ b/tests/baselines/reference/moduledecl.types
@@ -303,6 +303,8 @@ declare module m55 {
 }
 
 declare module "m3" {
+>"m3" : typeof "m3"
+
     export var b: number;
 >b : number
 }
diff --git a/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.symbols b/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.symbols
index e4041cd4a93..40e1c181e43 100644
--- a/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.symbols
+++ b/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts ===
 declare module "m1" {
+>"m1" : Symbol("m1", Decl(multipleExportAssignmentsInAmbientDeclaration.ts, 0, 0))
+
     var a: number
 >a : Symbol(a, Decl(multipleExportAssignmentsInAmbientDeclaration.ts, 1, 7))
 
diff --git a/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.types b/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.types
index 2b12234100c..ae94289f710 100644
--- a/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.types
+++ b/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts ===
 declare module "m1" {
+>"m1" : typeof "m1"
+
     var a: number
 >a : number
 
diff --git a/tests/baselines/reference/multipleNumericIndexers.symbols b/tests/baselines/reference/multipleNumericIndexers.symbols
index 755926468f9..3dc04af5dcf 100644
--- a/tests/baselines/reference/multipleNumericIndexers.symbols
+++ b/tests/baselines/reference/multipleNumericIndexers.symbols
@@ -41,6 +41,8 @@ var b: {
 >x : Symbol(x, Decl(multipleNumericIndexers.ts, 19, 5))
 
 } = { 1: '', "2": '' }
+>1 : Symbol(1, Decl(multipleNumericIndexers.ts, 20, 5))
+>"2" : Symbol("2", Decl(multipleNumericIndexers.ts, 20, 12))
 
 class C2<T> {
 >C2 : Symbol(C2, Decl(multipleNumericIndexers.ts, 20, 22))
diff --git a/tests/baselines/reference/multipleNumericIndexers.types b/tests/baselines/reference/multipleNumericIndexers.types
index a9da566aae7..a4c44a7c056 100644
--- a/tests/baselines/reference/multipleNumericIndexers.types
+++ b/tests/baselines/reference/multipleNumericIndexers.types
@@ -42,7 +42,9 @@ var b: {
 
 } = { 1: '', "2": '' }
 >{ 1: '', "2": '' } : { 1: string; "2": string; }
+>1 : string
 >'' : ""
+>"2" : string
 >'' : ""
 
 class C2<T> {
diff --git a/tests/baselines/reference/negateOperatorWithEnumType.symbols b/tests/baselines/reference/negateOperatorWithEnumType.symbols
index 98af23bb121..f2009828373 100644
--- a/tests/baselines/reference/negateOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/negateOperatorWithEnumType.symbols
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(negateOperatorWithEnumType.ts, 2, 14))
 >A : Symbol(ENUM1.A, Decl(negateOperatorWithEnumType.ts, 3, 12))
 >B : Symbol(ENUM1.B, Decl(negateOperatorWithEnumType.ts, 3, 15))
+>"" : Symbol(ENUM1[""], Decl(negateOperatorWithEnumType.ts, 3, 18))
 
 // enum type var
 var ResultIsNumber1 = -ENUM;
diff --git a/tests/baselines/reference/negateOperatorWithEnumType.types b/tests/baselines/reference/negateOperatorWithEnumType.types
index 7d3edbd2680..232451dbf59 100644
--- a/tests/baselines/reference/negateOperatorWithEnumType.types
+++ b/tests/baselines/reference/negateOperatorWithEnumType.types
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // enum type var
 var ResultIsNumber1 = -ENUM;
diff --git a/tests/baselines/reference/newWithSpread.symbols b/tests/baselines/reference/newWithSpread.symbols
index 564d49912c2..670bdc5fb5a 100644
--- a/tests/baselines/reference/newWithSpread.symbols
+++ b/tests/baselines/reference/newWithSpread.symbols
@@ -37,6 +37,7 @@ interface C {
 >C : Symbol(C, Decl(newWithSpread.ts, 14, 1))
 
     "a-b": typeof B;
+>"a-b" : Symbol(C["a-b"], Decl(newWithSpread.ts, 16, 13))
 >B : Symbol(B, Decl(newWithSpread.ts, 10, 1))
 }
 
@@ -44,6 +45,7 @@ interface D {
 >D : Symbol(D, Decl(newWithSpread.ts, 18, 1))
 
     1: typeof B;
+>1 : Symbol(D[1], Decl(newWithSpread.ts, 20, 13))
 >B : Symbol(B, Decl(newWithSpread.ts, 10, 1))
 }
 
diff --git a/tests/baselines/reference/newWithSpread.types b/tests/baselines/reference/newWithSpread.types
index 67cc63e6281..9a269e642b0 100644
--- a/tests/baselines/reference/newWithSpread.types
+++ b/tests/baselines/reference/newWithSpread.types
@@ -37,6 +37,7 @@ interface C {
 >C : C
 
     "a-b": typeof B;
+>"a-b" : typeof B
 >B : typeof B
 }
 
@@ -44,6 +45,7 @@ interface D {
 >D : D
 
     1: typeof B;
+>1 : typeof B
 >B : typeof B
 }
 
diff --git a/tests/baselines/reference/newWithSpreadES5.symbols b/tests/baselines/reference/newWithSpreadES5.symbols
index dc0b56a8c27..5baeff2cfb1 100644
--- a/tests/baselines/reference/newWithSpreadES5.symbols
+++ b/tests/baselines/reference/newWithSpreadES5.symbols
@@ -36,6 +36,7 @@ interface C {
 >C : Symbol(C, Decl(newWithSpreadES5.ts, 13, 1))
 
     "a-b": typeof B;
+>"a-b" : Symbol(C["a-b"], Decl(newWithSpreadES5.ts, 15, 13))
 >B : Symbol(B, Decl(newWithSpreadES5.ts, 9, 1))
 }
 
@@ -43,6 +44,7 @@ interface D {
 >D : Symbol(D, Decl(newWithSpreadES5.ts, 17, 1))
 
     1: typeof B;
+>1 : Symbol(D[1], Decl(newWithSpreadES5.ts, 19, 13))
 >B : Symbol(B, Decl(newWithSpreadES5.ts, 9, 1))
 }
 
diff --git a/tests/baselines/reference/newWithSpreadES5.types b/tests/baselines/reference/newWithSpreadES5.types
index ce173e071d8..e77611d5fc4 100644
--- a/tests/baselines/reference/newWithSpreadES5.types
+++ b/tests/baselines/reference/newWithSpreadES5.types
@@ -36,6 +36,7 @@ interface C {
 >C : C
 
     "a-b": typeof B;
+>"a-b" : typeof B
 >B : typeof B
 }
 
@@ -43,6 +44,7 @@ interface D {
 >D : D
 
     1: typeof B;
+>1 : typeof B
 >B : typeof B
 }
 
diff --git a/tests/baselines/reference/newWithSpreadES6.symbols b/tests/baselines/reference/newWithSpreadES6.symbols
index 98c58e40451..f56e5fe76dc 100644
--- a/tests/baselines/reference/newWithSpreadES6.symbols
+++ b/tests/baselines/reference/newWithSpreadES6.symbols
@@ -37,6 +37,7 @@ interface C {
 >C : Symbol(C, Decl(newWithSpreadES6.ts, 14, 1))
 
     "a-b": typeof B;
+>"a-b" : Symbol(C["a-b"], Decl(newWithSpreadES6.ts, 16, 13))
 >B : Symbol(B, Decl(newWithSpreadES6.ts, 10, 1))
 }
 
@@ -44,6 +45,7 @@ interface D {
 >D : Symbol(D, Decl(newWithSpreadES6.ts, 18, 1))
 
     1: typeof B;
+>1 : Symbol(D[1], Decl(newWithSpreadES6.ts, 20, 13))
 >B : Symbol(B, Decl(newWithSpreadES6.ts, 10, 1))
 }
 
diff --git a/tests/baselines/reference/newWithSpreadES6.types b/tests/baselines/reference/newWithSpreadES6.types
index 8567d04f260..59a8abdc822 100644
--- a/tests/baselines/reference/newWithSpreadES6.types
+++ b/tests/baselines/reference/newWithSpreadES6.types
@@ -37,6 +37,7 @@ interface C {
 >C : C
 
     "a-b": typeof B;
+>"a-b" : typeof B
 >B : typeof B
 }
 
@@ -44,6 +45,7 @@ interface D {
 >D : D
 
     1: typeof B;
+>1 : typeof B
 >B : typeof B
 }
 
diff --git a/tests/baselines/reference/noImplicitAnyIndexing.symbols b/tests/baselines/reference/noImplicitAnyIndexing.symbols
index 2f91f815a56..a0f69d9a6df 100644
--- a/tests/baselines/reference/noImplicitAnyIndexing.symbols
+++ b/tests/baselines/reference/noImplicitAnyIndexing.symbols
@@ -71,9 +71,16 @@ var m: MyMap<number> = {
 >MyMap : Symbol(MyMap, Decl(noImplicitAnyIndexing.ts, 30, 29))
 
     "0": 0,
+>"0" : Symbol("0", Decl(noImplicitAnyIndexing.ts, 36, 24))
+
     "1": 1,
+>"1" : Symbol("1", Decl(noImplicitAnyIndexing.ts, 37, 11))
+
     "2": 2,
+>"2" : Symbol("2", Decl(noImplicitAnyIndexing.ts, 38, 11))
+
     "Okay that's enough for today.": NaN
+>"Okay that's enough for today." : Symbol("Okay that's enough for today.", Decl(noImplicitAnyIndexing.ts, 39, 11))
 >NaN : Symbol(NaN, Decl(lib.d.ts, --, --))
 
 };
diff --git a/tests/baselines/reference/noImplicitAnyIndexing.types b/tests/baselines/reference/noImplicitAnyIndexing.types
index 06aa1a4a2e0..3357eb56ab0 100644
--- a/tests/baselines/reference/noImplicitAnyIndexing.types
+++ b/tests/baselines/reference/noImplicitAnyIndexing.types
@@ -90,15 +90,19 @@ var m: MyMap<number> = {
 >{    "0": 0,    "1": 1,    "2": 2,    "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": number; }
 
     "0": 0,
+>"0" : number
 >0 : 0
 
     "1": 1,
+>"1" : number
 >1 : 1
 
     "2": 2,
+>"2" : number
 >2 : 2
 
     "Okay that's enough for today.": NaN
+>"Okay that's enough for today." : number
 >NaN : number
 
 };
diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols
index d97a59cf091..8c004ac8945 100644
--- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols
+++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols
@@ -70,9 +70,16 @@ var m: MyMap<number> = {
 >MyMap : Symbol(MyMap, Decl(noImplicitAnyIndexingSuppressed.ts, 29, 29))
 
     "0": 0,
+>"0" : Symbol("0", Decl(noImplicitAnyIndexingSuppressed.ts, 35, 24))
+
     "1": 1,
+>"1" : Symbol("1", Decl(noImplicitAnyIndexingSuppressed.ts, 36, 11))
+
     "2": 2,
+>"2" : Symbol("2", Decl(noImplicitAnyIndexingSuppressed.ts, 37, 11))
+
     "Okay that's enough for today.": NaN
+>"Okay that's enough for today." : Symbol("Okay that's enough for today.", Decl(noImplicitAnyIndexingSuppressed.ts, 38, 11))
 >NaN : Symbol(NaN, Decl(lib.d.ts, --, --))
 
 };
diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
index 18c10871cf0..1bd8a6784d7 100644
--- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
+++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
@@ -89,15 +89,19 @@ var m: MyMap<number> = {
 >{    "0": 0,    "1": 1,    "2": 2,    "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": number; }
 
     "0": 0,
+>"0" : number
 >0 : 0
 
     "1": 1,
+>"1" : number
 >1 : 1
 
     "2": 2,
+>"2" : number
 >2 : 2
 
     "Okay that's enough for today.": NaN
+>"Okay that's enough for today." : number
 >NaN : number
 
 };
diff --git a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.symbols b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.symbols
index 87befecaa43..aa3990b0d7c 100644
--- a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.symbols
+++ b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.symbols
@@ -5,4 +5,5 @@ var x = {}["hello"];
 var y: string = { '': 'foo' }[''];
 >y : Symbol(y, Decl(noImplicitAnyStringIndexerOnObject.ts, 1, 3))
 >'' : Symbol('', Decl(noImplicitAnyStringIndexerOnObject.ts, 1, 17))
+>'' : Symbol('', Decl(noImplicitAnyStringIndexerOnObject.ts, 1, 17))
 
diff --git a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.types b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.types
index fca1757d01b..a1b78eaca57 100644
--- a/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.types
+++ b/tests/baselines/reference/noImplicitAnyStringIndexerOnObject.types
@@ -9,6 +9,7 @@ var y: string = { '': 'foo' }[''];
 >y : string
 >{ '': 'foo' }[''] : string
 >{ '': 'foo' } : { '': string; }
+>'' : string
 >'foo' : "foo"
 >'' : ""
 
diff --git a/tests/baselines/reference/nodeResolution5.symbols b/tests/baselines/reference/nodeResolution5.symbols
index 5871ad57a4e..c00eca8188d 100644
--- a/tests/baselines/reference/nodeResolution5.symbols
+++ b/tests/baselines/reference/nodeResolution5.symbols
@@ -4,6 +4,8 @@ import y = require("a");
 
 === tests/cases/compiler/node_modules/a.d.ts ===
 declare module "a" {
+>"a" : Symbol("a", Decl(a.d.ts, 0, 0))
+
     var x: number;
 >x : Symbol(x, Decl(a.d.ts, 1, 7))
 }
diff --git a/tests/baselines/reference/nodeResolution5.types b/tests/baselines/reference/nodeResolution5.types
index 4c2872f7b5d..453f5c319ee 100644
--- a/tests/baselines/reference/nodeResolution5.types
+++ b/tests/baselines/reference/nodeResolution5.types
@@ -4,6 +4,8 @@ import y = require("a");
 
 === tests/cases/compiler/node_modules/a.d.ts ===
 declare module "a" {
+>"a" : typeof "a"
+
     var x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/nodeResolution7.symbols b/tests/baselines/reference/nodeResolution7.symbols
index 30b930c72e4..db3bf2753c1 100644
--- a/tests/baselines/reference/nodeResolution7.symbols
+++ b/tests/baselines/reference/nodeResolution7.symbols
@@ -4,6 +4,8 @@ import y = require("a");
 
 === tests/cases/compiler/node_modules/a/index.d.ts ===
 declare module "a" {
+>"a" : Symbol("a", Decl(index.d.ts, 0, 0))
+
     var x: number;
 >x : Symbol(x, Decl(index.d.ts, 1, 7))
 }
diff --git a/tests/baselines/reference/nodeResolution7.types b/tests/baselines/reference/nodeResolution7.types
index 8dfe6c0d15f..dfe118fd395 100644
--- a/tests/baselines/reference/nodeResolution7.types
+++ b/tests/baselines/reference/nodeResolution7.types
@@ -4,6 +4,8 @@ import y = require("a");
 
 === tests/cases/compiler/node_modules/a/index.d.ts ===
 declare module "a" {
+>"a" : typeof "a"
+
     var x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/numericClassMembers1.symbols b/tests/baselines/reference/numericClassMembers1.symbols
index 90a3a4f1e77..9ff509ca938 100644
--- a/tests/baselines/reference/numericClassMembers1.symbols
+++ b/tests/baselines/reference/numericClassMembers1.symbols
@@ -3,20 +3,29 @@ class C234 {
 >C234 : Symbol(C234, Decl(numericClassMembers1.ts, 0, 0))
 
   0 = 1; 
+>0 : Symbol(C234[0], Decl(numericClassMembers1.ts, 0, 12), Decl(numericClassMembers1.ts, 1, 8))
+
   0.0 = 2;
+>0.0 : Symbol(C234[0], Decl(numericClassMembers1.ts, 0, 12), Decl(numericClassMembers1.ts, 1, 8))
 }
  
 class C235 { 
 >C235 : Symbol(C235, Decl(numericClassMembers1.ts, 3, 1))
 
   0.0 = 1;
+>0.0 : Symbol(C235[0.0], Decl(numericClassMembers1.ts, 5, 12), Decl(numericClassMembers1.ts, 6, 10))
+
  '0' = 2;
+>'0' : Symbol(C235[0.0], Decl(numericClassMembers1.ts, 5, 12), Decl(numericClassMembers1.ts, 6, 10))
 }
 
 class C236 {
 >C236 : Symbol(C236, Decl(numericClassMembers1.ts, 8, 1))
 
     '0.0' = 1;
+>'0.0' : Symbol(C236['0.0'], Decl(numericClassMembers1.ts, 10, 12))
+
     '0' = 2;
+>'0' : Symbol(C236['0'], Decl(numericClassMembers1.ts, 11, 14))
 }
 
diff --git a/tests/baselines/reference/numericClassMembers1.types b/tests/baselines/reference/numericClassMembers1.types
index 1969339bac0..be9716c21f1 100644
--- a/tests/baselines/reference/numericClassMembers1.types
+++ b/tests/baselines/reference/numericClassMembers1.types
@@ -3,9 +3,11 @@ class C234 {
 >C234 : C234
 
   0 = 1; 
+>0 : number
 >1 : 1
 
   0.0 = 2;
+>0.0 : number
 >2 : 2
 }
  
@@ -13,9 +15,11 @@ class C235 {
 >C235 : C235
 
   0.0 = 1;
+>0.0 : number
 >1 : 1
 
  '0' = 2;
+>'0' : number
 >2 : 2
 }
 
@@ -23,9 +27,11 @@ class C236 {
 >C236 : C236
 
     '0.0' = 1;
+>'0.0' : number
 >1 : 1
 
     '0' = 2;
+>'0' : number
 >2 : 2
 }
 
diff --git a/tests/baselines/reference/numericIndexExpressions.symbols b/tests/baselines/reference/numericIndexExpressions.symbols
index 54a284627e8..98bcfef0976 100644
--- a/tests/baselines/reference/numericIndexExpressions.symbols
+++ b/tests/baselines/reference/numericIndexExpressions.symbols
@@ -3,11 +3,13 @@ interface Numbers1 {
 >Numbers1 : Symbol(Numbers1, Decl(numericIndexExpressions.ts, 0, 0))
 
     1: string;
+>1 : Symbol(Numbers1[1], Decl(numericIndexExpressions.ts, 0, 20))
 }
 interface Strings1 {
 >Strings1 : Symbol(Strings1, Decl(numericIndexExpressions.ts, 2, 1))
 
     '1': string;
+>'1' : Symbol(Strings1['1'], Decl(numericIndexExpressions.ts, 3, 20))
 }
  
  
diff --git a/tests/baselines/reference/numericIndexExpressions.types b/tests/baselines/reference/numericIndexExpressions.types
index 828eff3a736..a143f30d934 100644
--- a/tests/baselines/reference/numericIndexExpressions.types
+++ b/tests/baselines/reference/numericIndexExpressions.types
@@ -3,11 +3,13 @@ interface Numbers1 {
 >Numbers1 : Numbers1
 
     1: string;
+>1 : string
 }
 interface Strings1 {
 >Strings1 : Strings1
 
     '1': string;
+>'1' : string
 }
  
  
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.symbols b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.symbols
index a7d4f77605f..f698a0c131f 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.symbols
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.symbols
@@ -27,12 +27,25 @@ class C {
 >c : Symbol(C.c, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 12, 14))
 
     "d": string; // ok
+>"d" : Symbol(C["d"], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 13, 15))
+
     "e": number; // ok
+>"e" : Symbol(C["e"], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 14, 16))
+
     1.0: string; // ok
+>1.0 : Symbol(C[1.0], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 15, 16))
+
     2.0: number; // error
+>2.0 : Symbol(C[2.0], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 16, 16))
+
     "3.0": string; // ok
+>"3.0" : Symbol(C["3.0"], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 17, 16))
+
     "4.0": number; // error
+>"4.0" : Symbol(C["4.0"], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 18, 18))
+
     3.0: MyNumber // error
+>3.0 : Symbol(C[3.0], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 19, 18))
 >MyNumber : Symbol(MyNumber, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 0, 0))
 
     get X() { // ok
@@ -82,9 +95,17 @@ interface I {
 >c : Symbol(I.c, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 44, 14))
 
     "d": string; // ok
+>"d" : Symbol(I["d"], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 45, 15))
+
     "e": number; // ok
+>"e" : Symbol(I["e"], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 46, 16))
+
     1.0: string; // ok
+>1.0 : Symbol(I[1.0], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 47, 16))
+
     2.0: number; // error
+>2.0 : Symbol(I[2.0], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 48, 16))
+
     (): string; // ok
     (x): number // ok
 >x : Symbol(x, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 51, 5))
@@ -93,7 +114,11 @@ interface I {
 >foo : Symbol(I.foo, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 51, 15))
 
     "3.0": string; // ok
+>"3.0" : Symbol(I["3.0"], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 52, 18))
+
     "4.0": number; // error
+>"4.0" : Symbol(I["4.0"], Decl(numericIndexerConstrainsPropertyDeclarations.ts, 53, 18))
+
     f: MyNumber; // error
 >f : Symbol(I.f, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 54, 18))
 >MyNumber : Symbol(MyNumber, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 0, 0))
@@ -115,9 +140,17 @@ var a: {
 >c : Symbol(c, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 62, 14))
 
     "d": string; // ok
+>"d" : Symbol("d", Decl(numericIndexerConstrainsPropertyDeclarations.ts, 63, 15))
+
     "e": number; // ok
+>"e" : Symbol("e", Decl(numericIndexerConstrainsPropertyDeclarations.ts, 64, 16))
+
     1.0: string; // ok
+>1.0 : Symbol(1.0, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 65, 16))
+
     2.0: number; // error
+>2.0 : Symbol(2.0, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 66, 16))
+
     (): string; // ok
     (x): number // ok
 >x : Symbol(x, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 69, 5))
@@ -126,7 +159,11 @@ var a: {
 >foo : Symbol(foo, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 69, 15))
 
     "3.0": string; // ok
+>"3.0" : Symbol("3.0", Decl(numericIndexerConstrainsPropertyDeclarations.ts, 70, 18))
+
     "4.0": number; // error
+>"4.0" : Symbol("4.0", Decl(numericIndexerConstrainsPropertyDeclarations.ts, 71, 18))
+
     f: MyNumber; // error
 >f : Symbol(f, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 72, 18))
 >MyNumber : Symbol(MyNumber, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 0, 0))
@@ -147,11 +184,23 @@ var b: { [x: number]: string; } = {
 >c : Symbol(c, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 79, 9))
 
     "d": '', 
+>"d" : Symbol("d", Decl(numericIndexerConstrainsPropertyDeclarations.ts, 80, 17))
+
     "e": 1, 
+>"e" : Symbol("e", Decl(numericIndexerConstrainsPropertyDeclarations.ts, 81, 12))
+
     1.0: '',
+>1.0 : Symbol(1.0, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 82, 11))
+
     2.0: 1, 
+>2.0 : Symbol(2.0, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 83, 12))
+
     "3.0": '', 
+>"3.0" : Symbol("3.0", Decl(numericIndexerConstrainsPropertyDeclarations.ts, 84, 11))
+
     "4.0": 1, 
+>"4.0" : Symbol("4.0", Decl(numericIndexerConstrainsPropertyDeclarations.ts, 85, 14))
+
     f: <Myn>null, 
 >f : Symbol(f, Decl(numericIndexerConstrainsPropertyDeclarations.ts, 86, 13))
 
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
index 06d6dfdf8c7..654b765396c 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
@@ -27,12 +27,25 @@ class C {
 >c : () => {}
 
     "d": string; // ok
+>"d" : string
+
     "e": number; // ok
+>"e" : number
+
     1.0: string; // ok
+>1.0 : string
+
     2.0: number; // error
+>2.0 : number
+
     "3.0": string; // ok
+>"3.0" : string
+
     "4.0": number; // error
+>"4.0" : number
+
     3.0: MyNumber // error
+>3.0 : MyNumber
 >MyNumber : MyNumber
 
     get X() { // ok
@@ -85,9 +98,17 @@ interface I {
 >c : () => {}
 
     "d": string; // ok
+>"d" : string
+
     "e": number; // ok
+>"e" : number
+
     1.0: string; // ok
+>1.0 : string
+
     2.0: number; // error
+>2.0 : number
+
     (): string; // ok
     (x): number // ok
 >x : any
@@ -96,7 +117,11 @@ interface I {
 >foo : () => string
 
     "3.0": string; // ok
+>"3.0" : string
+
     "4.0": number; // error
+>"4.0" : number
+
     f: MyNumber; // error
 >f : MyNumber
 >MyNumber : MyNumber
@@ -118,9 +143,17 @@ var a: {
 >c : () => {}
 
     "d": string; // ok
+>"d" : string
+
     "e": number; // ok
+>"e" : number
+
     1.0: string; // ok
+>1.0 : string
+
     2.0: number; // error
+>2.0 : number
+
     (): string; // ok
     (x): number // ok
 >x : any
@@ -129,7 +162,11 @@ var a: {
 >foo : () => string
 
     "3.0": string; // ok
+>"3.0" : string
+
     "4.0": number; // error
+>"4.0" : number
+
     f: MyNumber; // error
 >f : MyNumber
 >MyNumber : MyNumber
@@ -154,21 +191,27 @@ var b: { [x: number]: string; } = {
 >() => { } : () => void
 
     "d": '', 
+>"d" : string
 >'' : ""
 
     "e": 1, 
+>"e" : number
 >1 : 1
 
     1.0: '',
+>1.0 : string
 >'' : ""
 
     2.0: 1, 
+>2.0 : number
 >1 : 1
 
     "3.0": '', 
+>"3.0" : string
 >'' : ""
 
     "4.0": 1, 
+>"4.0" : number
 >1 : 1
 
     f: <Myn>null, 
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.symbols b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.symbols
index ffb78b876ee..c73797b2427 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.symbols
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.symbols
@@ -24,16 +24,22 @@ class Foo {
 >A : Symbol(A, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 0, 0))
 
     1.0: A; // ok
+>1.0 : Symbol(Foo[1.0], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 11, 19))
 >A : Symbol(A, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 0, 0))
 
     2.0: B; // ok
+>2.0 : Symbol(Foo[2.0], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 12, 11))
 >B : Symbol(B, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 4, 1))
 
     "2.5": B // ok
+>"2.5" : Symbol(Foo["2.5"], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 13, 11))
 >B : Symbol(B, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 4, 1))
 
     3.0: number; // error
+>3.0 : Symbol(Foo[3.0], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 14, 12))
+
     "4.0": string; // error
+>"4.0" : Symbol(Foo["4.0"], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 15, 16))
 }
 
 interface Foo2 {
@@ -44,16 +50,22 @@ interface Foo2 {
 >A : Symbol(A, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 0, 0))
 
     1.0: A; // ok
+>1.0 : Symbol(Foo2[1.0], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 20, 19))
 >A : Symbol(A, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 0, 0))
 
     2.0: B; // ok
+>2.0 : Symbol(Foo2[2.0], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 21, 11))
 >B : Symbol(B, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 4, 1))
 
     "2.5": B // ok
+>"2.5" : Symbol(Foo2["2.5"], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 22, 11))
 >B : Symbol(B, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 4, 1))
 
     3.0: number; // error
+>3.0 : Symbol(Foo2[3.0], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 23, 12))
+
     "4.0": string; // error
+>"4.0" : Symbol(Foo2["4.0"], Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 24, 16))
 }
 
 var a: {
@@ -64,16 +76,23 @@ var a: {
 >A : Symbol(A, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 0, 0))
 
     1.0: A; // ok
+>1.0 : Symbol(1.0, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 29, 19))
 >A : Symbol(A, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 0, 0))
 
     2.0: B; // ok
+>2.0 : Symbol(2.0, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 30, 11))
 >B : Symbol(B, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 4, 1))
 
     "2.5": B // ok
+>"2.5" : Symbol("2.5", Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 31, 11))
 >B : Symbol(B, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 4, 1))
 
     3.0: number; // error
+>3.0 : Symbol(3.0, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 32, 12))
+
     "4.0": string; // error
+>"4.0" : Symbol("4.0", Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 33, 16))
+
 };
 
 // error
@@ -83,14 +102,20 @@ var b: { [x: number]: A } = {
 >A : Symbol(A, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 0, 0))
 
     1.0: new A(), 
+>1.0 : Symbol(1.0, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 38, 29))
 >A : Symbol(A, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 0, 0))
 
     2.0: new B(), 
+>2.0 : Symbol(2.0, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 39, 17))
 >B : Symbol(B, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 4, 1))
 
     "2.5": new B(),
+>"2.5" : Symbol("2.5", Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 40, 17))
 >B : Symbol(B, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 4, 1))
 
     3.0: 1,
+>3.0 : Symbol(3.0, Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 41, 19))
+
     "4.0": ''
+>"4.0" : Symbol("4.0", Decl(numericIndexerConstrainsPropertyDeclarations2.ts, 42, 11))
 }
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
index ea535650cd1..f0c53f8388c 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
@@ -26,16 +26,22 @@ class Foo {
 >A : A
 
     1.0: A; // ok
+>1.0 : A
 >A : A
 
     2.0: B; // ok
+>2.0 : B
 >B : B
 
     "2.5": B // ok
+>"2.5" : B
 >B : B
 
     3.0: number; // error
+>3.0 : number
+
     "4.0": string; // error
+>"4.0" : string
 }
 
 interface Foo2 {
@@ -46,16 +52,22 @@ interface Foo2 {
 >A : A
 
     1.0: A; // ok
+>1.0 : A
 >A : A
 
     2.0: B; // ok
+>2.0 : B
 >B : B
 
     "2.5": B // ok
+>"2.5" : B
 >B : B
 
     3.0: number; // error
+>3.0 : number
+
     "4.0": string; // error
+>"4.0" : string
 }
 
 var a: {
@@ -66,16 +78,23 @@ var a: {
 >A : A
 
     1.0: A; // ok
+>1.0 : A
 >A : A
 
     2.0: B; // ok
+>2.0 : B
 >B : B
 
     "2.5": B // ok
+>"2.5" : B
 >B : B
 
     3.0: number; // error
+>3.0 : number
+
     "4.0": string; // error
+>"4.0" : string
+
 };
 
 // error
@@ -86,20 +105,25 @@ var b: { [x: number]: A } = {
 >{    1.0: new A(),     2.0: new B(),     "2.5": new B(),    3.0: 1,    "4.0": ''} : { 1.0: A; 2.0: B; "2.5": B; 3.0: number; "4.0": string; }
 
     1.0: new A(), 
+>1.0 : A
 >new A() : A
 >A : typeof A
 
     2.0: new B(), 
+>2.0 : B
 >new B() : B
 >B : typeof B
 
     "2.5": new B(),
+>"2.5" : B
 >new B() : B
 >B : typeof B
 
     3.0: 1,
+>3.0 : number
 >1 : 1
 
     "4.0": ''
+>"4.0" : string
 >'' : ""
 }
diff --git a/tests/baselines/reference/numericIndexerConstraint.symbols b/tests/baselines/reference/numericIndexerConstraint.symbols
index 3f6a42db9d7..dac9892c128 100644
--- a/tests/baselines/reference/numericIndexerConstraint.symbols
+++ b/tests/baselines/reference/numericIndexerConstraint.symbols
@@ -3,6 +3,8 @@ class C {
 >C : Symbol(C, Decl(numericIndexerConstraint.ts, 0, 0))
 
     0: number;
+>0 : Symbol(C[0], Decl(numericIndexerConstraint.ts, 0, 9))
+
     [x: number]: RegExp;
 >x : Symbol(x, Decl(numericIndexerConstraint.ts, 2, 5))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
diff --git a/tests/baselines/reference/numericIndexerConstraint.types b/tests/baselines/reference/numericIndexerConstraint.types
index a1d11ae6416..217a652898d 100644
--- a/tests/baselines/reference/numericIndexerConstraint.types
+++ b/tests/baselines/reference/numericIndexerConstraint.types
@@ -3,6 +3,8 @@ class C {
 >C : C
 
     0: number;
+>0 : number
+
     [x: number]: RegExp;
 >x : number
 >RegExp : RegExp
diff --git a/tests/baselines/reference/numericIndexerConstraint3.symbols b/tests/baselines/reference/numericIndexerConstraint3.symbols
index 5b784742ad8..b3b030b25c3 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.symbols
+++ b/tests/baselines/reference/numericIndexerConstraint3.symbols
@@ -18,6 +18,7 @@ class C {
 >C : Symbol(C, Decl(numericIndexerConstraint3.ts, 6, 1))
 
     0: B;
+>0 : Symbol(C[0], Decl(numericIndexerConstraint3.ts, 8, 9))
 >B : Symbol(B, Decl(numericIndexerConstraint3.ts, 2, 1))
 
     [x: number]: A;
diff --git a/tests/baselines/reference/numericIndexerConstraint3.types b/tests/baselines/reference/numericIndexerConstraint3.types
index 2e249c89b8c..a562e1727ab 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.types
+++ b/tests/baselines/reference/numericIndexerConstraint3.types
@@ -18,6 +18,7 @@ class C {
 >C : C
 
     0: B;
+>0 : B
 >B : B
 
     [x: number]: A;
diff --git a/tests/baselines/reference/numericIndexerConstraint4.symbols b/tests/baselines/reference/numericIndexerConstraint4.symbols
index 8edf7d0f6fe..05b54c512bd 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.symbols
+++ b/tests/baselines/reference/numericIndexerConstraint4.symbols
@@ -22,5 +22,6 @@ var x: {
 >A : Symbol(A, Decl(numericIndexerConstraint4.ts, 0, 0))
 
 } = { 0: new B() }
+>0 : Symbol(0, Decl(numericIndexerConstraint4.ts, 10, 5))
 >B : Symbol(B, Decl(numericIndexerConstraint4.ts, 2, 1))
 
diff --git a/tests/baselines/reference/numericIndexerConstraint4.types b/tests/baselines/reference/numericIndexerConstraint4.types
index c8cda0e6be2..e434ec83b40 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.types
+++ b/tests/baselines/reference/numericIndexerConstraint4.types
@@ -23,6 +23,7 @@ var x: {
 
 } = { 0: new B() }
 >{ 0: new B() } : { 0: B; }
+>0 : B
 >new B() : B
 >B : typeof B
 
diff --git a/tests/baselines/reference/numericIndexerConstraint5.symbols b/tests/baselines/reference/numericIndexerConstraint5.symbols
index ff4183c9e9a..47a0a178328 100644
--- a/tests/baselines/reference/numericIndexerConstraint5.symbols
+++ b/tests/baselines/reference/numericIndexerConstraint5.symbols
@@ -2,6 +2,7 @@
 var x = { name: "x", 0: new Date() };
 >x : Symbol(x, Decl(numericIndexerConstraint5.ts, 0, 3))
 >name : Symbol(name, Decl(numericIndexerConstraint5.ts, 0, 9))
+>0 : Symbol(0, Decl(numericIndexerConstraint5.ts, 0, 20))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var z: { [name: number]: string } = x;
diff --git a/tests/baselines/reference/numericIndexerConstraint5.types b/tests/baselines/reference/numericIndexerConstraint5.types
index 0f19dfa6b90..1f215e2b2dd 100644
--- a/tests/baselines/reference/numericIndexerConstraint5.types
+++ b/tests/baselines/reference/numericIndexerConstraint5.types
@@ -4,6 +4,7 @@ var x = { name: "x", 0: new Date() };
 >{ name: "x", 0: new Date() } : { name: string; 0: Date; }
 >name : string
 >"x" : "x"
+>0 : Date
 >new Date() : Date
 >Date : DateConstructor
 
diff --git a/tests/baselines/reference/numericIndexingResults.symbols b/tests/baselines/reference/numericIndexingResults.symbols
index 49a38fef567..f1357c272f1 100644
--- a/tests/baselines/reference/numericIndexingResults.symbols
+++ b/tests/baselines/reference/numericIndexingResults.symbols
@@ -6,7 +6,10 @@ class C {
 >x : Symbol(x, Decl(numericIndexingResults.ts, 1, 5))
 
     1 = '';
+>1 : Symbol(C[1], Decl(numericIndexingResults.ts, 1, 24))
+
     "2" = ''
+>"2" : Symbol(C["2"], Decl(numericIndexingResults.ts, 2, 11))
 }
 
 var c: C;
@@ -48,7 +51,10 @@ interface I {
 >x : Symbol(x, Decl(numericIndexingResults.ts, 15, 5))
 
     1: string;
+>1 : Symbol(I[1], Decl(numericIndexingResults.ts, 15, 24))
+
     "2": string;
+>"2" : Symbol(I["2"], Decl(numericIndexingResults.ts, 16, 14))
 }
 
 var i: I
@@ -90,7 +96,10 @@ var a: {
 >x : Symbol(x, Decl(numericIndexingResults.ts, 29, 5))
 
     1: string;
+>1 : Symbol(1, Decl(numericIndexingResults.ts, 29, 24))
+
     "2": string;
+>"2" : Symbol("2", Decl(numericIndexingResults.ts, 30, 14))
 }
 
 var r1 = a['1'];
@@ -124,6 +133,8 @@ var r6 = a[3];
 var b: { [x: number]: string } = { 1: '', "2": '' }
 >b : Symbol(b, Decl(numericIndexingResults.ts, 41, 3))
 >x : Symbol(x, Decl(numericIndexingResults.ts, 41, 10))
+>1 : Symbol(1, Decl(numericIndexingResults.ts, 41, 34))
+>"2" : Symbol("2", Decl(numericIndexingResults.ts, 41, 41))
 
 var r1a = b['1'];
 >r1a : Symbol(r1a, Decl(numericIndexingResults.ts, 42, 3))
@@ -152,6 +163,10 @@ var r6 = b[3];
 var b2: { [x: number]: string; 1: string; "2": string; } = { 1: '', "2": '' }
 >b2 : Symbol(b2, Decl(numericIndexingResults.ts, 49, 3))
 >x : Symbol(x, Decl(numericIndexingResults.ts, 49, 11))
+>1 : Symbol(1, Decl(numericIndexingResults.ts, 49, 30))
+>"2" : Symbol("2", Decl(numericIndexingResults.ts, 49, 41))
+>1 : Symbol(1, Decl(numericIndexingResults.ts, 49, 60))
+>"2" : Symbol("2", Decl(numericIndexingResults.ts, 49, 67))
 
 var r1b = b2['1'];
 >r1b : Symbol(r1b, Decl(numericIndexingResults.ts, 50, 3))
diff --git a/tests/baselines/reference/numericIndexingResults.types b/tests/baselines/reference/numericIndexingResults.types
index 8d25a44eab0..c8f46336721 100644
--- a/tests/baselines/reference/numericIndexingResults.types
+++ b/tests/baselines/reference/numericIndexingResults.types
@@ -6,9 +6,11 @@ class C {
 >x : number
 
     1 = '';
+>1 : string
 >'' : ""
 
     "2" = ''
+>"2" : string
 >'' : ""
 }
 
@@ -59,7 +61,10 @@ interface I {
 >x : number
 
     1: string;
+>1 : string
+
     "2": string;
+>"2" : string
 }
 
 var i: I
@@ -109,7 +114,10 @@ var a: {
 >x : number
 
     1: string;
+>1 : string
+
     "2": string;
+>"2" : string
 }
 
 var r1 = a['1'];
@@ -152,7 +160,9 @@ var b: { [x: number]: string } = { 1: '', "2": '' }
 >b : { [x: number]: string; }
 >x : number
 >{ 1: '', "2": '' } : { 1: string; "2": string; }
+>1 : string
 >'' : ""
+>"2" : string
 >'' : ""
 
 var r1a = b['1'];
@@ -194,8 +204,12 @@ var r6 = b[3];
 var b2: { [x: number]: string; 1: string; "2": string; } = { 1: '', "2": '' }
 >b2 : { [x: number]: string; 1: string; "2": string; }
 >x : number
+>1 : string
+>"2" : string
 >{ 1: '', "2": '' } : { 1: string; "2": string; }
+>1 : string
 >'' : ""
+>"2" : string
 >'' : ""
 
 var r1b = b2['1'];
diff --git a/tests/baselines/reference/numericMethodName1.symbols b/tests/baselines/reference/numericMethodName1.symbols
index a2ecd29e8e7..a16a634c9d7 100644
--- a/tests/baselines/reference/numericMethodName1.symbols
+++ b/tests/baselines/reference/numericMethodName1.symbols
@@ -3,5 +3,6 @@ class C {
 >C : Symbol(C, Decl(numericMethodName1.ts, 0, 0))
 
   1 = 2;
+>1 : Symbol(C[1], Decl(numericMethodName1.ts, 0, 9))
 }
 
diff --git a/tests/baselines/reference/numericMethodName1.types b/tests/baselines/reference/numericMethodName1.types
index 4f907f06feb..d93723e1b12 100644
--- a/tests/baselines/reference/numericMethodName1.types
+++ b/tests/baselines/reference/numericMethodName1.types
@@ -3,6 +3,7 @@ class C {
 >C : C
 
   1 = 2;
+>1 : number
 >2 : 2
 }
 
diff --git a/tests/baselines/reference/numericNamedPropertyDuplicates.symbols b/tests/baselines/reference/numericNamedPropertyDuplicates.symbols
index 11c0d939d89..a2cd812f363 100644
--- a/tests/baselines/reference/numericNamedPropertyDuplicates.symbols
+++ b/tests/baselines/reference/numericNamedPropertyDuplicates.symbols
@@ -3,28 +3,44 @@ class C {
 >C : Symbol(C, Decl(numericNamedPropertyDuplicates.ts, 0, 0))
 
     1: number;
+>1 : Symbol(C[1], Decl(numericNamedPropertyDuplicates.ts, 0, 9), Decl(numericNamedPropertyDuplicates.ts, 1, 14))
+
     1.0: number;
+>1.0 : Symbol(C[1], Decl(numericNamedPropertyDuplicates.ts, 0, 9), Decl(numericNamedPropertyDuplicates.ts, 1, 14))
+
     static 2: number;
+>2 : Symbol(C[2], Decl(numericNamedPropertyDuplicates.ts, 2, 16), Decl(numericNamedPropertyDuplicates.ts, 3, 21))
+
     static 2: number;
+>2 : Symbol(C[2], Decl(numericNamedPropertyDuplicates.ts, 2, 16), Decl(numericNamedPropertyDuplicates.ts, 3, 21))
 }
 
 interface I {
 >I : Symbol(I, Decl(numericNamedPropertyDuplicates.ts, 5, 1))
 
     2: number;
+>2 : Symbol(I[2], Decl(numericNamedPropertyDuplicates.ts, 7, 13), Decl(numericNamedPropertyDuplicates.ts, 8, 14))
+
     2.: number;
+>2. : Symbol(I[2], Decl(numericNamedPropertyDuplicates.ts, 7, 13), Decl(numericNamedPropertyDuplicates.ts, 8, 14))
 }
 
 var a: {
 >a : Symbol(a, Decl(numericNamedPropertyDuplicates.ts, 12, 3))
 
     1: number;
+>1 : Symbol(1, Decl(numericNamedPropertyDuplicates.ts, 12, 8), Decl(numericNamedPropertyDuplicates.ts, 13, 14))
+
     1: number;
+>1 : Symbol(1, Decl(numericNamedPropertyDuplicates.ts, 12, 8), Decl(numericNamedPropertyDuplicates.ts, 13, 14))
 }
 
 var b = {
 >b : Symbol(b, Decl(numericNamedPropertyDuplicates.ts, 17, 3))
 
     2: 1
+>2 : Symbol(2, Decl(numericNamedPropertyDuplicates.ts, 17, 9), Decl(numericNamedPropertyDuplicates.ts, 18, 8))
+
     2: 1
+>2 : Symbol(2, Decl(numericNamedPropertyDuplicates.ts, 17, 9), Decl(numericNamedPropertyDuplicates.ts, 18, 8))
 }
diff --git a/tests/baselines/reference/numericNamedPropertyDuplicates.types b/tests/baselines/reference/numericNamedPropertyDuplicates.types
index 8019c365a7c..bf62dcfed09 100644
--- a/tests/baselines/reference/numericNamedPropertyDuplicates.types
+++ b/tests/baselines/reference/numericNamedPropertyDuplicates.types
@@ -3,23 +3,36 @@ class C {
 >C : C
 
     1: number;
+>1 : number
+
     1.0: number;
+>1.0 : number
+
     static 2: number;
+>2 : number
+
     static 2: number;
+>2 : number
 }
 
 interface I {
 >I : I
 
     2: number;
+>2 : number
+
     2.: number;
+>2. : number
 }
 
 var a: {
 >a : { 1: number; }
 
     1: number;
+>1 : number
+
     1: number;
+>1 : number
 }
 
 var b = {
@@ -27,8 +40,10 @@ var b = {
 >{    2: 1    2: 1} : { 2: number; }
 
     2: 1
+>2 : number
 >1 : 1
 
     2: 1
+>2 : number
 >1 : 1
 }
diff --git a/tests/baselines/reference/numericStringNamedPropertyEquivalence.symbols b/tests/baselines/reference/numericStringNamedPropertyEquivalence.symbols
index 5589ca64fde..e0691045621 100644
--- a/tests/baselines/reference/numericStringNamedPropertyEquivalence.symbols
+++ b/tests/baselines/reference/numericStringNamedPropertyEquivalence.symbols
@@ -5,28 +5,44 @@ class C {
 >C : Symbol(C, Decl(numericStringNamedPropertyEquivalence.ts, 0, 0))
 
     "1": number;
+>"1" : Symbol(C["1"], Decl(numericStringNamedPropertyEquivalence.ts, 2, 9), Decl(numericStringNamedPropertyEquivalence.ts, 4, 18))
+
     "1.0": number; // not a duplicate
+>"1.0" : Symbol(C["1.0"], Decl(numericStringNamedPropertyEquivalence.ts, 3, 16))
+
     1.0: number;
+>1.0 : Symbol(C["1"], Decl(numericStringNamedPropertyEquivalence.ts, 2, 9), Decl(numericStringNamedPropertyEquivalence.ts, 4, 18))
 }
 
 interface I {
 >I : Symbol(I, Decl(numericStringNamedPropertyEquivalence.ts, 6, 1))
 
     "1": number;
+>"1" : Symbol(I["1"], Decl(numericStringNamedPropertyEquivalence.ts, 8, 13), Decl(numericStringNamedPropertyEquivalence.ts, 10, 17))
+
     "1.": number; // not a duplicate
+>"1." : Symbol(I["1."], Decl(numericStringNamedPropertyEquivalence.ts, 9, 16))
+
     1: number;
+>1 : Symbol(I["1"], Decl(numericStringNamedPropertyEquivalence.ts, 8, 13), Decl(numericStringNamedPropertyEquivalence.ts, 10, 17))
 }
 
 var a: {
 >a : Symbol(a, Decl(numericStringNamedPropertyEquivalence.ts, 14, 3))
 
     "1": number;
+>"1" : Symbol("1", Decl(numericStringNamedPropertyEquivalence.ts, 14, 8), Decl(numericStringNamedPropertyEquivalence.ts, 15, 16))
+
     1.0: string;
+>1.0 : Symbol("1", Decl(numericStringNamedPropertyEquivalence.ts, 14, 8), Decl(numericStringNamedPropertyEquivalence.ts, 15, 16))
 }
 
 var b = {
 >b : Symbol(b, Decl(numericStringNamedPropertyEquivalence.ts, 19, 3))
 
     "0": '',
+>"0" : Symbol("0", Decl(numericStringNamedPropertyEquivalence.ts, 19, 9), Decl(numericStringNamedPropertyEquivalence.ts, 20, 12))
+
     0: ''
+>0 : Symbol("0", Decl(numericStringNamedPropertyEquivalence.ts, 19, 9), Decl(numericStringNamedPropertyEquivalence.ts, 20, 12))
 }
diff --git a/tests/baselines/reference/numericStringNamedPropertyEquivalence.types b/tests/baselines/reference/numericStringNamedPropertyEquivalence.types
index a1f97ba4c8f..0e91edd32eb 100644
--- a/tests/baselines/reference/numericStringNamedPropertyEquivalence.types
+++ b/tests/baselines/reference/numericStringNamedPropertyEquivalence.types
@@ -5,23 +5,36 @@ class C {
 >C : C
 
     "1": number;
+>"1" : number
+
     "1.0": number; // not a duplicate
+>"1.0" : number
+
     1.0: number;
+>1.0 : number
 }
 
 interface I {
 >I : I
 
     "1": number;
+>"1" : number
+
     "1.": number; // not a duplicate
+>"1." : number
+
     1: number;
+>1 : number
 }
 
 var a: {
 >a : { "1": number; }
 
     "1": number;
+>"1" : number
+
     1.0: string;
+>1.0 : number
 }
 
 var b = {
@@ -29,8 +42,10 @@ var b = {
 >{    "0": '',    0: ''} : { "0": string; }
 
     "0": '',
+>"0" : string
 >'' : ""
 
     0: ''
+>0 : string
 >'' : ""
 }
diff --git a/tests/baselines/reference/objectLitIndexerContextualType.symbols b/tests/baselines/reference/objectLitIndexerContextualType.symbols
index e460d9e99dd..0e49f9eecd5 100644
--- a/tests/baselines/reference/objectLitIndexerContextualType.symbols
+++ b/tests/baselines/reference/objectLitIndexerContextualType.symbols
@@ -37,6 +37,7 @@ x = {
 >x : Symbol(x, Decl(objectLitIndexerContextualType.ts, 8, 3))
 
     0: t => t * t, // Should error
+>0 : Symbol(0, Decl(objectLitIndexerContextualType.ts, 13, 5))
 >t : Symbol(t, Decl(objectLitIndexerContextualType.ts, 14, 6))
 >t : Symbol(t, Decl(objectLitIndexerContextualType.ts, 14, 6))
 >t : Symbol(t, Decl(objectLitIndexerContextualType.ts, 14, 6))
@@ -56,6 +57,7 @@ y = {
 >y : Symbol(y, Decl(objectLitIndexerContextualType.ts, 9, 3))
 
     0: t => t * t, // Should error
+>0 : Symbol(0, Decl(objectLitIndexerContextualType.ts, 19, 5))
 >t : Symbol(t, Decl(objectLitIndexerContextualType.ts, 20, 6))
 >t : Symbol(t, Decl(objectLitIndexerContextualType.ts, 20, 6))
 >t : Symbol(t, Decl(objectLitIndexerContextualType.ts, 20, 6))
diff --git a/tests/baselines/reference/objectLitIndexerContextualType.types b/tests/baselines/reference/objectLitIndexerContextualType.types
index f98ad11ae00..0a49fdc72fc 100644
--- a/tests/baselines/reference/objectLitIndexerContextualType.types
+++ b/tests/baselines/reference/objectLitIndexerContextualType.types
@@ -43,6 +43,7 @@ x = {
 >{    0: t => t * t, // Should error} : { 0: (t: string) => number; }
 
     0: t => t * t, // Should error
+>0 : (t: string) => number
 >t => t * t : (t: string) => number
 >t : string
 >t * t : number
@@ -70,6 +71,7 @@ y = {
 >{    0: t => t * t, // Should error} : { 0: (t: string) => number; }
 
     0: t => t * t, // Should error
+>0 : (t: string) => number
 >t => t * t : (t: string) => number
 >t : string
 >t * t : number
diff --git a/tests/baselines/reference/objectLiteralEnumPropertyNames.symbols b/tests/baselines/reference/objectLiteralEnumPropertyNames.symbols
index 594af3c3f99..7be36605b8c 100644
--- a/tests/baselines/reference/objectLiteralEnumPropertyNames.symbols
+++ b/tests/baselines/reference/objectLiteralEnumPropertyNames.symbols
@@ -88,6 +88,8 @@ enum Nums {
 }
 type TestNums = { 0: number, 1: number }
 >TestNums : Symbol(TestNums, Decl(objectLiteralEnumPropertyNames.ts, 32, 1))
+>0 : Symbol(0, Decl(objectLiteralEnumPropertyNames.ts, 33, 17))
+>1 : Symbol(1, Decl(objectLiteralEnumPropertyNames.ts, 33, 28))
 
 const n: TestNums = {
 >n : Symbol(n, Decl(objectLiteralEnumPropertyNames.ts, 34, 5))
diff --git a/tests/baselines/reference/objectLiteralEnumPropertyNames.types b/tests/baselines/reference/objectLiteralEnumPropertyNames.types
index 460d96bc56d..6ba33d1286b 100644
--- a/tests/baselines/reference/objectLiteralEnumPropertyNames.types
+++ b/tests/baselines/reference/objectLiteralEnumPropertyNames.types
@@ -107,6 +107,8 @@ enum Nums {
 }
 type TestNums = { 0: number, 1: number }
 >TestNums : TestNums
+>0 : number
+>1 : number
 
 const n: TestNums = {
 >n : TestNums
diff --git a/tests/baselines/reference/objectLiteralErrors.symbols b/tests/baselines/reference/objectLiteralErrors.symbols
index d4a2ffe178c..94600906a2a 100644
--- a/tests/baselines/reference/objectLiteralErrors.symbols
+++ b/tests/baselines/reference/objectLiteralErrors.symbols
@@ -28,40 +28,62 @@ var e5 = { a: {}, a: {} };
 var e6 = { a: 0, 'a': 0 };
 >e6 : Symbol(e6, Decl(objectLiteralErrors.ts, 6, 3))
 >a : Symbol(a, Decl(objectLiteralErrors.ts, 6, 10), Decl(objectLiteralErrors.ts, 6, 16))
+>'a' : Symbol(a, Decl(objectLiteralErrors.ts, 6, 10), Decl(objectLiteralErrors.ts, 6, 16))
 
 var e7 = { 'a': 0, a: 0 };
 >e7 : Symbol(e7, Decl(objectLiteralErrors.ts, 7, 3))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 7, 10), Decl(objectLiteralErrors.ts, 7, 18))
 >a : Symbol('a', Decl(objectLiteralErrors.ts, 7, 10), Decl(objectLiteralErrors.ts, 7, 18))
 
 var e8 = { 'a': 0, "a": 0 };
 >e8 : Symbol(e8, Decl(objectLiteralErrors.ts, 8, 3))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 8, 10), Decl(objectLiteralErrors.ts, 8, 18))
+>"a" : Symbol('a', Decl(objectLiteralErrors.ts, 8, 10), Decl(objectLiteralErrors.ts, 8, 18))
 
 var e9 = { 'a': 0, 'a': 0 };
 >e9 : Symbol(e9, Decl(objectLiteralErrors.ts, 9, 3))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 9, 10), Decl(objectLiteralErrors.ts, 9, 18))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 9, 10), Decl(objectLiteralErrors.ts, 9, 18))
 
 var e10 = { "a": 0, 'a': 0 };
 >e10 : Symbol(e10, Decl(objectLiteralErrors.ts, 10, 3))
+>"a" : Symbol("a", Decl(objectLiteralErrors.ts, 10, 11), Decl(objectLiteralErrors.ts, 10, 19))
+>'a' : Symbol("a", Decl(objectLiteralErrors.ts, 10, 11), Decl(objectLiteralErrors.ts, 10, 19))
 
 var e11 = { 1.0: 0, '1': 0 };
 >e11 : Symbol(e11, Decl(objectLiteralErrors.ts, 11, 3))
+>1.0 : Symbol(1.0, Decl(objectLiteralErrors.ts, 11, 11), Decl(objectLiteralErrors.ts, 11, 19))
+>'1' : Symbol(1.0, Decl(objectLiteralErrors.ts, 11, 11), Decl(objectLiteralErrors.ts, 11, 19))
 
 var e12 = { 0: 0, 0: 0 };
 >e12 : Symbol(e12, Decl(objectLiteralErrors.ts, 12, 3))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 12, 11), Decl(objectLiteralErrors.ts, 12, 17))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 12, 11), Decl(objectLiteralErrors.ts, 12, 17))
 
 var e13 = { 0: 0, 0: 0 };
 >e13 : Symbol(e13, Decl(objectLiteralErrors.ts, 13, 3))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 13, 11), Decl(objectLiteralErrors.ts, 13, 17))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 13, 11), Decl(objectLiteralErrors.ts, 13, 17))
 
 var e14 = { 0: 0, 0x0: 0 };
 >e14 : Symbol(e14, Decl(objectLiteralErrors.ts, 14, 3), Decl(objectLiteralErrors.ts, 15, 3))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 14, 11), Decl(objectLiteralErrors.ts, 14, 17))
+>0x0 : Symbol(0, Decl(objectLiteralErrors.ts, 14, 11), Decl(objectLiteralErrors.ts, 14, 17))
 
 var e14 = { 0: 0, 000: 0 };
 >e14 : Symbol(e14, Decl(objectLiteralErrors.ts, 14, 3), Decl(objectLiteralErrors.ts, 15, 3))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 15, 11), Decl(objectLiteralErrors.ts, 15, 17))
+>000 : Symbol(0, Decl(objectLiteralErrors.ts, 15, 11), Decl(objectLiteralErrors.ts, 15, 17))
 
 var e15 = { "100": 0, 1e2: 0 };
 >e15 : Symbol(e15, Decl(objectLiteralErrors.ts, 16, 3))
+>"100" : Symbol("100", Decl(objectLiteralErrors.ts, 16, 11), Decl(objectLiteralErrors.ts, 16, 21))
+>1e2 : Symbol("100", Decl(objectLiteralErrors.ts, 16, 11), Decl(objectLiteralErrors.ts, 16, 21))
 
 var e16 = { 0x20: 0, 3.2e1: 0 };
 >e16 : Symbol(e16, Decl(objectLiteralErrors.ts, 17, 3))
+>0x20 : Symbol(0x20, Decl(objectLiteralErrors.ts, 17, 11), Decl(objectLiteralErrors.ts, 17, 20))
+>3.2e1 : Symbol(0x20, Decl(objectLiteralErrors.ts, 17, 11), Decl(objectLiteralErrors.ts, 17, 20))
 
 var e17 = { a: 0, b: 1, a: 0 };
 >e17 : Symbol(e17, Decl(objectLiteralErrors.ts, 18, 3))
@@ -98,40 +120,62 @@ var f5 = { a: {}, get a() { return {}; } };
 var f6 = { a: 0, get 'a'() { return 0; } };
 >f6 : Symbol(f6, Decl(objectLiteralErrors.ts, 26, 3))
 >a : Symbol(a, Decl(objectLiteralErrors.ts, 26, 10))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 26, 16))
 
 var f7 = { 'a': 0, get a() { return 0; } };
 >f7 : Symbol(f7, Decl(objectLiteralErrors.ts, 27, 3))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 27, 10))
 >a : Symbol(a, Decl(objectLiteralErrors.ts, 27, 18))
 
 var f8 = { 'a': 0, get "a"() { return 0; } };
 >f8 : Symbol(f8, Decl(objectLiteralErrors.ts, 28, 3))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 28, 10))
+>"a" : Symbol("a", Decl(objectLiteralErrors.ts, 28, 18))
 
 var f9 = { 'a': 0, get 'a'() { return 0; } };
 >f9 : Symbol(f9, Decl(objectLiteralErrors.ts, 29, 3))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 29, 10))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 29, 18))
 
 var f10 = { "a": 0, get 'a'() { return 0; } };
 >f10 : Symbol(f10, Decl(objectLiteralErrors.ts, 30, 3))
+>"a" : Symbol("a", Decl(objectLiteralErrors.ts, 30, 11))
+>'a' : Symbol('a', Decl(objectLiteralErrors.ts, 30, 19))
 
 var f11 = { 1.0: 0, get '1'() { return 0; } };
 >f11 : Symbol(f11, Decl(objectLiteralErrors.ts, 31, 3))
+>1.0 : Symbol(1.0, Decl(objectLiteralErrors.ts, 31, 11))
+>'1' : Symbol('1', Decl(objectLiteralErrors.ts, 31, 19))
 
 var f12 = { 0: 0, get 0() { return 0; } };
 >f12 : Symbol(f12, Decl(objectLiteralErrors.ts, 32, 3))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 32, 11))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 32, 17))
 
 var f13 = { 0: 0, get 0() { return 0; } };
 >f13 : Symbol(f13, Decl(objectLiteralErrors.ts, 33, 3))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 33, 11))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 33, 17))
 
 var f14 = { 0: 0, get 0x0() { return 0; } };
 >f14 : Symbol(f14, Decl(objectLiteralErrors.ts, 34, 3), Decl(objectLiteralErrors.ts, 35, 3))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 34, 11))
+>0x0 : Symbol(0x0, Decl(objectLiteralErrors.ts, 34, 17))
 
 var f14 = { 0: 0, get 000() { return 0; } };
 >f14 : Symbol(f14, Decl(objectLiteralErrors.ts, 34, 3), Decl(objectLiteralErrors.ts, 35, 3))
+>0 : Symbol(0, Decl(objectLiteralErrors.ts, 35, 11))
+>000 : Symbol(000, Decl(objectLiteralErrors.ts, 35, 17))
 
 var f15 = { "100": 0, get 1e2() { return 0; } };
 >f15 : Symbol(f15, Decl(objectLiteralErrors.ts, 36, 3))
+>"100" : Symbol("100", Decl(objectLiteralErrors.ts, 36, 11))
+>1e2 : Symbol(1e2, Decl(objectLiteralErrors.ts, 36, 21))
 
 var f16 = { 0x20: 0, get 3.2e1() { return 0; } };
 >f16 : Symbol(f16, Decl(objectLiteralErrors.ts, 37, 3))
+>0x20 : Symbol(0x20, Decl(objectLiteralErrors.ts, 37, 11))
+>3.2e1 : Symbol(3.2e1, Decl(objectLiteralErrors.ts, 37, 20))
 
 var f17 = { a: 0, get b() { return 1; }, get a() { return 0; } };
 >f17 : Symbol(f17, Decl(objectLiteralErrors.ts, 38, 3))
diff --git a/tests/baselines/reference/objectLiteralErrors.types b/tests/baselines/reference/objectLiteralErrors.types
index ed0d2fc9aa1..800ab2fe8d0 100644
--- a/tests/baselines/reference/objectLiteralErrors.types
+++ b/tests/baselines/reference/objectLiteralErrors.types
@@ -45,11 +45,13 @@ var e6 = { a: 0, 'a': 0 };
 >{ a: 0, 'a': 0 } : { a: number; }
 >a : number
 >0 : 0
+>'a' : number
 >0 : 0
 
 var e7 = { 'a': 0, a: 0 };
 >e7 : { 'a': number; }
 >{ 'a': 0, a: 0 } : { 'a': number; }
+>'a' : number
 >0 : 0
 >a : number
 >0 : 0
@@ -57,61 +59,81 @@ var e7 = { 'a': 0, a: 0 };
 var e8 = { 'a': 0, "a": 0 };
 >e8 : { 'a': number; }
 >{ 'a': 0, "a": 0 } : { 'a': number; }
+>'a' : number
 >0 : 0
+>"a" : number
 >0 : 0
 
 var e9 = { 'a': 0, 'a': 0 };
 >e9 : { 'a': number; }
 >{ 'a': 0, 'a': 0 } : { 'a': number; }
+>'a' : number
 >0 : 0
+>'a' : number
 >0 : 0
 
 var e10 = { "a": 0, 'a': 0 };
 >e10 : { "a": number; }
 >{ "a": 0, 'a': 0 } : { "a": number; }
+>"a" : number
 >0 : 0
+>'a' : number
 >0 : 0
 
 var e11 = { 1.0: 0, '1': 0 };
 >e11 : { 1.0: number; }
 >{ 1.0: 0, '1': 0 } : { 1.0: number; }
+>1.0 : number
 >0 : 0
+>'1' : number
 >0 : 0
 
 var e12 = { 0: 0, 0: 0 };
 >e12 : { 0: number; }
 >{ 0: 0, 0: 0 } : { 0: number; }
+>0 : number
 >0 : 0
+>0 : number
 >0 : 0
 
 var e13 = { 0: 0, 0: 0 };
 >e13 : { 0: number; }
 >{ 0: 0, 0: 0 } : { 0: number; }
+>0 : number
 >0 : 0
+>0 : number
 >0 : 0
 
 var e14 = { 0: 0, 0x0: 0 };
 >e14 : { 0: number; }
 >{ 0: 0, 0x0: 0 } : { 0: number; }
+>0 : number
 >0 : 0
+>0x0 : number
 >0 : 0
 
 var e14 = { 0: 0, 000: 0 };
 >e14 : { 0: number; }
 >{ 0: 0, 000: 0 } : { 0: number; }
+>0 : number
 >0 : 0
+>000 : number
 >0 : 0
 
 var e15 = { "100": 0, 1e2: 0 };
 >e15 : { "100": number; }
 >{ "100": 0, 1e2: 0 } : { "100": number; }
+>"100" : number
 >0 : 0
+>1e2 : number
 >0 : 0
 
 var e16 = { 0x20: 0, 3.2e1: 0 };
 >e16 : { 0x20: number; }
 >{ 0x20: 0, 3.2e1: 0 } : { 0x20: number; }
+>0x20 : number
 >0 : 0
+>3.2e1 : number
 >0 : 0
 
 var e17 = { a: 0, b: 1, a: 0 };
@@ -170,11 +192,13 @@ var f6 = { a: 0, get 'a'() { return 0; } };
 >{ a: 0, get 'a'() { return 0; } } : { readonly 'a': number; }
 >a : number
 >0 : 0
+>'a' : number
 >0 : 0
 
 var f7 = { 'a': 0, get a() { return 0; } };
 >f7 : { readonly a: number; }
 >{ 'a': 0, get a() { return 0; } } : { readonly a: number; }
+>'a' : number
 >0 : 0
 >a : number
 >0 : 0
@@ -182,61 +206,81 @@ var f7 = { 'a': 0, get a() { return 0; } };
 var f8 = { 'a': 0, get "a"() { return 0; } };
 >f8 : { readonly "a": number; }
 >{ 'a': 0, get "a"() { return 0; } } : { readonly "a": number; }
+>'a' : number
 >0 : 0
+>"a" : number
 >0 : 0
 
 var f9 = { 'a': 0, get 'a'() { return 0; } };
 >f9 : { readonly 'a': number; }
 >{ 'a': 0, get 'a'() { return 0; } } : { readonly 'a': number; }
+>'a' : number
 >0 : 0
+>'a' : number
 >0 : 0
 
 var f10 = { "a": 0, get 'a'() { return 0; } };
 >f10 : { readonly 'a': number; }
 >{ "a": 0, get 'a'() { return 0; } } : { readonly 'a': number; }
+>"a" : number
 >0 : 0
+>'a' : number
 >0 : 0
 
 var f11 = { 1.0: 0, get '1'() { return 0; } };
 >f11 : { readonly '1': number; }
 >{ 1.0: 0, get '1'() { return 0; } } : { readonly '1': number; }
+>1.0 : number
 >0 : 0
+>'1' : number
 >0 : 0
 
 var f12 = { 0: 0, get 0() { return 0; } };
 >f12 : { readonly 0: number; }
 >{ 0: 0, get 0() { return 0; } } : { readonly 0: number; }
+>0 : number
 >0 : 0
+>0 : number
 >0 : 0
 
 var f13 = { 0: 0, get 0() { return 0; } };
 >f13 : { readonly 0: number; }
 >{ 0: 0, get 0() { return 0; } } : { readonly 0: number; }
+>0 : number
 >0 : 0
+>0 : number
 >0 : 0
 
 var f14 = { 0: 0, get 0x0() { return 0; } };
 >f14 : { readonly 0x0: number; }
 >{ 0: 0, get 0x0() { return 0; } } : { readonly 0x0: number; }
+>0 : number
 >0 : 0
+>0x0 : number
 >0 : 0
 
 var f14 = { 0: 0, get 000() { return 0; } };
 >f14 : { readonly 0x0: number; }
 >{ 0: 0, get 000() { return 0; } } : { readonly 000: number; }
+>0 : number
 >0 : 0
+>000 : number
 >0 : 0
 
 var f15 = { "100": 0, get 1e2() { return 0; } };
 >f15 : { readonly 1e2: number; }
 >{ "100": 0, get 1e2() { return 0; } } : { readonly 1e2: number; }
+>"100" : number
 >0 : 0
+>1e2 : number
 >0 : 0
 
 var f16 = { 0x20: 0, get 3.2e1() { return 0; } };
 >f16 : { readonly 3.2e1: number; }
 >{ 0x20: 0, get 3.2e1() { return 0; } } : { readonly 3.2e1: number; }
+>0x20 : number
 >0 : 0
+>3.2e1 : number
 >0 : 0
 
 var f17 = { a: 0, get b() { return 1; }, get a() { return 0; } };
diff --git a/tests/baselines/reference/objectLiteralExcessProperties.symbols b/tests/baselines/reference/objectLiteralExcessProperties.symbols
index f032c0cdd07..d145f43cd5f 100644
--- a/tests/baselines/reference/objectLiteralExcessProperties.symbols
+++ b/tests/baselines/reference/objectLiteralExcessProperties.symbols
@@ -81,9 +81,12 @@ interface Indexed {
 var b10: Indexed = { 0: { }, '1': { } }; // ok
 >b10 : Symbol(b10, Decl(objectLiteralExcessProperties.ts, 30, 3))
 >Indexed : Symbol(Indexed, Decl(objectLiteralExcessProperties.ts, 24, 51))
+>0 : Symbol(0, Decl(objectLiteralExcessProperties.ts, 30, 20))
+>'1' : Symbol('1', Decl(objectLiteralExcessProperties.ts, 30, 28))
 
 var b11: Indexed = { 0: { colour: "blue" } }; // nested object literal still errors
 >b11 : Symbol(b11, Decl(objectLiteralExcessProperties.ts, 32, 3))
 >Indexed : Symbol(Indexed, Decl(objectLiteralExcessProperties.ts, 24, 51))
+>0 : Symbol(0, Decl(objectLiteralExcessProperties.ts, 32, 20))
 >colour : Symbol(colour, Decl(objectLiteralExcessProperties.ts, 32, 25))
 
diff --git a/tests/baselines/reference/objectLiteralExcessProperties.types b/tests/baselines/reference/objectLiteralExcessProperties.types
index e5150394a40..4a082e2a303 100644
--- a/tests/baselines/reference/objectLiteralExcessProperties.types
+++ b/tests/baselines/reference/objectLiteralExcessProperties.types
@@ -108,13 +108,16 @@ var b10: Indexed = { 0: { }, '1': { } }; // ok
 >b10 : Indexed
 >Indexed : Indexed
 >{ 0: { }, '1': { } } : { 0: {}; '1': {}; }
+>0 : {}
 >{ } : {}
+>'1' : {}
 >{ } : {}
 
 var b11: Indexed = { 0: { colour: "blue" } }; // nested object literal still errors
 >b11 : Indexed
 >Indexed : Indexed
 >{ 0: { colour: "blue" } } : { 0: { colour: string; }; }
+>0 : { colour: string; }
 >{ colour: "blue" } : { colour: string; }
 >colour : string
 >"blue" : "blue"
diff --git a/tests/baselines/reference/objectLiteralGettersAndSetters.symbols b/tests/baselines/reference/objectLiteralGettersAndSetters.symbols
index 5a4250f9c82..2acf3792aa9 100644
--- a/tests/baselines/reference/objectLiteralGettersAndSetters.symbols
+++ b/tests/baselines/reference/objectLiteralGettersAndSetters.symbols
@@ -2,6 +2,7 @@
 // Get and set accessor with the same name
 var sameName1a = { get 'a'() { return ''; }, set a(n) { var p = n; var p: string; } };
 >sameName1a : Symbol(sameName1a, Decl(objectLiteralGettersAndSetters.ts, 1, 3))
+>'a' : Symbol('a', Decl(objectLiteralGettersAndSetters.ts, 1, 18), Decl(objectLiteralGettersAndSetters.ts, 1, 44))
 >a : Symbol('a', Decl(objectLiteralGettersAndSetters.ts, 1, 18), Decl(objectLiteralGettersAndSetters.ts, 1, 44))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 1, 51))
 >p : Symbol(p, Decl(objectLiteralGettersAndSetters.ts, 1, 59), Decl(objectLiteralGettersAndSetters.ts, 1, 70))
@@ -10,6 +11,8 @@ var sameName1a = { get 'a'() { return ''; }, set a(n) { var p = n; var p: string
 
 var sameName2a = { get 0.0() { return ''; }, set 0(n) { var p = n; var p: string; } };
 >sameName2a : Symbol(sameName2a, Decl(objectLiteralGettersAndSetters.ts, 2, 3))
+>0.0 : Symbol(0.0, Decl(objectLiteralGettersAndSetters.ts, 2, 18), Decl(objectLiteralGettersAndSetters.ts, 2, 44))
+>0 : Symbol(0.0, Decl(objectLiteralGettersAndSetters.ts, 2, 18), Decl(objectLiteralGettersAndSetters.ts, 2, 44))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 2, 51))
 >p : Symbol(p, Decl(objectLiteralGettersAndSetters.ts, 2, 59), Decl(objectLiteralGettersAndSetters.ts, 2, 70))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 2, 51))
@@ -17,6 +20,8 @@ var sameName2a = { get 0.0() { return ''; }, set 0(n) { var p = n; var p: string
 
 var sameName3a = { get 0x20() { return ''; }, set 3.2e1(n) { var p = n; var p: string; } };
 >sameName3a : Symbol(sameName3a, Decl(objectLiteralGettersAndSetters.ts, 3, 3))
+>0x20 : Symbol(0x20, Decl(objectLiteralGettersAndSetters.ts, 3, 18), Decl(objectLiteralGettersAndSetters.ts, 3, 45))
+>3.2e1 : Symbol(0x20, Decl(objectLiteralGettersAndSetters.ts, 3, 18), Decl(objectLiteralGettersAndSetters.ts, 3, 45))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 3, 56))
 >p : Symbol(p, Decl(objectLiteralGettersAndSetters.ts, 3, 64), Decl(objectLiteralGettersAndSetters.ts, 3, 75))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 3, 56))
@@ -24,6 +29,8 @@ var sameName3a = { get 0x20() { return ''; }, set 3.2e1(n) { var p = n; var p: s
 
 var sameName4a = { get ''() { return ''; }, set ""(n) { var p = n; var p: string; } };
 >sameName4a : Symbol(sameName4a, Decl(objectLiteralGettersAndSetters.ts, 4, 3))
+>'' : Symbol('', Decl(objectLiteralGettersAndSetters.ts, 4, 18), Decl(objectLiteralGettersAndSetters.ts, 4, 43))
+>"" : Symbol('', Decl(objectLiteralGettersAndSetters.ts, 4, 18), Decl(objectLiteralGettersAndSetters.ts, 4, 43))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 4, 51))
 >p : Symbol(p, Decl(objectLiteralGettersAndSetters.ts, 4, 59), Decl(objectLiteralGettersAndSetters.ts, 4, 70))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 4, 51))
@@ -31,6 +38,8 @@ var sameName4a = { get ''() { return ''; }, set ""(n) { var p = n; var p: string
 
 var sameName5a = { get '\t'() { return ''; }, set '\t'(n) { var p = n; var p: string; } };
 >sameName5a : Symbol(sameName5a, Decl(objectLiteralGettersAndSetters.ts, 5, 3))
+>'\t' : Symbol('\t', Decl(objectLiteralGettersAndSetters.ts, 5, 18), Decl(objectLiteralGettersAndSetters.ts, 5, 45))
+>'\t' : Symbol('\t', Decl(objectLiteralGettersAndSetters.ts, 5, 18), Decl(objectLiteralGettersAndSetters.ts, 5, 45))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 5, 55))
 >p : Symbol(p, Decl(objectLiteralGettersAndSetters.ts, 5, 63), Decl(objectLiteralGettersAndSetters.ts, 5, 74))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 5, 55))
@@ -38,6 +47,7 @@ var sameName5a = { get '\t'() { return ''; }, set '\t'(n) { var p = n; var p: st
 
 var sameName6a = { get 'a'() { return ''; }, set a(n) { var p = n; var p: string; } };
 >sameName6a : Symbol(sameName6a, Decl(objectLiteralGettersAndSetters.ts, 6, 3))
+>'a' : Symbol('a', Decl(objectLiteralGettersAndSetters.ts, 6, 18), Decl(objectLiteralGettersAndSetters.ts, 6, 44))
 >a : Symbol('a', Decl(objectLiteralGettersAndSetters.ts, 6, 18), Decl(objectLiteralGettersAndSetters.ts, 6, 44))
 >n : Symbol(n, Decl(objectLiteralGettersAndSetters.ts, 6, 51))
 >p : Symbol(p, Decl(objectLiteralGettersAndSetters.ts, 6, 59), Decl(objectLiteralGettersAndSetters.ts, 6, 70))
diff --git a/tests/baselines/reference/objectLiteralGettersAndSetters.types b/tests/baselines/reference/objectLiteralGettersAndSetters.types
index 5302bcdbbf5..da16e47f3c9 100644
--- a/tests/baselines/reference/objectLiteralGettersAndSetters.types
+++ b/tests/baselines/reference/objectLiteralGettersAndSetters.types
@@ -3,6 +3,7 @@
 var sameName1a = { get 'a'() { return ''; }, set a(n) { var p = n; var p: string; } };
 >sameName1a : { 'a': string; }
 >{ get 'a'() { return ''; }, set a(n) { var p = n; var p: string; } } : { 'a': string; }
+>'a' : string
 >'' : ""
 >a : string
 >n : string
@@ -13,7 +14,9 @@ var sameName1a = { get 'a'() { return ''; }, set a(n) { var p = n; var p: string
 var sameName2a = { get 0.0() { return ''; }, set 0(n) { var p = n; var p: string; } };
 >sameName2a : { 0.0: string; }
 >{ get 0.0() { return ''; }, set 0(n) { var p = n; var p: string; } } : { 0.0: string; }
+>0.0 : string
 >'' : ""
+>0 : string
 >n : string
 >p : string
 >n : string
@@ -22,7 +25,9 @@ var sameName2a = { get 0.0() { return ''; }, set 0(n) { var p = n; var p: string
 var sameName3a = { get 0x20() { return ''; }, set 3.2e1(n) { var p = n; var p: string; } };
 >sameName3a : { 0x20: string; }
 >{ get 0x20() { return ''; }, set 3.2e1(n) { var p = n; var p: string; } } : { 0x20: string; }
+>0x20 : string
 >'' : ""
+>3.2e1 : string
 >n : string
 >p : string
 >n : string
@@ -31,7 +36,9 @@ var sameName3a = { get 0x20() { return ''; }, set 3.2e1(n) { var p = n; var p: s
 var sameName4a = { get ''() { return ''; }, set ""(n) { var p = n; var p: string; } };
 >sameName4a : { '': string; }
 >{ get ''() { return ''; }, set ""(n) { var p = n; var p: string; } } : { '': string; }
+>'' : string
 >'' : ""
+>"" : string
 >n : string
 >p : string
 >n : string
@@ -40,7 +47,9 @@ var sameName4a = { get ''() { return ''; }, set ""(n) { var p = n; var p: string
 var sameName5a = { get '\t'() { return ''; }, set '\t'(n) { var p = n; var p: string; } };
 >sameName5a : { '\t': string; }
 >{ get '\t'() { return ''; }, set '\t'(n) { var p = n; var p: string; } } : { '\t': string; }
+>'\t' : string
 >'' : ""
+>'\t' : string
 >n : string
 >p : string
 >n : string
@@ -49,6 +58,7 @@ var sameName5a = { get '\t'() { return ''; }, set '\t'(n) { var p = n; var p: st
 var sameName6a = { get 'a'() { return ''; }, set a(n) { var p = n; var p: string; } };
 >sameName6a : { 'a': string; }
 >{ get 'a'() { return ''; }, set a(n) { var p = n; var p: string; } } : { 'a': string; }
+>'a' : string
 >'' : ""
 >a : string
 >n : string
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.symbols b/tests/baselines/reference/objectLiteralIndexerErrors.symbols
index fe9d59114cf..c5c1c766f43 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.symbols
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.symbols
@@ -33,11 +33,13 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers ar
 >B : Symbol(B, Decl(objectLiteralIndexerErrors.ts, 2, 1))
 >x : Symbol(x, Decl(objectLiteralIndexerErrors.ts, 12, 46))
 >b : Symbol(b, Decl(objectLiteralIndexerErrors.ts, 9, 3))
+>0 : Symbol(0, Decl(objectLiteralIndexerErrors.ts, 12, 52))
 >a : Symbol(a, Decl(objectLiteralIndexerErrors.ts, 8, 3))
 
 o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
 >o1 : Symbol(o1, Decl(objectLiteralIndexerErrors.ts, 12, 3))
 >x : Symbol(x, Decl(objectLiteralIndexerErrors.ts, 13, 6))
 >c : Symbol(c, Decl(objectLiteralIndexerErrors.ts, 10, 3))
+>0 : Symbol(0, Decl(objectLiteralIndexerErrors.ts, 13, 12))
 >a : Symbol(a, Decl(objectLiteralIndexerErrors.ts, 8, 3))
 
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.types b/tests/baselines/reference/objectLiteralIndexerErrors.types
index cd963b5d517..b0a397a4469 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.types
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.types
@@ -34,6 +34,7 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers ar
 >{ x: b, 0: a } : { x: B; 0: A; }
 >x : B
 >b : B
+>0 : A
 >a : A
 
 o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
@@ -42,5 +43,6 @@ o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
 >{ x: c, 0: a } : { x: any; 0: A; }
 >x : any
 >c : any
+>0 : A
 >a : A
 
diff --git a/tests/baselines/reference/objectLiteralIndexers.symbols b/tests/baselines/reference/objectLiteralIndexers.symbols
index 53e1c82aca4..a1543ed871a 100644
--- a/tests/baselines/reference/objectLiteralIndexers.symbols
+++ b/tests/baselines/reference/objectLiteralIndexers.symbols
@@ -33,17 +33,20 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: a, 0: b }; // string indexer i
 >B : Symbol(B, Decl(objectLiteralIndexers.ts, 2, 1))
 >x : Symbol(x, Decl(objectLiteralIndexers.ts, 12, 46))
 >a : Symbol(a, Decl(objectLiteralIndexers.ts, 8, 3))
+>0 : Symbol(0, Decl(objectLiteralIndexers.ts, 12, 52))
 >b : Symbol(b, Decl(objectLiteralIndexers.ts, 9, 3))
 
 o1 = { x: b, 0: c }; // both indexers are any
 >o1 : Symbol(o1, Decl(objectLiteralIndexers.ts, 12, 3))
 >x : Symbol(x, Decl(objectLiteralIndexers.ts, 13, 6))
 >b : Symbol(b, Decl(objectLiteralIndexers.ts, 9, 3))
+>0 : Symbol(0, Decl(objectLiteralIndexers.ts, 13, 12))
 >c : Symbol(c, Decl(objectLiteralIndexers.ts, 10, 3))
 
 o1 = { x: c, 0: b }; // string indexer is any, number indexer is B
 >o1 : Symbol(o1, Decl(objectLiteralIndexers.ts, 12, 3))
 >x : Symbol(x, Decl(objectLiteralIndexers.ts, 14, 6))
 >c : Symbol(c, Decl(objectLiteralIndexers.ts, 10, 3))
+>0 : Symbol(0, Decl(objectLiteralIndexers.ts, 14, 12))
 >b : Symbol(b, Decl(objectLiteralIndexers.ts, 9, 3))
 
diff --git a/tests/baselines/reference/objectLiteralIndexers.types b/tests/baselines/reference/objectLiteralIndexers.types
index ef242fd1fe3..388d72da144 100644
--- a/tests/baselines/reference/objectLiteralIndexers.types
+++ b/tests/baselines/reference/objectLiteralIndexers.types
@@ -34,6 +34,7 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: a, 0: b }; // string indexer i
 >{ x: a, 0: b } : { x: A; 0: B; }
 >x : A
 >a : A
+>0 : B
 >b : B
 
 o1 = { x: b, 0: c }; // both indexers are any
@@ -42,6 +43,7 @@ o1 = { x: b, 0: c }; // both indexers are any
 >{ x: b, 0: c } : { x: B; 0: any; }
 >x : B
 >b : B
+>0 : any
 >c : any
 
 o1 = { x: c, 0: b }; // string indexer is any, number indexer is B
@@ -50,5 +52,6 @@ o1 = { x: c, 0: b }; // string indexer is any, number indexer is B
 >{ x: c, 0: b } : { x: any; 0: B; }
 >x : any
 >c : any
+>0 : B
 >b : B
 
diff --git a/tests/baselines/reference/objectLiteralParameterResolution.symbols b/tests/baselines/reference/objectLiteralParameterResolution.symbols
index 4d8c67c63f6..28a8ae5bd0f 100644
--- a/tests/baselines/reference/objectLiteralParameterResolution.symbols
+++ b/tests/baselines/reference/objectLiteralParameterResolution.symbols
@@ -46,6 +46,7 @@ var s = $.extend({
 
     converters: { "text json": "" },
 >converters : Symbol(converters, Decl(objectLiteralParameterResolution.ts, 10, 22))
+>"text json" : Symbol("text json", Decl(objectLiteralParameterResolution.ts, 11, 17))
 
     traditional: true ,
 >traditional : Symbol(traditional, Decl(objectLiteralParameterResolution.ts, 11, 36))
diff --git a/tests/baselines/reference/objectLiteralParameterResolution.types b/tests/baselines/reference/objectLiteralParameterResolution.types
index 56d61163eca..5991881248b 100644
--- a/tests/baselines/reference/objectLiteralParameterResolution.types
+++ b/tests/baselines/reference/objectLiteralParameterResolution.types
@@ -60,6 +60,7 @@ var s = $.extend({
     converters: { "text json": "" },
 >converters : { "text json": string; }
 >{ "text json": "" } : { "text json": string; }
+>"text json" : string
 >"" : ""
 
     traditional: true ,
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.symbols b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.symbols
index 255e95c76cd..09f9d036285 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.symbols
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.symbols
@@ -4,7 +4,11 @@ var y = {
 >y : Symbol(y, Decl(objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts, 1, 3))
 
     "stringLiteral",
+>"stringLiteral" : Symbol("stringLiteral", Decl(objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts, 1, 9))
+
     42,
+>42 : Symbol(42, Decl(objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts, 2, 20))
+
     get e,
 >e : Symbol(e, Decl(objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts, 3, 7))
 
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.types b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.types
index e6b457b4c04..6e255d871c0 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.types
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.types
@@ -5,9 +5,11 @@ var y = {
 >{    "stringLiteral",    42,    get e,    set f,    this,    super,    var,    class,    typeof} : { "stringLiteral": any; 42: any; readonly e: void; f: any; this: any; super: any; var: any; class: any; typeof: any; }
 
     "stringLiteral",
+>"stringLiteral" : any
 > : any
 
     42,
+>42 : any
 > : any
 
     get e,
diff --git a/tests/baselines/reference/objectLiteralWithNumericPropertyName.symbols b/tests/baselines/reference/objectLiteralWithNumericPropertyName.symbols
index 03911229181..bc6115541b2 100644
--- a/tests/baselines/reference/objectLiteralWithNumericPropertyName.symbols
+++ b/tests/baselines/reference/objectLiteralWithNumericPropertyName.symbols
@@ -3,11 +3,14 @@ interface A {
 >A : Symbol(A, Decl(objectLiteralWithNumericPropertyName.ts, 0, 0))
 
     0: string;
+>0 : Symbol(A[0], Decl(objectLiteralWithNumericPropertyName.ts, 0, 13))
 }
 var x: A = {
 >x : Symbol(x, Decl(objectLiteralWithNumericPropertyName.ts, 3, 3))
 >A : Symbol(A, Decl(objectLiteralWithNumericPropertyName.ts, 0, 0))
 
     0: 3
+>0 : Symbol(0, Decl(objectLiteralWithNumericPropertyName.ts, 3, 12))
+
 };
 
diff --git a/tests/baselines/reference/objectLiteralWithNumericPropertyName.types b/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
index b7f0e13a865..4b4a8d8a433 100644
--- a/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
+++ b/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
@@ -3,6 +3,7 @@ interface A {
 >A : A
 
     0: string;
+>0 : string
 }
 var x: A = {
 >x : A
@@ -10,6 +11,7 @@ var x: A = {
 >{    0: 3} : { 0: number; }
 
     0: 3
+>0 : number
 >3 : 3
 
 };
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index 0cb15d4ea7a..af831153c80 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -403,6 +403,7 @@ function container(
 >computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 108, 7))
 >a : Symbol(a, Decl(objectSpread.ts, 108, 24))
 >b : Symbol(b, Decl(objectSpread.ts, 108, 35))
+>"before everything" : Symbol("before everything", Decl(objectSpread.ts, 108, 46))
 
         { ['before everything']: 12, ...o, b: 'yes' }
 >'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 109, 9))
@@ -414,6 +415,7 @@ function container(
 >a : Symbol(a, Decl(objectSpread.ts, 110, 25))
 >b : Symbol(b, Decl(objectSpread.ts, 110, 36))
 >c : Symbol(c, Decl(objectSpread.ts, 110, 47))
+>"in the middle" : Symbol("in the middle", Decl(objectSpread.ts, 110, 59))
 
         { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
 >o : Symbol(o, Decl(objectSpread.ts, 0, 3))
@@ -425,6 +427,7 @@ function container(
 >computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 112, 7))
 >a : Symbol(a, Decl(objectSpread.ts, 112, 24))
 >b : Symbol(b, Decl(objectSpread.ts, 112, 35))
+>"at the end" : Symbol("at the end", Decl(objectSpread.ts, 112, 46))
 
         { ...o, b: 'yeah', ['at the end']: 14 }
 >o : Symbol(o, Decl(objectSpread.ts, 0, 3))
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index 3270cdfe8f0..eb62d6d4e8f 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -519,6 +519,7 @@ function container(
 >computedFirst : { a: number; b: string; "before everything": number; }
 >a : number
 >b : string
+>"before everything" : number
 
         { ['before everything']: 12, ...o, b: 'yes' }
 >{ ['before everything']: 12, ...o, b: 'yes' } : { b: string; a: number; ['before everything']: number; }
@@ -533,6 +534,7 @@ function container(
 >a : number
 >b : string
 >c : boolean
+>"in the middle" : number
 
         { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
 >{ ...o, ['in the middle']: 13, b: 'maybe?', ...o2 } : { b: string; c: boolean; ['in the middle']: number; a: number; }
@@ -547,6 +549,7 @@ function container(
 >computedAfter : { a: number; b: string; "at the end": number; }
 >a : number
 >b : string
+>"at the end" : number
 
         { ...o, b: 'yeah', ['at the end']: 14 }
 >{ ...o, b: 'yeah', ['at the end']: 14 } : { b: string; ['at the end']: number; a: number; }
diff --git a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.symbols b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.symbols
index 29052e9a499..86a6041b4dc 100644
--- a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.symbols
+++ b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.symbols
@@ -6,36 +6,64 @@ class C {
 >C : Symbol(C, Decl(objectTypeWithDuplicateNumericProperty.ts, 0, 0))
 
     1;
+>1 : Symbol(C[1], Decl(objectTypeWithDuplicateNumericProperty.ts, 3, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 4, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 5, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 6, 7))
+
     1.0;
+>1.0 : Symbol(C[1], Decl(objectTypeWithDuplicateNumericProperty.ts, 3, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 4, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 5, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 6, 7))
+
     1.;
+>1. : Symbol(C[1], Decl(objectTypeWithDuplicateNumericProperty.ts, 3, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 4, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 5, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 6, 7))
+
     1.00;
+>1.00 : Symbol(C[1], Decl(objectTypeWithDuplicateNumericProperty.ts, 3, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 4, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 5, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 6, 7))
 }
 
 interface I {
 >I : Symbol(I, Decl(objectTypeWithDuplicateNumericProperty.ts, 8, 1))
 
     1;
+>1 : Symbol(I[1], Decl(objectTypeWithDuplicateNumericProperty.ts, 10, 13), Decl(objectTypeWithDuplicateNumericProperty.ts, 11, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 12, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 13, 7))
+
     1.0;
+>1.0 : Symbol(I[1], Decl(objectTypeWithDuplicateNumericProperty.ts, 10, 13), Decl(objectTypeWithDuplicateNumericProperty.ts, 11, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 12, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 13, 7))
+
     1.;
+>1. : Symbol(I[1], Decl(objectTypeWithDuplicateNumericProperty.ts, 10, 13), Decl(objectTypeWithDuplicateNumericProperty.ts, 11, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 12, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 13, 7))
+
     1.00;
+>1.00 : Symbol(I[1], Decl(objectTypeWithDuplicateNumericProperty.ts, 10, 13), Decl(objectTypeWithDuplicateNumericProperty.ts, 11, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 12, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 13, 7))
 }
 
 var a: {
 >a : Symbol(a, Decl(objectTypeWithDuplicateNumericProperty.ts, 17, 3))
 
     1;
+>1 : Symbol(1, Decl(objectTypeWithDuplicateNumericProperty.ts, 17, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 18, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 19, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 20, 7))
+
     1.0;
+>1.0 : Symbol(1, Decl(objectTypeWithDuplicateNumericProperty.ts, 17, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 18, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 19, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 20, 7))
+
     1.;
+>1. : Symbol(1, Decl(objectTypeWithDuplicateNumericProperty.ts, 17, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 18, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 19, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 20, 7))
+
     1.00;
+>1.00 : Symbol(1, Decl(objectTypeWithDuplicateNumericProperty.ts, 17, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 18, 6), Decl(objectTypeWithDuplicateNumericProperty.ts, 19, 8), Decl(objectTypeWithDuplicateNumericProperty.ts, 20, 7))
 }
 
 var b = {
 >b : Symbol(b, Decl(objectTypeWithDuplicateNumericProperty.ts, 24, 3))
 
     1: 1,
+>1 : Symbol(1, Decl(objectTypeWithDuplicateNumericProperty.ts, 24, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 25, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 26, 11), Decl(objectTypeWithDuplicateNumericProperty.ts, 27, 10))
+
     1.0: 1,
+>1.0 : Symbol(1, Decl(objectTypeWithDuplicateNumericProperty.ts, 24, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 25, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 26, 11), Decl(objectTypeWithDuplicateNumericProperty.ts, 27, 10))
+
     1.: 1,
+>1. : Symbol(1, Decl(objectTypeWithDuplicateNumericProperty.ts, 24, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 25, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 26, 11), Decl(objectTypeWithDuplicateNumericProperty.ts, 27, 10))
+
     1.00: 1
+>1.00 : Symbol(1, Decl(objectTypeWithDuplicateNumericProperty.ts, 24, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 25, 9), Decl(objectTypeWithDuplicateNumericProperty.ts, 26, 11), Decl(objectTypeWithDuplicateNumericProperty.ts, 27, 10))
 }
 
 
diff --git a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.types b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.types
index eb881193888..87040fe80e0 100644
--- a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.types
@@ -6,27 +6,48 @@ class C {
 >C : C
 
     1;
+>1 : any
+
     1.0;
+>1.0 : any
+
     1.;
+>1. : any
+
     1.00;
+>1.00 : any
 }
 
 interface I {
 >I : I
 
     1;
+>1 : any
+
     1.0;
+>1.0 : any
+
     1.;
+>1. : any
+
     1.00;
+>1.00 : any
 }
 
 var a: {
 >a : { 1: any; }
 
     1;
+>1 : any
+
     1.0;
+>1.0 : any
+
     1.;
+>1. : any
+
     1.00;
+>1.00 : any
 }
 
 var b = {
@@ -34,15 +55,19 @@ var b = {
 >{    1: 1,    1.0: 1,    1.: 1,    1.00: 1} : { 1: number; }
 
     1: 1,
+>1 : number
 >1 : 1
 
     1.0: 1,
+>1.0 : number
 >1 : 1
 
     1.: 1,
+>1. : number
 >1 : 1
 
     1.00: 1
+>1.00 : number
 >1 : 1
 }
 
diff --git a/tests/baselines/reference/objectTypeWithNumericProperty.symbols b/tests/baselines/reference/objectTypeWithNumericProperty.symbols
index 73ff7149d0f..72b2ff24175 100644
--- a/tests/baselines/reference/objectTypeWithNumericProperty.symbols
+++ b/tests/baselines/reference/objectTypeWithNumericProperty.symbols
@@ -5,7 +5,10 @@ class C {
 >C : Symbol(C, Decl(objectTypeWithNumericProperty.ts, 0, 0))
 
     1: number;
+>1 : Symbol(C[1], Decl(objectTypeWithNumericProperty.ts, 2, 9))
+
     1.1: string;
+>1.1 : Symbol(C[1.1], Decl(objectTypeWithNumericProperty.ts, 3, 14))
 }
 
 var c: C;
@@ -36,7 +39,10 @@ interface I {
 >I : Symbol(I, Decl(objectTypeWithNumericProperty.ts, 11, 18))
 
     1: number;
+>1 : Symbol(I[1], Decl(objectTypeWithNumericProperty.ts, 13, 13))
+
     1.1: string;
+>1.1 : Symbol(I[1.1], Decl(objectTypeWithNumericProperty.ts, 14, 14))
 }
 
 var i: I;
@@ -67,7 +73,10 @@ var a: {
 >a : Symbol(a, Decl(objectTypeWithNumericProperty.ts, 24, 3))
 
     1: number;
+>1 : Symbol(1, Decl(objectTypeWithNumericProperty.ts, 24, 8))
+
     1.1: string;
+>1.1 : Symbol(1.1, Decl(objectTypeWithNumericProperty.ts, 25, 14))
 }
 
 var r1 = a[1];
@@ -94,7 +103,10 @@ var b = {
 >b : Symbol(b, Decl(objectTypeWithNumericProperty.ts, 34, 3))
 
     1: 1,
+>1 : Symbol(1, Decl(objectTypeWithNumericProperty.ts, 34, 9))
+
     1.1: ""
+>1.1 : Symbol(1.1, Decl(objectTypeWithNumericProperty.ts, 35, 9))
 }
 
 var r1 = b[1];
diff --git a/tests/baselines/reference/objectTypeWithNumericProperty.types b/tests/baselines/reference/objectTypeWithNumericProperty.types
index 52a27ea09af..ceb8ed0e42c 100644
--- a/tests/baselines/reference/objectTypeWithNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithNumericProperty.types
@@ -5,7 +5,10 @@ class C {
 >C : C
 
     1: number;
+>1 : number
+
     1.1: string;
+>1.1 : string
 }
 
 var c: C;
@@ -40,7 +43,10 @@ interface I {
 >I : I
 
     1: number;
+>1 : number
+
     1.1: string;
+>1.1 : string
 }
 
 var i: I;
@@ -75,7 +81,10 @@ var a: {
 >a : { 1: number; 1.1: string; }
 
     1: number;
+>1 : number
+
     1.1: string;
+>1.1 : string
 }
 
 var r1 = a[1];
@@ -107,9 +116,11 @@ var b = {
 >{    1: 1,    1.1: ""} : { 1: number; 1.1: string; }
 
     1: 1,
+>1 : number
 >1 : 1
 
     1.1: ""
+>1.1 : string
 >"" : ""
 }
 
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
index 37564117077..519e81c4d3b 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
@@ -7,19 +7,31 @@ class C {
 >C : Symbol(C, Decl(objectTypeWithStringNamedNumericProperty.ts, 0, 0))
 
     "0.1": void;
+>"0.1" : Symbol(C["0.1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 4, 9))
+
     ".1": Object;
+>".1" : Symbol(C[".1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 5, 16))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "1": number;
+>"1" : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 17))
+
     "1.": string;
+>"1." : Symbol(C["1."], Decl(objectTypeWithStringNamedNumericProperty.ts, 7, 16))
+
     "1..": boolean;
+>"1.." : Symbol(C["1.."], Decl(objectTypeWithStringNamedNumericProperty.ts, 8, 17))
+
     "1.0": Date;
+>"1.0" : Symbol(C["1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 9, 19))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1.0": RegExp;
+>"-1.0" : Symbol(C["-1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 10, 16))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1": Date;
+>"-1" : Symbol(C["-1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 11, 19))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -113,19 +125,31 @@ interface I {
 >I : Symbol(I, Decl(objectTypeWithStringNamedNumericProperty.ts, 33, 16))
 
     "0.1": void;
+>"0.1" : Symbol(I["0.1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 35, 13))
+
     ".1": Object;
+>".1" : Symbol(I[".1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 36, 16))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "1": number;
+>"1" : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 17))
+
     "1.": string;
+>"1." : Symbol(I["1."], Decl(objectTypeWithStringNamedNumericProperty.ts, 38, 16))
+
     "1..": boolean;
+>"1.." : Symbol(I["1.."], Decl(objectTypeWithStringNamedNumericProperty.ts, 39, 17))
+
     "1.0": Date;
+>"1.0" : Symbol(I["1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 40, 19))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1.0": RegExp;
+>"-1.0" : Symbol(I["-1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 41, 16))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1": Date;
+>"-1" : Symbol(I["-1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 42, 19))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -219,19 +243,31 @@ var a: {
 >a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 3))
 
     "0.1": void;
+>"0.1" : Symbol("0.1", Decl(objectTypeWithStringNamedNumericProperty.ts, 66, 8))
+
     ".1": Object;
+>".1" : Symbol(".1", Decl(objectTypeWithStringNamedNumericProperty.ts, 67, 16))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "1": number;
+>"1" : Symbol("1", Decl(objectTypeWithStringNamedNumericProperty.ts, 68, 17))
+
     "1.": string;
+>"1." : Symbol("1.", Decl(objectTypeWithStringNamedNumericProperty.ts, 69, 16))
+
     "1..": boolean;
+>"1.." : Symbol("1..", Decl(objectTypeWithStringNamedNumericProperty.ts, 70, 17))
+
     "1.0": Date;
+>"1.0" : Symbol("1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 71, 19))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1.0": RegExp;
+>"-1.0" : Symbol("-1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 72, 16))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1": Date;
+>"-1" : Symbol("-1", Decl(objectTypeWithStringNamedNumericProperty.ts, 73, 19))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -321,17 +357,30 @@ var b = {
 >b : Symbol(b, Decl(objectTypeWithStringNamedNumericProperty.ts, 96, 3))
 
     "0.1": <void>null,
+>"0.1" : Symbol("0.1", Decl(objectTypeWithStringNamedNumericProperty.ts, 96, 9))
+
     ".1": new Object(),
+>".1" : Symbol(".1", Decl(objectTypeWithStringNamedNumericProperty.ts, 97, 22))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "1": 1,
+>"1" : Symbol("1", Decl(objectTypeWithStringNamedNumericProperty.ts, 98, 23))
+
     "1.": "",
+>"1." : Symbol("1.", Decl(objectTypeWithStringNamedNumericProperty.ts, 99, 11))
+
     "1..": true,
+>"1.." : Symbol("1..", Decl(objectTypeWithStringNamedNumericProperty.ts, 100, 13))
+
     "1.0": new Date(),
+>"1.0" : Symbol("1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 101, 16))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1.0": /123/,
+>"-1.0" : Symbol("-1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 102, 22))
+
     "-1": Date
+>"-1" : Symbol("-1", Decl(objectTypeWithStringNamedNumericProperty.ts, 103, 18))
 >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 };
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
index 98081e6ab6c..79c3aebf141 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
@@ -7,19 +7,31 @@ class C {
 >C : C
 
     "0.1": void;
+>"0.1" : void
+
     ".1": Object;
+>".1" : Object
 >Object : Object
 
     "1": number;
+>"1" : number
+
     "1.": string;
+>"1." : string
+
     "1..": boolean;
+>"1.." : boolean
+
     "1.0": Date;
+>"1.0" : Date
 >Date : Date
 
     "-1.0": RegExp;
+>"-1.0" : RegExp
 >RegExp : RegExp
 
     "-1": Date;
+>"-1" : Date
 >Date : Date
 }
 
@@ -138,19 +150,31 @@ interface I {
 >I : I
 
     "0.1": void;
+>"0.1" : void
+
     ".1": Object;
+>".1" : Object
 >Object : Object
 
     "1": number;
+>"1" : number
+
     "1.": string;
+>"1." : string
+
     "1..": boolean;
+>"1.." : boolean
+
     "1.0": Date;
+>"1.0" : Date
 >Date : Date
 
     "-1.0": RegExp;
+>"-1.0" : RegExp
 >RegExp : RegExp
 
     "-1": Date;
+>"-1" : Date
 >Date : Date
 }
 
@@ -269,19 +293,31 @@ var a: {
 >a : { "0.1": void; ".1": Object; "1": number; "1.": string; "1..": boolean; "1.0": Date; "-1.0": RegExp; "-1": Date; }
 
     "0.1": void;
+>"0.1" : void
+
     ".1": Object;
+>".1" : Object
 >Object : Object
 
     "1": number;
+>"1" : number
+
     "1.": string;
+>"1." : string
+
     "1..": boolean;
+>"1.." : boolean
+
     "1.0": Date;
+>"1.0" : Date
 >Date : Date
 
     "-1.0": RegExp;
+>"-1.0" : RegExp
 >RegExp : RegExp
 
     "-1": Date;
+>"-1" : Date
 >Date : Date
 }
 
@@ -397,30 +433,38 @@ var b = {
 >{    "0.1": <void>null,    ".1": new Object(),    "1": 1,    "1.": "",    "1..": true,    "1.0": new Date(),    "-1.0": /123/,    "-1": Date} : { "0.1": void; ".1": Object; "1": number; "1.": string; "1..": boolean; "1.0": Date; "-1.0": RegExp; "-1": DateConstructor; }
 
     "0.1": <void>null,
+>"0.1" : void
 ><void>null : void
 >null : null
 
     ".1": new Object(),
+>".1" : Object
 >new Object() : Object
 >Object : ObjectConstructor
 
     "1": 1,
+>"1" : number
 >1 : 1
 
     "1.": "",
+>"1." : string
 >"" : ""
 
     "1..": true,
+>"1.." : boolean
 >true : true
 
     "1.0": new Date(),
+>"1.0" : Date
 >new Date() : Date
 >Date : DateConstructor
 
     "-1.0": /123/,
+>"-1.0" : RegExp
 >/123/ : RegExp
 
     "-1": Date
+>"-1" : DateConstructor
 >Date : DateConstructor
 
 };
diff --git a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.symbols b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.symbols
index 558ec029790..58f4bc8b8a1 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.symbols
+++ b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.symbols
@@ -3,10 +3,19 @@ class C {
 >C : Symbol(C, Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 0, 0))
 
     "   ": number;
+>"   " : Symbol(C["   "], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 0, 9))
+
     "a   b": string;
+>"a   b" : Symbol(C["a   b"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 1, 18))
+
     "~!@#$%^&*()_+{}|:'<>?\/.,`": number;
+>"~!@#$%^&*()_+{}|:'<>?\/.,`" : Symbol(C["~!@#$%^&*()_+{}|:'<>?/.,`"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 2, 20))
+
     "a\a": number;
+>"a\a" : Symbol(C["aa"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 3, 41))
+
     static "a ": number
+>"a " : Symbol(C["a "], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 4, 18))
 }
 
 var c: C;
@@ -37,8 +46,13 @@ interface I {
 >I : Symbol(I, Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 13, 41))
 
     "   ": number;
+>"   " : Symbol(I["   "], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 15, 13))
+
     "a   b": string;
+>"a   b" : Symbol(I["a   b"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 16, 18))
+
     "~!@#$%^&*()_+{}|:'<>?\/.,`": number;
+>"~!@#$%^&*()_+{}|:'<>?\/.,`" : Symbol(I["~!@#$%^&*()_+{}|:'<>?/.,`"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 17, 20))
 }
 
 var i: I;
@@ -70,8 +84,13 @@ var a: {
 >a : Symbol(a, Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 29, 3))
 
     "   ": number;
+>"   " : Symbol("   ", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 29, 8))
+
     "a   b": string;
+>"a   b" : Symbol("a   b", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 30, 18))
+
     "~!@#$%^&*()_+{}|:'<>?\/.,`": number;
+>"~!@#$%^&*()_+{}|:'<>?\/.,`" : Symbol("~!@#$%^&*()_+{}|:'<>?\/.,`", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 31, 20))
 }
 
 var r = a["   "];
@@ -98,8 +117,13 @@ var b = {
 >b : Symbol(b, Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 41, 3))
 
     "   ": 1,
+>"   " : Symbol("   ", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 41, 9))
+
     "a   b": "",
+>"a   b" : Symbol("a   b", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 42, 13))
+
     "~!@#$%^&*()_+{}|:'<>?\/.,`": 1,
+>"~!@#$%^&*()_+{}|:'<>?\/.,`" : Symbol("~!@#$%^&*()_+{}|:'<>?\/.,`", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 43, 16))
 }
 
 var r = b["   "];
diff --git a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
index ca200efcebf..783e04ba82e 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
+++ b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
@@ -3,10 +3,19 @@ class C {
 >C : C
 
     "   ": number;
+>"   " : number
+
     "a   b": string;
+>"a   b" : string
+
     "~!@#$%^&*()_+{}|:'<>?\/.,`": number;
+>"~!@#$%^&*()_+{}|:'<>?\/.,`" : number
+
     "a\a": number;
+>"a\a" : number
+
     static "a ": number
+>"a " : number
 }
 
 var c: C;
@@ -42,8 +51,13 @@ interface I {
 >I : I
 
     "   ": number;
+>"   " : number
+
     "a   b": string;
+>"a   b" : string
+
     "~!@#$%^&*()_+{}|:'<>?\/.,`": number;
+>"~!@#$%^&*()_+{}|:'<>?\/.,`" : number
 }
 
 var i: I;
@@ -80,8 +94,13 @@ var a: {
 >a : { "   ": number; "a   b": string; "~!@#$%^&*()_+{}|:'<>?\/.,`": number; }
 
     "   ": number;
+>"   " : number
+
     "a   b": string;
+>"a   b" : string
+
     "~!@#$%^&*()_+{}|:'<>?\/.,`": number;
+>"~!@#$%^&*()_+{}|:'<>?\/.,`" : number
 }
 
 var r = a["   "];
@@ -114,12 +133,15 @@ var b = {
 >{    "   ": 1,    "a   b": "",    "~!@#$%^&*()_+{}|:'<>?\/.,`": 1,} : { "   ": number; "a   b": string; "~!@#$%^&*()_+{}|:'<>?\/.,`": number; }
 
     "   ": 1,
+>"   " : number
 >1 : 1
 
     "a   b": "",
+>"a   b" : string
 >"" : ""
 
     "~!@#$%^&*()_+{}|:'<>?\/.,`": 1,
+>"~!@#$%^&*()_+{}|:'<>?\/.,`" : number
 >1 : 1
 }
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.symbols b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.symbols
index 798fb5c3c57..44b99bbf6d5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.symbols
@@ -50,6 +50,7 @@ var a: {
 var b: { [x: number]: string; } = { 0: '' };
 >b : Symbol(b, Decl(objectTypesIdentityWithNumericIndexers1.ts, 27, 3))
 >x : Symbol(x, Decl(objectTypesIdentityWithNumericIndexers1.ts, 27, 10))
+>0 : Symbol(0, Decl(objectTypesIdentityWithNumericIndexers1.ts, 27, 35))
 
 function foo1(x: A);
 >foo1 : Symbol(foo1, Decl(objectTypesIdentityWithNumericIndexers1.ts, 27, 44), Decl(objectTypesIdentityWithNumericIndexers1.ts, 29, 20), Decl(objectTypesIdentityWithNumericIndexers1.ts, 30, 20))
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
index 8ac7b807cba..8447ec7c702 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
@@ -51,6 +51,7 @@ var b: { [x: number]: string; } = { 0: '' };
 >b : { [x: number]: string; }
 >x : number
 >{ 0: '' } : { 0: string; }
+>0 : string
 >'' : ""
 
 function foo1(x: A);
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols
index b4ad1857748..87c7172917a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols
@@ -64,6 +64,7 @@ var b: { [x: number]: Derived; } = { 0: <Derived>null };
 >b : Symbol(b, Decl(objectTypesIdentityWithNumericIndexers2.ts, 30, 3))
 >x : Symbol(x, Decl(objectTypesIdentityWithNumericIndexers2.ts, 30, 10))
 >Derived : Symbol(Derived, Decl(objectTypesIdentityWithNumericIndexers2.ts, 2, 27))
+>0 : Symbol(0, Decl(objectTypesIdentityWithNumericIndexers2.ts, 30, 36))
 >Derived : Symbol(Derived, Decl(objectTypesIdentityWithNumericIndexers2.ts, 2, 27))
 
 function foo1(x: A);
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
index ce38d95174b..3cf86f10983 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
@@ -65,6 +65,7 @@ var b: { [x: number]: Derived; } = { 0: <Derived>null };
 >x : number
 >Derived : Derived
 >{ 0: <Derived>null } : { 0: Derived; }
+>0 : Derived
 ><Derived>null : Derived
 >Derived : Derived
 >null : null
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.symbols b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.symbols
index ed95b3a7025..ff8d854cb1e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.symbols
@@ -50,6 +50,7 @@ var a: {
 var b: { [x: number]: string; } = { 0: '' };
 >b : Symbol(b, Decl(objectTypesIdentityWithNumericIndexers3.ts, 27, 3))
 >x : Symbol(x, Decl(objectTypesIdentityWithNumericIndexers3.ts, 27, 10))
+>0 : Symbol(0, Decl(objectTypesIdentityWithNumericIndexers3.ts, 27, 35))
 
 function foo1(x: A);
 >foo1 : Symbol(foo1, Decl(objectTypesIdentityWithNumericIndexers3.ts, 27, 44), Decl(objectTypesIdentityWithNumericIndexers3.ts, 29, 20), Decl(objectTypesIdentityWithNumericIndexers3.ts, 30, 20))
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
index bcf2ef6d733..8d9e9a3bca3 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
@@ -51,6 +51,7 @@ var b: { [x: number]: string; } = { 0: '' };
 >b : { [x: number]: string; }
 >x : number
 >{ 0: '' } : { 0: string; }
+>0 : string
 >'' : ""
 
 function foo1(x: A);
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.symbols b/tests/baselines/reference/objectTypesWithOptionalProperties2.symbols
index 09932108a65..a9b326a057d 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties2.symbols
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.symbols
@@ -49,4 +49,5 @@ var b = {
 
     x()?: 1 // error
 >x : Symbol(x, Decl(objectTypesWithOptionalProperties2.ts, 23, 9))
+>1 : Symbol(1, Decl(objectTypesWithOptionalProperties2.ts, 24, 9))
 }
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.types b/tests/baselines/reference/objectTypesWithOptionalProperties2.types
index 703f5d7c96e..e3acb4bc9f1 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties2.types
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.types
@@ -50,6 +50,7 @@ var b = {
 
     x()?: 1 // error
 >x : () => any
+>1 : any
 }
 > : any
 
diff --git a/tests/baselines/reference/octalIntegerLiteral.symbols b/tests/baselines/reference/octalIntegerLiteral.symbols
index 6a4839839aa..7a69c3b56f8 100644
--- a/tests/baselines/reference/octalIntegerLiteral.symbols
+++ b/tests/baselines/reference/octalIntegerLiteral.symbols
@@ -15,6 +15,8 @@ var obj1 = {
 >obj1 : Symbol(obj1, Decl(octalIntegerLiteral.ts, 5, 3))
 
     0o45436: "Hello",
+>0o45436 : Symbol(0o45436, Decl(octalIntegerLiteral.ts, 5, 12))
+
     a: 0o45436, 
 >a : Symbol(a, Decl(octalIntegerLiteral.ts, 6, 21))
 
@@ -26,12 +28,15 @@ var obj1 = {
 >oct1 : Symbol(oct1, Decl(octalIntegerLiteral.ts, 8, 12))
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true
+>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : Symbol(0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777, Decl(octalIntegerLiteral.ts, 9, 9))
 }
 
 var obj2 = {
 >obj2 : Symbol(obj2, Decl(octalIntegerLiteral.ts, 13, 3))
 
     0O45436: "hi",
+>0O45436 : Symbol(0O45436, Decl(octalIntegerLiteral.ts, 13, 12))
+
     a: 0O45436, 
 >a : Symbol(a, Decl(octalIntegerLiteral.ts, 14, 18))
 
@@ -43,6 +48,7 @@ var obj2 = {
 >oct2 : Symbol(oct2, Decl(octalIntegerLiteral.ts, 16, 12))
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,
+>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : Symbol(0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777, Decl(octalIntegerLiteral.ts, 17, 9))
 }
 
 obj1[0o45436];     // string
diff --git a/tests/baselines/reference/octalIntegerLiteral.types b/tests/baselines/reference/octalIntegerLiteral.types
index f8f07da9a4b..160a1460977 100644
--- a/tests/baselines/reference/octalIntegerLiteral.types
+++ b/tests/baselines/reference/octalIntegerLiteral.types
@@ -20,6 +20,7 @@ var obj1 = {
 >{    0o45436: "Hello",    a: 0o45436,     b: oct1,    oct1,    0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true} : { 0o45436: string; a: number; b: number; oct1: number; 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: boolean; }
 
     0o45436: "Hello",
+>0o45436 : string
 >"Hello" : "Hello"
 
     a: 0o45436, 
@@ -34,6 +35,7 @@ var obj1 = {
 >oct1 : number
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true
+>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
 >true : true
 }
 
@@ -42,6 +44,7 @@ var obj2 = {
 >{    0O45436: "hi",    a: 0O45436,     b: oct2,    oct2,    0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,} : { 0O45436: string; a: number; b: number; oct2: number; 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: boolean; }
 
     0O45436: "hi",
+>0O45436 : string
 >"hi" : "hi"
 
     a: 0O45436, 
@@ -56,6 +59,7 @@ var obj2 = {
 >oct2 : number
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,
+>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
 >false : false
 }
 
diff --git a/tests/baselines/reference/octalIntegerLiteralES6.symbols b/tests/baselines/reference/octalIntegerLiteralES6.symbols
index ff3f54936cd..c73b9d2f85d 100644
--- a/tests/baselines/reference/octalIntegerLiteralES6.symbols
+++ b/tests/baselines/reference/octalIntegerLiteralES6.symbols
@@ -15,6 +15,8 @@ var obj1 = {
 >obj1 : Symbol(obj1, Decl(octalIntegerLiteralES6.ts, 5, 3))
 
     0o45436: "Hello",
+>0o45436 : Symbol(0o45436, Decl(octalIntegerLiteralES6.ts, 5, 12))
+
     a: 0o45436, 
 >a : Symbol(a, Decl(octalIntegerLiteralES6.ts, 6, 21))
 
@@ -26,12 +28,15 @@ var obj1 = {
 >oct1 : Symbol(oct1, Decl(octalIntegerLiteralES6.ts, 8, 12))
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true
+>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : Symbol(0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777, Decl(octalIntegerLiteralES6.ts, 9, 9))
 }
 
 var obj2 = {
 >obj2 : Symbol(obj2, Decl(octalIntegerLiteralES6.ts, 13, 3))
 
     0O45436: "hi",
+>0O45436 : Symbol(0O45436, Decl(octalIntegerLiteralES6.ts, 13, 12))
+
     a: 0O45436, 
 >a : Symbol(a, Decl(octalIntegerLiteralES6.ts, 14, 18))
 
@@ -43,6 +48,7 @@ var obj2 = {
 >oct2 : Symbol(oct2, Decl(octalIntegerLiteralES6.ts, 16, 12))
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,
+>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : Symbol(0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777, Decl(octalIntegerLiteralES6.ts, 17, 9))
 }
 
 obj1[0o45436];     // string
diff --git a/tests/baselines/reference/octalIntegerLiteralES6.types b/tests/baselines/reference/octalIntegerLiteralES6.types
index 06061be5d58..0c799a44697 100644
--- a/tests/baselines/reference/octalIntegerLiteralES6.types
+++ b/tests/baselines/reference/octalIntegerLiteralES6.types
@@ -20,6 +20,7 @@ var obj1 = {
 >{    0o45436: "Hello",    a: 0o45436,     b: oct1,    oct1,    0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true} : { 0o45436: string; a: number; b: number; oct1: number; 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: boolean; }
 
     0o45436: "Hello",
+>0o45436 : string
 >"Hello" : "Hello"
 
     a: 0o45436, 
@@ -34,6 +35,7 @@ var obj1 = {
 >oct1 : number
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true
+>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
 >true : true
 }
 
@@ -42,6 +44,7 @@ var obj2 = {
 >{    0O45436: "hi",    a: 0O45436,     b: oct2,    oct2,    0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,} : { 0O45436: string; a: number; b: number; oct2: number; 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: boolean; }
 
     0O45436: "hi",
+>0O45436 : string
 >"hi" : "hi"
 
     a: 0O45436, 
@@ -56,6 +59,7 @@ var obj2 = {
 >oct2 : number
 
     0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,
+>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean
 >false : false
 }
 
diff --git a/tests/baselines/reference/octalIntegerLiteralError.symbols b/tests/baselines/reference/octalIntegerLiteralError.symbols
index 393ce1387d4..84ab22cba90 100644
--- a/tests/baselines/reference/octalIntegerLiteralError.symbols
+++ b/tests/baselines/reference/octalIntegerLiteralError.symbols
@@ -10,7 +10,13 @@ var obj1 = {
 >obj1 : Symbol(obj1, Decl(octalIntegerLiteralError.ts, 4, 3))
 
     0O45436: "hi",
+>0O45436 : Symbol(0O45436, Decl(octalIntegerLiteralError.ts, 4, 12), Decl(octalIntegerLiteralError.ts, 5, 18), Decl(octalIntegerLiteralError.ts, 6, 19))
+
     19230: "Hello",
+>19230 : Symbol(0O45436, Decl(octalIntegerLiteralError.ts, 4, 12), Decl(octalIntegerLiteralError.ts, 5, 18), Decl(octalIntegerLiteralError.ts, 6, 19))
+
     "19230": "world",
+>"19230" : Symbol(0O45436, Decl(octalIntegerLiteralError.ts, 4, 12), Decl(octalIntegerLiteralError.ts, 5, 18), Decl(octalIntegerLiteralError.ts, 6, 19))
+
 };
 
diff --git a/tests/baselines/reference/octalIntegerLiteralError.types b/tests/baselines/reference/octalIntegerLiteralError.types
index face8ada000..1397e98fa98 100644
--- a/tests/baselines/reference/octalIntegerLiteralError.types
+++ b/tests/baselines/reference/octalIntegerLiteralError.types
@@ -15,12 +15,15 @@ var obj1 = {
 >{    0O45436: "hi",    19230: "Hello",    "19230": "world",} : { 0O45436: string; }
 
     0O45436: "hi",
+>0O45436 : string
 >"hi" : "hi"
 
     19230: "Hello",
+>19230 : string
 >"Hello" : "Hello"
 
     "19230": "world",
+>"19230" : string
 >"world" : "world"
 
 };
diff --git a/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.symbols b/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.symbols
index 9db33365b44..fcbb442c09d 100644
--- a/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.symbols
+++ b/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.symbols
@@ -253,4 +253,5 @@ class C25 {
 
     async * x = 1;
 >x : Symbol(C25.x, Decl(asyncGeneratorPropertyIsError.ts, 0, 11))
+>1 : Symbol(C25[1], Decl(asyncGeneratorPropertyIsError.ts, 1, 15))
 }
diff --git a/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.types b/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.types
index 254d983caaa..599ad78f057 100644
--- a/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.types
+++ b/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.types
@@ -286,4 +286,5 @@ class C25 {
 
     async * x = 1;
 >x : () => any
+>1 : any
 }
diff --git a/tests/baselines/reference/parser0_004152.symbols b/tests/baselines/reference/parser0_004152.symbols
index 97ad2e5b860..f2c778993e5 100644
--- a/tests/baselines/reference/parser0_004152.symbols
+++ b/tests/baselines/reference/parser0_004152.symbols
@@ -4,7 +4,21 @@ export class Game {
 
     private position = new DisplayPosition([), 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0], NoMove, 0);
 >position : Symbol(Game.position, Decl(parser0_004152.ts, 0, 19))
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>0 : Symbol(Game[0], Decl(parser0_004152.ts, 1, 61), Decl(parser0_004152.ts, 1, 82), Decl(parser0_004152.ts, 1, 94))
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>3 : Symbol(Game[3], Decl(parser0_004152.ts, 1, 46), Decl(parser0_004152.ts, 1, 49), Decl(parser0_004152.ts, 1, 52), Decl(parser0_004152.ts, 1, 55), Decl(parser0_004152.ts, 1, 58) ... and 6 more)
+>0 : Symbol(Game[0], Decl(parser0_004152.ts, 1, 61), Decl(parser0_004152.ts, 1, 82), Decl(parser0_004152.ts, 1, 94))
 >NoMove : Symbol(Game.NoMove, Decl(parser0_004152.ts, 1, 86))
+>0 : Symbol(Game[0], Decl(parser0_004152.ts, 1, 61), Decl(parser0_004152.ts, 1, 82), Decl(parser0_004152.ts, 1, 94))
 
     private prevConfig: SeedCoords[][];
 >prevConfig : Symbol(Game.prevConfig, Decl(parser0_004152.ts, 1, 98))
diff --git a/tests/baselines/reference/parser0_004152.types b/tests/baselines/reference/parser0_004152.types
index 5677fe15dfa..399bb260cc1 100644
--- a/tests/baselines/reference/parser0_004152.types
+++ b/tests/baselines/reference/parser0_004152.types
@@ -7,7 +7,21 @@ export class Game {
 >new DisplayPosition([) : any
 >DisplayPosition : any
 >[ : undefined[]
+>3 : any
+>3 : any
+>3 : any
+>3 : any
+>3 : any
+>0 : any
+>3 : any
+>3 : any
+>3 : any
+>3 : any
+>3 : any
+>3 : any
+>0 : any
 >NoMove : any
+>0 : any
 
     private prevConfig: SeedCoords[][];
 >prevConfig : any[][]
diff --git a/tests/baselines/reference/parserClassDeclaration19.symbols b/tests/baselines/reference/parserClassDeclaration19.symbols
index 9e9f64ca282..237cdbddaa4 100644
--- a/tests/baselines/reference/parserClassDeclaration19.symbols
+++ b/tests/baselines/reference/parserClassDeclaration19.symbols
@@ -6,4 +6,5 @@ class C {
 >foo : Symbol(C.foo, Decl(parserClassDeclaration19.ts, 0, 9), Decl(parserClassDeclaration19.ts, 1, 10))
 
     "foo"() { }
+>"foo" : Symbol(C.foo, Decl(parserClassDeclaration19.ts, 0, 9), Decl(parserClassDeclaration19.ts, 1, 10))
 }
diff --git a/tests/baselines/reference/parserClassDeclaration19.types b/tests/baselines/reference/parserClassDeclaration19.types
index 1f6a25bbdc8..dbaa031b8c5 100644
--- a/tests/baselines/reference/parserClassDeclaration19.types
+++ b/tests/baselines/reference/parserClassDeclaration19.types
@@ -6,4 +6,5 @@ class C {
 >foo : () => any
 
     "foo"() { }
+>"foo" : () => any
 }
diff --git a/tests/baselines/reference/parserClassDeclaration20.symbols b/tests/baselines/reference/parserClassDeclaration20.symbols
index 52e83a3f10c..b401915bd2a 100644
--- a/tests/baselines/reference/parserClassDeclaration20.symbols
+++ b/tests/baselines/reference/parserClassDeclaration20.symbols
@@ -3,5 +3,8 @@ class C {
 >C : Symbol(C, Decl(parserClassDeclaration20.ts, 0, 0))
 
     0();
+>0 : Symbol(C[0], Decl(parserClassDeclaration20.ts, 0, 9), Decl(parserClassDeclaration20.ts, 1, 8))
+
     "0"() { }
+>"0" : Symbol(C[0], Decl(parserClassDeclaration20.ts, 0, 9), Decl(parserClassDeclaration20.ts, 1, 8))
 }
diff --git a/tests/baselines/reference/parserClassDeclaration20.types b/tests/baselines/reference/parserClassDeclaration20.types
index e8014bf3af5..ceaab7c2cfa 100644
--- a/tests/baselines/reference/parserClassDeclaration20.types
+++ b/tests/baselines/reference/parserClassDeclaration20.types
@@ -3,5 +3,8 @@ class C {
 >C : C
 
     0();
+>0 : () => any
+
     "0"() { }
+>"0" : () => any
 }
diff --git a/tests/baselines/reference/parserClassDeclaration21.symbols b/tests/baselines/reference/parserClassDeclaration21.symbols
index b8528c65b28..38e745f69f7 100644
--- a/tests/baselines/reference/parserClassDeclaration21.symbols
+++ b/tests/baselines/reference/parserClassDeclaration21.symbols
@@ -3,5 +3,8 @@ class C {
 >C : Symbol(C, Decl(parserClassDeclaration21.ts, 0, 0))
 
     0();
+>0 : Symbol(C[0], Decl(parserClassDeclaration21.ts, 0, 9))
+
     1() { }
+>1 : Symbol(C[1], Decl(parserClassDeclaration21.ts, 1, 8))
 }
diff --git a/tests/baselines/reference/parserClassDeclaration21.types b/tests/baselines/reference/parserClassDeclaration21.types
index 40d19ab2d48..361c65caeaf 100644
--- a/tests/baselines/reference/parserClassDeclaration21.types
+++ b/tests/baselines/reference/parserClassDeclaration21.types
@@ -3,5 +3,8 @@ class C {
 >C : C
 
     0();
+>0 : () => any
+
     1() { }
+>1 : () => void
 }
diff --git a/tests/baselines/reference/parserClassDeclaration22.symbols b/tests/baselines/reference/parserClassDeclaration22.symbols
index 30b9bea3d0e..0008017a73a 100644
--- a/tests/baselines/reference/parserClassDeclaration22.symbols
+++ b/tests/baselines/reference/parserClassDeclaration22.symbols
@@ -3,5 +3,8 @@ class C {
 >C : Symbol(C, Decl(parserClassDeclaration22.ts, 0, 0))
 
     "foo"();
+>"foo" : Symbol(C["foo"], Decl(parserClassDeclaration22.ts, 0, 9))
+
     "bar"() { }
+>"bar" : Symbol(C["bar"], Decl(parserClassDeclaration22.ts, 1, 12))
 }
diff --git a/tests/baselines/reference/parserClassDeclaration22.types b/tests/baselines/reference/parserClassDeclaration22.types
index d339df3b368..d4af4194a4c 100644
--- a/tests/baselines/reference/parserClassDeclaration22.types
+++ b/tests/baselines/reference/parserClassDeclaration22.types
@@ -3,5 +3,8 @@ class C {
 >C : C
 
     "foo"();
+>"foo" : () => any
+
     "bar"() { }
+>"bar" : () => void
 }
diff --git a/tests/baselines/reference/parserEnum5.symbols b/tests/baselines/reference/parserEnum5.symbols
index b4bd7603503..11d9171fc69 100644
--- a/tests/baselines/reference/parserEnum5.symbols
+++ b/tests/baselines/reference/parserEnum5.symbols
@@ -6,11 +6,14 @@ enum E2 { a, }
 enum E3 { a: 1, }
 >E3 : Symbol(E3, Decl(parserEnum5.ts, 0, 14))
 >a : Symbol(E3.a, Decl(parserEnum5.ts, 1, 9))
+>1 : Symbol(E3[1], Decl(parserEnum5.ts, 1, 12))
 
 enum E1 { a, b: 1, c, d: 2 = 3 }
 >E1 : Symbol(E1, Decl(parserEnum5.ts, 1, 17))
 >a : Symbol(E1.a, Decl(parserEnum5.ts, 2, 9))
 >b : Symbol(E1.b, Decl(parserEnum5.ts, 2, 12))
+>1 : Symbol(E1[1], Decl(parserEnum5.ts, 2, 15))
 >c : Symbol(E1.c, Decl(parserEnum5.ts, 2, 18))
 >d : Symbol(E1.d, Decl(parserEnum5.ts, 2, 21))
+>2 : Symbol(E1[2], Decl(parserEnum5.ts, 2, 24))
 
diff --git a/tests/baselines/reference/parserEnum5.types b/tests/baselines/reference/parserEnum5.types
index 07aa381a43b..5d9e30c0932 100644
--- a/tests/baselines/reference/parserEnum5.types
+++ b/tests/baselines/reference/parserEnum5.types
@@ -6,12 +6,15 @@ enum E2 { a, }
 enum E3 { a: 1, }
 >E3 : E3
 >a : E3.a
+>1 : E3.1
 
 enum E1 { a, b: 1, c, d: 2 = 3 }
 >E1 : E1
 >a : E1.a
 >b : E1.b
+>1 : E1.1
 >c : E1.c
 >d : E1.d
+>2 : E1.c
 >3 : 3
 
diff --git a/tests/baselines/reference/parserEnum6.symbols b/tests/baselines/reference/parserEnum6.symbols
index baee1886f24..001c0af0be9 100644
--- a/tests/baselines/reference/parserEnum6.symbols
+++ b/tests/baselines/reference/parserEnum6.symbols
@@ -3,4 +3,7 @@ enum E {
 >E : Symbol(E, Decl(parserEnum6.ts, 0, 0))
 
   "A", "B", "C"
+>"A" : Symbol(E["A"], Decl(parserEnum6.ts, 0, 8))
+>"B" : Symbol(E["B"], Decl(parserEnum6.ts, 1, 6))
+>"C" : Symbol(E["C"], Decl(parserEnum6.ts, 1, 11))
 }
diff --git a/tests/baselines/reference/parserEnum6.types b/tests/baselines/reference/parserEnum6.types
index 9b9e2a4909a..8f4cd9bc484 100644
--- a/tests/baselines/reference/parserEnum6.types
+++ b/tests/baselines/reference/parserEnum6.types
@@ -3,4 +3,7 @@ enum E {
 >E : E
 
   "A", "B", "C"
+>"A" : E.A
+>"B" : E.B
+>"C" : E.C
 }
diff --git a/tests/baselines/reference/parserEnum7.symbols b/tests/baselines/reference/parserEnum7.symbols
index bfea417c332..9d1cbf0248a 100644
--- a/tests/baselines/reference/parserEnum7.symbols
+++ b/tests/baselines/reference/parserEnum7.symbols
@@ -3,4 +3,7 @@ enum E {
 >E : Symbol(E, Decl(parserEnum7.ts, 0, 0))
 
   1, 2, 3
+>1 : Symbol(E[1], Decl(parserEnum7.ts, 0, 8))
+>2 : Symbol(E[2], Decl(parserEnum7.ts, 1, 4))
+>3 : Symbol(E[3], Decl(parserEnum7.ts, 1, 7))
 }
diff --git a/tests/baselines/reference/parserEnum7.types b/tests/baselines/reference/parserEnum7.types
index 63a77cb9d23..dc9cc929757 100644
--- a/tests/baselines/reference/parserEnum7.types
+++ b/tests/baselines/reference/parserEnum7.types
@@ -3,4 +3,7 @@ enum E {
 >E : E
 
   1, 2, 3
+>1 : E.1
+>2 : E.2
+>3 : E.3
 }
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.symbols b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.symbols
index d809be20968..9bc9cc6b1a8 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.symbols
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.symbols
@@ -18,6 +18,7 @@ module Shapes {
 
         public con:C "hello";
 >con : Symbol(Point.con, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 9, 42))
+>"hello" : Symbol(Point["hello"], Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 11, 20))
 
         // Constructor
         constructor (public x: number, public y: number) { }
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
index c83c4dcdd19..383bbe9b0dc 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
@@ -19,6 +19,7 @@ module Shapes {
         public con:C "hello";
 >con : any
 >C : No type information available!
+>"hello" : any
 
         // Constructor
         constructor (public x: number, public y: number) { }
diff --git a/tests/baselines/reference/parserExportAssignment6.symbols b/tests/baselines/reference/parserExportAssignment6.symbols
index b779087ac39..3210115181c 100644
--- a/tests/baselines/reference/parserExportAssignment6.symbols
+++ b/tests/baselines/reference/parserExportAssignment6.symbols
@@ -1,5 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment6.ts ===
 declare module "M" {
-No type information for this code.    export = A;
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"M" : Symbol("M", Decl(parserExportAssignment6.ts, 0, 0))
+
+    export = A;
+}
diff --git a/tests/baselines/reference/parserExportAssignment6.types b/tests/baselines/reference/parserExportAssignment6.types
index 1bf8de8b83e..a6ad32722e3 100644
--- a/tests/baselines/reference/parserExportAssignment6.types
+++ b/tests/baselines/reference/parserExportAssignment6.types
@@ -1,5 +1,7 @@
 === tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment6.ts ===
 declare module "M" {
+>"M" : typeof "M"
+
     export = A;
 >A : No type information available!
 }
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment2.symbols b/tests/baselines/reference/parserFunctionPropertyAssignment2.symbols
index 3cd2d8ab325..e66fc32d6eb 100644
--- a/tests/baselines/reference/parserFunctionPropertyAssignment2.symbols
+++ b/tests/baselines/reference/parserFunctionPropertyAssignment2.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment2.ts ===
 var v = { 0() { } };
 >v : Symbol(v, Decl(parserFunctionPropertyAssignment2.ts, 0, 3))
+>0 : Symbol(0, Decl(parserFunctionPropertyAssignment2.ts, 0, 9))
 
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment2.types b/tests/baselines/reference/parserFunctionPropertyAssignment2.types
index 747b66978af..e6ee85bba89 100644
--- a/tests/baselines/reference/parserFunctionPropertyAssignment2.types
+++ b/tests/baselines/reference/parserFunctionPropertyAssignment2.types
@@ -2,4 +2,5 @@
 var v = { 0() { } };
 >v : { 0(): void; }
 >{ 0() { } } : { 0(): void; }
+>0 : () => void
 
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment3.symbols b/tests/baselines/reference/parserFunctionPropertyAssignment3.symbols
index 9b3135c5ed0..afcf09b03b6 100644
--- a/tests/baselines/reference/parserFunctionPropertyAssignment3.symbols
+++ b/tests/baselines/reference/parserFunctionPropertyAssignment3.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment3.ts ===
 var v = { "foo"() { } };
 >v : Symbol(v, Decl(parserFunctionPropertyAssignment3.ts, 0, 3))
+>"foo" : Symbol("foo", Decl(parserFunctionPropertyAssignment3.ts, 0, 9))
 
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment3.types b/tests/baselines/reference/parserFunctionPropertyAssignment3.types
index 9fb2bb45fef..1e3dd3be75d 100644
--- a/tests/baselines/reference/parserFunctionPropertyAssignment3.types
+++ b/tests/baselines/reference/parserFunctionPropertyAssignment3.types
@@ -2,4 +2,5 @@
 var v = { "foo"() { } };
 >v : { "foo"(): void; }
 >{ "foo"() { } } : { "foo"(): void; }
+>"foo" : () => void
 
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment4.symbols b/tests/baselines/reference/parserFunctionPropertyAssignment4.symbols
index 2cb8b652e33..b313d7b5ec0 100644
--- a/tests/baselines/reference/parserFunctionPropertyAssignment4.symbols
+++ b/tests/baselines/reference/parserFunctionPropertyAssignment4.symbols
@@ -1,5 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment4.ts ===
 var v = { 0<T>() { } };
 >v : Symbol(v, Decl(parserFunctionPropertyAssignment4.ts, 0, 3))
+>0 : Symbol(0, Decl(parserFunctionPropertyAssignment4.ts, 0, 9))
 >T : Symbol(T, Decl(parserFunctionPropertyAssignment4.ts, 0, 12))
 
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment4.types b/tests/baselines/reference/parserFunctionPropertyAssignment4.types
index 6ab031518d4..f7db89dec4b 100644
--- a/tests/baselines/reference/parserFunctionPropertyAssignment4.types
+++ b/tests/baselines/reference/parserFunctionPropertyAssignment4.types
@@ -2,5 +2,6 @@
 var v = { 0<T>() { } };
 >v : { 0<T>(): void; }
 >{ 0<T>() { } } : { 0<T>(): void; }
+>0 : <T>() => void
 >T : T
 
diff --git a/tests/baselines/reference/parserInExpression1.symbols b/tests/baselines/reference/parserInExpression1.symbols
index c351905f2fd..22fe1918adc 100644
--- a/tests/baselines/reference/parserInExpression1.symbols
+++ b/tests/baselines/reference/parserInExpression1.symbols
@@ -1,3 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/parserInExpression1.ts ===
 console.log("a" in { "a": true });
-No type information for this code.
\ No newline at end of file
+>"a" : Symbol("a", Decl(parserInExpression1.ts, 0, 20))
+
diff --git a/tests/baselines/reference/parserInExpression1.types b/tests/baselines/reference/parserInExpression1.types
index 64612921479..929258fa176 100644
--- a/tests/baselines/reference/parserInExpression1.types
+++ b/tests/baselines/reference/parserInExpression1.types
@@ -7,5 +7,6 @@ console.log("a" in { "a": true });
 >"a" in { "a": true } : boolean
 >"a" : "a"
 >{ "a": true } : { "a": boolean; }
+>"a" : boolean
 >true : true
 
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.symbols b/tests/baselines/reference/parserMemberAccessorDeclaration2.symbols
index 739fa591dac..dcaaf905a2b 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration2.symbols
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.symbols
@@ -3,4 +3,5 @@ class C {
 >C : Symbol(C, Decl(parserMemberAccessorDeclaration2.ts, 0, 0))
 
   get "b"() { }
+>"b" : Symbol(C["b"], Decl(parserMemberAccessorDeclaration2.ts, 0, 9))
 }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.types b/tests/baselines/reference/parserMemberAccessorDeclaration2.types
index c78ac3f01b6..4f1ef999f0c 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration2.types
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.types
@@ -3,4 +3,5 @@ class C {
 >C : C
 
   get "b"() { }
+>"b" : void
 }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.symbols b/tests/baselines/reference/parserMemberAccessorDeclaration3.symbols
index 139aa8bdb5a..a917be17706 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration3.symbols
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.symbols
@@ -3,4 +3,5 @@ class C {
 >C : Symbol(C, Decl(parserMemberAccessorDeclaration3.ts, 0, 0))
 
   get 0() { }
+>0 : Symbol(C[0], Decl(parserMemberAccessorDeclaration3.ts, 0, 9))
 }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.types b/tests/baselines/reference/parserMemberAccessorDeclaration3.types
index 1e684506cee..b9f6feab8c0 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration3.types
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.types
@@ -3,4 +3,5 @@ class C {
 >C : C
 
   get 0() { }
+>0 : void
 }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.symbols b/tests/baselines/reference/parserMemberAccessorDeclaration5.symbols
index ac343ff02b1..179d8c12719 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration5.symbols
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.symbols
@@ -3,5 +3,6 @@ class C {
 >C : Symbol(C, Decl(parserMemberAccessorDeclaration5.ts, 0, 0))
 
   set "a"(i) { }
+>"a" : Symbol(C["a"], Decl(parserMemberAccessorDeclaration5.ts, 0, 9))
 >i : Symbol(i, Decl(parserMemberAccessorDeclaration5.ts, 1, 10))
 }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.types b/tests/baselines/reference/parserMemberAccessorDeclaration5.types
index d22ee2d775a..5d9e220c63b 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration5.types
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.types
@@ -3,5 +3,6 @@ class C {
 >C : C
 
   set "a"(i) { }
+>"a" : any
 >i : any
 }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.symbols b/tests/baselines/reference/parserMemberAccessorDeclaration6.symbols
index a4b4558e892..2465d778669 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration6.symbols
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.symbols
@@ -3,5 +3,6 @@ class C {
 >C : Symbol(C, Decl(parserMemberAccessorDeclaration6.ts, 0, 0))
 
   set 0(i) { }
+>0 : Symbol(C[0], Decl(parserMemberAccessorDeclaration6.ts, 0, 9))
 >i : Symbol(i, Decl(parserMemberAccessorDeclaration6.ts, 1, 8))
 }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.types b/tests/baselines/reference/parserMemberAccessorDeclaration6.types
index a06b6ddfa0c..f530233ba38 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration6.types
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.types
@@ -3,5 +3,6 @@ class C {
 >C : C
 
   set 0(i) { }
+>0 : any
 >i : any
 }
diff --git a/tests/baselines/reference/parserMethodSignature10.symbols b/tests/baselines/reference/parserMethodSignature10.symbols
index 4cefa6c759e..ccef3e62f39 100644
--- a/tests/baselines/reference/parserMethodSignature10.symbols
+++ b/tests/baselines/reference/parserMethodSignature10.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature10.ts, 0, 0))
 
   1?();
+>1 : Symbol(I[1], Decl(parserMethodSignature10.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserMethodSignature10.types b/tests/baselines/reference/parserMethodSignature10.types
index 34b3bfcbd33..4b690b4f8c7 100644
--- a/tests/baselines/reference/parserMethodSignature10.types
+++ b/tests/baselines/reference/parserMethodSignature10.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   1?();
+>1 : () => any
 }
diff --git a/tests/baselines/reference/parserMethodSignature11.symbols b/tests/baselines/reference/parserMethodSignature11.symbols
index 3217eb47aec..a0a418e7b94 100644
--- a/tests/baselines/reference/parserMethodSignature11.symbols
+++ b/tests/baselines/reference/parserMethodSignature11.symbols
@@ -3,5 +3,6 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature11.ts, 0, 0))
 
   2<T>();
+>2 : Symbol(I[2], Decl(parserMethodSignature11.ts, 0, 13))
 >T : Symbol(T, Decl(parserMethodSignature11.ts, 1, 4))
 }
diff --git a/tests/baselines/reference/parserMethodSignature11.types b/tests/baselines/reference/parserMethodSignature11.types
index f47eda1e9cd..9bdaab6e85a 100644
--- a/tests/baselines/reference/parserMethodSignature11.types
+++ b/tests/baselines/reference/parserMethodSignature11.types
@@ -3,5 +3,6 @@ interface I {
 >I : I
 
   2<T>();
+>2 : <T>() => any
 >T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature12.symbols b/tests/baselines/reference/parserMethodSignature12.symbols
index 364a89eb970..5f1e1b6c0b5 100644
--- a/tests/baselines/reference/parserMethodSignature12.symbols
+++ b/tests/baselines/reference/parserMethodSignature12.symbols
@@ -3,5 +3,6 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature12.ts, 0, 0))
 
   3?<T>();
+>3 : Symbol(I[3], Decl(parserMethodSignature12.ts, 0, 13))
 >T : Symbol(T, Decl(parserMethodSignature12.ts, 1, 5))
 }
diff --git a/tests/baselines/reference/parserMethodSignature12.types b/tests/baselines/reference/parserMethodSignature12.types
index b5b38fadb4b..3da7315107a 100644
--- a/tests/baselines/reference/parserMethodSignature12.types
+++ b/tests/baselines/reference/parserMethodSignature12.types
@@ -3,5 +3,6 @@ interface I {
 >I : I
 
   3?<T>();
+>3 : <T>() => any
 >T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature5.symbols b/tests/baselines/reference/parserMethodSignature5.symbols
index 8cf748ab50c..579433294fc 100644
--- a/tests/baselines/reference/parserMethodSignature5.symbols
+++ b/tests/baselines/reference/parserMethodSignature5.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature5.ts, 0, 0))
 
   "E"();
+>"E" : Symbol(I["E"], Decl(parserMethodSignature5.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserMethodSignature5.types b/tests/baselines/reference/parserMethodSignature5.types
index 86053a7c1f8..2e20aae0946 100644
--- a/tests/baselines/reference/parserMethodSignature5.types
+++ b/tests/baselines/reference/parserMethodSignature5.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   "E"();
+>"E" : () => any
 }
diff --git a/tests/baselines/reference/parserMethodSignature6.symbols b/tests/baselines/reference/parserMethodSignature6.symbols
index b15a3d9a4e2..2557a37d513 100644
--- a/tests/baselines/reference/parserMethodSignature6.symbols
+++ b/tests/baselines/reference/parserMethodSignature6.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature6.ts, 0, 0))
 
   "F"?();
+>"F" : Symbol(I["F"], Decl(parserMethodSignature6.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserMethodSignature6.types b/tests/baselines/reference/parserMethodSignature6.types
index 184cdc1148a..f116fe39aae 100644
--- a/tests/baselines/reference/parserMethodSignature6.types
+++ b/tests/baselines/reference/parserMethodSignature6.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   "F"?();
+>"F" : () => any
 }
diff --git a/tests/baselines/reference/parserMethodSignature7.symbols b/tests/baselines/reference/parserMethodSignature7.symbols
index 3b275fa20cb..b394534ec22 100644
--- a/tests/baselines/reference/parserMethodSignature7.symbols
+++ b/tests/baselines/reference/parserMethodSignature7.symbols
@@ -3,5 +3,6 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature7.ts, 0, 0))
 
   "G"<T>();
+>"G" : Symbol(I["G"], Decl(parserMethodSignature7.ts, 0, 13))
 >T : Symbol(T, Decl(parserMethodSignature7.ts, 1, 6))
 }
diff --git a/tests/baselines/reference/parserMethodSignature7.types b/tests/baselines/reference/parserMethodSignature7.types
index 58a029c0a4a..55b2684eb79 100644
--- a/tests/baselines/reference/parserMethodSignature7.types
+++ b/tests/baselines/reference/parserMethodSignature7.types
@@ -3,5 +3,6 @@ interface I {
 >I : I
 
   "G"<T>();
+>"G" : <T>() => any
 >T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature8.symbols b/tests/baselines/reference/parserMethodSignature8.symbols
index 9fe0a7d64e8..2d601b5d38f 100644
--- a/tests/baselines/reference/parserMethodSignature8.symbols
+++ b/tests/baselines/reference/parserMethodSignature8.symbols
@@ -3,5 +3,6 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature8.ts, 0, 0))
 
   "H"?<T>();
+>"H" : Symbol(I["H"], Decl(parserMethodSignature8.ts, 0, 13))
 >T : Symbol(T, Decl(parserMethodSignature8.ts, 1, 7))
 }
diff --git a/tests/baselines/reference/parserMethodSignature8.types b/tests/baselines/reference/parserMethodSignature8.types
index 7480e3d92a2..33599ca25d2 100644
--- a/tests/baselines/reference/parserMethodSignature8.types
+++ b/tests/baselines/reference/parserMethodSignature8.types
@@ -3,5 +3,6 @@ interface I {
 >I : I
 
   "H"?<T>();
+>"H" : <T>() => any
 >T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature9.symbols b/tests/baselines/reference/parserMethodSignature9.symbols
index 2fb7aa56d3b..2709229bdad 100644
--- a/tests/baselines/reference/parserMethodSignature9.symbols
+++ b/tests/baselines/reference/parserMethodSignature9.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature9.ts, 0, 0))
 
   0();
+>0 : Symbol(I[0], Decl(parserMethodSignature9.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserMethodSignature9.types b/tests/baselines/reference/parserMethodSignature9.types
index ac2f85d002d..8bf875a3b09 100644
--- a/tests/baselines/reference/parserMethodSignature9.types
+++ b/tests/baselines/reference/parserMethodSignature9.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   0();
+>0 : () => any
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration1.d.symbols b/tests/baselines/reference/parserModuleDeclaration1.d.symbols
index f8f742293fb..97e3e6e749c 100644
--- a/tests/baselines/reference/parserModuleDeclaration1.d.symbols
+++ b/tests/baselines/reference/parserModuleDeclaration1.d.symbols
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration1.d.ts ===
 module "Foo" {
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"Foo" : Symbol("Foo", Decl(parserModuleDeclaration1.d.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/parserModuleDeclaration1.d.types b/tests/baselines/reference/parserModuleDeclaration1.d.types
index f8f742293fb..0ccbe7ea896 100644
--- a/tests/baselines/reference/parserModuleDeclaration1.d.types
+++ b/tests/baselines/reference/parserModuleDeclaration1.d.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration1.d.ts ===
 module "Foo" {
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"Foo" : typeof "Foo"
+}
diff --git a/tests/baselines/reference/parserModuleDeclaration1.symbols b/tests/baselines/reference/parserModuleDeclaration1.symbols
index 536bec9f5e8..0a6b8ed883f 100644
--- a/tests/baselines/reference/parserModuleDeclaration1.symbols
+++ b/tests/baselines/reference/parserModuleDeclaration1.symbols
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration1.ts ===
 module "Foo" {
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"Foo" : Symbol("Foo", Decl(parserModuleDeclaration1.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/parserModuleDeclaration1.types b/tests/baselines/reference/parserModuleDeclaration1.types
index 536bec9f5e8..f37435dacbd 100644
--- a/tests/baselines/reference/parserModuleDeclaration1.types
+++ b/tests/baselines/reference/parserModuleDeclaration1.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration1.ts ===
 module "Foo" {
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"Foo" : typeof "Foo"
+}
diff --git a/tests/baselines/reference/parserModuleDeclaration2.symbols b/tests/baselines/reference/parserModuleDeclaration2.symbols
index 340cee697f1..5d9ae63cb31 100644
--- a/tests/baselines/reference/parserModuleDeclaration2.symbols
+++ b/tests/baselines/reference/parserModuleDeclaration2.symbols
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.ts ===
 declare module "Foo" {
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"Foo" : Symbol("Foo", Decl(parserModuleDeclaration2.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/parserModuleDeclaration2.types b/tests/baselines/reference/parserModuleDeclaration2.types
index 340cee697f1..5794fdcca17 100644
--- a/tests/baselines/reference/parserModuleDeclaration2.types
+++ b/tests/baselines/reference/parserModuleDeclaration2.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.ts ===
 declare module "Foo" {
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
+>"Foo" : typeof "Foo"
+}
diff --git a/tests/baselines/reference/parserPropertySignature10.symbols b/tests/baselines/reference/parserPropertySignature10.symbols
index a6a755a0891..5d28260efd3 100644
--- a/tests/baselines/reference/parserPropertySignature10.symbols
+++ b/tests/baselines/reference/parserPropertySignature10.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature10.ts, 0, 0))
 
   1?;
+>1 : Symbol(I[1], Decl(parserPropertySignature10.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature10.types b/tests/baselines/reference/parserPropertySignature10.types
index 06d1e78f0f1..48c2c3692dd 100644
--- a/tests/baselines/reference/parserPropertySignature10.types
+++ b/tests/baselines/reference/parserPropertySignature10.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   1?;
+>1 : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature11.symbols b/tests/baselines/reference/parserPropertySignature11.symbols
index 960f16bf526..43b6fd012ab 100644
--- a/tests/baselines/reference/parserPropertySignature11.symbols
+++ b/tests/baselines/reference/parserPropertySignature11.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature11.ts, 0, 0))
 
   2:any;
+>2 : Symbol(I[2], Decl(parserPropertySignature11.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature11.types b/tests/baselines/reference/parserPropertySignature11.types
index 55776f4f820..e5577886476 100644
--- a/tests/baselines/reference/parserPropertySignature11.types
+++ b/tests/baselines/reference/parserPropertySignature11.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   2:any;
+>2 : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature12.symbols b/tests/baselines/reference/parserPropertySignature12.symbols
index a6f0eb5faf8..fef4c685e37 100644
--- a/tests/baselines/reference/parserPropertySignature12.symbols
+++ b/tests/baselines/reference/parserPropertySignature12.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature12.ts, 0, 0))
 
   3?:any;
+>3 : Symbol(I[3], Decl(parserPropertySignature12.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature12.types b/tests/baselines/reference/parserPropertySignature12.types
index 1c37dcaa460..88cde3fb314 100644
--- a/tests/baselines/reference/parserPropertySignature12.types
+++ b/tests/baselines/reference/parserPropertySignature12.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   3?:any;
+>3 : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature5.symbols b/tests/baselines/reference/parserPropertySignature5.symbols
index fa56ec75871..99d3a813c85 100644
--- a/tests/baselines/reference/parserPropertySignature5.symbols
+++ b/tests/baselines/reference/parserPropertySignature5.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature5.ts, 0, 0))
 
   "E";
+>"E" : Symbol(I["E"], Decl(parserPropertySignature5.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature5.types b/tests/baselines/reference/parserPropertySignature5.types
index c85c814fc70..74c0ba517e2 100644
--- a/tests/baselines/reference/parserPropertySignature5.types
+++ b/tests/baselines/reference/parserPropertySignature5.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   "E";
+>"E" : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature6.symbols b/tests/baselines/reference/parserPropertySignature6.symbols
index 1f3831e5610..2710a46db8e 100644
--- a/tests/baselines/reference/parserPropertySignature6.symbols
+++ b/tests/baselines/reference/parserPropertySignature6.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature6.ts, 0, 0))
 
   "F"?;
+>"F" : Symbol(I["F"], Decl(parserPropertySignature6.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature6.types b/tests/baselines/reference/parserPropertySignature6.types
index 94ca4e313df..b5ad6ca8f9d 100644
--- a/tests/baselines/reference/parserPropertySignature6.types
+++ b/tests/baselines/reference/parserPropertySignature6.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   "F"?;
+>"F" : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature7.symbols b/tests/baselines/reference/parserPropertySignature7.symbols
index 840b302d6ac..d21bcadb446 100644
--- a/tests/baselines/reference/parserPropertySignature7.symbols
+++ b/tests/baselines/reference/parserPropertySignature7.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature7.ts, 0, 0))
 
   "G":any;
+>"G" : Symbol(I["G"], Decl(parserPropertySignature7.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature7.types b/tests/baselines/reference/parserPropertySignature7.types
index 0f78332d756..de676079800 100644
--- a/tests/baselines/reference/parserPropertySignature7.types
+++ b/tests/baselines/reference/parserPropertySignature7.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   "G":any;
+>"G" : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature8.symbols b/tests/baselines/reference/parserPropertySignature8.symbols
index e124b4c770c..4352a21e0f1 100644
--- a/tests/baselines/reference/parserPropertySignature8.symbols
+++ b/tests/baselines/reference/parserPropertySignature8.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature8.ts, 0, 0))
 
   "H"?:any;
+>"H" : Symbol(I["H"], Decl(parserPropertySignature8.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature8.types b/tests/baselines/reference/parserPropertySignature8.types
index 79594cec56a..1afb5d1bfe2 100644
--- a/tests/baselines/reference/parserPropertySignature8.types
+++ b/tests/baselines/reference/parserPropertySignature8.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   "H"?:any;
+>"H" : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature9.symbols b/tests/baselines/reference/parserPropertySignature9.symbols
index 3664160fad4..fdfdaffcbbf 100644
--- a/tests/baselines/reference/parserPropertySignature9.symbols
+++ b/tests/baselines/reference/parserPropertySignature9.symbols
@@ -3,4 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature9.ts, 0, 0))
 
   0;
+>0 : Symbol(I[0], Decl(parserPropertySignature9.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature9.types b/tests/baselines/reference/parserPropertySignature9.types
index b7dbff8cbee..030d9497d33 100644
--- a/tests/baselines/reference/parserPropertySignature9.types
+++ b/tests/baselines/reference/parserPropertySignature9.types
@@ -3,4 +3,5 @@ interface I {
 >I : I
 
   0;
+>0 : any
 }
diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment3.symbols b/tests/baselines/reference/parserShorthandPropertyAssignment3.symbols
index 3dbca289fc8..c0c2a29ef20 100644
--- a/tests/baselines/reference/parserShorthandPropertyAssignment3.symbols
+++ b/tests/baselines/reference/parserShorthandPropertyAssignment3.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript6/ShorthandPropertyAssignment/parserShorthandPropertyAssignment3.ts ===
 var v = { "" };
 >v : Symbol(v, Decl(parserShorthandPropertyAssignment3.ts, 0, 3))
+>"" : Symbol("", Decl(parserShorthandPropertyAssignment3.ts, 0, 9))
 
diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment3.types b/tests/baselines/reference/parserShorthandPropertyAssignment3.types
index 18270a03f17..50e6775339d 100644
--- a/tests/baselines/reference/parserShorthandPropertyAssignment3.types
+++ b/tests/baselines/reference/parserShorthandPropertyAssignment3.types
@@ -2,5 +2,6 @@
 var v = { "" };
 >v : { "": any; }
 >{ "" } : { "": any; }
+>"" : any
 > : any
 
diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment4.symbols b/tests/baselines/reference/parserShorthandPropertyAssignment4.symbols
index 999e7e1befe..08662c04811 100644
--- a/tests/baselines/reference/parserShorthandPropertyAssignment4.symbols
+++ b/tests/baselines/reference/parserShorthandPropertyAssignment4.symbols
@@ -1,4 +1,5 @@
 === tests/cases/conformance/parser/ecmascript6/ShorthandPropertyAssignment/parserShorthandPropertyAssignment4.ts ===
 var v = { 0 };
 >v : Symbol(v, Decl(parserShorthandPropertyAssignment4.ts, 0, 3))
+>0 : Symbol(0, Decl(parserShorthandPropertyAssignment4.ts, 0, 9))
 
diff --git a/tests/baselines/reference/parserShorthandPropertyAssignment4.types b/tests/baselines/reference/parserShorthandPropertyAssignment4.types
index 0f277cd1755..1ae8cd24ba7 100644
--- a/tests/baselines/reference/parserShorthandPropertyAssignment4.types
+++ b/tests/baselines/reference/parserShorthandPropertyAssignment4.types
@@ -2,5 +2,6 @@
 var v = { 0 };
 >v : { 0: any; }
 >{ 0 } : { 0: any; }
+>0 : any
 > : any
 
diff --git a/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.symbols b/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.symbols
index 6575e1d932b..c010efb0c5f 100644
--- a/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.symbols
+++ b/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.symbols
@@ -2,6 +2,7 @@
 return {
 
   "set": function (key, value) {
+>"set" : Symbol("set", Decl(parserStatementIsNotAMemberVariableDeclaration1.ts, 0, 8))
 >key : Symbol(key, Decl(parserStatementIsNotAMemberVariableDeclaration1.ts, 2, 19))
 >value : Symbol(value, Decl(parserStatementIsNotAMemberVariableDeclaration1.ts, 2, 23))
 
diff --git a/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.types b/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.types
index e94845f56c8..9c4e4a25cef 100644
--- a/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.types
+++ b/tests/baselines/reference/parserStatementIsNotAMemberVariableDeclaration1.types
@@ -3,6 +3,7 @@ return {
 >{  "set": function (key, value) {    // 'private' should not be considered a member variable here.    private[key] = value;  }} : { "set": (key: any, value: any) => void; }
 
   "set": function (key, value) {
+>"set" : (key: any, value: any) => void
 >function (key, value) {    // 'private' should not be considered a member variable here.    private[key] = value;  } : (key: any, value: any) => void
 >key : any
 >value : any
diff --git a/tests/baselines/reference/parserSymbolIndexer5.symbols b/tests/baselines/reference/parserSymbolIndexer5.symbols
index d742586bf91..7a5a49a8a88 100644
--- a/tests/baselines/reference/parserSymbolIndexer5.symbols
+++ b/tests/baselines/reference/parserSymbolIndexer5.symbols
@@ -3,4 +3,5 @@ var x = {
 >x : Symbol(x, Decl(parserSymbolIndexer5.ts, 0, 3))
 
     [s: symbol]: ""
+>"" : Symbol("", Decl(parserSymbolIndexer5.ts, 1, 16))
 }
diff --git a/tests/baselines/reference/parserSymbolIndexer5.types b/tests/baselines/reference/parserSymbolIndexer5.types
index 0fcd3a4617b..171ec57d05a 100644
--- a/tests/baselines/reference/parserSymbolIndexer5.types
+++ b/tests/baselines/reference/parserSymbolIndexer5.types
@@ -6,6 +6,7 @@ var x = {
     [s: symbol]: ""
 >s : any
 >symbol : any
+>"" : any
 }
 > : any
 
diff --git a/tests/baselines/reference/plusOperatorWithEnumType.symbols b/tests/baselines/reference/plusOperatorWithEnumType.symbols
index 8e0b584cf26..970cfa19bfe 100644
--- a/tests/baselines/reference/plusOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/plusOperatorWithEnumType.symbols
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(plusOperatorWithEnumType.ts, 2, 14))
 >A : Symbol(ENUM1.A, Decl(plusOperatorWithEnumType.ts, 3, 12))
 >B : Symbol(ENUM1.B, Decl(plusOperatorWithEnumType.ts, 3, 15))
+>"" : Symbol(ENUM1[""], Decl(plusOperatorWithEnumType.ts, 3, 18))
 
 // enum type var
 var ResultIsNumber1 = +ENUM;
diff --git a/tests/baselines/reference/plusOperatorWithEnumType.types b/tests/baselines/reference/plusOperatorWithEnumType.types
index f0b7df10756..817d8d61e2c 100644
--- a/tests/baselines/reference/plusOperatorWithEnumType.types
+++ b/tests/baselines/reference/plusOperatorWithEnumType.types
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // enum type var
 var ResultIsNumber1 = +ENUM;
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.symbols b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.symbols
index 7aca10833e0..2354942db97 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.symbols
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.symbols
@@ -215,6 +215,8 @@ class privateClassWithPrivateModuleGetAccessorTypes {
 }
 === tests/cases/compiler/privacyCannotNameAccessorDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
+>"GlobalWidgets" : Symbol("GlobalWidgets", Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 0, 0))
+
     export class Widget3 {
 >Widget3 : Symbol(Widget3, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 0, 32))
 
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
index 8d894a8bf86..6eba8b6eb1c 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
@@ -239,6 +239,8 @@ class privateClassWithPrivateModuleGetAccessorTypes {
 }
 === tests/cases/compiler/privacyCannotNameAccessorDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
+>"GlobalWidgets" : typeof "GlobalWidgets"
+
     export class Widget3 {
 >Widget3 : Widget3
 
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.symbols b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.symbols
index 8963c2571fe..b9ab328b2e5 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.symbols
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.symbols
@@ -210,6 +210,8 @@ var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4()
 
 === tests/cases/compiler/privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
+>"GlobalWidgets" : Symbol("GlobalWidgets", Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 0, 0))
+
     export class Widget3 {
 >Widget3 : Symbol(Widget3, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 0, 32))
 
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
index 13a842c970e..2ceffd034e1 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
@@ -242,6 +242,8 @@ var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4()
 
 === tests/cases/compiler/privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
+>"GlobalWidgets" : typeof "GlobalWidgets"
+
     export class Widget3 {
 >Widget3 : Widget3
 
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.symbols b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.symbols
index 2ea9d11fca6..d643da45767 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.symbols
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.symbols
@@ -378,6 +378,8 @@ function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createE
 }
 === tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
+>"GlobalWidgets" : Symbol("GlobalWidgets", Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 0, 0))
+
     export class Widget3 {
 >Widget3 : Symbol(Widget3, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 0, 32))
 
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
index 4b9a4f73bb2..c6ea5d358be 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
@@ -434,6 +434,8 @@ function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createE
 }
 === tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
+>"GlobalWidgets" : typeof "GlobalWidgets"
+
     export class Widget3 {
 >Widget3 : Widget3
 
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.symbols b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.symbols
index bf143f59416..3ca54d70872 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.symbols
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.symbols
@@ -281,6 +281,8 @@ function privateFunctionWithPrivateModuleReturnTypes1() {
 
 === tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
+>"GlobalWidgets" : Symbol("GlobalWidgets", Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 0, 0))
+
     export class Widget3 {
 >Widget3 : Symbol(Widget3, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 0, 32))
 
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
index 5fd8d46870c..863ca2e7c51 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
@@ -313,6 +313,8 @@ function privateFunctionWithPrivateModuleReturnTypes1() {
 
 === tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
+>"GlobalWidgets" : typeof "GlobalWidgets"
+
     export class Widget3 {
 >Widget3 : Widget3
 
diff --git a/tests/baselines/reference/privacyGloImport.symbols b/tests/baselines/reference/privacyGloImport.symbols
index bb5b41f4b30..9efe2465aa5 100644
--- a/tests/baselines/reference/privacyGloImport.symbols
+++ b/tests/baselines/reference/privacyGloImport.symbols
@@ -219,6 +219,8 @@ module glo_M1_public {
 }
 
 declare module "glo_M2_public" {
+>"glo_M2_public" : Symbol("glo_M2_public", Decl(privacyGloImport.ts, 92, 1))
+
     export function f1();
 >f1 : Symbol(f1, Decl(privacyGloImport.ts, 94, 32))
 
@@ -235,6 +237,8 @@ declare module "glo_M2_public" {
 }
 
 declare module "use_glo_M1_public" {
+>"use_glo_M1_public" : Symbol("use_glo_M1_public", Decl(privacyGloImport.ts, 100, 1))
+
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImport.ts, 102, 36))
 >glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImport.ts, 82, 1))
@@ -318,6 +322,8 @@ declare module "use_glo_M1_public" {
 }
 
 declare module "anotherParseError" {
+>"anotherParseError" : Symbol("anotherParseError", Decl(privacyGloImport.ts, 128, 1))
+
     module m2 {
 >m2 : Symbol(m2, Decl(privacyGloImport.ts, 130, 36), Decl(privacyGloImport.ts, 134, 5))
 
diff --git a/tests/baselines/reference/privacyGloImport.types b/tests/baselines/reference/privacyGloImport.types
index 717a189a7eb..263e36cbc0e 100644
--- a/tests/baselines/reference/privacyGloImport.types
+++ b/tests/baselines/reference/privacyGloImport.types
@@ -230,6 +230,8 @@ module glo_M1_public {
 }
 
 declare module "glo_M2_public" {
+>"glo_M2_public" : typeof "glo_M2_public"
+
     export function f1();
 >f1 : () => any
 
@@ -246,6 +248,8 @@ declare module "glo_M2_public" {
 }
 
 declare module "use_glo_M1_public" {
+>"use_glo_M1_public" : typeof "use_glo_M1_public"
+
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : typeof use_glo_M1_public
 >glo_M1_public : typeof use_glo_M1_public
@@ -329,6 +333,8 @@ declare module "use_glo_M1_public" {
 }
 
 declare module "anotherParseError" {
+>"anotherParseError" : typeof "anotherParseError"
+
     module m2 {
 >m2 : any
 
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.symbols b/tests/baselines/reference/privacyGloImportParseErrors.symbols
index 5483325c188..27236816ada 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.symbols
+++ b/tests/baselines/reference/privacyGloImportParseErrors.symbols
@@ -45,6 +45,8 @@ module m1 {
     }
 
     export declare module "m1_M3_public" {
+>"m1_M3_public" : Symbol("m1_M3_public", Decl(privacyGloImportParseErrors.ts, 19, 5))
+
         export function f1();
 >f1 : Symbol(f1, Decl(privacyGloImportParseErrors.ts, 21, 42))
 
@@ -61,6 +63,8 @@ module m1 {
     }
 
     declare module "m1_M4_private" {
+>"m1_M4_private" : Symbol("m1_M4_private", Decl(privacyGloImportParseErrors.ts, 27, 5))
+
         export function f1();
 >f1 : Symbol(f1, Decl(privacyGloImportParseErrors.ts, 29, 36))
 
@@ -288,6 +292,8 @@ module glo_M1_public {
 }
 
 declare module "glo_M2_public" {
+>"glo_M2_public" : Symbol("glo_M2_public", Decl(privacyGloImportParseErrors.ts, 92, 1))
+
     export function f1();
 >f1 : Symbol(f1, Decl(privacyGloImportParseErrors.ts, 94, 32))
 
@@ -304,6 +310,8 @@ declare module "glo_M2_public" {
 }
 
 declare module "use_glo_M1_public" {
+>"use_glo_M1_public" : Symbol("use_glo_M1_public", Decl(privacyGloImportParseErrors.ts, 100, 1))
+
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImportParseErrors.ts, 102, 36))
 >glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImportParseErrors.ts, 82, 1))
@@ -391,10 +399,13 @@ declare module "use_glo_M1_public" {
 }
 
 declare module "anotherParseError" {
+>"anotherParseError" : Symbol("anotherParseError", Decl(privacyGloImportParseErrors.ts, 128, 1))
+
     module m2 {
 >m2 : Symbol(m2, Decl(privacyGloImportParseErrors.ts, 130, 36), Decl(privacyGloImportParseErrors.ts, 134, 5))
 
         declare module "abc" {
+>"abc" : Symbol("abc", Decl(privacyGloImportParseErrors.ts, 131, 15))
         }
     }
 
@@ -402,9 +413,11 @@ declare module "anotherParseError" {
 >m2 : Symbol(m2, Decl(privacyGloImportParseErrors.ts, 130, 36), Decl(privacyGloImportParseErrors.ts, 134, 5))
 
         module "abc2" {
+>"abc2" : Symbol("abc2", Decl(privacyGloImportParseErrors.ts, 136, 15))
         }
     }
     module "abc3" {
+>"abc3" : Symbol("abc3", Decl(privacyGloImportParseErrors.ts, 139, 5))
     }
 }
 
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.types b/tests/baselines/reference/privacyGloImportParseErrors.types
index 0485ea361e2..e6d615c3550 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.types
+++ b/tests/baselines/reference/privacyGloImportParseErrors.types
@@ -47,6 +47,8 @@ module m1 {
     }
 
     export declare module "m1_M3_public" {
+>"m1_M3_public" : typeof "m1_M3_public"
+
         export function f1();
 >f1 : () => any
 
@@ -63,6 +65,8 @@ module m1 {
     }
 
     declare module "m1_M4_private" {
+>"m1_M4_private" : typeof "m1_M4_private"
+
         export function f1();
 >f1 : () => any
 
@@ -339,6 +343,8 @@ module glo_M1_public {
 }
 
 declare module "glo_M2_public" {
+>"glo_M2_public" : typeof "glo_M2_public"
+
     export function f1();
 >f1 : () => any
 
@@ -355,6 +361,8 @@ declare module "glo_M2_public" {
 }
 
 declare module "use_glo_M1_public" {
+>"use_glo_M1_public" : typeof "use_glo_M1_public"
+
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : typeof use_glo_M1_public
 >glo_M1_public : typeof use_glo_M1_public
@@ -442,10 +450,13 @@ declare module "use_glo_M1_public" {
 }
 
 declare module "anotherParseError" {
+>"anotherParseError" : typeof "anotherParseError"
+
     module m2 {
 >m2 : any
 
         declare module "abc" {
+>"abc" : typeof "abc"
         }
     }
 
@@ -453,9 +464,11 @@ declare module "anotherParseError" {
 >m2 : any
 
         module "abc2" {
+>"abc2" : typeof "abc2"
         }
     }
     module "abc3" {
+>"abc3" : any
     }
 }
 
diff --git a/tests/baselines/reference/privacyImportParseErrors.symbols b/tests/baselines/reference/privacyImportParseErrors.symbols
index 0353224cfd2..c7d81035912 100644
--- a/tests/baselines/reference/privacyImportParseErrors.symbols
+++ b/tests/baselines/reference/privacyImportParseErrors.symbols
@@ -45,6 +45,8 @@ export module m1 {
     }
 
     export declare module "m1_M3_public" {
+>"m1_M3_public" : Symbol("m1_M3_public", Decl(privacyImportParseErrors.ts, 19, 5))
+
         export function f1();
 >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 21, 42))
 
@@ -61,6 +63,8 @@ export module m1 {
     }
 
     declare module "m1_M4_private" {
+>"m1_M4_private" : Symbol("m1_M4_private", Decl(privacyImportParseErrors.ts, 27, 5))
+
         export function f1();
 >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 29, 36))
 
@@ -312,6 +316,8 @@ module m2 {
     }
 
     export declare module "m2_M3_public" {
+>"m2_M3_public" : Symbol("m2_M3_public", Decl(privacyImportParseErrors.ts, 103, 5))
+
         export function f1();
 >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 105, 42))
 
@@ -328,6 +334,8 @@ module m2 {
     }
 
     declare module "m2_M4_private" {
+>"m2_M4_private" : Symbol("m2_M4_private", Decl(privacyImportParseErrors.ts, 111, 5))
+
         export function f1();
 >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 113, 36))
 
@@ -556,6 +564,8 @@ export module glo_M1_public {
 }
 
 export declare module "glo_M2_public" {
+>"glo_M2_public" : Symbol("glo_M2_public", Decl(privacyImportParseErrors.ts, 177, 1))
+
     export function f1();
 >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 179, 39))
 
@@ -593,6 +603,8 @@ export module glo_M3_private {
 }
 
 export declare module "glo_M4_private" {
+>"glo_M4_private" : Symbol("glo_M4_private", Decl(privacyImportParseErrors.ts, 195, 1))
+
     export function f1();
 >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 197, 40))
 
@@ -801,6 +813,8 @@ export import glo_im4_public = require("glo_M4_private");
 
 
 export declare module "use_glo_M1_public" {
+>"use_glo_M1_public" : Symbol("use_glo_M1_public", Decl(privacyImportParseErrors.ts, 251, 57))
+
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyImportParseErrors.ts, 254, 43))
 >glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyImportParseErrors.ts, 167, 1))
@@ -887,6 +901,8 @@ export declare module "use_glo_M1_public" {
 
 
 declare module "use_glo_M3_private" {
+>"use_glo_M3_private" : Symbol("use_glo_M3_private", Decl(privacyImportParseErrors.ts, 280, 1))
+
     import use_glo_M3_private = glo_M3_private;
 >use_glo_M3_private : Symbol(use_glo_M3_private, Decl(privacyImportParseErrors.ts, 283, 37))
 >glo_M3_private : Symbol(use_glo_M3_private, Decl(privacyImportParseErrors.ts, 185, 1))
@@ -972,10 +988,13 @@ declare module "use_glo_M3_private" {
 }
 
 declare module "anotherParseError" {
+>"anotherParseError" : Symbol("anotherParseError", Decl(privacyImportParseErrors.ts, 309, 1))
+
     module m2 {
 >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 311, 36), Decl(privacyImportParseErrors.ts, 315, 5))
 
         declare module "abc" {
+>"abc" : Symbol("abc", Decl(privacyImportParseErrors.ts, 312, 15))
         }
     }
 
@@ -983,17 +1002,22 @@ declare module "anotherParseError" {
 >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 311, 36), Decl(privacyImportParseErrors.ts, 315, 5))
 
         module "abc2" {
+>"abc2" : Symbol("abc2", Decl(privacyImportParseErrors.ts, 317, 15))
         }
     }
     module "abc3" {
+>"abc3" : Symbol("abc3", Decl(privacyImportParseErrors.ts, 320, 5))
     }
 }
 
 declare export module "anotherParseError2" {
+>"anotherParseError2" : Symbol("anotherParseError2", Decl(privacyImportParseErrors.ts, 323, 1))
+
     module m2 {
 >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 325, 44), Decl(privacyImportParseErrors.ts, 329, 5))
 
         declare module "abc" {
+>"abc" : Symbol("abc", Decl(privacyImportParseErrors.ts, 326, 15))
         }
     }
 
@@ -1001,9 +1025,11 @@ declare export module "anotherParseError2" {
 >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 325, 44), Decl(privacyImportParseErrors.ts, 329, 5))
 
         module "abc2" {
+>"abc2" : Symbol("abc2", Decl(privacyImportParseErrors.ts, 331, 15))
         }
     }
     module "abc3" {
+>"abc3" : Symbol("abc3", Decl(privacyImportParseErrors.ts, 334, 5))
     }
 }
 
diff --git a/tests/baselines/reference/privacyImportParseErrors.types b/tests/baselines/reference/privacyImportParseErrors.types
index 014688e53e5..ff9bf75f2b2 100644
--- a/tests/baselines/reference/privacyImportParseErrors.types
+++ b/tests/baselines/reference/privacyImportParseErrors.types
@@ -47,6 +47,8 @@ export module m1 {
     }
 
     export declare module "m1_M3_public" {
+>"m1_M3_public" : typeof "m1_M3_public"
+
         export function f1();
 >f1 : () => any
 
@@ -63,6 +65,8 @@ export module m1 {
     }
 
     declare module "m1_M4_private" {
+>"m1_M4_private" : typeof "m1_M4_private"
+
         export function f1();
 >f1 : () => any
 
@@ -364,6 +368,8 @@ module m2 {
     }
 
     export declare module "m2_M3_public" {
+>"m2_M3_public" : typeof "m2_M3_public"
+
         export function f1();
 >f1 : () => any
 
@@ -380,6 +386,8 @@ module m2 {
     }
 
     declare module "m2_M4_private" {
+>"m2_M4_private" : typeof "m2_M4_private"
+
         export function f1();
 >f1 : () => any
 
@@ -657,6 +665,8 @@ export module glo_M1_public {
 }
 
 export declare module "glo_M2_public" {
+>"glo_M2_public" : typeof "glo_M2_public"
+
     export function f1();
 >f1 : () => any
 
@@ -695,6 +705,8 @@ export module glo_M3_private {
 }
 
 export declare module "glo_M4_private" {
+>"glo_M4_private" : typeof "glo_M4_private"
+
     export function f1();
 >f1 : () => any
 
@@ -951,6 +963,8 @@ export import glo_im4_public = require("glo_M4_private");
 
 
 export declare module "use_glo_M1_public" {
+>"use_glo_M1_public" : typeof "use_glo_M1_public"
+
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : typeof use_glo_M1_public
 >glo_M1_public : typeof use_glo_M1_public
@@ -1039,6 +1053,8 @@ export declare module "use_glo_M1_public" {
 
 
 declare module "use_glo_M3_private" {
+>"use_glo_M3_private" : typeof "use_glo_M3_private"
+
     import use_glo_M3_private = glo_M3_private;
 >use_glo_M3_private : typeof use_glo_M3_private
 >glo_M3_private : typeof use_glo_M3_private
@@ -1126,10 +1142,13 @@ declare module "use_glo_M3_private" {
 }
 
 declare module "anotherParseError" {
+>"anotherParseError" : any
+
     module m2 {
 >m2 : any
 
         declare module "abc" {
+>"abc" : typeof "abc"
         }
     }
 
@@ -1137,17 +1156,22 @@ declare module "anotherParseError" {
 >m2 : any
 
         module "abc2" {
+>"abc2" : typeof "abc2"
         }
     }
     module "abc3" {
+>"abc3" : typeof "abc3"
     }
 }
 
 declare export module "anotherParseError2" {
+>"anotherParseError2" : any
+
     module m2 {
 >m2 : any
 
         declare module "abc" {
+>"abc" : typeof "abc"
         }
     }
 
@@ -1155,9 +1179,11 @@ declare export module "anotherParseError2" {
 >m2 : any
 
         module "abc2" {
+>"abc2" : typeof "abc2"
         }
     }
     module "abc3" {
+>"abc3" : typeof "abc3"
     }
 }
 
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.symbols b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.symbols
index 5f3e4098da9..07cb1012e8e 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.symbols
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.symbols
@@ -84,6 +84,8 @@ export class c_public {
 // private elements
 // Export - Error ambient modules allowed only in global
 declare module 'm' {
+>'m' : Symbol('m', Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 0, 0))
+
     export class c_private {
 >c_private : Symbol(c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
 
@@ -95,6 +97,8 @@ declare module 'm' {
 
 === tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts ===
 declare module 'm2' {
+>'m2' : Symbol('m2', Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts, 0, 0))
+
     export class c_private {
 >c_private : Symbol(c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts, 0, 21))
 
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
index 5c082bef5de..cf210da33e9 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
@@ -92,6 +92,8 @@ export class c_public {
 // private elements
 // Export - Error ambient modules allowed only in global
 declare module 'm' {
+>'m' : typeof 'm'
+
     export class c_private {
 >c_private : c_private
 
@@ -103,6 +105,8 @@ declare module 'm' {
 
 === tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts ===
 declare module 'm2' {
+>'m2' : typeof 'm2'
+
     export class c_private {
 >c_private : c_private
 
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols
index c75370087dd..9b10bef8008 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols
@@ -84,6 +84,8 @@ export class c_public {
 // private elements
 // Export - Error ambient modules allowed only in global
 declare module 'm' {
+>'m' : Symbol('m', Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 0, 0))
+
     export class c_private {
 >c_private : Symbol(c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 2, 20))
 
@@ -94,6 +96,8 @@ declare module 'm' {
 
 === tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts ===
 declare module 'm2' {
+>'m2' : Symbol('m2', Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 0, 0))
+
     export class c_private {
 >c_private : Symbol(c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 0, 21))
 
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
index 69954db637f..a69bd3373d1 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
@@ -92,6 +92,8 @@ export class c_public {
 // private elements
 // Export - Error ambient modules allowed only in global
 declare module 'm' {
+>'m' : typeof 'm'
+
     export class c_private {
 >c_private : c_private
 
@@ -102,6 +104,8 @@ declare module 'm' {
 
 === tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts ===
 declare module 'm2' {
+>'m2' : typeof 'm2'
+
     export class c_private {
 >c_private : c_private
 
diff --git a/tests/baselines/reference/propertiesAndIndexers.symbols b/tests/baselines/reference/propertiesAndIndexers.symbols
index 17fcf82068a..a89d8207541 100644
--- a/tests/baselines/reference/propertiesAndIndexers.symbols
+++ b/tests/baselines/reference/propertiesAndIndexers.symbols
@@ -27,6 +27,7 @@ interface A {
 >X : Symbol(X, Decl(propertiesAndIndexers.ts, 0, 0))
 
     1: Z;
+>1 : Symbol(A[1], Decl(propertiesAndIndexers.ts, 10, 9))
 >Z : Symbol(Z, Decl(propertiesAndIndexers.ts, 3, 1))
 }
 
@@ -41,14 +42,20 @@ interface B extends A {
 >c : Symbol(B.c, Decl(propertiesAndIndexers.ts, 15, 24))
 
     3: boolean;
+>3 : Symbol(B[3], Decl(propertiesAndIndexers.ts, 16, 15))
+
     6(): string;
+>6 : Symbol(B[6], Decl(propertiesAndIndexers.ts, 17, 15))
 }
 
 interface B {
 >B : Symbol(B, Decl(propertiesAndIndexers.ts, 12, 1), Decl(propertiesAndIndexers.ts, 19, 1))
 
     4: boolean;
+>4 : Symbol(B[4], Decl(propertiesAndIndexers.ts, 21, 13))
+
     5: string;
+>5 : Symbol(B[5], Decl(propertiesAndIndexers.ts, 22, 15))
 }
 
 interface C extends A {
@@ -62,6 +69,7 @@ interface C extends A {
 >c : Symbol(C.c, Decl(propertiesAndIndexers.ts, 27, 24))
 
     3: boolean;
+>3 : Symbol(C[3], Decl(propertiesAndIndexers.ts, 28, 15))
 }
 
 interface D extends B, C {
@@ -70,6 +78,7 @@ interface D extends B, C {
 >C : Symbol(C, Decl(propertiesAndIndexers.ts, 24, 1))
 
     2: Z;
+>2 : Symbol(D[2], Decl(propertiesAndIndexers.ts, 32, 26))
 >Z : Symbol(Z, Decl(propertiesAndIndexers.ts, 3, 1))
 
     Infinity: number;
@@ -104,4 +113,6 @@ var c: {
 >c : Symbol(c, Decl(propertiesAndIndexers.ts, 47, 24))
 
     3: boolean;
+>3 : Symbol(3, Decl(propertiesAndIndexers.ts, 48, 15))
+
 };
diff --git a/tests/baselines/reference/propertiesAndIndexers.types b/tests/baselines/reference/propertiesAndIndexers.types
index 87e9ac7a863..d3bad04b486 100644
--- a/tests/baselines/reference/propertiesAndIndexers.types
+++ b/tests/baselines/reference/propertiesAndIndexers.types
@@ -27,6 +27,7 @@ interface A {
 >X : X
 
     1: Z;
+>1 : Z
 >Z : Z
 }
 
@@ -41,14 +42,20 @@ interface B extends A {
 >c : boolean
 
     3: boolean;
+>3 : boolean
+
     6(): string;
+>6 : () => string
 }
 
 interface B {
 >B : B
 
     4: boolean;
+>4 : boolean
+
     5: string;
+>5 : string
 }
 
 interface C extends A {
@@ -62,6 +69,7 @@ interface C extends A {
 >c : boolean
 
     3: boolean;
+>3 : boolean
 }
 
 interface D extends B, C {
@@ -70,6 +78,7 @@ interface D extends B, C {
 >C : C
 
     2: Z;
+>2 : Z
 >Z : Z
 
     Infinity: number;
@@ -104,4 +113,6 @@ var c: {
 >c : boolean
 
     3: boolean;
+>3 : boolean
+
 };
diff --git a/tests/baselines/reference/propertiesAndIndexers2.symbols b/tests/baselines/reference/propertiesAndIndexers2.symbols
index 9bf47ee825b..e5ae6440bda 100644
--- a/tests/baselines/reference/propertiesAndIndexers2.symbols
+++ b/tests/baselines/reference/propertiesAndIndexers2.symbols
@@ -18,14 +18,21 @@ interface B extends A {
 >c : Symbol(B.c, Decl(propertiesAndIndexers2.ts, 6, 23))
 
     3: string;
+>3 : Symbol(B[3], Decl(propertiesAndIndexers2.ts, 7, 14))
+
     Infinity: string;
 >Infinity : Symbol(B.Infinity, Decl(propertiesAndIndexers2.ts, 8, 14))
 
     "-Infinity": string;
+>"-Infinity" : Symbol(B["-Infinity"], Decl(propertiesAndIndexers2.ts, 9, 21))
+
     NaN: string;
 >NaN : Symbol(B.NaN, Decl(propertiesAndIndexers2.ts, 10, 24))
 
     "-NaN": string;
+>"-NaN" : Symbol(B["-NaN"], Decl(propertiesAndIndexers2.ts, 11, 16))
+
     6(): string;
+>6 : Symbol(B[6], Decl(propertiesAndIndexers2.ts, 12, 19))
 }
 
diff --git a/tests/baselines/reference/propertiesAndIndexers2.types b/tests/baselines/reference/propertiesAndIndexers2.types
index f6b8ead00d4..43c6282a481 100644
--- a/tests/baselines/reference/propertiesAndIndexers2.types
+++ b/tests/baselines/reference/propertiesAndIndexers2.types
@@ -18,14 +18,21 @@ interface B extends A {
 >c : string
 
     3: string;
+>3 : string
+
     Infinity: string;
 >Infinity : string
 
     "-Infinity": string;
+>"-Infinity" : string
+
     NaN: string;
 >NaN : string
 
     "-NaN": string;
+>"-NaN" : string
+
     6(): string;
+>6 : () => string
 }
 
diff --git a/tests/baselines/reference/propertiesAndIndexersForNumericNames.symbols b/tests/baselines/reference/propertiesAndIndexersForNumericNames.symbols
index 39625c687a0..79c6a218e6a 100644
--- a/tests/baselines/reference/propertiesAndIndexersForNumericNames.symbols
+++ b/tests/baselines/reference/propertiesAndIndexersForNumericNames.symbols
@@ -8,39 +8,90 @@ class C {
     // These all have numeric names; they should error
     // because their types are not compatible with the numeric indexer.
     public "1": string = "number"; // Error
+>"1" : Symbol(C["1"], Decl(propertiesAndIndexersForNumericNames.ts, 1, 24))
+
     public "-1": string = "negative number"; // Error
+>"-1" : Symbol(C["-1"], Decl(propertiesAndIndexersForNumericNames.ts, 5, 34))
+
     public "-2.5": string = "negative number"; // Error
+>"-2.5" : Symbol(C["-2.5"], Decl(propertiesAndIndexersForNumericNames.ts, 6, 44))
+
     public "3.141592": string = "pi-sitive number"; // Error
+>"3.141592" : Symbol(C["3.141592"], Decl(propertiesAndIndexersForNumericNames.ts, 7, 46))
+
     public "1.2e-20": string = "really small number"; // Error
+>"1.2e-20" : Symbol(C["1.2e-20"], Decl(propertiesAndIndexersForNumericNames.ts, 8, 51))
+
     public "Infinity": string = "A gillion"; // Error
+>"Infinity" : Symbol(C["Infinity"], Decl(propertiesAndIndexersForNumericNames.ts, 9, 53))
+
     public "-Infinity": string = "Negative-a-gillion"; // Error
+>"-Infinity" : Symbol(C["-Infinity"], Decl(propertiesAndIndexersForNumericNames.ts, 10, 44))
+
     public "NaN": string = "not a number"; // Error
+>"NaN" : Symbol(C["NaN"], Decl(propertiesAndIndexersForNumericNames.ts, 11, 54))
     
     // These all have *partially* numeric names,
     // but should really be treated as plain string literals.
     public " 1": string = "leading space"; // No error
+>" 1" : Symbol(C[" 1"], Decl(propertiesAndIndexersForNumericNames.ts, 12, 42))
+
     public "1    ": string = "trailing space"; // No error
+>"1    " : Symbol(C["1    "], Decl(propertiesAndIndexersForNumericNames.ts, 16, 42))
+
     public "": string = "no nothing"; // No error
+>"" : Symbol(C[""], Decl(propertiesAndIndexersForNumericNames.ts, 17, 46))
+
     public "    ": string = "just space"; // No error
+>"    " : Symbol(C["    "], Decl(propertiesAndIndexersForNumericNames.ts, 18, 37))
+
     public "1 0 1": string = "several numbers and spaces"; // No error
+>"1 0 1" : Symbol(C["1 0 1"], Decl(propertiesAndIndexersForNumericNames.ts, 19, 41))
+
     public "hunter2": string = "not a password"; // No error
+>"hunter2" : Symbol(C["hunter2"], Decl(propertiesAndIndexersForNumericNames.ts, 20, 58))
+
     public "+Infinity": string = "A gillion"; // No error
+>"+Infinity" : Symbol(C["+Infinity"], Decl(propertiesAndIndexersForNumericNames.ts, 21, 48))
+
     public "+NaN": string = "not a positive number"; // No error
+>"+NaN" : Symbol(C["+NaN"], Decl(propertiesAndIndexersForNumericNames.ts, 22, 45))
+
     public "-NaN": string = "not a negative number"; // No error
+>"-NaN" : Symbol(C["-NaN"], Decl(propertiesAndIndexersForNumericNames.ts, 23, 52))
     
 
     // These fall into the above category, however, they are "trickier";
     // these all are *scanned* as numeric literals, but they are not written in
     // "canonical" numeric representations.
     public "+1": string = "positive number (for the paranoid)"; // No error
+>"+1" : Symbol(C["+1"], Decl(propertiesAndIndexersForNumericNames.ts, 24, 52))
+
     public "1e0": string = "just one"; // No error
+>"1e0" : Symbol(C["1e0"], Decl(propertiesAndIndexersForNumericNames.ts, 30, 63))
+
     public "-0": string = "just zero"; // No error
+>"-0" : Symbol(C["-0"], Decl(propertiesAndIndexersForNumericNames.ts, 31, 38))
+
     public "-0e0": string = "just zero"; // No error
+>"-0e0" : Symbol(C["-0e0"], Decl(propertiesAndIndexersForNumericNames.ts, 32, 38))
+
     public "0xF00D": string = "hex food"; // No error
+>"0xF00D" : Symbol(C["0xF00D"], Decl(propertiesAndIndexersForNumericNames.ts, 33, 40))
+
     public "0xBEEF": string = "hex beef"; // No error
+>"0xBEEF" : Symbol(C["0xBEEF"], Decl(propertiesAndIndexersForNumericNames.ts, 34, 41))
+
     public "0123": string = "oct 83"; // No error
+>"0123" : Symbol(C["0123"], Decl(propertiesAndIndexersForNumericNames.ts, 35, 41))
+
     public "0o123": string = "explicit oct 83"; // No error
+>"0o123" : Symbol(C["0o123"], Decl(propertiesAndIndexersForNumericNames.ts, 36, 37))
+
     public "0b101101001010": string = "explicit binary"; // No error
+>"0b101101001010" : Symbol(C["0b101101001010"], Decl(propertiesAndIndexersForNumericNames.ts, 37, 47))
+
     public "0.000000000000000000012": string = "should've been in exponential form"; // No error
+>"0.000000000000000000012" : Symbol(C["0.000000000000000000012"], Decl(propertiesAndIndexersForNumericNames.ts, 38, 56))
 }
 
diff --git a/tests/baselines/reference/propertiesAndIndexersForNumericNames.types b/tests/baselines/reference/propertiesAndIndexersForNumericNames.types
index 460772f42f4..5ed3473fd1a 100644
--- a/tests/baselines/reference/propertiesAndIndexersForNumericNames.types
+++ b/tests/baselines/reference/propertiesAndIndexersForNumericNames.types
@@ -8,56 +8,73 @@ class C {
     // These all have numeric names; they should error
     // because their types are not compatible with the numeric indexer.
     public "1": string = "number"; // Error
+>"1" : string
 >"number" : "number"
 
     public "-1": string = "negative number"; // Error
+>"-1" : string
 >"negative number" : "negative number"
 
     public "-2.5": string = "negative number"; // Error
+>"-2.5" : string
 >"negative number" : "negative number"
 
     public "3.141592": string = "pi-sitive number"; // Error
+>"3.141592" : string
 >"pi-sitive number" : "pi-sitive number"
 
     public "1.2e-20": string = "really small number"; // Error
+>"1.2e-20" : string
 >"really small number" : "really small number"
 
     public "Infinity": string = "A gillion"; // Error
+>"Infinity" : string
 >"A gillion" : "A gillion"
 
     public "-Infinity": string = "Negative-a-gillion"; // Error
+>"-Infinity" : string
 >"Negative-a-gillion" : "Negative-a-gillion"
 
     public "NaN": string = "not a number"; // Error
+>"NaN" : string
 >"not a number" : "not a number"
     
     // These all have *partially* numeric names,
     // but should really be treated as plain string literals.
     public " 1": string = "leading space"; // No error
+>" 1" : string
 >"leading space" : "leading space"
 
     public "1    ": string = "trailing space"; // No error
+>"1    " : string
 >"trailing space" : "trailing space"
 
     public "": string = "no nothing"; // No error
+>"" : string
 >"no nothing" : "no nothing"
 
     public "    ": string = "just space"; // No error
+>"    " : string
 >"just space" : "just space"
 
     public "1 0 1": string = "several numbers and spaces"; // No error
+>"1 0 1" : string
 >"several numbers and spaces" : "several numbers and spaces"
 
     public "hunter2": string = "not a password"; // No error
+>"hunter2" : string
 >"not a password" : "not a password"
 
     public "+Infinity": string = "A gillion"; // No error
+>"+Infinity" : string
 >"A gillion" : "A gillion"
 
     public "+NaN": string = "not a positive number"; // No error
+>"+NaN" : string
 >"not a positive number" : "not a positive number"
 
     public "-NaN": string = "not a negative number"; // No error
+>"-NaN" : string
 >"not a negative number" : "not a negative number"
     
 
@@ -65,33 +82,43 @@ class C {
     // these all are *scanned* as numeric literals, but they are not written in
     // "canonical" numeric representations.
     public "+1": string = "positive number (for the paranoid)"; // No error
+>"+1" : string
 >"positive number (for the paranoid)" : "positive number (for the paranoid)"
 
     public "1e0": string = "just one"; // No error
+>"1e0" : string
 >"just one" : "just one"
 
     public "-0": string = "just zero"; // No error
+>"-0" : string
 >"just zero" : "just zero"
 
     public "-0e0": string = "just zero"; // No error
+>"-0e0" : string
 >"just zero" : "just zero"
 
     public "0xF00D": string = "hex food"; // No error
+>"0xF00D" : string
 >"hex food" : "hex food"
 
     public "0xBEEF": string = "hex beef"; // No error
+>"0xBEEF" : string
 >"hex beef" : "hex beef"
 
     public "0123": string = "oct 83"; // No error
+>"0123" : string
 >"oct 83" : "oct 83"
 
     public "0o123": string = "explicit oct 83"; // No error
+>"0o123" : string
 >"explicit oct 83" : "explicit oct 83"
 
     public "0b101101001010": string = "explicit binary"; // No error
+>"0b101101001010" : string
 >"explicit binary" : "explicit binary"
 
     public "0.000000000000000000012": string = "should've been in exponential form"; // No error
+>"0.000000000000000000012" : string
 >"should've been in exponential form" : "should've been in exponential form"
 }
 
diff --git a/tests/baselines/reference/propertyAccess.symbols b/tests/baselines/reference/propertyAccess.symbols
index 8262e417747..512a40462e4 100644
--- a/tests/baselines/reference/propertyAccess.symbols
+++ b/tests/baselines/reference/propertyAccess.symbols
@@ -25,14 +25,18 @@ enum Compass {
 var numIndex: { [n: number]: string } = { 3: 'three', 'three': 'three' };
 >numIndex : Symbol(numIndex, Decl(propertyAccess.ts, 10, 3))
 >n : Symbol(n, Decl(propertyAccess.ts, 10, 17))
+>3 : Symbol(3, Decl(propertyAccess.ts, 10, 41))
+>'three' : Symbol('three', Decl(propertyAccess.ts, 10, 53))
 
 var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East };
 >strIndex : Symbol(strIndex, Decl(propertyAccess.ts, 11, 3))
 >n : Symbol(n, Decl(propertyAccess.ts, 11, 17))
 >Compass : Symbol(Compass, Decl(propertyAccess.ts, 5, 1))
+>'N' : Symbol('N', Decl(propertyAccess.ts, 11, 42))
 >Compass.North : Symbol(Compass.North, Decl(propertyAccess.ts, 6, 14))
 >Compass : Symbol(Compass, Decl(propertyAccess.ts, 5, 1))
 >North : Symbol(Compass.North, Decl(propertyAccess.ts, 6, 14))
+>'E' : Symbol('E', Decl(propertyAccess.ts, 11, 62))
 >Compass.East : Symbol(Compass.East, Decl(propertyAccess.ts, 7, 17))
 >Compass : Symbol(Compass, Decl(propertyAccess.ts, 5, 1))
 >East : Symbol(Compass.East, Decl(propertyAccess.ts, 7, 17))
@@ -57,6 +61,8 @@ var obj = {
 >obj : Symbol(obj, Decl(propertyAccess.ts, 20, 3))
 
     10: 'ten',
+>10 : Symbol(10, Decl(propertyAccess.ts, 20, 11))
+
     x: 'hello',
 >x : Symbol(x, Decl(propertyAccess.ts, 21, 14))
 
@@ -70,6 +76,8 @@ var obj = {
 >o : Symbol(o, Decl(propertyAccess.ts, 24, 27))
 
     'literal property': 100
+>'literal property' : Symbol('literal property', Decl(propertyAccess.ts, 24, 45))
+
 };
 var anyVar: any = {};
 >anyVar : Symbol(anyVar, Decl(propertyAccess.ts, 27, 3))
diff --git a/tests/baselines/reference/propertyAccess.types b/tests/baselines/reference/propertyAccess.types
index eeb14e46960..983718ee1fd 100644
--- a/tests/baselines/reference/propertyAccess.types
+++ b/tests/baselines/reference/propertyAccess.types
@@ -26,7 +26,9 @@ var numIndex: { [n: number]: string } = { 3: 'three', 'three': 'three' };
 >numIndex : { [n: number]: string; }
 >n : number
 >{ 3: 'three', 'three': 'three' } : { 3: string; 'three': string; }
+>3 : string
 >'three' : "three"
+>'three' : string
 >'three' : "three"
 
 var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East };
@@ -34,9 +36,11 @@ var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East
 >n : string
 >Compass : Compass
 >{ 'N': Compass.North, 'E': Compass.East } : { 'N': Compass.North; 'E': Compass.East; }
+>'N' : Compass.North
 >Compass.North : Compass.North
 >Compass : typeof Compass
 >North : Compass.North
+>'E' : Compass.East
 >Compass.East : Compass.East
 >Compass : typeof Compass
 >East : Compass.East
@@ -62,6 +66,7 @@ var obj = {
 >{    10: 'ten',    x: 'hello',    y: 32,    z: { n: 'world', m: 15, o: () => false },    'literal property': 100} : { 10: string; x: string; y: number; z: { n: string; m: number; o: () => boolean; }; 'literal property': number; }
 
     10: 'ten',
+>10 : string
 >'ten' : "ten"
 
     x: 'hello',
@@ -84,6 +89,7 @@ var obj = {
 >false : false
 
     'literal property': 100
+>'literal property' : number
 >100 : 100
 
 };
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.symbols b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.symbols
index 6c53bff768e..dff1ab6639a 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.symbols
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.symbols
@@ -38,6 +38,8 @@ var y: Foo2;
 
 === tests/cases/compiler/propertyIdentityWithPrivacyMismatch_0.ts ===
 declare module 'mod1' {
+>'mod1' : Symbol('mod1', Decl(propertyIdentityWithPrivacyMismatch_0.ts, 0, 0))
+
     class Foo {
 >Foo : Symbol(Foo, Decl(propertyIdentityWithPrivacyMismatch_0.ts, 0, 23))
 
@@ -46,6 +48,8 @@ declare module 'mod1' {
     }
 }
 declare module 'mod2' {
+>'mod2' : Symbol('mod2', Decl(propertyIdentityWithPrivacyMismatch_0.ts, 4, 1))
+
     class Foo {
 >Foo : Symbol(Foo, Decl(propertyIdentityWithPrivacyMismatch_0.ts, 5, 23))
 
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.types b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.types
index 5c65aad39aa..12eb94ec188 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.types
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.types
@@ -38,6 +38,8 @@ var y: Foo2;
 
 === tests/cases/compiler/propertyIdentityWithPrivacyMismatch_0.ts ===
 declare module 'mod1' {
+>'mod1' : typeof 'mod1'
+
     class Foo {
 >Foo : Foo
 
@@ -46,6 +48,8 @@ declare module 'mod1' {
     }
 }
 declare module 'mod2' {
+>'mod2' : typeof 'mod2'
+
     class Foo {
 >Foo : Foo
 
diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.symbols b/tests/baselines/reference/propertyNamesWithStringLiteral.symbols
index 1851629c134..8cdc65f9a94 100644
--- a/tests/baselines/reference/propertyNamesWithStringLiteral.symbols
+++ b/tests/baselines/reference/propertyNamesWithStringLiteral.symbols
@@ -17,9 +17,11 @@ interface NamedColors {
 >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0))
 
     "blue": _Color;
+>"blue" : Symbol(NamedColors["blue"], Decl(propertyNamesWithStringLiteral.ts, 5, 18))
 >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0))
 
     "pale blue": _Color;
+>"pale blue" : Symbol(NamedColors["pale blue"], Decl(propertyNamesWithStringLiteral.ts, 6, 19))
 >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0))
 }
 module Color {
diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.types b/tests/baselines/reference/propertyNamesWithStringLiteral.types
index 4e3c9c6080c..83e16e12217 100644
--- a/tests/baselines/reference/propertyNamesWithStringLiteral.types
+++ b/tests/baselines/reference/propertyNamesWithStringLiteral.types
@@ -17,9 +17,11 @@ interface NamedColors {
 >_Color : _Color
 
     "blue": _Color;
+>"blue" : _Color
 >_Color : _Color
 
     "pale blue": _Color;
+>"pale blue" : _Color
 >_Color : _Color
 }
 module Color {
diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.symbols b/tests/baselines/reference/protoAsIndexInIndexExpression.symbols
index 3a5f39c65c6..09e4057b988 100644
--- a/tests/baselines/reference/protoAsIndexInIndexExpression.symbols
+++ b/tests/baselines/reference/protoAsIndexInIndexExpression.symbols
@@ -19,11 +19,14 @@ var o = {
 >o : Symbol(o, Decl(protoAsIndexInIndexExpression_1.ts, 8, 3))
 
     "__proto__": 0
+>"__proto__" : Symbol("__proto__", Decl(protoAsIndexInIndexExpression_1.ts, 8, 9))
+
 };
 class C {
 >C : Symbol(C, Decl(protoAsIndexInIndexExpression_1.ts, 10, 2))
 
     "__proto__" = 0;
+>"__proto__" : Symbol(C["__proto__"], Decl(protoAsIndexInIndexExpression_1.ts, 11, 9))
 }
 === tests/cases/compiler/protoAsIndexInIndexExpression_0.ts ===
 export var x;
diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.types b/tests/baselines/reference/protoAsIndexInIndexExpression.types
index e9adb6705ac..7d276199063 100644
--- a/tests/baselines/reference/protoAsIndexInIndexExpression.types
+++ b/tests/baselines/reference/protoAsIndexInIndexExpression.types
@@ -25,6 +25,7 @@ var o = {
 >{    "__proto__": 0} : { "__proto__": number; }
 
     "__proto__": 0
+>"__proto__" : number
 >0 : 0
 
 };
@@ -32,6 +33,7 @@ class C {
 >C : C
 
     "__proto__" = 0;
+>"__proto__" : number
 >0 : 0
 }
 === tests/cases/compiler/protoAsIndexInIndexExpression_0.ts ===
diff --git a/tests/baselines/reference/quotedAccessorName1.symbols b/tests/baselines/reference/quotedAccessorName1.symbols
index d7afe8fa3d6..6725cd6d78e 100644
--- a/tests/baselines/reference/quotedAccessorName1.symbols
+++ b/tests/baselines/reference/quotedAccessorName1.symbols
@@ -3,4 +3,5 @@ class C {
 >C : Symbol(C, Decl(quotedAccessorName1.ts, 0, 0))
 
     get "foo"() { return 0; }
+>"foo" : Symbol(C["foo"], Decl(quotedAccessorName1.ts, 0, 9))
 }
diff --git a/tests/baselines/reference/quotedAccessorName1.types b/tests/baselines/reference/quotedAccessorName1.types
index cbd63c919a6..39f927e7304 100644
--- a/tests/baselines/reference/quotedAccessorName1.types
+++ b/tests/baselines/reference/quotedAccessorName1.types
@@ -3,5 +3,6 @@ class C {
 >C : C
 
     get "foo"() { return 0; }
+>"foo" : number
 >0 : 0
 }
diff --git a/tests/baselines/reference/quotedAccessorName2.symbols b/tests/baselines/reference/quotedAccessorName2.symbols
index 5ff7fa26bf5..a9cd9d530a5 100644
--- a/tests/baselines/reference/quotedAccessorName2.symbols
+++ b/tests/baselines/reference/quotedAccessorName2.symbols
@@ -3,4 +3,5 @@ class C {
 >C : Symbol(C, Decl(quotedAccessorName2.ts, 0, 0))
 
     static get "foo"() { return 0; }
+>"foo" : Symbol(C["foo"], Decl(quotedAccessorName2.ts, 0, 9))
 }
diff --git a/tests/baselines/reference/quotedAccessorName2.types b/tests/baselines/reference/quotedAccessorName2.types
index 849a986ff1d..b621e5049d9 100644
--- a/tests/baselines/reference/quotedAccessorName2.types
+++ b/tests/baselines/reference/quotedAccessorName2.types
@@ -3,5 +3,6 @@ class C {
 >C : C
 
     static get "foo"() { return 0; }
+>"foo" : number
 >0 : 0
 }
diff --git a/tests/baselines/reference/quotedFunctionName1.symbols b/tests/baselines/reference/quotedFunctionName1.symbols
index ea000bd138e..7d03a3e47d3 100644
--- a/tests/baselines/reference/quotedFunctionName1.symbols
+++ b/tests/baselines/reference/quotedFunctionName1.symbols
@@ -3,4 +3,5 @@ class Test1 {
 >Test1 : Symbol(Test1, Decl(quotedFunctionName1.ts, 0, 0))
 
   "prop1"() { }
+>"prop1" : Symbol(Test1["prop1"], Decl(quotedFunctionName1.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/quotedFunctionName1.types b/tests/baselines/reference/quotedFunctionName1.types
index 9ebc0abfc4d..138dd5ade45 100644
--- a/tests/baselines/reference/quotedFunctionName1.types
+++ b/tests/baselines/reference/quotedFunctionName1.types
@@ -3,4 +3,5 @@ class Test1 {
 >Test1 : Test1
 
   "prop1"() { }
+>"prop1" : () => void
 }
diff --git a/tests/baselines/reference/quotedFunctionName2.symbols b/tests/baselines/reference/quotedFunctionName2.symbols
index 0c26e1db608..920344efbaa 100644
--- a/tests/baselines/reference/quotedFunctionName2.symbols
+++ b/tests/baselines/reference/quotedFunctionName2.symbols
@@ -3,4 +3,5 @@ class Test1 {
 >Test1 : Symbol(Test1, Decl(quotedFunctionName2.ts, 0, 0))
 
   static "prop1"() { }
+>"prop1" : Symbol(Test1["prop1"], Decl(quotedFunctionName2.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/quotedFunctionName2.types b/tests/baselines/reference/quotedFunctionName2.types
index de36a3f969a..322aa948841 100644
--- a/tests/baselines/reference/quotedFunctionName2.types
+++ b/tests/baselines/reference/quotedFunctionName2.types
@@ -3,4 +3,5 @@ class Test1 {
 >Test1 : Test1
 
   static "prop1"() { }
+>"prop1" : () => void
 }
diff --git a/tests/baselines/reference/quotedModuleNameMustBeAmbient.symbols b/tests/baselines/reference/quotedModuleNameMustBeAmbient.symbols
index b43c708cd5d..667383b9286 100644
--- a/tests/baselines/reference/quotedModuleNameMustBeAmbient.symbols
+++ b/tests/baselines/reference/quotedModuleNameMustBeAmbient.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/quotedModuleNameMustBeAmbient.ts ===
 module 'M' {}
-No type information for this code.
-No type information for this code.declare module 'M2' {}
-No type information for this code.
\ No newline at end of file
+>'M' : Symbol('M', Decl(quotedModuleNameMustBeAmbient.ts, 0, 0))
+
+declare module 'M2' {}
+>'M2' : Symbol('M2', Decl(quotedModuleNameMustBeAmbient.ts, 0, 13))
+
diff --git a/tests/baselines/reference/quotedModuleNameMustBeAmbient.types b/tests/baselines/reference/quotedModuleNameMustBeAmbient.types
index b43c708cd5d..2ab8ffc3a8d 100644
--- a/tests/baselines/reference/quotedModuleNameMustBeAmbient.types
+++ b/tests/baselines/reference/quotedModuleNameMustBeAmbient.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/quotedModuleNameMustBeAmbient.ts ===
 module 'M' {}
-No type information for this code.
-No type information for this code.declare module 'M2' {}
-No type information for this code.
\ No newline at end of file
+>'M' : typeof 'M'
+
+declare module 'M2' {}
+>'M2' : typeof 'M2'
+
diff --git a/tests/baselines/reference/quotedPropertyName1.symbols b/tests/baselines/reference/quotedPropertyName1.symbols
index 3e9045bfa74..fd3a8c57d36 100644
--- a/tests/baselines/reference/quotedPropertyName1.symbols
+++ b/tests/baselines/reference/quotedPropertyName1.symbols
@@ -3,4 +3,5 @@ class Test1 {
 >Test1 : Symbol(Test1, Decl(quotedPropertyName1.ts, 0, 0))
 
   "prop1" = 0;
+>"prop1" : Symbol(Test1["prop1"], Decl(quotedPropertyName1.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/quotedPropertyName1.types b/tests/baselines/reference/quotedPropertyName1.types
index a142d607a75..517cf2e1e04 100644
--- a/tests/baselines/reference/quotedPropertyName1.types
+++ b/tests/baselines/reference/quotedPropertyName1.types
@@ -3,5 +3,6 @@ class Test1 {
 >Test1 : Test1
 
   "prop1" = 0;
+>"prop1" : number
 >0 : 0
 }
diff --git a/tests/baselines/reference/quotedPropertyName2.symbols b/tests/baselines/reference/quotedPropertyName2.symbols
index e7209196bfd..847790a1b1e 100644
--- a/tests/baselines/reference/quotedPropertyName2.symbols
+++ b/tests/baselines/reference/quotedPropertyName2.symbols
@@ -3,4 +3,5 @@ class Test1 {
 >Test1 : Symbol(Test1, Decl(quotedPropertyName2.ts, 0, 0))
 
   static "prop1" = 0;
+>"prop1" : Symbol(Test1["prop1"], Decl(quotedPropertyName2.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/quotedPropertyName2.types b/tests/baselines/reference/quotedPropertyName2.types
index 16b116a5e22..044e65583f2 100644
--- a/tests/baselines/reference/quotedPropertyName2.types
+++ b/tests/baselines/reference/quotedPropertyName2.types
@@ -3,5 +3,6 @@ class Test1 {
 >Test1 : Test1
 
   static "prop1" = 0;
+>"prop1" : number
 >0 : 0
 }
diff --git a/tests/baselines/reference/quotedPropertyName3.symbols b/tests/baselines/reference/quotedPropertyName3.symbols
index 813cf23e336..6d955d24d9c 100644
--- a/tests/baselines/reference/quotedPropertyName3.symbols
+++ b/tests/baselines/reference/quotedPropertyName3.symbols
@@ -3,6 +3,8 @@ class Test {
 >Test : Symbol(Test, Decl(quotedPropertyName3.ts, 0, 0))
 
     "prop1": number;
+>"prop1" : Symbol(Test["prop1"], Decl(quotedPropertyName3.ts, 0, 12))
+
     foo() {
 >foo : Symbol(Test.foo, Decl(quotedPropertyName3.ts, 1, 20))
 
diff --git a/tests/baselines/reference/quotedPropertyName3.types b/tests/baselines/reference/quotedPropertyName3.types
index f5f1d47bbc8..40c47212f3e 100644
--- a/tests/baselines/reference/quotedPropertyName3.types
+++ b/tests/baselines/reference/quotedPropertyName3.types
@@ -3,6 +3,8 @@ class Test {
 >Test : Test
 
     "prop1": number;
+>"prop1" : number
+
     foo() {
 >foo : () => void
 
diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.symbols b/tests/baselines/reference/reactNamespaceImportPresevation.symbols
index dadd6f3e7a7..0a1d51843ef 100644
--- a/tests/baselines/reference/reactNamespaceImportPresevation.symbols
+++ b/tests/baselines/reference/reactNamespaceImportPresevation.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "my-React-Lib" {
+>"my-React-Lib" : Symbol("my-React-Lib", Decl(modules.d.ts, 0, 0))
+
     var a: any;
 >a : Symbol(a, Decl(modules.d.ts, 1, 7))
 
diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.types b/tests/baselines/reference/reactNamespaceImportPresevation.types
index 9f45b5cb462..55c11d3e44a 100644
--- a/tests/baselines/reference/reactNamespaceImportPresevation.types
+++ b/tests/baselines/reference/reactNamespaceImportPresevation.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "my-React-Lib" {
+>"my-React-Lib" : typeof "my-React-Lib"
+
     var a: any;
 >a : any
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.symbols
index 046e4323be4..3602a6cf7b9 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.symbols
@@ -12,6 +12,8 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts ===
 declare module "moduleC" {
+>"moduleC" : Symbol("moduleC", Decl(recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts, 0, 0))
+
     import self = require("moduleC");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts, 0, 26))
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
index 5096fa64490..22566d71c0f 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
@@ -12,6 +12,8 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts ===
 declare module "moduleC" {
+>"moduleC" : typeof "moduleC"
+
     import self = require("moduleC");
 >self : any
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.symbols
index 7ae819bfd7c..eca3fe266f0 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.symbols
@@ -12,6 +12,8 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts ===
 declare module "moduleC" {
+>"moduleC" : Symbol("moduleC", Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 0, 0))
+
     import self = require("moduleD");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 0, 26))
 
@@ -19,6 +21,8 @@ declare module "moduleC" {
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 0, 26))
 }
 declare module "moduleD" {
+>"moduleD" : Symbol("moduleD", Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 3, 1))
+
     import self = require("moduleC");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 4, 26))
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
index fdbfe4bd68a..9c7bb322c93 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
@@ -12,6 +12,8 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts ===
 declare module "moduleC" {
+>"moduleC" : typeof "moduleC"
+
     import self = require("moduleD");
 >self : any
 
@@ -19,6 +21,8 @@ declare module "moduleC" {
 >self : any
 }
 declare module "moduleD" {
+>"moduleD" : typeof "moduleD"
+
     import self = require("moduleC");
 >self : any
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.symbols b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.symbols
index 6ea040b847a..63648644149 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.symbols
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.symbols
@@ -12,6 +12,8 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts ===
 declare module "moduleC" {
+>"moduleC" : Symbol("moduleC", Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 0, 0))
+
     import self = require("moduleD");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 0, 26))
 
@@ -19,6 +21,8 @@ declare module "moduleC" {
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 0, 26))
 }
 declare module "moduleD" {
+>"moduleD" : Symbol("moduleD", Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 3, 1))
+
     import self = require("moduleE");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 4, 26))
 
@@ -26,6 +30,8 @@ declare module "moduleD" {
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 4, 26))
 }
 declare module "moduleE" {
+>"moduleE" : Symbol("moduleE", Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 7, 1))
+
     import self = require("moduleC");
 >self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 8, 26))
 
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
index d879424ae01..81654cb4f7c 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
@@ -12,6 +12,8 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts ===
 declare module "moduleC" {
+>"moduleC" : typeof "moduleC"
+
     import self = require("moduleD");
 >self : any
 
@@ -19,6 +21,8 @@ declare module "moduleC" {
 >self : any
 }
 declare module "moduleD" {
+>"moduleD" : typeof "moduleD"
+
     import self = require("moduleE");
 >self : any
 
@@ -26,6 +30,8 @@ declare module "moduleD" {
 >self : any
 }
 declare module "moduleE" {
+>"moduleE" : typeof "moduleE"
+
     import self = require("moduleC");
 >self : any
 
diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols
index 7ddb3d5b9e1..45f6fd8df38 100644
--- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols
+++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName2.ts ===
 declare module "punycode" {
+>"punycode" : Symbol("punycode", Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 0, 0))
+
     interface ucs2 {
 >ucs2 : Symbol(ucs2, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 0, 27), Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 6, 14))
 
diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
index 835e4656f5f..fd732fd2620 100644
--- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
+++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName2.ts ===
 declare module "punycode" {
+>"punycode" : typeof "punycode"
+
     interface ucs2 {
 >ucs2 : ucs2
 
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern2.symbols b/tests/baselines/reference/restElementWithAssignmentPattern2.symbols
index a67323e93f5..9555b85a003 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern2.symbols
+++ b/tests/baselines/reference/restElementWithAssignmentPattern2.symbols
@@ -4,6 +4,7 @@ var a: string, b: number;
 >b : Symbol(b, Decl(restElementWithAssignmentPattern2.ts, 0, 14))
 
 [...{ 0: a = "", b }] = ["", 1];
+>0 : Symbol(0, Decl(restElementWithAssignmentPattern2.ts, 1, 5))
 >a : Symbol(a, Decl(restElementWithAssignmentPattern2.ts, 0, 3))
 >b : Symbol(b, Decl(restElementWithAssignmentPattern2.ts, 1, 16))
 
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern2.types b/tests/baselines/reference/restElementWithAssignmentPattern2.types
index df2dc66c909..4f6366dff7f 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern2.types
+++ b/tests/baselines/reference/restElementWithAssignmentPattern2.types
@@ -8,6 +8,7 @@ var a: string, b: number;
 >[...{ 0: a = "", b }] : undefined[]
 >...{ 0: a = "", b } : any
 >{ 0: a = "", b } : { 0?: string; b: number; }
+>0 : string
 >a = "" : ""
 >a : string
 >"" : ""
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern4.symbols b/tests/baselines/reference/restElementWithAssignmentPattern4.symbols
index 776a5f8ab4a..b1e9d05affc 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern4.symbols
+++ b/tests/baselines/reference/restElementWithAssignmentPattern4.symbols
@@ -7,6 +7,7 @@ var tuple: [string, number] = ["", 1];
 >tuple : Symbol(tuple, Decl(restElementWithAssignmentPattern4.ts, 1, 3))
 
 [...{ 0: a = "", b }] = tuple;
+>0 : Symbol(0, Decl(restElementWithAssignmentPattern4.ts, 2, 5))
 >a : Symbol(a, Decl(restElementWithAssignmentPattern4.ts, 0, 3))
 >b : Symbol(b, Decl(restElementWithAssignmentPattern4.ts, 2, 16))
 >tuple : Symbol(tuple, Decl(restElementWithAssignmentPattern4.ts, 1, 3))
diff --git a/tests/baselines/reference/restElementWithAssignmentPattern4.types b/tests/baselines/reference/restElementWithAssignmentPattern4.types
index f29dd1b219c..688735982cc 100644
--- a/tests/baselines/reference/restElementWithAssignmentPattern4.types
+++ b/tests/baselines/reference/restElementWithAssignmentPattern4.types
@@ -14,6 +14,7 @@ var tuple: [string, number] = ["", 1];
 >[...{ 0: a = "", b }] : undefined[]
 >...{ 0: a = "", b } : any
 >{ 0: a = "", b } : { 0?: string; b: number; }
+>0 : string
 >a = "" : ""
 >a : string
 >"" : ""
diff --git a/tests/baselines/reference/shebangBeforeReferences.symbols b/tests/baselines/reference/shebangBeforeReferences.symbols
index 03e20113f58..9a30f22cd34 100644
--- a/tests/baselines/reference/shebangBeforeReferences.symbols
+++ b/tests/baselines/reference/shebangBeforeReferences.symbols
@@ -16,6 +16,8 @@ use(x);
 
 === tests/cases/compiler/f.d.ts ===
 declare module "test" {
+>"test" : Symbol("test", Decl(f.d.ts, 0, 0))
+
     let x: number;
 >x : Symbol(x, Decl(f.d.ts, 1, 7))
 }
diff --git a/tests/baselines/reference/shebangBeforeReferences.types b/tests/baselines/reference/shebangBeforeReferences.types
index 8b594d76509..db04f7e6602 100644
--- a/tests/baselines/reference/shebangBeforeReferences.types
+++ b/tests/baselines/reference/shebangBeforeReferences.types
@@ -17,6 +17,8 @@ use(x);
 
 === tests/cases/compiler/f.d.ts ===
 declare module "test" {
+>"test" : typeof "test"
+
     let x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols b/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols
index 277a88ce38f..c182339cfb5 100644
--- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols
+++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols
@@ -3,7 +3,10 @@ class C {
 >C : Symbol(C, Decl(staticMemberWithStringAndNumberNames.ts, 0, 0))
 
     static "foo" = 0;
+>"foo" : Symbol(C["foo"], Decl(staticMemberWithStringAndNumberNames.ts, 0, 9))
+
     static 0 = 1;
+>0 : Symbol(C[0], Decl(staticMemberWithStringAndNumberNames.ts, 1, 21))
 
     x = C['foo'];
 >x : Symbol(C.x, Decl(staticMemberWithStringAndNumberNames.ts, 2, 17))
diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.types b/tests/baselines/reference/staticMemberWithStringAndNumberNames.types
index b0826343d20..79726a26b79 100644
--- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.types
+++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.types
@@ -3,9 +3,11 @@ class C {
 >C : C
 
     static "foo" = 0;
+>"foo" : number
 >0 : 0
 
     static 0 = 1;
+>0 : number
 >1 : 1
 
     x = C['foo'];
diff --git a/tests/baselines/reference/strictPropertyInitialization.symbols b/tests/baselines/reference/strictPropertyInitialization.symbols
index 3247d975bb5..c271094a527 100644
--- a/tests/baselines/reference/strictPropertyInitialization.symbols
+++ b/tests/baselines/reference/strictPropertyInitialization.symbols
@@ -142,7 +142,10 @@ class C8 {
 >a : Symbol(C8.a, Decl(strictPropertyInitialization.ts, 69, 10))
 
     "b": number;
+>"b" : Symbol(C8["b"], Decl(strictPropertyInitialization.ts, 70, 14))
+
     0: number;
+>0 : Symbol(C8[0], Decl(strictPropertyInitialization.ts, 71, 16))
 }
 
 // No strict initialization checks for abstract members
diff --git a/tests/baselines/reference/strictPropertyInitialization.types b/tests/baselines/reference/strictPropertyInitialization.types
index 24cbdb14ef7..4c0ab3e8527 100644
--- a/tests/baselines/reference/strictPropertyInitialization.types
+++ b/tests/baselines/reference/strictPropertyInitialization.types
@@ -156,7 +156,10 @@ class C8 {
 >a : number
 
     "b": number;
+>"b" : number
+
     0: number;
+>0 : number
 }
 
 // No strict initialization checks for abstract members
diff --git a/tests/baselines/reference/stringIndexerAndConstructor.symbols b/tests/baselines/reference/stringIndexerAndConstructor.symbols
index 9893bc0035b..b8ea0de4a8c 100644
--- a/tests/baselines/reference/stringIndexerAndConstructor.symbols
+++ b/tests/baselines/reference/stringIndexerAndConstructor.symbols
@@ -19,6 +19,8 @@ interface I {
     (): boolean;
     new (): boolean;
     "": string;
+>"" : Symbol(I[""], Decl(stringIndexerAndConstructor.ts, 9, 20))
+
     d: string;
 >d : Symbol(I.d, Decl(stringIndexerAndConstructor.ts, 10, 15))
 }
diff --git a/tests/baselines/reference/stringIndexerAndConstructor.types b/tests/baselines/reference/stringIndexerAndConstructor.types
index e730d9bcac7..7eab2df1ff0 100644
--- a/tests/baselines/reference/stringIndexerAndConstructor.types
+++ b/tests/baselines/reference/stringIndexerAndConstructor.types
@@ -19,6 +19,8 @@ interface I {
     (): boolean;
     new (): boolean;
     "": string;
+>"" : string
+
     d: string;
 >d : string
 }
diff --git a/tests/baselines/reference/stringIndexerAndConstructor1.symbols b/tests/baselines/reference/stringIndexerAndConstructor1.symbols
index 700119ac22b..a1d083c1180 100644
--- a/tests/baselines/reference/stringIndexerAndConstructor1.symbols
+++ b/tests/baselines/reference/stringIndexerAndConstructor1.symbols
@@ -6,4 +6,5 @@ interface I {
 >s : Symbol(s, Decl(stringIndexerAndConstructor1.ts, 1, 5))
 
     "": string;
+>"" : Symbol(I[""], Decl(stringIndexerAndConstructor1.ts, 1, 24))
 }
diff --git a/tests/baselines/reference/stringIndexerAndConstructor1.types b/tests/baselines/reference/stringIndexerAndConstructor1.types
index ad358053565..086ab4981e4 100644
--- a/tests/baselines/reference/stringIndexerAndConstructor1.types
+++ b/tests/baselines/reference/stringIndexerAndConstructor1.types
@@ -6,4 +6,5 @@ interface I {
 >s : string
 
     "": string;
+>"" : string
 }
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.symbols b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.symbols
index 97195b867e0..8c12846399d 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.symbols
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.symbols
@@ -27,11 +27,23 @@ class C {
 >c : Symbol(C.c, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 12, 14))
 
     "d": string; // ok
+>"d" : Symbol(C["d"], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 13, 15))
+
     "e": number; // error
+>"e" : Symbol(C["e"], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 14, 16))
+
     1.0: string; // ok
+>1.0 : Symbol(C[1.0], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 15, 16))
+
     2.0: number; // error
+>2.0 : Symbol(C[2.0], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 16, 16))
+
     "3.0": string; // ok
+>"3.0" : Symbol(C["3.0"], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 17, 16))
+
     "4.0": number; // error
+>"4.0" : Symbol(C["4.0"], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 18, 18))
+
     f: MyString; // error
 >f : Symbol(C.f, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 19, 18))
 >MyString : Symbol(MyString, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 0, 0))
@@ -83,9 +95,17 @@ interface I {
 >c : Symbol(I.c, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 44, 14))
 
     "d": string; // ok
+>"d" : Symbol(I["d"], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 45, 15))
+
     "e": number; // error
+>"e" : Symbol(I["e"], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 46, 16))
+
     1.0: string; // ok
+>1.0 : Symbol(I[1.0], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 47, 16))
+
     2.0: number; // error
+>2.0 : Symbol(I[2.0], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 48, 16))
+
     (): string; // ok
     (x): number // ok
 >x : Symbol(x, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 51, 5))
@@ -94,7 +114,11 @@ interface I {
 >foo : Symbol(I.foo, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 51, 15))
 
     "3.0": string; // ok
+>"3.0" : Symbol(I["3.0"], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 52, 18))
+
     "4.0": number; // error
+>"4.0" : Symbol(I["4.0"], Decl(stringIndexerConstrainsPropertyDeclarations.ts, 53, 18))
+
     f: MyString; // error
 >f : Symbol(I.f, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 54, 18))
 >MyString : Symbol(MyString, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 0, 0))
@@ -116,9 +140,17 @@ var a: {
 >c : Symbol(c, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 62, 14))
 
     "d": string; // ok
+>"d" : Symbol("d", Decl(stringIndexerConstrainsPropertyDeclarations.ts, 63, 15))
+
     "e": number; // error
+>"e" : Symbol("e", Decl(stringIndexerConstrainsPropertyDeclarations.ts, 64, 16))
+
     1.0: string; // ok
+>1.0 : Symbol(1.0, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 65, 16))
+
     2.0: number; // error
+>2.0 : Symbol(2.0, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 66, 16))
+
     (): string; // ok
     (x): number // ok
 >x : Symbol(x, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 69, 5))
@@ -127,7 +159,11 @@ var a: {
 >foo : Symbol(foo, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 69, 15))
 
     "3.0": string; // ok
+>"3.0" : Symbol("3.0", Decl(stringIndexerConstrainsPropertyDeclarations.ts, 70, 18))
+
     "4.0": number; // error
+>"4.0" : Symbol("4.0", Decl(stringIndexerConstrainsPropertyDeclarations.ts, 71, 18))
+
     f: MyString; // error
 >f : Symbol(f, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 72, 18))
 >MyString : Symbol(MyString, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 0, 0))
@@ -148,11 +184,23 @@ var b: { [x: string]: string; } = {
 >c : Symbol(c, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 79, 9))
 
     "d": '', 
+>"d" : Symbol("d", Decl(stringIndexerConstrainsPropertyDeclarations.ts, 80, 17))
+
     "e": 1, 
+>"e" : Symbol("e", Decl(stringIndexerConstrainsPropertyDeclarations.ts, 81, 12))
+
     1.0: '',
+>1.0 : Symbol(1.0, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 82, 11))
+
     2.0: 1, 
+>2.0 : Symbol(2.0, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 83, 12))
+
     "3.0": '', 
+>"3.0" : Symbol("3.0", Decl(stringIndexerConstrainsPropertyDeclarations.ts, 84, 11))
+
     "4.0": 1, 
+>"4.0" : Symbol("4.0", Decl(stringIndexerConstrainsPropertyDeclarations.ts, 85, 14))
+
     f: <MyString>null, 
 >f : Symbol(f, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 86, 13))
 >MyString : Symbol(MyString, Decl(stringIndexerConstrainsPropertyDeclarations.ts, 0, 0))
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
index c6f3a412da1..91feb78d0c2 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
@@ -27,11 +27,23 @@ class C {
 >c : () => {}
 
     "d": string; // ok
+>"d" : string
+
     "e": number; // error
+>"e" : number
+
     1.0: string; // ok
+>1.0 : string
+
     2.0: number; // error
+>2.0 : number
+
     "3.0": string; // ok
+>"3.0" : string
+
     "4.0": number; // error
+>"4.0" : number
+
     f: MyString; // error
 >f : MyString
 >MyString : MyString
@@ -86,9 +98,17 @@ interface I {
 >c : () => {}
 
     "d": string; // ok
+>"d" : string
+
     "e": number; // error
+>"e" : number
+
     1.0: string; // ok
+>1.0 : string
+
     2.0: number; // error
+>2.0 : number
+
     (): string; // ok
     (x): number // ok
 >x : any
@@ -97,7 +117,11 @@ interface I {
 >foo : () => string
 
     "3.0": string; // ok
+>"3.0" : string
+
     "4.0": number; // error
+>"4.0" : number
+
     f: MyString; // error
 >f : MyString
 >MyString : MyString
@@ -119,9 +143,17 @@ var a: {
 >c : () => {}
 
     "d": string; // ok
+>"d" : string
+
     "e": number; // error
+>"e" : number
+
     1.0: string; // ok
+>1.0 : string
+
     2.0: number; // error
+>2.0 : number
+
     (): string; // ok
     (x): number // ok
 >x : any
@@ -130,7 +162,11 @@ var a: {
 >foo : () => string
 
     "3.0": string; // ok
+>"3.0" : string
+
     "4.0": number; // error
+>"4.0" : number
+
     f: MyString; // error
 >f : MyString
 >MyString : MyString
@@ -155,21 +191,27 @@ var b: { [x: string]: string; } = {
 >() => { } : () => void
 
     "d": '', 
+>"d" : string
 >'' : ""
 
     "e": 1, 
+>"e" : number
 >1 : 1
 
     1.0: '',
+>1.0 : string
 >'' : ""
 
     2.0: 1, 
+>2.0 : number
 >1 : 1
 
     "3.0": '', 
+>"3.0" : string
 >'' : ""
 
     "4.0": 1, 
+>"4.0" : number
 >1 : 1
 
     f: <MyString>null, 
diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols
index b4bdeb71c79..608acd4a597 100644
--- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols
+++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols
@@ -4,5 +4,6 @@ module m1 {
 
   export var n = { 'foo bar': 4 };
 >n : Symbol(n, Decl(stringLiteralObjectLiteralDeclaration1.ts, 1, 12))
+>'foo bar' : Symbol('foo bar', Decl(stringLiteralObjectLiteralDeclaration1.ts, 1, 18))
 }
 
diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
index 7c4ea1c86bb..fb0d8e44ddf 100644
--- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
+++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
@@ -5,6 +5,7 @@ module m1 {
   export var n = { 'foo bar': 4 };
 >n : { 'foo bar': number; }
 >{ 'foo bar': 4 } : { 'foo bar': number; }
+>'foo bar' : number
 >4 : 4
 }
 
diff --git a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.symbols b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.symbols
index 3f7804a18a7..4c0e7f433ff 100644
--- a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.symbols
+++ b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.symbols
@@ -1,6 +1,8 @@
 === tests/cases/compiler/stringLiteralPropertyNameWithLineContinuation1.ts ===
 var x = {'text\
 >x : Symbol(x, Decl(stringLiteralPropertyNameWithLineContinuation1.ts, 0, 3))
+>'text\' : Symbol('text\
+', Decl(stringLiteralPropertyNameWithLineContinuation1.ts, 0, 9))
 
 ':'hello'}
 x.text = "bar"
diff --git a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
index c5022b5463b..11f0108a83f 100644
--- a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
+++ b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
@@ -4,6 +4,7 @@ var x = {'text\
 ': string; }
 >{'text\':'hello'} : { 'text\
 ': string; }
+>'text\' : string
 
 ':'hello'}
 >'hello' : "hello"
diff --git a/tests/baselines/reference/stringNamedPropertyAccess.symbols b/tests/baselines/reference/stringNamedPropertyAccess.symbols
index 961b03f6e04..c7515e68cac 100644
--- a/tests/baselines/reference/stringNamedPropertyAccess.symbols
+++ b/tests/baselines/reference/stringNamedPropertyAccess.symbols
@@ -3,7 +3,10 @@ class C {
 >C : Symbol(C, Decl(stringNamedPropertyAccess.ts, 0, 0))
 
     "a b": number;
+>"a b" : Symbol(C["a b"], Decl(stringNamedPropertyAccess.ts, 0, 9))
+
     static "c d": number;
+>"c d" : Symbol(C["c d"], Decl(stringNamedPropertyAccess.ts, 1, 18))
 }
 var c: C;
 >c : Symbol(c, Decl(stringNamedPropertyAccess.ts, 4, 3))
@@ -23,6 +26,7 @@ interface I {
 >I : Symbol(I, Decl(stringNamedPropertyAccess.ts, 6, 19))
 
     "a b": number;
+>"a b" : Symbol(I["a b"], Decl(stringNamedPropertyAccess.ts, 8, 13))
 }
 var i: I;
 >i : Symbol(i, Decl(stringNamedPropertyAccess.ts, 11, 3))
@@ -37,6 +41,7 @@ var a: {
 >a : Symbol(a, Decl(stringNamedPropertyAccess.ts, 14, 3))
 
     "a b": number;
+>"a b" : Symbol("a b", Decl(stringNamedPropertyAccess.ts, 14, 8))
 }
 var r3 = a["a b"];
 >r3 : Symbol(r3, Decl(stringNamedPropertyAccess.ts, 17, 3))
@@ -47,6 +52,7 @@ var b = {
 >b : Symbol(b, Decl(stringNamedPropertyAccess.ts, 19, 3))
 
     "a b": 1
+>"a b" : Symbol("a b", Decl(stringNamedPropertyAccess.ts, 19, 9))
 }
 var r4 = b["a b"];
 >r4 : Symbol(r4, Decl(stringNamedPropertyAccess.ts, 22, 3))
diff --git a/tests/baselines/reference/stringNamedPropertyAccess.types b/tests/baselines/reference/stringNamedPropertyAccess.types
index 1b3d56abc10..e048608449c 100644
--- a/tests/baselines/reference/stringNamedPropertyAccess.types
+++ b/tests/baselines/reference/stringNamedPropertyAccess.types
@@ -3,7 +3,10 @@ class C {
 >C : C
 
     "a b": number;
+>"a b" : number
+
     static "c d": number;
+>"c d" : number
 }
 var c: C;
 >c : C
@@ -25,6 +28,7 @@ interface I {
 >I : I
 
     "a b": number;
+>"a b" : number
 }
 var i: I;
 >i : I
@@ -40,6 +44,7 @@ var a: {
 >a : { "a b": number; }
 
     "a b": number;
+>"a b" : number
 }
 var r3 = a["a b"];
 >r3 : number
@@ -52,6 +57,7 @@ var b = {
 >{    "a b": 1} : { "a b": number; }
 
     "a b": 1
+>"a b" : number
 >1 : 1
 }
 var r4 = b["a b"];
diff --git a/tests/baselines/reference/stringNamedPropertyDuplicates.symbols b/tests/baselines/reference/stringNamedPropertyDuplicates.symbols
index 17e8af5b59f..a8258cf3bc7 100644
--- a/tests/baselines/reference/stringNamedPropertyDuplicates.symbols
+++ b/tests/baselines/reference/stringNamedPropertyDuplicates.symbols
@@ -3,28 +3,44 @@ class C {
 >C : Symbol(C, Decl(stringNamedPropertyDuplicates.ts, 0, 0))
 
     "a b": number;
+>"a b" : Symbol(C["a b"], Decl(stringNamedPropertyDuplicates.ts, 0, 9), Decl(stringNamedPropertyDuplicates.ts, 1, 18))
+
     "a b": number;
+>"a b" : Symbol(C["a b"], Decl(stringNamedPropertyDuplicates.ts, 0, 9), Decl(stringNamedPropertyDuplicates.ts, 1, 18))
+
     static "c d": number;
+>"c d" : Symbol(C["c d"], Decl(stringNamedPropertyDuplicates.ts, 2, 18), Decl(stringNamedPropertyDuplicates.ts, 3, 25))
+
     static "c d": number;
+>"c d" : Symbol(C["c d"], Decl(stringNamedPropertyDuplicates.ts, 2, 18), Decl(stringNamedPropertyDuplicates.ts, 3, 25))
 }
 
 interface I {
 >I : Symbol(I, Decl(stringNamedPropertyDuplicates.ts, 5, 1))
 
     "a b": number;
+>"a b" : Symbol(I["a b"], Decl(stringNamedPropertyDuplicates.ts, 7, 13), Decl(stringNamedPropertyDuplicates.ts, 8, 18))
+
     "a b": number;
+>"a b" : Symbol(I["a b"], Decl(stringNamedPropertyDuplicates.ts, 7, 13), Decl(stringNamedPropertyDuplicates.ts, 8, 18))
 }
 
 var a: {
 >a : Symbol(a, Decl(stringNamedPropertyDuplicates.ts, 12, 3))
 
     "a b": number;
+>"a b" : Symbol("a b", Decl(stringNamedPropertyDuplicates.ts, 12, 8), Decl(stringNamedPropertyDuplicates.ts, 13, 18))
+
     "a b": number;
+>"a b" : Symbol("a b", Decl(stringNamedPropertyDuplicates.ts, 12, 8), Decl(stringNamedPropertyDuplicates.ts, 13, 18))
 }
 
 var b = {
 >b : Symbol(b, Decl(stringNamedPropertyDuplicates.ts, 17, 3))
 
     "a b": 1
+>"a b" : Symbol("a b", Decl(stringNamedPropertyDuplicates.ts, 17, 9), Decl(stringNamedPropertyDuplicates.ts, 18, 12))
+
     "a b": 1
+>"a b" : Symbol("a b", Decl(stringNamedPropertyDuplicates.ts, 17, 9), Decl(stringNamedPropertyDuplicates.ts, 18, 12))
 }
diff --git a/tests/baselines/reference/stringNamedPropertyDuplicates.types b/tests/baselines/reference/stringNamedPropertyDuplicates.types
index d937362588a..cbd2edaf933 100644
--- a/tests/baselines/reference/stringNamedPropertyDuplicates.types
+++ b/tests/baselines/reference/stringNamedPropertyDuplicates.types
@@ -3,23 +3,36 @@ class C {
 >C : C
 
     "a b": number;
+>"a b" : number
+
     "a b": number;
+>"a b" : number
+
     static "c d": number;
+>"c d" : number
+
     static "c d": number;
+>"c d" : number
 }
 
 interface I {
 >I : I
 
     "a b": number;
+>"a b" : number
+
     "a b": number;
+>"a b" : number
 }
 
 var a: {
 >a : { "a b": number; }
 
     "a b": number;
+>"a b" : number
+
     "a b": number;
+>"a b" : number
 }
 
 var b = {
@@ -27,8 +40,10 @@ var b = {
 >{    "a b": 1    "a b": 1} : { "a b": number; }
 
     "a b": 1
+>"a b" : number
 >1 : 1
 
     "a b": 1
+>"a b" : number
 >1 : 1
 }
diff --git a/tests/baselines/reference/stringPropCodeGen.symbols b/tests/baselines/reference/stringPropCodeGen.symbols
index d2c966f1b6e..a590463c948 100644
--- a/tests/baselines/reference/stringPropCodeGen.symbols
+++ b/tests/baselines/reference/stringPropCodeGen.symbols
@@ -3,7 +3,10 @@ var a = {
 >a : Symbol(a, Decl(stringPropCodeGen.ts, 0, 3))
 
   "foo" : function() { },
+>"foo" : Symbol("foo", Decl(stringPropCodeGen.ts, 0, 9))
+
   "bar" : 5
+>"bar" : Symbol("bar", Decl(stringPropCodeGen.ts, 2, 25))
 
 };
 
diff --git a/tests/baselines/reference/stringPropCodeGen.types b/tests/baselines/reference/stringPropCodeGen.types
index 184718982fa..c4f84fc6279 100644
--- a/tests/baselines/reference/stringPropCodeGen.types
+++ b/tests/baselines/reference/stringPropCodeGen.types
@@ -4,9 +4,11 @@ var a = {
 >{  "foo" : function() { },  "bar" : 5} : { "foo": () => void; "bar": number; }
 
   "foo" : function() { },
+>"foo" : () => void
 >function() { } : () => void
 
   "bar" : 5
+>"bar" : number
 >5 : 5
 
 };
diff --git a/tests/baselines/reference/subtypingWithObjectMembers.symbols b/tests/baselines/reference/subtypingWithObjectMembers.symbols
index d107385ba65..4b13fab1b63 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembers.symbols
@@ -43,9 +43,11 @@ class A2 {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers.ts, 14, 1))
 
     1: Base; 
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers.ts, 16, 10))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers.ts, 0, 0))
 
     2.0: Base;
+>2.0 : Symbol(A2[2.0], Decl(subtypingWithObjectMembers.ts, 17, 12))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers.ts, 0, 0))
 }
 
@@ -54,18 +56,22 @@ class B2 extends A2 {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers.ts, 14, 1))
 
     1: Derived; // ok
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembers.ts, 21, 21))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers.ts, 0, 27))
 
     2: string; // error
+>2 : Symbol(B2[2], Decl(subtypingWithObjectMembers.ts, 22, 15))
 }
 
 class A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers.ts, 24, 1))
 
     '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers.ts, 26, 10))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers.ts, 0, 0))
 
     '2.0': Base;
+>'2.0' : Symbol(A3['2.0'], Decl(subtypingWithObjectMembers.ts, 27, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers.ts, 0, 0))
 }
 
@@ -74,9 +80,11 @@ class B3 extends A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers.ts, 24, 1))
 
     '1': Derived; // ok
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembers.ts, 31, 21))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers.ts, 0, 27))
 
     '2.0': string; // error
+>'2.0' : Symbol(B3['2.0'], Decl(subtypingWithObjectMembers.ts, 32, 17))
 }
 
 module TwoLevels {
@@ -110,9 +118,11 @@ module TwoLevels {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers.ts, 45, 5))
 
         1: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers.ts, 47, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers.ts, 0, 0))
 
         2.0: Base;
+>2.0 : Symbol(A2[2.0], Decl(subtypingWithObjectMembers.ts, 48, 16))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers.ts, 0, 0))
     }
 
@@ -121,18 +131,22 @@ module TwoLevels {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers.ts, 45, 5))
 
         1: Derived2; // ok
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembers.ts, 52, 25))
 >Derived2 : Symbol(Derived2, Decl(subtypingWithObjectMembers.ts, 1, 43))
 
         2: string; // error
+>2 : Symbol(B2[2], Decl(subtypingWithObjectMembers.ts, 53, 20))
     }
 
     class A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers.ts, 55, 5))
 
         '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers.ts, 57, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers.ts, 0, 0))
 
         '2.0': Base;
+>'2.0' : Symbol(A3['2.0'], Decl(subtypingWithObjectMembers.ts, 58, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers.ts, 0, 0))
     }
 
@@ -141,8 +155,10 @@ module TwoLevels {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers.ts, 55, 5))
 
         '1': Derived2; // ok
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembers.ts, 62, 25))
 >Derived2 : Symbol(Derived2, Decl(subtypingWithObjectMembers.ts, 1, 43))
 
         '2.0': string; // error
+>'2.0' : Symbol(B3['2.0'], Decl(subtypingWithObjectMembers.ts, 63, 22))
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers.types b/tests/baselines/reference/subtypingWithObjectMembers.types
index 4b29aac7804..bab012b97cf 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers.types
@@ -43,9 +43,11 @@ class A2 {
 >A2 : A2
 
     1: Base; 
+>1 : Base
 >Base : Base
 
     2.0: Base;
+>2.0 : Base
 >Base : Base
 }
 
@@ -54,18 +56,22 @@ class B2 extends A2 {
 >A2 : A2
 
     1: Derived; // ok
+>1 : Derived
 >Derived : Derived
 
     2: string; // error
+>2 : string
 }
 
 class A3 {
 >A3 : A3
 
     '1': Base;
+>'1' : Base
 >Base : Base
 
     '2.0': Base;
+>'2.0' : Base
 >Base : Base
 }
 
@@ -74,9 +80,11 @@ class B3 extends A3 {
 >A3 : A3
 
     '1': Derived; // ok
+>'1' : Derived
 >Derived : Derived
 
     '2.0': string; // error
+>'2.0' : string
 }
 
 module TwoLevels {
@@ -110,9 +118,11 @@ module TwoLevels {
 >A2 : A2
 
         1: Base;
+>1 : Base
 >Base : Base
 
         2.0: Base;
+>2.0 : Base
 >Base : Base
     }
 
@@ -121,18 +131,22 @@ module TwoLevels {
 >A2 : A2
 
         1: Derived2; // ok
+>1 : Derived2
 >Derived2 : Derived2
 
         2: string; // error
+>2 : string
     }
 
     class A3 {
 >A3 : A3
 
         '1': Base;
+>'1' : Base
 >Base : Base
 
         '2.0': Base;
+>'2.0' : Base
 >Base : Base
     }
 
@@ -141,8 +155,10 @@ module TwoLevels {
 >A3 : A3
 
         '1': Derived2; // ok
+>'1' : Derived2
 >Derived2 : Derived2
 
         '2.0': string; // error
+>'2.0' : string
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers2.symbols b/tests/baselines/reference/subtypingWithObjectMembers2.symbols
index 848212fbaca..d155cfdae04 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers2.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembers2.symbols
@@ -47,9 +47,11 @@ module NotOptional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers2.ts, 19, 5))
 
         1: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers2.ts, 21, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers2.ts, 0, 0))
 
         2.0: Base;
+>2.0 : Symbol(A2[2.0], Decl(subtypingWithObjectMembers2.ts, 22, 16))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers2.ts, 0, 0))
     }
 
@@ -58,18 +60,22 @@ module NotOptional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers2.ts, 19, 5))
 
         1: Derived; // ok
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembers2.ts, 26, 29))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers2.ts, 2, 1))
 
         2: string; // error
+>2 : Symbol(B2[2], Decl(subtypingWithObjectMembers2.ts, 27, 19))
     }
 
     interface A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers2.ts, 29, 5))
 
         '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers2.ts, 31, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers2.ts, 0, 0))
 
         '2.0': Base;
+>'2.0' : Symbol(A3['2.0'], Decl(subtypingWithObjectMembers2.ts, 32, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers2.ts, 0, 0))
     }
 
@@ -78,9 +84,11 @@ module NotOptional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers2.ts, 29, 5))
 
         '1': Derived; // ok
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembers2.ts, 36, 29))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers2.ts, 2, 1))
 
         '2.0': string; // error
+>'2.0' : Symbol(B3['2.0'], Decl(subtypingWithObjectMembers2.ts, 37, 21))
     }
 }
 
@@ -116,9 +124,11 @@ module Optional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers2.ts, 52, 5))
 
         1?: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers2.ts, 54, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers2.ts, 0, 0))
 
         2.0?: Base;
+>2.0 : Symbol(A2[2.0], Decl(subtypingWithObjectMembers2.ts, 55, 17))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers2.ts, 0, 0))
     }
 
@@ -127,18 +137,22 @@ module Optional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers2.ts, 52, 5))
 
         1?: Derived; // ok
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembers2.ts, 59, 29))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers2.ts, 2, 1))
 
         2?: string; // error
+>2 : Symbol(B2[2], Decl(subtypingWithObjectMembers2.ts, 60, 20))
     }
 
     interface A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers2.ts, 62, 5))
 
         '1'?: Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers2.ts, 64, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers2.ts, 0, 0))
 
         '2.0'?: Base;
+>'2.0' : Symbol(A3['2.0'], Decl(subtypingWithObjectMembers2.ts, 65, 19))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers2.ts, 0, 0))
     }
 
@@ -147,8 +161,10 @@ module Optional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers2.ts, 62, 5))
 
         '1'?: Derived; // ok
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembers2.ts, 69, 29))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers2.ts, 2, 1))
 
         '2.0'?: string; // error
+>'2.0' : Symbol(B3['2.0'], Decl(subtypingWithObjectMembers2.ts, 70, 22))
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers2.types b/tests/baselines/reference/subtypingWithObjectMembers2.types
index 3a039158511..fb5e7f12c15 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers2.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers2.types
@@ -47,9 +47,11 @@ module NotOptional {
 >A2 : A2
 
         1: Base;
+>1 : Base
 >Base : Base
 
         2.0: Base;
+>2.0 : Base
 >Base : Base
     }
 
@@ -58,18 +60,22 @@ module NotOptional {
 >A2 : A2
 
         1: Derived; // ok
+>1 : Derived
 >Derived : Derived
 
         2: string; // error
+>2 : string
     }
 
     interface A3 {
 >A3 : A3
 
         '1': Base;
+>'1' : Base
 >Base : Base
 
         '2.0': Base;
+>'2.0' : Base
 >Base : Base
     }
 
@@ -78,9 +84,11 @@ module NotOptional {
 >A3 : A3
 
         '1': Derived; // ok
+>'1' : Derived
 >Derived : Derived
 
         '2.0': string; // error
+>'2.0' : string
     }
 }
 
@@ -116,9 +124,11 @@ module Optional {
 >A2 : A2
 
         1?: Base;
+>1 : Base
 >Base : Base
 
         2.0?: Base;
+>2.0 : Base
 >Base : Base
     }
 
@@ -127,18 +137,22 @@ module Optional {
 >A2 : A2
 
         1?: Derived; // ok
+>1 : Derived
 >Derived : Derived
 
         2?: string; // error
+>2 : string
     }
 
     interface A3 {
 >A3 : A3
 
         '1'?: Base;
+>'1' : Base
 >Base : Base
 
         '2.0'?: Base;
+>'2.0' : Base
 >Base : Base
     }
 
@@ -147,8 +161,10 @@ module Optional {
 >A3 : A3
 
         '1'?: Derived; // ok
+>'1' : Derived
 >Derived : Derived
 
         '2.0'?: string; // error
+>'2.0' : string
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.symbols b/tests/baselines/reference/subtypingWithObjectMembers3.symbols
index 143f7fced85..2c03059bcde 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers3.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembers3.symbols
@@ -48,9 +48,11 @@ module NotOptional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers3.ts, 19, 5))
 
         1: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers3.ts, 21, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers3.ts, 0, 0))
 
         2.0: Derived;
+>2.0 : Symbol(A2[2.0], Decl(subtypingWithObjectMembers3.ts, 22, 16))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers3.ts, 2, 1))
     }
 
@@ -59,9 +61,11 @@ module NotOptional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers3.ts, 19, 5))
 
         1: Derived; // ok
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembers3.ts, 26, 29))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers3.ts, 2, 1))
 
         2: Base; // error
+>2 : Symbol(B2[2], Decl(subtypingWithObjectMembers3.ts, 27, 19))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers3.ts, 0, 0))
     }
 
@@ -69,9 +73,11 @@ module NotOptional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers3.ts, 29, 5))
 
         '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers3.ts, 31, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers3.ts, 0, 0))
 
         '2.0': Derived;
+>'2.0' : Symbol(A3['2.0'], Decl(subtypingWithObjectMembers3.ts, 32, 18))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers3.ts, 2, 1))
     }
 
@@ -80,9 +86,11 @@ module NotOptional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers3.ts, 29, 5))
 
         '1': Derived; // ok
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembers3.ts, 36, 29))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers3.ts, 2, 1))
 
         '2.0': Base; // error
+>'2.0' : Symbol(B3['2.0'], Decl(subtypingWithObjectMembers3.ts, 37, 21))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers3.ts, 0, 0))
     }
 }
@@ -119,9 +127,11 @@ module Optional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers3.ts, 51, 5))
 
         1?: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers3.ts, 53, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers3.ts, 0, 0))
 
         2.0?: Derived;
+>2.0 : Symbol(A2[2.0], Decl(subtypingWithObjectMembers3.ts, 54, 17))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers3.ts, 2, 1))
     }
 
@@ -130,9 +140,11 @@ module Optional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers3.ts, 51, 5))
 
         1?: Derived; // ok
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembers3.ts, 58, 29))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers3.ts, 2, 1))
 
         2?: Base; // error
+>2 : Symbol(B2[2], Decl(subtypingWithObjectMembers3.ts, 59, 20))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers3.ts, 0, 0))
     }
 
@@ -140,9 +152,11 @@ module Optional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers3.ts, 61, 5))
 
         '1'?: Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers3.ts, 63, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers3.ts, 0, 0))
 
         '2.0'?: Derived;
+>'2.0' : Symbol(A3['2.0'], Decl(subtypingWithObjectMembers3.ts, 64, 19))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers3.ts, 2, 1))
     }
 
@@ -151,9 +165,11 @@ module Optional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers3.ts, 61, 5))
 
         '1'?: Derived; // ok
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembers3.ts, 68, 29))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers3.ts, 2, 1))
 
         '2.0'?: Base; // error
+>'2.0' : Symbol(B3['2.0'], Decl(subtypingWithObjectMembers3.ts, 69, 22))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers3.ts, 0, 0))
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.types b/tests/baselines/reference/subtypingWithObjectMembers3.types
index 00442122230..397998d642f 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers3.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers3.types
@@ -48,9 +48,11 @@ module NotOptional {
 >A2 : A2
 
         1: Base;
+>1 : Base
 >Base : Base
 
         2.0: Derived;
+>2.0 : Derived
 >Derived : Derived
     }
 
@@ -59,9 +61,11 @@ module NotOptional {
 >A2 : A2
 
         1: Derived; // ok
+>1 : Derived
 >Derived : Derived
 
         2: Base; // error
+>2 : Base
 >Base : Base
     }
 
@@ -69,9 +73,11 @@ module NotOptional {
 >A3 : A3
 
         '1': Base;
+>'1' : Base
 >Base : Base
 
         '2.0': Derived;
+>'2.0' : Derived
 >Derived : Derived
     }
 
@@ -80,9 +86,11 @@ module NotOptional {
 >A3 : A3
 
         '1': Derived; // ok
+>'1' : Derived
 >Derived : Derived
 
         '2.0': Base; // error
+>'2.0' : Base
 >Base : Base
     }
 }
@@ -119,9 +127,11 @@ module Optional {
 >A2 : A2
 
         1?: Base;
+>1 : Base
 >Base : Base
 
         2.0?: Derived;
+>2.0 : Derived
 >Derived : Derived
     }
 
@@ -130,9 +140,11 @@ module Optional {
 >A2 : A2
 
         1?: Derived; // ok
+>1 : Derived
 >Derived : Derived
 
         2?: Base; // error
+>2 : Base
 >Base : Base
     }
 
@@ -140,9 +152,11 @@ module Optional {
 >A3 : A3
 
         '1'?: Base;
+>'1' : Base
 >Base : Base
 
         '2.0'?: Derived;
+>'2.0' : Derived
 >Derived : Derived
     }
 
@@ -151,9 +165,11 @@ module Optional {
 >A3 : A3
 
         '1'?: Derived; // ok
+>'1' : Derived
 >Derived : Derived
 
         '2.0'?: Base; // error
+>'2.0' : Base
 >Base : Base
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.symbols b/tests/baselines/reference/subtypingWithObjectMembers4.symbols
index 94b38bc4c9b..ce307197fb7 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.symbols
@@ -37,6 +37,7 @@ class A2 {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers4.ts, 16, 1))
 
     1: Base; 
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers4.ts, 18, 10))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers4.ts, 0, 0))
 }
 
@@ -45,6 +46,7 @@ class B2 extends A2 {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers4.ts, 16, 1))
 
     1.1: Derived; // ok, inherits 1
+>1.1 : Symbol(B2[1.1], Decl(subtypingWithObjectMembers4.ts, 22, 21))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers4.ts, 4, 1))
 }
 
@@ -52,6 +54,7 @@ class A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers4.ts, 24, 1))
 
     '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers4.ts, 26, 10))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers4.ts, 0, 0))
 }
 
@@ -60,5 +63,6 @@ class B3 extends A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers4.ts, 24, 1))
 
     '1.1': Derived; // ok, inherits '1'
+>'1.1' : Symbol(B3['1.1'], Decl(subtypingWithObjectMembers4.ts, 30, 21))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers4.ts, 4, 1))
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.types b/tests/baselines/reference/subtypingWithObjectMembers4.types
index 6e6475b2578..5bc53e47809 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.types
@@ -37,6 +37,7 @@ class A2 {
 >A2 : A2
 
     1: Base; 
+>1 : Base
 >Base : Base
 }
 
@@ -45,6 +46,7 @@ class B2 extends A2 {
 >A2 : A2
 
     1.1: Derived; // ok, inherits 1
+>1.1 : Derived
 >Derived : Derived
 }
 
@@ -52,6 +54,7 @@ class A3 {
 >A3 : A3
 
     '1': Base;
+>'1' : Base
 >Base : Base
 }
 
@@ -60,5 +63,6 @@ class B3 extends A3 {
 >A3 : A3
 
     '1.1': Derived; // ok, inherits '1'
+>'1.1' : Derived
 >Derived : Derived
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.symbols b/tests/baselines/reference/subtypingWithObjectMembers5.symbols
index d22c356324c..f087e1af3db 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers5.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembers5.symbols
@@ -40,6 +40,7 @@ module NotOptional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers5.ts, 17, 5))
 
         1: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers5.ts, 19, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers5.ts, 0, 0))
     }
 
@@ -48,6 +49,7 @@ module NotOptional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers5.ts, 17, 5))
 
         2: Derived; // error
+>2 : Symbol(B2[2], Decl(subtypingWithObjectMembers5.ts, 23, 28))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers5.ts, 2, 1))
     }
 
@@ -55,6 +57,7 @@ module NotOptional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers5.ts, 25, 5))
 
         '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers5.ts, 27, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers5.ts, 0, 0))
     }
 
@@ -63,6 +66,7 @@ module NotOptional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers5.ts, 25, 5))
 
         '1.0': Derived; // error
+>'1.0' : Symbol(B3['1.0'], Decl(subtypingWithObjectMembers5.ts, 31, 28))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers5.ts, 2, 1))
     }
 }
@@ -92,6 +96,7 @@ module Optional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers5.ts, 44, 5))
 
         1?: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers5.ts, 46, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers5.ts, 0, 0))
     }
 
@@ -100,6 +105,7 @@ module Optional {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembers5.ts, 44, 5))
 
         2: Derived; // weak type error
+>2 : Symbol(B2[2], Decl(subtypingWithObjectMembers5.ts, 50, 28))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers5.ts, 2, 1))
     }
 
@@ -107,6 +113,7 @@ module Optional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers5.ts, 52, 5))
 
         '1'?: Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers5.ts, 54, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers5.ts, 0, 0))
     }
 
@@ -115,6 +122,7 @@ module Optional {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembers5.ts, 52, 5))
 
         '1.0': Derived; // weak type error
+>'1.0' : Symbol(B3['1.0'], Decl(subtypingWithObjectMembers5.ts, 58, 28))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers5.ts, 2, 1))
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.types b/tests/baselines/reference/subtypingWithObjectMembers5.types
index d788a47c8a2..7683d5e63a1 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers5.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers5.types
@@ -40,6 +40,7 @@ module NotOptional {
 >A2 : A2
 
         1: Base;
+>1 : Base
 >Base : Base
     }
 
@@ -48,6 +49,7 @@ module NotOptional {
 >A2 : A2
 
         2: Derived; // error
+>2 : Derived
 >Derived : Derived
     }
 
@@ -55,6 +57,7 @@ module NotOptional {
 >A3 : A3
 
         '1': Base;
+>'1' : Base
 >Base : Base
     }
 
@@ -63,6 +66,7 @@ module NotOptional {
 >A3 : A3
 
         '1.0': Derived; // error
+>'1.0' : Derived
 >Derived : Derived
     }
 }
@@ -92,6 +96,7 @@ module Optional {
 >A2 : A2
 
         1?: Base;
+>1 : Base
 >Base : Base
     }
 
@@ -100,6 +105,7 @@ module Optional {
 >A2 : A2
 
         2: Derived; // weak type error
+>2 : Derived
 >Derived : Derived
     }
 
@@ -107,6 +113,7 @@ module Optional {
 >A3 : A3
 
         '1'?: Base;
+>'1' : Base
 >Base : Base
     }
 
@@ -115,6 +122,7 @@ module Optional {
 >A3 : A3
 
         '1.0': Derived; // weak type error
+>'1.0' : Derived
 >Derived : Derived
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.symbols b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.symbols
index dee61829506..8269c6f41a1 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.symbols
@@ -37,6 +37,7 @@ class A2 {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembersAccessibility.ts, 16, 1))
 
     public 1: Base; 
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembersAccessibility.ts, 18, 10))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersAccessibility.ts, 0, 0))
 }
 
@@ -45,6 +46,7 @@ class B2 extends A2 {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembersAccessibility.ts, 16, 1))
 
     private 1: Derived; // error
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembersAccessibility.ts, 22, 21))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersAccessibility.ts, 4, 1))
 }
 
@@ -52,6 +54,7 @@ class A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembersAccessibility.ts, 24, 1))
 
     public '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembersAccessibility.ts, 26, 10))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersAccessibility.ts, 0, 0))
 }
 
@@ -60,5 +63,6 @@ class B3 extends A3 {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembersAccessibility.ts, 24, 1))
 
     private '1': Derived; // error
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembersAccessibility.ts, 30, 21))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersAccessibility.ts, 4, 1))
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.types b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.types
index cd0f85d9be9..596eda0c69c 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.types
@@ -37,6 +37,7 @@ class A2 {
 >A2 : A2
 
     public 1: Base; 
+>1 : Base
 >Base : Base
 }
 
@@ -45,6 +46,7 @@ class B2 extends A2 {
 >A2 : A2
 
     private 1: Derived; // error
+>1 : Derived
 >Derived : Derived
 }
 
@@ -52,6 +54,7 @@ class A3 {
 >A3 : A3
 
     public '1': Base;
+>'1' : Base
 >Base : Base
 }
 
@@ -60,5 +63,6 @@ class B3 extends A3 {
 >A3 : A3
 
     private '1': Derived; // error
+>'1' : Derived
 >Derived : Derived
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.symbols b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.symbols
index 5f2317254ec..7a48818ba14 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.symbols
@@ -40,6 +40,7 @@ module ExplicitPublic {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembersAccessibility2.ts, 17, 5))
 
         private 1: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembersAccessibility2.ts, 19, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersAccessibility2.ts, 0, 0))
     }
 
@@ -48,6 +49,7 @@ module ExplicitPublic {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembersAccessibility2.ts, 17, 5))
 
         public 1: Derived; // error
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembersAccessibility2.ts, 23, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersAccessibility2.ts, 4, 1))
     }
 
@@ -55,6 +57,7 @@ module ExplicitPublic {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembersAccessibility2.ts, 25, 5))
 
         private '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembersAccessibility2.ts, 27, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersAccessibility2.ts, 0, 0))
     }
 
@@ -63,6 +66,7 @@ module ExplicitPublic {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembersAccessibility2.ts, 25, 5))
 
         public '1': Derived; // error
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembersAccessibility2.ts, 31, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersAccessibility2.ts, 4, 1))
     }
 }
@@ -91,6 +95,7 @@ module ImplicitPublic {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembersAccessibility2.ts, 43, 5))
 
         private 1: Base;
+>1 : Symbol(A2[1], Decl(subtypingWithObjectMembersAccessibility2.ts, 45, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersAccessibility2.ts, 0, 0))
     }
 
@@ -99,6 +104,7 @@ module ImplicitPublic {
 >A2 : Symbol(A2, Decl(subtypingWithObjectMembersAccessibility2.ts, 43, 5))
 
         1: Derived; // error
+>1 : Symbol(B2[1], Decl(subtypingWithObjectMembersAccessibility2.ts, 49, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersAccessibility2.ts, 4, 1))
     }
 
@@ -106,6 +112,7 @@ module ImplicitPublic {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembersAccessibility2.ts, 51, 5))
 
         private '1': Base;
+>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembersAccessibility2.ts, 53, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersAccessibility2.ts, 0, 0))
     }
 
@@ -114,6 +121,7 @@ module ImplicitPublic {
 >A3 : Symbol(A3, Decl(subtypingWithObjectMembersAccessibility2.ts, 51, 5))
 
         '1': Derived; // error
+>'1' : Symbol(B3['1'], Decl(subtypingWithObjectMembersAccessibility2.ts, 57, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersAccessibility2.ts, 4, 1))
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types
index 5d35834c68e..01746b644a2 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types
@@ -40,6 +40,7 @@ module ExplicitPublic {
 >A2 : A2
 
         private 1: Base;
+>1 : Base
 >Base : Base
     }
 
@@ -48,6 +49,7 @@ module ExplicitPublic {
 >A2 : A2
 
         public 1: Derived; // error
+>1 : Derived
 >Derived : Derived
     }
 
@@ -55,6 +57,7 @@ module ExplicitPublic {
 >A3 : A3
 
         private '1': Base;
+>'1' : Base
 >Base : Base
     }
 
@@ -63,6 +66,7 @@ module ExplicitPublic {
 >A3 : A3
 
         public '1': Derived; // error
+>'1' : Derived
 >Derived : Derived
     }
 }
@@ -91,6 +95,7 @@ module ImplicitPublic {
 >A2 : A2
 
         private 1: Base;
+>1 : Base
 >Base : Base
     }
 
@@ -99,6 +104,7 @@ module ImplicitPublic {
 >A2 : A2
 
         1: Derived; // error
+>1 : Derived
 >Derived : Derived
     }
 
@@ -106,6 +112,7 @@ module ImplicitPublic {
 >A3 : A3
 
         private '1': Base;
+>'1' : Base
 >Base : Base
     }
 
@@ -114,6 +121,7 @@ module ImplicitPublic {
 >A3 : A3
 
         '1': Derived; // error
+>'1' : Derived
 >Derived : Derived
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols
index 5b144baa428..f19aeda2c8f 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols
@@ -44,6 +44,7 @@ interface T2 {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality.ts, 20, 1))
 
     1?: Base; 
+>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality.ts, 22, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0))
 }
 
@@ -52,6 +53,7 @@ interface S2 extends T2 {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality.ts, 20, 1))
 
     1: Derived;
+>1 : Symbol(S2[1], Decl(subtypingWithObjectMembersOptionality.ts, 26, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality.ts, 2, 31))
 }
 
@@ -59,6 +61,7 @@ interface T3 {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality.ts, 28, 1))
 
     '1'?: Base;
+>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality.ts, 30, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0))
 }
 
@@ -67,6 +70,7 @@ interface S3 extends T3 {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality.ts, 28, 1))
 
     '1.': Derived;
+>'1.' : Symbol(S3['1.'], Decl(subtypingWithObjectMembersOptionality.ts, 34, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality.ts, 2, 31))
 }
 
@@ -110,6 +114,7 @@ module TwoLevels {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality.ts, 50, 5))
 
         1?: Base;
+>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality.ts, 52, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0))
     }
 
@@ -118,6 +123,7 @@ module TwoLevels {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality.ts, 50, 5))
 
         1: Derived2;
+>1 : Symbol(S2[1], Decl(subtypingWithObjectMembersOptionality.ts, 56, 29))
 >Derived2 : Symbol(Derived2, Decl(subtypingWithObjectMembersOptionality.ts, 3, 47))
     }
 
@@ -125,6 +131,7 @@ module TwoLevels {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality.ts, 58, 5))
 
         '1'?: Base;
+>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality.ts, 60, 18))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0))
     }
 
@@ -133,6 +140,7 @@ module TwoLevels {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality.ts, 58, 5))
 
         '1.': Derived2;
+>'1.' : Symbol(S3['1.'], Decl(subtypingWithObjectMembersOptionality.ts, 64, 29))
 >Derived2 : Symbol(Derived2, Decl(subtypingWithObjectMembersOptionality.ts, 3, 47))
     }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
index e0198e31d28..d81404b2449 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
@@ -44,6 +44,7 @@ interface T2 {
 >T2 : T2
 
     1?: Base; 
+>1 : Base
 >Base : Base
 }
 
@@ -52,6 +53,7 @@ interface S2 extends T2 {
 >T2 : T2
 
     1: Derived;
+>1 : Derived
 >Derived : Derived
 }
 
@@ -59,6 +61,7 @@ interface T3 {
 >T3 : T3
 
     '1'?: Base;
+>'1' : Base
 >Base : Base
 }
 
@@ -67,6 +70,7 @@ interface S3 extends T3 {
 >T3 : T3
 
     '1.': Derived;
+>'1.' : Derived
 >Derived : Derived
 }
 
@@ -115,6 +119,7 @@ module TwoLevels {
 >T2 : T2
 
         1?: Base;
+>1 : Base
 >Base : Base
     }
 
@@ -123,6 +128,7 @@ module TwoLevels {
 >T2 : T2
 
         1: Derived2;
+>1 : Derived2
 >Derived2 : Derived2
     }
 
@@ -130,6 +136,7 @@ module TwoLevels {
 >T3 : T3
 
         '1'?: Base;
+>'1' : Base
 >Base : Base
     }
 
@@ -138,6 +145,7 @@ module TwoLevels {
 >T3 : T3
 
         '1.': Derived2;
+>'1.' : Derived2
 >Derived2 : Derived2
     }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.symbols
index d3823411d6e..7f3994322c9 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.symbols
@@ -31,6 +31,7 @@ interface T2 {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality2.ts, 11, 1))
 
     1: Base;
+>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality2.ts, 13, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality2.ts, 0, 0))
 }
 
@@ -39,6 +40,7 @@ interface S2 extends T2 {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality2.ts, 11, 1))
 
     1?: Derived; // error
+>1 : Symbol(S2[1], Decl(subtypingWithObjectMembersOptionality2.ts, 17, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality2.ts, 2, 31))
 }
 
@@ -46,6 +48,7 @@ interface T3 {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality2.ts, 19, 1))
 
     '1': Base;
+>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality2.ts, 21, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality2.ts, 0, 0))
 }
 
@@ -54,6 +57,7 @@ interface S3 extends T3 {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality2.ts, 19, 1))
 
     '1'?: Derived; // error
+>'1' : Symbol(S3['1'], Decl(subtypingWithObjectMembersOptionality2.ts, 25, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality2.ts, 2, 31))
 }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
index be2dae2a7df..a46a03496d3 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
@@ -31,6 +31,7 @@ interface T2 {
 >T2 : T2
 
     1: Base;
+>1 : Base
 >Base : Base
 }
 
@@ -39,6 +40,7 @@ interface S2 extends T2 {
 >T2 : T2
 
     1?: Derived; // error
+>1 : Derived
 >Derived : Derived
 }
 
@@ -46,6 +48,7 @@ interface T3 {
 >T3 : T3
 
     '1': Base;
+>'1' : Base
 >Base : Base
 }
 
@@ -54,6 +57,7 @@ interface S3 extends T3 {
 >T3 : T3
 
     '1'?: Derived; // error
+>'1' : Derived
 >Derived : Derived
 }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols
index 2a3e806f540..2559cbb791c 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols
@@ -31,6 +31,7 @@ interface T2 {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality3.ts, 11, 1))
 
     1?: Base;
+>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality3.ts, 13, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality3.ts, 0, 0))
 }
 
@@ -39,6 +40,7 @@ interface S2 extends T2 {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality3.ts, 11, 1))
 
     2: Derived; // ok
+>2 : Symbol(S2[2], Decl(subtypingWithObjectMembersOptionality3.ts, 17, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality3.ts, 2, 31))
 }
 
@@ -46,6 +48,7 @@ interface T3 {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality3.ts, 19, 1))
 
     '1'?: Base;
+>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality3.ts, 21, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality3.ts, 0, 0))
 }
 
@@ -54,6 +57,7 @@ interface S3 extends T3 {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality3.ts, 19, 1))
 
     '1.0': Derived; // ok
+>'1.0' : Symbol(S3['1.0'], Decl(subtypingWithObjectMembersOptionality3.ts, 25, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality3.ts, 2, 31))
 }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types
index 9a61726dddc..02495be61ee 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types
@@ -31,6 +31,7 @@ interface T2 {
 >T2 : T2
 
     1?: Base;
+>1 : Base
 >Base : Base
 }
 
@@ -39,6 +40,7 @@ interface S2 extends T2 {
 >T2 : T2
 
     2: Derived; // ok
+>2 : Derived
 >Derived : Derived
 }
 
@@ -46,6 +48,7 @@ interface T3 {
 >T3 : T3
 
     '1'?: Base;
+>'1' : Base
 >Base : Base
 }
 
@@ -54,6 +57,7 @@ interface S3 extends T3 {
 >T3 : T3
 
     '1.0': Derived; // ok
+>'1.0' : Derived
 >Derived : Derived
 }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols
index b1124d49083..cd80cd165f7 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols
@@ -31,6 +31,7 @@ interface T2 {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality4.ts, 11, 1))
 
     1: Base; 
+>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality4.ts, 13, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality4.ts, 0, 0))
 }
 
@@ -39,6 +40,7 @@ interface S2 extends T2 {
 >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality4.ts, 11, 1))
 
     2?: Derived; // ok
+>2 : Symbol(S2[2], Decl(subtypingWithObjectMembersOptionality4.ts, 17, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality4.ts, 2, 31))
 }
 
@@ -46,6 +48,7 @@ interface T3 {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality4.ts, 19, 1))
 
     '1': Base;
+>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality4.ts, 21, 14))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality4.ts, 0, 0))
 }
 
@@ -54,6 +57,7 @@ interface S3 extends T3 {
 >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality4.ts, 19, 1))
 
     '1.0'?: Derived; // ok
+>'1.0' : Symbol(S3['1.0'], Decl(subtypingWithObjectMembersOptionality4.ts, 25, 25))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality4.ts, 2, 31))
 }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types
index 056173dd97b..0398935117b 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types
@@ -31,6 +31,7 @@ interface T2 {
 >T2 : T2
 
     1: Base; 
+>1 : Base
 >Base : Base
 }
 
@@ -39,6 +40,7 @@ interface S2 extends T2 {
 >T2 : T2
 
     2?: Derived; // ok
+>2 : Derived
 >Derived : Derived
 }
 
@@ -46,6 +48,7 @@ interface T3 {
 >T3 : T3
 
     '1': Base;
+>'1' : Base
 >Base : Base
 }
 
@@ -54,6 +57,7 @@ interface S3 extends T3 {
 >T3 : T3
 
     '1.0'?: Derived; // ok
+>'1.0' : Derived
 >Derived : Derived
 }
 
diff --git a/tests/baselines/reference/symbolProperty17.symbols b/tests/baselines/reference/symbolProperty17.symbols
index 688a391043b..120ad852c75 100644
--- a/tests/baselines/reference/symbolProperty17.symbols
+++ b/tests/baselines/reference/symbolProperty17.symbols
@@ -11,6 +11,7 @@ interface I {
 >s : Symbol(s, Decl(symbolProperty17.ts, 2, 5))
 
     "__@iterator": string;
+>"__@iterator" : Symbol(I["__@iterator"], Decl(symbolProperty17.ts, 2, 24))
 }
 
 var i: I;
diff --git a/tests/baselines/reference/symbolProperty17.types b/tests/baselines/reference/symbolProperty17.types
index f804943c212..12305565b25 100644
--- a/tests/baselines/reference/symbolProperty17.types
+++ b/tests/baselines/reference/symbolProperty17.types
@@ -11,6 +11,7 @@ interface I {
 >s : symbol
 
     "__@iterator": string;
+>"__@iterator" : string
 }
 
 var i: I;
diff --git a/tests/baselines/reference/systemExportAssignment3.symbols b/tests/baselines/reference/systemExportAssignment3.symbols
index 099892c706e..1f6d9609f16 100644
--- a/tests/baselines/reference/systemExportAssignment3.symbols
+++ b/tests/baselines/reference/systemExportAssignment3.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "a" {
+>"a" : Symbol("a", Decl(modules.d.ts, 0, 0))
+
     var a: number;
 >a : Symbol(a, Decl(modules.d.ts, 1, 7))
 
diff --git a/tests/baselines/reference/systemExportAssignment3.types b/tests/baselines/reference/systemExportAssignment3.types
index e42fadc2944..7265f066c8d 100644
--- a/tests/baselines/reference/systemExportAssignment3.types
+++ b/tests/baselines/reference/systemExportAssignment3.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "a" {
+>"a" : typeof "a"
+
     var a: number;
 >a : number
 
diff --git a/tests/baselines/reference/topLevelAmbientModule.symbols b/tests/baselines/reference/topLevelAmbientModule.symbols
index 20ff7eb7d39..3c8a9a244b2 100644
--- a/tests/baselines/reference/topLevelAmbientModule.symbols
+++ b/tests/baselines/reference/topLevelAmbientModule.symbols
@@ -11,6 +11,8 @@ var z = foo.x + 10;
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 declare module "foo" {
+>"foo" : Symbol("foo", Decl(foo_0.ts, 0, 0))
+
 	export var x: number;
 >x : Symbol(x, Decl(foo_0.ts, 1, 11))
 }
diff --git a/tests/baselines/reference/topLevelAmbientModule.types b/tests/baselines/reference/topLevelAmbientModule.types
index aef1bb5486f..7edf8d7b987 100644
--- a/tests/baselines/reference/topLevelAmbientModule.types
+++ b/tests/baselines/reference/topLevelAmbientModule.types
@@ -13,6 +13,8 @@ var z = foo.x + 10;
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 declare module "foo" {
+>"foo" : typeof "foo"
+
 	export var x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.symbols b/tests/baselines/reference/topLevelModuleDeclarationAndFile.symbols
index 734b991c470..69ee25662a8 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.symbols
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.symbols
@@ -15,6 +15,8 @@ var z2 = foo.y() + 10; // Should resolve
 
 === tests/cases/conformance/externalModules/foo_1.ts ===
 declare module "vs/foo_0" {
+>"vs/foo_0" : Symbol("vs/foo_0", Decl(foo_1.ts, 0, 0))
+
 	export var y: () => number;
 >y : Symbol(y, Decl(foo_1.ts, 1, 11))
 }
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.types b/tests/baselines/reference/topLevelModuleDeclarationAndFile.types
index dba2d1d74d5..a80254e7a62 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.types
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.types
@@ -22,6 +22,8 @@ var z2 = foo.y() + 10; // Should resolve
 
 === tests/cases/conformance/externalModules/foo_1.ts ===
 declare module "vs/foo_0" {
+>"vs/foo_0" : typeof "vs/foo_0"
+
 	export var y: () => number;
 >y : () => number
 }
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols b/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols
index d83f91f29d0..b983a5605bf 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols
@@ -33,6 +33,8 @@ async function a(): Bluebird<void> {
 
 === tests/cases/compiler/bluebird.d.ts ===
 declare module "bluebird" {
+>"bluebird" : Symbol("bluebird", Decl(bluebird.d.ts, 0, 0))
+
     type Bluebird<T> = Promise<T>;
 >Bluebird : Symbol(Bluebird, Decl(bluebird.d.ts, 0, 27), Decl(bluebird.d.ts, 2, 9))
 >T : Symbol(T, Decl(bluebird.d.ts, 1, 18))
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.types b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
index 3e4ef3f0852..84cf51794f2 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.types
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
@@ -38,6 +38,8 @@ async function a(): Bluebird<void> {
 
 === tests/cases/compiler/bluebird.d.ts ===
 declare module "bluebird" {
+>"bluebird" : typeof "bluebird"
+
     type Bluebird<T> = Promise<T>;
 >Bluebird : Promise<T>
 >T : T
diff --git a/tests/baselines/reference/tsxAttributeInvalidNames.symbols b/tests/baselines/reference/tsxAttributeInvalidNames.symbols
index 6a21451e5ea..d9333d200ed 100644
--- a/tests/baselines/reference/tsxAttributeInvalidNames.symbols
+++ b/tests/baselines/reference/tsxAttributeInvalidNames.symbols
@@ -10,15 +10,18 @@ declare module JSX {
 
 		test1: { "data-foo"?: string };
 >test1 : Symbol(IntrinsicElements.test1, Decl(file.tsx, 2, 30))
+>"data-foo" : Symbol("data-foo", Decl(file.tsx, 3, 10))
 
 		test2: { "data-foo"?: string };
 >test2 : Symbol(IntrinsicElements.test2, Decl(file.tsx, 3, 33))
+>"data-foo" : Symbol("data-foo", Decl(file.tsx, 4, 10))
 	}
 }
 
 // Invalid names
 <test1 32data={32} />;
 >test1 : Symbol(JSX.IntrinsicElements.test1, Decl(file.tsx, 2, 30))
+>32 : Symbol(32, Decl(file.tsx, 9, 15))
 
 <test2 -data={32} />;
 >test2 : Symbol(JSX.IntrinsicElements.test2, Decl(file.tsx, 3, 33))
diff --git a/tests/baselines/reference/tsxAttributeInvalidNames.types b/tests/baselines/reference/tsxAttributeInvalidNames.types
index 540d7a1367b..f957b995fba 100644
--- a/tests/baselines/reference/tsxAttributeInvalidNames.types
+++ b/tests/baselines/reference/tsxAttributeInvalidNames.types
@@ -10,9 +10,11 @@ declare module JSX {
 
 		test1: { "data-foo"?: string };
 >test1 : { "data-foo"?: string; }
+>"data-foo" : string
 
 		test2: { "data-foo"?: string };
 >test2 : { "data-foo"?: string; }
+>"data-foo" : string
 	}
 }
 
@@ -26,6 +28,7 @@ declare module JSX {
 >{32} /> : boolean
 >{32} / : number
 >{32} : { 32: any; }
+>32 : any
 > : any
 > : any
 > : any
diff --git a/tests/baselines/reference/tsxAttributeResolution7.symbols b/tests/baselines/reference/tsxAttributeResolution7.symbols
index 81fc230b991..1ad76b382c9 100644
--- a/tests/baselines/reference/tsxAttributeResolution7.symbols
+++ b/tests/baselines/reference/tsxAttributeResolution7.symbols
@@ -10,6 +10,7 @@ declare module JSX {
 
 		test1: { "data-foo"?: string };
 >test1 : Symbol(IntrinsicElements.test1, Decl(file.tsx, 2, 30))
+>"data-foo" : Symbol("data-foo", Decl(file.tsx, 3, 10))
 	}
 }
 
diff --git a/tests/baselines/reference/tsxAttributeResolution7.types b/tests/baselines/reference/tsxAttributeResolution7.types
index 257d423a41e..e6429c75136 100644
--- a/tests/baselines/reference/tsxAttributeResolution7.types
+++ b/tests/baselines/reference/tsxAttributeResolution7.types
@@ -10,6 +10,7 @@ declare module JSX {
 
 		test1: { "data-foo"?: string };
 >test1 : { "data-foo"?: string; }
+>"data-foo" : string
 	}
 }
 
diff --git a/tests/baselines/reference/tsxDynamicTagName5.symbols b/tests/baselines/reference/tsxDynamicTagName5.symbols
index a37ac84b446..f5782923945 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.symbols
+++ b/tests/baselines/reference/tsxDynamicTagName5.symbols
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : Symbol('react', Decl(react.d.ts, 0, 0))
+
 	class Component<T, U> { }
 >Component : Symbol(Component, Decl(react.d.ts, 0, 24))
 >T : Symbol(T, Decl(react.d.ts, 1, 17))
diff --git a/tests/baselines/reference/tsxDynamicTagName5.types b/tests/baselines/reference/tsxDynamicTagName5.types
index b746be2e88e..962b7bfebd6 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.types
+++ b/tests/baselines/reference/tsxDynamicTagName5.types
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : typeof 'react'
+
 	class Component<T, U> { }
 >Component : Component<T, U>
 >T : T
diff --git a/tests/baselines/reference/tsxDynamicTagName7.symbols b/tests/baselines/reference/tsxDynamicTagName7.symbols
index 4180f69cc5a..405887092d7 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.symbols
+++ b/tests/baselines/reference/tsxDynamicTagName7.symbols
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : Symbol('react', Decl(react.d.ts, 0, 0))
+
 	class Component<T, U> { }
 >Component : Symbol(Component, Decl(react.d.ts, 0, 24))
 >T : Symbol(T, Decl(react.d.ts, 1, 17))
diff --git a/tests/baselines/reference/tsxDynamicTagName7.types b/tests/baselines/reference/tsxDynamicTagName7.types
index c9614e885c2..c6e44fe45c3 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.types
+++ b/tests/baselines/reference/tsxDynamicTagName7.types
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : typeof 'react'
+
 	class Component<T, U> { }
 >Component : Component<T, U>
 >T : T
diff --git a/tests/baselines/reference/tsxDynamicTagName8.symbols b/tests/baselines/reference/tsxDynamicTagName8.symbols
index 996391941a9..937c4a2de6f 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.symbols
+++ b/tests/baselines/reference/tsxDynamicTagName8.symbols
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : Symbol('react', Decl(react.d.ts, 0, 0))
+
 	class Component<T, U> { }
 >Component : Symbol(Component, Decl(react.d.ts, 0, 24))
 >T : Symbol(T, Decl(react.d.ts, 1, 17))
diff --git a/tests/baselines/reference/tsxDynamicTagName8.types b/tests/baselines/reference/tsxDynamicTagName8.types
index bc7d71e9a66..ca00d88fe1d 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.types
+++ b/tests/baselines/reference/tsxDynamicTagName8.types
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : typeof 'react'
+
 	class Component<T, U> { }
 >Component : Component<T, U>
 >T : T
diff --git a/tests/baselines/reference/tsxDynamicTagName9.symbols b/tests/baselines/reference/tsxDynamicTagName9.symbols
index bfb97510885..2a8dfb2de8d 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.symbols
+++ b/tests/baselines/reference/tsxDynamicTagName9.symbols
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : Symbol('react', Decl(react.d.ts, 0, 0))
+
 	class Component<T, U> { }
 >Component : Symbol(Component, Decl(react.d.ts, 0, 24))
 >T : Symbol(T, Decl(react.d.ts, 1, 17))
diff --git a/tests/baselines/reference/tsxDynamicTagName9.types b/tests/baselines/reference/tsxDynamicTagName9.types
index 91290dcc3d8..8118589e7dc 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.types
+++ b/tests/baselines/reference/tsxDynamicTagName9.types
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : typeof 'react'
+
 	class Component<T, U> { }
 >Component : Component<T, U>
 >T : T
diff --git a/tests/baselines/reference/tsxElementResolution.symbols b/tests/baselines/reference/tsxElementResolution.symbols
index f69d17a6d03..9870101adae 100644
--- a/tests/baselines/reference/tsxElementResolution.symbols
+++ b/tests/baselines/reference/tsxElementResolution.symbols
@@ -10,7 +10,10 @@ declare namespace JSX {
 >x : Symbol(x, Decl(tsxElementResolution.tsx, 2, 15))
 
 		'string_named';
+>'string_named' : Symbol(IntrinsicElements['string_named'], Decl(tsxElementResolution.tsx, 2, 28))
+
 		'var';
+>'var' : Symbol(IntrinsicElements['var'], Decl(tsxElementResolution.tsx, 3, 17))
 	}
 }
 
diff --git a/tests/baselines/reference/tsxElementResolution.types b/tests/baselines/reference/tsxElementResolution.types
index df429d1c54d..6e9be8aa7b5 100644
--- a/tests/baselines/reference/tsxElementResolution.types
+++ b/tests/baselines/reference/tsxElementResolution.types
@@ -10,7 +10,10 @@ declare namespace JSX {
 >x : string
 
 		'string_named';
+>'string_named' : any
+
 		'var';
+>'var' : any
 	}
 }
 
diff --git a/tests/baselines/reference/tsxElementResolution17.symbols b/tests/baselines/reference/tsxElementResolution17.symbols
index 59deba2c300..2a591207f04 100644
--- a/tests/baselines/reference/tsxElementResolution17.symbols
+++ b/tests/baselines/reference/tsxElementResolution17.symbols
@@ -24,6 +24,8 @@ declare module JSX {
 }
 
 declare module 'elements1' {
+>'elements1' : Symbol('elements1', Decl(file.tsx, 3, 1))
+
 	class MyElement {
 >MyElement : Symbol(MyElement, Decl(file.tsx, 5, 28))
 
@@ -31,6 +33,8 @@ declare module 'elements1' {
 }
 
 declare module 'elements2' {
+>'elements2' : Symbol('elements2', Decl(file.tsx, 9, 1))
+
 	class MyElement {
 >MyElement : Symbol(MyElement, Decl(file.tsx, 11, 28))
 
diff --git a/tests/baselines/reference/tsxElementResolution17.types b/tests/baselines/reference/tsxElementResolution17.types
index ab730d7245d..8ab3290eceb 100644
--- a/tests/baselines/reference/tsxElementResolution17.types
+++ b/tests/baselines/reference/tsxElementResolution17.types
@@ -25,6 +25,8 @@ declare module JSX {
 }
 
 declare module 'elements1' {
+>'elements1' : typeof 'elements1'
+
 	class MyElement {
 >MyElement : MyElement
 
@@ -32,6 +34,8 @@ declare module 'elements1' {
 }
 
 declare module 'elements2' {
+>'elements2' : typeof 'elements2'
+
 	class MyElement {
 >MyElement : MyElement
 
diff --git a/tests/baselines/reference/tsxElementResolution19.symbols b/tests/baselines/reference/tsxElementResolution19.symbols
index 8313a8aa4be..0afafc4e868 100644
--- a/tests/baselines/reference/tsxElementResolution19.symbols
+++ b/tests/baselines/reference/tsxElementResolution19.symbols
@@ -1,9 +1,10 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module "react" {
-No type information for this code.
-No type information for this code.}
-No type information for this code.
-No type information for this code.=== tests/cases/conformance/jsx/file1.tsx ===
+>"react" : Symbol("react", Decl(react.d.ts, 0, 0))
+
+}
+
+=== tests/cases/conformance/jsx/file1.tsx ===
 declare module JSX {
 >JSX : Symbol(JSX, Decl(file1.tsx, 0, 0))
 
diff --git a/tests/baselines/reference/tsxElementResolution19.types b/tests/baselines/reference/tsxElementResolution19.types
index 6539bfd5908..03157790e7b 100644
--- a/tests/baselines/reference/tsxElementResolution19.types
+++ b/tests/baselines/reference/tsxElementResolution19.types
@@ -1,9 +1,10 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module "react" {
-No type information for this code.
-No type information for this code.}
-No type information for this code.
-No type information for this code.=== tests/cases/conformance/jsx/file1.tsx ===
+>"react" : typeof "react"
+
+}
+
+=== tests/cases/conformance/jsx/file1.tsx ===
 declare module JSX {
 >JSX : any
 
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.symbols b/tests/baselines/reference/tsxExternalModuleEmit1.symbols
index d9a988aa168..39c85c371ab 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.symbols
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.symbols
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : Symbol('react', Decl(react.d.ts, 0, 0))
+
 	class Component<T, U> { }
 >Component : Symbol(Component, Decl(react.d.ts, 0, 24))
 >T : Symbol(T, Decl(react.d.ts, 1, 17))
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.types b/tests/baselines/reference/tsxExternalModuleEmit1.types
index 7045cd739c1..fa22a5ec49f 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.types
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.types
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : typeof 'react'
+
 	class Component<T, U> { }
 >Component : Component<T, U>
 >T : T
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.symbols b/tests/baselines/reference/tsxExternalModuleEmit2.symbols
index 20ae94fb668..5d3a586ee42 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.symbols
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.symbols
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/modules.d.ts ===
 declare module 'mod' {
+>'mod' : Symbol('mod', Decl(modules.d.ts, 0, 0))
+
   var y: any;
 >y : Symbol(y, Decl(modules.d.ts, 1, 5))
 
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.types b/tests/baselines/reference/tsxExternalModuleEmit2.types
index bb858cdf0c1..5d397b517af 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.types
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.types
@@ -1,5 +1,7 @@
 === tests/cases/conformance/jsx/modules.d.ts ===
 declare module 'mod' {
+>'mod' : typeof 'mod'
+
   var y: any;
 >y : any
 
diff --git a/tests/baselines/reference/tsxPreserveEmit1.symbols b/tests/baselines/reference/tsxPreserveEmit1.symbols
index d477dcc3d3c..98ffd3282d5 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.symbols
+++ b/tests/baselines/reference/tsxPreserveEmit1.symbols
@@ -33,6 +33,8 @@ module M {
 
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : Symbol('react', Decl(react.d.ts, 0, 0))
+
 	var x: any;
 >x : Symbol(x, Decl(react.d.ts, 1, 4))
 
@@ -50,6 +52,8 @@ declare module ReactRouter {
 >Thing : Symbol(Thing, Decl(react.d.ts, 6, 16))
 }
 declare module 'react-router' {
+>'react-router' : Symbol('react-router', Decl(react.d.ts, 8, 1))
+
 	export = ReactRouter;
 >ReactRouter : Symbol(ReactRouter, Decl(react.d.ts, 3, 1))
 }
diff --git a/tests/baselines/reference/tsxPreserveEmit1.types b/tests/baselines/reference/tsxPreserveEmit1.types
index 099a184b322..a5a7a0efaca 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.types
+++ b/tests/baselines/reference/tsxPreserveEmit1.types
@@ -35,6 +35,8 @@ module M {
 
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module 'react' {
+>'react' : typeof 'react'
+
 	var x: any;
 >x : any
 
@@ -52,6 +54,8 @@ declare module ReactRouter {
 >Thing : Thing
 }
 declare module 'react-router' {
+>'react-router' : typeof 'react-router'
+
 	export = ReactRouter;
 >ReactRouter : typeof ReactRouter
 }
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols b/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
index ccf2e68d4f1..e599665b156 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.symbols
@@ -89,4 +89,5 @@ let e4 = <EmptyProp data-prop />
 let e5 = <EmptyProp {...{ "data-prop": true}} />
 >e5 : Symbol(e5, Decl(file.tsx, 33, 3))
 >EmptyProp : Symbol(EmptyProp, Decl(file.tsx, 19, 30))
+>"data-prop" : Symbol("data-prop", Decl(file.tsx, 33, 25))
 
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.types b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
index 532e7828df9..ee5dd48aed2 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
@@ -108,5 +108,6 @@ let e5 = <EmptyProp {...{ "data-prop": true}} />
 ><EmptyProp {...{ "data-prop": true}} /> : JSX.Element
 >EmptyProp : typeof EmptyProp
 >{ "data-prop": true} : { "data-prop": boolean; }
+>"data-prop" : boolean
 >true : true
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.symbols
index 6946c2b3279..ca25cba4f49 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.symbols
@@ -38,6 +38,7 @@ declare function OneThing(l1: {data: string, "data-prop": boolean}): JSX.Element
 >OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 57), Decl(file.tsx, 3, 76), Decl(file.tsx, 4, 69), Decl(file.tsx, 5, 83))
 >l1 : Symbol(l1, Decl(file.tsx, 6, 26))
 >data : Symbol(data, Decl(file.tsx, 6, 31))
+>"data-prop" : Symbol("data-prop", Decl(file.tsx, 6, 44))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
@@ -82,6 +83,7 @@ declare function TestingOneThing({y1: string}): JSX.Element;
 declare function TestingOneThing(j: {"extra-data": string, yy?: string}): JSX.Element;
 >TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 13, 47), Decl(file.tsx, 16, 60), Decl(file.tsx, 17, 86), Decl(file.tsx, 18, 83))
 >j : Symbol(j, Decl(file.tsx, 17, 33))
+>"extra-data" : Symbol("extra-data", Decl(file.tsx, 17, 37))
 >yy : Symbol(yy, Decl(file.tsx, 17, 58))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
index cb1908845dd..ec16b6134ee 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
@@ -38,6 +38,7 @@ declare function OneThing(l1: {data: string, "data-prop": boolean}): JSX.Element
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
 >l1 : { data: string; "data-prop": boolean; }
 >data : string
+>"data-prop" : boolean
 >JSX : any
 >Element : JSX.Element
 
@@ -88,6 +89,7 @@ declare function TestingOneThing({y1: string}): JSX.Element;
 declare function TestingOneThing(j: {"extra-data": string, yy?: string}): JSX.Element;
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
 >j : { "extra-data": string; yy?: string; }
+>"extra-data" : string
 >yy : string
 >JSX : any
 >Element : JSX.Element
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.symbols
index ed613618411..68dff707c9f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.symbols
@@ -39,6 +39,7 @@ let obj2 = {
 >yy : Symbol(yy, Decl(file.tsx, 13, 12))
 
     "ignore-prop": "hello"
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 14, 12))
 }
 
 let defaultObj: any;
@@ -93,6 +94,7 @@ const c8 = <OneThing ignore-prop={100} />
 const c9 = <OneThing {...{ "ignore-prop":200 }} />;
 >c9 : Symbol(c9, Decl(file.tsx, 29, 5))
 >OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 29, 26))
 
 const c10 = <OneThing {...obj2} yy1="boo" />;
 >c10 : Symbol(c10, Decl(file.tsx, 30, 5))
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
index d1cc5774447..5374e8c8e5b 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
@@ -46,6 +46,7 @@ let obj2 = {
 >500 : 500
 
     "ignore-prop": "hello"
+>"ignore-prop" : string
 >"hello" : "hello"
 }
 
@@ -119,6 +120,7 @@ const c9 = <OneThing {...{ "ignore-prop":200 }} />;
 ><OneThing {...{ "ignore-prop":200 }} /> : JSX.Element
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >{ "ignore-prop":200 } : { "ignore-prop": number; }
+>"ignore-prop" : number
 >200 : 200
 
 const c10 = <OneThing {...obj2} yy1="boo" />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.symbols
index 7316de2dcc9..950ff21be00 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.symbols
@@ -77,6 +77,7 @@ const c7 = <OneThing {...obj2} yy />;  // Should error as there is extra attribu
 declare function TestingOneThing(j: {"extra-data": string}): JSX.Element;
 >TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73))
 >j : Symbol(j, Decl(file.tsx, 20, 33))
+>"extra-data" : Symbol("extra-data", Decl(file.tsx, 20, 37))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
index fe265c5c4d0..b1d5b59323e 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
@@ -96,6 +96,7 @@ const c7 = <OneThing {...obj2} yy />;  // Should error as there is extra attribu
 declare function TestingOneThing(j: {"extra-data": string}): JSX.Element;
 >TestingOneThing : { (j: { "extra-data": string; }): JSX.Element; (n: { yy: string; direction?: number; }): JSX.Element; }
 >j : { "extra-data": string; }
+>"extra-data" : string
 >JSX : any
 >Element : JSX.Element
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.symbols
index df26fe0bea6..acec753b783 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.symbols
@@ -35,6 +35,7 @@ export interface HyphenProps extends ClickableProps {
 >ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
 
     "data-format": string;
+>"data-format" : Symbol(HyphenProps["data-format"], Decl(file.tsx, 15, 53))
 }
 
 let obj0 = {
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
index b60a5a2d3f0..2e14ff745cb 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
@@ -35,6 +35,7 @@ export interface HyphenProps extends ClickableProps {
 >ClickableProps : ClickableProps
 
     "data-format": string;
+>"data-format" : string
 }
 
 let obj0 = {
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.symbols
index cc3cb199309..fa961797460 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.symbols
@@ -35,6 +35,7 @@ export interface HyphenProps extends ClickableProps {
 >ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31))
 
     "data-format": string;
+>"data-format" : Symbol(HyphenProps["data-format"], Decl(file.tsx, 15, 53))
 }
 
 let obj = {
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
index 6f7f04e3cf3..df77ce5558e 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
@@ -35,6 +35,7 @@ export interface HyphenProps extends ClickableProps {
 >ClickableProps : ClickableProps
 
     "data-format": string;
+>"data-format" : string
 }
 
 let obj = {
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.symbols b/tests/baselines/reference/tsxStatelessFunctionComponents1.symbols
index 7350fda3e76..28105943860 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.symbols
@@ -29,6 +29,7 @@ function Meet({name = 'world'}) {
 function MeetAndGreet(k: {"prop-name": string}) {
 >MeetAndGreet : Symbol(MeetAndGreet, Decl(file.tsx, 9, 1))
 >k : Symbol(k, Decl(file.tsx, 10, 22))
+>"prop-name" : Symbol("prop-name", Decl(file.tsx, 10, 26))
 
 	return <div>Hi Hi</div>;
 >div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
@@ -144,5 +145,6 @@ let j3 = <EmptyPropSFC {...{}} />
 let j4 = <EmptyPropSFC {...{ "data-info": "hi"}} />
 >j4 : Symbol(j4, Decl(file.tsx, 52, 3))
 >EmptyPropSFC : Symbol(EmptyPropSFC, Decl(file.tsx, 0, 0))
+>"data-info" : Symbol("data-info", Decl(file.tsx, 52, 28))
 
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents1.types b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
index ffd52cb4978..08e29302480 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents1.types
@@ -33,6 +33,7 @@ function Meet({name = 'world'}) {
 function MeetAndGreet(k: {"prop-name": string}) {
 >MeetAndGreet : (k: { "prop-name": string; }) => JSX.Element
 >k : { "prop-name": string; }
+>"prop-name" : string
 
 	return <div>Hi Hi</div>;
 ><div>Hi Hi</div> : JSX.Element
@@ -179,6 +180,7 @@ let j4 = <EmptyPropSFC {...{ "data-info": "hi"}} />
 ><EmptyPropSFC {...{ "data-info": "hi"}} /> : JSX.Element
 >EmptyPropSFC : () => JSX.Element
 >{ "data-info": "hi"} : { "data-info": string; }
+>"data-info" : string
 >"hi" : "hi"
 
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.symbols
index 66660e4d205..72aebfd2e4c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.symbols
@@ -8,6 +8,7 @@ declare function ComponentSpecific1<U>(l: {prop: U, "ignore-prop": string}): JSX
 >l : Symbol(l, Decl(file.tsx, 2, 39))
 >prop : Symbol(prop, Decl(file.tsx, 2, 43))
 >U : Symbol(U, Decl(file.tsx, 2, 36))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 2, 51))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
index 851839ea921..2c2b4d3bd5f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
@@ -8,6 +8,7 @@ declare function ComponentSpecific1<U>(l: {prop: U, "ignore-prop": string}): JSX
 >l : { prop: U; "ignore-prop": string; }
 >prop : U
 >U : U
+>"ignore-prop" : string
 >JSX : any
 >Element : JSX.Element
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.symbols
index b0823c19d67..42f2ce9792e 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.symbols
@@ -15,6 +15,7 @@ declare function OverloadComponent<U>(attr: {b: U, a?: string, "ignore-prop": bo
 >b : Symbol(b, Decl(file.tsx, 3, 45))
 >U : Symbol(U, Decl(file.tsx, 3, 35))
 >a : Symbol(a, Decl(file.tsx, 3, 50))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 3, 62))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
index 32f483227d3..7d767208772 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
@@ -15,6 +15,7 @@ declare function OverloadComponent<U>(attr: {b: U, a?: string, "ignore-prop": bo
 >b : U
 >U : U
 >a : string
+>"ignore-prop" : boolean
 >JSX : any
 >Element : JSX.Element
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.symbols
index 6011e091c52..5dc9a40fd6c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.symbols
@@ -15,6 +15,7 @@ declare function OverloadComponent<U>(attr: {b: U, a: string, "ignore-prop": boo
 >b : Symbol(b, Decl(file.tsx, 3, 45))
 >U : Symbol(U, Decl(file.tsx, 3, 35))
 >a : Symbol(a, Decl(file.tsx, 3, 50))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 3, 61))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
index 310450045db..2c31f2afde2 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
@@ -15,6 +15,7 @@ declare function OverloadComponent<U>(attr: {b: U, a: string, "ignore-prop": boo
 >b : U
 >U : U
 >a : string
+>"ignore-prop" : boolean
 >JSX : any
 >Element : JSX.Element
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.symbols b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.symbols
index d6aa17e5109..20ca8dc4e03 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.symbols
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.symbols
@@ -44,6 +44,7 @@ declare function ComponentSpecific1<U>(l: { prop: U, "ignore-prop": number }): J
 >l : Symbol(l, Decl(file.tsx, 9, 39))
 >prop : Symbol(prop, Decl(file.tsx, 9, 43))
 >U : Symbol(U, Decl(file.tsx, 9, 36))
+>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 9, 52))
 >JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1))
 >Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27))
 
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
index 98a9c621797..99d760bb7a5 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
@@ -46,6 +46,7 @@ declare function ComponentSpecific1<U>(l: { prop: U, "ignore-prop": number }): J
 >l : { prop: U; "ignore-prop": number; }
 >prop : U
 >U : U
+>"ignore-prop" : number
 >JSX : any
 >Element : JSX.Element
 
diff --git a/tests/baselines/reference/typeAliasExport.symbols b/tests/baselines/reference/typeAliasExport.symbols
index 5ffe181ca70..7b880e41b72 100644
--- a/tests/baselines/reference/typeAliasExport.symbols
+++ b/tests/baselines/reference/typeAliasExport.symbols
@@ -1,5 +1,7 @@
 === tests/cases/compiler/typeAliasExport.ts ===
 declare module "a" {
+>"a" : Symbol("a", Decl(typeAliasExport.ts, 0, 0))
+
   export default undefined
 >undefined : Symbol(undefined)
 
diff --git a/tests/baselines/reference/typeAliasExport.types b/tests/baselines/reference/typeAliasExport.types
index e9a7b92c3e7..5cbea867ad3 100644
--- a/tests/baselines/reference/typeAliasExport.types
+++ b/tests/baselines/reference/typeAliasExport.types
@@ -1,5 +1,7 @@
 === tests/cases/compiler/typeAliasExport.ts ===
 declare module "a" {
+>"a" : typeof "a"
+
   export default undefined
 >undefined : undefined
 
diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols
index 1e7604b44e7..0edef5db04b 100644
--- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols
+++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols
@@ -25,14 +25,29 @@ var menuData: IMenuItem[] = [
 >IMenuItem : Symbol(IMenuItem, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 0, 0))
     {
         "id": "ourLogo",
+>"id" : Symbol("id", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 9, 5))
+
         "type": "image",
+>"type" : Symbol("type", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 10, 24))
+
         "link": "",
+>"link" : Symbol("link", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 11, 24))
+
         "icon": "modules/menu/logo.svg"
+>"icon" : Symbol("icon", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 12, 19))
+
     }, {
         "id": "productName",
+>"id" : Symbol("id", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 14, 8))
+
         "type": "default",
+>"type" : Symbol("type", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 15, 28))
+
         "link": "",
+>"link" : Symbol("link", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 16, 26))
+
         "text": "Product Name"
+>"text" : Symbol("text", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 17, 19))
     }
 ];
 
diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
index 66e35a5a535..8e6fc0e315a 100644
--- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
+++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
@@ -28,30 +28,38 @@ var menuData: IMenuItem[] = [
 >{        "id": "ourLogo",        "type": "image",        "link": "",        "icon": "modules/menu/logo.svg"    } : { "id": string; "type": string; "link": string; "icon": string; }
 
         "id": "ourLogo",
+>"id" : string
 >"ourLogo" : "ourLogo"
 
         "type": "image",
+>"type" : string
 >"image" : "image"
 
         "link": "",
+>"link" : string
 >"" : ""
 
         "icon": "modules/menu/logo.svg"
+>"icon" : string
 >"modules/menu/logo.svg" : "modules/menu/logo.svg"
 
     }, {
 >{        "id": "productName",        "type": "default",        "link": "",        "text": "Product Name"    } : { "id": string; "type": string; "link": string; "text": string; }
 
         "id": "productName",
+>"id" : string
 >"productName" : "productName"
 
         "type": "default",
+>"type" : string
 >"default" : "default"
 
         "link": "",
+>"link" : string
 >"" : ""
 
         "text": "Product Name"
+>"text" : string
 >"Product Name" : "Product Name"
     }
 ];
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.symbols b/tests/baselines/reference/typeGuardFunctionErrors.symbols
index 59f30533674..841e986a95d 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.symbols
+++ b/tests/baselines/reference/typeGuardFunctionErrors.symbols
@@ -382,9 +382,11 @@ declare function hasKey<T extends Keys>(x: KeySet<T>): x is KeySet<T|'d'>;
 
 type Foo = { 'a': string; }
 >Foo : Symbol(Foo, Decl(typeGuardFunctionErrors.ts, 151, 74))
+>'a' : Symbol('a', Decl(typeGuardFunctionErrors.ts, 153, 12))
 
 type Bar = { 'a': number; }
 >Bar : Symbol(Bar, Decl(typeGuardFunctionErrors.ts, 153, 27))
+>'a' : Symbol('a', Decl(typeGuardFunctionErrors.ts, 154, 12))
 
 interface NeedsFoo<T extends Foo> {
 >NeedsFoo : Symbol(NeedsFoo, Decl(typeGuardFunctionErrors.ts, 154, 27))
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.types b/tests/baselines/reference/typeGuardFunctionErrors.types
index d8add236887..96d441d8b8d 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionErrors.types
@@ -434,9 +434,11 @@ declare function hasKey<T extends Keys>(x: KeySet<T>): x is KeySet<T|'d'>;
 
 type Foo = { 'a': string; }
 >Foo : Foo
+>'a' : string
 
 type Bar = { 'a': number; }
 >Bar : Bar
+>'a' : number
 
 interface NeedsFoo<T extends Foo> {
 >NeedsFoo : NeedsFoo<T>
diff --git a/tests/baselines/reference/typeOfOnTypeArg.symbols b/tests/baselines/reference/typeOfOnTypeArg.symbols
index 13d2d75b47f..254fba1107b 100644
--- a/tests/baselines/reference/typeOfOnTypeArg.symbols
+++ b/tests/baselines/reference/typeOfOnTypeArg.symbols
@@ -1,6 +1,7 @@
 === tests/cases/compiler/typeOfOnTypeArg.ts ===
 var A = { '': 3 };
 >A : Symbol(A, Decl(typeOfOnTypeArg.ts, 0, 3))
+>'' : Symbol('', Decl(typeOfOnTypeArg.ts, 0, 9))
 
 function fill<B extends typeof A>(f: B) {
 >fill : Symbol(fill, Decl(typeOfOnTypeArg.ts, 0, 18))
diff --git a/tests/baselines/reference/typeOfOnTypeArg.types b/tests/baselines/reference/typeOfOnTypeArg.types
index 9c76b6fa906..fef88255d05 100644
--- a/tests/baselines/reference/typeOfOnTypeArg.types
+++ b/tests/baselines/reference/typeOfOnTypeArg.types
@@ -2,6 +2,7 @@
 var A = { '': 3 };
 >A : { '': number; }
 >{ '': 3 } : { '': number; }
+>'' : number
 >3 : 3
 
 function fill<B extends typeof A>(f: B) {
diff --git a/tests/baselines/reference/typeReferenceDirectives12.symbols b/tests/baselines/reference/typeReferenceDirectives12.symbols
index b3c6cc1b8d7..fc37a10f43d 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.symbols
+++ b/tests/baselines/reference/typeReferenceDirectives12.symbols
@@ -48,6 +48,8 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./main" {
+>"./main" : Symbol("/main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
+
     interface Cls {
 >Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
 
diff --git a/tests/baselines/reference/typeReferenceDirectives12.types b/tests/baselines/reference/typeReferenceDirectives12.types
index cb6f3239bea..3503de37ad3 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.types
+++ b/tests/baselines/reference/typeReferenceDirectives12.types
@@ -53,6 +53,8 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : undefined
 
 declare module "./main" {
+>"./main" : typeof "/main"
+
     interface Cls {
 >Cls : Cls
 
diff --git a/tests/baselines/reference/typeReferenceDirectives9.symbols b/tests/baselines/reference/typeReferenceDirectives9.symbols
index b3c6cc1b8d7..fc37a10f43d 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.symbols
+++ b/tests/baselines/reference/typeReferenceDirectives9.symbols
@@ -48,6 +48,8 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : Symbol(undefined)
 
 declare module "./main" {
+>"./main" : Symbol("/main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52))
+
     interface Cls {
 >Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5))
 
diff --git a/tests/baselines/reference/typeReferenceDirectives9.types b/tests/baselines/reference/typeReferenceDirectives9.types
index cb6f3239bea..3503de37ad3 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.types
+++ b/tests/baselines/reference/typeReferenceDirectives9.types
@@ -53,6 +53,8 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : undefined
 
 declare module "./main" {
+>"./main" : typeof "/main"
+
     interface Cls {
 >Cls : Cls
 
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols
index 11b00906cec..79fb6799a89 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols
@@ -15,18 +15,24 @@ x + y + z;
 
 === /node_modules/@types/dopey/index.d.ts ===
 declare module "xyz" {
+>"xyz" : Symbol("xyz", Decl(index.d.ts, 0, 0))
+
     export const x: number;
 >x : Symbol(x, Decl(index.d.ts, 1, 16))
 }
 
 === /foo/node_modules/@types/grumpy/index.d.ts ===
 declare module "pdq" {
+>"pdq" : Symbol("pdq", Decl(index.d.ts, 0, 0))
+
     export const y: number; 
 >y : Symbol(y, Decl(index.d.ts, 1, 16))
 }
 
 === /foo/node_modules/@types/sneezy/index.d.ts ===
 declare module "abc" {
+>"abc" : Symbol("abc", Decl(index.d.ts, 0, 0))
+
     export const z: number;
 >z : Symbol(z, Decl(index.d.ts, 1, 16))
 }
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types
index f99c3c08991..94411e4cfda 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types
@@ -17,18 +17,24 @@ x + y + z;
 
 === /node_modules/@types/dopey/index.d.ts ===
 declare module "xyz" {
+>"xyz" : typeof "xyz"
+
     export const x: number;
 >x : number
 }
 
 === /foo/node_modules/@types/grumpy/index.d.ts ===
 declare module "pdq" {
+>"pdq" : typeof "pdq"
+
     export const y: number; 
 >y : number
 }
 
 === /foo/node_modules/@types/sneezy/index.d.ts ===
 declare module "abc" {
+>"abc" : typeof "abc"
+
     export const z: number;
 >z : number
 }
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols
index 453f5a542b7..1e3fe12b121 100644
--- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols
@@ -7,6 +7,8 @@ x;
 
 === /node_modules/@types/foo/index.d.ts ===
 declare module "xyz" {
+>"xyz" : Symbol("xyz", Decl(index.d.ts, 0, 0))
+
     export const x: number;
 >x : Symbol(x, Decl(index.d.ts, 1, 16))
 }
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types
index ebc801015ff..9288256420d 100644
--- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types
@@ -7,6 +7,8 @@ x;
 
 === /node_modules/@types/foo/index.d.ts ===
 declare module "xyz" {
+>"xyz" : typeof "xyz"
+
     export const x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/typeofOperatorWithEnumType.symbols b/tests/baselines/reference/typeofOperatorWithEnumType.symbols
index 3ae150ece03..8374b556732 100644
--- a/tests/baselines/reference/typeofOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithEnumType.symbols
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(typeofOperatorWithEnumType.ts, 2, 14))
 >A : Symbol(ENUM1.A, Decl(typeofOperatorWithEnumType.ts, 3, 12))
 >B : Symbol(ENUM1.B, Decl(typeofOperatorWithEnumType.ts, 3, 15))
+>"" : Symbol(ENUM1[""], Decl(typeofOperatorWithEnumType.ts, 3, 18))
 
 // enum type var
 var ResultIsString1 = typeof ENUM;
diff --git a/tests/baselines/reference/typeofOperatorWithEnumType.types b/tests/baselines/reference/typeofOperatorWithEnumType.types
index 5537a4edff2..ccbb7bef2c5 100644
--- a/tests/baselines/reference/typeofOperatorWithEnumType.types
+++ b/tests/baselines/reference/typeofOperatorWithEnumType.types
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // enum type var
 var ResultIsString1 = typeof ENUM;
diff --git a/tests/baselines/reference/umd-augmentation-1.symbols b/tests/baselines/reference/umd-augmentation-1.symbols
index bf5023f0e39..cd072fd6d20 100644
--- a/tests/baselines/reference/umd-augmentation-1.symbols
+++ b/tests/baselines/reference/umd-augmentation-1.symbols
@@ -82,6 +82,8 @@ import * as Math2d from 'math2d';
 
 // Augment the module
 declare module 'math2d' {
+>'math2d' : Symbol(Math2d, Decl(index.d.ts, 0, 0), Decl(math2d-augment.d.ts, 0, 33))
+
 	// Add a method to the class
 	interface Vector {
 >Vector : Symbol(Vector, Decl(index.d.ts, 5, 1), Decl(math2d-augment.d.ts, 2, 25))
diff --git a/tests/baselines/reference/umd-augmentation-1.types b/tests/baselines/reference/umd-augmentation-1.types
index 9d89e0c4537..0df11a2009a 100644
--- a/tests/baselines/reference/umd-augmentation-1.types
+++ b/tests/baselines/reference/umd-augmentation-1.types
@@ -91,6 +91,8 @@ import * as Math2d from 'math2d';
 
 // Augment the module
 declare module 'math2d' {
+>'math2d' : typeof Math2d
+
 	// Add a method to the class
 	interface Vector {
 >Vector : Vector
diff --git a/tests/baselines/reference/umd-augmentation-2.symbols b/tests/baselines/reference/umd-augmentation-2.symbols
index 18f79b6090e..c083dc35bf8 100644
--- a/tests/baselines/reference/umd-augmentation-2.symbols
+++ b/tests/baselines/reference/umd-augmentation-2.symbols
@@ -80,6 +80,8 @@ import * as Math2d from 'math2d';
 
 // Augment the module
 declare module 'math2d' {
+>'math2d' : Symbol(Math2d, Decl(index.d.ts, 0, 0), Decl(math2d-augment.d.ts, 0, 33))
+
 	// Add a method to the class
 	interface Vector {
 >Vector : Symbol(Vector, Decl(index.d.ts, 5, 1), Decl(math2d-augment.d.ts, 2, 25))
diff --git a/tests/baselines/reference/umd-augmentation-2.types b/tests/baselines/reference/umd-augmentation-2.types
index b8d04ecd643..2effb43fb76 100644
--- a/tests/baselines/reference/umd-augmentation-2.types
+++ b/tests/baselines/reference/umd-augmentation-2.types
@@ -89,6 +89,8 @@ import * as Math2d from 'math2d';
 
 // Augment the module
 declare module 'math2d' {
+>'math2d' : typeof Math2d
+
 	// Add a method to the class
 	interface Vector {
 >Vector : Vector
diff --git a/tests/baselines/reference/umd-augmentation-3.symbols b/tests/baselines/reference/umd-augmentation-3.symbols
index 7cbe3ac803b..606c7cd2398 100644
--- a/tests/baselines/reference/umd-augmentation-3.symbols
+++ b/tests/baselines/reference/umd-augmentation-3.symbols
@@ -91,6 +91,8 @@ import * as Math2d from 'math2d';
 
 // Augment the module
 declare module 'math2d' {
+>'math2d' : Symbol(Math2d, Decl(index.d.ts, 2, 13), Decl(math2d-augment.d.ts, 0, 33))
+
 	// Add a method to the class
 	interface Vector {
 >Vector : Symbol(Vector, Decl(index.d.ts, 8, 2), Decl(math2d-augment.d.ts, 2, 25))
diff --git a/tests/baselines/reference/umd-augmentation-3.types b/tests/baselines/reference/umd-augmentation-3.types
index 5efafd780a0..8c329eaf6d4 100644
--- a/tests/baselines/reference/umd-augmentation-3.types
+++ b/tests/baselines/reference/umd-augmentation-3.types
@@ -100,6 +100,8 @@ import * as Math2d from 'math2d';
 
 // Augment the module
 declare module 'math2d' {
+>'math2d' : typeof Math2d
+
 	// Add a method to the class
 	interface Vector {
 >Vector : Vector
diff --git a/tests/baselines/reference/umd-augmentation-4.symbols b/tests/baselines/reference/umd-augmentation-4.symbols
index eabb2e15898..90341d679f0 100644
--- a/tests/baselines/reference/umd-augmentation-4.symbols
+++ b/tests/baselines/reference/umd-augmentation-4.symbols
@@ -89,6 +89,8 @@ import * as Math2d from 'math2d';
 
 // Augment the module
 declare module 'math2d' {
+>'math2d' : Symbol(Math2d, Decl(index.d.ts, 2, 13), Decl(math2d-augment.d.ts, 0, 33))
+
 	// Add a method to the class
 	interface Vector {
 >Vector : Symbol(Vector, Decl(index.d.ts, 8, 2), Decl(math2d-augment.d.ts, 2, 25))
diff --git a/tests/baselines/reference/umd-augmentation-4.types b/tests/baselines/reference/umd-augmentation-4.types
index f71928f5afc..901ae2f6374 100644
--- a/tests/baselines/reference/umd-augmentation-4.types
+++ b/tests/baselines/reference/umd-augmentation-4.types
@@ -98,6 +98,8 @@ import * as Math2d from 'math2d';
 
 // Augment the module
 declare module 'math2d' {
+>'math2d' : typeof Math2d
+
 	// Add a method to the class
 	interface Vector {
 >Vector : Vector
diff --git a/tests/baselines/reference/umd-errors.symbols b/tests/baselines/reference/umd-errors.symbols
index f7cbb705c10..be2566003fb 100644
--- a/tests/baselines/reference/umd-errors.symbols
+++ b/tests/baselines/reference/umd-errors.symbols
@@ -4,11 +4,13 @@ No type information for this code.export as namespace Foo;
 No type information for this code.
 No type information for this code.=== tests/cases/conformance/externalModules/err2.d.ts ===
 // Illegal, can't be in external ambient module
-No type information for this code.declare module "Foo" {
-No type information for this code.	export as namespace Bar;
-No type information for this code.}
-No type information for this code.
-No type information for this code.=== tests/cases/conformance/externalModules/err3.d.ts ===
+declare module "Foo" {
+>"Foo" : Symbol("Foo", Decl(err2.d.ts, 0, 0))
+
+	export as namespace Bar;
+}
+
+=== tests/cases/conformance/externalModules/err3.d.ts ===
 // Illegal, can't have modifiers
 export var p;
 >p : Symbol(p, Decl(err3.d.ts, 1, 10))
diff --git a/tests/baselines/reference/umd-errors.types b/tests/baselines/reference/umd-errors.types
index 56d2f7d470e..5464613dc14 100644
--- a/tests/baselines/reference/umd-errors.types
+++ b/tests/baselines/reference/umd-errors.types
@@ -6,6 +6,8 @@ export as namespace Foo;
 === tests/cases/conformance/externalModules/err2.d.ts ===
 // Illegal, can't be in external ambient module
 declare module "Foo" {
+>"Foo" : typeof "Foo"
+
 	export as namespace Bar;
 >Bar : No type information available!
 }
diff --git a/tests/baselines/reference/underscoreEscapedNameInEnum.symbols b/tests/baselines/reference/underscoreEscapedNameInEnum.symbols
index 98e2a931cf8..e7c3f454169 100644
--- a/tests/baselines/reference/underscoreEscapedNameInEnum.symbols
+++ b/tests/baselines/reference/underscoreEscapedNameInEnum.symbols
@@ -3,6 +3,8 @@ enum E {
 >E : Symbol(E, Decl(underscoreEscapedNameInEnum.ts, 0, 0))
 
     "__foo" = 1,
+>"__foo" : Symbol(E["__foo"], Decl(underscoreEscapedNameInEnum.ts, 0, 8))
+
     bar = E["__foo"] + 1
 >bar : Symbol(E.bar, Decl(underscoreEscapedNameInEnum.ts, 1, 16))
 >E : Symbol(E, Decl(underscoreEscapedNameInEnum.ts, 0, 0))
diff --git a/tests/baselines/reference/underscoreEscapedNameInEnum.types b/tests/baselines/reference/underscoreEscapedNameInEnum.types
index 02fc9a5493c..7dae091e9bb 100644
--- a/tests/baselines/reference/underscoreEscapedNameInEnum.types
+++ b/tests/baselines/reference/underscoreEscapedNameInEnum.types
@@ -3,6 +3,7 @@ enum E {
 >E : E
 
     "__foo" = 1,
+>"__foo" : E
 >1 : 1
 
     bar = E["__foo"] + 1
diff --git a/tests/baselines/reference/underscoreTest1.symbols b/tests/baselines/reference/underscoreTest1.symbols
index 41b0c811027..a2819531d20 100644
--- a/tests/baselines/reference/underscoreTest1.symbols
+++ b/tests/baselines/reference/underscoreTest1.symbols
@@ -1011,9 +1011,11 @@ interface Tuple2<T0, T1> extends Array<any> {
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: T0;
+>0 : Symbol(Tuple2[0], Decl(underscoreTest1_underscore.ts, 12, 45))
 >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 12, 17))
 
     1: T1;
+>1 : Symbol(Tuple2[1], Decl(underscoreTest1_underscore.ts, 13, 10))
 >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 12, 20))
 }
 
@@ -1025,12 +1027,15 @@ interface Tuple3<T0, T1, T2> extends Array<any> {
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: T0;
+>0 : Symbol(Tuple3[0], Decl(underscoreTest1_underscore.ts, 17, 49))
 >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 17, 17))
 
     1: T1;
+>1 : Symbol(Tuple3[1], Decl(underscoreTest1_underscore.ts, 18, 10))
 >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 17, 20))
 
     2: T2;
+>2 : Symbol(Tuple3[2], Decl(underscoreTest1_underscore.ts, 19, 10))
 >T2 : Symbol(T2, Decl(underscoreTest1_underscore.ts, 17, 24))
 }
 
@@ -1043,15 +1048,19 @@ interface Tuple4<T0, T1, T2, T3> extends Array<any> {
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: T0;
+>0 : Symbol(Tuple4[0], Decl(underscoreTest1_underscore.ts, 23, 53))
 >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 23, 17))
 
     1: T1;
+>1 : Symbol(Tuple4[1], Decl(underscoreTest1_underscore.ts, 24, 10))
 >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 23, 20))
 
     2: T2;
+>2 : Symbol(Tuple4[2], Decl(underscoreTest1_underscore.ts, 25, 10))
 >T2 : Symbol(T2, Decl(underscoreTest1_underscore.ts, 23, 24))
 
     3: T3;
+>3 : Symbol(Tuple4[3], Decl(underscoreTest1_underscore.ts, 26, 10))
 >T3 : Symbol(T3, Decl(underscoreTest1_underscore.ts, 23, 28))
 }
 
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index 111039994d5..262d0c5e56b 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -1772,9 +1772,11 @@ interface Tuple2<T0, T1> extends Array<any> {
 >Array : T[]
 
     0: T0;
+>0 : T0
 >T0 : T0
 
     1: T1;
+>1 : T1
 >T1 : T1
 }
 
@@ -1786,12 +1788,15 @@ interface Tuple3<T0, T1, T2> extends Array<any> {
 >Array : T[]
 
     0: T0;
+>0 : T0
 >T0 : T0
 
     1: T1;
+>1 : T1
 >T1 : T1
 
     2: T2;
+>2 : T2
 >T2 : T2
 }
 
@@ -1804,15 +1809,19 @@ interface Tuple4<T0, T1, T2, T3> extends Array<any> {
 >Array : T[]
 
     0: T0;
+>0 : T0
 >T0 : T0
 
     1: T1;
+>1 : T1
 >T1 : T1
 
     2: T2;
+>2 : T2
 >T2 : T2
 
     3: T3;
+>3 : T3
 >T3 : T3
 }
 
diff --git a/tests/baselines/reference/unionAndIntersectionInference1.symbols b/tests/baselines/reference/unionAndIntersectionInference1.symbols
index 685b21dd215..174a9a7cbba 100644
--- a/tests/baselines/reference/unionAndIntersectionInference1.symbols
+++ b/tests/baselines/reference/unionAndIntersectionInference1.symbols
@@ -3,6 +3,7 @@
 
 interface Y { 'i am a very certain type': Y }
 >Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0))
+>'i am a very certain type' : Symbol(Y['i am a very certain type'], Decl(unionAndIntersectionInference1.ts, 2, 13))
 >Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0))
 
 var y: Y = <Y>undefined;
diff --git a/tests/baselines/reference/unionAndIntersectionInference1.types b/tests/baselines/reference/unionAndIntersectionInference1.types
index 6d24bffb56d..2746c9dac92 100644
--- a/tests/baselines/reference/unionAndIntersectionInference1.types
+++ b/tests/baselines/reference/unionAndIntersectionInference1.types
@@ -3,6 +3,7 @@
 
 interface Y { 'i am a very certain type': Y }
 >Y : Y
+>'i am a very certain type' : Y
 >Y : Y
 
 var y: Y = <Y>undefined;
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.symbols b/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
index 7699e89dedd..b6d2a0d548f 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
@@ -23,7 +23,11 @@ var arr5Tuple: {
 >arr5Tuple : Symbol(arr5Tuple, Decl(unionTypeFromArrayLiteral.ts, 10, 3))
 
     0: string;
+>0 : Symbol(0, Decl(unionTypeFromArrayLiteral.ts, 10, 16))
+
     5: number;
+>5 : Symbol(5, Decl(unionTypeFromArrayLiteral.ts, 11, 14))
+
 } = ["hello", true, false, " hello", true, 10, "any"]; // Tuple
 class C { foo() { } }
 >C : Symbol(C, Decl(unionTypeFromArrayLiteral.ts, 13, 54))
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.types b/tests/baselines/reference/unionTypeFromArrayLiteral.types
index efff5e5e219..a2563e7b04c 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.types
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.types
@@ -37,7 +37,11 @@ var arr5Tuple: {
 >arr5Tuple : { 0: string; 5: number; }
 
     0: string;
+>0 : string
+
     5: number;
+>5 : number
+
 } = ["hello", true, false, " hello", true, 10, "any"]; // Tuple
 >["hello", true, false, " hello", true, 10, "any"] : [string, boolean, boolean, string, boolean, number, string]
 >"hello" : "hello"
diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.symbols b/tests/baselines/reference/untypedModuleImport_vsAmbient.symbols
index 8def3c6a09b..11cae5ef356 100644
--- a/tests/baselines/reference/untypedModuleImport_vsAmbient.symbols
+++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.symbols
@@ -8,6 +8,8 @@ x;
 
 === /declarations.d.ts ===
 declare module "foo" {
+>"foo" : Symbol("foo", Decl(declarations.d.ts, 0, 0))
+
     export const x: number;
 >x : Symbol(x, Decl(declarations.d.ts, 1, 16))
 }
diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.types b/tests/baselines/reference/untypedModuleImport_vsAmbient.types
index 58b0eabefdf..f1991818ad1 100644
--- a/tests/baselines/reference/untypedModuleImport_vsAmbient.types
+++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.types
@@ -8,6 +8,8 @@ x;
 
 === /declarations.d.ts ===
 declare module "foo" {
+>"foo" : typeof "foo"
+
     export const x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation.symbols b/tests/baselines/reference/untypedModuleImport_withAugmentation.symbols
index e8575071c9f..ed07d73e21b 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation.symbols
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation.symbols
@@ -1,5 +1,7 @@
 === /a.ts ===
 declare module "foo" {
+>"foo" : Symbol("foo", Decl(a.ts, 0, 0))
+
     export const x: number;
 >x : Symbol(x, Decl(a.ts, 1, 16))
 }
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation.types b/tests/baselines/reference/untypedModuleImport_withAugmentation.types
index ada8fd7db5d..8bd23ca6aa5 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation.types
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation.types
@@ -1,5 +1,7 @@
 === /a.ts ===
 declare module "foo" {
+>"foo" : typeof "foo"
+
     export const x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation2.symbols b/tests/baselines/reference/untypedModuleImport_withAugmentation2.symbols
index 8671b37b06f..b401b3bb21f 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation2.symbols
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation2.symbols
@@ -5,6 +5,8 @@ No type information for this code.=== /node_modules/augmenter/index.d.ts ===
 // This tests that augmenting an untyped module is forbidden even in an ambient context. Contrast with `moduleAugmentationInDependency.ts`.
 
 declare module "js" {
+>"js" : Symbol("js", Decl(index.d.ts, 0, 0))
+
     export const j: number;
 >j : Symbol(j, Decl(index.d.ts, 3, 16))
 }
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation2.types b/tests/baselines/reference/untypedModuleImport_withAugmentation2.types
index 89bb2dd2805..89637715584 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation2.types
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation2.types
@@ -5,6 +5,8 @@ No type information for this code.=== /node_modules/augmenter/index.d.ts ===
 // This tests that augmenting an untyped module is forbidden even in an ambient context. Contrast with `moduleAugmentationInDependency.ts`.
 
 declare module "js" {
+>"js" : typeof "js"
+
     export const j: number;
 >j : number
 }
diff --git a/tests/baselines/reference/voidOperatorWithEnumType.symbols b/tests/baselines/reference/voidOperatorWithEnumType.symbols
index 26e2ca70959..36a7960ffb3 100644
--- a/tests/baselines/reference/voidOperatorWithEnumType.symbols
+++ b/tests/baselines/reference/voidOperatorWithEnumType.symbols
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : Symbol(ENUM1, Decl(voidOperatorWithEnumType.ts, 2, 14))
 >A : Symbol(ENUM1.A, Decl(voidOperatorWithEnumType.ts, 3, 12))
 >B : Symbol(ENUM1.B, Decl(voidOperatorWithEnumType.ts, 3, 15))
+>"" : Symbol(ENUM1[""], Decl(voidOperatorWithEnumType.ts, 3, 18))
 
 // enum type var
 var ResultIsAny1 = void ENUM;
diff --git a/tests/baselines/reference/voidOperatorWithEnumType.types b/tests/baselines/reference/voidOperatorWithEnumType.types
index 21332786390..2646cb6ca48 100644
--- a/tests/baselines/reference/voidOperatorWithEnumType.types
+++ b/tests/baselines/reference/voidOperatorWithEnumType.types
@@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" };
 >ENUM1 : ENUM1
 >A : ENUM1.A
 >B : ENUM1.B
+>"" : ENUM1.
 
 // enum type var
 var ResultIsAny1 = void ENUM;