Replace all testcase instances of 'module' with 'namespace' (#62399)

tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts] ////
 
 //// [module.d.ts]
-declare module Point {
+declare namespace Point {
     export var Origin: { x: number; y: number; }
 }
 

tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.symbols

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts] ////
 
 === module.d.ts ===
-declare module Point {
+declare namespace Point {
 >Point : Symbol(Point, Decl(module.d.ts, 0, 0), Decl(function.d.ts, 0, 0))
 
     export var Origin: { x: number; y: number; }

tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts] ////
 
 === module.d.ts ===
-declare module Point {
+declare namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 

tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.js

@@ -1,8 +1,8 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts] ////
 
 //// [module.d.ts]
-declare module A {
-    export module Point {
+declare namespace A {
+    export namespace Point {
         export var Origin: {
             x: number;
             y: number;
@@ -11,7 +11,7 @@ declare module A {
 }
 
 //// [class.d.ts]
-declare module A {
+declare namespace A {
     export class Point {
         constructor(x: number, y: number);
         x: number;

tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts] ////
 
 === module.d.ts ===
-declare module A {
+declare namespace A {
 >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(class.d.ts, 0, 0))
 
-    export module Point {
->Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18))
+    export namespace Point {
+>Point : Symbol(Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21))
 
         export var Origin: {
 >Origin : Symbol(Origin, Decl(module.d.ts, 2, 18))
@@ -20,11 +20,11 @@ declare module A {
 }
 
 === class.d.ts ===
-declare module A {
+declare namespace A {
 >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(class.d.ts, 0, 0))
 
     export class Point {
->Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18))
+>Point : Symbol(Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21))
 
         constructor(x: number, y: number);
 >x : Symbol(x, Decl(class.d.ts, 2, 20))
@@ -47,14 +47,14 @@ var p: { x: number; y: number; }
 var p = A.Point.Origin;
 >p : Symbol(p, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(test.ts, 2, 3))
 >A.Point.Origin : Symbol(A.Point.Origin, Decl(module.d.ts, 2, 18))
->A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18))
+>A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21))
 >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(class.d.ts, 0, 0))
->Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18))
+>Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21))
 >Origin : Symbol(A.Point.Origin, Decl(module.d.ts, 2, 18))
 
 var p = new A.Point(0, 0); // unexpected error here, bug 840000
 >p : Symbol(p, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(test.ts, 2, 3))
->A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18))
+>A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21))
 >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(class.d.ts, 0, 0))
->Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18))
+>Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21))
  

tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts] ////
 
 === module.d.ts ===
-declare module A {
+declare namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 
-    export module Point {
+    export namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 
@@ -25,7 +25,7 @@ declare module A {
 }
 
 === class.d.ts ===
-declare module A {
+declare namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js

@@ -1,8 +1,8 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts] ////
 
 //// [module.d.ts]
-declare module A {
-    export module Point {
+declare namespace A {
+    export namespace Point {
         export var Origin: {
             x: number;
             y: number;
@@ -11,7 +11,7 @@ declare module A {
 }
 
 //// [classPoint.ts]
-module A {
+namespace A {
     export class Point {
         constructor(public x: number, public y: number) { }
     }

tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts] ////
 
 === module.d.ts ===
-declare module A {
+declare namespace A {
 >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(classPoint.ts, 0, 0))
 
-    export module Point {
->Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10))
+    export namespace Point {
+>Point : Symbol(Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13))
 
         export var Origin: {
 >Origin : Symbol(Origin, Decl(module.d.ts, 2, 18))
@@ -20,11 +20,11 @@ declare module A {
 }
 
 === classPoint.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(classPoint.ts, 0, 0))
 
     export class Point {
->Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10))
+>Point : Symbol(Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(classPoint.ts, 2, 20))
@@ -41,14 +41,14 @@ var p: { x: number; y: number; }
 var p = A.Point.Origin;
 >p : Symbol(p, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(test.ts, 2, 3))
 >A.Point.Origin : Symbol(A.Point.Origin, Decl(module.d.ts, 2, 18))
->A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10))
+>A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13))
 >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(classPoint.ts, 0, 0))
->Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10))
+>Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13))
 >Origin : Symbol(A.Point.Origin, Decl(module.d.ts, 2, 18))
 
 var p = new A.Point(0, 0); // unexpected error here, bug 840000
 >p : Symbol(p, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(test.ts, 2, 3))
->A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10))
+>A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13))
 >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(classPoint.ts, 0, 0))
->Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10))
+>Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13))
 

tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts] ////
 
 === module.d.ts ===
