diff --git a/tests/cases/compiler/acceptableAlias1.ts b/tests/cases/compiler/acceptableAlias1.ts
index 585194297ba..c98c1111c07 100644
--- a/tests/cases/compiler/acceptableAlias1.ts
+++ b/tests/cases/compiler/acceptableAlias1.ts
@@ -1,5 +1,5 @@
 namespace M {
-    export module N {
+    export namespace N {
     }
     export import X = N;
 }
diff --git a/tests/cases/compiler/accessorsInAmbientContext.ts b/tests/cases/compiler/accessorsInAmbientContext.ts
index 2596097da1e..9d9edd41958 100644
--- a/tests/cases/compiler/accessorsInAmbientContext.ts
+++ b/tests/cases/compiler/accessorsInAmbientContext.ts
@@ -1,6 +1,6 @@
 // @target: es5
 
-declare module M {
+declare namespace M {
     class C {
         get X() { return 1; }
         set X(v) { }
diff --git a/tests/cases/compiler/aliasBug.ts b/tests/cases/compiler/aliasBug.ts
index 08505b6ac4e..8ccec7283c1 100644
--- a/tests/cases/compiler/aliasBug.ts
+++ b/tests/cases/compiler/aliasBug.ts
@@ -4,7 +4,7 @@ namespace foo {
     export class Provide {
     }
 
-    export module bar { export module baz {export class boo {}}}
+    export namespace bar { export module baz {export class boo {}}}
 }
 
 import provide = foo;
diff --git a/tests/cases/compiler/aliasErrors.ts b/tests/cases/compiler/aliasErrors.ts
index df39970b84c..a1324781664 100644
--- a/tests/cases/compiler/aliasErrors.ts
+++ b/tests/cases/compiler/aliasErrors.ts
@@ -1,7 +1,7 @@
 namespace foo {    
     export class Provide {
     }
-    export module bar { export module baz {export class boo {}}}
+    export namespace bar { export module baz {export class boo {}}}
 }
 
 import provide = foo;
diff --git a/tests/cases/compiler/aliasOnMergedModuleInterface.ts b/tests/cases/compiler/aliasOnMergedModuleInterface.ts
index dd1f707e092..bfa18356414 100644
--- a/tests/cases/compiler/aliasOnMergedModuleInterface.ts
+++ b/tests/cases/compiler/aliasOnMergedModuleInterface.ts
@@ -2,7 +2,7 @@
 // @Filename: aliasOnMergedModuleInterface_0.ts
 declare module "foo"
 {
-    module B {
+    namespace B {
         export interface A {
         }
     }
diff --git a/tests/cases/compiler/ambientEnumElementInitializer6.ts b/tests/cases/compiler/ambientEnumElementInitializer6.ts
index 09e6f1759d1..daa4b039205 100644
--- a/tests/cases/compiler/ambientEnumElementInitializer6.ts
+++ b/tests/cases/compiler/ambientEnumElementInitializer6.ts
@@ -1,4 +1,4 @@
-declare module M {
+declare namespace M {
     enum E {
         e = 3
     }
diff --git a/tests/cases/compiler/ambientFundule.ts b/tests/cases/compiler/ambientFundule.ts
index 56c21d34292..772ae088eb1 100644
--- a/tests/cases/compiler/ambientFundule.ts
+++ b/tests/cases/compiler/ambientFundule.ts
@@ -1,3 +1,3 @@
 declare function f();
-declare module f { var x }
+declare namespace f { var x }
 declare function f(x);
\ No newline at end of file
diff --git a/tests/cases/compiler/ambientModuleExports.ts b/tests/cases/compiler/ambientModuleExports.ts
index cc0b3968348..fe37cf93305 100644
--- a/tests/cases/compiler/ambientModuleExports.ts
+++ b/tests/cases/compiler/ambientModuleExports.ts
@@ -1,4 +1,4 @@
-declare module Foo {
+declare namespace Foo {
 	function a():void;
 	var b:number;
 	class C {}
@@ -8,7 +8,7 @@ Foo.a();
 Foo.b;
 var c = new Foo.C();
 
-declare module Foo2 {
+declare namespace Foo2 {
     export function a(): void;
     export var b: number;
     export class C { }
diff --git a/tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts b/tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts
index d34f29b0ad6..66afd8c29ce 100644
--- a/tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts
+++ b/tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts
@@ -1,4 +1,4 @@
-declare module foo {
+declare namespace foo {
     class A { }
     class B extends A { }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/ambientModuleWithTemplateLiterals.ts b/tests/cases/compiler/ambientModuleWithTemplateLiterals.ts
index 74c1b29e52d..ed2ce6c3c9e 100644
--- a/tests/cases/compiler/ambientModuleWithTemplateLiterals.ts
+++ b/tests/cases/compiler/ambientModuleWithTemplateLiterals.ts
@@ -1,4 +1,4 @@
-declare module Foo {
+declare namespace Foo {
     enum Bar {
         a = `1`,
         b = '2',
diff --git a/tests/cases/compiler/ambientStatement1.ts b/tests/cases/compiler/ambientStatement1.ts
index b2d1bb9d499..faf98c2dd67 100644
--- a/tests/cases/compiler/ambientStatement1.ts
+++ b/tests/cases/compiler/ambientStatement1.ts
@@ -1,4 +1,4 @@
-    declare module M1 {
+    declare namespace M1 {
     	while(true);
     
     	export var v1 = () => false;
diff --git a/tests/cases/compiler/ambientWithStatements.ts b/tests/cases/compiler/ambientWithStatements.ts
index 297776fafa6..d4dcc3a5b7d 100644
--- a/tests/cases/compiler/ambientWithStatements.ts
+++ b/tests/cases/compiler/ambientWithStatements.ts
@@ -1,4 +1,4 @@
-declare module M {
+declare namespace M {
     break;
     continue;
     debugger;
diff --git a/tests/cases/compiler/arraySigChecking.ts b/tests/cases/compiler/arraySigChecking.ts
index a9536084de2..191f13f5afb 100644
--- a/tests/cases/compiler/arraySigChecking.ts
+++ b/tests/cases/compiler/arraySigChecking.ts
@@ -1,4 +1,4 @@
-declare module M {
+declare namespace M {
     interface iBar { t: any; }
     interface iFoo extends iBar {
         s: any;
diff --git a/tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts b/tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts
index 8a92aaa34b4..3f188884b8d 100644
--- a/tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts
+++ b/tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts
@@ -1,9 +1,9 @@
-declare module WinJS {
+declare namespace WinJS {
     class Promise<T> {
         then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
     }
 }
-declare module Data {
+declare namespace Data {
     export interface IListItem<T> {
         itemIndex: number;
         key: any;
diff --git a/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts b/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts
index 3fa6f8f5dda..f3881804c46 100644
--- a/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts
+++ b/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts
@@ -1,4 +1,4 @@
-declare module m {
+declare namespace m {
     var f;
     var prototype; // This should be error since prototype would be static property on class m
 }
diff --git a/tests/cases/compiler/bluebirdStaticThis.ts b/tests/cases/compiler/bluebirdStaticThis.ts
index 21b4d244dec..02dab6f350a 100644
--- a/tests/cases/compiler/bluebirdStaticThis.ts
+++ b/tests/cases/compiler/bluebirdStaticThis.ts
@@ -108,7 +108,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
     static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
 }
 
-export declare module Promise {
+export declare namespace Promise {
 	export interface Thenable<R> {
 		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>;
 		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
diff --git a/tests/cases/compiler/chainedImportAlias.ts b/tests/cases/compiler/chainedImportAlias.ts
index 5b91c58f4bc..3c727169c74 100644
--- a/tests/cases/compiler/chainedImportAlias.ts
+++ b/tests/cases/compiler/chainedImportAlias.ts
@@ -1,6 +1,6 @@
 // @module: commonjs
 // @Filename: chainedImportAlias_file0.ts
-export module m {
+export namespace m {
     export function foo() { }
 }
 
diff --git a/tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts b/tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts
index eeebe4c5fcb..8d14aefdb71 100644
--- a/tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts
+++ b/tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts
@@ -1,6 +1,6 @@
 namespace M {
     export class N { }
-    export module N {
+    export namespace N {
         export var v = 0;
     }
 }
diff --git a/tests/cases/compiler/classdecl.ts b/tests/cases/compiler/classdecl.ts
index 3e5e247fcd9..3005d77d496 100644
--- a/tests/cases/compiler/classdecl.ts
+++ b/tests/cases/compiler/classdecl.ts
@@ -51,7 +51,7 @@ namespace m1 {
 
 namespace m2 {
 
-    export module m3 {
+    export namespace m3 {
         export class c extends b {
         }
         export class ib2 implements m1.ib {
diff --git a/tests/cases/compiler/cloduleAcrossModuleDefinitions.ts b/tests/cases/compiler/cloduleAcrossModuleDefinitions.ts
index cdb9367e8f4..0d76f6c4c24 100644
--- a/tests/cases/compiler/cloduleAcrossModuleDefinitions.ts
+++ b/tests/cases/compiler/cloduleAcrossModuleDefinitions.ts
@@ -6,7 +6,7 @@ namespace A {
 }
 
 namespace A {
-    export module B {
+    export namespace B {
         export var x = 1;
     }
 }
diff --git a/tests/cases/compiler/cloduleWithRecursiveReference.ts b/tests/cases/compiler/cloduleWithRecursiveReference.ts
index c67df6c12a1..0a01dc87abb 100644
--- a/tests/cases/compiler/cloduleWithRecursiveReference.ts
+++ b/tests/cases/compiler/cloduleWithRecursiveReference.ts
@@ -1,7 +1,7 @@
 namespace M
 {
   export class C {  }
-  export module C {
+  export namespace C {
     export var C = M.C
   }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts
index 7a18f239712..ad703c2fddc 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts
@@ -4,7 +4,7 @@ export declare class require {
 }
 export declare class exports {
 }
-declare module m1 {
+declare namespace m1 {
     class require {
     }
     class exports {
@@ -22,7 +22,7 @@ declare class require {
 }
 declare class exports {
 }
-declare module m3 {
+declare namespace m3 {
     class require {
     }
     class exports {
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
index 3aa2a0ff002..c303a099b16 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
@@ -8,7 +8,7 @@ export declare enum exports {
     _thisVal1,
     _thisVal2,
 }
-declare module m1 {
+declare namespace m1 {
     enum require {
         _thisVal1,
         _thisVal2,
@@ -38,7 +38,7 @@ declare enum exports {
     _thisVal1,
     _thisVal2,
 }
-declare module m3 {
+declare namespace m3 {
     enum require {
         _thisVal1,
         _thisVal2,
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
index fa2ffac8d5b..5b54298b587 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
@@ -3,7 +3,7 @@ export declare function exports(): number;
 
 export declare function require(): string[];
     
-declare module m1 {
+declare namespace m1 {
     function exports(): string;
     function require(): number;
 }
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientFunctionInGlobalFile.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientFunctionInGlobalFile.ts
index 27bc3137475..78f6591ff17 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientFunctionInGlobalFile.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientFunctionInGlobalFile.ts
@@ -1,6 +1,6 @@
 declare function exports(): number;
 declare function require(): string;
-declare module m3 {
+declare namespace m3 {
     function exports(): string[];
     function require(): number[];
 }
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts
index adbea6947fd..cc37a4cf670 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts
@@ -1,6 +1,6 @@
 //@module: amd
 //@filename: collisionExportsRequireAndAmbientModule_externalmodule.ts
-export declare module require {
+export declare namespace require {
     export interface I {
     }
     export class C {
@@ -9,7 +9,7 @@ export declare module require {
 export function foo(): require.I {
     return null;
 }
-export declare module exports {
+export declare namespace exports {
     export interface I {
     }
     export class C {
@@ -18,7 +18,7 @@ export declare module exports {
 export function foo2(): exports.I {
     return null;
 }
-declare module m1 {
+declare namespace m1 {
     namespace require {
         export interface I {
         }
@@ -33,13 +33,13 @@ declare module m1 {
     }
 }
 namespace m2 {
-    export declare module require {
+    export declare namespace require {
         export interface I {
         }
         export class C {
         }
     }
-    export declare module exports {
+    export declare namespace exports {
         export interface I {
         }
         export class C {
@@ -49,19 +49,19 @@ namespace m2 {
 }
 
 //@filename: collisionExportsRequireAndAmbientModule_globalFile.ts
-declare module require {
+declare namespace require {
     export interface I {
     }
     export class C {
     }
 }
-declare module exports {
+declare namespace exports {
     export interface I {
     }
     export class C {
     }
 }
-declare module m3 {
+declare namespace m3 {
     namespace require {
         export interface I {
         }
@@ -76,13 +76,13 @@ declare module m3 {
     }
 }
 namespace m4 {
-    export declare module require {
+    export declare namespace require {
         export interface I {
         }
         export class C {
         }
     }
-    export declare module exports {
+    export declare namespace exports {
         export interface I {
         }
         export class C {
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
index 3736d7eb344..25c98898c72 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
@@ -2,7 +2,7 @@
 //@filename: collisionExportsRequireAndAmbientVar_externalmodule.ts
 export declare var exports: number;
 export declare var require: string;
-declare module m1 {
+declare namespace m1 {
     var exports: string;
     var require: number;
 }
@@ -15,7 +15,7 @@ namespace m2 {
 //@filename: collisionExportsRequireAndAmbientVar_globalFile.ts
 declare var exports: number;
 declare var require: string;
-declare module m3 {
+declare namespace m3 {
     var exports: string;
     var require: number;
 }
diff --git a/tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts b/tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts
index c65942da203..62158e2052f 100644
--- a/tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts
@@ -1,5 +1,5 @@
 //@module: amd
-export module m {
+export namespace m {
     export class c {
     }
 }
diff --git a/tests/cases/compiler/collisionExportsRequireAndModule.ts b/tests/cases/compiler/collisionExportsRequireAndModule.ts
index 2879d5d4bb1..66fb1b0102f 100644
--- a/tests/cases/compiler/collisionExportsRequireAndModule.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndModule.ts
@@ -1,6 +1,6 @@
 //@module: amd
 //@filename: collisionExportsRequireAndModule_externalmodule.ts
-export module require {
+export namespace require {
     export interface I {
     }
     export class C {
@@ -9,7 +9,7 @@ export module require {
 export function foo(): require.I {
     return null;
 }
-export module exports {
+export namespace exports {
     export interface I {
     }
     export class C {
@@ -33,13 +33,13 @@ namespace m1 {
     }
 }
 namespace m2 {
-    export module require {
+    export namespace require {
         export interface I {
         }
         export class C {
         }
     }
-    export module exports {
+    export namespace exports {
         export interface I {
         }
         export class C {
@@ -75,13 +75,13 @@ namespace m3 {
     }
 }
 namespace m4 {
-    export module require {
+    export namespace require {
         export interface I {
         }
         export class C {
         }
     }
-    export module exports {
+    export namespace exports {
         export interface I {
         }
         export class C {
diff --git a/tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts b/tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts
index a63972d1550..2f6d038edfa 100644
--- a/tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts
@@ -1,12 +1,12 @@
 //@module: amd
-export module require { // no error 
+export namespace require { // no error 
     export interface I {
     }
 }
 export function foo(): require.I {
     return null;
 }
-export module exports { // no error
+export namespace exports { // no error
     export interface I {
     }
 }
diff --git a/tests/cases/compiler/commentOnAmbientModule.ts b/tests/cases/compiler/commentOnAmbientModule.ts
index a8aeab7efba..d878760fa2d 100644
--- a/tests/cases/compiler/commentOnAmbientModule.ts
+++ b/tests/cases/compiler/commentOnAmbientModule.ts
@@ -5,18 +5,18 @@
 */
 
 /*! Don't keep this pinned comment */
-declare module C {
+declare namespace C {
     function foo();
 }
 
 // Don't keep this comment.
-declare module D {
+declare namespace D {
     class bar { }
 }
 
 //@filename: b.ts
 ///<reference path="a.ts"/>
-declare module E {
+declare namespace E {
     class foobar extends D.bar {
         foo();
     }
diff --git a/tests/cases/compiler/commentsExternalModules.ts b/tests/cases/compiler/commentsExternalModules.ts
index 04489611427..808b717fda5 100644
--- a/tests/cases/compiler/commentsExternalModules.ts
+++ b/tests/cases/compiler/commentsExternalModules.ts
@@ -5,7 +5,7 @@
 
 // @Filename: commentsExternalModules_0.ts
 /** Module comment*/
-export module m1 {
+export namespace m1 {
     /** b's comment*/
     export var b: number;
     /** foo's comment*/
@@ -13,7 +13,7 @@ export module m1 {
         return b;
     }
     /** m2 comments*/
-    export module m2 {
+    export namespace m2 {
         /** class comment;*/
         export class c {
         };
@@ -29,7 +29,7 @@ m1.fooExport();
 var myvar = new m1.m2.c();
 
 /** Module comment */
-export module m4 {
+export namespace m4 {
     /** b's comment */
     export var b: number;
     /** foo's comment
@@ -39,7 +39,7 @@ export module m4 {
     }
     /** m2 comments
     */
-    export module m2 {
+    export namespace m2 {
         /** class comment; */
         export class c {
         };
diff --git a/tests/cases/compiler/commentsExternalModules2.ts b/tests/cases/compiler/commentsExternalModules2.ts
index b1dfb04902b..538579e8adf 100644
--- a/tests/cases/compiler/commentsExternalModules2.ts
+++ b/tests/cases/compiler/commentsExternalModules2.ts
@@ -5,7 +5,7 @@
 
 // @Filename: commentsExternalModules2_0.ts
 /** Module comment*/
-export module m1 {
+export namespace m1 {
     /** b's comment*/
     export var b: number;
     /** foo's comment*/
@@ -13,7 +13,7 @@ export module m1 {
         return b;
     }
     /** m2 comments*/
-    export module m2 {
+    export namespace m2 {
         /** class comment;*/
         export class c {
         };
@@ -29,7 +29,7 @@ m1.fooExport();
 var myvar = new m1.m2.c();
 
 /** Module comment */
-export module m4 {
+export namespace m4 {
     /** b's comment */
     export var b: number;
     /** foo's comment
@@ -39,7 +39,7 @@ export module m4 {
     }
     /** m2 comments
     */
-    export module m2 {
+    export namespace m2 {
         /** class comment; */
         export class c {
         };
diff --git a/tests/cases/compiler/commentsExternalModules3.ts b/tests/cases/compiler/commentsExternalModules3.ts
index a59458893ca..07d1d4bd40c 100644
--- a/tests/cases/compiler/commentsExternalModules3.ts
+++ b/tests/cases/compiler/commentsExternalModules3.ts
@@ -5,7 +5,7 @@
 
 // @Filename: commentsExternalModules2_0.ts
 /** Module comment*/
-export module m1 {
+export namespace m1 {
     /** b's comment*/
     export var b: number;
     /** foo's comment*/
@@ -13,7 +13,7 @@ export module m1 {
         return b;
     }
     /** m2 comments*/
-    export module m2 {
+    export namespace m2 {
         /** class comment;*/
         export class c {
         };
@@ -29,7 +29,7 @@ m1.fooExport();
 var myvar = new m1.m2.c();
 
 /** Module comment */
-export module m4 {
+export namespace m4 {
     /** b's comment */
     export var b: number;
     /** foo's comment
@@ -39,7 +39,7 @@ export module m4 {
     }
     /** m2 comments
     */
-    export module m2 {
+    export namespace m2 {
         /** class comment; */
         export class c {
         };
diff --git a/tests/cases/compiler/commentsModules.ts b/tests/cases/compiler/commentsModules.ts
index 6717cdd2098..de0bea7b635 100644
--- a/tests/cases/compiler/commentsModules.ts
+++ b/tests/cases/compiler/commentsModules.ts
@@ -10,7 +10,7 @@ namespace m1 {
         return b;
     }
     /** m2 comments*/
-    export module m2 {
+    export namespace m2 {
         /** class comment;*/
         export class c {
         };
@@ -56,7 +56,7 @@ module m3.m4.m5 {
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 module m4.m5.m6 {
-    export module m7 {
+    export namespace m7 {
         /** Exported class comment*/
         export class c {
         }
@@ -66,7 +66,7 @@ new m4.m5.m6.m7.c();
 /** module comment of m5.m6.m7*/
 module m5.m6.m7 {
     /** module m8 comment*/
-    export module m8 {
+    export namespace m8 {
         /** Exported class comment*/
         export class c {
         }
@@ -74,7 +74,7 @@ module m5.m6.m7 {
 }
 new m5.m6.m7.m8.c();
 module m6.m7 {
-    export module m8 {
+    export namespace m8 {
         /** Exported class comment*/
         export class c {
         }
@@ -83,7 +83,7 @@ module m6.m7 {
 new m6.m7.m8.c();
 module m7.m8 {
     /** module m9 comment*/
-    export module m9 {
+    export namespace m9 {
         /** Exported class comment*/
         export class c {
         }
diff --git a/tests/cases/compiler/commentsMultiModuleMultiFile.ts b/tests/cases/compiler/commentsMultiModuleMultiFile.ts
index 04066b975ab..058a6400365 100644
--- a/tests/cases/compiler/commentsMultiModuleMultiFile.ts
+++ b/tests/cases/compiler/commentsMultiModuleMultiFile.ts
@@ -5,13 +5,13 @@
 
 // @Filename: commentsMultiModuleMultiFile_0.ts
 /** this is multi declare module*/
-export module multiM {
+export namespace multiM {
     /// class b comment
     export class b {
     }
 }
 /** thi is multi module 2*/
-export module multiM {
+export namespace multiM {
     /** class c comment*/
     export class c {
     }
@@ -27,7 +27,7 @@ new multiM.c();
 // @Filename: commentsMultiModuleMultiFile_1.ts
 import m = require('commentsMultiModuleMultiFile_0');
 /** this is multi module 3 comment*/
-export module multiM {
+export namespace multiM {
     /** class d comment*/
     export class d {
     }
diff --git a/tests/cases/compiler/commentsdoNotEmitComments.ts b/tests/cases/compiler/commentsdoNotEmitComments.ts
index dbdd110ea8c..af831c74d48 100644
--- a/tests/cases/compiler/commentsdoNotEmitComments.ts
+++ b/tests/cases/compiler/commentsdoNotEmitComments.ts
@@ -82,7 +82,7 @@ namespace m1 {
     }
 
     /// module m2
-    export module m2 {
+    export namespace m2 {
     }
 }
 
diff --git a/tests/cases/compiler/commentsemitComments.ts b/tests/cases/compiler/commentsemitComments.ts
index a04a2d98bd7..449bacec8af 100644
--- a/tests/cases/compiler/commentsemitComments.ts
+++ b/tests/cases/compiler/commentsemitComments.ts
@@ -82,7 +82,7 @@ namespace m1 {
     }
 
     /// module m2
-    export module m2 {
+    export namespace m2 {
     }
 }
 
diff --git a/tests/cases/compiler/complexRecursiveCollections.ts b/tests/cases/compiler/complexRecursiveCollections.ts
index ed8906ff441..ab4e142ecab 100644
--- a/tests/cases/compiler/complexRecursiveCollections.ts
+++ b/tests/cases/compiler/complexRecursiveCollections.ts
@@ -25,7 +25,7 @@ interface N2<T> extends N1<T> {
 // Test that complex recursive collections can pass the `extends` assignability check without
 // running out of memory. This bug was exposed in Typescript 2.4 when more generic signatures
 // started being checked.
-declare module Immutable {
+declare namespace Immutable {
   export function fromJS(jsValue: any, reviver?: (key: string | number, sequence: Collection.Keyed<string, any> | Collection.Indexed<any>, path?: Array<string | number>) => any): any;
   export function is(first: any, second: any): boolean;
   export function hash(value: any): number;
@@ -40,7 +40,7 @@ declare module Immutable {
     equals(other: any): boolean;
     hashCode(): number;
   }
-  export module List {
+  export namespace List {
     function isList(maybeList: any): maybeList is List<any>;
     function of<T>(...values: Array<T>): List<T>;
   }
@@ -85,7 +85,7 @@ declare module Immutable {
     filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): List<F>;
     filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
   }
-  export module Map {
+  export namespace Map {
     function isMap(maybeMap: any): maybeMap is Map<any, any>;
     function of(...keyValues: Array<any>): Map<any, any>;
   }
@@ -131,7 +131,7 @@ declare module Immutable {
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Map<K, F>;
     filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
   }
-  export module OrderedMap {
+  export namespace OrderedMap {
     function isOrderedMap(maybeOrderedMap: any): maybeOrderedMap is OrderedMap<any, any>;
   }
   export function OrderedMap<K, V>(collection: Iterable<[K, V]>): OrderedMap<K, V>;
@@ -150,7 +150,7 @@ declare module Immutable {
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): OrderedMap<K, F>;
     filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
   }
-  export module Set {
+  export namespace Set {
     function isSet(maybeSet: any): maybeSet is Set<any>;
     function of<T>(...values: Array<T>): Set<T>;
     function fromKeys<T>(iter: Collection<T, any>): Set<T>;
@@ -182,7 +182,7 @@ declare module Immutable {
     filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>;
     filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
   }
-  export module OrderedSet {
+  export namespace OrderedSet {
     function isOrderedSet(maybeOrderedSet: any): boolean;
     function of<T>(...values: Array<T>): OrderedSet<T>;
     function fromKeys<T>(iter: Collection<T, any>): OrderedSet<T>;
@@ -203,7 +203,7 @@ declare module Immutable {
     zipWith<U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>;
     zipWith<Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): OrderedSet<Z>;
   }
-  export module Stack {
+  export namespace Stack {
     function isStack(maybeStack: any): maybeStack is Stack<any>;
     function of<T>(...values: Array<T>): Stack<T>;
   }
@@ -234,7 +234,7 @@ declare module Immutable {
   }
   export function Range(start?: number, end?: number, step?: number): Seq.Indexed<number>;
   export function Repeat<T>(value: T, times?: number): Seq.Indexed<T>;
-  export module Record {
+  export namespace Record {
     export function isRecord(maybeRecord: any): maybeRecord is Record.Instance<any>;
     export function getDescriptiveName(record: Instance<any>): string;
     export interface Class<T extends Object> {
@@ -283,10 +283,10 @@ declare module Immutable {
     }
   }
   export function Record<T>(defaultValues: T, name?: string): Record.Class<T>;
-  export module Seq {
+  export namespace Seq {
     function isSeq(maybeSeq: any): maybeSeq is Seq.Indexed<any> | Seq.Keyed<any, any>;
     function of<T>(...values: Array<T>): Seq.Indexed<T>;
-    export module Keyed {}
+    export namespace Keyed {}
     export function Keyed<K, V>(collection: Iterable<[K, V]>): Seq.Keyed<K, V>;
     export function Keyed<V>(obj: {[key: string]: V}): Seq.Keyed<string, V>;
     export function Keyed<K, V>(): Seq.Keyed<K, V>;
@@ -304,7 +304,7 @@ declare module Immutable {
       filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq.Keyed<K, F>;
       filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
     }
-    module Indexed {
+    namespace Indexed {
       function of<T>(...values: Array<T>): Seq.Indexed<T>;
     }
     export function Indexed(): Seq.Indexed<any>;
@@ -320,7 +320,7 @@ declare module Immutable {
       filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Seq.Indexed<F>;
       filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
     }
-    export module Set {
+    export namespace Set {
       function of<T>(...values: Array<T>): Seq.Set<T>;
     }
     export function Set(): Seq.Set<any>;
@@ -354,12 +354,12 @@ declare module Immutable {
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq<K, F>;
     filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
   }
-  export module Collection {
+  export namespace Collection {
     function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed<any, any>;
     function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed<any>;
     function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed<any, any> | Collection.Indexed<any>;
     function isOrdered(maybeOrdered: any): boolean;
-    export module Keyed {}
+    export namespace Keyed {}
     export function Keyed<K, V>(collection: Iterable<[K, V]>): Collection.Keyed<K, V>;
     export function Keyed<V>(obj: {[key: string]: V}): Collection.Keyed<string, V>;
     export interface Keyed<K, V> extends Collection<K, V> {
@@ -378,7 +378,7 @@ declare module Immutable {
       filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
       [Symbol.iterator](): IterableIterator<[K, V]>;
     }
-    export module Indexed {}
+    export namespace Indexed {}
     export function Indexed<T>(collection: Iterable<T>): Collection.Indexed<T>;
     export interface Indexed<T> extends Collection<number, T> {
       toJS(): Array<any>;
@@ -410,7 +410,7 @@ declare module Immutable {
       filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
       [Symbol.iterator](): IterableIterator<T>;
     }
-    export module Set {}
+    export namespace Set {}
     export function Set<T>(collection: Iterable<T>): Collection.Set<T>;
     export interface Set<T> extends Collection<never, T> {
       toJS(): Array<any>;
diff --git a/tests/cases/compiler/complicatedPrivacy.ts b/tests/cases/compiler/complicatedPrivacy.ts
index 65ecc3536ba..ec86b636609 100644
--- a/tests/cases/compiler/complicatedPrivacy.ts
+++ b/tests/cases/compiler/complicatedPrivacy.ts
@@ -1,6 +1,6 @@
 // @target: es5
 namespace m1 {
-    export module m2 {
+    export namespace m2 {
 
 
         export function f1(c1: C1) {
@@ -69,7 +69,7 @@ class C2 {
 }
 
 namespace m2 {
-    export module m3 {
+    export namespace m3 {
 
         export class c_pr  implements mglo5.i5, mglo5.i6 {
             f1() {
@@ -82,7 +82,7 @@ namespace m2 {
             }
             namespace m5 {
                 
-                export module m6 {
+                export namespace m6 {
                     function f1() {
                         return new C();
                     }
diff --git a/tests/cases/compiler/constDeclarations-access4.ts b/tests/cases/compiler/constDeclarations-access4.ts
index 492f6a31d6d..3ea4f54e8df 100644
--- a/tests/cases/compiler/constDeclarations-access4.ts
+++ b/tests/cases/compiler/constDeclarations-access4.ts
@@ -1,7 +1,7 @@
 // @target: ES6
 
 
-declare module M {
+declare namespace M {
     const x: number;
 }
 
diff --git a/tests/cases/compiler/constDeclarations-ambient-errors.ts b/tests/cases/compiler/constDeclarations-ambient-errors.ts
index c07bfb01810..ecc6521c208 100644
--- a/tests/cases/compiler/constDeclarations-ambient-errors.ts
+++ b/tests/cases/compiler/constDeclarations-ambient-errors.ts
@@ -5,7 +5,7 @@ declare const c1: boolean = true;
 declare const c2: number = 0;
 declare const c3 = null, c4 :string = "", c5: any = 0;
 
-declare module M {
+declare namespace M {
     const c6 = 0;
     const c7: number = 7;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/constDeclarations-ambient.ts b/tests/cases/compiler/constDeclarations-ambient.ts
index dcd4cb9fc72..e9fdab5faab 100644
--- a/tests/cases/compiler/constDeclarations-ambient.ts
+++ b/tests/cases/compiler/constDeclarations-ambient.ts
@@ -5,7 +5,7 @@ declare const c1: boolean;
 declare const c2: number;
 declare const c3, c4 :string, c5: any;
 
-declare module M {
+declare namespace M {
     const c6;
     const c7: number;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts b/tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts
index 06abeafd1fb..2d6297c08e3 100644
--- a/tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts
+++ b/tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts
@@ -2,7 +2,7 @@
 // @noTypesAndSymbols: true
 
 // @filename: foo.ts
-export module ConstEnumOnlyModule {
+export namespace ConstEnumOnlyModule {
   export const enum ConstFooEnum {
     Some,
     Values,
diff --git a/tests/cases/compiler/constEnums.ts b/tests/cases/compiler/constEnums.ts
index 0c23de86380..77e5a8ec0da 100644
--- a/tests/cases/compiler/constEnums.ts
+++ b/tests/cases/compiler/constEnums.ts
@@ -48,8 +48,8 @@ const enum Comments {
 }
 
 namespace A {
-    export module B {
-        export module C {
+    export namespace B {
+        export namespace C {
             export const enum E {
                 V1 = 1,
                 V2 = A.B.C.E.V1 | 100
@@ -59,8 +59,8 @@ namespace A {
 }
 
 namespace A {
-    export module B {
-        export module C {
+    export namespace B {
+        export namespace C {
             export const enum E {
                 V3 = A.B.C.E["V2"] & 200,
                 V4 = A.B.C.E[`V1`] << 1,
@@ -70,8 +70,8 @@ namespace A {
 }
 
 namespace A1 {
-    export module B {
-        export module C {
+    export namespace B {
+        export namespace C {
             export const enum E {
                 V1 = 10,
                 V2 = 110,
@@ -81,15 +81,15 @@ namespace A1 {
 }
 
 namespace A2 {
-    export module B {
-        export module C {
+    export namespace B {
+        export namespace C {
             export const enum E {
                 V1 = 10,
                 V2 = 110,
             }
         }
         // module C will be classified as value
-        export module C {
+        export namespace C {
             var x = 1
         }
     }
diff --git a/tests/cases/compiler/constructorOverloads4.ts b/tests/cases/compiler/constructorOverloads4.ts
index c6fc7dc0625..03481da12e1 100644
--- a/tests/cases/compiler/constructorOverloads4.ts
+++ b/tests/cases/compiler/constructorOverloads4.ts
@@ -1,4 +1,4 @@
-declare module M {    
+declare namespace M {    
     export class Function {
         constructor(...args: string[]);
     }
diff --git a/tests/cases/compiler/constructorOverloads5.ts b/tests/cases/compiler/constructorOverloads5.ts
index 18cc4803a2a..eb949cd8552 100644
--- a/tests/cases/compiler/constructorOverloads5.ts
+++ b/tests/cases/compiler/constructorOverloads5.ts
@@ -1,6 +1,6 @@
  interface IArguments {}
 
- declare module M {
+ declare namespace M {
     export function RegExp(pattern: string): RegExp;
     export function RegExp(pattern: string, flags: string): RegExp;
     export class RegExp {
diff --git a/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts b/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts
index 3cfe651a160..060470e1b45 100644
--- a/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts
+++ b/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts
@@ -14,7 +14,7 @@ declare module "fs" {
 import fs = module("fs");
 
 
-module TypeScriptAllInOne {
+namespace TypeScriptAllInOne {
     export class Program {
         static Main(...args: string[]) {
             try {
diff --git a/tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts b/tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts
index 25f19ec276e..76412db373d 100644
--- a/tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts
+++ b/tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts
@@ -2,7 +2,7 @@
 //@declaration: true
 
 declare module "test" {
-    module A {
+    namespace A {
         class C {
         }
     }
diff --git a/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts b/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts
index 1f1c40ff8bd..08e2af20a2e 100644
--- a/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts
+++ b/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts
@@ -1,7 +1,7 @@
 //@module: commonjs
 // @declaration: true
 namespace m3 {
-    export module m2 {
+    export namespace m2 {
         export interface connectModule {
             (res, req, next): void;
         }
diff --git a/tests/cases/compiler/declFileExportImportChain.ts b/tests/cases/compiler/declFileExportImportChain.ts
index 6d5a5df8f7e..e83a26f6a81 100644
--- a/tests/cases/compiler/declFileExportImportChain.ts
+++ b/tests/cases/compiler/declFileExportImportChain.ts
@@ -3,7 +3,7 @@
 
 // @Filename: declFileExportImportChain_a.ts
 namespace m1 {
-    export module m2 {
+    export namespace m2 {
         export class c1 {
         }
     }
diff --git a/tests/cases/compiler/declFileExportImportChain2.ts b/tests/cases/compiler/declFileExportImportChain2.ts
index 9e8249c131c..c36eb6e06be 100644
--- a/tests/cases/compiler/declFileExportImportChain2.ts
+++ b/tests/cases/compiler/declFileExportImportChain2.ts
@@ -3,7 +3,7 @@
 
 // @Filename: declFileExportImportChain2_a.ts
 namespace m1 {
-    export module m2 {
+    export namespace m2 {
         export class c1 {
         }
     }
diff --git a/tests/cases/compiler/declFileGenericType.ts b/tests/cases/compiler/declFileGenericType.ts
index c001707acc9..940d727415f 100644
--- a/tests/cases/compiler/declFileGenericType.ts
+++ b/tests/cases/compiler/declFileGenericType.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module C {
+export namespace C {
     export class A<T>{ }
     export class B { }
     
diff --git a/tests/cases/compiler/declFileImportChainInExportAssignment.ts b/tests/cases/compiler/declFileImportChainInExportAssignment.ts
index d67557a1dbf..7a5f2b771a6 100644
--- a/tests/cases/compiler/declFileImportChainInExportAssignment.ts
+++ b/tests/cases/compiler/declFileImportChainInExportAssignment.ts
@@ -1,7 +1,7 @@
 // @declaration: true
 // @module: commonjs
 namespace m {
-    export module c {
+    export namespace c {
         export class c {
         }
     }
diff --git a/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts b/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts
index 4fbb6ac6ede..5af929c2016 100644
--- a/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts
+++ b/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts
@@ -11,7 +11,7 @@ namespace M {
 
     export type C = c;
 
-    export module m {
+    export namespace m {
         export class c {
         }
     }
@@ -27,7 +27,7 @@ interface Window {
 
 namespace M {
     export type W = Window | string;
-    export module N {
+    export namespace N {
         export class Window { }
         export var p: W;
     }
diff --git a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts
index f1d515f8823..f43d2b1073c 100644
--- a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts
+++ b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts
@@ -8,7 +8,7 @@ interface Window {
 
 namespace M {
     type W = Window | string;
-    export module N {
+    export namespace N {
         export class Window { }
         export var p: W; // Should report error that W is private
     }
@@ -16,7 +16,7 @@ namespace M {
 
 namespace M1 {
     export type W = Window | string;
-    export module N {
+    export namespace N {
         export class Window { }
         export var p: W; // No error
     }
diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts
index fa29ce429d4..2c1e9f51871 100644
--- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts
+++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts
@@ -1,11 +1,11 @@
 // @declaration: true
 
 // @Filename: declFile.d.ts
-declare module M {
+declare namespace M {
     declare var x;
     declare function f();
 
-    declare module N { }
+    declare namespace N { }
 
     declare class C { }
 }
diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
index 3bad7e60698..7a79a1db225 100644
--- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
+++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
@@ -2,11 +2,11 @@
 // @outFile: out.js
 
 // @Filename: declFile.d.ts
-declare module M {
+declare namespace M {
     declare var x;
     declare function f();
 
-    declare module N { }
+    declare namespace N { }
 
     declare class C { }
 }
diff --git a/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts b/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts
index 86f6862f145..1fbc328712d 100644
--- a/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts
+++ b/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts
@@ -10,6 +10,6 @@ module X.A.B.C {
 }
 
 module X.A.B.C {
-    export module A {
+    export namespace A {
     }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts b/tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts
index e3d7e0a46a1..666262f6807 100644
--- a/tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts
+++ b/tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts
@@ -2,7 +2,7 @@
 // @module: commonjs 
 
 namespace m {
-    export module c {
+    export namespace c {
         export class c {
         }
     }
diff --git a/tests/cases/compiler/declarationEmitNameConflicts.ts b/tests/cases/compiler/declarationEmitNameConflicts.ts
index 2bc80b8340f..c355913e867 100644
--- a/tests/cases/compiler/declarationEmitNameConflicts.ts
+++ b/tests/cases/compiler/declarationEmitNameConflicts.ts
@@ -6,10 +6,10 @@ export = f;
 
 // @Filename: declarationEmit_nameConflicts_0.ts
 import im = require('./declarationEmit_nameConflicts_1');
-export module M {
+export namespace M {
     export function f() { }
     export class C { }
-    export module N {
+    export namespace N {
         export function g() { };
         export interface I { }
     }
@@ -23,7 +23,7 @@ export module M {
 export module M.P {
     export function f() { }
     export class C { }
-    export module N {
+    export namespace N {
         export function g() { };
         export interface I { }
     }
@@ -38,13 +38,13 @@ export module M.P {
 export module M.Q {
     export function f() { }
     export class C { }
-    export module N {
+    export namespace N {
         export function g() { };
         export interface I { }
     }
     export interface b extends M.b { } // ok
     export interface I extends M.c.I { } // ok
-    export module c {
+    export namespace c {
         export interface I extends M.c.I { } // ok
     }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmitNameConflicts2.ts b/tests/cases/compiler/declarationEmitNameConflicts2.ts
index f0112fa9501..2fcb3a9354c 100644
--- a/tests/cases/compiler/declarationEmitNameConflicts2.ts
+++ b/tests/cases/compiler/declarationEmitNameConflicts2.ts
@@ -2,7 +2,7 @@
 module X.Y.base {
     export function f() { }
     export class C { }
-    export module M {
+    export namespace M {
         export var v;
     }
     export enum E { }
diff --git a/tests/cases/compiler/declarationEmitNameConflicts3.ts b/tests/cases/compiler/declarationEmitNameConflicts3.ts
index 1df09bca4e0..4329b6d98c3 100644
--- a/tests/cases/compiler/declarationEmitNameConflicts3.ts
+++ b/tests/cases/compiler/declarationEmitNameConflicts3.ts
@@ -2,13 +2,13 @@
 // @module: commonjs
 namespace M {
     export interface D { }
-    export module D {
+    export namespace D {
         export function f() { }
     }
-    export module C {
+    export namespace C {
         export function f() { }
     }
-    export module E {
+    export namespace E {
         export function f() { }
     }
 }
diff --git a/tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts b/tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts
index 50fc2484a4a..7f3ca5c2c45 100644
--- a/tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts
+++ b/tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts
@@ -1,8 +1,8 @@
 // @declaration: true
 // @module: commonjs
-export module C { export interface I { } }
+export namespace C { export interface I { } }
 export import v = C;
-export module M {
-    export module C { export interface I { } }
+export namespace M {
+    export namespace C { export interface I { } }
     export var w: v.I; // Gets emitted as C.I, which is the wrong interface
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts b/tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts
index c432bcc0909..41bf794ec9c 100644
--- a/tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts
+++ b/tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts
@@ -4,7 +4,7 @@ declare module "express" {
 
     function express(): express.ExpressServer;
 
-    module express {
+    namespace express {
 
         export interface ExpressServer {
 
diff --git a/tests/cases/compiler/dottedModuleName.ts b/tests/cases/compiler/dottedModuleName.ts
index f1ae9acda1e..effc138860c 100644
--- a/tests/cases/compiler/dottedModuleName.ts
+++ b/tests/cases/compiler/dottedModuleName.ts
@@ -1,5 +1,5 @@
 namespace M {
-    export module N {
+    export namespace N {
 	export function f(x:number)=>2*x;
 	export module X.Y.Z {
 	    export var v2=f(v);
@@ -10,7 +10,7 @@ namespace M {
 
 
 module M.N {
-    export module X {
+    export namespace X {
 	export module Y.Z {
 	    export var v=f(10);
 	}
diff --git a/tests/cases/compiler/downlevelLetConst13.ts b/tests/cases/compiler/downlevelLetConst13.ts
index af803e079bc..7332bcdf184 100644
--- a/tests/cases/compiler/downlevelLetConst13.ts
+++ b/tests/cases/compiler/downlevelLetConst13.ts
@@ -11,7 +11,7 @@ export const [bar2] = [2];
 export let {a: bar3} = { a: 1 };
 export const {a: bar4} = { a: 1 };
 
-export module M {
+export namespace M {
     export let baz = 100;
     export const baz2 = true;
     export let [bar5] = [1];
diff --git a/tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts b/tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts
index aa26e567b6d..b4a67f0f6a0 100644
--- a/tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts
+++ b/tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts
@@ -2,7 +2,7 @@
 // @FileName: duplicateIdentifierShouldNotShortCircuitBaseTypeBinding_0.ts
 export interface IPoint {}
 
-export module Shapes {
+export namespace Shapes {
 
     export class Point implements IPoint {}
 
diff --git a/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts b/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
index 4eb23e5b6d3..81f45ff82e3 100644
--- a/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
+++ b/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts
@@ -42,10 +42,10 @@ namespace Foo {
 }
 
 namespace N {
-    export module F {
+    export namespace F {
         var t;
     }
 }
-declare module N {
+declare namespace N {
     export function F(); // no error because function is ambient
 }
diff --git a/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts b/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts
index 1b65251f822..005bfd306d1 100644
--- a/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts
+++ b/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts
@@ -12,7 +12,7 @@ class Foo {
 }
 
 namespace N {
-    export module F {
+    export namespace F {
         var t;
     }
 }
@@ -28,6 +28,6 @@ namespace Foo {
     export var x: number; // error for redeclaring var in a different parent
 }
 
-declare module N {
+declare namespace N {
     export function F(); // no error because function is ambient
 }
diff --git a/tests/cases/compiler/duplicateSymbolsExportMatching.ts b/tests/cases/compiler/duplicateSymbolsExportMatching.ts
index 4e8123c2e87..1fbd5e2aea0 100644
--- a/tests/cases/compiler/duplicateSymbolsExportMatching.ts
+++ b/tests/cases/compiler/duplicateSymbolsExportMatching.ts
@@ -33,7 +33,7 @@ namespace M {
     namespace inst {
         var t;
     }
-    export module inst { // one error
+    export namespace inst { // one error
         var t;
     }
 }
@@ -56,7 +56,7 @@ namespace M {
 namespace M {
     class C { }
     namespace C { }
-    export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol)
+    export namespace C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol)
         var t;
     }
 }
diff --git a/tests/cases/compiler/enumAssignmentCompat3.ts b/tests/cases/compiler/enumAssignmentCompat3.ts
index a706be4ce21..4b987b97f74 100644
--- a/tests/cases/compiler/enumAssignmentCompat3.ts
+++ b/tests/cases/compiler/enumAssignmentCompat3.ts
@@ -49,7 +49,7 @@ namespace Merged2 {
     export enum E {
         a, b, c
     }
-    export module E {
+    export namespace E {
         export let d = 5;
     }
 }
diff --git a/tests/cases/compiler/enumDecl1.ts b/tests/cases/compiler/enumDecl1.ts
index 0077c62600f..70cb5803276 100644
--- a/tests/cases/compiler/enumDecl1.ts
+++ b/tests/cases/compiler/enumDecl1.ts
@@ -1,6 +1,6 @@
 // @declaration: true
 
-declare module mAmbient {
+declare namespace mAmbient {
     enum e {
         x,
         y,
diff --git a/tests/cases/compiler/es5ModuleInternalNamedImports.ts b/tests/cases/compiler/es5ModuleInternalNamedImports.ts
index 62b976a7df7..b527ec23c20 100644
--- a/tests/cases/compiler/es5ModuleInternalNamedImports.ts
+++ b/tests/cases/compiler/es5ModuleInternalNamedImports.ts
@@ -1,7 +1,7 @@
 // @target: ES5
 // @module: AMD
 
-export module M {
+export namespace M {
     // variable
     export var M_V = 0;
     // interface
@@ -9,9 +9,9 @@ export module M {
     //calss
     export class M_C { }
     // instantiated module
-    export module M_M { var x; }
+    export namespace M_M { var x; }
     // uninstantiated module
-    export module M_MU { }
+    export namespace M_MU { }
     // function
     export function M_F() { }
     // enum
diff --git a/tests/cases/compiler/es6ClassTest.ts b/tests/cases/compiler/es6ClassTest.ts
index 77f1c402c9e..73d1c2bc6f0 100644
--- a/tests/cases/compiler/es6ClassTest.ts
+++ b/tests/cases/compiler/es6ClassTest.ts
@@ -31,7 +31,7 @@ class Foo  extends Bar {
 
 var f = new Foo();
 
-declare module AmbientMod {
+declare namespace AmbientMod {
 	export class Provide {
 		foo:number;
 		zoo:string;
diff --git a/tests/cases/compiler/es6ClassTest7.ts b/tests/cases/compiler/es6ClassTest7.ts
index 89517ed1781..1cfdb3dcf5e 100644
--- a/tests/cases/compiler/es6ClassTest7.ts
+++ b/tests/cases/compiler/es6ClassTest7.ts
@@ -1,4 +1,4 @@
-declare module M {
+declare namespace M {
     export class Foo {
     }
 }
diff --git a/tests/cases/compiler/es6ExportAll.ts b/tests/cases/compiler/es6ExportAll.ts
index ed2b47c23c4..7830e2b171b 100644
--- a/tests/cases/compiler/es6ExportAll.ts
+++ b/tests/cases/compiler/es6ExportAll.ts
@@ -6,11 +6,11 @@ export class c {
 }
 export interface i {
 }
-export module m {
+export namespace m {
     export var x = 10;
 }
 export var x = 10;
-export module uninstantiated {
+export namespace uninstantiated {
 }
 
 // @filename: client.ts
diff --git a/tests/cases/compiler/es6ExportAllInEs5.ts b/tests/cases/compiler/es6ExportAllInEs5.ts
index 3ee95e1a217..29e26b89230 100644
--- a/tests/cases/compiler/es6ExportAllInEs5.ts
+++ b/tests/cases/compiler/es6ExportAllInEs5.ts
@@ -7,11 +7,11 @@ export class c {
 }
 export interface i {
 }
-export module m {
+export namespace m {
     export var x = 10;
 }
 export var x = 10;
-export module uninstantiated {
+export namespace uninstantiated {
 }
 
 // @filename: client.ts
diff --git a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts
index 22a6cef4203..07cae1c7da7 100644
--- a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts
+++ b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts
@@ -6,11 +6,11 @@ export class c {
 }
 export interface i {
 }
-export module m {
+export namespace m {
     export var x = 10;
 }
 export var x = 10;
-export module uninstantiated {
+export namespace uninstantiated {
 }
 
 // @filename: client.ts
diff --git a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts
index 24dbc77e98f..455552916b1 100644
--- a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts
+++ b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts
@@ -7,11 +7,11 @@ export class c {
 }
 export interface i {
 }
-export module m {
+export namespace m {
     export var x = 10;
 }
 export var x = 10;
-export module uninstantiated {
+export namespace uninstantiated {
 }
 
 // @filename: client.ts
diff --git a/tests/cases/compiler/es6ExportEqualsInterop.ts b/tests/cases/compiler/es6ExportEqualsInterop.ts
index 7b1f6700dd9..26fec1a30de 100644
--- a/tests/cases/compiler/es6ExportEqualsInterop.ts
+++ b/tests/cases/compiler/es6ExportEqualsInterop.ts
@@ -30,7 +30,7 @@ declare module "interface-variable" {
 }
 
 declare module "module" {
-    module Foo {
+    namespace Foo {
         export var a: number;
         export var b: number;
     }
@@ -42,7 +42,7 @@ declare module "interface-module" {
         x: number;
         y: number;
     }
-    module Foo {
+    namespace Foo {
         export var a: number;
         export var b: number;
     }
@@ -50,7 +50,7 @@ declare module "interface-module" {
 }
 
 declare module "variable-module" {
-    module Foo {
+    namespace Foo {
         interface Bar {
             x: number;
             y: number;
@@ -70,7 +70,7 @@ declare module "function" {
 
 declare module "function-module" {
     function foo();
-    module foo {
+    namespace foo {
         export var a: number;
         export var b: number;
     }
@@ -90,7 +90,7 @@ declare module "class-module" {
         x: number;
         y: number;
     }
-    module Foo {
+    namespace Foo {
         export var a: number;
         export var b: number;
     }
diff --git a/tests/cases/compiler/es6ImportEqualsDeclaration2.ts b/tests/cases/compiler/es6ImportEqualsDeclaration2.ts
index 554740d80e1..ba41e854d74 100644
--- a/tests/cases/compiler/es6ImportEqualsDeclaration2.ts
+++ b/tests/cases/compiler/es6ImportEqualsDeclaration2.ts
@@ -8,7 +8,7 @@ declare module "other" {
 declare module "server" {
     import events = require("other"); // Ambient declaration, no error expected.
 
-    module S {
+    namespace S {
         export var a: number;
     }
 
diff --git a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
index 381a21f58ea..c0595cf324a 100644
--- a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
+++ b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
@@ -2,7 +2,7 @@
 // @declaration: true
 
 // @filename: es6ImportNamedImportInIndirectExportAssignment_0.ts
-export module a {
+export namespace a {
     export class c {
     }
 }
diff --git a/tests/cases/compiler/es6ModuleClassDeclaration.ts b/tests/cases/compiler/es6ModuleClassDeclaration.ts
index 846003a7cf5..1e4f6f99632 100644
--- a/tests/cases/compiler/es6ModuleClassDeclaration.ts
+++ b/tests/cases/compiler/es6ModuleClassDeclaration.ts
@@ -34,7 +34,7 @@ class c2 {
 new c();
 new c2();
 
-export module m1 {
+export namespace m1 {
     export class c3 {
         constructor() {
         }
diff --git a/tests/cases/compiler/es6ModuleConst.ts b/tests/cases/compiler/es6ModuleConst.ts
index e4580337be9..293ece2f9a4 100644
--- a/tests/cases/compiler/es6ModuleConst.ts
+++ b/tests/cases/compiler/es6ModuleConst.ts
@@ -3,7 +3,7 @@ export const a = "hello";
 export const x: string = a, y = x;
 const b = y;
 const c: string = b, d = c;
-export module m1 {
+export namespace m1 {
     export const k = a;
     export const l: string = b, m = k;
     const n = m1.k;
diff --git a/tests/cases/compiler/es6ModuleConstEnumDeclaration.ts b/tests/cases/compiler/es6ModuleConstEnumDeclaration.ts
index 71bb7654c25..21906d6f428 100644
--- a/tests/cases/compiler/es6ModuleConstEnumDeclaration.ts
+++ b/tests/cases/compiler/es6ModuleConstEnumDeclaration.ts
@@ -11,7 +11,7 @@ const enum e2 {
 }
 var x = e1.a;
 var y = e2.x;
-export module m1 {
+export namespace m1 {
     export const enum e3 {
         a,
         b,
diff --git a/tests/cases/compiler/es6ModuleConstEnumDeclaration2.ts b/tests/cases/compiler/es6ModuleConstEnumDeclaration2.ts
index c2a7ddc8296..0ed98259b04 100644
--- a/tests/cases/compiler/es6ModuleConstEnumDeclaration2.ts
+++ b/tests/cases/compiler/es6ModuleConstEnumDeclaration2.ts
@@ -13,7 +13,7 @@ const enum e2 {
 }
 var x = e1.a;
 var y = e2.x;
-export module m1 {
+export namespace m1 {
     export const enum e3 {
         a,
         b,
diff --git a/tests/cases/compiler/es6ModuleEnumDeclaration.ts b/tests/cases/compiler/es6ModuleEnumDeclaration.ts
index 5e9b8362923..377914da90e 100644
--- a/tests/cases/compiler/es6ModuleEnumDeclaration.ts
+++ b/tests/cases/compiler/es6ModuleEnumDeclaration.ts
@@ -11,7 +11,7 @@ enum e2 {
 }
 var x = e1.a;
 var y = e2.x;
-export module m1 {
+export namespace m1 {
     export enum e3 {
         a,
         b,
diff --git a/tests/cases/compiler/es6ModuleFunctionDeclaration.ts b/tests/cases/compiler/es6ModuleFunctionDeclaration.ts
index d1374741aed..f591b0a8877 100644
--- a/tests/cases/compiler/es6ModuleFunctionDeclaration.ts
+++ b/tests/cases/compiler/es6ModuleFunctionDeclaration.ts
@@ -6,7 +6,7 @@ function foo2() {
 foo();
 foo2();
 
-export module m1 {
+export namespace m1 {
     export function foo3() {
     }
     function foo4() {
diff --git a/tests/cases/compiler/es6ModuleInternalImport.ts b/tests/cases/compiler/es6ModuleInternalImport.ts
index 23be88466d9..94847afc585 100644
--- a/tests/cases/compiler/es6ModuleInternalImport.ts
+++ b/tests/cases/compiler/es6ModuleInternalImport.ts
@@ -1,11 +1,11 @@
 // @target: ES6
-export module m {
+export namespace m {
     export var a = 10;
 }
 export import a1 = m.a;
 import a2 = m.a;
 var x = a1 + a2;
-export module m1 {
+export namespace m1 {
     export import a3 = m.a;
     import a4 = m.a;
     var x = a1 + a2;
diff --git a/tests/cases/compiler/es6ModuleInternalNamedImports.ts b/tests/cases/compiler/es6ModuleInternalNamedImports.ts
index f696cee0aa3..cdd8b56c433 100644
--- a/tests/cases/compiler/es6ModuleInternalNamedImports.ts
+++ b/tests/cases/compiler/es6ModuleInternalNamedImports.ts
@@ -1,6 +1,6 @@
 // @target: ES6
 
-export module M {
+export namespace M {
     // variable
     export var M_V = 0;
     // interface
@@ -8,9 +8,9 @@ export module M {
     //calss
     export class M_C { }
     // instantiated module
-    export module M_M { var x; }
+    export namespace M_M { var x; }
     // uninstantiated module
-    export module M_MU { }
+    export namespace M_MU { }
     // function
     export function M_F() { }
     // enum
diff --git a/tests/cases/compiler/es6ModuleInternalNamedImports2.ts b/tests/cases/compiler/es6ModuleInternalNamedImports2.ts
index 6f235af52bd..c5cfc8b96b5 100644
--- a/tests/cases/compiler/es6ModuleInternalNamedImports2.ts
+++ b/tests/cases/compiler/es6ModuleInternalNamedImports2.ts
@@ -1,6 +1,6 @@
 // @target: ES6
 
-export module M {
+export namespace M {
     // variable
     export var M_V = 0;
     // interface
@@ -8,9 +8,9 @@ export module M {
     //calss
     export class M_C { }
     // instantiated module
-    export module M_M { var x; }
+    export namespace M_M { var x; }
     // uninstantiated module
-    export module M_MU { }
+    export namespace M_MU { }
     // function
     export function M_F() { }
     // enum
@@ -21,7 +21,7 @@ export module M {
     export import M_A = M_M;
 }
 
-export module M {
+export namespace M {
     // Reexports
     export {M_V as v};
     export {M_I as i};
diff --git a/tests/cases/compiler/es6ModuleLet.ts b/tests/cases/compiler/es6ModuleLet.ts
index 1b0955315cb..973a454c2cf 100644
--- a/tests/cases/compiler/es6ModuleLet.ts
+++ b/tests/cases/compiler/es6ModuleLet.ts
@@ -3,7 +3,7 @@ export let a = "hello";
 export let x: string = a, y = x;
 let b = y;
 let c: string = b, d = c;
-export module m1 {
+export namespace m1 {
     export let k = a;
     export let l: string = b, m = k;
     let n = m1.k;
diff --git a/tests/cases/compiler/es6ModuleModuleDeclaration.ts b/tests/cases/compiler/es6ModuleModuleDeclaration.ts
index 2ff326bc3d7..21082e28c0b 100644
--- a/tests/cases/compiler/es6ModuleModuleDeclaration.ts
+++ b/tests/cases/compiler/es6ModuleModuleDeclaration.ts
@@ -1,12 +1,12 @@
 // @target: ES6
-export module m1 {
+export namespace m1 {
     export var a = 10;
     var b = 10;
-    export module innerExportedModule {
+    export namespace innerExportedModule {
         export var k = 10;
         var l = 10;
     }
-    export module innerNonExportedModule {
+    export namespace innerNonExportedModule {
         export var x = 10;
         var y = 10;
     }
@@ -14,11 +14,11 @@ export module m1 {
 namespace m2 {
     export var a = 10;
     var b = 10;
-    export module innerExportedModule {
+    export namespace innerExportedModule {
         export var k = 10;
         var l = 10;
     }
-    export module innerNonExportedModule {
+    export namespace innerNonExportedModule {
         export var x = 10;
         var y = 10;
     }
diff --git a/tests/cases/compiler/es6ModuleVariableStatement.ts b/tests/cases/compiler/es6ModuleVariableStatement.ts
index 0237d405f8e..8e6541b8b0c 100644
--- a/tests/cases/compiler/es6ModuleVariableStatement.ts
+++ b/tests/cases/compiler/es6ModuleVariableStatement.ts
@@ -3,7 +3,7 @@ export var a = "hello";
 export var x: string = a, y = x;
 var b = y;
 var c: string = b, d = c;
-export module m1 {
+export namespace m1 {
     export var k = a;
     export var l: string = b, m = k;
     var n = m1.k;
diff --git a/tests/cases/compiler/exportAlreadySeen.ts b/tests/cases/compiler/exportAlreadySeen.ts
index 80cd4f6a6e1..9ece5d0507a 100644
--- a/tests/cases/compiler/exportAlreadySeen.ts
+++ b/tests/cases/compiler/exportAlreadySeen.ts
@@ -8,7 +8,7 @@ namespace M {
     }  
 }
 
-declare module A {
+declare namespace A {
     export export var x;
     export export function f()
 
diff --git a/tests/cases/compiler/exportAssignValueAndType.ts b/tests/cases/compiler/exportAssignValueAndType.ts
index 34ca4278584..69235b217f1 100644
--- a/tests/cases/compiler/exportAssignValueAndType.ts
+++ b/tests/cases/compiler/exportAssignValueAndType.ts
@@ -1,5 +1,5 @@
 //@module: commonjs
-declare module http {
+declare namespace http {
 	export interface Server { openPort: number; }
 }
 
diff --git a/tests/cases/compiler/exportEqualNamespaces.ts b/tests/cases/compiler/exportEqualNamespaces.ts
index ccb5b6cde21..059fa6650c5 100644
--- a/tests/cases/compiler/exportEqualNamespaces.ts
+++ b/tests/cases/compiler/exportEqualNamespaces.ts
@@ -1,5 +1,5 @@
 //@module: amd
-declare module server {
+declare namespace server {
     interface Server extends Object { }
 }
 
diff --git a/tests/cases/compiler/exportImportAndClodule.ts b/tests/cases/compiler/exportImportAndClodule.ts
index d8effb9900c..cb713807c2e 100644
--- a/tests/cases/compiler/exportImportAndClodule.ts
+++ b/tests/cases/compiler/exportImportAndClodule.ts
@@ -2,7 +2,7 @@ namespace K {
     export class L {
         constructor(public name: string) { }
     }
-    export module L {
+    export namespace L {
         export var y = 12;
         export interface Point {
             x: number;
diff --git a/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts b/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts
index 5f942a75a74..cb781c36ba5 100644
--- a/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts
+++ b/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts
@@ -1,5 +1,5 @@
 declare module "m2" {
-    module X {
+    namespace X {
         interface I { }
     }
     function Y();
diff --git a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts
index 683358a0e3b..db327b27bf6 100644
--- a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts
+++ b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts
@@ -1,6 +1,6 @@
 // @module: commonjs
 // @Filename: exportSpecifierReferencingOuterDeclaration2_A.ts
-declare module X { export interface bar { } }
+declare namespace X { export interface bar { } }
 
 // @Filename: exportSpecifierReferencingOuterDeclaration2_B.ts
 export { X };
diff --git a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts
index d4ddf3cc4a6..b6f9bae6976 100644
--- a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts
+++ b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts
@@ -1,6 +1,6 @@
-declare module X { export interface bar { } }
+declare namespace X { export interface bar { } }
 declare module "m" {
-    module X { export interface foo { } }
+    namespace X { export interface foo { } }
     export { X };
     export function foo(): X.foo;
     export function bar(): X.bar; // error
diff --git a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts
index 5beaf1de126..008fe44860e 100644
--- a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts
+++ b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts
@@ -1,9 +1,9 @@
 // @module: commonjs
 // @Filename: exportSpecifierReferencingOuterDeclaration2_A.ts
-declare module X { export interface bar { } }
+declare namespace X { export interface bar { } }
 
 // @Filename: exportSpecifierReferencingOuterDeclaration2_B.ts
-declare module X { export interface foo { } }
+declare namespace X { export interface foo { } }
 export { X };
 export declare function foo(): X.foo;
 export declare function bar(): X.bar; // error
\ No newline at end of file
diff --git a/tests/cases/compiler/extendArray.ts b/tests/cases/compiler/extendArray.ts
index e1b4a458036..781765257b5 100644
--- a/tests/cases/compiler/extendArray.ts
+++ b/tests/cases/compiler/extendArray.ts
@@ -2,7 +2,7 @@ var a = [1,2];
 a.forEach(function (v,i,a) {});
 
 
-declare module _Core {
+declare namespace _Core {
   interface Array {
     collect(fn:(e:_element) => _element[]) : any[];
   }
diff --git a/tests/cases/compiler/extension.ts b/tests/cases/compiler/extension.ts
index afa57d2ceaa..f412c4d700d 100644
--- a/tests/cases/compiler/extension.ts
+++ b/tests/cases/compiler/extension.ts
@@ -6,13 +6,13 @@ interface I {
     y;
 }
 
-declare module M {
+declare namespace M {
     export class C {
         public p:number;
     }
 }
 
-declare module M {
+declare namespace M {
     export extension class C {
         public pe:string;
     }
diff --git a/tests/cases/compiler/externModuleClobber.ts b/tests/cases/compiler/externModuleClobber.ts
index e99634f9f37..1434daafe58 100644
--- a/tests/cases/compiler/externModuleClobber.ts
+++ b/tests/cases/compiler/externModuleClobber.ts
@@ -1,4 +1,4 @@
-declare module EM {
+declare namespace EM {
 	export class Position { }
 
 	export class EC {
diff --git a/tests/cases/compiler/externSyntax.ts b/tests/cases/compiler/externSyntax.ts
index 9036834d94c..429f9420157 100644
--- a/tests/cases/compiler/externSyntax.ts
+++ b/tests/cases/compiler/externSyntax.ts
@@ -1,5 +1,5 @@
 declare var v;
-declare module M {
+declare namespace M {
     export class D {
         public p;
     }
diff --git a/tests/cases/compiler/externalModuleResolution.ts b/tests/cases/compiler/externalModuleResolution.ts
index d7b9baaa675..fd88eeeb0f8 100644
--- a/tests/cases/compiler/externalModuleResolution.ts
+++ b/tests/cases/compiler/externalModuleResolution.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @Filename: foo.d.ts
-declare module M1 {
+declare namespace M1 {
     export var X:number;
 }
 export = M1
diff --git a/tests/cases/compiler/externalModuleResolution2.ts b/tests/cases/compiler/externalModuleResolution2.ts
index 78b9df55e79..07dc25a6d15 100644
--- a/tests/cases/compiler/externalModuleResolution2.ts
+++ b/tests/cases/compiler/externalModuleResolution2.ts
@@ -6,7 +6,7 @@ namespace M2 {
 export = M2
 
 // @Filename: foo.d.ts
-declare module M1 {
+declare namespace M1 {
     export var Y:number;
 }
 export = M1
diff --git a/tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts b/tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts
index 875e3205407..0c1e2162a7d 100644
--- a/tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts
+++ b/tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts
@@ -1,4 +1,4 @@
 
 // Not on line 0 because we want to verify the error is placed in the appropriate location.
-  export module M {
+  export namespace M {
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/funClodule.ts b/tests/cases/compiler/funClodule.ts
index f99301d6a39..24836852384 100644
--- a/tests/cases/compiler/funClodule.ts
+++ b/tests/cases/compiler/funClodule.ts
@@ -1,12 +1,12 @@
 declare function foo();
-declare module foo {
+declare namespace foo {
     export function x(): any;
 }
 declare class foo { } // Should error
 
 
 declare class foo2 { }
-declare module foo2 {
+declare namespace foo2 {
     export function x(): any;
 }
 declare function foo2(); // Should error
diff --git a/tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts b/tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts
index 9188908e27f..b85ebd54d34 100644
--- a/tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts
+++ b/tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts
@@ -2,7 +2,7 @@ interface A {   // interface before module declaration
     (): B.C;    // uses defined below class in module
 }
 declare function B(): B.C;  // function merged with module
-declare module B {
+declare namespace B {
     export class C {    // class defined in module 
     }
 }
diff --git a/tests/cases/compiler/funduleUsedAcrossFileBoundary.ts b/tests/cases/compiler/funduleUsedAcrossFileBoundary.ts
index 12d4c296cdf..b94f63fd80d 100644
--- a/tests/cases/compiler/funduleUsedAcrossFileBoundary.ts
+++ b/tests/cases/compiler/funduleUsedAcrossFileBoundary.ts
@@ -1,6 +1,6 @@
 // @Filename: funduleUsedAcrossFileBoundary_file1.ts
 declare function Q<T>(value: T): string;
-declare module Q {
+declare namespace Q {
     interface Promise<T> {
         foo: string;
     }
diff --git a/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts b/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts
index 2c8741ee18f..22feef1ac67 100644
--- a/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts
+++ b/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts
@@ -33,7 +33,7 @@ interface KnockoutObservableArrayStatic {
     <T>(value?: T[]): KnockoutObservableArray<T>;
 }
 
-declare module ko {
+declare namespace ko {
     export var observableArray: KnockoutObservableArrayStatic;
 }
 
diff --git a/tests/cases/compiler/genericClassesRedeclaration.ts b/tests/cases/compiler/genericClassesRedeclaration.ts
index 59c8bf3e0c2..2967943cad5 100644
--- a/tests/cases/compiler/genericClassesRedeclaration.ts
+++ b/tests/cases/compiler/genericClassesRedeclaration.ts
@@ -1,4 +1,4 @@
-declare module TypeScript {
+declare namespace TypeScript {
     interface IIndexable<T> {
         [s: string]: T;
     }
@@ -37,7 +37,7 @@ declare module TypeScript {
     }
 }
 
-declare module TypeScript {
+declare namespace TypeScript {
     interface IIndexable<T> {
         [s: string]: T;
     }
diff --git a/tests/cases/compiler/genericCloduleInModule.ts b/tests/cases/compiler/genericCloduleInModule.ts
index bd5157835cf..c15d1dd6aab 100644
--- a/tests/cases/compiler/genericCloduleInModule.ts
+++ b/tests/cases/compiler/genericCloduleInModule.ts
@@ -3,7 +3,7 @@ namespace A {
         foo() { }
         static bar() { }
     }
-    export module B {
+    export namespace B {
         export var x = 1;
     }
 }
diff --git a/tests/cases/compiler/genericCloduleInModule2.ts b/tests/cases/compiler/genericCloduleInModule2.ts
index 1303f8effef..7dc503ef67e 100644
--- a/tests/cases/compiler/genericCloduleInModule2.ts
+++ b/tests/cases/compiler/genericCloduleInModule2.ts
@@ -6,7 +6,7 @@ namespace A {
 }
 
 namespace A {
-    export module B {
+    export namespace B {
         export var x = 1;
     }
 }
diff --git a/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts b/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts
index 8e7fb9fa58d..9f8eee74035 100644
--- a/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts
+++ b/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts
@@ -1,4 +1,4 @@
-declare module EndGate {
+declare namespace EndGate {
     export interface ICloneable {
         Clone(): any;
     }
diff --git a/tests/cases/compiler/genericFunduleInModule.ts b/tests/cases/compiler/genericFunduleInModule.ts
index 60b814a88a0..5cc890ace99 100644
--- a/tests/cases/compiler/genericFunduleInModule.ts
+++ b/tests/cases/compiler/genericFunduleInModule.ts
@@ -1,6 +1,6 @@
 namespace A {
     export function B<T>(x: T) { return x; }
-    export module B {
+    export namespace B {
         export var x = 1;
     }
 }
diff --git a/tests/cases/compiler/genericFunduleInModule2.ts b/tests/cases/compiler/genericFunduleInModule2.ts
index a98c600214b..8c3dbb0e8c4 100644
--- a/tests/cases/compiler/genericFunduleInModule2.ts
+++ b/tests/cases/compiler/genericFunduleInModule2.ts
@@ -3,7 +3,7 @@ namespace A {
 }
 
 namespace A {
-    export module B {
+    export namespace B {
         export var x = 1;
     }
 }
diff --git a/tests/cases/compiler/genericInference2.ts b/tests/cases/compiler/genericInference2.ts
index 633961ca03d..f50e4368d0f 100644
--- a/tests/cases/compiler/genericInference2.ts
+++ b/tests/cases/compiler/genericInference2.ts
@@ -1,4 +1,4 @@
-    declare module ko { 
+    declare namespace ko { 
        export interface Observable<T> { 
            (): T; 
            (value: T): any; 
diff --git a/tests/cases/compiler/genericOfACloduleType1.ts b/tests/cases/compiler/genericOfACloduleType1.ts
index b4e26fa14d7..9d6318b6cec 100644
--- a/tests/cases/compiler/genericOfACloduleType1.ts
+++ b/tests/cases/compiler/genericOfACloduleType1.ts
@@ -1,7 +1,7 @@
 class G<T>{ bar(x: T) { return x; } }
 namespace M {
     export class C { foo() { } }
-    export module C {
+    export namespace C {
         export class X {
         }
     }
diff --git a/tests/cases/compiler/genericOfACloduleType2.ts b/tests/cases/compiler/genericOfACloduleType2.ts
index c40c7024d31..51448d6b7a0 100644
--- a/tests/cases/compiler/genericOfACloduleType2.ts
+++ b/tests/cases/compiler/genericOfACloduleType2.ts
@@ -1,7 +1,7 @@
 class G<T>{ bar(x: T) { return x; } }
 namespace M {
     export class C { foo() { } }
-    export module C {
+    export namespace C {
         export class X {
         }
     }
diff --git a/tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts b/tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts
index 299e88e67c5..6ba2e2cc936 100644
--- a/tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts
+++ b/tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts
@@ -1,5 +1,5 @@
 //@module: amd
-export declare module TypeScript {
+export declare namespace TypeScript {
   class PullSymbol { }
   class PullSignatureSymbol <A,B,C> extends PullSymbol {
   public addSpecialization<A,B,C>(signature: PullSignatureSymbol<A,B,C>, typeArguments: PullTypeSymbol<any,any,any>[]): void;
diff --git a/tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts b/tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts
index e6ed2305b9b..fcaaf1ee5cf 100644
--- a/tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts
+++ b/tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts
@@ -1,7 +1,7 @@
 declare function _<T>(value: Array<T>): _<T>;
 declare function _<T>(value: T): _<T>;
 
-declare module _ {
+declare namespace _ {
     export function each<T>(
         //list: List<T>,
         //iterator: ListIterator<T, void>,
diff --git a/tests/cases/compiler/giant.ts b/tests/cases/compiler/giant.ts
index 361075e6c53..f88c914ca81 100644
--- a/tests/cases/compiler/giant.ts
+++ b/tests/cases/compiler/giant.ts
@@ -152,11 +152,11 @@ namespace M {
         export function eF() { };
         export class eC { };
         export interface eI { };
-        export module eM { };
+        export namespace eM { };
         export declare var eaV;
         export declare function eaF() { };
         export declare class eaC { };
-        export declare module eaM { };
+        export declare namespace eaM { };
     }
     export var eV;
     export function eF() { };
@@ -221,7 +221,7 @@ namespace M {
         p7(pa1, pa2): void;
         p7? (pa1, pa2): void;
     }
-    export module eM {
+    export namespace eM {
         var V;
         function F() { };
         class C { };
@@ -231,11 +231,11 @@ namespace M {
         export function eF() { };
         export class eC { };
         export interface eI { };
-        export module eM { };
+        export namespace eM { };
         export declare var eaV;
         export declare function eaF() { };
         export declare class eaC { };
-        export declare module eaM { };
+        export declare namespace eaM { };
     }
     export declare var eaV;
     export declare function eaF() { };
@@ -260,7 +260,7 @@ namespace M {
         static tgF() { }
         static get tgF()
     }
-    export declare module eaM {
+    export declare namespace eaM {
         var V;
         function F() { };
         class C { }
@@ -270,7 +270,7 @@ namespace M {
         export function eF() { };
         export class eC { }
         export interface eI { }
-        export module eM { }
+        export namespace eM { }
     }
 }
 export var eV;
@@ -336,7 +336,7 @@ export interface eI {
     p7(pa1, pa2): void;
     p7? (pa1, pa2): void;
 }
-export module eM {
+export namespace eM {
     var V;
     function F() { };
     class C {
@@ -410,11 +410,11 @@ export module eM {
         export function eF() { };
         export class eC { };
         export interface eI { };
-        export module eM { };
+        export namespace eM { };
         export declare var eaV;
         export declare function eaF() { };
         export declare class eaC { };
-        export declare module eaM { };
+        export declare namespace eaM { };
     }
     export var eV;
     export function eF() { };
@@ -479,7 +479,7 @@ export module eM {
         p7(pa1, pa2): void;
         p7? (pa1, pa2): void;
     }
-    export module eM {
+    export namespace eM {
         var V;
         function F() { };
         class C { };
@@ -489,11 +489,11 @@ export module eM {
         export function eF() { };
         export class eC { };
         export interface eI { };
-        export module eM { };
+        export namespace eM { };
         export declare var eaV;
         export declare function eaF() { };
         export declare class eaC { };
-        export declare module eaM { };
+        export declare namespace eaM { };
     }
     export declare var eaV;
     export declare function eaF() { };
@@ -518,7 +518,7 @@ export module eM {
         static tgF() { }
         static get tgF()
     }
-    export declare module eaM {
+    export declare namespace eaM {
         var V;
         function F() { };
         class C { }
@@ -528,7 +528,7 @@ export module eM {
         export function eF() { };
         export class eC { }
         export interface eI { }
-        export module eM { }
+        export namespace eM { }
     }
 }
 export declare var eaV;
@@ -554,7 +554,7 @@ export declare class eaC {
     static tgF() { }
     static get tgF()
 }
-export declare module eaM {
+export declare namespace eaM {
     var V;
     function F() { };
     class C {
@@ -614,11 +614,11 @@ export declare module eaM {
         export function eF() { };
         export class eC { }
         export interface eI { }
-        export module eM { }
+        export namespace eM { }
         export declare var eaV
         export declare function eaF() { };
         export declare class eaC { }
-        export declare module eaM { }
+        export declare namespace eaM { }
     }
     export var eV;
     export function eF() { };
@@ -670,7 +670,7 @@ export declare module eaM {
         p7(pa1, pa2): void;
         p7? (pa1, pa2): void;
     }
-    export module eM {
+    export namespace eM {
         var V;
         function F() { };
         class C { }
@@ -679,6 +679,6 @@ export declare module eaM {
         export function eF() { };
         export class eC { }
         export interface eI { }
-        export module eM { }
+        export namespace eM { }
     }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/implicitAnyAmbients.ts b/tests/cases/compiler/implicitAnyAmbients.ts
index 8588421e256..26804256c10 100644
--- a/tests/cases/compiler/implicitAnyAmbients.ts
+++ b/tests/cases/compiler/implicitAnyAmbients.ts
@@ -1,6 +1,6 @@
 // @noimplicitany: true
 
-declare module m {
+declare namespace m {
     var x; // error
     var y: any;
 
diff --git a/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts b/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts
index 8620578bf7e..f642bb964e1 100644
--- a/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts
+++ b/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts
@@ -1,5 +1,5 @@
 // @Filename: importAliasAnExternalModuleInsideAnInternalModule_file0.ts
-export module m {
+export namespace m {
     export function foo() { }
 }
 
diff --git a/tests/cases/compiler/importAliasWithDottedName.ts b/tests/cases/compiler/importAliasWithDottedName.ts
index 5a00afd1c14..61b97b9b0d6 100644
--- a/tests/cases/compiler/importAliasWithDottedName.ts
+++ b/tests/cases/compiler/importAliasWithDottedName.ts
@@ -1,6 +1,6 @@
 namespace M {
     export var x = 1;
-    export module N {
+    export namespace N {
         export var y = 2;
     }
 }
diff --git a/tests/cases/compiler/importDecl.ts b/tests/cases/compiler/importDecl.ts
index e7c3a0789ce..6abe77078c8 100644
--- a/tests/cases/compiler/importDecl.ts
+++ b/tests/cases/compiler/importDecl.ts
@@ -43,7 +43,7 @@ export var x4 = m4.x;
 export var d4 = m4.d;
 export var f4 = m4.foo();
 
-export module m1 {
+export namespace m1 {
     export var x2 = m4.x;
     export var d2 = m4.d;
     export var f2 = m4.foo();
@@ -64,7 +64,7 @@ export var useFncOnly_m4_f4 = fncOnly_m4.foo();
 
 // only used privately no need to emit
 import private_m4 = require("./importDecl_require3");
-export module usePrivate_m4_m1 {
+export namespace usePrivate_m4_m1 {
     var x3 = private_m4.x;
     var d3 = private_m4.d;
     var f3 = private_m4.foo();
diff --git a/tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts b/tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts
index 5d42c1eb615..b0ad82a993e 100644
--- a/tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts
+++ b/tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts
@@ -1,5 +1,5 @@
 declare module "m" {
-    module x {
+    namespace x {
         interface c {
         }
     }
diff --git a/tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts b/tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts
index 0b280166cfd..c1ceeca5e03 100644
--- a/tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts
+++ b/tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts
@@ -1,5 +1,5 @@
 declare module "m" {
-    module x {
+    namespace x {
         interface c {
         }
     }
diff --git a/tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts b/tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts
index d475ae34bfd..006f14ef36c 100644
--- a/tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts
+++ b/tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts
@@ -1,5 +1,5 @@
 declare module "m" {
-    module x {
+    namespace x {
         interface c {
         }
     }
diff --git a/tests/cases/compiler/importInsideModule.ts b/tests/cases/compiler/importInsideModule.ts
index 44c2deec331..852d7e5614d 100644
--- a/tests/cases/compiler/importInsideModule.ts
+++ b/tests/cases/compiler/importInsideModule.ts
@@ -3,7 +3,7 @@
 export var x = 1;
 
 // @Filename: importInsideModule_file2.ts
-export module myModule {
+export namespace myModule {
     import foo = require("importInsideModule_file1");
     var a = foo.x;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/import_reference-exported-alias.ts b/tests/cases/compiler/import_reference-exported-alias.ts
index b409b620021..181d9775bea 100644
--- a/tests/cases/compiler/import_reference-exported-alias.ts
+++ b/tests/cases/compiler/import_reference-exported-alias.ts
@@ -1,6 +1,6 @@
 // @Filename: file1.ts
 namespace App {
-    export module Services {
+    export namespace Services {
         export class UserServices {
             public getUserName(): string {
                 return "Bill Gates";
diff --git a/tests/cases/compiler/import_reference-to-type-alias.ts b/tests/cases/compiler/import_reference-to-type-alias.ts
index afe304bf67f..f325f942d54 100644
--- a/tests/cases/compiler/import_reference-to-type-alias.ts
+++ b/tests/cases/compiler/import_reference-to-type-alias.ts
@@ -1,6 +1,6 @@
 // @Filename: file1.ts
-export module App {
-    export module Services {
+export namespace App {
+    export namespace Services {
         export class UserServices {
             public getUserName(): string {
                 return "Bill Gates";
diff --git a/tests/cases/compiler/importedAliasesInTypePositions.ts b/tests/cases/compiler/importedAliasesInTypePositions.ts
index f1dd66f60a7..2924ae31beb 100644
--- a/tests/cases/compiler/importedAliasesInTypePositions.ts
+++ b/tests/cases/compiler/importedAliasesInTypePositions.ts
@@ -12,7 +12,7 @@ export module elaborate.nested.mod.name {
 import RT_ALIAS = require("file1");
 import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo;
 
-export module ImportingModule {
+export namespace ImportingModule {
     class UsesReferredType {
         constructor(private referred: ReferredTo) { }
     }
diff --git a/tests/cases/compiler/importedModuleClassNameClash.ts b/tests/cases/compiler/importedModuleClassNameClash.ts
index 6883cadb369..cbcf01622cd 100644
--- a/tests/cases/compiler/importedModuleClassNameClash.ts
+++ b/tests/cases/compiler/importedModuleClassNameClash.ts
@@ -1,6 +1,6 @@
 //@module: amd
 import foo = m1;
  
-export module m1 { }
+export namespace m1 { }
  
 class foo { }
diff --git a/tests/cases/compiler/incompatibleExports1.ts b/tests/cases/compiler/incompatibleExports1.ts
index d0ebd5585af..9c2cd323e02 100644
--- a/tests/cases/compiler/incompatibleExports1.ts
+++ b/tests/cases/compiler/incompatibleExports1.ts
@@ -5,11 +5,11 @@ declare module "foo" {
 }
  
 declare module "baz" {
-    export module a {
+    export namespace a {
         export var b: number;
     }
  
-    module c {
+    namespace c {
         export var c: string;
     }
  
diff --git a/tests/cases/compiler/innerAliases.ts b/tests/cases/compiler/innerAliases.ts
index 8343d53f28d..8621755783b 100644
--- a/tests/cases/compiler/innerAliases.ts
+++ b/tests/cases/compiler/innerAliases.ts
@@ -1,6 +1,6 @@
 namespace A {
-    export module B {
-        export module C {
+    export namespace B {
+        export namespace C {
             export class Class1 {}
         }
     }
@@ -11,7 +11,7 @@ namespace D {
    
     var c1 = new inner.Class1(); 
 
-    export module E { 
+    export namespace E { 
         export class Class2 {}
     }
 }
diff --git a/tests/cases/compiler/innerExtern.ts b/tests/cases/compiler/innerExtern.ts
index 5f6f3064114..212181124ae 100644
--- a/tests/cases/compiler/innerExtern.ts
+++ b/tests/cases/compiler/innerExtern.ts
@@ -1,8 +1,8 @@
 namespace A {
-    export declare module BB {
+    export declare namespace BB {
         export var Elephant;
     }
-    export module B {
+    export namespace B {
         export class C {
             x = BB.Elephant.X;
         }
diff --git a/tests/cases/compiler/interMixingModulesInterfaces0.ts b/tests/cases/compiler/interMixingModulesInterfaces0.ts
index 9a47364d96a..d7d90760a98 100644
--- a/tests/cases/compiler/interMixingModulesInterfaces0.ts
+++ b/tests/cases/compiler/interMixingModulesInterfaces0.ts
@@ -1,6 +1,6 @@
 namespace A {
 
-    export module B {
+    export namespace B {
         export function createB(): B {
             return null;
         }
diff --git a/tests/cases/compiler/interMixingModulesInterfaces1.ts b/tests/cases/compiler/interMixingModulesInterfaces1.ts
index 21b4ca4f505..3970ed92526 100644
--- a/tests/cases/compiler/interMixingModulesInterfaces1.ts
+++ b/tests/cases/compiler/interMixingModulesInterfaces1.ts
@@ -5,7 +5,7 @@ namespace A {
         value: number;
     }
 
-    export module B {
+    export namespace B {
         export function createB(): B {
             return null;
         }
diff --git a/tests/cases/compiler/interMixingModulesInterfaces4.ts b/tests/cases/compiler/interMixingModulesInterfaces4.ts
index 8a2c36a7bb3..9d38def2ff0 100644
--- a/tests/cases/compiler/interMixingModulesInterfaces4.ts
+++ b/tests/cases/compiler/interMixingModulesInterfaces4.ts
@@ -1,6 +1,6 @@
 namespace A {
 
-    export module B {
+    export namespace B {
         export function createB(): number {
             return null;
         }
diff --git a/tests/cases/compiler/interMixingModulesInterfaces5.ts b/tests/cases/compiler/interMixingModulesInterfaces5.ts
index a1e2389606c..0a2965aac84 100644
--- a/tests/cases/compiler/interMixingModulesInterfaces5.ts
+++ b/tests/cases/compiler/interMixingModulesInterfaces5.ts
@@ -5,7 +5,7 @@ namespace A {
         value: number;
     }
 
-    export module B {
+    export namespace B {
         export function createB(): number {
             return null;
         }
diff --git a/tests/cases/compiler/interfaceDeclaration3.ts b/tests/cases/compiler/interfaceDeclaration3.ts
index eb447ca91c7..6dd9e787e3e 100644
--- a/tests/cases/compiler/interfaceDeclaration3.ts
+++ b/tests/cases/compiler/interfaceDeclaration3.ts
@@ -23,10 +23,10 @@ namespace M1 {
     }
 }
 
-export module M2 {
+export namespace M2 {
     export interface I1 { item:string; }
     export interface I2 { item:string; }
-    export module M3 {
+    export namespace M3 {
         export interface I1 { item:string; }
     }
     class C1 implements I1 {
diff --git a/tests/cases/compiler/interfacePropertiesWithSameName2.ts b/tests/cases/compiler/interfacePropertiesWithSameName2.ts
index 115e809c56e..2c9094b77c2 100644
--- a/tests/cases/compiler/interfacePropertiesWithSameName2.ts
+++ b/tests/cases/compiler/interfacePropertiesWithSameName2.ts
@@ -12,7 +12,7 @@ interface MoverShaker extends Mover, Shaker {
 }
 
 // Inside a module
-declare module MoversAndShakers {
+declare namespace MoversAndShakers {
     export class Mover {
         move(): void;
         getStatus(): { speed: number; };
diff --git a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts
index c326692bae5..f1d231f3c20 100644
--- a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module x {
+export namespace x {
     export class c {
         foo(a: number) {
             return a;
@@ -8,8 +8,8 @@ export module x {
     }
 }
 
-export module m2 {
-    export module m3 {
+export namespace m2 {
+    export namespace m3 {
         export import c = x.c;
         export var cProp = new c();
         var cReturnVal = cProp.foo(10);
diff --git a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts
index f5f821a5a24..e8245bdb67e 100644
--- a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module x {
+export namespace x {
     export class c {
         foo(a: number) {
             return a;
@@ -8,8 +8,8 @@ export module x {
     }
 }
 
-export module m2 {
-    export module m3 {
+export namespace m2 {
+    export namespace m3 {
         import c = x.c;
         export var cProp = new c();
         var cReturnVal = cProp.foo(10);
diff --git a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts
index fc456b8896e..92f15b82370 100644
--- a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts
@@ -1,5 +1,5 @@
 //@module: commonjs
-export module x {
+export namespace x {
     export class c {
         foo(a: number) {
             return a;
@@ -7,8 +7,8 @@ export module x {
     }
 }
 
-export module m2 {
-    export module m3 {
+export namespace m2 {
+    export namespace m3 {
         import c = x.c;
         export var cProp = new c();
         var cReturnVal = cProp.foo(10);
diff --git a/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts
index d0feb0735ad..598db2394b9 100644
--- a/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module x {
+export namespace x {
     export class c {
         foo(a: number) {
             return a;
diff --git a/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts
index 059d5bf3199..6202f502409 100644
--- a/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module x {
+export namespace x {
     export class c {
         foo(a: number) {
             return a;
diff --git a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts
index ad1f7c113c8..52a76bd6058 100644
--- a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module a {
+export namespace a {
     export enum weekend {
         Friday,
         Saturday,
@@ -8,7 +8,7 @@ export module a {
     }
 }
 
-export module c {
+export namespace c {
     export import b = a.weekend;
     export var bVal: b = b.Sunday;
 }
diff --git a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts
index 8cdf446ae71..66b36ab0da8 100644
--- a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module a {
+export namespace a {
     export enum weekend {
         Friday,
         Saturday,
@@ -8,7 +8,7 @@ export module a {
     }
 }
 
-export module c {
+export namespace c {
     import b = a.weekend;
     export var bVal: b = b.Sunday;
 }
diff --git a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts
index 01d2f7b6430..13eb2d8ef7d 100644
--- a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts
@@ -1,5 +1,5 @@
 //@module: commonjs
-export module a {
+export namespace a {
     export enum weekend {
         Friday,
         Saturday,
@@ -7,7 +7,7 @@ export module a {
     }
 }
 
-export module c {
+export namespace c {
     import b = a.weekend;
     export var bVal: b = b.Sunday;
 }
diff --git a/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts
index 29af9d1f69a..6522421bc5b 100644
--- a/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts
@@ -1,6 +1,6 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export enum weekend {
         Friday,
         Saturday,
diff --git a/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts
index ffc558fbf9c..90df2ff5817 100644
--- a/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts
@@ -1,6 +1,6 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export enum weekend {
         Friday,
         Saturday,
diff --git a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts
index fadf16cbea3..e9ed5dff053 100644
--- a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts
@@ -1,12 +1,12 @@
 //@module: commonjs
 // @declaration: true
-export module a {
+export namespace a {
     export function foo(x: number) {
         return x;
     }
 }
 
-export module c {
+export namespace c {
     export import b = a.foo;
     export var bVal = b(10);
     export var bVal2 = b;
diff --git a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts
index 9b56b079c30..a04f28fa52e 100644
--- a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts
@@ -1,12 +1,12 @@
 //@module: commonjs
 // @declaration: true
-export module a {
+export namespace a {
     export function foo(x: number) {
         return x;
     }
 }
 
-export module c {
+export namespace c {
     import b = a.foo;
     var bVal = b(10);
     export var bVal2 = b;
diff --git a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts
index 07d96374448..0e705189a3f 100644
--- a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts
@@ -1,11 +1,11 @@
 //@module: commonjs
-export module a {
+export namespace a {
     export function foo(x: number) {
         return x;
     }
 }
 
-export module c {
+export namespace c {
     import b = a.foo;
     var bVal = b(10);
     export var bVal2 = b;
diff --git a/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts
index 3859a16e678..bb25a349937 100644
--- a/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts
@@ -1,6 +1,6 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export function foo(x: number) {
         return x;
     }
diff --git a/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts
index 0ecf9fa75f3..a53a2f5b175 100644
--- a/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module a {
+export namespace a {
     export function foo(x: number) {
         return x;
     }
diff --git a/tests/cases/compiler/internalAliasInitializedModule.ts b/tests/cases/compiler/internalAliasInitializedModule.ts
index 04dcf806e70..13bc699fb75 100644
--- a/tests/cases/compiler/internalAliasInitializedModule.ts
+++ b/tests/cases/compiler/internalAliasInitializedModule.ts
@@ -1,6 +1,6 @@
 // @declaration: true
 namespace a {
-    export module b {
+    export namespace b {
         export class c {
         }
     }
diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts
index f36c242fa99..8abb8a8e262 100644
--- a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts
@@ -1,13 +1,13 @@
 //@module: amd
 // @declaration: true
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export class c {
         }
     }
 }
 
-export module c {
+export namespace c {
     export import b = a.b;
     export var x: b.c = new b.c();
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts
index 8e3e7b1fa2c..810964fbf6b 100644
--- a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts
@@ -1,13 +1,13 @@
 //@module: commonjs
 // @declaration: true
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export class c {
         }
     }
 }
 
-export module c {
+export namespace c {
     import b = a.b;
     export var x: b.c = new b.c();
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts
index 019973618d0..8867c4ec1e7 100644
--- a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts
@@ -1,12 +1,12 @@
 //@module: commonjs
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export class c {
         }
     }
 }
 
-export module c {
+export namespace c {
     import b = a.b;
     export var x: b.c = new b.c();
 }
diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts
index 0d8bc703e8b..ee812083d45 100644
--- a/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts
@@ -1,7 +1,7 @@
 //@module: commonjs
 // @declaration: true
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export class c {
         }
     }
diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts
index b02e6899348..a866934e699 100644
--- a/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts
@@ -1,7 +1,7 @@
 //@module: amd
 // @declaration: true
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export class c {
         }
     }
diff --git a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts
index faaa0c29a49..ce3272c00d1 100644
--- a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts
@@ -1,11 +1,11 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export interface I {
     }
 }
 
-export module c {
+export namespace c {
     export import b = a.I;
     export var x: b;
 }
diff --git a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts
index 7084cbc99b6..b15c334f467 100644
--- a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts
@@ -1,11 +1,11 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export interface I {
     }
 }
 
-export module c {
+export namespace c {
     import b = a.I;
     export var x: b;
 }
diff --git a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
index 23629661799..fb1764a7ca2 100644
--- a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
@@ -1,10 +1,10 @@
 //@module: amd
-export module a {
+export namespace a {
     export interface I {
     }
 }
 
-export module c {
+export namespace c {
     import b = a.I;
     export var x: b;
 }
diff --git a/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts
index 5498eedd60e..d99007a610a 100644
--- a/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module a {
+export namespace a {
     export interface I {
     }
 }
diff --git a/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts
index 60f95127644..f2f6bd13971 100644
--- a/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts
@@ -1,6 +1,6 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export interface I {
     }
 }
diff --git a/tests/cases/compiler/internalAliasUninitializedModule.ts b/tests/cases/compiler/internalAliasUninitializedModule.ts
index 430b137d5b6..eec8d3420e9 100644
--- a/tests/cases/compiler/internalAliasUninitializedModule.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModule.ts
@@ -1,6 +1,6 @@
 // @declaration: true
 namespace a {
-    export module b {
+    export namespace b {
         export interface I {
             foo();
         }
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts
index 12969ab59d6..9c148ca2d2e 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts
@@ -1,14 +1,14 @@
 //@module: commonjs
 // @declaration: true
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export interface I {
             foo();
         }
     }
 }
 
-export module c {
+export namespace c {
     export import b = a.b;
     export var x: b.I;
     x.foo();
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts
index fcaed7d34a0..b7d84962869 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts
@@ -1,14 +1,14 @@
 //@module: commonjs
 // @declaration: true
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export interface I {
             foo();
         }
     }
 }
 
-export module c {
+export namespace c {
     import b = a.b;
     export var x: b.I;
     x.foo();
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
index 36cfcf7e8ce..39b5a8ec246 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
@@ -1,13 +1,13 @@
 //@module: amd
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export interface I {
             foo();
         }
     }
 }
 
-export module c {
+export namespace c {
     import b = a.b;
     export var x: b.I;
     x.foo();
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts
index 1caa77efc6d..9ef9aba771d 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts
@@ -1,7 +1,7 @@
 //@module: amd
 // @declaration: true
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export interface I {
             foo();
         }
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts
index 794f2c9d976..03d2121e7b1 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts
@@ -1,7 +1,7 @@
 //@module: commonjs
 // @declaration: true
-export module a {
-    export module b {
+export namespace a {
+    export namespace b {
         export interface I {
             foo();
         }
diff --git a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts
index ab2d0eddff0..19c52736c0b 100644
--- a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts
@@ -1,10 +1,10 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export var x = 10;
 }
 
-export module c {
+export namespace c {
     export import b = a.x;
     export var bVal = b;
 }
diff --git a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts
index a262a24e685..09edf8fb0c6 100644
--- a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts
@@ -1,10 +1,10 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export var x = 10;
 }
 
-export module c {
+export namespace c {
     import b = a.x;
     export var bVal = b;
 }
diff --git a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts
index dbda086e705..6065ede8fd8 100644
--- a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts
@@ -1,9 +1,9 @@
 //@module: commonjs
-export module a {
+export namespace a {
     export var x = 10;
 }
 
-export module c {
+export namespace c {
     import b = a.x;
     export var bVal = b;
 }
diff --git a/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts
index ec37a80eb3d..186de6eeebc 100644
--- a/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts
+++ b/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts
@@ -1,6 +1,6 @@
 //@module: amd
 // @declaration: true
-export module a {
+export namespace a {
     export var x = 10;
 }
 
diff --git a/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts
index b6af17ee9ec..bfeb5bcc9cc 100644
--- a/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts
+++ b/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @declaration: true
-export module a {
+export namespace a {
     export var x = 10;
 }
 
diff --git a/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts b/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
index bd92a473428..b420d3fd3ad 100644
--- a/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
+++ b/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
@@ -5,7 +5,7 @@
 //@sourcemap: true
 
 // @filename: test.tsx
-declare module JSX {
+declare namespace JSX {
     interface IntrinsicElements {
         [s: string]: any;
     }
diff --git a/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts b/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
index 49e485a1085..e2d101c5f09 100644
--- a/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
+++ b/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
@@ -5,7 +5,7 @@
 //@sourcemap: true
 
 // @filename: test.tsx
-declare module JSX {
+declare namespace JSX {
     interface IntrinsicElements {
         [s: string]: any;
     }
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts b/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts
index a8996245138..9b6d23e283e 100644
--- a/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts
+++ b/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts
@@ -5,7 +5,7 @@
 //@sourcemap: true
 
 // @filename: test.tsx
-declare module JSX {
+declare namespace JSX {
     interface IntrinsicElements {
         [s: string]: any;
     }
diff --git a/tests/cases/compiler/knockout.ts b/tests/cases/compiler/knockout.ts
index cccfeef24db..dfe072d1a57 100644
--- a/tests/cases/compiler/knockout.ts
+++ b/tests/cases/compiler/knockout.ts
@@ -1,4 +1,4 @@
-  declare module ko {
+  declare namespace ko {
    export interface Observable<T> {
      (): T;
      (value: T): any;
diff --git a/tests/cases/compiler/memberScope.ts b/tests/cases/compiler/memberScope.ts
index 305a5eaacfa..c39124d3a99 100644
--- a/tests/cases/compiler/memberScope.ts
+++ b/tests/cases/compiler/memberScope.ts
@@ -1,6 +1,6 @@
 namespace Salt {
   export class Pepper {}
-  export module Basil { }
+  export namespace Basil { }
   var z = Basil.Pepper;
 }
 
diff --git a/tests/cases/compiler/mergedDeclarations3.ts b/tests/cases/compiler/mergedDeclarations3.ts
index 41a1b32091c..4b234499fa1 100644
--- a/tests/cases/compiler/mergedDeclarations3.ts
+++ b/tests/cases/compiler/mergedDeclarations3.ts
@@ -4,7 +4,7 @@ namespace M {
  }
 }
 namespace M {
- export module Color {
+ export namespace Color {
    export var Blue = 4;
   }
 }
@@ -22,7 +22,7 @@ namespace M {
 }
 
 namespace M {
-    export module foo {
+    export namespace foo {
         export var y = 2
     }
 }
diff --git a/tests/cases/compiler/mergedDeclarations4.ts b/tests/cases/compiler/mergedDeclarations4.ts
index 7bec0f4fd10..2619b59527b 100644
--- a/tests/cases/compiler/mergedDeclarations4.ts
+++ b/tests/cases/compiler/mergedDeclarations4.ts
@@ -6,7 +6,7 @@ namespace M {
 }
  
 namespace M {
-    export module f {
+    export namespace f {
         export var hello = 1;
     }
     f();
diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen.ts
index 9a0a5fbb17b..168a21e7b90 100644
--- a/tests/cases/compiler/mergedModuleDeclarationCodeGen.ts
+++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen.ts
@@ -1,5 +1,5 @@
-export module X {
-    export module Y {
+export namespace X {
+    export namespace Y {
         class A {
             constructor(Y: any) {
                 new B();
@@ -7,8 +7,8 @@ export module X {
         }
     }
 }
-export module X {
-    export module Y {
+export namespace X {
+    export namespace Y {
         export class B {
         }
     }
diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts
index d53fc363636..ed4aa36f1a0 100644
--- a/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts
+++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts
@@ -1,12 +1,12 @@
 namespace superContain {
-    export module contain {
+    export namespace contain {
         export module my.buz {
-            export module data {
+            export namespace data {
                 export function foo() { }
             }
         }
         export module my.buz {
-            export module data {
+            export namespace data {
                 export function bar(contain, my, buz, data) {
                     foo();
                 }
diff --git a/tests/cases/compiler/missingTypeArguments3.ts b/tests/cases/compiler/missingTypeArguments3.ts
index 0f86411e2e4..a0644803af4 100644
--- a/tests/cases/compiler/missingTypeArguments3.ts
+++ b/tests/cases/compiler/missingTypeArguments3.ts
@@ -1,4 +1,4 @@
-declare module linq {
+declare namespace linq {
 
     interface Enumerable<T> {
         OrderByDescending(keySelector?: string): OrderedEnumerable<T>;
diff --git a/tests/cases/compiler/mixedExports.ts b/tests/cases/compiler/mixedExports.ts
index 82486352761..896cb550f48 100644
--- a/tests/cases/compiler/mixedExports.ts
+++ b/tests/cases/compiler/mixedExports.ts
@@ -1,16 +1,16 @@
-declare module M {
+declare namespace M {
      function foo();
      export function foo();
      function foo();
 }
 
-declare module M1 {
+declare namespace M1 {
      export interface Foo {}
      interface Foo {}
 }
 
 namespace A {
      interface X {x}
-     export module X {}
+     export namespace X {}
      interface X {y}
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts b/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts
index 9a9c29d3165..f6271a80ce3 100644
--- a/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts
+++ b/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts
@@ -1,12 +1,12 @@
 namespace A {
-    declare module My {
+    declare namespace My {
         export var x: number;
     }
     function My(s: string) { }
 }
 
 namespace B {
-    declare module My {
+    declare namespace My {
         export var x: number;
     }
     function My(s: boolean);
@@ -14,14 +14,14 @@ namespace B {
 }
 
 namespace C {
-    declare module My {
+    declare namespace My {
         export var x: number;
     }
     declare function My(s: boolean);
 }
 
 namespace D {
-    declare module My {
+    declare namespace My {
         export var x: number;
     }
     declare function My(s: boolean);
@@ -30,11 +30,11 @@ namespace D {
 
 
 namespace E {
-    declare module My {
+    declare namespace My {
         export var x: number;
     }
     declare function My(s: boolean);
-    declare module My {
+    declare namespace My {
         export var y: number;
     }
     declare function My(s: any);
diff --git a/tests/cases/compiler/modFunctionCrash.ts b/tests/cases/compiler/modFunctionCrash.ts
index 038fb40f7c8..c1099f974bb 100644
--- a/tests/cases/compiler/modFunctionCrash.ts
+++ b/tests/cases/compiler/modFunctionCrash.ts
@@ -1,4 +1,4 @@
-declare module Q {
+declare namespace Q {
     function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler
 }
 
diff --git a/tests/cases/compiler/moduleAndInterfaceSharingName.ts b/tests/cases/compiler/moduleAndInterfaceSharingName.ts
index af18876294e..ae5fc4c03e7 100644
--- a/tests/cases/compiler/moduleAndInterfaceSharingName.ts
+++ b/tests/cases/compiler/moduleAndInterfaceSharingName.ts
@@ -1,5 +1,5 @@
 namespace X {
-    export module Y {
+    export namespace Y {
         export interface Z { }
     }
     export interface Y { }
diff --git a/tests/cases/compiler/moduleAndInterfaceSharingName2.ts b/tests/cases/compiler/moduleAndInterfaceSharingName2.ts
index 58d0597fb14..2f695e96bd0 100644
--- a/tests/cases/compiler/moduleAndInterfaceSharingName2.ts
+++ b/tests/cases/compiler/moduleAndInterfaceSharingName2.ts
@@ -1,5 +1,5 @@
 namespace X {
-    export module Y {
+    export namespace Y {
         export interface Z { }
     }
     export interface Y { }
diff --git a/tests/cases/compiler/moduleAndInterfaceSharingName3.ts b/tests/cases/compiler/moduleAndInterfaceSharingName3.ts
index 3197728de02..d493bffd365 100644
--- a/tests/cases/compiler/moduleAndInterfaceSharingName3.ts
+++ b/tests/cases/compiler/moduleAndInterfaceSharingName3.ts
@@ -1,5 +1,5 @@
 namespace X {
-    export module Y {
+    export namespace Y {
         export interface Z { }
     }
     export interface Y<T> { }
diff --git a/tests/cases/compiler/moduleAndInterfaceSharingName4.ts b/tests/cases/compiler/moduleAndInterfaceSharingName4.ts
index afd99322400..1fbd0d96a2f 100644
--- a/tests/cases/compiler/moduleAndInterfaceSharingName4.ts
+++ b/tests/cases/compiler/moduleAndInterfaceSharingName4.ts
@@ -1,4 +1,4 @@
-declare module D3 {
+declare namespace D3 {
     var x: D3.Color.Color;
 
     namespace Color {
diff --git a/tests/cases/compiler/moduleAndInterfaceWithSameName.ts b/tests/cases/compiler/moduleAndInterfaceWithSameName.ts
index b9c81acaa9a..3c84570779e 100644
--- a/tests/cases/compiler/moduleAndInterfaceWithSameName.ts
+++ b/tests/cases/compiler/moduleAndInterfaceWithSameName.ts
@@ -1,5 +1,5 @@
 namespace Foo1 {
-    export module Bar {
+    export namespace Bar {
         export var x = 42;
     }
 
@@ -21,7 +21,7 @@ namespace Foo2 {
 var z2 = Foo2.Bar.y; // Error for using interface name as a value.
 
 namespace Foo3 {
-    export module Bar {
+    export namespace Bar {
         export var x = 42;
     }
 
diff --git a/tests/cases/compiler/moduleAssignmentCompat4.ts b/tests/cases/compiler/moduleAssignmentCompat4.ts
index b041ea5d9ed..f1b762a6848 100644
--- a/tests/cases/compiler/moduleAssignmentCompat4.ts
+++ b/tests/cases/compiler/moduleAssignmentCompat4.ts
@@ -1,10 +1,10 @@
 namespace A {
-   export module M {
+   export namespace M {
         class C { }
     }
 }
 namespace B {
-    export module M {
+    export namespace M {
         export class D { }
     }
 }
diff --git a/tests/cases/compiler/moduleAugmentationNoNewNames.ts b/tests/cases/compiler/moduleAugmentationNoNewNames.ts
index 2ab82ba5f0b..f0e8f93f0cf 100644
--- a/tests/cases/compiler/moduleAugmentationNoNewNames.ts
+++ b/tests/cases/compiler/moduleAugmentationNoNewNames.ts
@@ -12,7 +12,7 @@ declare module "./observable" {
     class Bar {}
     let y: number, z: string;
     let {a: x, b: x1}: {a: number, b: number};
-    module Z {}
+    namespace Z {}
 }
 
 // @filename: observable.ts
diff --git a/tests/cases/compiler/moduleCodegenTest4.ts b/tests/cases/compiler/moduleCodegenTest4.ts
index fbf540b4a27..7f57b26d6ce 100644
--- a/tests/cases/compiler/moduleCodegenTest4.ts
+++ b/tests/cases/compiler/moduleCodegenTest4.ts
@@ -1,5 +1,5 @@
 //@module: commonjs
-export module Baz { export var x = "hello"; }
+export namespace Baz { export var x = "hello"; }
 
 Baz.x = "goodbye";
 void 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleElementsInWrongContext.ts b/tests/cases/compiler/moduleElementsInWrongContext.ts
index 778e2775467..4f7d0d33878 100644
--- a/tests/cases/compiler/moduleElementsInWrongContext.ts
+++ b/tests/cases/compiler/moduleElementsInWrongContext.ts
@@ -1,5 +1,5 @@
 {
-    module M { }
+    namespace M { }
     export namespace N {
         export interface I { }
     }
diff --git a/tests/cases/compiler/moduleElementsInWrongContext2.ts b/tests/cases/compiler/moduleElementsInWrongContext2.ts
index 936893b96c2..204e621fbad 100644
--- a/tests/cases/compiler/moduleElementsInWrongContext2.ts
+++ b/tests/cases/compiler/moduleElementsInWrongContext2.ts
@@ -1,5 +1,5 @@
 function blah () {
-    module M { }
+    namespace M { }
     export namespace N {
         export interface I { }
     }
diff --git a/tests/cases/compiler/moduleElementsInWrongContext3.ts b/tests/cases/compiler/moduleElementsInWrongContext3.ts
index efc69016269..73fad4ba3c7 100644
--- a/tests/cases/compiler/moduleElementsInWrongContext3.ts
+++ b/tests/cases/compiler/moduleElementsInWrongContext3.ts
@@ -1,6 +1,6 @@
-module P {
+namespace P {
     {
-        module M { }
+        namespace M { }
         export namespace N {
             export interface I { }
         }
diff --git a/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts b/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts
index 1d5dfbec59e..68d60977d62 100644
--- a/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts
+++ b/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts
@@ -1,5 +1,5 @@
 namespace TypeScript {
-    export module CompilerDiagnostics {
+    export namespace CompilerDiagnostics {
 
         export interface IDiagnosticWriter {
             Alert(output: string): void;
diff --git a/tests/cases/compiler/moduleOuterQualification.ts b/tests/cases/compiler/moduleOuterQualification.ts
index bd315843125..a725a1a2458 100644
--- a/tests/cases/compiler/moduleOuterQualification.ts
+++ b/tests/cases/compiler/moduleOuterQualification.ts
@@ -1,6 +1,6 @@
 // @declaration: true
 
-declare module outer {
+declare namespace outer {
   interface Beta { }
   namespace inner {
     // .d.ts emit: should be 'extends outer.Beta'
diff --git a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts
index 3d80b3dbdf4..93be3bc4980 100644
--- a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts
+++ b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts
@@ -1,5 +1,5 @@
 namespace Z {
-    export module M {
+    export namespace M {
         export function bar() {
             return "";
         }
diff --git a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts
index b37b002b4b3..d5a35cc3ee2 100644
--- a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts
+++ b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts
@@ -1,5 +1,5 @@
 namespace Z {
-    export module M {
+    export namespace M {
         export function bar() {
             return "";
         }
diff --git a/tests/cases/compiler/moduleVisibilityTest1.ts b/tests/cases/compiler/moduleVisibilityTest1.ts
index 5b21c0727ce..6e71c4b10d9 100644
--- a/tests/cases/compiler/moduleVisibilityTest1.ts
+++ b/tests/cases/compiler/moduleVisibilityTest1.ts
@@ -3,7 +3,7 @@
 namespace OuterMod {
 	export function someExportedOuterFunc() { return -1; }
 
-	export module OuterInnerMod {
+	export namespace OuterInnerMod {
 		export function someExportedOuterInnerFunc() { return "foo"; }
 	}
 }
@@ -12,7 +12,7 @@ import OuterInnerAlias = OuterMod.OuterInnerMod;
 
 namespace M {
 
-	export module InnerMod {
+	export namespace InnerMod {
 		export function someExportedInnerFunc() { return -2; }
 	}
 
diff --git a/tests/cases/compiler/moduleVisibilityTest2.ts b/tests/cases/compiler/moduleVisibilityTest2.ts
index 9f334a15909..79c6187d7b8 100644
--- a/tests/cases/compiler/moduleVisibilityTest2.ts
+++ b/tests/cases/compiler/moduleVisibilityTest2.ts
@@ -3,7 +3,7 @@
 namespace OuterMod {
 	export function someExportedOuterFunc() { return -1; }
 
-	export module OuterInnerMod {
+	export namespace OuterInnerMod {
 		export function someExportedOuterInnerFunc() { return "foo"; }
 	}
 }
diff --git a/tests/cases/compiler/moduledecl.ts b/tests/cases/compiler/moduledecl.ts
index eac2e9ff78c..833a3879a42 100644
--- a/tests/cases/compiler/moduledecl.ts
+++ b/tests/cases/compiler/moduledecl.ts
@@ -1,7 +1,7 @@
 // @declaration: true
 // @target: es5
 
-module a {
+namespace a {
 }
 
 module b.a {
@@ -11,14 +11,14 @@ module c.a.b {
     import ma = a;
 }
 
-module mImport {
+namespace mImport {
     import d = a;
     import e = b.a;
     import d1 = a;
     import e1 = b.a;
 }
 
-module m0 {
+namespace m0 {
     function f1() {
     }
 
@@ -47,7 +47,7 @@ module m0 {
     import m7 = c.a.b;
 }
 
-module m1 {
+namespace m1 {
     export function f1() {
     }
 
@@ -84,30 +84,30 @@ module m1 {
     import m7 = c.a.b;
 }
 
-module m {
-    export module m2 {
+namespace m {
+    export namespace m2 {
         var a = 10;
         export var b: number;
     }
 
-    export module m3 {
+    export namespace m3 {
         export var c: number;
     }
 }
 
-module m {
+namespace m {
 
-    export module m25 {
-        export module m5 {
+    export namespace m25 {
+        export namespace m5 {
             export var c: number;
         }
     }
 }
 
-module m13 {
-    export module m4 {
-        export module m2 {
-            export module m3 {
+namespace m13 {
+    export namespace m4 {
+        export namespace m2 {
+            export namespace m3 {
                 export var c: number;
             }
         }
@@ -118,19 +118,19 @@ module m13 {
     }
 }
 
-declare module m4 {
+declare namespace m4 {
     export var b;
 }
 
-declare module m5 {
+declare namespace m5 {
     export var c;
 }
 
-declare module m43 {
+declare namespace m43 {
     export var b;
 }
 
-declare module m55 {
+declare namespace m55 {
     export var c;
 }
 
@@ -138,7 +138,7 @@ declare module "m3" {
     export var b: number;
 }
 
-module exportTests {
+namespace exportTests {
     export class C1_public {
         private f2() {
             return 30;
@@ -178,7 +178,7 @@ module exportTests {
     }
 }
 
-declare module mAmbient {
+declare namespace mAmbient {
     class C {
         public myProp: number;
     }
@@ -195,7 +195,7 @@ declare module mAmbient {
         z
     }
 
-    module m3 {
+    namespace m3 {
         class C {
             public myProp: number;
         }
diff --git a/tests/cases/compiler/multipleExports.ts b/tests/cases/compiler/multipleExports.ts
index b8d16ea18a8..0a56c9a7190 100644
--- a/tests/cases/compiler/multipleExports.ts
+++ b/tests/cases/compiler/multipleExports.ts
@@ -1,12 +1,12 @@
 // @module: commonjs
 
-export module M {
+export namespace M {
     export var v = 0;
     export let x;
 }
 
 const x = 0;
-export module M {
+export namespace M {
     v;
     export {x};
 }
diff --git a/tests/cases/compiler/namespaces1.ts b/tests/cases/compiler/namespaces1.ts
index cf27961eb93..e0dc095d254 100644
--- a/tests/cases/compiler/namespaces1.ts
+++ b/tests/cases/compiler/namespaces1.ts
@@ -1,5 +1,5 @@
 namespace X {
-    export module Y {
+    export namespace Y {
         export interface Z { }
     }
     export interface Y { }
diff --git a/tests/cases/compiler/namespaces2.ts b/tests/cases/compiler/namespaces2.ts
index e16b97f35a3..02d8a2ba652 100644
--- a/tests/cases/compiler/namespaces2.ts
+++ b/tests/cases/compiler/namespaces2.ts
@@ -1,5 +1,5 @@
 namespace A {
-    export module B {
+    export namespace B {
         export class C { }
     }
 }
diff --git a/tests/cases/compiler/namespacesDeclaration1.ts b/tests/cases/compiler/namespacesDeclaration1.ts
index 48a600c381e..cf491bf5fbe 100644
--- a/tests/cases/compiler/namespacesDeclaration1.ts
+++ b/tests/cases/compiler/namespacesDeclaration1.ts
@@ -2,7 +2,7 @@
 
 namespace M {
    export namespace N {
-      export module M2 {
+      export namespace M2 {
          export interface I {}
       }
    }
diff --git a/tests/cases/compiler/noImplicitAnyModule.ts b/tests/cases/compiler/noImplicitAnyModule.ts
index a67ecf25586..0dc5d22d695 100644
--- a/tests/cases/compiler/noImplicitAnyModule.ts
+++ b/tests/cases/compiler/noImplicitAnyModule.ts
@@ -1,6 +1,6 @@
 //@noImplicitAny: true
 
-declare module Module {
+declare namespace Module {
     interface Interface {
         // Should return error for implicit any on return type.
         new ();
diff --git a/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts b/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
index 5ccc82bf690..78e2304709c 100644
--- a/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
+++ b/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
@@ -1,6 +1,6 @@
 //@noImplicitAny: true
 
-declare module D_M {
+declare namespace D_M {
     // No implicit-'any' errors.
     function dm_f1(): void;
 
diff --git a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
index b73f941f7a9..e177363ced6 100644
--- a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
+++ b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
@@ -1,4 +1,4 @@
-declare module M {
+declare namespace M {
     // Error because body is not ambient and this overload is
     export function f();
 }
diff --git a/tests/cases/compiler/parameterPropertyInConstructor1.ts b/tests/cases/compiler/parameterPropertyInConstructor1.ts
index 5de50cf9b21..0168f4af21f 100644
--- a/tests/cases/compiler/parameterPropertyInConstructor1.ts
+++ b/tests/cases/compiler/parameterPropertyInConstructor1.ts
@@ -1,4 +1,4 @@
-declare module mod {
+declare namespace mod {
   class Customers {
     constructor(public names: string);
   }
diff --git a/tests/cases/compiler/partiallyAmbientClodule.ts b/tests/cases/compiler/partiallyAmbientClodule.ts
index 211b165b73a..69447767594 100644
--- a/tests/cases/compiler/partiallyAmbientClodule.ts
+++ b/tests/cases/compiler/partiallyAmbientClodule.ts
@@ -1,4 +1,4 @@
-declare module foo {
+declare namespace foo {
     export function x(): any;
 }
 class foo { } // Legal, because module is ambient
\ No newline at end of file
diff --git a/tests/cases/compiler/partiallyAmbientFundule.ts b/tests/cases/compiler/partiallyAmbientFundule.ts
index 0ceb7f30cae..1c87f79d70c 100644
--- a/tests/cases/compiler/partiallyAmbientFundule.ts
+++ b/tests/cases/compiler/partiallyAmbientFundule.ts
@@ -1,4 +1,4 @@
-declare module foo {
+declare namespace foo {
     export function x(): any;
 }
 function foo () { } // Legal, because module is ambient
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyAccessorDeclFile.ts b/tests/cases/compiler/privacyAccessorDeclFile.ts
index 7f0e4448f56..9df33cee7c7 100644
--- a/tests/cases/compiler/privacyAccessorDeclFile.ts
+++ b/tests/cases/compiler/privacyAccessorDeclFile.ts
@@ -205,7 +205,7 @@ class privateClassWithPrivateModuleSetAccessorTypes {
     }
 }
 
-export module publicModule {
+export namespace publicModule {
     class privateClass {
     }
 
diff --git a/tests/cases/compiler/privacyClass.ts b/tests/cases/compiler/privacyClass.ts
index b57d0d3626a..a00a1b0c487 100644
--- a/tests/cases/compiler/privacyClass.ts
+++ b/tests/cases/compiler/privacyClass.ts
@@ -1,5 +1,5 @@
 //@module: commonjs
-export module m1 {
+export namespace m1 {
     export interface m1_i_public {
     }
 
diff --git a/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
index 18f7bcb8d69..9befa0f04d2 100644
--- a/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
+++ b/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
@@ -2,7 +2,7 @@
 // @declaration: true
 
 // @Filename: privacyClassExtendsClauseDeclFile_externalModule.ts
-export module publicModule {
+export namespace publicModule {
     export class publicClassInPublicModule {
         private f1() {
         }
diff --git a/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts b/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
index aa0b5ea2713..f4eb7e7f490 100644
--- a/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
+++ b/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
@@ -2,7 +2,7 @@
 // @declaration: true
 
 // @Filename: privacyClassImplementsClauseDeclFile_externalModule.ts
-export module publicModule {
+export namespace publicModule {
     export interface publicInterfaceInPublicModule {
     }
 
diff --git a/tests/cases/compiler/privacyFunctionParameterDeclFile.ts b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts
index 4012bef654f..16c0ff7d3f4 100644
--- a/tests/cases/compiler/privacyFunctionParameterDeclFile.ts
+++ b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts
@@ -132,7 +132,7 @@ function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.pub
 }
 declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
 
-export module publicModule {
+export namespace publicModule {
     class privateClass {
     }
 
diff --git a/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
index c329dbd6a99..730e1aa4c9b 100644
--- a/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
+++ b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
@@ -230,7 +230,7 @@ function privateFunctionWithPrivateModuleParameterTypes1() {
 }
 declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
 
-export module publicModule {
+export namespace publicModule {
     class privateClass {
     }
 
diff --git a/tests/cases/compiler/privacyGetter.ts b/tests/cases/compiler/privacyGetter.ts
index a6799bd4456..be469c8a537 100644
--- a/tests/cases/compiler/privacyGetter.ts
+++ b/tests/cases/compiler/privacyGetter.ts
@@ -1,6 +1,6 @@
 // @target: ES5
 //@module: amd
-export module m1 {
+export namespace m1 {
     export class C1_public {
         private f1() {
         }
diff --git a/tests/cases/compiler/privacyGloFunc.ts b/tests/cases/compiler/privacyGloFunc.ts
index a5dff8b2a36..d76e23bc7bb 100644
--- a/tests/cases/compiler/privacyGloFunc.ts
+++ b/tests/cases/compiler/privacyGloFunc.ts
@@ -1,5 +1,5 @@
 //@module: amd
-export module m1 {
+export namespace m1 {
     export class C1_public {
         private f1() {
         }
diff --git a/tests/cases/compiler/privacyGloImport.ts b/tests/cases/compiler/privacyGloImport.ts
index 19bf1009867..a589e9e6ab2 100644
--- a/tests/cases/compiler/privacyGloImport.ts
+++ b/tests/cases/compiler/privacyGloImport.ts
@@ -1,6 +1,6 @@
 //@declaration: true
-module m1 {
-    export module m1_M1_public {
+namespace m1 {
+    export namespace m1_M1_public {
         export class c1 {
         }
         export function f1() {
@@ -10,7 +10,7 @@ module m1 {
         export var v2: c1;
     }
 
-    module m1_M2_private {
+    namespace m1_M2_private {
         export class c1 {
         }
         export function f1() {
@@ -83,7 +83,7 @@ module m1 {
     //export import m1_im4_public = require("m1_M4_private");
 }
 
-module glo_M1_public {
+namespace glo_M1_public {
     export class c1 {
     }
     export function f1() {
@@ -118,11 +118,11 @@ declare module "use_glo_M1_public" {
     var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 
-    module m2 {
+    namespace m2 {
         //import errorImport = require("glo_M2_public");
         import nonerrorImport = glo_M1_public;
 
-        module m5 {
+        namespace m5 {
             //import m5_errorImport = require("glo_M2_public");
             import m5_nonerrorImport = glo_M1_public;
         }
@@ -130,12 +130,12 @@ declare module "use_glo_M1_public" {
 }
 
 declare module "anotherParseError" {
-    module m2 {
+    namespace m2 {
         //declare module "abc" {
         //}
     }
 
-    module m2 {
+    namespace m2 {
         //module "abc2" {
         //}
     }
@@ -143,9 +143,9 @@ declare module "anotherParseError" {
     //}
 }
 
-module m2 {
+namespace m2 {
     //import m3 = require("use_glo_M1_public");
-    module m4 {
+    namespace m4 {
         var a = 10;
         //import m2 = require("use_glo_M1_public");
     }
diff --git a/tests/cases/compiler/privacyGloImportParseErrors.ts b/tests/cases/compiler/privacyGloImportParseErrors.ts
index 8419f6737ea..0d725488952 100644
--- a/tests/cases/compiler/privacyGloImportParseErrors.ts
+++ b/tests/cases/compiler/privacyGloImportParseErrors.ts
@@ -1,6 +1,6 @@
 //@declaration: true
-module m1 {
-    export module m1_M1_public {
+namespace m1 {
+    export namespace m1_M1_public {
         export class c1 {
         }
         export function f1() {
@@ -10,7 +10,7 @@ module m1 {
         export var v2: c1;
     }
 
-    module m1_M2_private {
+    namespace m1_M2_private {
         export class c1 {
         }
         export function f1() {
@@ -83,7 +83,7 @@ module m1 {
     export import m1_im4_public = require("m1_M4_private");
 }
 
-module glo_M1_public {
+namespace glo_M1_public {
     export class c1 {
     }
     export function f1() {
@@ -118,11 +118,11 @@ declare module "use_glo_M1_public" {
     var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 
-    module m2 {
+    namespace m2 {
         import errorImport = require("glo_M2_public");
         import nonerrorImport = glo_M1_public;
 
-        module m5 {
+        namespace m5 {
             import m5_errorImport = require("glo_M2_public");
             import m5_nonerrorImport = glo_M1_public;
         }
@@ -130,12 +130,12 @@ declare module "use_glo_M1_public" {
 }
 
 declare module "anotherParseError" {
-    module m2 {
+    namespace m2 {
         declare module "abc" {
         }
     }
 
-    module m2 {
+    namespace m2 {
         module "abc2" {
         }
     }
@@ -143,9 +143,9 @@ declare module "anotherParseError" {
     }
 }
 
-module m2 {
+namespace m2 {
     import m3 = require("use_glo_M1_public");
-    module m4 {
+    namespace m4 {
         var a = 10;
         import m2 = require("use_glo_M1_public");
     }
diff --git a/tests/cases/compiler/privacyImport.ts b/tests/cases/compiler/privacyImport.ts
index dff16781d56..3a3236f1c7b 100644
--- a/tests/cases/compiler/privacyImport.ts
+++ b/tests/cases/compiler/privacyImport.ts
@@ -1,7 +1,7 @@
 //@module: commonjs
 //@declaration: true
-export module m1 {
-    export module m1_M1_public {
+export namespace m1 {
+    export namespace m1_M1_public {
         export class c1 {
         }
         export function f1() {
@@ -11,7 +11,7 @@ export module m1 {
         export var v2: c1;
     }
 
-    module m1_M2_private {
+    namespace m1_M2_private {
         export class c1 {
         }
         export function f1() {
@@ -84,8 +84,8 @@ export module m1 {
     //export import m1_im4_public = require("m1_M4_private");
 }
 
-module m2 {
-    export module m2_M1_public {
+namespace m2 {
+    export namespace m2_M1_public {
         export class c1 {
         }
         export function f1() {
@@ -95,7 +95,7 @@ module m2 {
         export var v2: c1;
     }
 
-    module m2_M2_private {
+    namespace m2_M2_private {
         export class c1 {
         }
         export function f1() {
@@ -169,7 +169,7 @@ module m2 {
     //export import m1_im4_public = require("m2_M4_private");
 }
 
-export module glo_M1_public {
+export namespace glo_M1_public {
     export class c1 {
     }
     export function f1() {
@@ -187,7 +187,7 @@ export module glo_M1_public {
 //    export var v2: c1;
 //}
 
-export module glo_M3_private {
+export namespace glo_M3_private {
     export class c1 {
     }
     export function f1() {
@@ -339,18 +339,18 @@ export import glo_im2_public = glo_M3_private;
 //    }
 //}
 
-module m2 {
+namespace m2 {
     //import m3 = require("use_glo_M1_public");
-    module m4 {
+    namespace m4 {
         var a = 10;
         //import m2 = require("use_glo_M1_public");
     }
 
 }
 
-export module m3 {
+export namespace m3 {
     //import m3 = require("use_glo_M1_public");
-    module m4 {
+    namespace m4 {
         var a = 10;
         //import m2 = require("use_glo_M1_public");
     }
diff --git a/tests/cases/compiler/privacyImportParseErrors.ts b/tests/cases/compiler/privacyImportParseErrors.ts
index 04d789a3749..fb9b58ae629 100644
--- a/tests/cases/compiler/privacyImportParseErrors.ts
+++ b/tests/cases/compiler/privacyImportParseErrors.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
-export module m1 {
-    export module m1_M1_public {
+export namespace m1 {
+    export namespace m1_M1_public {
         export class c1 {
         }
         export function f1() {
@@ -10,7 +10,7 @@ export module m1 {
         export var v2: c1;
     }
 
-    module m1_M2_private {
+    namespace m1_M2_private {
         export class c1 {
         }
         export function f1() {
@@ -83,8 +83,8 @@ export module m1 {
     export import m1_im4_public = require("m1_M4_private");
 }
 
-module m2 {
-    export module m2_M1_public {
+namespace m2 {
+    export namespace m2_M1_public {
         export class c1 {
         }
         export function f1() {
@@ -94,7 +94,7 @@ module m2 {
         export var v2: c1;
     }
 
-    module m2_M2_private {
+    namespace m2_M2_private {
         export class c1 {
         }
         export function f1() {
@@ -168,7 +168,7 @@ module m2 {
     export import m1_im4_public = require("m2_M4_private");
 }
 
-export module glo_M1_public {
+export namespace glo_M1_public {
     export class c1 {
     }
     export function f1() {
@@ -186,7 +186,7 @@ export declare module "glo_M2_public" {
     export var v2: c1;
 }
 
-export module glo_M3_private {
+export namespace glo_M3_private {
     export class c1 {
     }
     export function f1() {
@@ -270,11 +270,11 @@ export declare module "use_glo_M1_public" {
     var use_glo_M2_public_v2_private: use_glo_M2_public;
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 
-    module m2 {
+    namespace m2 {
         import errorImport = require("glo_M2_public");
         import nonerrorImport = glo_M1_public;
 
-        module m5 {
+        namespace m5 {
             import m5_errorImport = require("glo_M2_public");
             import m5_nonerrorImport = glo_M1_public;
         }
@@ -299,11 +299,11 @@ declare module "use_glo_M3_private" {
     var use_glo_M4_private_v2_private: use_glo_M4_private;
     var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
 
-    module m2 {
+    namespace m2 {
         import errorImport = require("glo_M4_private");
         import nonerrorImport = glo_M3_private;
 
-        module m5 {
+        namespace m5 {
             import m5_errorImport = require("glo_M4_private");
             import m5_nonerrorImport = glo_M3_private;
         }
@@ -311,12 +311,12 @@ declare module "use_glo_M3_private" {
 }
 
 declare module "anotherParseError" {
-    module m2 {
+    namespace m2 {
         declare module "abc" {
         }
     }
 
-    module m2 {
+    namespace m2 {
         module "abc2" {
         }
     }
@@ -325,12 +325,12 @@ declare module "anotherParseError" {
 }
 
 declare export module "anotherParseError2" {
-    module m2 {
+    namespace m2 {
         declare module "abc" {
         }
     }
 
-    module m2 {
+    namespace m2 {
         module "abc2" {
         }
     }
@@ -338,18 +338,18 @@ declare export module "anotherParseError2" {
     }
 }
 
-module m2 {
+namespace m2 {
     import m3 = require("use_glo_M1_public");
-    module m4 {
+    namespace m4 {
         var a = 10;
         import m2 = require("use_glo_M1_public");
     }
 
 }
 
-export module m3 {
+export namespace m3 {
     import m3 = require("use_glo_M1_public");
-    module m4 {
+    namespace m4 {
         var a = 10;
         import m2 = require("use_glo_M1_public");
     }
diff --git a/tests/cases/compiler/privacyInterface.ts b/tests/cases/compiler/privacyInterface.ts
index ab83c313e74..13e0d107c09 100644
--- a/tests/cases/compiler/privacyInterface.ts
+++ b/tests/cases/compiler/privacyInterface.ts
@@ -1,5 +1,5 @@
 //@module: commonjs
-export module m1 {
+export namespace m1 {
     export class C1_public {
         private f1() {
         }
@@ -193,7 +193,7 @@ interface C8_private {
 
 }
 
-export module m3 {
+export namespace m3 {
     export interface m3_i_public {
         f1(): number;
     }
diff --git a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
index 69db00d13f1..8f2ab891ff8 100644
--- a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
+++ b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
@@ -2,7 +2,7 @@
 // @declaration: true
 
 // @Filename: privacyInterfaceExtendsClauseDeclFile_externalModule.ts
-export module publicModule {
+export namespace publicModule {
     export interface publicInterfaceInPublicModule {
     }
 
diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
index a2a8fdc5033..cc12ab4111e 100644
--- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
+++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
@@ -14,18 +14,18 @@ namespace m_private {
     export var v_private = new c_private();
     export interface i_private {
     }
-    export module mi_private {
+    export namespace mi_private {
         export class c {
         }
     }
-    export module mu_private {
+    export namespace mu_private {
         export interface i {
         }
     }
 }
 
 // Public elements
-export module m_public {
+export namespace m_public {
     export class c_public {
     }
     export enum e_public {
@@ -38,17 +38,17 @@ export module m_public {
     export var v_public = 10;
     export interface i_public {
     }
-    export module mi_public {
+    export namespace mi_public {
         export class c {
         }
     }
-    export module mu_public {
+    export namespace mu_public {
         export interface i {
         }
     }
 }
 
-export module import_public {
+export namespace import_public {
     // Privacy errors - importing private elements
     export import im_public_c_private = m_private.c_private;
     export import im_public_e_private = m_private.e_private;
diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
index 752d56c601d..9462c129b0c 100644
--- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
@@ -14,18 +14,18 @@ namespace m_private {
     export var v_private = new c_private();
     export interface i_private {
     }
-    export module mi_private {
+    export namespace mi_private {
         export class c {
         }
     }
-    export module mu_private {
+    export namespace mu_private {
         export interface i {
         }
     }
 }
 
 // Public elements
-export module m_public {
+export namespace m_public {
     export class c_public {
     }
     export enum e_public {
@@ -38,17 +38,17 @@ export module m_public {
     export var v_public = 10;
     export interface i_public {
     }
-    export module mi_public {
+    export namespace mi_public {
         export class c {
         }
     }
-    export module mu_public {
+    export namespace mu_public {
         export interface i {
         }
     }
 }
 
-export module import_public {
+export namespace import_public {
     // No Privacy errors - importing private elements
     import im_private_c_private = m_private.c_private;
     import im_private_e_private = m_private.e_private;
diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
index 4dda10bf155..5fb4b1dcba3 100644
--- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
+++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
@@ -14,18 +14,18 @@ namespace m_private {
     export var v_private = new c_private();
     export interface i_private {
     }
-    export module mi_private {
+    export namespace mi_private {
         export class c {
         }
     }
-    export module mu_private {
+    export namespace mu_private {
         export interface i {
         }
     }
 }
 
 // Public elements
-export module m_public {
+export namespace m_public {
     export class c_public {
     }
     export enum e_public {
@@ -38,11 +38,11 @@ export module m_public {
     export var v_public = 10;
     export interface i_public {
     }
-    export module mi_public {
+    export namespace mi_public {
         export class c {
         }
     }
-    export module mu_public {
+    export namespace mu_public {
         export interface i {
         }
     }
diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
index 2e75f66c501..7a8f3c024da 100644
--- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
@@ -15,18 +15,18 @@ namespace m_private {
     export var v_private = new c_private();
     export interface i_private {
     }
-    export module mi_private {
+    export namespace mi_private {
         export class c {
         }
     }
-    export module mu_private {
+    export namespace mu_private {
         export interface i {
         }
     }
 }
 
 // Public elements
-export module m_public {
+export namespace m_public {
     export class c_public {
     }
     export enum e_public {
@@ -39,11 +39,11 @@ export module m_public {
     export var v_public = 10;
     export interface i_public {
     }
-    export module mi_public {
+    export namespace mi_public {
         export class c {
         }
     }
-    export module mu_public {
+    export namespace mu_public {
         export interface i {
         }
     }
diff --git a/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts b/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
index ffe336834d3..ea22fe0353b 100644
--- a/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
+++ b/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
@@ -155,7 +155,7 @@ function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule
 }
 
 
-export module publicModule {
+export namespace publicModule {
     class privateClass {
     }
 
diff --git a/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts b/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
index 665d990f345..f35c129cc7c 100644
--- a/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
+++ b/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
@@ -54,7 +54,7 @@ class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.pu
     }
 }
 
-export module publicModule {
+export namespace publicModule {
     class privateClassInPublicModule {
     }
 
diff --git a/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts b/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
index f230c21b35c..0a461c6ac55 100644
--- a/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
+++ b/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
@@ -65,7 +65,7 @@ export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T exte
 interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
 }
 
-export module publicModule {
+export namespace publicModule {
     class privateClassInPublicModule {
     }
 
diff --git a/tests/cases/compiler/privacyVar.ts b/tests/cases/compiler/privacyVar.ts
index 4558556b7bd..d79fd9e3190 100644
--- a/tests/cases/compiler/privacyVar.ts
+++ b/tests/cases/compiler/privacyVar.ts
@@ -1,5 +1,5 @@
 //@module: commonjs
-export module m1 {
+export namespace m1 {
     export class C1_public {
         private f1() {
         }
diff --git a/tests/cases/compiler/privacyVarDeclFile.ts b/tests/cases/compiler/privacyVarDeclFile.ts
index a41c5c98657..95be414c8a0 100644
--- a/tests/cases/compiler/privacyVarDeclFile.ts
+++ b/tests/cases/compiler/privacyVarDeclFile.ts
@@ -82,7 +82,7 @@ class privateClassWithPrivateModulePropertyTypes {
 var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 
-export module publicModule {
+export namespace publicModule {
     class privateClass {
     }
 
diff --git a/tests/cases/compiler/qualify.ts b/tests/cases/compiler/qualify.ts
index 9f6f3e10c83..0e2db204238 100644
--- a/tests/cases/compiler/qualify.ts
+++ b/tests/cases/compiler/qualify.ts
@@ -1,12 +1,12 @@
 namespace M {
     export var m=0;
-    export module N {
+    export namespace N {
         export var n=1;
     }
 }
 
 namespace M {
-    export module N {
+    export namespace N {
         var y=m;
         var x=n+y;
     }
@@ -17,7 +17,7 @@ namespace T {
     export interface I {
         p;
     }
-    export module U {
+    export namespace U {
         var z:I=3;
         export interface I2 {
             q;
@@ -26,18 +26,18 @@ namespace T {
 }
 
 namespace Peer {
-    export module U2 {
+    export namespace U2 {
         var z:T.U.I2=3;
     }
 }
 
 namespace Everest {
-    export module K1 {
+    export namespace K1 {
         export interface I3 {
             zeep;
         }
     }
-    export module K2 {
+    export namespace K2 {
         export interface I4 {
             z;
         }
diff --git a/tests/cases/compiler/recursiveBaseCheck.ts b/tests/cases/compiler/recursiveBaseCheck.ts
index 9042a3e0d2f..d6fca21cc8c 100644
--- a/tests/cases/compiler/recursiveBaseCheck.ts
+++ b/tests/cases/compiler/recursiveBaseCheck.ts
@@ -1,4 +1,4 @@
-declare module Module {
+declare namespace Module {
     class C extends D {
     }
     export class B extends Module.C {
diff --git a/tests/cases/compiler/recursiveCloduleReference.ts b/tests/cases/compiler/recursiveCloduleReference.ts
index a3dd263be3c..d54c1a92935 100644
--- a/tests/cases/compiler/recursiveCloduleReference.ts
+++ b/tests/cases/compiler/recursiveCloduleReference.ts
@@ -2,7 +2,7 @@ namespace M
 {
   export class C {
   }
-  export module C {
+  export namespace C {
     export var C = M.C
   };
 };
diff --git a/tests/cases/compiler/recursiveGenericUnionType1.ts b/tests/cases/compiler/recursiveGenericUnionType1.ts
index c1c7b3e81ad..84e4c33a72d 100644
--- a/tests/cases/compiler/recursiveGenericUnionType1.ts
+++ b/tests/cases/compiler/recursiveGenericUnionType1.ts
@@ -1,11 +1,11 @@
-declare module Test1 {
+declare namespace Test1 {
     export type Container<T> = T | {
         [i: string]: Container<T>;
     };
     export type IStringContainer = Container<string>;
 }
 
-declare module Test2 {
+declare namespace Test2 {
     export type Container<T> = T | {
         [i: string]: Container<T>;
     };
diff --git a/tests/cases/compiler/recursiveGenericUnionType2.ts b/tests/cases/compiler/recursiveGenericUnionType2.ts
index 784ddefeb1f..18168149d92 100644
--- a/tests/cases/compiler/recursiveGenericUnionType2.ts
+++ b/tests/cases/compiler/recursiveGenericUnionType2.ts
@@ -1,11 +1,11 @@
-declare module Test1 {
+declare namespace Test1 {
     export type Container<T> = T | {
         [i: string]: Container<T>[];
     };
     export type IStringContainer = Container<string>;
 }
 
-declare module Test2 {
+declare namespace Test2 {
     export type Container<T> = T | {
         [i: string]: Container<T>[];
     };
diff --git a/tests/cases/compiler/recursiveMods.ts b/tests/cases/compiler/recursiveMods.ts
index 84dbafff558..acc5db8d84d 100644
--- a/tests/cases/compiler/recursiveMods.ts
+++ b/tests/cases/compiler/recursiveMods.ts
@@ -1,11 +1,11 @@
 // @allowUnreachableCode: true
 // @module: commonjs
 
-export module Foo {
+export namespace Foo {
 	export class C {}
 }
 
-export module Foo {
+export namespace Foo {
 
 	function Bar() : C {
 		if (true) { return Bar();}
diff --git a/tests/cases/compiler/recursiveTypeComparison2.ts b/tests/cases/compiler/recursiveTypeComparison2.ts
index 6a781437abe..7efec96dac5 100644
--- a/tests/cases/compiler/recursiveTypeComparison2.ts
+++ b/tests/cases/compiler/recursiveTypeComparison2.ts
@@ -1,6 +1,6 @@
 // Before fix this would cause compiler to hang (#1170)
 
-declare module Bacon {
+declare namespace Bacon {
     interface Event<T> {
     }
     interface Error<T> extends Event<T> {
diff --git a/tests/cases/compiler/requireEmitSemicolon.ts b/tests/cases/compiler/requireEmitSemicolon.ts
index b0122e9bbc6..dfaeb8664d0 100644
--- a/tests/cases/compiler/requireEmitSemicolon.ts
+++ b/tests/cases/compiler/requireEmitSemicolon.ts
@@ -1,6 +1,6 @@
 //@module: amd
 // @Filename: requireEmitSemicolon_0.ts
-export module Models {
+export namespace Models {
 	export class Person {
         constructor(name: string) { }
 	}
@@ -10,7 +10,7 @@ export module Models {
 ///<reference path='requireEmitSemicolon_0.ts'/>
 import P = require("requireEmitSemicolon_0"); // bug was we were not emitting a ; here and causing runtime failures in node
 
-export module Database {
+export namespace Database {
 	export class DB {
 	    public findPerson(id: number): P.Models.Person {
 	        return new P.Models.Person("Rock");
diff --git a/tests/cases/compiler/reservedNameOnInterfaceImport.ts b/tests/cases/compiler/reservedNameOnInterfaceImport.ts
index 0a706a9acba..901a307a832 100644
--- a/tests/cases/compiler/reservedNameOnInterfaceImport.ts
+++ b/tests/cases/compiler/reservedNameOnInterfaceImport.ts
@@ -1,4 +1,4 @@
-declare module test {
+declare namespace test {
     interface istring { }
 
     // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type.
diff --git a/tests/cases/compiler/reservedNameOnModuleImport.ts b/tests/cases/compiler/reservedNameOnModuleImport.ts
index e1ef5ec443d..e0085c9f45b 100644
--- a/tests/cases/compiler/reservedNameOnModuleImport.ts
+++ b/tests/cases/compiler/reservedNameOnModuleImport.ts
@@ -1,4 +1,4 @@
-declare module test {
+declare namespace test {
     namespace mstring { }
 
     // Should be fine; this does not clobber any declared values.
diff --git a/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts b/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
index ca90c9d4761..981d988b74f 100644
--- a/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
+++ b/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
@@ -1,4 +1,4 @@
-declare module test {
+declare namespace test {
     interface mi_string { }
     namespace mi_string { }
 
diff --git a/tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts b/tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts
index d76a3b0ba0d..9aa33108a71 100644
--- a/tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts
+++ b/tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts
@@ -1,4 +1,4 @@
-declare module foo {
+declare namespace foo {
 
     interface Bar {
 
diff --git a/tests/cases/compiler/reuseInnerModuleMember.ts b/tests/cases/compiler/reuseInnerModuleMember.ts
index 64b5859b5fc..18911203770 100644
--- a/tests/cases/compiler/reuseInnerModuleMember.ts
+++ b/tests/cases/compiler/reuseInnerModuleMember.ts
@@ -1,10 +1,10 @@
 // @module: commonjs
 // @Filename: reuseInnerModuleMember_0.ts
-export module M { }
+export namespace M { }
 
 // @Filename: reuseInnerModuleMember_1.ts
 ///<reference path='reuseInnerModuleMember_0.ts'/>
-declare module bar {
+declare namespace bar {
     interface alpha { }
 }
 
diff --git a/tests/cases/compiler/semicolonsInModuleDeclarations.ts b/tests/cases/compiler/semicolonsInModuleDeclarations.ts
index 97ef92a52e3..8be37d16986 100644
--- a/tests/cases/compiler/semicolonsInModuleDeclarations.ts
+++ b/tests/cases/compiler/semicolonsInModuleDeclarations.ts
@@ -1,4 +1,4 @@
-declare module ambiModule {
+declare namespace ambiModule {
    export interface i1 { };
    export interface i2 { }
 }
diff --git a/tests/cases/compiler/sourceMapValidationImport.ts b/tests/cases/compiler/sourceMapValidationImport.ts
index 70633de7a74..2987ccf2485 100644
--- a/tests/cases/compiler/sourceMapValidationImport.ts
+++ b/tests/cases/compiler/sourceMapValidationImport.ts
@@ -1,6 +1,6 @@
 //@module: commonjs
 // @sourcemap: true
-export module m {
+export namespace m {
     export class c {
     }
 }
diff --git a/tests/cases/compiler/systemModule7.ts b/tests/cases/compiler/systemModule7.ts
index bb22822d0d1..62e3110e273 100644
--- a/tests/cases/compiler/systemModule7.ts
+++ b/tests/cases/compiler/systemModule7.ts
@@ -1,11 +1,11 @@
 // @module: system
 
 // filename: instantiatedModule.ts
-export module M {
+export namespace M {
     var x = 1;
 }
 
 // filename: nonInstantiatedModule.ts
-export module M {
+export namespace M {
     interface I {}
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/systemModuleAmbientDeclarations.ts b/tests/cases/compiler/systemModuleAmbientDeclarations.ts
index 690d0c65c13..5cc0bb98b1e 100644
--- a/tests/cases/compiler/systemModuleAmbientDeclarations.ts
+++ b/tests/cases/compiler/systemModuleAmbientDeclarations.ts
@@ -25,4 +25,4 @@ export declare var v: number;
 export declare enum E {X = 1}
 
 // @filename: file6.ts
-export declare module M { var v: number; }
+export declare namespace M { var v: number; }
diff --git a/tests/cases/compiler/systemModuleDeclarationMerging.ts b/tests/cases/compiler/systemModuleDeclarationMerging.ts
index ae8b3a8dd0b..d0007a7ff2e 100644
--- a/tests/cases/compiler/systemModuleDeclarationMerging.ts
+++ b/tests/cases/compiler/systemModuleDeclarationMerging.ts
@@ -2,10 +2,10 @@
 // @isolatedModules: true
 
 export function F() {}
-export module F { var x; }
+export namespace F { var x; }
 
 export class C {}
-export module C { var x; }
+export namespace C { var x; }
 
 export enum E {}
-export module E { var x; }
\ No newline at end of file
+export namespace E { var x; }
\ No newline at end of file
diff --git a/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts b/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts
index b5617970339..cfe759919ad 100644
--- a/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts
+++ b/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts
@@ -2,13 +2,13 @@
 // @isolatedModules: true
 
 export class TopLevelClass {}
-export module TopLevelModule {var v;}
+export namespace TopLevelModule {var v;}
 export function TopLevelFunction(): void {}
 export enum TopLevelEnum {E}
 
-export module TopLevelModule2 {
+export namespace TopLevelModule2 {
     export class NonTopLevelClass {}
-    export module NonTopLevelModule {var v;}
+    export namespace NonTopLevelModule {var v;}
     export function NonTopLevelFunction(): void {}
     export enum NonTopLevelEnum {E}
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts b/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts
index 89faf9e4515..5a16c751cc6 100644
--- a/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts
+++ b/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts
@@ -1,4 +1,4 @@
-declare module m {
+declare namespace m {
     // type alias declaration here shouldnt make the module declaration instantiated
     type Selector = string| string[] |Function;
 
diff --git a/tests/cases/compiler/typeResolution.ts b/tests/cases/compiler/typeResolution.ts
index f0854468804..34832a8d9b2 100644
--- a/tests/cases/compiler/typeResolution.ts
+++ b/tests/cases/compiler/typeResolution.ts
@@ -1,8 +1,8 @@
 //@module: amd
 // @sourcemap: true
-export module TopLevelModule1 {
-    export module SubModule1 {
-        export module SubSubModule1 {
+export namespace TopLevelModule1 {
+    export namespace SubModule1 {
+        export namespace SubSubModule1 {
             export class ClassA {
                 public AisIn1_1_1() {
                     // Try all qualified names of this type
@@ -75,8 +75,8 @@ export module TopLevelModule1 {
         }
     }
 
-    export module SubModule2 {
-        export module SubSubModule2 {
+    export namespace SubModule2 {
+        export namespace SubSubModule2 {
             // No code here since these are the mirror of the above calls
             export class ClassA { public AisIn1_2_2() { } }
             export class ClassB { public BisIn1_2_2() { } }
@@ -102,7 +102,7 @@ export module TopLevelModule1 {
 }
 
 namespace TopLevelModule2 {
-    export module SubModule3 {
+    export namespace SubModule3 {
         export class ClassA {
             public AisIn2_3() { }
         }
diff --git a/tests/cases/compiler/typeofInternalModules.ts b/tests/cases/compiler/typeofInternalModules.ts
index e08daa0c290..7b29c76813d 100644
--- a/tests/cases/compiler/typeofInternalModules.ts
+++ b/tests/cases/compiler/typeofInternalModules.ts
@@ -1,8 +1,8 @@
 namespace Outer {
-    export module instantiated {
+    export namespace instantiated {
         export class C { }
     }
-    export module uninstantiated {
+    export namespace uninstantiated {
         export interface P { }
     }
 }
diff --git a/tests/cases/compiler/underscoreMapFirst.ts b/tests/cases/compiler/underscoreMapFirst.ts
index e50cb508b45..2f6af6fb4fc 100644
--- a/tests/cases/compiler/underscoreMapFirst.ts
+++ b/tests/cases/compiler/underscoreMapFirst.ts
@@ -1,4 +1,4 @@
-declare module _ {
+declare namespace _ {
     interface Collection<T> { }
     interface List<T> extends Collection<T> {
         [index: number]: T;
diff --git a/tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts b/tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts
index 9f941127a24..4f3588d59bd 100644
--- a/tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts
+++ b/tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts
@@ -3,7 +3,7 @@ export var x = 'hello world'
 export class Point {
         constructor(public x: number, public y: number) { }
     }
-    export module B {
+    export namespace B {
         export interface Id {
             name: string;
         }
diff --git a/tests/cases/compiler/varBlock.ts b/tests/cases/compiler/varBlock.ts
index c1bea788323..5f3121656ba 100644
--- a/tests/cases/compiler/varBlock.ts
+++ b/tests/cases/compiler/varBlock.ts
@@ -3,7 +3,7 @@ namespace m2 {
     export var a, b2: number = 10, b;
 }
 
-declare module m3 {
+declare namespace m3 {
     var a, b, c;
     var a1, b1 = 10;
 
@@ -28,7 +28,7 @@ namespace m3 {
     export declare var d2E, d3E = 10, d4E = 10;
 }
 
-declare module m4 {
+declare namespace m4 {
     var d = 10;
     var d2, d3 = 10, d4 =10;
     export var dE = 10;
diff --git a/tests/cases/compiler/withExportDecl.ts b/tests/cases/compiler/withExportDecl.ts
index 1745d4c49f3..0b13755c7ad 100644
--- a/tests/cases/compiler/withExportDecl.ts
+++ b/tests/cases/compiler/withExportDecl.ts
@@ -42,13 +42,13 @@ namespace m1 {
         return "Hello";
     }
 }
-export declare module m2 {
+export declare namespace m2 {
 
     export var a: number;
 }
 
 
-export module m3 {
+export namespace m3 {
 
     export function foo() {
         return m1.foo();
diff --git a/tests/cases/conformance/ambient/ambientDeclarations.ts b/tests/cases/conformance/ambient/ambientDeclarations.ts
index 379f5a5440a..65312ebe826 100644
--- a/tests/cases/conformance/ambient/ambientDeclarations.ts
+++ b/tests/cases/conformance/ambient/ambientDeclarations.ts
@@ -52,13 +52,13 @@ declare enum E2 {
 declare enum E3 {
     A
 }
-declare module E3 {
+declare namespace E3 {
     var B;
 }
 var x = E3.B;
 
 // Ambient module
-declare module M1 {
+declare namespace M1 {
     var x;
     function fn(): number;
 }
diff --git a/tests/cases/conformance/ambient/ambientErrors.ts b/tests/cases/conformance/ambient/ambientErrors.ts
index 78ffbd7136c..ea0c92ab4fa 100644
--- a/tests/cases/conformance/ambient/ambientErrors.ts
+++ b/tests/cases/conformance/ambient/ambientErrors.ts
@@ -30,7 +30,7 @@ declare enum E2 {
 }
 
 // Ambient module with initializers for values, bodies for functions / classes
-declare module M1 {
+declare namespace M1 {
     var x = 3;
     function fn() { }
     class C {
diff --git a/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts b/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts
index 9a726443729..37f85249d6c 100644
--- a/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts
+++ b/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts
@@ -1,3 +1,3 @@
-module M {
+namespace M {
     export declare module "M" { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts b/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts
index 2705db43316..a1b6cf47922 100644
--- a/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts
+++ b/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts
@@ -3,7 +3,7 @@ namespace M {
     export declare function f();
     export declare class C { }
     export declare enum E { }
-    export declare module M { }
+    export declare namespace M { }
 }
 
 namespace M2 {
@@ -11,5 +11,5 @@ namespace M2 {
     declare function f();
     declare class C { }
     declare enum E { }
-    declare module M { }
+    declare namespace M { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts b/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts
index dbdc315c743..937246c92df 100644
--- a/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts
+++ b/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts
@@ -3,4 +3,4 @@ export declare var x;
 export declare function f();
 export declare class C { }
 export declare enum E { }
-export declare module M { }
\ No newline at end of file
+export declare namespace M { }
\ No newline at end of file
diff --git a/tests/cases/conformance/ambient/ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts b/tests/cases/conformance/ambient/ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts
index 58710108785..0332fbcb8f3 100644
--- a/tests/cases/conformance/ambient/ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts
+++ b/tests/cases/conformance/ambient/ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts
@@ -10,4 +10,4 @@ export const tabId = chrome.debugger.tabId;
 
 declare module test.class {}
 
-declare module debugger {} // still an error
+declare namespace debugger {} // still an error
diff --git a/tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts b/tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts
index 1ef7724f81d..6cd791ca15b 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts
@@ -7,7 +7,7 @@ interface C { }
 
 interface C { }
 
-declare module M {
+declare namespace M {
 
     interface C1 { }
 
@@ -20,6 +20,6 @@ declare module M {
     export class C2 { }
 }
 
-declare module M {
+declare namespace M {
     export interface C2 { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/enums/enumMerging.ts b/tests/cases/conformance/enums/enumMerging.ts
index 51ed3d4757a..c895e524d3e 100644
--- a/tests/cases/conformance/enums/enumMerging.ts
+++ b/tests/cases/conformance/enums/enumMerging.ts
@@ -57,7 +57,7 @@ module M6.A {
     export enum Color { Red, Green, Blue }
 }
 namespace M6 {
-    export module A {
+    export namespace A {
         export enum Color { Yellow = 1 }
     }
     var t = A.Color.Yellow;
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts b/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts
index f804d98a44e..260e9499b5d 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts
@@ -14,10 +14,10 @@ export enum E {
 export const enum D {
     A, B, C
 }
-export module M {
+export namespace M {
     export var x;
 }
-export module N {
+export namespace N {
     export interface I {
     }
 }
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts b/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts
index 77cb5b9df9b..bf09ccde0b1 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts
@@ -14,10 +14,10 @@ export enum E {
 export const enum D {
     A, B, C
 }
-export module M {
+export namespace M {
     export var x;
 }
-export module N {
+export namespace N {
     export interface I {
     }
 }
diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3.ts b/tests/cases/conformance/es6/modules/exportsAndImports3.ts
index 806a5e2779e..1abfb5301cd 100644
--- a/tests/cases/conformance/es6/modules/exportsAndImports3.ts
+++ b/tests/cases/conformance/es6/modules/exportsAndImports3.ts
@@ -13,10 +13,10 @@ export enum E {
 export const enum D {
     A, B, C
 }
-export module M {
+export namespace M {
     export var x;
 }
-export module N {
+export namespace N {
     export interface I {
     }
 }
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts
index f4d560c521f..b74d0beb4b6 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts
@@ -1,4 +1,4 @@
 //@target: ES6
-declare module M {
+declare namespace M {
     function *generator(): any;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts
index f4d560c521f..b74d0beb4b6 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts
@@ -1,4 +1,4 @@
 //@target: ES6
-declare module M {
+declare namespace M {
     function *generator(): any;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts b/tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts
index de362aedc8b..b941140c404 100644
--- a/tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts
+++ b/tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts
@@ -1,5 +1,5 @@
 //@target: ES6
-declare module M {
+declare namespace M {
     function* f(s: string): Iterable<any>;
     function* f(s: number): Iterable<any>;
     function* f(s: any): Iterable<any>;
diff --git a/tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts b/tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts
index b5326a56f57..fa6cd60cb61 100644
--- a/tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts
+++ b/tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts
@@ -18,7 +18,7 @@ M = { y: 3 }; // Error
 (M) = { y: 3 }; // Error
 
 namespace M2 {
-    export module M3 {
+    export namespace M3 {
         export var x: number;
     }
 
diff --git a/tests/cases/conformance/externalModules/amdImportNotAsPrimaryExpression.ts b/tests/cases/conformance/externalModules/amdImportNotAsPrimaryExpression.ts
index 63db6f2ec33..6abd14942e5 100644
--- a/tests/cases/conformance/externalModules/amdImportNotAsPrimaryExpression.ts
+++ b/tests/cases/conformance/externalModules/amdImportNotAsPrimaryExpression.ts
@@ -10,7 +10,7 @@ export interface I1 {
 	age: number;
 }
 
-export module M1 {
+export namespace M1 {
 	export interface I2 {
 		foo: string;
 	}
diff --git a/tests/cases/conformance/externalModules/circularReference.ts b/tests/cases/conformance/externalModules/circularReference.ts
index 86afa6b314d..acefd7b3ed0 100644
--- a/tests/cases/conformance/externalModules/circularReference.ts
+++ b/tests/cases/conformance/externalModules/circularReference.ts
@@ -1,6 +1,6 @@
 // @Filename: foo1.ts
 import foo2 = require('./foo2');
-export module M1 {
+export namespace M1 {
 	export class C1 {
 		m1: foo2.M1.C1;
 		x: number;
@@ -14,7 +14,7 @@ export module M1 {
 
 // @Filename: foo2.ts
 import foo1 = require('./foo1');
-export module M1 {
+export namespace M1 {
 	export class C1 {
 		m1: foo1.M1.C1;
 		y: number
diff --git a/tests/cases/conformance/externalModules/commonJSImportNotAsPrimaryExpression.ts b/tests/cases/conformance/externalModules/commonJSImportNotAsPrimaryExpression.ts
index b7ee8892908..4550f89fdf6 100644
--- a/tests/cases/conformance/externalModules/commonJSImportNotAsPrimaryExpression.ts
+++ b/tests/cases/conformance/externalModules/commonJSImportNotAsPrimaryExpression.ts
@@ -10,7 +10,7 @@ export interface I1 {
 	age: number;
 }
 
-export module M1 {
+export namespace M1 {
 	export interface I2 {
 		foo: string;
 	}
diff --git a/tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts b/tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts
index e8c29ed04db..1746a7a2f6e 100644
--- a/tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts
+++ b/tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts
@@ -10,7 +10,7 @@ namespace Foo {
 	export function c(a: number){
 		return a;
 	}
-	export module Test {
+	export namespace Test {
 		export var answer = 42;
 	}
 }
diff --git a/tests/cases/conformance/externalModules/exportDeclaredModule.ts b/tests/cases/conformance/externalModules/exportDeclaredModule.ts
index 6038b79f3ba..fe72c1eff26 100644
--- a/tests/cases/conformance/externalModules/exportDeclaredModule.ts
+++ b/tests/cases/conformance/externalModules/exportDeclaredModule.ts
@@ -1,6 +1,6 @@
 // @Filename: foo1.ts
 
-declare module M1 {
+declare namespace M1 {
 	export var a: string; 
 	export function b(): number;
 }
diff --git a/tests/cases/conformance/externalModules/initializersInDeclarations.ts b/tests/cases/conformance/externalModules/initializersInDeclarations.ts
index 2821c693f52..b1b5ed6d7c4 100644
--- a/tests/cases/conformance/externalModules/initializersInDeclarations.ts
+++ b/tests/cases/conformance/externalModules/initializersInDeclarations.ts
@@ -13,7 +13,7 @@ declare class Foo {
 declare var x = [];
 declare var y = {};
 
-declare module M1 {
+declare namespace M1 {
 	while(true);
 
 	export var v1 = () => false;
diff --git a/tests/cases/conformance/externalModules/nameWithRelativePaths.ts b/tests/cases/conformance/externalModules/nameWithRelativePaths.ts
index 72545d1b3a0..87006ca52af 100644
--- a/tests/cases/conformance/externalModules/nameWithRelativePaths.ts
+++ b/tests/cases/conformance/externalModules/nameWithRelativePaths.ts
@@ -8,7 +8,7 @@ export function f(){
 }
 
 // @Filename: test/foo_2.ts
-export module M2 {
+export namespace M2 {
 	export var x = true;
 }
 
diff --git a/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts b/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts
index 71b8a1eb1a2..3569bf17595 100644
--- a/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts
+++ b/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts
@@ -1,11 +1,11 @@
 // @ModuleResolution: classic
 // @Filename: test/foo.d.ts
-export declare module M2 {
+export declare namespace M2 {
 	export var x: boolean;
 }
 
 // @Filename: test/other.d.ts
-export declare module M2 {
+export declare namespace M2 {
 	export var x: string;
 }
 
diff --git a/tests/cases/conformance/externalModules/typesOnlyExternalModuleStillHasInstance.ts b/tests/cases/conformance/externalModules/typesOnlyExternalModuleStillHasInstance.ts
index 3f7bc3fa42c..52ce0a38389 100644
--- a/tests/cases/conformance/externalModules/typesOnlyExternalModuleStillHasInstance.ts
+++ b/tests/cases/conformance/externalModules/typesOnlyExternalModuleStillHasInstance.ts
@@ -5,7 +5,7 @@ export interface Person {
 	age: number;
 }
 
-export module M2 {
+export namespace M2 {
 	export interface I2 {
 		x: Person;
 	}
diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces2.ts b/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces2.ts
index 505ce5624e1..26acec745eb 100644
--- a/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces2.ts
+++ b/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces2.ts
@@ -28,7 +28,7 @@ namespace M2 {
 
 // same as above but with an additional level of nesting and third module declaration
 namespace M2 {
-    export module M3 {
+    export namespace M3 {
         export interface A {
             foo: string;
         }
@@ -40,7 +40,7 @@ namespace M2 {
 }
 
 namespace M2 {
-    export module M3 {
+    export namespace M3 {
         export interface A {
             bar: number;
         }
@@ -54,7 +54,7 @@ namespace M2 {
 }
 
 namespace M2 {
-    export module M3 {
+    export namespace M3 {
         export interface A {
             baz: boolean;
         }
diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces2.ts b/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces2.ts
index 98e288fa527..44201975122 100644
--- a/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces2.ts
+++ b/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces2.ts
@@ -23,7 +23,7 @@ namespace M2 {
 
 // same as above but with an additional level of nesting
 namespace M2 {
-    export module M3 {
+    export namespace M3 {
         export interface A {
             foo: string;
         }
@@ -35,7 +35,7 @@ namespace M2 {
 }
 
 namespace M2 {
-    export module M3 {
+    export namespace M3 {
         export interface A {
             bar: number;
         }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts
index 62814fd2c3e..ef0dc1b2002 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts
@@ -1,5 +1,5 @@
 // @filename: module.d.ts
-declare module Point {
+declare namespace Point {
     export var Origin: { x: number; y: number; }
 }
 
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts
index 12f51f90a74..6902f30eb7d 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts
@@ -1,6 +1,6 @@
 // @filename: module.d.ts
-declare module A {
-    export module Point {
+declare namespace A {
+    export namespace Point {
         export var Origin: {
             x: number;
             y: number;
@@ -9,7 +9,7 @@ declare module A {
 }
 
 // @filename: class.d.ts
-declare module A {
+declare namespace A {
     export class Point {
         constructor(x: number, y: number);
         x: number;
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts
index f1f638c725b..57291881158 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts
@@ -1,6 +1,6 @@
 // @filename: module.d.ts
-declare module A {
-    export module Point {
+declare namespace A {
+    export namespace Point {
         export var Origin: {
             x: number;
             y: number;
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts
index 5e6c12e817a..cc13a9196de 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts
@@ -1,5 +1,5 @@
 // @filename: module.d.ts
-declare module Point {
+declare namespace Point {
     export var Origin: { x: number; y: number; }
 }
 
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts
index a46ffc7a560..d81e0b09e93 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts
@@ -16,7 +16,7 @@ namespace A {
         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
     }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts
index 32e5f0cfb68..43125e9c0ce 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts
@@ -16,7 +16,7 @@ namespace A {
         static Origin(): Point { return { x: 0, y: 0 }; }
     }
 
-    export module Point {
+    export namespace Point {
         function Origin() { return ""; }// not an error since not exported
     }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts
index f2fe8dc94ff..8349f7b0999 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts
@@ -16,7 +16,7 @@ namespace A {
         static Origin: Point = { x: 0, y: 0 };
     }
 
-    export module Point {
+    export namespace Point {
         export var Origin = ""; //expected duplicate identifier error
     }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts
index 8e355649b7c..7de34febe2d 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts
@@ -16,7 +16,7 @@ namespace A {
         static Origin: Point = { x: 0, y: 0 };
     }
 
-    export module Point {
+    export namespace Point {
         var Origin = ""; // not an error since not exported
     }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts
index 5e6974b6a80..2fff1261162 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts
@@ -12,7 +12,7 @@ module X.Y {
 
 // @filename: module.ts
 module X.Y {
-    export module Point {
+    export namespace Point {
         export var Origin = new Point(0, 0);
     }
 }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts
index d935e894e9e..df3e0d1eda4 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts
@@ -13,7 +13,7 @@ module X.Y {
 
 // @filename: module.ts
 module X.Y {
-    export module Point {
+    export namespace Point {
         export var Origin = new Point(0, 0);
     }
 }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts
index b73da83d339..df056ee05c2 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts
@@ -7,7 +7,7 @@ namespace A {
 
 // @filename: module.ts
 namespace A {
-    export module Point {
+    export namespace Point {
         export var Origin = { x: 0, y: 0 };
     }
 }
@@ -28,7 +28,7 @@ namespace B {
         return { x: 0, y: 0 };
     }
 
-    export module Point {
+    export namespace Point {
         export var Origin = { x: 0, y: 0 };
     }
 }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts
index 8fb0872091e..703d0486efd 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts
@@ -7,7 +7,7 @@ namespace A {
 
 // @filename: module.ts
 namespace B {
-    export module Point {
+    export namespace Point {
         export var Origin = { x: 0, y: 0 };
     }
 }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot.ts
index 3d84339a42a..f32f00f2c07 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot.ts
@@ -1,6 +1,6 @@
 // @Filename: module.ts
 module X.Y {
-    export module Point {
+    export namespace Point {
         export var Origin = new Point(0, 0);
     }
 }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts
index e41ea1f25b7..86527e110f9 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts
@@ -1,6 +1,6 @@
 // @filename: module.ts
 namespace A {
-    export module Point {
+    export namespace Point {
         export var Origin = { x: 0, y: 0 };
     }
 }
@@ -16,7 +16,7 @@ namespace A {
 // @filename: simple.ts
 namespace B {
 
-    export module Point {
+    export namespace Point {
         export var Origin = { x: 0, y: 0 };
     }
 
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts
index 48b2b4f8a64..2281ae73f1a 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts
@@ -24,8 +24,8 @@ module X.Y.Z {
 }
 
 namespace X {
-    export module Y {
-        export module Z {
+    export namespace Y {
+        export namespace Z {
             class Line {
                 name: string;
             }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts
index 3f92d298855..7fa8af21d42 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts
@@ -5,7 +5,7 @@ namespace A {
         y: number;
     }
 
-    export module Utils {
+    export namespace Utils {
         export function mirror<T extends Point>(p: T) {
             return { x: p.y, y: p.x };
         }
@@ -18,7 +18,7 @@ namespace A {
     // not a collision, since we don't export
     var Origin: string = "0,0";
 
-    export module Utils {
+    export namespace Utils {
         export class Plane {
             constructor(public tl: Point, public br: Point) { }
         }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts
index 042b395c730..ac807220036 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts
@@ -20,8 +20,8 @@ module X.Y.Z {
 }
 
 namespace X {
-    export module Y {
-        export module Z {
+    export namespace Y {
+        export namespace Z {
             // expected error
             export class Line {
                 name: string;
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts
index 99da64e6c06..369c0f7f201 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts
@@ -1,11 +1,11 @@
 //@filename: part1.ts
-export module A {
+export namespace A {
     export interface Point {
         x: number;
         y: number;
     }
 
-    export module Utils {
+    export namespace Utils {
         export function mirror<T extends Point>(p: T) {
             return { x: p.y, y: p.x };
         }
@@ -15,11 +15,11 @@ export module A {
 }
 
 //@filename: part2.ts
-export module A {
+export namespace A {
     // collision with 'Origin' var in other part of merged module
     export var Origin: Point = { x: 0, y: 0 };
 
-    export module Utils {
+    export namespace Utils {
         export class Plane {
             constructor(public tl: Point, public br: Point) { }
         }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts
index 74f4195379e..8026ec81844 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts
@@ -19,7 +19,7 @@ module X.Y.Z {
 }
 
 namespace X {
-    export module Y {
+    export namespace Y {
         namespace Z {
             export class Line {
                 name: string;
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts
index 363c2a24d2b..ba5c22ba967 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts
@@ -1,12 +1,12 @@
 //@filename: part1.ts
 namespace Root {
-    export module A {
+    export namespace A {
         export interface Point {
             x: number;
             y: number;
         }
 
-        export module Utils {
+        export namespace Utils {
             export function mirror<T extends Point>(p: T) {
                 return { x: p.y, y: p.x };
             }
@@ -16,11 +16,11 @@ namespace Root {
 
 //@filename: part2.ts
 namespace otherRoot {
-    export module A {
+    export namespace A {
         // have to be fully qualified since in different root
         export var Origin: Root.A.Point = { x: 0, y: 0 };
 
-        export module Utils {
+        export namespace Utils {
             export class Plane {
                 constructor(public tl: Root.A.Point, public br: Root.A.Point) { }
             }
diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts
index 3e476465c20..f56c42550ee 100644
--- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts
+++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts
@@ -5,7 +5,7 @@ namespace A {
         y: number;
     }
 
-    export module Utils {
+    export namespace Utils {
         export function mirror<T extends Point>(p: T) {
             return { x: p.y, y: p.x };
         }
@@ -16,7 +16,7 @@ namespace A {
 namespace A {
     export var Origin: Point = { x: 0, y: 0 };
 
-    export module Utils {
+    export namespace Utils {
         export class Plane {
             constructor(public tl: Point, public br: Point) { }
         }
diff --git a/tests/cases/conformance/internalModules/codeGeneration/exportCodeGen.ts b/tests/cases/conformance/internalModules/codeGeneration/exportCodeGen.ts
index 6494bed0329..41681da242c 100644
--- a/tests/cases/conformance/internalModules/codeGeneration/exportCodeGen.ts
+++ b/tests/cases/conformance/internalModules/codeGeneration/exportCodeGen.ts
@@ -36,7 +36,7 @@ namespace E {
     export function fn() { }
     export interface I { id: number }
     export class C { name: string }
-    export module M {
+    export namespace M {
         export var x = 42;
     }
 }
diff --git a/tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts b/tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts
index a4c8ab3c3e3..51711bfd054 100644
--- a/tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts
+++ b/tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts
@@ -4,7 +4,7 @@ namespace A {
         y: number;
     }
 
-    export module inA {
+    export namespace inA {
         export interface Point3D extends Point {
             z: number;
         }
diff --git a/tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts b/tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts
index 02f234868bc..749b258e27f 100644
--- a/tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts
+++ b/tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts
@@ -19,9 +19,9 @@ namespace B {
 
 namespace X {
     var X = 13;
-    export module Y {
+    export namespace Y {
         var Y = 13;
-        export module Z {
+        export namespace Z {
             var X = 12;
             var Y = 12;
             var Z = 12;
diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts
index c2ae7bfba26..595b46d4206 100644
--- a/tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts
+++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts
@@ -4,7 +4,7 @@ namespace A {
         constructor(public x: number, public y: number) { }
     }
 
-    export module B {
+    export namespace B {
         export var Origin: Point = new Point(0, 0);
 
         export class Line {
diff --git a/tests/cases/conformance/internalModules/importDeclarations/exportImportAlias.ts b/tests/cases/conformance/internalModules/importDeclarations/exportImportAlias.ts
index f69f221fbca..3b7f4297735 100644
--- a/tests/cases/conformance/internalModules/importDeclarations/exportImportAlias.ts
+++ b/tests/cases/conformance/internalModules/importDeclarations/exportImportAlias.ts
@@ -6,7 +6,7 @@ namespace A {
     export class Point {
         constructor(public x: number, public y: number) { }
     }
-    export module B {
+    export namespace B {
         export interface Id {
             name: string;
         }
@@ -27,7 +27,7 @@ namespace X {
         return 42;
     }
 
-    export module Y {
+    export namespace Y {
         export class Point {
             constructor(public x: number, public y: number) { }
         }
@@ -48,7 +48,7 @@ namespace K {
         constructor(public name: string) { }
     }
 
-    export module L {
+    export namespace L {
         export var y = 12;
         export interface Point {
             x: number;
diff --git a/tests/cases/conformance/internalModules/importDeclarations/shadowedInternalModule.ts b/tests/cases/conformance/internalModules/importDeclarations/shadowedInternalModule.ts
index 4e064edffa4..bd751796c82 100644
--- a/tests/cases/conformance/internalModules/importDeclarations/shadowedInternalModule.ts
+++ b/tests/cases/conformance/internalModules/importDeclarations/shadowedInternalModule.ts
@@ -14,7 +14,7 @@ namespace B {
 }
 
 namespace X {
-    export module Y {
+    export namespace Y {
         export interface Point{
             x: number;
             y: number
@@ -40,7 +40,7 @@ namespace a {
 
 namespace b {
   export import A = a.A;
-  export module A {}
+  export namespace A {}
 }
 
 namespace c {
diff --git a/tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts b/tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts
index ec0d7d149d5..4e2f826cfbc 100644
--- a/tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts
+++ b/tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts
@@ -37,7 +37,7 @@ namespace Y {
         id: number;
     }
 
-    export module Module {
+    export namespace Module {
         class A { s: string }
     }
     export enum Color { Blue, Red }
diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts b/tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts
index b32ea16a728..7a9173df4e0 100644
--- a/tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts
+++ b/tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts
@@ -6,7 +6,7 @@ module A.B.C {
 }
 
 namespace A {
-    export module B {
+    export namespace B {
         export class C { // Error
             name: string;
         }
@@ -20,7 +20,7 @@ module M2.X {
 }
 
 namespace M2 {
-    export module X {
+    export namespace X {
         export var Point: number; // Error
     }
 }
diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts b/tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts
index 2066d434a96..a4afe605fd9 100644
--- a/tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts
+++ b/tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts
@@ -6,7 +6,7 @@ module A.B.C {
 }
 
 namespace A {
-    export module B {
+    export namespace B {
         var Point: C.Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C'
     }
 }
@@ -18,7 +18,7 @@ module M2.X {
 }
 
 namespace M2 {
-    export module X {
+    export namespace X {
         export var Point: number;
     }
 }
diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts b/tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts
index 5a478467bd0..bb500215992 100644
--- a/tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts
+++ b/tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts
@@ -14,7 +14,7 @@ var a2: number;
 var a2 = m.a;
 
 namespace M2 {
-    export module Point {
+    export namespace Point {
         export function Origin(): Point {
             return { x: 0, y: 0 };
         }
@@ -33,7 +33,7 @@ var p2: { Origin() : { x: number; y: number; } };
 var p2: typeof M2.Point;
 
 namespace M3 {
-    export module Utils {
+    export namespace Utils {
         export interface Point {
             x: number; y: number;
         }
diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts b/tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts
index 8d62691b2bc..0d274b397d1 100644
--- a/tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts
+++ b/tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts
@@ -1,18 +1,18 @@
-declare module pack1 {
+declare namespace pack1 {
   const test1: string;
   export { test1 };
 }
-declare module pack2 {
+declare namespace pack2 {
   import test1 = pack1.test1;
   export { test1 };
 }
 export import test1 = pack2.test1;
 
-declare module mod1 {
+declare namespace mod1 {
   type test1 = string;
   export { test1 };
 }
-declare module mod2 {
+declare namespace mod2 {
   import test1 = mod1.test1;
   export { test1 };
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts
index ec5ff748c4d..648cf9e016f 100644
--- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts
@@ -1,4 +1,4 @@
-declare module M {
+declare namespace M {
   declare class C {
   }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts b/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts
index 312523ebb9c..c7fc10ce88b 100644
--- a/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts
@@ -1,4 +1,4 @@
-declare module M {
+declare namespace M {
   declare enum E {
   }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts
index 4475445f75c..079019e9e05 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts
@@ -1,4 +1,4 @@
-declare module ng {
+declare namespace ng {
     interfaceICompiledExpression {
         (context: any, locals?: any): any;
         assign(context: any, value: any): any;
diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts
index a41285e609f..e6360d755c2 100644
--- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts
@@ -1,3 +1,3 @@
-declare module M {
+declare namespace M {
   declare function F();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts
index cfc171c4d9b..f1b8f0efc02 100644
--- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts
@@ -1,3 +1,3 @@
-declare module M {
+declare namespace M {
    function foo();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts
index 8cf72dd0847..1ac21fe9e12 100644
--- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts
@@ -1,4 +1,4 @@
-    export module CompilerDiagnostics {
+    export namespace CompilerDiagnostics {
         export var debug = false;
         export interface IDiagnosticWriter {
             Alert(output: string): void;
diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts
index 3fd73030c81..e0045fc9f9e 100644
--- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts
@@ -1,4 +1,4 @@
-declare module string {
+declare namespace string {
     interface X { }
     export function foo(s: string);
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts
index 33e15b4eeda..9922ffb96b3 100644
--- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts
@@ -1,2 +1,2 @@
-declare module M {
+declare namespace M {
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts
index 06970e52a4c..f9144ba1683 100644
--- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts
@@ -1,4 +1,4 @@
-declare module M {
-  declare module M2 {
+declare namespace M {
+  declare namespace M2 {
   }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts
index 92631ed83d3..4875b6e7144 100644
--- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts
@@ -1,4 +1,4 @@
 namespace M {
-  declare module M1 {
+  declare namespace M1 {
   }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts
index 4f95e718eb2..d68f1ffc4d5 100644
--- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts
@@ -1,5 +1,5 @@
 namespace M {
-  declare module M1 {
+  declare namespace M1 {
     namespace M2 {
     }
   }
diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts
index eae32a13d87..c739bb8f760 100644
--- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts
@@ -1,6 +1,6 @@
 namespace M1 {
-  declare module M2 {
-    declare module M3 {
+  declare namespace M2 {
+    declare namespace M3 {
     }
   }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts
index 4418c1bf18e..a34899dcdb0 100644
--- a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts
@@ -48,7 +48,7 @@ if (typeof ActiveXObject === "function") {
     throw new Error('Unknown context');
 }
 
-declare module process {
+declare namespace process {
     export function nextTick(callback: () => any): void;
     export function on(event: string, listener: Function);
 }
@@ -79,7 +79,7 @@ namespace Harness {
     }
 
     // Assert functions
-    export module Assert {
+    export namespace Assert {
         export var bugIds: string[] = [];
         export var throwAssertError = (error: Error) => {
             throw error;
@@ -497,16 +497,16 @@ namespace Harness {
     }
 
     // Performance test
-    export module Perf {
-        export module Clock {
+    export namespace Perf {
+        export namespace Clock {
             export var now: () => number;
             export var resolution: number;
 
-            declare module WScript {
+            declare namespace WScript {
                 export function InitializeProjection();
             }
 
-            declare module TestUtilities {
+            declare namespace TestUtilities {
                 export function QueryPerformanceCounter(): number;
                 export function QueryPerformanceFrequency(): number;
             }
@@ -685,7 +685,7 @@ namespace Harness {
     }
 
     /** Functionality for compiling TypeScript code */
-    export module Compiler {
+    export namespace Compiler {
         /** Aggregate various writes into a single array of lines. Useful for passing to the
          *  TypeScript compiler to fill with source code or errors.
          */
@@ -1412,7 +1412,7 @@ namespace Harness {
     /** Parses the test cases files 
      *  extracts options and individual files in a multifile test
      */
-    export module TestCaseParser {
+    export namespace TestCaseParser {
         /** all the necesarry information to set the right compiler settings */
         export interface CompilerSetting {
             flag: string;
@@ -1867,7 +1867,7 @@ namespace Harness {
     }
 
     /** Runs TypeScript or Javascript code. */
-    export module Runner {
+    export namespace Runner {
         export function runCollateral(path: string, callback: (error: Error, result: any) => void ) {
             path = switchToForwardSlashes(path);
             runString(readFile(path), path.match(/[^\/]*$/)[0], callback);
@@ -1908,7 +1908,7 @@ namespace Harness {
     }
 
     /** Support class for baseline files */
-    export module Baseline {
+    export namespace Baseline {
         var reportFilename = 'baseline-report.html';
 
         var firstRun = true;
diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts
index eda90337f79..2c075a4463c 100644
--- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts
+++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts
@@ -1,3 +1,3 @@
-declare module ambiModule {
+declare namespace ambiModule {
    interface i1 { };
 }
diff --git a/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts
index b64ce2532bb..14b003f4f93 100644
--- a/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts
@@ -1,3 +1,3 @@
-declare module M {
+declare namespace M {
    declare var v;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts
index 05239d44898..69499c512c2 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts
@@ -4,7 +4,7 @@
 ///<reference path='typescript.ts' />
 
 namespace TypeScript {
-    export module CompilerDiagnostics {
+    export namespace CompilerDiagnostics {
         export var debug = false;
         export interface IDiagnosticWriter {
             Alert(output: string): void;
diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts
index 78bf21547d1..92cb1858912 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts
@@ -20,7 +20,7 @@ var i2: I;
 export var r5: typeof i;
 export var r5: typeof i2;
 
-export module M {
+export namespace M {
     export var foo = '';
     export class C {
         foo: string;
@@ -42,7 +42,7 @@ export var r11: typeof E.A;
 export var r12: typeof r12;
 
 export function foo() { }
-export module foo {
+export namespace foo {
     export var y = 1;
     export class C {
         foo: string;
diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts
index fdd51b3f5c6..5099887a749 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts
@@ -15,7 +15,7 @@ declare function f(x: C): C;
 
 declare class D extends C {}
 
-declare module M {
+declare namespace M {
     export class E<T> { foo: T }
 }
 
diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts
index fdd51b3f5c6..5099887a749 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts
@@ -15,7 +15,7 @@ declare function f(x: C): C;
 
 declare class D extends C {}
 
-declare module M {
+declare namespace M {
     export class E<T> { foo: T }
 }
 
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 8c656639205..9ec091fe670 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -42,7 +42,7 @@
 //
 // TODO: figure out a better solution to the API exposure problem.
 
-declare module ts {
+declare namespace ts {
     export const Diagnostics: typeof import("../../../src/compiler/diagnosticInformationMap.generated").Diagnostics;
     export type MapKey = string | number;
     export interface Map<T> {
diff --git a/tests/cases/projects/DeclareExportAdded/ref.d.ts b/tests/cases/projects/DeclareExportAdded/ref.d.ts
index 4ce3adee420..242a4eb2e7b 100644
--- a/tests/cases/projects/DeclareExportAdded/ref.d.ts
+++ b/tests/cases/projects/DeclareExportAdded/ref.d.ts
@@ -1,4 +1,4 @@
-declare module M1
+declare namespace M1
 {
     export function f1(): void;
 }
\ No newline at end of file
diff --git a/tests/cases/projects/NestedLocalModule-SimpleCase/test1.ts b/tests/cases/projects/NestedLocalModule-SimpleCase/test1.ts
index a182217506c..9cd4f6542d5 100644
--- a/tests/cases/projects/NestedLocalModule-SimpleCase/test1.ts
+++ b/tests/cases/projects/NestedLocalModule-SimpleCase/test1.ts
@@ -1,4 +1,4 @@
-export module myModule {
+export namespace myModule {
  import foo = require("test2");
  //console.log(foo.$);
 }
diff --git a/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test2.ts b/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test2.ts
index dce144b3dc7..28957fbb778 100644
--- a/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test2.ts
+++ b/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test2.ts
@@ -1,7 +1,7 @@
 export var $;
 
 
-export module Yo {
+export namespace Yo {
     import test = require("test1");
     test.x;
 
diff --git a/tests/cases/projects/baseline/nestedModule.ts b/tests/cases/projects/baseline/nestedModule.ts
index 9137cac6bb0..b670b176597 100644
--- a/tests/cases/projects/baseline/nestedModule.ts
+++ b/tests/cases/projects/baseline/nestedModule.ts
@@ -1,5 +1,5 @@
-export module outer {
-	export module inner {
+export namespace outer {
+	export namespace inner {
 		var local = 1;
 		export var a = local;
 	}
diff --git a/tests/cases/projects/declarations_ImportedInPrivate/useModule.ts b/tests/cases/projects/declarations_ImportedInPrivate/useModule.ts
index e7a03b58cdb..634116d6689 100644
--- a/tests/cases/projects/declarations_ImportedInPrivate/useModule.ts
+++ b/tests/cases/projects/declarations_ImportedInPrivate/useModule.ts
@@ -1,6 +1,6 @@
 // only used privately no need to emit
 import private_m4 = require("private_m4");
-export module usePrivate_m4_m1 {
+export namespace usePrivate_m4_m1 {
     var x3 = private_m4.x;
     var d3 = private_m4.d;
     var f3 = private_m4.foo();
diff --git a/tests/cases/projects/declarations_MultipleTimesImport/useModule.ts b/tests/cases/projects/declarations_MultipleTimesImport/useModule.ts
index c3b2f5c7887..5f4377333a7 100644
--- a/tests/cases/projects/declarations_MultipleTimesImport/useModule.ts
+++ b/tests/cases/projects/declarations_MultipleTimesImport/useModule.ts
@@ -3,7 +3,7 @@ export var x4 = m4.x;
 export var d4 = m4.d;
 export var f4 = m4.foo();
 
-export module m1 {
+export namespace m1 {
     export var x2 = m4.x;
     export var d2 = m4.d;
     export var f2 = m4.foo();
diff --git a/tests/cases/projects/declarations_MultipleTimesMultipleImport/useModule.ts b/tests/cases/projects/declarations_MultipleTimesMultipleImport/useModule.ts
index 012e1ecfdec..956c384ba58 100644
--- a/tests/cases/projects/declarations_MultipleTimesMultipleImport/useModule.ts
+++ b/tests/cases/projects/declarations_MultipleTimesMultipleImport/useModule.ts
@@ -3,7 +3,7 @@ export var x4 = m4.x;
 export var d4 = m4.d;
 export var f4 = m4.foo();
 
-export module m1 {
+export namespace m1 {
     export var x2 = m4.x;
     export var d2 = m4.d;
     export var f2 = m4.foo();
diff --git a/tests/cases/projects/declarations_SimpleImport/useModule.ts b/tests/cases/projects/declarations_SimpleImport/useModule.ts
index a2a8191972c..0df95cac1b5 100644
--- a/tests/cases/projects/declarations_SimpleImport/useModule.ts
+++ b/tests/cases/projects/declarations_SimpleImport/useModule.ts
@@ -3,7 +3,7 @@ export var x4 = m4.x;
 export var d4 = m4.d;
 export var f4 = m4.foo();
 
-export module m1 {
+export namespace m1 {
     export var x2 = m4.x;
     export var d2 = m4.d;
     export var f2 = m4.foo();
diff --git a/tests/cases/projects/declareVariableCollision/decl.d.ts b/tests/cases/projects/declareVariableCollision/decl.d.ts
index 9bcb7bb84b4..294bf6a0a54 100644
--- a/tests/cases/projects/declareVariableCollision/decl.d.ts
+++ b/tests/cases/projects/declareVariableCollision/decl.d.ts
@@ -1,11 +1,11 @@
 // bug 535531: duplicate identifier error reported for "import" declarations in separate files
 
-declare module A
+declare namespace A
 {
 
     class MyRoot { }
 
-    export module B
+    export namespace B
     {
         class MyClass{ }
     }
diff --git a/tests/cases/projects/privacyCheck-ImportInParent/mExported.ts b/tests/cases/projects/privacyCheck-ImportInParent/mExported.ts
index 1c25c14413b..2ea26e7e803 100644
--- a/tests/cases/projects/privacyCheck-ImportInParent/mExported.ts
+++ b/tests/cases/projects/privacyCheck-ImportInParent/mExported.ts
@@ -1,4 +1,4 @@
-export module me {
+export namespace me {
     export class class1 {
         public prop1 = 0;
     }
diff --git a/tests/cases/projects/privacyCheck-ImportInParent/mNonExported.ts b/tests/cases/projects/privacyCheck-ImportInParent/mNonExported.ts
index 3674792f342..4ea93a9fec9 100644
--- a/tests/cases/projects/privacyCheck-ImportInParent/mNonExported.ts
+++ b/tests/cases/projects/privacyCheck-ImportInParent/mNonExported.ts
@@ -1,4 +1,4 @@
-export module mne {
+export namespace mne {
     export class class1 {
         public prop1 = 0;
     }
diff --git a/tests/cases/projects/privacyCheck-ImportInParent/test.ts b/tests/cases/projects/privacyCheck-ImportInParent/test.ts
index a7fc387d1f5..75c74f0313b 100644
--- a/tests/cases/projects/privacyCheck-ImportInParent/test.ts
+++ b/tests/cases/projects/privacyCheck-ImportInParent/test.ts
@@ -1,4 +1,4 @@
-export module m2 {
+export namespace m2 {
     export import mExported = require("mExported");
 
     namespace Internal_M1 {
@@ -20,7 +20,7 @@ export module m2 {
         }
     }
 
-    export module Internal_M2 {
+    export namespace Internal_M2 {
         export var c1 = new mExported.me.class1;
         export function f1() {
             return new mExported.me.class1();
@@ -60,7 +60,7 @@ export module m2 {
         }
     }
 
-    export module Internal_M4 {
+    export namespace Internal_M4 {
         export var c3 = new mNonExported.mne.class1;
         export function f3() {
             return new mNonExported.mne.class1();
diff --git a/tests/cases/projects/privacyCheck-InsideModule/mExported.ts b/tests/cases/projects/privacyCheck-InsideModule/mExported.ts
index 1c25c14413b..2ea26e7e803 100644
--- a/tests/cases/projects/privacyCheck-InsideModule/mExported.ts
+++ b/tests/cases/projects/privacyCheck-InsideModule/mExported.ts
@@ -1,4 +1,4 @@
-export module me {
+export namespace me {
     export class class1 {
         public prop1 = 0;
     }
diff --git a/tests/cases/projects/privacyCheck-InsideModule/mNonExported.ts b/tests/cases/projects/privacyCheck-InsideModule/mNonExported.ts
index 3674792f342..4ea93a9fec9 100644
--- a/tests/cases/projects/privacyCheck-InsideModule/mNonExported.ts
+++ b/tests/cases/projects/privacyCheck-InsideModule/mNonExported.ts
@@ -1,4 +1,4 @@
-export module mne {
+export namespace mne {
     export class class1 {
         public prop1 = 0;
     }
diff --git a/tests/cases/projects/privacyCheck-InsideModule/test.ts b/tests/cases/projects/privacyCheck-InsideModule/test.ts
index f33c27a10c5..8de870b2e86 100644
--- a/tests/cases/projects/privacyCheck-InsideModule/test.ts
+++ b/tests/cases/projects/privacyCheck-InsideModule/test.ts
@@ -1,4 +1,4 @@
-export module m1 {
+export namespace m1 {
 }
 
 namespace m2 {
diff --git a/tests/cases/projects/privacyCheck-SimpleReference/mExported.ts b/tests/cases/projects/privacyCheck-SimpleReference/mExported.ts
index 1c25c14413b..2ea26e7e803 100644
--- a/tests/cases/projects/privacyCheck-SimpleReference/mExported.ts
+++ b/tests/cases/projects/privacyCheck-SimpleReference/mExported.ts
@@ -1,4 +1,4 @@
-export module me {
+export namespace me {
     export class class1 {
         public prop1 = 0;
     }
diff --git a/tests/cases/projects/privacyCheck-SimpleReference/mNonExported.ts b/tests/cases/projects/privacyCheck-SimpleReference/mNonExported.ts
index 3674792f342..4ea93a9fec9 100644
--- a/tests/cases/projects/privacyCheck-SimpleReference/mNonExported.ts
+++ b/tests/cases/projects/privacyCheck-SimpleReference/mNonExported.ts
@@ -1,4 +1,4 @@
-export module mne {
+export namespace mne {
     export class class1 {
         public prop1 = 0;
     }