diff --git a/angular-file-upload/angular-file-upload.d.ts b/angular-file-upload/angular-file-upload.d.ts
index f2a6bd0429..2eb0e72b56 100644
--- a/angular-file-upload/angular-file-upload.d.ts
+++ b/angular-file-upload/angular-file-upload.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module ng.angularFileUpload  {
+declare module angular.angularFileUpload  {
 
     interface IUploadService {
 
diff --git a/angular-hotkeys/angular-hotkeys.d.ts b/angular-hotkeys/angular-hotkeys.d.ts
index 0c0b9109a0..3340f9ff31 100644
--- a/angular-hotkeys/angular-hotkeys.d.ts
+++ b/angular-hotkeys/angular-hotkeys.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module ng.hotkeys {
+declare module angular.hotkeys {
 
     interface HotkeysProvider {
         template: string;
diff --git a/angular-http-auth/angular-http-auth.d.ts b/angular-http-auth/angular-http-auth.d.ts
index 297761c478..4a08272cde 100644
--- a/angular-http-auth/angular-http-auth.d.ts
+++ b/angular-http-auth/angular-http-auth.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module ng.httpAuth {
+declare module angular.httpAuth {
     interface IAuthService {
         loginConfirmed(data?:any, configUpdater?:Function):void;
         loginCancelled(data?:any, reason?:any):void;
diff --git a/angular-idle/angular-idle.d.ts b/angular-idle/angular-idle.d.ts
index 57ef2380b6..4e1e98fb59 100644
--- a/angular-idle/angular-idle.d.ts
+++ b/angular-idle/angular-idle.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module ng.idle {
+declare module angular.idle {
 
     /**
      * Used to configure the $keepalive service.
@@ -131,4 +131,4 @@ declare module ng.idle {
          */
         unwatch(): void;
     }
-}
\ No newline at end of file
+}
diff --git a/angular-local-storage/angular-local-storage-tests.ts b/angular-local-storage/angular-local-storage-tests.ts
index fde523af5f..cf61d20c94 100644
--- a/angular-local-storage/angular-local-storage-tests.ts
+++ b/angular-local-storage/angular-local-storage-tests.ts
@@ -12,55 +12,53 @@ interface TestScope extends ng.IScope {
   property: string;
 }
 
-module ng.local.storage.tests {
-  export class TestController {
-    constructor($scope: TestScope, localStorageService: ng.local.storage.ILocalStorageService<string>) {
-      // isSupported
-      if (localStorageService.isSupported) {
-        // do something
-      }
-
-      // getStorageType
-      var storageType: string = localStorageService.getStorageType();
-
-      // set
-      $scope.submit = (key, value) => {
-        return localStorageService.set(key, value);
-      };
-
-      // get
-      $scope.getItem = (key) => {
-        return localStorageService.get(key);
-      };
-
-      // remove
-      $scope.removeItem = (key) => {
-        return localStorageService.remove(key);
-      };
-
-      // clearAll(regexp)
-      $scope.clearNumbers = () => {
-        return localStorageService.clearAll(/^\d+$/);
-      };
-
-      // clearAll
-      $scope.clearAll = () => {
-        return localStorageService.clearAll();
-      };
-
-      // keys
-      var lsKeys = localStorageService.keys();
-
-      // bind
-      localStorageService.set('property', 'oldValue');
-      $scope.unbind = localStorageService.bind($scope, 'property');
-
-      // deriveKey
-      console.log(localStorageService.deriveKey('property')); // ls.property
-
-      // length
-      var lsLength: number = localStorageService.length();
+export class TestController {
+  constructor($scope: TestScope, localStorageService: ng.local.storage.ILocalStorageService<string>) {
+    // isSupported
+    if (localStorageService.isSupported) {
+      // do something
     }
+
+    // getStorageType
+    var storageType: string = localStorageService.getStorageType();
+
+    // set
+    $scope.submit = (key, value) => {
+      return localStorageService.set(key, value);
+    };
+
+    // get
+    $scope.getItem = (key) => {
+      return localStorageService.get(key);
+    };
+
+    // remove
+    $scope.removeItem = (key) => {
+      return localStorageService.remove(key);
+    };
+
+    // clearAll(regexp)
+    $scope.clearNumbers = () => {
+      return localStorageService.clearAll(/^\d+$/);
+    };
+
+    // clearAll
+    $scope.clearAll = () => {
+      return localStorageService.clearAll();
+    };
+
+    // keys
+    var lsKeys = localStorageService.keys();
+
+    // bind
+    localStorageService.set('property', 'oldValue');
+    $scope.unbind = localStorageService.bind($scope, 'property');
+
+    // deriveKey
+    console.log(localStorageService.deriveKey('property')); // ls.property
+
+    // length
+    var lsLength: number = localStorageService.length();
   }
 }
 
@@ -72,4 +70,4 @@ app.config(function (localStorageServiceProvider: ng.local.storage.ILocalStorage
     .setNotify(true, true);
 });
 
-app.controller('TestController', ng.local.storage.tests.TestController);
+app.controller('TestController', TestController);
diff --git a/angular-local-storage/angular-local-storage.d.ts b/angular-local-storage/angular-local-storage.d.ts
index 07c7157e13..d40630a2a6 100644
--- a/angular-local-storage/angular-local-storage.d.ts
+++ b/angular-local-storage/angular-local-storage.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path='../angularjs/angular.d.ts' />
 
-declare module ng.local.storage {
+declare module angular.local.storage {
   interface ILocalStorageServiceProvider extends IServiceProvider {
     /**
      * Setter for the prefix
diff --git a/angular-material/angular-material.d.ts b/angular-material/angular-material.d.ts
index c764f939b9..cf7a20d79e 100644
--- a/angular-material/angular-material.d.ts
+++ b/angular-material/angular-material.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../angularjs/angular.d.ts" />
-declare module ng.material {
+declare module angular.material {
 
     interface MDBottomSheetOptions {
         templateUrl?: string;
diff --git a/angular-notify/angular-notify.d.ts b/angular-notify/angular-notify.d.ts
index bbb7c1e6b1..7e55dc654a 100644
--- a/angular-notify/angular-notify.d.ts
+++ b/angular-notify/angular-notify.d.ts
@@ -5,7 +5,7 @@
 
 ///<reference path="../angularjs/angular.d.ts" />
 
-declare module ng.cgNotify {
+declare module angular.cgNotify {
 
     interface INotifyService {
 
@@ -113,4 +113,4 @@ declare module ng.cgNotify {
          */
         close():void;
     }
-}
\ No newline at end of file
+}
diff --git a/angular-translate/angular-translate.d.ts b/angular-translate/angular-translate.d.ts
index 135ac75adb..c972c927de 100644
--- a/angular-translate/angular-translate.d.ts
+++ b/angular-translate/angular-translate.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module ng.translate {
+declare module angular.translate {
     
     interface ITranslatePartialLoaderService {
         addPart(name: string): ITranslatePartialLoaderService;
diff --git a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts
index ad90dc9db1..c9bf91c016 100644
--- a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts
+++ b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module ng.ui.bootstrap {
+declare module angular.ui.bootstrap {
 
     interface IAccordionConfig {
         /**
@@ -630,4 +630,4 @@ declare module ng.ui.bootstrap {
         animation?: boolean;
     }
 
-}
\ No newline at end of file
+}
diff --git a/angular-ui/angular-ui-router.d.ts b/angular-ui/angular-ui-router.d.ts
index 53761552f4..51082cdeeb 100644
--- a/angular-ui/angular-ui-router.d.ts
+++ b/angular-ui/angular-ui-router.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module ng.ui {
+declare module angular.ui {
 
     interface IState {
         name?: string;
diff --git a/angular-ui/angular-ui-sortable.d.ts b/angular-ui/angular-ui-sortable.d.ts
index a0c99f34fa..48b96f2d37 100644
--- a/angular-ui/angular-ui-sortable.d.ts
+++ b/angular-ui/angular-ui-sortable.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module ng.ui {
+declare module angular.ui {
 
     interface UISortableOptions<T> extends SortableOptions<T> {
         'ui-floating'?: string|boolean;
diff --git a/angularLocalStorage/angularLocalStorage-tests.ts b/angularLocalStorage/angularLocalStorage-tests.ts
index 7ae0d90669..366ab6e44a 100644
--- a/angularLocalStorage/angularLocalStorage-tests.ts
+++ b/angularLocalStorage/angularLocalStorage-tests.ts
@@ -5,23 +5,21 @@ interface TestScope extends ng.IScope {
   viewType: string;
 }
 
-module ng.LocalStorageTests {
-  export class TestController {
-    constructor(private $scope: TestScope, private storage: ng.localStorage.ILocalStorageService) {
-      storage.bind($scope, 'varName');
-      storage.bind($scope,'varName', { defaultValue: 'randomValue123', storeName: 'customStoreKey' });
-      $scope.viewType = 'ANYTHING';
-      storage.unbind($scope, 'viewType');
+export class TestController {
+  constructor(private $scope: TestScope, private storage: ng.localStorage.ILocalStorageService) {
+    storage.bind($scope, 'varName');
+    storage.bind($scope,'varName', { defaultValue: 'randomValue123', storeName: 'customStoreKey' });
+    $scope.viewType = 'ANYTHING';
+    storage.unbind($scope, 'viewType');
 
-      storage.set('key', 'value');
-      storage.get('key');
-      storage.remove('key');
+    storage.set('key', 'value');
+    storage.get('key');
+    storage.remove('key');
 
-      storage.clearAll();
-    }
+    storage.clearAll();
   }
 }
 
 var app = angular.module('angularLocalStorageTests', ['angularLocalStorage']);
-app.controller('testCtrl', ['$scope', 'storage',  ($scope: TestScope, storage: ng.localStorage.ILocalStorageService) => new ng.LocalStorageTests.TestController($scope, storage)]);
+app.controller('testCtrl', ['$scope', 'storage',  ($scope: TestScope, storage: ng.localStorage.ILocalStorageService) => new TestController($scope, storage)]);
 
diff --git a/angularLocalStorage/angularLocalStorage.d.ts b/angularLocalStorage/angularLocalStorage.d.ts
index f83ae33060..08b5d473b4 100644
--- a/angularLocalStorage/angularLocalStorage.d.ts
+++ b/angularLocalStorage/angularLocalStorage.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts"/>
 
-declare module ng.localStorage {
+declare module angular.localStorage {
   interface ILocalStorageService {
     set(key: string, value: any): any;
     get(key: string): any;
diff --git a/angularjs/angular-amd-tests.ts b/angularjs/angular-amd-tests.ts
new file mode 100644
index 0000000000..2ce75cc22d
--- /dev/null
+++ b/angularjs/angular-amd-tests.ts
@@ -0,0 +1,7 @@
+/// <reference path="angular.d.ts" />
+
+import localName = require('angular');
+var mod: localName.IModule = localName.module('mod', []);
+
+// Remain compatible with the ambient version 
+var mod2: angular.IModule = mod;
diff --git a/angularjs/angular-animate.d.ts b/angularjs/angular-animate.d.ts
index f649d65f70..833252177b 100644
--- a/angularjs/angular-animate.d.ts
+++ b/angularjs/angular-animate.d.ts
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // ngAnimate module (angular-animate.js)
 ///////////////////////////////////////////////////////////////////////////////
-declare module ng.animate {
+declare module angular.animate {
 
     ///////////////////////////////////////////////////////////////////////////
     // AnimateService
diff --git a/angularjs/angular-cookies.d.ts b/angularjs/angular-cookies.d.ts
index 0feffae83a..12208ae104 100644
--- a/angularjs/angular-cookies.d.ts
+++ b/angularjs/angular-cookies.d.ts
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // ngCookies module (angular-cookies.js)
 ///////////////////////////////////////////////////////////////////////////////
-declare module ng.cookies {
+declare module angular.cookies {
 
     ///////////////////////////////////////////////////////////////////////////
     // CookieService
diff --git a/angularjs/angular-mocks.d.ts b/angularjs/angular-mocks.d.ts
index 877071127f..4b5408c151 100644
--- a/angularjs/angular-mocks.d.ts
+++ b/angularjs/angular-mocks.d.ts
@@ -14,7 +14,7 @@ declare var inject: (...fns: Function[]) => any;
 ///////////////////////////////////////////////////////////////////////////////
 // ngMock module (angular-mocks.js)
 ///////////////////////////////////////////////////////////////////////////////
-declare module ng {
+declare module angular {
 
     ///////////////////////////////////////////////////////////////////////////
     // AngularStatic
diff --git a/angularjs/angular-resource.d.ts b/angularjs/angular-resource.d.ts
index ed08c77dd9..4f03a341cc 100644
--- a/angularjs/angular-resource.d.ts
+++ b/angularjs/angular-resource.d.ts
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // ngResource module (angular-resource.js)
 ///////////////////////////////////////////////////////////////////////////////
-declare module ng.resource {
+declare module angular.resource {
 
     /**
      * Currently supported options for the $resource factory options argument.
@@ -146,7 +146,7 @@ declare module ng.resource {
 }
 
 /** extensions to base ng based on using angular-resource */
-declare module ng {
+declare module angular {
 
     interface IModule {
         /** creating a resource service factory */
diff --git a/angularjs/angular-route.d.ts b/angularjs/angular-route.d.ts
index 936b42589e..7d9d282fe5 100644
--- a/angularjs/angular-route.d.ts
+++ b/angularjs/angular-route.d.ts
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // ngRoute module (angular-route.js)
 ///////////////////////////////////////////////////////////////////////////////
-declare module ng.route {
+declare module angular.route {
 
     ///////////////////////////////////////////////////////////////////////////
     // RouteParamsService
diff --git a/angularjs/angular-sanitize.d.ts b/angularjs/angular-sanitize.d.ts
index 6fde0baef9..4be812cdd2 100644
--- a/angularjs/angular-sanitize.d.ts
+++ b/angularjs/angular-sanitize.d.ts
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // ngSanitize module (angular-sanitize.js)
 ///////////////////////////////////////////////////////////////////////////////
-declare module ng.sanitize {
+declare module angular.sanitize {
 
     ///////////////////////////////////////////////////////////////////////////
     // SanitizeService
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index e5f6f779eb..bc7fa9de0e 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -6,13 +6,15 @@
 
 /// <reference path="../jquery/jquery.d.ts" />
 
-declare var angular: ng.IAngularStatic;
+declare var angular: angular.IAngularStatic;
 
 // Support for painless dependency injection
 interface Function {
     $inject?: string[];
 }
 
+// Collapse angular into ng
+import ng = angular;
 // Support AMD require
 declare module 'angular' {
     export = angular;
@@ -21,7 +23,7 @@ declare module 'angular' {
 ///////////////////////////////////////////////////////////////////////////////
 // ng module (angular.js)
 ///////////////////////////////////////////////////////////////////////////////
-declare module ng {
+declare module angular {
 
     // not directly implemented, but ensures that constructed class implements $get
     interface IServiceProviderClass {
diff --git a/ngprogress-lite/ngprogress-lite.d.ts b/ngprogress-lite/ngprogress-lite.d.ts
index bdee716732..20f0c6c0c8 100644
--- a/ngprogress-lite/ngprogress-lite.d.ts
+++ b/ngprogress-lite/ngprogress-lite.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Luke Forder <https://github.com/LukeForder>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module ng.progressLite {
+declare module angular.progressLite {
 
     export interface INgProgressLite {
         set(num: number): INgProgressLite;
@@ -25,4 +25,4 @@ declare module ng.progressLite {
     export interface INgProgressLiteProvider {
         settings: IConfigurationOptions;
     }
-}
\ No newline at end of file
+}