-declare module A {
+declare namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 
-    export module Point {
+    export namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 
@@ -25,7 +25,7 @@ declare module A {
 }
 
 === classPoint.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts] ////
 
 //// [module.d.ts]
-declare module Point {
+declare namespace Point {
     export var Origin: { x: number; y: number; }
 }
 

tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.symbols

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts] ////
 
 === module.d.ts ===
-declare module Point {
+declare namespace Point {
 >Point : Symbol(Point, Decl(module.d.ts, 0, 0), Decl(function.ts, 0, 0))
 
     export var Origin: { x: number; y: number; }

tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts] ////
 
 === module.d.ts ===
-declare module Point {
+declare namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.errors.txt

@@ -14,7 +14,7 @@ ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): err
         value: T;
     }
     
-    module clodule1 {
+    namespace clodule1 {
         function f(x: T) { }
                       ~
 !!! error TS2304: Cannot find name 'T'.
@@ -26,7 +26,7 @@ ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): err
         value: T;
     }
     
-    module clodule2 {
+    namespace clodule2 {
         var x: T;
                ~
 !!! error TS2304: Cannot find name 'T'.
@@ -45,7 +45,7 @@ ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): err
         value: T;
     }
     
-    module clodule3 {
+    namespace clodule3 {
         export var y = { id: T };
                              ~
 !!! error TS2304: Cannot find name 'T'.
@@ -57,7 +57,7 @@ ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): err
         value: T;
     }
     
-    module clodule4 {
+    namespace clodule4 {
         class D {
             name: T;
                   ~

tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js

@@ -9,7 +9,7 @@ class clodule1<T>{
     value: T;
 }
 
-module clodule1 {
+namespace clodule1 {
     function f(x: T) { }
 }
 
@@ -19,7 +19,7 @@ class clodule2<T>{
     value: T;
 }
 
-module clodule2 {
+namespace clodule2 {
     var x: T;
 
     class D<U extends T>{
@@ -34,7 +34,7 @@ class clodule3<T>{
     value: T;
 }
 
-module clodule3 {
+namespace clodule3 {
     export var y = { id: T };
 }
 
@@ -44,7 +44,7 @@ class clodule4<T>{
     value: T;
 }
 
-module clodule4 {
+namespace clodule4 {
     class D {
         name: T;
     }

tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.symbols

@@ -15,11 +15,11 @@ class clodule1<T>{
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 2, 15))
 }
 
-module clodule1 {
+namespace clodule1 {
 >clodule1 : Symbol(clodule1, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 0, 0), Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 6, 1))
 
     function f(x: T) { }
->f : Symbol(f, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 8, 17))
+>f : Symbol(f, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 8, 20))
 >x : Symbol(x, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 9, 15))
 >T : Symbol(T)
 }
@@ -36,7 +36,7 @@ class clodule2<T>{
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 12, 15))
 }
 
-module clodule2 {
+namespace clodule2 {
 >clodule2 : Symbol(clodule2, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 10, 1), Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 16, 1))
 
     var x: T;
@@ -69,7 +69,7 @@ class clodule3<T>{
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 27, 15))
 }
 
-module clodule3 {
+namespace clodule3 {
 >clodule3 : Symbol(clodule3, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 25, 1), Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 31, 1))
 
     export var y = { id: T };
@@ -89,11 +89,11 @@ class clodule4<T>{
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 37, 15))
 }
 
-module clodule4 {
+namespace clodule4 {
 >clodule4 : Symbol(clodule4, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 35, 1), Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 41, 1))
 
     class D {
->D : Symbol(D, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 43, 17))
+>D : Symbol(D, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 43, 20))
 
         name: T;
 >name : Symbol(D.name, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 44, 13))

tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types

@@ -16,7 +16,7 @@ class clodule1<T>{
 >      : ^
 }
 
-module clodule1 {
+namespace clodule1 {
 >clodule1 : typeof clodule1
 >         : ^^^^^^^^^^^^^^^
 
@@ -40,7 +40,7 @@ class clodule2<T>{
 >      : ^
 }
 
-module clodule2 {
+namespace clodule2 {
 >clodule2 : typeof clodule2
 >         : ^^^^^^^^^^^^^^^
 
@@ -75,7 +75,7 @@ class clodule3<T>{
 >      : ^
 }
 
-module clodule3 {
+namespace clodule3 {
 >clodule3 : typeof clodule3
 >         : ^^^^^^^^^^^^^^^
 
@@ -103,7 +103,7 @@ class clodule4<T>{
 >      : ^
 }
 
-module clodule4 {
+namespace clodule4 {
 >clodule4 : typeof clodule4
 >         : ^^^^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt

@@ -12,7 +12,7 @@ ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFu
 !!! error TS2300: Duplicate identifier 'fn'.
     }
     
-    module clodule {
+    namespace clodule {
         // error: duplicate identifier expected
         export function fn<T>(x: T, y: T): T {
                         ~~

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js

@@ -8,7 +8,7 @@ class clodule<T> {
     static fn<U>(id: U) { }
 }
 
-module clodule {
+namespace clodule {
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): T {
         return x;

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.symbols

@@ -19,12 +19,12 @@ class clodule<T> {
 >U : Symbol(U, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 4, 14))
 }
 
-module clodule {
+namespace clodule {
 >clodule : Symbol(clodule, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 5, 1))
 
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): T {
->fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 7, 16))
+>fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 7, 19))
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 9, 23))
 >x : Symbol(x, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 9, 26))
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 9, 23))

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types

@@ -20,7 +20,7 @@ class clodule<T> {
 >   : ^
 }
 
-module clodule {
+namespace clodule {
 >clodule : typeof clodule
 >        : ^^^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt

@@ -12,7 +12,7 @@ ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStati
 !!! error TS2300: Duplicate identifier 'fn'.
     }
     
-    module clodule {
+    namespace clodule {
         // error: duplicate identifier expected
         export function fn<T>(x: T, y: T): T {
                         ~~

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js

@@ -8,7 +8,7 @@ class clodule<T> {
     static fn(id: string) { }
 }
 
-module clodule {
+namespace clodule {
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): T {
         return x;

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.symbols

@@ -17,12 +17,12 @@ class clodule<T> {
 >id : Symbol(id, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 4, 14))
 }
 
-module clodule {
+namespace clodule {
 >clodule : Symbol(clodule, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 5, 1))
 
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): T {
->fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 7, 16))
+>fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 7, 19))
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 9, 23))
 >x : Symbol(x, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 9, 26))
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 9, 23))

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types

@@ -20,7 +20,7 @@ class clodule<T> {
 >   : ^^^^^^
 }
 
