diff --git a/ember/ember-tests.ts b/ember/ember-tests.ts
index 63acb0fbba..5924dbd0ae 100644
--- a/ember/ember-tests.ts
+++ b/ember/ember-tests.ts
@@ -4,7 +4,7 @@
 
 var App : any;
 
-App = Em.Application.create<Ember.Application>();
+App = Em.Application.create<Em.Application>();
 
 App.president = Em.Object.create({
     name: 'Barack Obama'
@@ -44,7 +44,7 @@ var tom = Person1.create<MyPerson2>({
 tom.helloWorld();
 
 Person1.reopen({ isPerson: true });
-Person1.create<Ember.Object>().get('isPerson');
+Person1.create<Em.Object>().get('isPerson');
 
 Person1.reopenClass({
     createMan: () => {
@@ -55,7 +55,7 @@ Person1.reopenClass({
 declare var Person1: typeof MyPerson;
 Person1.createMan().get('isMan');
 
-var person = Person1.create<Ember.Object>({
+var person = Person1.create<Em.Object>({
     firstName: 'Yehuda',
     lastName: 'Katz'
 });
@@ -140,17 +140,17 @@ var people2 = [
     Person3.create({ name: 'Yehuda', isHappy: true }),
     Person3.create({ name: 'Majd', isHappy: false })
 ];
-people2.every((person: Ember.Object) => {
+people2.every((person: Em.Object) => {
     return !!person.get('isHappy');
 });
-people2.some((person: Ember.Object) => {
+people2.some((person: Em.Object) => {
     return !!person.get('isHappy');
 });
 people2.everyProperty('isHappy', true);
 people2.someProperty('isHappy', true);
 
-// Examples taken from http://emberjs.com/api/classes/Ember.RSVP.Promise.html
-var promise = new Ember.RSVP.Promise(function(resolve: Function, reject: Function) {
+// Examples taken from http://emberjs.com/api/classes/Em.RSVP.Promise.html
+var promise = new Em.RSVP.Promise(function(resolve: Function, reject: Function) {
   // on success
   resolve('ok!');
 
diff --git a/ember/ember.d.ts b/ember/ember.d.ts
index 7aa4a2671c..20328feef8 100644
--- a/ember/ember.d.ts
+++ b/ember/ember.d.ts
@@ -2568,7 +2568,216 @@ declare namespace Ember {
     function assign(original: any, ...sources: any[]): any;
 }
 
-declare var Em : typeof Ember;
+declare namespace Em {
+    var $: typeof Ember.$;
+    var A: typeof Ember.A;
+    class ActionHandlerMixin extends Ember.ActionHandlerMixin  { }
+    class Application extends Ember.Application { }
+    class Array extends Ember.Array { }
+    class ArrayProxy extends Ember.ArrayProxy { }
+    var BOOTED: typeof Ember.BOOTED;
+    class Binding extends Ember.Binding { }
+    class Button extends Ember.Button { }
+    class Checkbox extends Ember.Checkbox { }
+    class Comparable extends Ember.Comparable { }
+    class Component extends Ember.Component { }
+    class ComputedProperty extends Ember.ComputedProperty { }
+    class Container extends Ember.Container { }
+    class Controller extends Ember.Controller { }
+    class ControllerMixin extends Ember.ControllerMixin { }
+    class Copyable extends Ember.Copyable {}
+    class CoreObject extends Ember.CoreObject { }
+    class DAG extends Ember.DAG {}
+    var DEFAULT_GETTER_FUNCTION : typeof Ember.DEFAULT_GETTER_FUNCTION;
+    class DefaultResolver extends Ember.DefaultResolver  { }
+    class Descriptor extends Ember.Descriptor { }
+    var ENV: typeof Ember.ENV;
+    var EXTEND_PROTOTYPES: typeof Ember.EXTEND_PROTOTYPES;
+    class EachProxy extends Ember.EachProxy { }
+    class Enumerable extends Ember.Enumerable { }
+    var Error: typeof Ember.Error;
+    class EventDispatcher extends Ember.EventDispatcher { }
+    class Evented extends Ember.Evented { }
+    var FROZEN_ERROR: typeof Ember.FROZEN_ERROR;
+    class Freezable extends Ember.Freezable { }
+    var GUID_KEY: typeof Ember.GUID_KEY;
+    namespace Handlebars {
+        var compile: typeof Ember.Handlebars.compile;
+        var precompile: typeof Ember.Handlebars.precompile;
+        class Compiler extends Ember.Handlebars.Compiler { }
+        class JavaScriptCompiler extends Ember.Handlebars.JavaScriptCompiler{ }
+        var registerPartial: typeof Ember.Handlebars.registerPartial;
+        var K: typeof Ember.Handlebars.K;
+        var createFrame: typeof Ember.Handlebars.createFrame;
+        var Exception: typeof Ember.Handlebars.Exception;
+        class SafeString extends Ember.Handlebars.SafeString { }
+        var parse: typeof Ember.Handlebars.parse;
+        var print: typeof Ember.Handlebars.print;
+        var logger: typeof Ember.Handlebars.logger;
+        var log: typeof Ember.Handlebars.log;
+    }
+    class HashLocation extends Ember.HashLocation { }
+    class HistoryLocation extends Ember.HistoryLocation { }
+    var IS_BINDING: typeof Ember.IS_BINDING;
+    class Instrumentation extends Ember.Instrumentation { }
+    var K: typeof Ember.K;
+    var LOG_BINDINGS: typeof Ember.LOG_BINDINGS;
+    var LOG_STACKTRACE_ON_DEPRECATION: typeof Ember.LOG_STACKTRACE_ON_DEPRECATION;
+    var LOG_VERSION: typeof Ember.LOG_VERSION;
+    class Location extends Ember.Location {}
+    var Logger: typeof Ember.Logger;
+    var MANDATORY_SETTER_FUNCTION: typeof Ember.MANDATORY_SETTER_FUNCTION;
+    var META_KEY: typeof Ember.META_KEY;
+    class Map extends Ember.Map { }
+    class MapWithDefault extends Ember.MapWithDefault { }
+    class Mixin extends Ember.Mixin { }
+    class MutableArray extends Ember.MutableArray { }
+    class MutableEnumberable extends Ember.MutableEnumberable { }
+    var NAME_KEY: typeof Ember.NAME_KEY;
+    class Namespace extends Ember.Namespace { }
+    class NativeArray extends Ember.NativeArray { }
+    class NoneLocation extends Ember.NoneLocation { }
+    var ORDER_DEFINITION: typeof Ember.ORDER_DEFINITION;
+    class Object extends Ember.Object { }
+    class ObjectProxy extends Ember.ObjectProxy { }
+    class Observable extends Ember.Observable { }
+    class OrderedSet extends Ember.OrderedSet { }
+    class Registry extends Ember.Registry { }
+    namespace RSVP {
+        interface PromiseResolve extends Ember.RSVP.PromiseResolve { }
+        interface PromiseReject extends Ember.RSVP.PromiseReject { }
+        interface PromiseResolverFunction extends Ember.RSVP.PromiseResolverFunction { }
+        class Promise extends Ember.RSVP.Promise { }
+    }
+    class Route extends Ember.Route {}
+    class Router extends Ember.Router { }
+    class RouterDSL extends Ember.RouterDSL { }
+    var STRINGS: typeof Ember.STRINGS;
+    class State extends Ember.State { }
+    class StateManager extends Ember.StateManager { }
+    var String : typeof Ember.String;
+    var TEMPLATES: typeof Ember.TEMPLATES;
+    class TargetActionSupport extends Ember.TargetActionSupport {}
+    namespace Test {
+        class Adapter extends Ember.Test.Adapter { }
+        class Promise extends Ember.Test.Promise { }
+        var oninjectHelpers: typeof Ember.Test.oninjectHelpers;
+        var promise: typeof Ember.Test.promise;
+        var unregisterHelper: typeof Ember.Test.unregisterHelper;
+        var registerHelper: typeof Ember.Test.registerHelper;
+        var registerAsyncHelper: typeof Ember.Test.registerAsyncHelper;
+        var adapter: typeof Ember.Test.adapter;
+        var QUnitAdapter: typeof Ember.Test.QUnitAdapter;
+        var registerWaiter: typeof Ember.Test.registerWaiter;
+        var unregisterWaiter: typeof Ember.Test.unregisterWaiter
+        var resolve: typeof Ember.Test.resolve;
+    }
+    class TextArea extends Ember.TextArea { }
+    class TextField extends Ember.TextField { }
+    class TextSupport extends Ember.TextSupport { }
+    var VERSION: typeof Ember.VERSION;
+    class ViewTargetActionSupport extends Ember.ViewTargetActionSupport { }
+    var ViewUtils: typeof Ember.ViewUtils;
+    var addListener: typeof Ember.addListener;
+    var addObserver: typeof Ember.addObserver;
+    var alias: typeof Ember.alias;
+    var aliasMethod: typeof Ember.aliasMethod;
+    var assert: typeof Ember.assert;
+    var beginPropertyChanges: typeof Ember.beginPropertyChanges;
+    var bind: typeof Ember.bind;
+    var cacheFor: typeof Ember.cacheFor;
+    var canInvoke: typeof Ember.canInvoke;
+    var changeProperties: typeof Ember.changeProperties;
+    var compare: typeof Ember.compare;
+    var computed: typeof Ember.computed;
+    var controllerFor: typeof Ember.controllerFor;
+    var copy: typeof Ember.copy;
+    var create: typeof Ember.create;
+    var debug: typeof Ember.debug;
+    var defineProperty: typeof Ember.defineProperty;
+    var deprecate: typeof Ember.deprecate;
+    var deprecateFunc: typeof Ember.deprecateFunc
+    var destroy: typeof Ember.destroy;
+    var empty: typeof Ember.empty;
+    var endPropertyChanges: typeof Ember.endPropertyChanges;
+    var finishChains: typeof Ember.finishChains;
+    var generateController: typeof Ember.generateController;
+    var generateGuid: typeof Ember.generateGuid;
+    var get: typeof Ember.get;
+    var getPath: typeof Ember.getPath;
+    var getWithDefault: typeof Ember.getWithDefault;
+    var guidFor: typeof Ember.guidFor;
+    var handleErrors: typeof Ember.handleErrors;
+    var hasListeners: typeof Ember.hasListeners;
+    var hasOwnProperty: typeof Ember.hasOwnProperty;
+    var immediateObserver: typeof Ember.immediateObserver;
+    var inspect: typeof Ember.inspect;
+    var instrument: typeof Ember.instrument;
+    var isArray: typeof Ember.isArray;
+    var isEmpty: typeof Ember.isEmpty;
+    var isEqual: typeof Ember.isEqual;
+    var isGlobalPath: typeof Ember.isGlobalPath;
+    var isNamespace: typeof Ember.isNamespace;
+    var isNone: typeof Ember.isNone;
+    var isPrototypeOf: typeof Ember.isPrototypeOf;
+    var isWatching: typeof Ember.isWatching;
+    var keys: typeof Ember.keys;
+    var listenersDiff: typeof Ember.listenersDiff;
+    var listenersFor: typeof Ember.listenersFor;
+    var listenersUnion: typeof Ember.listenersUnion;
+    var lookup: typeof Ember.lookup;
+    var makeArray: typeof Ember.makeArray;
+    var merge: typeof Ember.merge;
+    var meta: typeof Ember.meta;
+    var mixin: typeof Ember.mixin;
+    var none: typeof Ember.none;
+    var observer: typeof Ember.observer;
+    var observersFor: typeof Ember.observersFor;
+    var onLoad: typeof Ember.onLoad;
+    var onError: typeof Ember.onError;
+    var overrideChains: typeof Ember.overrideChains;
+    var platform: typeof Ember.platform;
+    var propertyDidChange: typeof Ember.propertyDidChange;
+    var propertyIsEnumerable: typeof Ember.propertyIsEnumerable;
+    var propertyWillChange: typeof Ember.propertyWillChange;
+    var removeChainWatcher: typeof Ember.removeChainWatcher;
+    var removeListener: typeof Ember.removeListener;
+    var removeObserver: typeof Ember.removeObserver;
+    var required: typeof Ember.required;
+    var rewatch: typeof Ember.rewatch;
+    var run: typeof Ember.run;
+    var runLoadHooks: typeof Ember.runLoadHooks;
+    var sendEvent: typeof Ember.sendEvent;
+    var set: typeof Ember.set;
+    var setPath: typeof Ember.setPath;
+    var setProperties: typeof Ember.setProperties;
+    var subscribe: typeof Ember.subscribe;
+    var toLocaleString: typeof Ember.toLocaleString;
+    var toString: typeof Ember.toString;
+    var tryCatchFinally: typeof Ember.tryCatchFinally;
+    var tryInvoke: typeof Ember.tryInvoke;
+    var trySet: typeof Ember.trySet;
+    var trySetPath: typeof Ember.trySetPath;
+    var typeOf: typeof Ember.typeOf;
+    var unwatch: typeof Ember.unwatch;
+    var unwatchKey: typeof Ember.unwatchKey;
+    var unwatchPath: typeof Ember.unwatchPath;
+    var uuid: typeof Ember.uuid;
+    var valueOf: typeof Ember.valueOf;
+    var warn: typeof Ember.warn;
+    var watch: typeof Ember.watch;
+    var watchKey: typeof Ember.watchKey;
+    var watchPath: typeof Ember.watchPath;
+    var watchedEvents: typeof Ember.watchedEvents;
+    var wrap: typeof Ember.wrap;
+    var _ContainerProxyMixin : typeof Ember._ContainerProxyMixin;
+    var _RegistryProxyMixin: typeof Ember._RegistryProxyMixin;
+    var getOwner: typeof Ember.getOwner;
+    var setOwner: typeof Ember.setOwner;
+    var testing: typeof Ember.testing;
+    var MODEL_FACTORY_INJECTIONS: typeof Ember.MODEL_FACTORY_INJECTIONS;
+    var assign: typeof Ember.assign;
+}
 
 /**
  * External ambient module - to allow "import Ember = require('Ember');" to work correctly