Print pure namespaces as unknown

src/compiler/checker.ts

@@ -6916,18 +6916,6 @@ module ts {
                 return getDeclaredTypeOfSymbol(symbol);
             }
 
-            if (node.kind === SyntaxKind.ModuleDeclaration ||
-                node.kind === SyntaxKind.ImportDeclaration) {
-                return unknownType;
-            }
-
-            if (node.parent.kind === SyntaxKind.ModuleDeclaration ||
-                node.parent.kind === SyntaxKind.ImportDeclaration) {
-                if ((<Declaration>node.parent).name === node) {
-                    return unknownType;
-                }
-            }
-
             if (isDeclaration(node)) {
                 // In this case, we call getSymbolOfNode instead of getSymbolInfo because it is a declaration
                 var symbol = getSymbolOfNode(node);

src/harness/typeWriter.ts

@@ -29,7 +29,6 @@ class TypeWriterWalker {
             // old typeWriter baselines, suppress tokens
             case ts.SyntaxKind.ThisKeyword:
             case ts.SyntaxKind.SuperKeyword:
-         //   case ts.SyntaxKind.RegularExpressionLiteral:
             case ts.SyntaxKind.ArrayLiteral:
             case ts.SyntaxKind.ObjectLiteral:
             case ts.SyntaxKind.PropertyAccess:
@@ -79,10 +78,7 @@ class TypeWriterWalker {
         var lineAndCharacter = this.currentSourceFile.getLineAndCharacterFromPosition(actualPos);
         var sourceText = ts.getSourceTextOfNodeFromSourceText(this.currentSourceFile.text, node);
         var isUnknownType = (<ts.IntrinsicType>type).intrinsicName === "unknown";
-        if (isUnknownType) {
-            var symbol = this.checker.getSymbolInfo(node);
-        }
-        else {
+        if (!isUnknownType) {
             var writeArrayAsGenericType = node.kind === ts.SyntaxKind.Identifier && (<ts.Identifier>node).text === "Array" ? ts.TypeFormatFlags.WriteArrayAsGenericType : 0;
         }
         
@@ -94,9 +90,7 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             sourceText: sourceText,
-            type: isUnknownType
-                ? this.checker.symbolToString(symbol, node.parent, ts.SymbolFlags.Value | ts.SymbolFlags.Type | ts.SymbolFlags.Namespace | ts.SymbolFlags.Import)
-                : this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
+            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
         });
     }
 

tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module Point {
->Point : Point
+>Point : typeof Point
 
     export var Origin: { x: number; y: number; }
 >Origin : { x: number; y: number; }

tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types

@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export var Origin: {
 >Origin : { x: number; y: number; }
@@ -19,7 +19,7 @@ declare module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/class.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point

tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types

@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export var Origin: {
 >Origin : { x: number; y: number; }
@@ -19,7 +19,7 @@ declare module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/classPoint.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point

tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module Point {
->Point : Point
+>Point : typeof Point
 
     export var Origin: { x: number; y: number; }
 >Origin : { x: number; y: number; }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types

@@ -15,7 +15,7 @@ class Point {
 }
 
 module Point {
->Point : Point
+>Point : typeof Point
 
     function Origin() { return ""; }// not an error, since not exported
 >Origin : typeof Origin
@@ -23,7 +23,7 @@ module Point {
 
 
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -41,7 +41,7 @@ module A {
     }
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         function Origin() { return ""; }// not an error since not exported
 >Origin : typeof Origin

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types

@@ -15,7 +15,7 @@ class Point {
 }
 
 module Point {
->Point : Point
+>Point : typeof Point
 
     var Origin = ""; // not an error, since not exported
 >Origin : string
@@ -23,7 +23,7 @@ module Point {
 
 
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -41,7 +41,7 @@ module A {
     }
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         var Origin = ""; // not an error since not exported
 >Origin : string

tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types

@@ -8,7 +8,7 @@ enum enumdule {
 }
 
 module enumdule {
->enumdule : enumdule
+>enumdule : typeof enumdule
 
     export class Point {
 >Point : Point

tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts ===
 module A {
->A : A
+>A : typeof A
 
     interface Point {
 >Point : Point

tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point

tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point

tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts ===
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point

tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point

tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point

tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point

tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point

tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
 module A {
->A : A
+>A : unknown
 
     interface Point {
 >Point : Point

tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts ===
 module A {
->A : A
+>A : typeof A
 
     interface Point {
 >Point : Point

tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -11,7 +11,7 @@ module A {
     }
 
     export module B {
->B : B
+>B : typeof B
 
         export var Origin: Point = new Point(0, 0);
 >Origin : Point

tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts ===
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point

tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts ===
 module A {
->A : A
+>A : typeof A
 
     class B {
 >B : B

tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point

tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point

tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/function.ts ===
 module A {
->A : A
+>A : typeof A
 
     export function Point() {
 >Point : typeof Point
@@ -14,10 +14,10 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/module.ts ===
 module B {
->B : B
+>B : typeof B
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export var Origin = { x: 0, y: 0 };
 >Origin : { x: number; y: number; }

tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts ===
 module enumdule {
->enumdule : enumdule
+>enumdule : typeof enumdule
 
     export class Point {
 >Point : Point

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -14,7 +14,7 @@ module A {
 }
 
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point
@@ -22,7 +22,7 @@ module A {
         fromCarthesian(p: A.Point) {
 >fromCarthesian : (p: A.Point) => { x: number; y: number; }
 >p : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
             return { x: p.x, y: p.y };
@@ -47,13 +47,13 @@ var p: { x: number; y: number; };
 
 var p: A.Point;
 >p : { x: number; y: number; }
->A : A
+>A : unknown
 >Point : A.Point
 
 module X.Y.Z {
->X : X
->Y : Y
->Z : Z
+>X : typeof X
+>Y : typeof Y
+>Z : typeof Z
 
     export class Line {
 >Line : Line
@@ -64,13 +64,13 @@ module X.Y.Z {
 }
 
 module X {
->X : X
+>X : typeof X
 
     export module Y {
->Y : Y
+>Y : typeof Y
 
         export module Z {
->Z : Z
+>Z : typeof Z
 
             class Line {
 >Line : Line
@@ -89,9 +89,9 @@ var l: { length: number; }
 
 var l: X.Y.Z.Line;
 >l : { length: number; }
->X : X
->Y : X.Y
->Z : X.Y.Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 >Line : X.Y.Z.Line
 
 

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts ===
 module A {
->A : A
+>A : unknown
 
     export interface Point {
 >Point : Point
@@ -18,7 +18,7 @@ module A {
 }
 
 module A {
->A : A
+>A : unknown
 
     interface Point {
 >Point : Point
@@ -35,50 +35,50 @@ var p: { x: number; y: number; toCarth(): A.Point; };
 >x : number
 >y : number
 >toCarth : () => A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var p: A.Point;
 >p : { x: number; y: number; toCarth(): A.Point; }
->A : A
+>A : unknown
 >Point : A.Point
 
 module X.Y.Z {
->X : X
->Y : Y
->Z : Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 
     export interface Line {
 >Line : Line
 
         new (start: A.Point, end: A.Point);
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
     }
 }
 
 module X {
->X : X
+>X : unknown
 
     export module Y.Z {
->Y : Y
->Z : Z
+>Y : unknown
+>Z : unknown
 
         interface Line {
 >Line : Line
 
             start: A.Point;
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
             end: A.Point;
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
         }
     }
@@ -88,16 +88,16 @@ module X {
 var l: { new (s: A.Point, e: A.Point); }
 >l : new (s: A.Point, e: A.Point) => any
 >s : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >e : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var l: X.Y.Z.Line;
 >l : new (s: A.Point, e: A.Point) => any
->X : X
->Y : X.Y
->Z : X.Y.Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 >Line : X.Y.Z.Line
 

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point
@@ -13,7 +13,7 @@ module A {
     }
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -44,14 +44,14 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module A {
->A : A
+>A : typeof A
 
     // not a collision, since we don't export
     var Origin: string = "0,0";
 >Origin : string
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export class Plane {
 >Plane : Plane
@@ -75,7 +75,7 @@ var o: { x: number; y: number };
 
 var o: A.Point;
 >o : { x: number; y: number; }
->A : A
+>A : unknown
 >Point : A.Point
 
 var o = A.Origin;
@@ -97,16 +97,16 @@ var o = A.Utils.mirror(o);
 var p: { tl: A.Point; br: A.Point };
 >p : { tl: A.Point; br: A.Point; }
 >tl : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >br : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var p: A.Utils.Plane;
 >p : { tl: A.Point; br: A.Point; }
->A : A
->Utils : A.Utils
+>A : unknown
+>Utils : unknown
 >Plane : A.Utils.Plane
 
 var p = new A.Utils.Plane(o, { x: 1, y: 1 });

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts ===
 module A {
->A : A
+>A : unknown
 
     export interface Point {
 >Point : Point
@@ -18,7 +18,7 @@ module A {
 }
 
 module A {
->A : A
+>A : unknown
 
     export interface Point {
 >Point : Point
@@ -35,53 +35,53 @@ var p: { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; };
 >x : number
 >y : number
 >toCarth : () => A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >fromCarth : () => A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var p: A.Point;
 >p : { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; }
->A : A
+>A : unknown
 >Point : A.Point
 
 module X.Y.Z {
->X : X
->Y : Y
->Z : Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 
     export interface Line {
 >Line : Line
 
         new (start: A.Point, end: A.Point);
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
     }
 }
 
 module X {
->X : X
+>X : unknown
 
     export module Y.Z {
->Y : Y
->Z : Z
+>Y : unknown
+>Z : unknown
 
         export interface Line {
 >Line : Line
 
             start: A.Point;
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
             end: A.Point;
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
         }
     }
@@ -91,22 +91,22 @@ module X {
 var l: { start: A.Point; end: A.Point; new (s: A.Point, e: A.Point); }
 >l : { new (s: A.Point, e: A.Point): any; start: A.Point; end: A.Point; }
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >s : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >e : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var l: X.Y.Z.Line;
 >l : { new (s: A.Point, e: A.Point): any; start: A.Point; end: A.Point; }
->X : X
->Y : X.Y
->Z : X.Y.Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 >Line : X.Y.Z.Line
 

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types

@@ -1,17 +1,17 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts ===
 module A.B {
->A : A
->B : B
+>A : typeof A
+>B : typeof B
 
     export var x: number;
 >x : number
 }
 
 module A{ 
->A : A
+>A : typeof A
 
     module B {
->B : B
+>B : typeof B
 
         export var x: string;
 >x : string
@@ -31,9 +31,9 @@ var x = A.B.x;
 >x : number
 
 module X.Y.Z {
->X : X
->Y : Y
->Z : Z
+>X : typeof X
+>Y : typeof Y
+>Z : typeof Z
 
     export class Line {
 >Line : Line
@@ -44,13 +44,13 @@ module X.Y.Z {
 }
 
 module X {
->X : X
+>X : typeof X
 
     export module Y {
->Y : Y
+>Y : typeof Y
 
         module Z {
->Z : Z
+>Z : typeof Z
 
             export class Line {
 >Line : Line
@@ -69,8 +69,8 @@ var l: { length: number };
 
 var l: X.Y.Z.Line;
 >l : { length: number; }
->X : X
->Y : X.Y
->Z : X.Y.Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 >Line : X.Y.Z.Line
 

tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types

@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module Root {
->Root : Root
+>Root : typeof Root
 
     export module A {
->A : A
+>A : typeof A
 
         export interface Point {
 >Point : Point
@@ -16,7 +16,7 @@ module Root {
         }
 
         export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
             export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -42,35 +42,35 @@ module Root {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module otherRoot {
->otherRoot : otherRoot
+>otherRoot : typeof otherRoot
 
     export module A {
->A : A
+>A : typeof A
 
         // have to be fully qualified since in different root
         export var Origin: Root.A.Point = { x: 0, y: 0 };
 >Origin : Root.A.Point
->Root : Root
->A : Root.A
+>Root : unknown
+>A : unknown
 >Point : Root.A.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >y : number
 
         export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
             export class Plane {
 >Plane : Plane
 
                 constructor(public tl: Root.A.Point, public br: Root.A.Point) { }
 >tl : Root.A.Point
->Root : Root
->A : Root.A
+>Root : unknown
+>A : unknown
 >Point : Root.A.Point
 >br : Root.A.Point
->Root : Root
->A : Root.A
+>Root : unknown
+>A : unknown
 >Point : Root.A.Point
             }
         }

tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point
@@ -13,7 +13,7 @@ module A {
     }
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -38,7 +38,7 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module A {
->A : A
+>A : typeof A
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
@@ -48,7 +48,7 @@ module A {
 >y : number
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export class Plane {
 >Plane : Plane
@@ -72,7 +72,7 @@ var o: { x: number; y: number };
 
 var o: A.Point;
 >o : { x: number; y: number; }
->A : A
+>A : unknown
 >Point : A.Point
 
 var o = A.Origin;
@@ -94,16 +94,16 @@ var o = A.Utils.mirror(o);
 var p: { tl: A.Point; br: A.Point };
 >p : { tl: A.Point; br: A.Point; }
 >tl : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >br : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var p: A.Utils.Plane;
 >p : { tl: A.Point; br: A.Point; }
->A : A
->Utils : A.Utils
+>A : unknown
+>Utils : unknown
 >Plane : A.Utils.Plane
 
 var p = new A.Utils.Plane(o, { x: 1, y: 1 });

tests/baselines/reference/acceptableAlias1.types

@@ -1,17 +1,17 @@
 === tests/cases/compiler/acceptableAlias1.ts ===
 module M {
->M : M
+>M : typeof M
 
     export module N {
->N : N
+>N : unknown
     }
     export import X = N;
->X : X
->N : N
+>X : unknown
+>N : unknown
 }
 
 import r = M.X;
->r : r
+>r : unknown
 >M : typeof M
->X : r
+>X : unknown
 

tests/baselines/reference/additionOperatorWithAnyAndEveryType.types

@@ -18,7 +18,7 @@ enum E { a, b, c }
 >c : E
 
 module M { export var a }
->M : M
+>M : typeof M
 >a : any
 
 var a: any;

tests/baselines/reference/aliasUsageInAccessorsOfClass.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsage1_main.ts ===
 import Backbone = require("aliasUsage1_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsage1_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -48,11 +48,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsage1_moduleA.ts ===
 import Backbone = require("aliasUsage1_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsageInArray.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInArray_main.ts ===
 import Backbone = require("aliasUsageInArray_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInArray_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -36,11 +36,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInArray_moduleA.ts ===
 import Backbone = require("aliasUsageInArray_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsageInFunctionExpression.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInFunctionExpression_main.ts ===
 import Backbone = require("aliasUsageInFunctionExpression_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInFunctionExpression_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -37,11 +37,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_moduleA.ts ===
 import Backbone = require("aliasUsageInFunctionExpression_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsageInGenericFunction.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInGenericFunction_main.ts ===
 import Backbone = require("aliasUsageInGenericFunction_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInGenericFunction_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -51,11 +51,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInGenericFunction_moduleA.ts ===
 import Backbone = require("aliasUsageInGenericFunction_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsageInIndexerOfClass.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInIndexerOfClass_main.ts ===
 import Backbone = require("aliasUsageInIndexerOfClass_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -45,11 +45,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA.ts ===
 import Backbone = require("aliasUsageInIndexerOfClass_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsageInObjectLiteral.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInObjectLiteral_main.ts ===
 import Backbone = require("aliasUsageInObjectLiteral_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInObjectLiteral_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -50,11 +50,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_moduleA.ts ===
 import Backbone = require("aliasUsageInObjectLiteral_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsageInOrExpression.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInOrExpression_main.ts ===
 import Backbone = require("aliasUsageInOrExpression_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInOrExpression_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -71,11 +71,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInOrExpression_moduleA.ts ===
 import Backbone = require("aliasUsageInOrExpression_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_main.ts ===
 import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -41,11 +41,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts ===
 import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsageInVarAssignment.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInVarAssignment_main.ts ===
 import Backbone = require("aliasUsageInVarAssignment_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInVarAssignment_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -32,11 +32,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInVarAssignment_moduleA.ts ===
 import Backbone = require("aliasUsageInVarAssignment_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here

tests/baselines/reference/aliasUsedAsNameValue.types

@@ -2,10 +2,10 @@
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
 import mod = require("aliasUsedAsNameValue_0");
->mod : mod
+>mod : typeof mod
 
 import b = require("aliasUsedAsNameValue_1");
->b : b
+>b : typeof b
  
 export var a = function () {
 >a : () => void

tests/baselines/reference/ambientDeclarations.types

@@ -122,7 +122,7 @@ declare enum E3 {
 >A : E3
 }
 declare module E3 {
->E3 : E3
+>E3 : typeof E3
 
     var B;
 >B : any
@@ -135,7 +135,7 @@ var x = E3.B;
 
 // Ambient module
 declare module M1 {
->M1 : M1
+>M1 : typeof M1
 
     var x;
 >x : any

tests/baselines/reference/ambientEnumElementInitializer6.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientEnumElementInitializer6.ts ===
 declare module M {
->M : M
+>M : typeof M
 
     enum E {
 >E : E

tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types

@@ -1,7 +1,7 @@
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_1.ts ===
 ///<reference path='ambientExternalModuleWithInternalImportDeclaration_0.ts'/>
 import A = require('M');
->A : A
+>A : typeof A
 
 var c = new A();
 >c : A
@@ -11,7 +11,7 @@ var c = new A();
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_0.ts ===
 declare module 'M' {
     module C {
->C : X
+>C : typeof X
 
         export var f: number;
 >f : number
@@ -23,7 +23,7 @@ declare module 'M' {
 >foo : () => void
     }
     import X = C;
->X : X
+>X : typeof X
 >C : X
 
     export = X;

tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types

@@ -1,7 +1,7 @@
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_1.ts ===
 ///<reference path='ambientExternalModuleWithoutInternalImportDeclaration_0.ts'/>
 import A = require('M');
->A : A
+>A : typeof A
 
 var c = new A();
 >c : A
@@ -11,7 +11,7 @@ var c = new A();
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_0.ts ===
 declare module 'M' {
     module C {
->C : C
+>C : typeof C
 
         export var f: number;
 >f : number

tests/baselines/reference/ambientFundule.types

@@ -3,7 +3,7 @@ declare function f();
 >f : typeof f
 
 declare module f { var x }
->f : f
+>f : typeof f
 >x : any
 
 declare function f(x);

tests/baselines/reference/ambientModuleExports.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientModuleExports.ts ===
 declare module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	function a():void;
 >a : typeof a
@@ -31,7 +31,7 @@ var c = new Foo.C();
 >C : typeof Foo.C
 
 declare module Foo2 {
->Foo2 : Foo2
+>Foo2 : typeof Foo2
 
     export function a(): void;
 >a : typeof a

tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts ===
 declare module foo {
->foo : foo
+>foo : typeof foo
 
     class A { }
 >A : A

tests/baselines/reference/ambientModules.types

@@ -1,7 +1,7 @@
 === tests/cases/compiler/ambientModules.ts ===
 declare module Foo.Bar { export var foo; };
->Foo : Foo
->Bar : Bar
+>Foo : typeof Foo
+>Bar : typeof Bar
 >foo : any
 
 Foo.Bar.foo = 5; 

tests/baselines/reference/amdImportAsPrimaryExpression.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 if(foo.E1.A === 0){
 >foo.E1.A === 0 : boolean

tests/baselines/reference/amdImportNotAsPrimaryExpression.types

@@ -1,21 +1,21 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 // None of the below should cause a runtime dependency on foo_0
 import f = foo.M1;
->f : f
+>f : unknown
 >foo : typeof foo
->M1 : foo.M1
+>M1 : unknown
 
 var i: f.I2;
 >i : f.I2
->f : f
+>f : unknown
 >I2 : f.I2
 
 var x: foo.C1 = <{m1: number}>{};
 >x : foo.C1
->foo : foo
+>foo : unknown
 >C1 : foo.C1
 ><{m1: number}>{} : { m1: number; }
 >m1 : number
@@ -29,14 +29,14 @@ var y: typeof foo.C1.s1 = false;
 
 var z: foo.M1.I2;
 >z : f.I2
->foo : foo
->M1 : foo.M1
+>foo : unknown
+>M1 : unknown
 >I2 : f.I2
 
 var e: number = <foo.E1>0;
 >e : number
 ><foo.E1>0 : foo.E1
->foo : foo
+>foo : unknown
 >E1 : foo.E1
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -61,7 +61,7 @@ export interface I1 {
 }
 
 export module M1 {
->M1 : M1
+>M1 : unknown
 
 	export interface I2 {
 >I2 : I2

tests/baselines/reference/anonterface.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/anonterface.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class C {
 >C : C

tests/baselines/reference/anyAssignabilityInInheritance.types

@@ -242,7 +242,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : f
+>f : typeof f
 
     export var bar = 1;
 >bar : number
@@ -268,7 +268,7 @@ class CC { baz: string }
 >baz : string
 
 module CC {
->CC : CC
+>CC : typeof CC
 
     export var bar = 1;
 >bar : number

tests/baselines/reference/arrayAssignmentTest6.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayAssignmentTest6.ts ===
 module Test {
->Test : Test
+>Test : typeof Test
 
     interface IState {
 >IState : IState

tests/baselines/reference/arrayOfExportedClass.types

@@ -1,7 +1,7 @@
 === tests/cases/compiler/arrayOfExportedClass_1.ts ===
 ///<reference path='arrayOfExportedClass_0.ts'/>
 import Car = require('arrayOfExportedClass_0');
->Car : Car
+>Car : typeof Car
 
 class Road {
 >Road : Road

tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts ===
 declare module WinJS {
->WinJS : WinJS
+>WinJS : typeof WinJS
 
     class Promise<T> {
 >Promise : Promise<T>
@@ -25,7 +25,7 @@ declare module WinJS {
     }
 }
 declare module Data {
->Data : Data
+>Data : typeof Data
 
     export interface IListItem<T> {
 >IListItem : IListItem<T>
@@ -65,7 +65,7 @@ declare module Data {
 >removeIndices : (indices: number[], options?: any) => WinJS.Promise<IListItem<T>[]>
 >indices : number[]
 >options : any
->WinJS : WinJS
+>WinJS : unknown
 >Promise : WinJS.Promise<T>
 >IListItem : IListItem<T>
 >T : T
@@ -81,7 +81,7 @@ declare module Data {
 >removeIndices : (indices: number[], options?: any) => WinJS.Promise<IListItem<T>[]>
 >indices : number[]
 >options : any
->WinJS : WinJS
+>WinJS : unknown
 >Promise : WinJS.Promise<T>
 >IListItem : IListItem<T>
 >T : T

tests/baselines/reference/arrowFunctionInExpressionStatement2.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrowFunctionInExpressionStatement2.ts ===
 module M {
->M : M
+>M : typeof M
 
     () => 0;
 >() => 0 : () => number

tests/baselines/reference/assign1.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assign1.ts ===
 module M {
->M : M
+>M : typeof M
 
     interface I {
 >I : I

tests/baselines/reference/assignmentCompatWithObjectMembers.types

@@ -3,7 +3,7 @@
 // no errors expected
 
 module SimpleTypes {
->SimpleTypes : SimpleTypes
+>SimpleTypes : typeof SimpleTypes
 
     class S { foo: string; }
 >S : S
@@ -152,7 +152,7 @@ module SimpleTypes {
 }
 
 module ObjectTypes {
->ObjectTypes : ObjectTypes
+>ObjectTypes : typeof ObjectTypes
 
     class S { foo: S; }
 >S : S

tests/baselines/reference/assignmentCompatability1.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability1.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export var aa = {};;
 >aa : {}

tests/baselines/reference/assignmentCompatability2.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability2.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export var aa:{};;
 >aa : {}

tests/baselines/reference/assignmentCompatability3.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability3.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export var obj = {one: 1};
 >obj : { one: number; }

tests/baselines/reference/assignmentCompatability4.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability4.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export var aa:{one:number;};;
 >aa : { one: number; }

tests/baselines/reference/assignmentCompatability5.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability5.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export                   interface interfaceOne<T> { one: T; };                var obj1: interfaceOne<number> = { one: 1 };;
 >interfaceOne : interfaceOne<T>

tests/baselines/reference/assignmentCompatability6.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability6.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export          interface interfaceWithOptional<T> { one?: T; };               var obj3: interfaceWithOptional<number> = { };;
 >interfaceWithOptional : interfaceWithOptional<T>

tests/baselines/reference/assignmentCompatability7.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability7.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>

tests/baselines/reference/assignmentCompatability8.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability8.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export            class classWithPublic<T> { constructor(public one: T) {} }                        var x1 = new classWithPublic(1);;
 >classWithPublic : classWithPublic<T>

tests/baselines/reference/assignmentCompatability9.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability9.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export          class classWithOptional<T> { constructor(public one?: T) {} }                       var x3 = new classWithOptional<number>();;
 >classWithOptional : classWithOptional<T>

tests/baselines/reference/augmentedTypesClass3.types

@@ -5,14 +5,14 @@ class c5 { public foo() { } }
 >foo : () => void
 
 module c5 { } // should be ok
->c5 : c5
+>c5 : typeof c5
 
 class c5a { public foo() { } }
 >c5a : c5a
 >foo : () => void
 
 module c5a { var y = 2; } // should be ok
->c5a : c5a
+>c5a : typeof c5a
 >y : number
 
 class c5b { public foo() { } }
@@ -20,7 +20,7 @@ class c5b { public foo() { } }
 >foo : () => void
 
 module c5b { export var y = 2; } // should be ok
->c5b : c5b
+>c5b : typeof c5b
 >y : number
 
 //// class then import

tests/baselines/reference/augmentedTypesExternalModule1.types

@@ -7,5 +7,5 @@ class c5 { public foo() { } }
 >foo : () => void
 
 module c5 { } // should be ok everywhere
->c5 : c5
+>c5 : typeof c5
 

tests/baselines/reference/augmentedTypesModules3b.types

@@ -4,7 +4,7 @@ class m3b { foo() { } }
 >foo : () => void
 
 module m3b { var y = 2; }
->m3b : m3b
+>m3b : typeof m3b
 >y : number
 
 class m3c { foo() { } }
@@ -12,7 +12,7 @@ class m3c { foo() { } }
 >foo : () => void
 
 module m3c { export var y = 2; } 
->m3c : m3c
+>m3c : typeof m3c
 >y : number
 
 declare class m3d { foo(): void }
@@ -20,11 +20,11 @@ declare class m3d { foo(): void }
 >foo : () => void
 
 module m3d { export var y = 2; } 
->m3d : m3d
+>m3d : typeof m3d
 >y : number
 
 module m3e { export var y = 2; } 
->m3e : m3e
+>m3e : typeof m3e
 >y : number
 
 declare class m3e { foo(): void } 
@@ -36,7 +36,7 @@ declare class m3f { foo(): void }
 >foo : () => void
 
 module m3f { export interface I { foo(): void } }
->m3f : m3f
+>m3f : typeof m3f
 >I : I
 >foo : () => void
 
@@ -45,7 +45,7 @@ declare class m3g { foo(): void }
 >foo : () => void
 
 module m3g { export class C { foo() { } } }
->m3g : m3g
+>m3g : typeof m3g
 >C : C
 >foo : () => void
 

tests/baselines/reference/augmentedTypesModules4.types

@@ -2,13 +2,13 @@
 // module then enum
 // should be errors
 module m4 { }
->m4 : m4
+>m4 : typeof m4
 
 enum m4 { }
 >m4 : m4
 
 module m4a { var y = 2; }
->m4a : m4a
+>m4a : typeof m4a
 >y : number
 
 enum m4a { One }
@@ -16,7 +16,7 @@ enum m4a { One }
 >One : m4a
 
 module m4b { export var y = 2; }
->m4b : m4b
+>m4b : typeof m4b
 >y : number
 
 enum m4b { One }
@@ -24,7 +24,7 @@ enum m4b { One }
 >One : m4b
 
 module m4c { interface I { foo(): void } }
->m4c : m4c
+>m4c : typeof m4c
 >I : I
 >foo : () => void
 
@@ -33,7 +33,7 @@ enum m4c { One }
 >One : m4c
 
 module m4d { class C { foo() { } } }
->m4d : m4d
+>m4d : typeof m4d
 >C : C
 >foo : () => void
 
@@ -44,11 +44,11 @@ enum m4d { One }
 //// module then module
 
 module m5 { export var y = 2; }
->m5 : m5
+>m5 : typeof m5
 >y : number
 
 module m5 { export interface I { foo(): void } } // should already be reasonably well covered
->m5 : m5
+>m5 : typeof m5
 >I : I
 >foo : () => void
 

tests/baselines/reference/binopAssignmentShouldHaveType.types

@@ -4,7 +4,7 @@ declare var console;
 
 "use strict";
 module Test {
->Test : Test
+>Test : typeof Test
 
  export class Bug {
 >Bug : Bug

tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types

@@ -16,7 +16,7 @@ class A {
 >foo : () => boolean
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: boolean;
 >n : boolean

tests/baselines/reference/bitwiseNotOperatorWithNumberType.types

@@ -20,7 +20,7 @@ class A {
 >foo : () => number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number

tests/baselines/reference/bitwiseNotOperatorWithStringType.types

@@ -20,7 +20,7 @@ class A {
 >foo : () => string
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: string;
 >n : string

tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types

@@ -163,7 +163,7 @@ var r10 = foo10(1);
 >foo10 : typeof foo10
 
 module M {
->M : M
+>M : typeof M
 
     export var x = 1;
 >x : number
@@ -215,7 +215,7 @@ function m1() { return 1; }
 >m1 : typeof m1
 
 module m1 { export var y = 2; }
->m1 : m1
+>m1 : typeof m1
 >y : number
 
 function foo13() {
@@ -239,7 +239,7 @@ class c1 {
 >x : any
 }
 module c1 {
->c1 : c1
+>c1 : typeof c1
 
     export var x = 1;
 >x : number
@@ -260,7 +260,7 @@ enum e1 { A }
 >A : e1
 
 module e1 { export var y = 1; }
->e1 : e1
+>e1 : typeof e1
 >y : number
 
 function foo15() {

tests/baselines/reference/chainedImportAlias.types

@@ -1,9 +1,9 @@
 === tests/cases/compiler/chainedImportAlias_file1.ts ===
 import x = require('chainedImportAlias_file0');
->x : x
+>x : typeof x
 
 import y = x;
->y : y
+>y : typeof x
 >x : typeof x
 
 y.m.foo();
@@ -16,7 +16,7 @@ y.m.foo();
 
 === tests/cases/compiler/chainedImportAlias_file0.ts ===
 export module m {
->m : m
+>m : typeof m
 
     export function foo() { }
 >foo : typeof foo

tests/baselines/reference/circularImportAlias.types

@@ -2,15 +2,15 @@
 // expected no error
 
 module B {
->B : a.b
+>B : typeof a.b
 
     export import a = A;
->a : a
+>a : typeof a
 >A : typeof a
 
     export class D extends a.C {
 >D : D
->a : a
+>a : unknown
 >C : a.C
 
         id: number;
@@ -19,14 +19,14 @@ module B {
 }
 
 module A {
->A : b.a
+>A : typeof b.a
 
     export class C { name: string }
 >C : C
 >name : string
 
     export import b = B;
->b : b
+>b : typeof b
 >B : typeof b
 }
 

tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types

@@ -1,12 +1,12 @@
 === tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class N { }
 >N : N
 
     export module N {
->N : N
+>N : typeof N
 
         export var v = 0;
 >v : number
@@ -14,11 +14,11 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     export class O extends M.N {
 >O : O
->M : M
+>M : unknown
 >N : N
     }
 }

tests/baselines/reference/classExtendingQualifiedName2.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/classExtendingQualifiedName2.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class C {
 >C : C
@@ -8,7 +8,7 @@ module M {
 
     class D extends M.C {
 >D : D
->M : M
+>M : unknown
 >C : C
     }
 }

tests/baselines/reference/classImplementsImportedInterface.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/classImplementsImportedInterface.ts ===
 module M1 {
->M1 : M1
+>M1 : unknown
 
     export interface I {
 >I : I
@@ -11,11 +11,11 @@ module M1 {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     import T = M1.I;
->T : T
->M1 : M1
+>T : unknown
+>M1 : unknown
 >I : T
 
     class C implements T {

tests/baselines/reference/cloduleAcrossModuleDefinitions.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/cloduleAcrossModuleDefinitions.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class B {
 >B : B
@@ -14,10 +14,10 @@ module A {
 }
 
 module A {
->A : A
+>A : typeof A
 
     export module B {
->B : B
+>B : typeof B
 
         export var x = 1;
 >x : number
@@ -26,6 +26,6 @@ module A {
 
 var b: A.B; // ok
 >b : A.B
->A : A
+>A : unknown
 >B : A.B
 

tests/baselines/reference/cloduleAndTypeParameters.types

@@ -10,7 +10,7 @@ class Foo<T extends Foo.Bar> {
 }
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
   export interface Bar {
 >Bar : Bar

tests/baselines/reference/cloduleTest1.types

@@ -13,7 +13,7 @@
 >$ : $
   }
   module $ {
->$ : $
+>$ : typeof $
 
     export interface AjaxSettings {
 >AjaxSettings : AjaxSettings

tests/baselines/reference/cloduleWithRecursiveReference.types

@@ -1,12 +1,12 @@
 === tests/cases/compiler/cloduleWithRecursiveReference.ts ===
 module M
->M : M
+>M : typeof M
 {
   export class C {  }
 >C : C
 
   export module C {
->C : M.C
+>C : typeof M.C
 
     export var C = M.C
 >C : typeof M.C

tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 3;
 >x : number
@@ -17,7 +17,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     class d {
 >d : d
@@ -31,7 +31,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     class d2 {
 >d2 : d2

tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     enum e {
 >e : e

tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 3;
 >x : number
@@ -13,7 +13,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     function fn2() {
 >fn2 : typeof fn2
@@ -28,7 +28,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     function fn3() {
 >fn3 : typeof fn3

tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class m1 {
 >m1 : m1
@@ -14,7 +14,7 @@ var foo = new m1.m1();
 >m1 : typeof m1.m1
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class m2 {
 >m2 : m2

tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export interface m1 {
 >m1 : m1

tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export var m1 = 10;
 >m1 : number

tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 3;
 >x : number
@@ -17,7 +17,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     class d {
 >d : d
@@ -36,7 +36,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     class e {
 >e : e
@@ -56,7 +56,7 @@ module M {
 }
 
 module M { // Shouldnt bn _M
->M : M
+>M : typeof M
 
     class f {
 >f : f

tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types

@@ -1,12 +1,12 @@
 === tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 3;
 >x : number
 
     module m1 {
->m1 : m1
+>m1 : typeof m1
 
         var M = 10;
 >M : number
@@ -18,10 +18,10 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     module m2 {
->m2 : m2
+>m2 : typeof m2
 
         class M {
 >M : M
@@ -38,10 +38,10 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     module m3 {
->m3 : m3
+>m3 : typeof m3
 
         function M() {
 >M : typeof M
@@ -58,10 +58,10 @@ module M {
 }
 
 module M { // shouldnt be _M
->M : M
+>M : typeof M
 
     module m3 {
->m3 : m3
+>m3 : typeof m3
 
         interface M {
 >M : M
@@ -77,13 +77,13 @@ module M { // shouldnt be _M
 }
 
 module M {
->M : M
+>M : typeof M
 
     module m4 {
->m4 : m4
+>m4 : typeof m4
 
         module M {
->M : M
+>M : typeof M
 
             var p = x;
 >p : number

tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class m1 {
 >m1 : m1
@@ -14,7 +14,7 @@ var foo = new m1.m1();
 >m1 : typeof m1.m1
 
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class c1 {
 >c1 : c1
@@ -37,7 +37,7 @@ var foo2 = new m1.c1();
 >c1 : typeof m1.c1
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class c1 {
 >c1 : c1
@@ -58,7 +58,7 @@ var foo3 = new m2.c1();
 >c1 : typeof m2.c1
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class m2 {
 >m2 : m2

tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     class m1 {
 >m1 : m1