-module clodule {
+namespace clodule {
 >clodule : typeof clodule
 >        : ^^^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt

@@ -9,7 +9,7 @@ ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics
         private static sfn(id: string) { return 42; }
     }
     
-    module clodule {
+    namespace clodule {
         // error: duplicate identifier expected
         export function fn<T>(x: T, y: T): number {
             return clodule.sfn('a');

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js

@@ -8,7 +8,7 @@ class clodule<T> {
     private static sfn(id: string) { return 42; }
 }
 
-module clodule {
+namespace clodule {
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): number {
         return clodule.sfn('a');

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.symbols

@@ -17,12 +17,12 @@ class clodule<T> {
 >id : Symbol(id, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 4, 23))
 }
 
-module clodule {
+namespace clodule {
 >clodule : Symbol(clodule, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 0, 0), Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 5, 1))
 
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): number {
->fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 7, 16))
+>fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 7, 19))
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 9, 23))
 >x : Symbol(x, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 9, 26))
 >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 9, 23))

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types

@@ -22,7 +22,7 @@ class clodule<T> {
 >   : ^^
 }
 
-module clodule {
+namespace clodule {
 >clodule : typeof clodule
 >        : ^^^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt

@@ -13,14 +13,14 @@ ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(20
 !!! error TS2300: Duplicate identifier 'Origin'.
     }
     
-    module Point {
+    namespace Point {
         export function Origin() { return null; } //expected duplicate identifier error
                         ~~~~~~
 !!! error TS2300: Duplicate identifier 'Origin'.
     }
     
     
-    module A {
+    namespace A {
         export class Point {
             constructor(public x: number, public y: number) { }
     
@@ -29,7 +29,7 @@ ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(20
 !!! error TS2300: Duplicate identifier 'Origin'.
         }
     
-        export module Point {
+        export namespace Point {
             export function Origin() { return ""; }//expected duplicate identifier error
                             ~~~~~~
 !!! error TS2300: Duplicate identifier 'Origin'.

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js

@@ -7,19 +7,19 @@ class Point {
     static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246
 }
 
-module Point {
+namespace Point {
     export function Origin() { return null; } //expected duplicate identifier error
 }
 
 
-module A {
+namespace A {
     export class Point {
         constructor(public x: number, public y: number) { }
 
         static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246
     }
 
-    export module Point {
+    export namespace Point {
         export function Origin() { return ""; }//expected duplicate identifier error
     }
 }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.symbols

@@ -15,19 +15,19 @@ class Point {
 >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 3, 43))
 }
 
-module Point {
+namespace Point {
 >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 4, 1))
 
     export function Origin() { return null; } //expected duplicate identifier error
->Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 6, 14))
+>Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 6, 17))
 }
 
 
-module A {
+namespace A {
 >A : Symbol(A, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 8, 1))
 
     export class Point {
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5))
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 13, 20))
@@ -35,15 +35,15 @@ module A {
 
         static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246
 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 13, 59))
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5))
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5))
 >x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 15, 41))
 >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 15, 47))
     }
 
-    export module Point {
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5))
+    export namespace Point {
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5))
 
         export function Origin() { return ""; }//expected duplicate identifier error
->Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 18, 25))
+>Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 18, 28))
     }
 }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types

@@ -26,7 +26,7 @@ class Point {
 >  : ^
 }
 
-module Point {
+namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 
@@ -36,7 +36,7 @@ module Point {
 }
 
 
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 
@@ -65,7 +65,7 @@ module A {
 >  : ^
     }
 
-    export module Point {
+    export namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js

@@ -7,19 +7,19 @@ class Point {
     static Origin(): Point { return { x: 0, y: 0 }; }
 }
 
-module Point {
+namespace Point {
     function Origin() { return ""; }// not an error, since not exported
 }
 
 
-module A {
+namespace A {
     export class Point {
         constructor(public x: number, public y: number) { }
 
         static Origin(): Point { return { x: 0, y: 0 }; }
     }
 
-    export module Point {
+    export namespace Point {
         function Origin() { return ""; }// not an error since not exported
     }
 }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols

@@ -15,19 +15,19 @@ class Point {
 >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 3, 43))
 }
 
-module Point {
+namespace Point {
 >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 4, 1))
 
     function Origin() { return ""; }// not an error, since not exported
->Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 6, 14))
+>Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 6, 17))
 }
 
 
-module A {
+namespace A {
 >A : Symbol(A, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 8, 1))
 
     export class Point {
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5))
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 20))
@@ -35,15 +35,15 @@ module A {
 
         static Origin(): Point { return { x: 0, y: 0 }; }
 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 59))
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5))
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5))
 >x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 15, 41))
 >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 15, 47))
     }
 
-    export module Point {
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5))
+    export namespace Point {
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5))
 
         function Origin() { return ""; }// not an error since not exported
->Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 18, 25))
+>Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 18, 28))
     }
 }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types

@@ -26,7 +26,7 @@ class Point {
 >  : ^
 }
 
-module Point {
+namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 
@@ -38,7 +38,7 @@ module Point {
 }
 
 
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 
@@ -67,7 +67,7 @@ module A {
 >  : ^
     }
 
-    export module Point {
+    export namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.errors.txt

@@ -13,14 +13,14 @@ ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts(20,20):
 !!! error TS2300: Duplicate identifier 'Origin'.
     }
     
-    module Point {
+    namespace Point {
         export var Origin = ""; //expected duplicate identifier error
                    ~~~~~~
 !!! error TS2300: Duplicate identifier 'Origin'.
     }
     
     
-    module A {
+    namespace A {
         export class Point {
             constructor(public x: number, public y: number) { }
     
@@ -29,7 +29,7 @@ ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts(20,20):
 !!! error TS2300: Duplicate identifier 'Origin'.
         }
     
-        export module Point {
+        export namespace Point {
             export var Origin = ""; //expected duplicate identifier error
                        ~~~~~~
 !!! error TS2300: Duplicate identifier 'Origin'.

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js

@@ -7,19 +7,19 @@ class Point {
     static Origin: Point = { x: 0, y: 0 };
 }
 
-module Point {
+namespace Point {
     export var Origin = ""; //expected duplicate identifier error
 }
 
 
-module A {
+namespace A {
     export class Point {
         constructor(public x: number, public y: number) { }
 
         static Origin: Point = { x: 0, y: 0 };
     }
 
-    export module Point {
+    export namespace Point {
         export var Origin = ""; //expected duplicate identifier error
     }
 }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.symbols

@@ -15,7 +15,7 @@ class Point {
 >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 3, 34))
 }
 
-module Point {
+namespace Point {
 >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 4, 1))
 
     export var Origin = ""; //expected duplicate identifier error
@@ -23,11 +23,11 @@ module Point {
 }
 
 
-module A {
+namespace A {
 >A : Symbol(A, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 8, 1))
 
     export class Point {
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5))
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 13, 20))
@@ -35,13 +35,13 @@ module A {
 
         static Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 13, 59))
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5))
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5))
 >x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 15, 32))
 >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 15, 38))
     }
 
-    export module Point {
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5))
+    export namespace Point {
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5))
 
         export var Origin = ""; //expected duplicate identifier error
 >Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 19, 18))

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types

@@ -26,7 +26,7 @@ class Point {
 >  : ^
 }
 
-module Point {
+namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 
@@ -38,7 +38,7 @@ module Point {
 }
 
 
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 
@@ -67,7 +67,7 @@ module A {
 >  : ^
     }
 
-    export module Point {
+    export namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js

@@ -7,19 +7,19 @@ class Point {
     static Origin: Point = { x: 0, y: 0 };
 }
 
-module Point {
+namespace Point {
     var Origin = ""; // not an error, since not exported
 }
 
 
-module A {
+namespace A {
     export class Point {
         constructor(public x: number, public y: number) { }
 
         static Origin: Point = { x: 0, y: 0 };
     }
 
-    export module Point {
+    export namespace Point {
         var Origin = ""; // not an error since not exported
     }
 }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols

@@ -15,7 +15,7 @@ class Point {
 >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 3, 34))
 }
 
-module Point {
+namespace Point {
 >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 4, 1))
 
     var Origin = ""; // not an error, since not exported
@@ -23,11 +23,11 @@ module Point {
 }
 
 
-module A {
+namespace A {
 >A : Symbol(A, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 8, 1))
 
     export class Point {
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5))
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 20))
@@ -35,13 +35,13 @@ module A {
 
         static Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 59))
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5))
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5))
 >x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 15, 32))
 >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 15, 38))
     }
 
-    export module Point {
->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5))
+    export namespace Point {
+>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5))
 
         var Origin = ""; // not an error since not exported
 >Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 19, 11))

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types

@@ -26,7 +26,7 @@ class Point {
 >  : ^
 }
 
-module Point {
+namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 
@@ -38,7 +38,7 @@ module Point {
 }
 
 
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 
@@ -67,7 +67,7 @@ module A {
 >  : ^
     }
 
-    export module Point {
+    export namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt

@@ -1,8 +1,8 @@
-module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged.
+module.ts(2,22): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged.
 
 
 ==== class.ts (0 errors) ====
-    module X.Y {
+    namespace X.Y {
         export class Point {
             constructor(x: number, y: number) {
                 this.x = x;
@@ -14,9 +14,9 @@ module.ts(2,19): error TS2433: A namespace declaration cannot be in a different
     }
     
 ==== module.ts (1 errors) ====
-    module X.Y {
-        export module Point {
-                      ~~~~~
+    namespace X.Y {
+        export namespace Point {
+                         ~~~~~
 !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged.
             export var Origin = new Point(0, 0);
         }
@@ -33,7 +33,7 @@ module.ts(2,19): error TS2433: A namespace declaration cannot be in a different
         id: string;
     }
     
-    module A {
+    namespace A {
         export var Instance = new A();
     }
     

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts] ////
 
 //// [class.ts]
-module X.Y {
+namespace X.Y {
     export class Point {
         constructor(x: number, y: number) {
             this.x = x;
@@ -13,8 +13,8 @@ module X.Y {
 }
 
 //// [module.ts]
-module X.Y {
-    export module Point {
+namespace X.Y {
+    export namespace Point {
         export var Origin = new Point(0, 0);
     }
 }
@@ -30,7 +30,7 @@ class A {
     id: string;
 }
 
-module A {
+namespace A {
     export var Instance = new A();
 }
 

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.symbols

@@ -1,12 +1,12 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts] ////
 
 === class.ts ===
-module X.Y {
+namespace X.Y {
 >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0))
->Y : Symbol(Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
+>Y : Symbol(Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
 
     export class Point {
->Point : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Point : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 
         constructor(x: number, y: number) {
 >x : Symbol(x, Decl(class.ts, 2, 20))
@@ -14,13 +14,13 @@ module X.Y {
 
             this.x = x;
 >this.x : Symbol(Point.x, Decl(class.ts, 5, 9))
->this : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>this : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 >x : Symbol(Point.x, Decl(class.ts, 5, 9))
 >x : Symbol(x, Decl(class.ts, 2, 20))
 
             this.y = y;
 >this.y : Symbol(Point.y, Decl(class.ts, 6, 18))
->this : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>this : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 >y : Symbol(Point.y, Decl(class.ts, 6, 18))
 >y : Symbol(y, Decl(class.ts, 2, 30))
         }
@@ -33,16 +33,16 @@ module X.Y {
 }
 
 === module.ts ===
-module X.Y {
+namespace X.Y {
 >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0))
->Y : Symbol(Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
+>Y : Symbol(Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
 
-    export module Point {
->Point : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+    export namespace Point {
+>Point : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 
         export var Origin = new Point(0, 0);
 >Origin : Symbol(Origin, Decl(module.ts, 2, 18))
->Point : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Point : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
     }
 }
 
@@ -50,20 +50,20 @@ module X.Y {
 //var cl: { x: number; y: number; }
 var cl = new X.Y.Point(1,1);
 >cl : Symbol(cl, Decl(test.ts, 1, 3), Decl(test.ts, 2, 3))
->X.Y.Point : Symbol(X.Y.Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
->X.Y : Symbol(X.Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
+>X.Y.Point : Symbol(X.Y.Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
+>X.Y : Symbol(X.Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
 >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0))
->Y : Symbol(X.Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
->Point : Symbol(X.Y.Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Y : Symbol(X.Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Point : Symbol(X.Y.Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 
 var cl = X.Y.Point.Origin; // error not expected here same as bug 83996 ?
 >cl : Symbol(cl, Decl(test.ts, 1, 3), Decl(test.ts, 2, 3))
 >X.Y.Point.Origin : Symbol(X.Y.Point.Origin, Decl(module.ts, 2, 18))
->X.Y.Point : Symbol(X.Y.Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
->X.Y : Symbol(X.Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
+>X.Y.Point : Symbol(X.Y.Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
+>X.Y : Symbol(X.Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
 >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0))
->Y : Symbol(X.Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
->Point : Symbol(X.Y.Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Y : Symbol(X.Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Point : Symbol(X.Y.Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 >Origin : Symbol(X.Y.Point.Origin, Decl(module.ts, 2, 18))
 
 
@@ -75,7 +75,7 @@ class A {
 >id : Symbol(A.id, Decl(simple.ts, 0, 9))
 }
 
-module A {
+namespace A {
 >A : Symbol(A, Decl(simple.ts, 0, 0), Decl(simple.ts, 2, 1))
 
     export var Instance = new A();

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts] ////
 
 === class.ts ===
-module X.Y {
+namespace X.Y {
 >X : typeof X
 >  : ^^^^^^^^
 >Y : typeof Y
@@ -52,13 +52,13 @@ module X.Y {
 }
 
 === module.ts ===
-module X.Y {
+namespace X.Y {
 >X : typeof X
 >  : ^^^^^^^^
 >Y : typeof Y
 >  : ^^^^^^^^
 
-    export module Point {
+    export namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 
@@ -127,7 +127,7 @@ class A {
 >   : ^^^^^^
 }
 
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt

@@ -1,8 +1,8 @@
-module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged.
+module.ts(2,22): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged.
 
 
 ==== class.ts (0 errors) ====
-    module X.Y {
+    namespace X.Y {
         export class Point {
             constructor(x: number, y: number) {
                 this.x = x;
@@ -14,9 +14,9 @@ module.ts(2,19): error TS2433: A namespace declaration cannot be in a different
     }
     
 ==== module.ts (1 errors) ====
-    module X.Y {
-        export module Point {
-                      ~~~~~
+    namespace X.Y {
+        export namespace Point {
+                         ~~~~~
 !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged.
             export var Origin = new Point(0, 0);
         }
@@ -33,7 +33,7 @@ module.ts(2,19): error TS2433: A namespace declaration cannot be in a different
         id: string;
     }
     
-    module A {
+    namespace A {
         export var Instance = new A();
     }
     

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts] ////
 
 //// [class.ts]
-module X.Y {
+namespace X.Y {
     export class Point {
         constructor(x: number, y: number) {
             this.x = x;
@@ -13,8 +13,8 @@ module X.Y {
 }
 
 //// [module.ts]
-module X.Y {
-    export module Point {
+namespace X.Y {
+    export namespace Point {
         export var Origin = new Point(0, 0);
     }
 }
@@ -30,7 +30,7 @@ class A {
     id: string;
 }
 
-module A {
+namespace A {
     export var Instance = new A();
 }
 

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.symbols

@@ -1,12 +1,12 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts] ////
 
 === class.ts ===
-module X.Y {
+namespace X.Y {
 >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0))
->Y : Symbol(Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
+>Y : Symbol(Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
 
     export class Point {
->Point : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Point : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 
         constructor(x: number, y: number) {
 >x : Symbol(x, Decl(class.ts, 2, 20))
@@ -14,13 +14,13 @@ module X.Y {
 
             this.x = x;
 >this.x : Symbol(Point.x, Decl(class.ts, 5, 9))
->this : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>this : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 >x : Symbol(Point.x, Decl(class.ts, 5, 9))
 >x : Symbol(x, Decl(class.ts, 2, 20))
 
             this.y = y;
 >this.y : Symbol(Point.y, Decl(class.ts, 6, 18))
->this : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>this : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 >y : Symbol(Point.y, Decl(class.ts, 6, 18))
 >y : Symbol(y, Decl(class.ts, 2, 30))
         }
@@ -33,16 +33,16 @@ module X.Y {
 }
 
 === module.ts ===
-module X.Y {
+namespace X.Y {
 >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0))
->Y : Symbol(Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
+>Y : Symbol(Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
 
-    export module Point {
->Point : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+    export namespace Point {
+>Point : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 
         export var Origin = new Point(0, 0);
 >Origin : Symbol(Origin, Decl(module.ts, 2, 18))
->Point : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Point : Symbol(Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
     }
 }
 
@@ -50,20 +50,20 @@ module X.Y {
 //var cl: { x: number; y: number; }
 var cl = new X.Y.Point(1,1);
 >cl : Symbol(cl, Decl(test.ts, 1, 3), Decl(test.ts, 2, 3))
->X.Y.Point : Symbol(X.Y.Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
->X.Y : Symbol(X.Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
+>X.Y.Point : Symbol(X.Y.Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
+>X.Y : Symbol(X.Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
 >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0))
->Y : Symbol(X.Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
->Point : Symbol(X.Y.Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Y : Symbol(X.Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Point : Symbol(X.Y.Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 
 var cl = X.Y.Point.Origin; // error not expected here same as bug 83996 ?
 >cl : Symbol(cl, Decl(test.ts, 1, 3), Decl(test.ts, 2, 3))
 >X.Y.Point.Origin : Symbol(X.Y.Point.Origin, Decl(module.ts, 2, 18))
->X.Y.Point : Symbol(X.Y.Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
->X.Y : Symbol(X.Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
+>X.Y.Point : Symbol(X.Y.Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
+>X.Y : Symbol(X.Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
 >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0))
->Y : Symbol(X.Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9))
->Point : Symbol(X.Y.Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Y : Symbol(X.Y, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12))
+>Point : Symbol(X.Y.Point, Decl(class.ts, 0, 15), Decl(module.ts, 0, 15))
 >Origin : Symbol(X.Y.Point.Origin, Decl(module.ts, 2, 18))
 
 
@@ -75,7 +75,7 @@ class A {
 >id : Symbol(A.id, Decl(simple.ts, 0, 9))
 }
 
-module A {
+namespace A {
 >A : Symbol(A, Decl(simple.ts, 0, 0), Decl(simple.ts, 2, 1))
 
     export var Instance = new A();

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts] ////
 
 === class.ts ===
-module X.Y {
+namespace X.Y {
 >X : typeof X
 >  : ^^^^^^^^
 >Y : typeof Y
@@ -52,13 +52,13 @@ module X.Y {
 }
 
 === module.ts ===
-module X.Y {
+namespace X.Y {
 >X : typeof X
 >  : ^^^^^^^^
 >Y : typeof Y
 >  : ^^^^^^^^
 
-    export module Point {
+    export namespace Point {
 >Point : typeof Point
 >      : ^^^^^^^^^^^^
 
@@ -127,7 +127,7 @@ class A {
 >   : ^^^^^^
 }
 
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ES5SymbolProperty2.errors.txt

@@ -2,7 +2,7 @@ ES5SymbolProperty2.ts(10,11): error TS2585: 'Symbol' only refers to a type, but
 
 
 ==== ES5SymbolProperty2.ts (1 errors) ====
-    module M {
+    namespace M {
         var Symbol: any;
     
         export class C {

tests/baselines/reference/ES5SymbolProperty2.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/Symbols/ES5SymbolProperty2.ts] ////
 
 //// [ES5SymbolProperty2.ts]
-module M {
+namespace M {
     var Symbol: any;
 
     export class C {

tests/baselines/reference/ES5SymbolProperty2.symbols

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/Symbols/ES5SymbolProperty2.ts] ////
 
 === ES5SymbolProperty2.ts ===
-module M {
+namespace M {
 >M : Symbol(M, Decl(ES5SymbolProperty2.ts, 0, 0))
 
     var Symbol: any;

tests/baselines/reference/ES5SymbolProperty2.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/Symbols/ES5SymbolProperty2.ts] ////
 
 === ES5SymbolProperty2.ts ===
-module M {
+namespace M {
 >M : typeof M
 >  : ^^^^^^^^
 

tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js

@@ -5,7 +5,7 @@ enum enumdule {
     Red, Blue
 }
 
-module enumdule {
+namespace enumdule {
 
     export class Point {
         constructor(public x: number, public y: number) { }

tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.symbols

@@ -9,11 +9,11 @@ enum enumdule {
 >Blue : Symbol(enumdule.Blue, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 1, 8))
 }
 
-module enumdule {
+namespace enumdule {
 >enumdule : Symbol(enumdule, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 0, 0), Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 2, 1))
 
     export class Point {
->Point : Symbol(Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 17))
+>Point : Symbol(Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 20))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 7, 20))
@@ -38,7 +38,7 @@ var y: { x: number; y: number };
 
 var y = new enumdule.Point(0, 0);
 >y : Symbol(y, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 14, 3), Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 15, 3))
->enumdule.Point : Symbol(enumdule.Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 17))
+>enumdule.Point : Symbol(enumdule.Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 20))
 >enumdule : Symbol(enumdule, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 0, 0), Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 2, 1))
->Point : Symbol(enumdule.Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 17))
+>Point : Symbol(enumdule.Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 20))
 

tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types

@@ -12,7 +12,7 @@ enum enumdule {
 >     : ^^^^^^^^^^^^^
 }
 
-module enumdule {
+namespace enumdule {
 >enumdule : typeof enumdule
 >         : ^^^^^^^^^^^^^^^
 

tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts] ////
 
 //// [ExportClassWhichExtendsInterfaceWithInaccessibleType.ts]
-module A {
+namespace A {
 
     interface Point {
         x: number;

tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts] ////
 
 === ExportClassWhichExtendsInterfaceWithInaccessibleType.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 0))
 
     interface Point {
->Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 2, 21))
@@ -16,12 +16,12 @@ module A {
         fromOrigin(p: Point): number;
 >fromOrigin : Symbol(Point.fromOrigin, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 4, 18))
 >p : Symbol(p, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 6, 19))
->Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 13))
     }
 
     export class Point2d implements Point {
 >Point2d : Symbol(Point2d, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 7, 5))
->Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 13))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point2d.x, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 20))
@@ -30,7 +30,7 @@ module A {
         fromOrigin(p: Point) {
 >fromOrigin : Symbol(Point2d.fromOrigin, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 59))
 >p : Symbol(p, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 12, 19))
->Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 13))
 
             return 1;
         }

tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts] ////
 
 === ExportClassWhichExtendsInterfaceWithInaccessibleType.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] ////
 
 //// [ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts]
-module A {
+namespace A {
 
     export class Point {
         x: number;

tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] ////
 
 === ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 0))
 
     export class Point {
->Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 2, 24))
@@ -16,13 +16,13 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Origin, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 14))
->Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13))
 >x : Symbol(x, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 32))
 >y : Symbol(y, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 38))
 
     export class Point3d extends Point {
 >Point3d : Symbol(Point3d, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 46))
->Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13))
 
         z: number;
 >z : Symbol(Point3d.z, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 9, 40))
@@ -38,7 +38,7 @@ module A {
     export class Line<TPoint extends Point>{
 >Line : Symbol(Line, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 13, 56))
 >TPoint : Symbol(TPoint, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 22))
->Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13))
 
         constructor(public start: TPoint, public end: TPoint) { }
 >start : Symbol(Line.start, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 20))

tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] ////
 
 === ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts] ////
 
 //// [ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts]
-module A {
+namespace A {
 
     class Point {
         x: number;

tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts] ////
 
 === ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 0))
 
     class Point {
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 2, 17))
@@ -19,11 +19,11 @@ module A {
 
         [idx: number]: Point;
 >idx : Symbol(idx, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 9, 9))
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13))
 
         [idx: string]: Point;
 >idx : Symbol(idx, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 10, 9))
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13))
     }
 }
 

tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts] ////
 
 === ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts] ////
 
 //// [ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts]
-module A {
+namespace A {
 
     class Point {
         x: number;

tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts] ////
 
 === ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 0))
 
     class Point {
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 2, 17))
@@ -16,13 +16,13 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Origin, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 14))
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 >x : Symbol(x, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 32))
 >y : Symbol(y, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 38))
 
     export class Point3d extends Point {
 >Point3d : Symbol(Point3d, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 46))
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 
         z: number;
 >z : Symbol(Point3d.z, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 9, 40))
@@ -38,7 +38,7 @@ module A {
     export class Line<TPoint extends Point>{
 >Line : Symbol(Line, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 13, 56))
 >TPoint : Symbol(TPoint, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 22))
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 
         constructor(public start: TPoint, public end: TPoint) { }
 >start : Symbol(Line.start, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 20))
@@ -49,9 +49,9 @@ module A {
         static fromorigin2d(p: Point): Line<Point>{
 >fromorigin2d : Symbol(Line.fromorigin2d, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 65))
 >p : Symbol(p, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 18, 28))
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 >Line : Symbol(Line, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 13, 56))
->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 
             return null;
         }

tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts] ////
 
 === ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts] ////
 
 //// [ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts]
-module A {
+namespace A {
 
     export class Point {
         x: number;

tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts] ////
 
 === ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 0))
 
     export class Point {
->Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 2, 24))
@@ -19,15 +19,15 @@ module A {
 
         constructor(public start: Point, public end: Point) { }
 >start : Symbol(Line.start, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 8, 20))
->Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 13))
 >end : Symbol(Line.end, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 8, 40))
->Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 13))
     }
 
     export function fromOrigin(p: Point): Line {
 >fromOrigin : Symbol(fromOrigin, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 9, 5))
 >p : Symbol(p, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 11, 31))
->Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 13))
 >Line : Symbol(Line, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 5, 5))
 
         return new Line({ x: 0, y: 0 }, p);

tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts] ////
 
 === ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts] ////
 
 //// [ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts]
-module A {
+namespace A {
 
     class Point {
         x: number;

tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts] ////
 
 === ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 0))
 
     class Point {
->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 2, 17))
@@ -19,15 +19,15 @@ module A {
 
         constructor(public start: Point, public end: Point) { }
 >start : Symbol(Line.start, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 8, 20))
->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 13))
 >end : Symbol(Line.end, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 8, 40))
->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 13))
     }
 
     export function fromOrigin(p: Point): Line {
 >fromOrigin : Symbol(fromOrigin, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 9, 5))
 >p : Symbol(p, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 11, 31))
->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 13))
 >Line : Symbol(Line, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 5, 5))
 
         return new Line({ x: 0, y: 0 }, p);

tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts] ////
 
 === ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts] ////
 
 //// [ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts]
-module A {
+namespace A {
 
     export class Point {
         x: number;

tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts] ////
 
 === ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 0))
 
     export class Point {
->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 2, 24))
@@ -19,15 +19,15 @@ module A {
 
         constructor(public start: Point, public end: Point) { }
 >start : Symbol(Line.start, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 8, 20))
->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 13))
 >end : Symbol(Line.end, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 8, 40))
->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 13))
     }
 
     export function fromOrigin(p: Point): Line {
 >fromOrigin : Symbol(fromOrigin, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 9, 5))
 >p : Symbol(p, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 11, 31))
->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 13))
 >Line : Symbol(Line, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 5, 5))
 
         return new Line({ x: 0, y: 0 }, p);

tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts] ////
 
 === ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] ////
 
 //// [ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts]
-module A {
+namespace A {
 
     export interface Point {
         x: number;

tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] ////
 
 === ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 0))
 
     export interface Point {
->Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 2, 28))
@@ -16,13 +16,13 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Origin, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 14))
->Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13))
 >x : Symbol(x, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 32))
 >y : Symbol(y, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 38))
 
     export interface Point3d extends Point {
 >Point3d : Symbol(Point3d, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 46))
->Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13))
 
         z: number;
 >z : Symbol(Point3d.z, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 9, 44))
@@ -38,7 +38,7 @@ module A {
     export interface Line<TPoint extends Point>{
 >Line : Symbol(Line, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 13, 56))
 >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 26))
->Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13))
 
         new (start: TPoint, end: TPoint);
 >start : Symbol(start, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 13))

tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] ////
 
 === ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts] ////
 
 //// [ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts]
-module A {
+namespace A {
 
     interface Point {
         x: number;

tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts] ////
 
 === ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 0))
 
     interface Point {
->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 2, 21))
@@ -19,11 +19,11 @@ module A {
 
         [idx: number]: Point;
 >idx : Symbol(idx, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 9, 9))
->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13))
 
         [idx: string]: Point;
 >idx : Symbol(idx, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 10, 9))
->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13))
     }
 }
 

tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts] ////
 
 === ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
-module A {
+namespace A {
 
     interface Point {
         x: number;

tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts] ////
 
 //// [ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts]
-module A {
+namespace A {
 
     interface Point {
         x: number;

tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts] ////
 
 === ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 0))
 
     interface Point {
->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 
         x: number;
 >x : Symbol(Point.x, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 2, 21))
@@ -16,13 +16,13 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Origin, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 14))
->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 >x : Symbol(x, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 32))
 >y : Symbol(y, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 38))
 
     export interface Point3d extends Point {
 >Point3d : Symbol(Point3d, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 46))
->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 
         z: number;
 >z : Symbol(Point3d.z, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 9, 44))
@@ -38,7 +38,7 @@ module A {
     export interface Line<TPoint extends Point>{
 >Line : Symbol(Line, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 13, 56))
 >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 26))
->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13))
 
         new (start: TPoint, end: TPoint);
 >start : Symbol(start, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 13))

tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts] ////
 
 === ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js

@@ -1,13 +1,13 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts] ////
 
 //// [ExportModuleWithAccessibleTypesOnItsExportedMembers.ts]
-module A {
+namespace A {
 
     export class Point {
         constructor(public x: number, public y: number) { }
     }
 
-    export module B {
+    export namespace B {
         export var Origin: Point = new Point(0, 0);
 
         export class Line {

tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols

@@ -1,40 +1,40 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts] ////
 
 === ExportModuleWithAccessibleTypesOnItsExportedMembers.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 0))
 
     export class Point {
->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 3, 20))
 >y : Symbol(Point.y, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 3, 37))
     }
 
-    export module B {
+    export namespace B {
 >B : Symbol(B, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 4, 5))
 
         export var Origin: Point = new Point(0, 0);
 >Origin : Symbol(Origin, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 7, 18))
->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10))
->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13))
+>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13))
 
         export class Line {
 >Line : Symbol(Line, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 7, 51))
 
             constructor(start: Point, end: Point) {
 >start : Symbol(start, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 10, 24))
->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13))
 >end : Symbol(end, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 10, 37))
->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13))
 
             }
 
             static fromOrigin(p: Point) {
 >fromOrigin : Symbol(Line.fromOrigin, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 12, 13))
 >p : Symbol(p, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 14, 30))
->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13))
 
                 return new Line({ x: 0, y: 0 }, p);
 >Line : Symbol(Line, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 7, 51))

tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts] ////
 
 === ExportModuleWithAccessibleTypesOnItsExportedMembers.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 
@@ -16,7 +16,7 @@ module A {
 >  : ^^^^^^
     }
 
-    export module B {
+    export namespace B {
 >B : typeof B
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts] ////
 
 //// [ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts]
-module A {
+namespace A {
 
     class Point {
         constructor(public x: number, public y: number) { }

tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts] ////
 
 === ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 0))
 
     class Point {
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 13))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 3, 20))
@@ -14,15 +14,15 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Origin, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 6, 14))
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 13))
 >x : Symbol(x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 6, 32))
 >y : Symbol(y, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 6, 38))
 
     export var Unity = { start: new Point(0, 0), end: new Point(1, 0) };
 >Unity : Symbol(Unity, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 8, 14))
 >start : Symbol(start, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 8, 24))
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 13))
 >end : Symbol(end, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 8, 48))
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 13))
 }
 

tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts] ////
 
 === ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts] ////
 
 //// [ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts]
-module A {
+namespace A {
 
     class Point {
         constructor(public x: number, public y: number) { }

tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts] ////
 
 === ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 0))
 
     class Point {
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13))
 
         constructor(public x: number, public y: number) { }
 >x : Symbol(Point.x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 3, 20))
@@ -18,16 +18,16 @@ module A {
         top: { left: Point, right: Point },
 >top : Symbol(top, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 6, 29))
 >left : Symbol(left, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 7, 14))
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13))
 >right : Symbol(right, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 7, 27))
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13))
 
         bottom: { left: Point, right: Point }
 >bottom : Symbol(bottom, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 7, 43))
 >left : Symbol(left, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 8, 17))
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13))
 >right : Symbol(right, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 8, 30))
->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10))
+>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13))
 
     } = null;
 }

tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts] ////
 
 === ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts] ////
 
 //// [ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts]
-module A {
+namespace A {
     class B {
         id: number;
     }

tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols

@@ -1,11 +1,11 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts] ////
 
 === ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts ===
-module A {
+namespace A {
 >A : Symbol(A, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 0))
 
     class B {
->B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10))
+>B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 13))
 
         id: number;
 >id : Symbol(B.id, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 1, 13))
@@ -14,10 +14,10 @@ module A {
     export var beez: Array<B>;
 >beez : Symbol(beez, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 5, 14))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10))
+>B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 13))
 
     export var beez2 = new Array<B>();
 >beez2 : Symbol(beez2, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 6, 14))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10))
+>B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 13))
 }

tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts] ////
 
 === ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts ===
-module A {
+namespace A {
 >A : typeof A
 >  : ^^^^^^^^
 

tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts] ////
 
 //// [ExportVariableWithAccessibleTypeInTypeAnnotation.ts]
-module A {
+namespace A {
 
     export interface Point {
         x: number;