diff --git a/.eslintrc b/.eslintrc
index d84c9eb64c0..148fa3b11a3 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -28,7 +28,6 @@
     "currentURL": true,
     "define": true,
     "Discourse": true,
-    "Em": true,
     "Ember": true,
     "exists": true,
     "expandSelectKit": true,
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index 17ae5a9296d..28801436620 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -34,7 +34,7 @@ export default Ember.Component.extend({
   didInsertElement() {
     loadScript("/javascripts/spectrum.js").then(() => {
       loadCSS("/javascripts/spectrum.css").then(() => {
-        Em.run.schedule("afterRender", () => {
+        Ember.run.schedule("afterRender", () => {
           this.$(".picker")
             .spectrum({ color: "#" + this.get("hexValue") })
             .on("change.spectrum", (me, color) => {
@@ -44,7 +44,7 @@ export default Ember.Component.extend({
         });
       });
     });
-    Em.run.schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this.hexValueChanged();
     });
   }
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index 357ba10d5f5..1ddb37faf7c 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -21,7 +21,7 @@ export default Ember.Component.extend({
         ajax("/admin/users/ip-info", {
           data: { ip: this.get("ip") }
         }).then(function(location) {
-          self.set("location", Em.Object.create(location));
+          self.set("location", Ember.Object.create(location));
         });
       }
 
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index 0bd547cf257..c0c2f24b325 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js.es6
+++ b/app/assets/javascripts/admin/components/permalink-form.js.es6
@@ -34,7 +34,7 @@ export default Ember.Component.extend({
             self.set("permalink_type_value", "");
             self.set("formSubmitted", false);
             self.action(Permalink.create(result.permalink));
-            Em.run.schedule("afterRender", function() {
+            Ember.run.schedule("afterRender", function() {
               self.$(".permalink-url").focus();
             });
           },
@@ -60,7 +60,7 @@ export default Ember.Component.extend({
   didInsertElement: function() {
     var self = this;
     self._super();
-    Em.run.schedule("afterRender", function() {
+    Ember.run.schedule("afterRender", function() {
       self.$(".external-url").keydown(function(e) {
         if (e.keyCode === 13) {
           // enter key
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 00730478c35..e462d9e32c4 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -55,7 +55,7 @@ export default Ember.Component.extend(
       if (this.get("isUploading")) {
         this.resumable.cancel();
         var self = this;
-        Em.run.later(function() {
+        Ember.run.later(function() {
           self._reset();
         });
         return false;
@@ -83,20 +83,20 @@ export default Ember.Component.extend(
         // automatically upload the selected file
         self.resumable.upload();
         // mark as uploading
-        Em.run.later(function() {
+        Ember.run.later(function() {
           self.set("isUploading", true);
         });
       });
 
       this.resumable.on("fileProgress", function(file) {
         // update progress
-        Em.run.later(function() {
+        Ember.run.later(function() {
           self.set("progress", parseInt(file.progress() * 100, 10));
         });
       });
 
       this.resumable.on("fileSuccess", function(file) {
-        Em.run.later(function() {
+        Ember.run.later(function() {
           // mark as not uploading anymore
           self._reset();
           // fire an event to allow the parent route to reload its model
@@ -105,7 +105,7 @@ export default Ember.Component.extend(
       });
 
       this.resumable.on("fileError", function(file, message) {
-        Em.run.later(function() {
+        Ember.run.later(function() {
           // mark as not uploading anymore
           self._reset();
           // fire an event to allow the parent route to display the error message
@@ -116,7 +116,7 @@ export default Ember.Component.extend(
 
     _assignBrowse: function() {
       var self = this;
-      Em.run.schedule("afterRender", function() {
+      Ember.run.schedule("afterRender", function() {
         self.resumable.assignBrowse(self.$());
       });
     }.on("didInsertElement"),
diff --git a/app/assets/javascripts/admin/components/tags-uploader.js.es6 b/app/assets/javascripts/admin/components/tags-uploader.js.es6
index 60b4297a481..1373792f24b 100644
--- a/app/assets/javascripts/admin/components/tags-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/tags-uploader.js.es6
@@ -1,9 +1,9 @@
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "csv",
   uploadUrl: "/tags/upload",
-  addDisabled: Em.computed.alias("uploading"),
+  addDisabled: Ember.computed.alias("uploading"),
   elementId: "tag-uploader",
 
   validateUploadedFilesOptions() {
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js.es6
index 0bd69f92d25..fad6702a3ce 100644
--- a/app/assets/javascripts/admin/components/themes-list-item.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list-item.js.es6
@@ -9,9 +9,9 @@ export default Ember.Component.extend({
   childrenExpanded: false,
   classNames: ["themes-list-item"],
   classNameBindings: ["theme.selected:selected"],
-  hasComponents: Em.computed.gt("children.length", 0),
-  displayComponents: Em.computed.and("hasComponents", "theme.isActive"),
-  displayHasMore: Em.computed.gt("theme.childThemes.length", MAX_COMPONENTS),
+  hasComponents: Ember.computed.gt("children.length", 0),
+  displayComponents: Ember.computed.and("hasComponents", "theme.isActive"),
+  displayHasMore: Ember.computed.gt("theme.childThemes.length", MAX_COMPONENTS),
 
   click(e) {
     if (!$(e.target).hasClass("others-count")) {
diff --git a/app/assets/javascripts/admin/components/themes-list.js.es6 b/app/assets/javascripts/admin/components/themes-list.js.es6
index da14b6492a0..abb03af476d 100644
--- a/app/assets/javascripts/admin/components/themes-list.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list.js.es6
@@ -7,12 +7,12 @@ export default Ember.Component.extend({
 
   classNames: ["themes-list"],
 
-  hasThemes: Em.computed.gt("themesList.length", 0),
-  hasUserThemes: Em.computed.gt("userThemes.length", 0),
-  hasInactiveThemes: Em.computed.gt("inactiveThemes.length", 0),
+  hasThemes: Ember.computed.gt("themesList.length", 0),
+  hasUserThemes: Ember.computed.gt("userThemes.length", 0),
+  hasInactiveThemes: Ember.computed.gt("inactiveThemes.length", 0),
 
-  themesTabActive: Em.computed.equal("currentTab", THEMES),
-  componentsTabActive: Em.computed.equal("currentTab", COMPONENTS),
+  themesTabActive: Ember.computed.equal("currentTab", THEMES),
+  componentsTabActive: Ember.computed.equal("currentTab", COMPONENTS),
 
   @computed("themes", "components", "currentTab")
   themesList(themes, components) {
@@ -79,7 +79,7 @@ export default Ember.Component.extend({
       }
     },
     navigateToTheme(theme) {
-      Em.getOwner(this)
+      Ember.getOwner(this)
         .lookup("router:main")
         .transitionTo("adminCustomizeThemes.show", theme);
     }
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
index 6b35fd465ef..5f047a2bc6e 100644
--- a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
@@ -1,11 +1,11 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "csv",
   classNames: "watched-words-uploader",
   uploadUrl: "/admin/logs/watched_words/upload",
-  addDisabled: Em.computed.alias("uploading"),
+  addDisabled: Ember.computed.alias("uploading"),
 
   validateUploadedFilesOptions() {
     return { csvOnly: true };
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
index 38bdd6f5713..ee2fd2f95d6 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Controller.extend({
   logs: [],
   adminBackups: Ember.inject.controller(),
-  status: Em.computed.alias("adminBackups.model")
+  status: Ember.computed.alias("adminBackups.model")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
index 9b83dbaeb89..e49e87fc4b8 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
@@ -51,7 +51,7 @@ export default Ember.Controller.extend({
     },
 
     copy() {
-      var newColorScheme = Em.copy(this.get("model"), true);
+      var newColorScheme = Ember.copy(this.get("model"), true);
       newColorScheme.set(
         "name",
         I18n.t("admin.customize.colors.copy_name_prefix") +
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
index 60a0af98b84..88ab2b8846d 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
@@ -10,7 +10,7 @@ export default Ember.Controller.extend({
   }.property("model.@each.id"),
 
   baseColors: function() {
-    var baseColorsHash = Em.Object.create({});
+    var baseColorsHash = Ember.Object.create({});
     this.get("baseColorScheme.colors").forEach(color => {
       baseColorsHash.set(color.get("name"), color);
     });
@@ -23,7 +23,7 @@ export default Ember.Controller.extend({
         "base_scheme_id",
         baseKey
       );
-      const newColorScheme = Em.copy(base, true);
+      const newColorScheme = Ember.copy(base, true);
       newColorScheme.set("name", I18n.t("admin.customize.colors.new_name"));
       newColorScheme.set("base_scheme_id", base.get("base_scheme_id"));
       newColorScheme.save().then(() => {
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
index a8acc0e2f04..0b31a299bbe 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
@@ -179,7 +179,7 @@ export default Ember.Controller.extend({
 
     toggleMaximize: function() {
       this.toggleProperty("maximized");
-      Em.run.next(() => {
+      Ember.run.next(() => {
         this.appEvents.trigger("ace:resize");
       });
     }
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
index 45f1b3359d0..a5a703ceb95 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -10,7 +10,7 @@ const THEME_UPLOAD_VAR = 2;
 export default Ember.Controller.extend({
   downloadUrl: url("model.id", "/admin/themes/%@"),
   previewUrl: url("model.id", "/admin/themes/%@/preview"),
-  addButtonDisabled: Em.computed.empty("selectedChildThemeId"),
+  addButtonDisabled: Ember.computed.empty("selectedChildThemeId"),
   editRouteName: "adminCustomizeThemes.edit",
 
   @computed("model", "allThemes", "model.component")
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
index 1bab3fe2979..cbbd1563b09 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
@@ -5,7 +5,7 @@ export default Ember.Controller.extend({
 
     @property sendTestEmailDisabled
   **/
-  sendTestEmailDisabled: Em.computed.empty("testEmailAddress"),
+  sendTestEmailDisabled: Ember.computed.empty("testEmailAddress"),
 
   /**
     Clears the 'sentTestEmail' property on successful send.
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
index bd65bb9c14d..f92a8ebd94a 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
@@ -4,7 +4,7 @@ const MAX_FIELDS = 20;
 
 export default Ember.Controller.extend({
   fieldTypes: null,
-  createDisabled: Em.computed.gte("model.length", MAX_FIELDS),
+  createDisabled: Ember.computed.gte("model.length", MAX_FIELDS),
 
   fieldSortOrder: ["position"],
   sortedFields: Ember.computed.sort("model", "fieldSortOrder"),
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
index 057a9b532b6..16b148f951e 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
@@ -14,15 +14,15 @@ export default Ember.Controller.extend(CanCheckEmails, {
   listFilter: null,
   selectAll: false,
 
-  queryNew: Em.computed.equal("query", "new"),
-  queryPending: Em.computed.equal("query", "pending"),
-  queryHasApproval: Em.computed.or("queryNew", "queryPending"),
-  showApproval: Em.computed.and(
+  queryNew: Ember.computed.equal("query", "new"),
+  queryPending: Ember.computed.equal("query", "pending"),
+  queryHasApproval: Ember.computed.or("queryNew", "queryPending"),
+  showApproval: Ember.computed.and(
     "siteSettings.must_approve_users",
     "queryHasApproval"
   ),
   searchHint: i18n("search_hint"),
-  hasSelection: Em.computed.gt("selectedCount", 0),
+  hasSelection: Ember.computed.gt("selectedCount", 0),
 
   selectedCount: function() {
     var model = this.get("model");
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
index e29bc70702d..41a9e4a7556 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -43,7 +43,7 @@ export default Ember.Controller.extend({
       if (a) {
         a.words.unshiftObject(arg);
         a.incrementProperty("count");
-        Em.run.schedule("afterRender", () => {
+        Ember.run.schedule("afterRender", () => {
           // remove from other actions lists
           let match = null;
           this.get("adminWatchedWords.model").forEach(action => {
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
index 766892e0e73..24e00b50d43 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
@@ -63,8 +63,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
     this.set("fileSelected", false);
   },
 
-  enabled: Em.computed.and("nameValid", "fileSelected"),
-  disabled: Em.computed.not("enabled"),
+  enabled: Ember.computed.and("nameValid", "fileSelected"),
+  disabled: Ember.computed.not("enabled"),
 
   @computed("name", "adminCustomizeThemesShow.model.theme_fields")
   errorMessage(name, themeFields) {
@@ -105,7 +105,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
   actions: {
     updateName() {
       let name = this.get("name");
-      if (Em.isEmpty(name)) {
+      if (Ember.isEmpty(name)) {
         name = $("#file-input")[0].files[0].name;
         this.set("name", name.split(".")[0]);
       }
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index f609427512d..1a195149b36 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
@@ -4,7 +4,7 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
 export default Ember.Controller.extend(ModalFunctionality, {
   modelChanged: function() {
     const model = this.get("model");
-    const copy = Em.A();
+    const copy = Ember.A();
     const store = this.store;
 
     if (model) {
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 8e6180eb0de..a0552766a57 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -100,7 +100,7 @@ export default Ember.Mixin.create({
   }.on("willDestroyElement"),
 
   _save() {
-    Em.warn("You should define a `_save` method", {
+    Ember.warn("You should define a `_save` method", {
       id: "admin.mixins.setting-component"
     });
     return Ember.RSVP.resolve();
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index d98e148a5a4..b9a8fc76181 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -305,7 +305,7 @@ const AdminUser = Discourse.User.extend({
     return this.get("trust_level") < 4;
   }.property("trust_level"),
 
-  canSuspend: Em.computed.not("staff"),
+  canSuspend: Ember.computed.not("staff"),
 
   suspendDuration: function() {
     const suspended_at = moment(this.suspended_at),
diff --git a/app/assets/javascripts/admin/models/backup-status.js.es6 b/app/assets/javascripts/admin/models/backup-status.js.es6
index cc623046012..2eb856c3be7 100644
--- a/app/assets/javascripts/admin/models/backup-status.js.es6
+++ b/app/assets/javascripts/admin/models/backup-status.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Discourse.Model.extend({
-  restoreDisabled: Em.computed.not("restoreEnabled"),
+  restoreDisabled: Ember.computed.not("restoreEnabled"),
 
   @computed("allowRestore", "isOperationRunning")
   restoreEnabled(allowRestore, isOperationRunning) {
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js.es6
index e781320c298..fc24331fb81 100644
--- a/app/assets/javascripts/admin/models/color-scheme.js.es6
+++ b/app/assets/javascripts/admin/models/color-scheme.js.es6
@@ -30,7 +30,7 @@ const ColorScheme = Discourse.Model.extend(Ember.Copyable, {
     var newScheme = ColorScheme.create({
       name: this.get("name"),
       can_edit: true,
-      colors: Em.A()
+      colors: Ember.A()
     });
     this.get("colors").forEach(c => {
       newScheme.colors.pushObject(
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index e81fc7e1474..83f42d962e7 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -10,9 +10,9 @@ const SETTINGS_TYPE_ID = 5;
 
 const Theme = RestModel.extend({
   FIELDS_IDS: [0, 1],
-  isActive: Em.computed.or("default", "user_selectable"),
-  isPendingUpdates: Em.computed.gt("remote_theme.commits_behind", 0),
-  hasEditedFields: Em.computed.gt("editedFields.length", 0),
+  isActive: Ember.computed.or("default", "user_selectable"),
+  isPendingUpdates: Ember.computed.gt("remote_theme.commits_behind", 0),
+  hasEditedFields: Ember.computed.gt("editedFields.length", 0),
 
   @computed("theme_fields")
   themeFields(fields) {
@@ -50,7 +50,7 @@ const Theme = RestModel.extend({
   @computed("theme_fields.[]")
   editedFields(fields) {
     return fields.filter(
-      field => !Em.isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
+      field => !Ember.isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
     );
   },
 
@@ -67,11 +67,11 @@ const Theme = RestModel.extend({
 
   hasEdited(target, name) {
     if (name) {
-      return !Em.isEmpty(this.getField(target, name));
+      return !Ember.isEmpty(this.getField(target, name));
     } else {
       let fields = this.get("theme_fields") || [];
       return fields.any(
-        field => field.target === target && !Em.isEmpty(field.value)
+        field => field.target === target && !Ember.isEmpty(field.value)
       );
     }
   },
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
index 200d33f28e6..a0febc3d1de 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
@@ -15,7 +15,7 @@ export default Ember.Route.extend({
             return log.message.length === 0 || log.message[0] === "[";
           })
           .map(function(log) {
-            return Em.Object.create(log);
+            return Ember.Object.create(log);
           })
           .value();
         logs.pushObjects(newLogs);
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index 4514eec2054..28ec187f22a 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -41,7 +41,7 @@ export default Discourse.Route.extend({
       } else {
         this.controllerFor("adminBackupsLogs")
           .get("logs")
-          .pushObject(Em.Object.create(log));
+          .pushObject(Ember.Object.create(log));
       }
     });
   },
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index 65071702561..7837d1b30de 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -4,7 +4,7 @@ import showModal from "discourse/lib/show-modal";
 
 export default Ember.Route.extend({
   serialize(m) {
-    return { badge_id: Em.get(m, "id") || "new" };
+    return { badge_id: Ember.get(m, "id") || "new" };
   },
 
   model(params) {
@@ -49,7 +49,7 @@ export default Ember.Route.extend({
         })
         .catch(function(error) {
           badge.set("preview_loading", false);
-          Em.Logger.error(error);
+          Ember.Logger.error(error);
           bootbox.alert("Network error");
         });
     }
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js.es6
index 9eab70c84de..c25f750c253 100644
--- a/app/assets/javascripts/admin/routes/admin-user.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user.js.es6
@@ -9,7 +9,7 @@ export default Discourse.Route.extend({
   },
 
   model(params) {
-    return AdminUser.find(Em.get(params, "user_id"));
+    return AdminUser.find(Ember.get(params, "user_id"));
   },
 
   renderTemplate() {
diff --git a/app/assets/javascripts/authentication-complete.js.no-module.es6 b/app/assets/javascripts/authentication-complete.js.no-module.es6
index ad768b64261..be55e6d8386 100644
--- a/app/assets/javascripts/authentication-complete.js.no-module.es6
+++ b/app/assets/javascripts/authentication-complete.js.no-module.es6
@@ -7,7 +7,7 @@
   require("discourse/routes/application").default.reopen({
     actions: {
       didTransition: function() {
-        Em.run.next(function() {
+        Ember.run.next(function() {
           Discourse.authenticationComplete(authenticationData);
         });
         return this._super();
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
index f8c6613aed3..5922fc55c81 100644
--- a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
@@ -24,7 +24,7 @@ RawHandlebars.helpers["get"] = function(context, options) {
     context = context.slice(context.indexOf(".") + 1);
   }
 
-  return val === undefined ? Em.get(firstContext, context) : val;
+  return val === undefined ? Ember.get(firstContext, context) : val;
 };
 
 // adds compatability so this works with stringParams
@@ -45,7 +45,7 @@ RawHandlebars.registerHelper("each", function(
   contextName,
   options
 ) {
-  var list = Em.get(this, contextName);
+  var list = Ember.get(this, contextName);
   var output = [];
   var innerContext = objectCreate(this);
   for (var i = 0; i < list.length; i++) {
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
index 7db66e8aa30..5fe9aecec61 100644
--- a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "avatar",
   tagName: "span",
   imageIsNotASquare: false,
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js.es6 b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
index 803c7df0671..04588987bef 100644
--- a/app/assets/javascripts/discourse/components/backup-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
@@ -2,7 +2,7 @@ import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   tagName: "span",
 
   @computed("uploading", "uploadProgress")
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js.es6
index 6cae62b1655..443bf28e09e 100644
--- a/app/assets/javascripts/discourse/components/badge-button.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-button.js.es6
@@ -9,5 +9,5 @@ export default Ember.Component.extend({
     return $("<div>" + this.get("badge.description") + "</div>").text();
   }.property("badge.description"),
   attributeBindings: ["data-badge-name", "title"],
-  "data-badge-name": Em.computed.alias("badge.name")
+  "data-badge-name": Ember.computed.alias("badge.name")
 });
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
index 74012f4817a..ded546ec178 100644
--- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
+++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
@@ -2,9 +2,9 @@
 export default Ember.Component.extend({
   classNameBindings: ["hidden:hidden", ":category-breadcrumb"],
   tagName: "ol",
-  parentCategory: Em.computed.alias("category.parentCategory"),
+  parentCategory: Ember.computed.alias("category.parentCategory"),
 
-  parentCategories: Em.computed.filter("categories", function(c) {
+  parentCategories: Ember.computed.filter("categories", function(c) {
     if (
       c.id === this.site.get("uncategorized_category_id") &&
       !this.siteSettings.allow_uncategorized_topics
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index b05dd54629e..ffe7302432f 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -29,7 +29,7 @@ export default Ember.Component.extend({
   search: debounce(function(title) {
     const currentTopicId = this.get("currentTopicId");
 
-    if (Em.isEmpty(title)) {
+    if (Ember.isEmpty(title)) {
       this.setProperties({ messages: null, loading: false });
       return;
     }
@@ -53,7 +53,7 @@ export default Ember.Component.extend({
 
   actions: {
     chooseMessage(message) {
-      const messageId = Em.get(message, "id");
+      const messageId = Ember.get(message, "id");
       this.set("selectedTopicId", messageId);
       Ember.run.next(() =>
         $(`#choose-message-${messageId}`).prop("checked", "true")
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js.es6
index 4719be54559..4f35e90e203 100644
--- a/app/assets/javascripts/discourse/components/choose-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-topic.js.es6
@@ -27,7 +27,7 @@ export default Ember.Component.extend({
     const self = this,
       currentTopicId = this.get("currentTopicId");
 
-    if (Em.isEmpty(title)) {
+    if (Ember.isEmpty(title)) {
       self.setProperties({ topics: null, loading: false });
       return;
     }
@@ -50,7 +50,7 @@ export default Ember.Component.extend({
 
   actions: {
     chooseTopic(topic) {
-      const topicId = Em.get(topic, "id");
+      const topicId = Ember.get(topic, "id");
       this.set("selectedTopicId", topicId);
       Ember.run.next(() =>
         $("#choose-topic-" + topicId).prop("checked", "true")
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 8f8dd8a2609..341f0380295 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -583,7 +583,7 @@ export default Ember.Component.extend({
         if (found.indexOf(name) === -1) {
           // add a delay to allow for typing, so you don't open the warning right away
           // previously we would warn after @bob even if you were about to mention @bob2
-          Em.run.later(
+          Ember.run.later(
             this,
             () => {
               if (
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 1ec43f321b2..65b32b2227e 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -79,7 +79,7 @@ export default Ember.Component.extend({
     }
 
     if (Ember.testing) {
-      Em.run.next(() =>
+      Ember.run.next(() =>
         // not ideal but we don't want to run this in current
         // runloop to avoid an error in console
         this._checkForUrl()
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
index d38a549f6db..2799b736ec1 100644
--- a/app/assets/javascripts/discourse/components/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -11,7 +11,7 @@ const CookText = Ember.Component.extend({
       this.set("cooked", cooked);
       // no choice but to defer this cause
       // pretty text may only be loaded now
-      Em.run.next(() =>
+      Ember.run.next(() =>
         window
           .requireModule("pretty-text/image-short-url")
           .resolveAllShortUrls(ajax)
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
index d5c6124fc1a..f080dcf7559 100644
--- a/app/assets/javascripts/discourse/components/csv-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "csv",
   tagName: "span",
   uploadUrl: "/invites/upload_csv",
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index efb05b38fc8..44792ecfc06 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -23,7 +23,7 @@ export default Ember.Component.extend({
   setUp() {
     $("html").on("keydown.discourse-modal", e => {
       if (e.which === 27 && this.get("dismissable")) {
-        Em.run.next(() => $(".modal-header a.close").click());
+        Ember.run.next(() => $(".modal-header a.close").click());
       }
     });
 
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
index 2cc6b2b3a5d..79f0d9c092d 100644
--- a/app/assets/javascripts/discourse/components/edit-category-general.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
@@ -6,7 +6,9 @@ import computed from "ember-addons/ember-computed-decorators";
 
 export default buildCategoryPanel("general", {
   foregroundColors: ["FFFFFF", "000000"],
-  canSelectParentCategory: Em.computed.not("category.isUncategorizedCategory"),
+  canSelectParentCategory: Ember.computed.not(
+    "category.isUncategorizedCategory"
+  ),
 
   // background colors are available as a pipe-separated string
   @computed
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
index b7ebf139a5b..455418f13cf 100644
--- a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
@@ -5,12 +5,12 @@ import computed from "ember-addons/ember-computed-decorators";
 export default buildCategoryPanel("settings", {
   emailInEnabled: setting("email_in"),
   showPositionInput: setting("fixed_category_positions"),
-  isParentCategory: Em.computed.empty("category.parent_category_id"),
-  showSubcategoryListStyle: Em.computed.and(
+  isParentCategory: Ember.computed.empty("category.parent_category_id"),
+  showSubcategoryListStyle: Ember.computed.and(
     "category.show_subcategory_list",
     "isParentCategory"
   ),
-  isDefaultSortOrder: Em.computed.empty("category.sort_order"),
+  isDefaultSortOrder: Ember.computed.empty("category.sort_order"),
 
   @computed
   availableSubcategoryListStyles() {
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index e48a390d7b8..f8b8d962ada 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -1,6 +1,6 @@
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Em.Component.extend({
+export default Ember.Component.extend({
   tagName: "li",
   classNameBindings: ["active", "tabClassName"],
 
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
index daca2880933..f6ccab1c5ab 100644
--- a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
@@ -1,11 +1,11 @@
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "emoji",
   uploadUrl: "/admin/customize/emojis",
 
-  hasName: Em.computed.notEmpty("name"),
-  addDisabled: Em.computed.not("hasName"),
+  hasName: Ember.computed.notEmpty("name"),
+  addDisabled: Ember.computed.not("hasName"),
 
   data: function() {
     return Ember.isBlank(this.get("name")) ? {} : { name: this.get("name") };
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
index 9a20d30777d..6a7a713d4e0 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -23,9 +23,9 @@ export default Ember.Component.extend({
     return flag === selectedFlag;
   },
 
-  showMessageInput: Em.computed.and("flag.is_custom_flag", "selected"),
-  showDescription: Em.computed.not("showMessageInput"),
-  isNotifyUser: Em.computed.equal("flag.name_key", "notify_user"),
+  showMessageInput: Ember.computed.and("flag.is_custom_flag", "selected"),
+  showDescription: Ember.computed.not("showMessageInput"),
+  isNotifyUser: Ember.computed.equal("flag.name_key", "notify_user"),
 
   @computed("flag.description", "flag.short_description")
   description(long_description, short_description) {
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index f05fda3eb0a..637cfca41b3 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -28,7 +28,7 @@ export default Ember.Component.extend({
     return !usernames || !(usernames.length > 0);
   },
 
-  showingFirst: Em.computed.lte("currentPage", 1),
+  showingFirst: Ember.computed.lte("currentPage", 1),
   showingLast: propertyEqual("currentPage", "totalPages"),
 
   actions: {
@@ -60,7 +60,7 @@ export default Ember.Component.extend({
     },
 
     addMembers() {
-      if (Em.isEmpty(this.get("model.usernames"))) {
+      if (Ember.isEmpty(this.get("model.usernames"))) {
         return;
       }
       this.get("model")
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 0c9120069a6..db580fb71fb 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,12 +1,12 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   classNames: ["image-uploader"],
 
   @computed("imageUrl")
   backgroundStyle(imageUrl) {
-    if (Em.isEmpty(imageUrl)) {
+    if (Ember.isEmpty(imageUrl)) {
       return "".htmlSafe();
     }
 
diff --git a/app/assets/javascripts/discourse/components/images-uploader.js.es6 b/app/assets/javascripts/discourse/components/images-uploader.js.es6
index e9280d96aa0..5fd63d0d013 100644
--- a/app/assets/javascripts/discourse/components/images-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/images-uploader.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "avatar",
   tagName: "span",
 
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index c7fae124554..6c7688c0944 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -6,8 +6,8 @@ export default Ember.Component.extend(
     classNameBindings: [":tip", "good", "bad"],
     rerenderTriggers: ["validation"],
 
-    bad: Em.computed.alias("validation.failed"),
-    good: Em.computed.not("bad"),
+    bad: Ember.computed.alias("validation.failed"),
+    good: Ember.computed.not("bad"),
 
     buildBuffer(buffer) {
       const reason = this.get("validation.reason");
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
index 71e33560903..3638eaca8f5 100644
--- a/app/assets/javascripts/discourse/components/mobile-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
@@ -20,7 +20,7 @@ export default Ember.Component.extend({
   @observes("currentPath")
   currentPathChanged() {
     this.set("expanded", false);
-    Em.run.next(() => this._updateSelectedHtml());
+    Ember.run.next(() => this._updateSelectedHtml());
   },
 
   _updateSelectedHtml() {
@@ -38,7 +38,7 @@ export default Ember.Component.extend({
     toggleExpanded() {
       this.toggleProperty("expanded");
 
-      Em.run.next(() => {
+      Ember.run.next(() => {
         if (this.get("expanded")) {
           $(window)
             .off("click.mobile-nav")
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index 7d0c8f7ac7b..674ad8f9431 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -68,7 +68,7 @@ export default Ember.Component.extend({
       if (this.get("expanded")) {
         DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
-        Em.run.next(() => {
+        Ember.run.next(() => {
           if (!this.get("expanded")) {
             return;
           }
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
index 5b246336828..6088f4a4a6b 100644
--- a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
@@ -1,4 +1,4 @@
-export default Em.Component.extend({
+export default Ember.Component.extend({
   classNames: ["controls"],
 
   label: function() {
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index 408064686dd..8ae88ca19ff 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -28,7 +28,7 @@ const REGEXP_POST_TIME_WHEN = /^(before|after)/gi;
 
 const IN_OPTIONS_MAPPING = { images: "with" };
 
-export default Em.Component.extend({
+export default Ember.Component.extend({
   classNames: ["search-advanced-options"],
 
   inOptionsForUsers: [
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index cc5108c4f6a..dbbc7ad1d5b 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -9,7 +9,10 @@ export default Ember.Component.extend({
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
-      Em.run.later(() => this.session.set("showSignupCta", false), 20 * 1000);
+      Ember.run.later(
+        () => this.session.set("showSignupCta", false),
+        20 * 1000
+      );
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
index 78d512aae00..da1ae4f00ab 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -32,7 +32,7 @@ export default Ember.Component.extend({
 
     if (
       category &&
-      Em.get(category, "id") ===
+      Ember.get(category, "id") ===
         Discourse.Site.currentProp("uncategorized_category_id")
     ) {
       category = null;
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index 266b803e8c3..b2cc3943445 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -39,7 +39,7 @@ export default Ember.Component.extend(
       "topic.visited"
     ],
     attributeBindings: ["data-topic-id"],
-    "data-topic-id": Em.computed.alias("topic.id"),
+    "data-topic-id": Ember.computed.alias("topic.id"),
 
     @computed
     newDotText() {
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index 2d6926d3a7a..e276e7a3972 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -86,7 +86,7 @@ export default MountWidget.extend(Docking, {
     this._super();
 
     if (this.get("fullscreen") && !this.get("addShowClass")) {
-      Em.run.next(() => {
+      Ember.run.next(() => {
         this.set("addShowClass", true);
         this.queueRerender();
       });
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 6a3306a55a5..8fcb580dadd 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -77,7 +77,7 @@ export default Ember.Component.extend(
 
     willDestroyElement() {
       if (this._delayedRerender) {
-        Em.run.cancel(this._delayedRerender);
+        Ember.run.cancel(this._delayedRerender);
       }
     },
 
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js.es6
index 825b822cd4c..e507b305707 100644
--- a/app/assets/javascripts/discourse/components/user-info.js.es6
+++ b/app/assets/javascripts/discourse/components/user-info.js.es6
@@ -15,10 +15,10 @@ export default Ember.Component.extend({
     return userPath(username);
   },
 
-  "data-username": Em.computed.alias("user.username"),
+  "data-username": Ember.computed.alias("user.username"),
 
   // TODO: In later ember releases `hasBlock` works without this
-  hasBlock: Em.computed.alias("template"),
+  hasBlock: Ember.computed.alias("template"),
 
   @computed("user.name", "user.username")
   name(name, username) {
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6
index 32435088bca..cdd9aba2809 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/user-selector.js.es6
@@ -114,7 +114,7 @@ export default TextField.extend({
   @observes("usernames")
   _clearInput: function() {
     if (arguments.length > 1) {
-      if (Em.isEmpty(this.get("usernames"))) {
+      if (Ember.isEmpty(this.get("usernames"))) {
         this.$()
           .parent()
           .find("a")
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index f28c2968494..59408144df4 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -13,7 +13,7 @@ export default Ember.Component.extend(LoadMore, {
   classNames: ["user-stream"],
 
   _scrollTopOnModelChange: function() {
-    Em.run.schedule("afterRender", () => $(document).scrollTop(0));
+    Ember.run.schedule("afterRender", () => $(document).scrollTop(0));
   }.observes("stream.user.id"),
 
   _inserted: function() {
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
index 07dbe955f3a..744e28a13a4 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -17,7 +17,7 @@ export default Ember.Controller.extend({
     });
   },
 
-  disabled: Em.computed.empty("notificationLevelId"),
+  disabled: Ember.computed.empty("notificationLevelId"),
 
   actions: {
     changeNotificationLevel() {
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index c409ca31efb..87df9f226a9 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -47,7 +47,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
         .then(function() {
           self.send("closeModal");
           self.setProperties({ date: "", time: "", saving: false });
-          Em.run.next(() => {
+          Ember.run.next(() => {
             DiscourseURL.routeTo(topic.get("url"));
           });
         })
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 565c6418145..1ae4cfffd68 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -80,11 +80,11 @@ export default Ember.Controller.extend({
   topicController: Ember.inject.controller("topic"),
   application: Ember.inject.controller(),
 
-  replyAsNewTopicDraft: Em.computed.equal(
+  replyAsNewTopicDraft: Ember.computed.equal(
     "model.draftKey",
     Composer.REPLY_AS_NEW_TOPIC_KEY
   ),
-  replyAsNewPrivateMessageDraft: Em.computed.equal(
+  replyAsNewPrivateMessageDraft: Ember.computed.equal(
     "model.draftKey",
     Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY
   ),
@@ -155,7 +155,7 @@ export default Ember.Controller.extend({
     return "title";
   },
 
-  showToolbar: Em.computed({
+  showToolbar: Ember.computed({
     get() {
       const keyValueStore = getOwner(this).lookup("key-value-store:main");
       const storedVal = keyValueStore.get("toolbar-enabled");
@@ -198,7 +198,7 @@ export default Ember.Controller.extend({
     return currentUser && currentUser.get("staff");
   },
 
-  canUnlistTopic: Em.computed.and("model.creatingTopic", "isStaffUser"),
+  canUnlistTopic: Ember.computed.and("model.creatingTopic", "isStaffUser"),
 
   @computed("canWhisper", "model.post")
   showWhisperToggle(canWhisper, repliedToPost) {
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index c00555d5bdd..cb38b10d30c 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -24,14 +24,14 @@ export default Ember.Controller.extend(
     accountPasswordConfirm: 0,
     accountChallenge: 0,
     formSubmitted: false,
-    rejectedEmails: Em.A([]),
+    rejectedEmails: Ember.A([]),
     prefilledUsername: null,
     userFields: null,
     isDeveloper: false,
 
-    hasAuthOptions: Em.computed.notEmpty("authOptions"),
+    hasAuthOptions: Ember.computed.notEmpty("authOptions"),
     canCreateLocal: setting("enable_local_logins"),
-    showCreateForm: Em.computed.or("hasAuthOptions", "canCreateLocal"),
+    showCreateForm: Ember.computed.or("hasAuthOptions", "canCreateLocal"),
 
     resetForm() {
       // We wrap the fields in a structure so we can assign a value
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 3fdf27d1ac5..c19e0f7fb1b 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -7,10 +7,10 @@ export default Ember.Controller.extend({
 
   loading: false,
 
-  category: Em.computed.alias("navigationCategory.category"),
-  noSubcategories: Em.computed.alias("navigationCategory.noSubcategories"),
+  category: Ember.computed.alias("navigationCategory.category"),
+  noSubcategories: Ember.computed.alias("navigationCategory.noSubcategories"),
 
-  loadedAllItems: Em.computed.not("discoveryTopics.model.canLoadMore"),
+  loadedAllItems: Ember.computed.not("discoveryTopics.model.canLoadMore"),
 
   _showFooter: function() {
     this.set("application.showFooter", this.get("loadedAllItems"));
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 9952ffd01ad..aa522af0f1e 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -115,16 +115,16 @@ const controllerOpts = {
     );
   }.property("model.filter", "model.topics.length"),
 
-  hasTopics: Em.computed.gt("model.topics.length", 0),
-  allLoaded: Em.computed.empty("model.more_topics_url"),
+  hasTopics: Ember.computed.gt("model.topics.length", 0),
+  allLoaded: Ember.computed.empty("model.more_topics_url"),
   latest: endWith("model.filter", "latest"),
   new: endWith("model.filter", "new"),
-  top: Em.computed.notEmpty("period"),
-  yearly: Em.computed.equal("period", "yearly"),
-  quarterly: Em.computed.equal("period", "quarterly"),
-  monthly: Em.computed.equal("period", "monthly"),
-  weekly: Em.computed.equal("period", "weekly"),
-  daily: Em.computed.equal("period", "daily"),
+  top: Ember.computed.notEmpty("period"),
+  yearly: Ember.computed.equal("period", "yearly"),
+  quarterly: Ember.computed.equal("period", "quarterly"),
+  monthly: Ember.computed.equal("period", "monthly"),
+  weekly: Ember.computed.equal("period", "weekly"),
+  daily: Ember.computed.equal("period", "daily"),
 
   footerMessage: function() {
     if (!this.get("allLoaded")) {
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index 8ac67d52752..331dc5e6947 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -33,10 +33,10 @@ export default Ember.Controller.extend({
     return false;
   }.property(),
 
-  isNotFound: Em.computed.equal("thrown.status", 404),
-  isForbidden: Em.computed.equal("thrown.status", 403),
-  isServer: Em.computed.gte("thrown.status", 500),
-  isUnknown: Em.computed.none("isNetwork", "isServer"),
+  isNotFound: Ember.computed.equal("thrown.status", 404),
+  isForbidden: Ember.computed.equal("thrown.status", 403),
+  isServer: Ember.computed.gte("thrown.status", 500),
+  isUnknown: Ember.computed.none("isNetwork", "isServer"),
 
   // TODO
   // make ajax requests to /srv/status with exponential backoff
@@ -63,7 +63,7 @@ export default Ember.Controller.extend({
     }
   }.property("isNetwork", "isServer", "isUnknown"),
 
-  requestUrl: Em.computed.alias("thrown.requestedUrl"),
+  requestUrl: Ember.computed.alias("thrown.requestedUrl"),
 
   desc: function() {
     if (this.get("networkFixed")) {
@@ -100,7 +100,7 @@ export default Ember.Controller.extend({
     tryLoading: function() {
       this.set("loading", true);
       var self = this;
-      Em.run.schedule("afterRender", function() {
+      Ember.run.schedule("afterRender", function() {
         self.get("lastTransition").retry();
         self.set("loading", false);
       });
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index f2fdc877169..a6fbef909e6 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -56,7 +56,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       return flagsAvailable;
     } else {
       // flagging topic
-      let lookup = Em.Object.create();
+      let lookup = Ember.Object.create();
       let model = this.get("model");
       model.get("actions_summary").forEach(a => {
         a.flagTopic = model;
@@ -94,7 +94,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return true;
   }.property("selected.is_custom_flag", "message.length"),
 
-  submitDisabled: Em.computed.not("submitEnabled"),
+  submitDisabled: Ember.computed.not("submitEnabled"),
 
   // Staff accounts can "take action"
   @computed("flagTopic", "selected.is_custom_flag")
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index 0e1984ff49a..7822ad94b80 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -50,7 +50,7 @@ export default Ember.Controller.extend({
 
   @computed("q")
   hasAutofocus(q) {
-    return Em.isEmpty(q);
+    return Ember.isEmpty(q);
   },
 
   @computed("q")
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
index c3a70c3a875..6c46b360e3d 100644
--- a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
@@ -17,7 +17,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
       const model = this.get("model");
       const usernames = model.get("usernames");
-      if (Em.isEmpty(usernames)) {
+      if (Ember.isEmpty(usernames)) {
         return;
       }
       let promise;
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6
index e6c76c40aa7..b42a99f1ddf 100644
--- a/app/assets/javascripts/discourse/controllers/history.js.es6
+++ b/app/assets/javascripts/discourse/controllers/history.js.es6
@@ -31,10 +31,12 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  previousFeaturedLink: Em.computed.alias(
+  previousFeaturedLink: Ember.computed.alias(
     "model.featured_link_changes.previous"
   ),
-  currentFeaturedLink: Em.computed.alias("model.featured_link_changes.current"),
+  currentFeaturedLink: Ember.computed.alias(
+    "model.featured_link_changes.current"
+  ),
 
   previousTagChanges: customTagArray("model.tags_changes.previous"),
   currentTagChanges: customTagArray("model.tags_changes.current"),
@@ -188,9 +190,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  displayingInline: Em.computed.equal("viewMode", "inline"),
-  displayingSideBySide: Em.computed.equal("viewMode", "side_by_side"),
-  displayingSideBySideMarkdown: Em.computed.equal(
+  displayingInline: Ember.computed.equal("viewMode", "inline"),
+  displayingSideBySide: Ember.computed.equal("viewMode", "side_by_side"),
+  displayingSideBySideMarkdown: Ember.computed.equal(
     "viewMode",
     "side_by_side_markdown"
   ),
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index 2227d2c8c51..b6144dd7b0e 100644
--- a/app/assets/javascripts/discourse/controllers/invite.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invite.js.es6
@@ -120,13 +120,13 @@ export default Ember.Controller.extend(ModalFunctionality, {
   topicId: Ember.computed.alias("model.id"),
 
   // Is Private Topic? (i.e. visible only to specific group members)
-  isPrivateTopic: Em.computed.and(
+  isPrivateTopic: Ember.computed.and(
     "invitingToTopic",
     "model.category.read_restricted"
   ),
 
   // Is Private Message?
-  isMessage: Em.computed.equal("model.archetype", "private_message"),
+  isMessage: Ember.computed.equal("model.archetype", "private_message"),
 
   // Allow Existing Members? (username autocomplete)
   allowExistingMembers: Ember.computed.alias("invitingToTopic"),
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 9d09956ce8d..34ca1434443 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -32,7 +32,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   canLoginLocal: setting("enable_local_logins"),
   canLoginLocalWithEmail: setting("enable_local_logins_via_email"),
-  loginRequired: Em.computed.alias("application.loginRequired"),
+  loginRequired: Ember.computed.alias("application.loginRequired"),
   secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
 
   resetForm() {
@@ -67,7 +67,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return loggingIn ? "login.logging_in" : "login.title";
   },
 
-  loginDisabled: Em.computed.or("loggingIn", "loggedIn"),
+  loginDisabled: Ember.computed.or("loggingIn", "loggedIn"),
 
   @computed("loggingIn", "authenticate", "application.canSignUp")
   showSignupLink(loggingIn, authenticate, canSignUp) {
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
index da630bcee05..a54af35e2ac 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
@@ -1,8 +1,8 @@
 import NavigationDefaultController from "discourse/controllers/navigation/default";
 
 export default NavigationDefaultController.extend({
-  showingParentCategory: Em.computed.none("category.parentCategory"),
-  showingSubcategoryList: Em.computed.and(
+  showingParentCategory: Ember.computed.none("category.parentCategory"),
+  showingSubcategoryList: Ember.computed.and(
     "category.show_subcategory_list",
     "showingParentCategory"
   )
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 1e051c78274..293503978cb 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -28,8 +28,8 @@ export default Ember.Controller.extend(
 
     showAllAuthTokens: false,
 
-    cannotDeleteAccount: Em.computed.not("currentUser.can_delete_account"),
-    deleteDisabled: Em.computed.or(
+    cannotDeleteAccount: Ember.computed.not("currentUser.can_delete_account"),
+    deleteDisabled: Ember.computed.or(
       "model.isSaving",
       "deleting",
       "cannotDeleteAccount"
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
index 10ca794fba1..90936b5284f 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
@@ -10,8 +10,8 @@ export default Ember.Controller.extend({
   success: false,
   newEmail: null,
 
-  newEmailEmpty: Em.computed.empty("newEmail"),
-  saveDisabled: Em.computed.or(
+  newEmailEmpty: Ember.computed.empty("newEmail"),
+  saveDisabled: Ember.computed.or(
     "saving",
     "newEmailEmpty",
     "taken",
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
index dacc3a1ab75..a6d1c99ad5b 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
@@ -15,8 +15,8 @@ export default Ember.Controller.extend({
 
   maxLength: setting("max_username_length"),
   minLength: setting("min_username_length"),
-  newUsernameEmpty: Em.computed.empty("newUsername"),
-  saveDisabled: Em.computed.or(
+  newUsernameEmpty: Ember.computed.empty("newUsername"),
+  saveDisabled: Ember.computed.or(
     "saving",
     "newUsernameEmpty",
     "taken",
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 8238d5fad9f..82fd514e16a 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -5,7 +5,7 @@ import { userPath } from "discourse/lib/url";
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
 
-  showLoginButton: Em.computed.equal("model.path", "login"),
+  showLoginButton: Ember.computed.equal("model.path", "login"),
 
   @computed("model.path")
   bodyClass: path => `static-${path}`,
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index ebbcd681c53..0b92cd9a485 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -889,7 +889,7 @@ export default Ember.Controller.extend(bufferedProperty("model"), {
       composerController
         .open(options)
         .then(() => {
-          return Em.isEmpty(quotedText) ? "" : quotedText;
+          return Ember.isEmpty(quotedText) ? "" : quotedText;
         })
         .then(q => {
           const postUrl = `${location.protocol}//${location.host}${post.get(
@@ -1243,7 +1243,7 @@ export default Ember.Controller.extend(bufferedProperty("model"), {
             if (callback) {
               callback(this, data);
             } else {
-              Em.Logger.warn("unknown topic bus message type", data);
+              Ember.Logger.warn("unknown topic bus message type", data);
             }
           }
         }
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
index de8d645ca46..9d6c3c4c4df 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -35,7 +35,7 @@ export default Ember.Controller.extend({
     });
   }, 250).observes("searchTerm"),
 
-  inviteRedeemed: Em.computed.equal("filter", "redeemed"),
+  inviteRedeemed: Ember.computed.equal("filter", "redeemed"),
 
   showBulkActionButtons: function() {
     return (
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index 97a74ea36be..6091a569c06 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -7,11 +7,11 @@ export default Ember.Controller.extend({
   user: Ember.inject.controller(),
 
   pmView: false,
-  viewingSelf: Em.computed.alias("user.viewingSelf"),
-  isGroup: Em.computed.equal("pmView", "groups"),
-  currentPath: Em.computed.alias("application.currentPath"),
-  selected: Em.computed.alias("userTopicsList.selected"),
-  bulkSelectEnabled: Em.computed.alias("userTopicsList.bulkSelectEnabled"),
+  viewingSelf: Ember.computed.alias("user.viewingSelf"),
+  isGroup: Ember.computed.equal("pmView", "groups"),
+  currentPath: Ember.computed.alias("application.currentPath"),
+  selected: Ember.computed.alias("userTopicsList.selected"),
+  bulkSelectEnabled: Ember.computed.alias("userTopicsList.bulkSelectEnabled"),
   showToggleBulkSelect: true,
   pmTaggingEnabled: Ember.computed.alias("site.can_tag_pms"),
   tagId: null,
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 80162bff88c..e0b31bd1727 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -53,7 +53,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
     return !suspended || isStaff;
   },
 
-  linkWebsite: Em.computed.not("model.isBasic"),
+  linkWebsite: Ember.computed.not("model.isBasic"),
 
   @computed("model.trust_level")
   removeNoFollow(trustLevel) {
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index bf3df520f5a..3b62c82170d 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -2,7 +2,7 @@ import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
-var get = Em.get,
+var get = Ember.get,
   escapeExpression = Handlebars.Utils.escapeExpression;
 
 let _renderer = defaultCategoryLinkRenderer;
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index 60e8137b085..ff09e4e2fcd 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -30,9 +30,9 @@ function renderAvatar(user, options) {
   options = options || {};
 
   if (user) {
-    const name = Em.get(user, options.namePath || "name");
-    const username = Em.get(user, options.usernamePath || "username");
-    const avatarTemplate = Em.get(
+    const name = Ember.get(user, options.namePath || "name");
+    const username = Ember.get(user, options.usernamePath || "username");
+    const avatarTemplate = Ember.get(
       user,
       options.avatarTemplatePath || "avatar_template"
     );
@@ -46,11 +46,11 @@ function renderAvatar(user, options) {
     let title = options.title;
     if (!title && !options.ignoreTitle) {
       // first try to get a title
-      title = Em.get(user, "title");
+      title = Ember.get(user, "title");
       // if there was no title provided
       if (!title) {
         // try to retrieve a description
-        const description = Em.get(user, "description");
+        const description = Ember.get(user, "description");
         // if a description has been provided
         if (description && description.length > 0) {
           // preprend the username before the description
@@ -61,7 +61,7 @@ function renderAvatar(user, options) {
 
     return avatarImg({
       size: options.imageSize,
-      extraClasses: Em.get(user, "extras") || options.extraClasses,
+      extraClasses: Ember.get(user, "extras") || options.extraClasses,
       title: title || displayName,
       avatarTemplate: avatarTemplate
     });
diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js.es6
index 61298501da0..c8b422c9378 100644
--- a/app/assets/javascripts/discourse/initializers/banner.js.es6
+++ b/app/assets/javascripts/discourse/initializers/banner.js.es6
@@ -5,7 +5,7 @@ export default {
   after: "message-bus",
 
   initialize(container) {
-    const banner = Em.Object.create(PreloadStore.get("banner")),
+    const banner = Ember.Object.create(PreloadStore.get("banner")),
       site = container.lookup("site:main");
 
     site.set("banner", banner);
@@ -16,7 +16,7 @@ export default {
     }
 
     messageBus.subscribe("/site/banner", function(ban) {
-      site.set("banner", Em.Object.create(ban));
+      site.set("banner", Ember.Object.create(ban));
     });
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index 96ea1ef8d01..651f23e130e 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -82,7 +82,7 @@ export default {
               }
               oldNotifications.insertAt(
                 insertPosition,
-                Em.Object.create(lastNotification)
+                Ember.Object.create(lastNotification)
               );
             }
 
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index 7c01519388b..c70d80d5150 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -8,7 +8,7 @@ import addonFmt from "ember-addons/fmt";
   @return {Function} computedProperty function
 **/
 export function propertyEqual(p1, p2) {
-  return Em.computed(function() {
+  return Ember.computed(function() {
     return this.get(p1) === this.get(p2);
   }).property(p1, p2);
 }
@@ -22,7 +22,7 @@ export function propertyEqual(p1, p2) {
   @return {Function} computedProperty function
 **/
 export function propertyNotEqual(p1, p2) {
-  return Em.computed(function() {
+  return Ember.computed(function() {
     return this.get(p1) !== this.get(p2);
   }).property(p1, p2);
 }
@@ -57,7 +57,7 @@ export function i18n(...args) {
 
 /**
   Uses an Ember String `fmt` call to format a string. See:
-  http://emberjs.com/api/classes/Em.String.html#method_fmt
+  http://emberjs.com/api/classes/Ember.String.html#method_fmt
 
   @method fmt
   @params {String} properties* to format
@@ -100,7 +100,7 @@ export function url(...args) {
 export function endWith() {
   const args = Array.prototype.slice.call(arguments, 0);
   const substring = args.pop();
-  const computed = Em.computed(function() {
+  const computed = Ember.computed(function() {
     const self = this;
     return _.all(
       args.map(function(a) {
@@ -124,7 +124,7 @@ export function endWith() {
   @param {String} name of site setting
 **/
 export function setting(name) {
-  return Em.computed(function() {
+  return Ember.computed(function() {
     return Discourse.SiteSettings[name];
   }).property();
 }
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 5b26fce0ebc..41b86bc30e2 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -26,14 +26,14 @@ function init(messageBus, appEvents) {
   try {
     keyValueStore.getItem(focusTrackerKey);
   } catch (e) {
-    Em.Logger.info(
+    Ember.Logger.info(
       "Discourse desktop notifications are disabled - localStorage denied."
     );
     return;
   }
 
   if (!("Notification" in window)) {
-    Em.Logger.info(
+    Ember.Logger.info(
       "Discourse desktop notifications are disabled - not supported by browser"
     );
     return;
@@ -47,7 +47,7 @@ function init(messageBus, appEvents) {
       return;
     }
   } catch (e) {
-    Em.Logger.warn(
+    Ember.Logger.warn(
       "Unexpected error, Notification is defined on window but not a responding correctly " +
         e
     );
@@ -58,7 +58,7 @@ function init(messageBus, appEvents) {
     // Preliminary checks passed, continue with setup
     setupNotifications(appEvents);
   } catch (e) {
-    Em.Logger.error(e);
+    Ember.Logger.error(e);
   }
 }
 
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6
index c886eb00d9a..752776a9353 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -97,7 +97,7 @@ export function translateResults(results, opts) {
     !results.categories.length
   );
 
-  return noResults ? null : Em.Object.create(results);
+  return noResults ? null : Ember.Object.create(results);
 }
 
 export function searchForTerm(term, opts) {
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index d26dffa7b90..827ef44410f 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -176,7 +176,7 @@ const DiscourseURL = Ember.Object.extend({
   routeTo(path, opts) {
     opts = opts || {};
 
-    if (Em.isEmpty(path)) {
+    if (Ember.isEmpty(path)) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6 b/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
index 48244d894d9..671de5801b5 100644
--- a/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
@@ -10,7 +10,7 @@ export default Ember.Mixin.create({
       return e.get("badge.name");
     });
     items.unshiftObject(
-      Em.Object.create({
+      Ember.Object.create({
         badge: Badge.create({ name: I18n.t("badges.none") })
       })
     );
@@ -36,5 +36,5 @@ export default Ember.Mixin.create({
     return selectedUserBadge;
   }.property("selectedUserBadgeId"),
 
-  disableSave: Em.computed.alias("saving")
+  disableSave: Ember.computed.alias("saving")
 });
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6 b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
index 076df29ee98..8630c297000 100644
--- a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
+++ b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
@@ -2,7 +2,7 @@
 export function bufferedProperty(property) {
   const mixin = {
     buffered: function() {
-      return Em.ObjectProxy.extend(BufferedProxy).create({
+      return Ember.ObjectProxy.extend(BufferedProxy).create({
         content: this.get(property)
       });
     }.property(property),
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
index 1b99e1f8124..8db10c5d22b 100644
--- a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
+++ b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
@@ -4,7 +4,7 @@ export default Ember.Mixin.create({
   bulkSelectEnabled: false,
   selected: null,
 
-  canBulkSelect: Em.computed.alias("currentUser.staff"),
+  canBulkSelect: Ember.computed.alias("currentUser.staff"),
 
   resetSelected: function() {
     this.set("selected", []);
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index 9e74d03a73f..b9d1142fa20 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -3,12 +3,12 @@ import { propertyEqual, setting } from "discourse/lib/computed";
 export default Ember.Mixin.create({
   isCurrentUser: propertyEqual("model.id", "currentUser.id"),
   showEmailOnProfile: setting("show_email_on_profile"),
-  canStaffCheckEmails: Em.computed.and(
+  canStaffCheckEmails: Ember.computed.and(
     "showEmailOnProfile",
     "currentUser.staff"
   ),
-  canAdminCheckEmails: Em.computed.alias("currentUser.admin"),
-  canCheckEmails: Em.computed.or(
+  canAdminCheckEmails: Ember.computed.alias("currentUser.admin"),
+  canCheckEmails: Ember.computed.or(
     "isCurrentUser",
     "canStaffCheckEmails",
     "canAdminCheckEmails"
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index 9bb4f0ec6a9..cc485333151 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -4,12 +4,12 @@ import {
 } from "discourse/lib/utilities";
 import getUrl from "discourse-common/lib/get-url";
 
-export default Em.Mixin.create({
+export default Ember.Mixin.create({
   uploading: false,
   uploadProgress: 0,
 
   uploadDone() {
-    Em.warn("You should implement `uploadDone`");
+    Ember.warn("You should implement `uploadDone`");
   },
 
   validateUploadedFilesOptions() {
diff --git a/app/assets/javascripts/discourse/models/archetype.js.es6 b/app/assets/javascripts/discourse/models/archetype.js.es6
index 025909ef823..9ba6e6744b4 100644
--- a/app/assets/javascripts/discourse/models/archetype.js.es6
+++ b/app/assets/javascripts/discourse/models/archetype.js.es6
@@ -2,7 +2,7 @@ import { propertyEqual } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
 
 export default RestModel.extend({
-  hasOptions: Em.computed.gt("options.length", 0),
+  hasOptions: Ember.computed.gt("options.length", 0),
   isDefault: propertyEqual("id", "site.default_archetype"),
-  notDefault: Em.computed.not("isDefault")
+  notDefault: Ember.computed.not("isDefault")
 });
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js.es6
index 197d6e7aef6..0658bd631f6 100644
--- a/app/assets/javascripts/discourse/models/badge.js.es6
+++ b/app/assets/javascripts/discourse/models/badge.js.es6
@@ -3,7 +3,7 @@ import BadgeGrouping from "discourse/models/badge-grouping";
 import RestModel from "discourse/models/rest";
 
 const Badge = RestModel.extend({
-  newBadge: Em.computed.none("id"),
+  newBadge: Ember.computed.none("id"),
 
   url: function() {
     return Discourse.getURL(`/badges/${this.get("id")}/${this.get("slug")}`);
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 7c7d92bd9c9..c8531986d40 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -160,7 +160,7 @@ const Category = RestModel.extend({
 
   @computed
   permissions() {
-    return Em.A([
+    return Ember.A([
       { group_name: "everyone", permission: PermissionType.create({ id: 1 }) },
       { group_name: "admins", permission: PermissionType.create({ id: 2 }) },
       { group_name: "crap", permission: PermissionType.create({ id: 3 }) }
@@ -219,15 +219,15 @@ Category.reopenClass({
   slugFor(category, separator = "/") {
     if (!category) return "";
 
-    const parentCategory = Em.get(category, "parentCategory");
+    const parentCategory = Ember.get(category, "parentCategory");
     let result = "";
 
     if (parentCategory) {
       result = Category.slugFor(parentCategory) + separator;
     }
 
-    const id = Em.get(category, "id"),
-      slug = Em.get(category, "slug");
+    const id = Ember.get(category, "id"),
+      slug = Ember.get(category, "slug");
 
     return !slug || slug.trim().length === 0
       ? `${result}${id}-category`
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 230cbffecf8..69a40d35f9e 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -117,10 +117,10 @@ const Composer = RestModel.extend({
       : null;
   },
 
-  creatingTopic: Em.computed.equal("action", CREATE_TOPIC),
-  creatingSharedDraft: Em.computed.equal("action", CREATE_SHARED_DRAFT),
-  creatingPrivateMessage: Em.computed.equal("action", PRIVATE_MESSAGE),
-  notCreatingPrivateMessage: Em.computed.not("creatingPrivateMessage"),
+  creatingTopic: Ember.computed.equal("action", CREATE_TOPIC),
+  creatingSharedDraft: Ember.computed.equal("action", CREATE_SHARED_DRAFT),
+  creatingPrivateMessage: Ember.computed.equal("action", PRIVATE_MESSAGE),
+  notCreatingPrivateMessage: Ember.computed.not("creatingPrivateMessage"),
 
   @computed("privateMessage", "archetype.hasOptions")
   showCategoryChooser(isPrivateMessage, hasOptions) {
@@ -136,17 +136,17 @@ const Composer = RestModel.extend({
     );
   },
 
-  topicFirstPost: Em.computed.or("creatingTopic", "editingFirstPost"),
+  topicFirstPost: Ember.computed.or("creatingTopic", "editingFirstPost"),
 
   @computed("action")
   editingPost: isEdit,
 
-  replyingToTopic: Em.computed.equal("action", REPLY),
+  replyingToTopic: Ember.computed.equal("action", REPLY),
 
-  viewOpen: Em.computed.equal("composeState", OPEN),
-  viewDraft: Em.computed.equal("composeState", DRAFT),
-  viewFullscreen: Em.computed.equal("composeState", FULLSCREEN),
-  viewOpenOrFullscreen: Em.computed.or("viewOpen", "viewFullscreen"),
+  viewOpen: Ember.computed.equal("composeState", OPEN),
+  viewDraft: Ember.computed.equal("composeState", DRAFT),
+  viewFullscreen: Ember.computed.equal("composeState", FULLSCREEN),
+  viewOpenOrFullscreen: Ember.computed.or("viewOpen", "viewFullscreen"),
 
   composeStateChanged: function() {
     let oldOpen = this.get("composerOpened"),
@@ -186,7 +186,7 @@ const Composer = RestModel.extend({
   }.property("archetypeId"),
 
   archetypeChanged: function() {
-    return this.set("metaData", Em.Object.create());
+    return this.set("metaData", Ember.Object.create());
   }.observes("archetype"),
 
   // view detected user is typing
@@ -199,16 +199,19 @@ const Composer = RestModel.extend({
     { leading: false, trailing: true }
   ),
 
-  editingFirstPost: Em.computed.and("editingPost", "post.firstPost"),
+  editingFirstPost: Ember.computed.and("editingPost", "post.firstPost"),
 
-  canEditTitle: Em.computed.or(
+  canEditTitle: Ember.computed.or(
     "creatingTopic",
     "creatingPrivateMessage",
     "editingFirstPost",
     "creatingSharedDraft"
   ),
 
-  canCategorize: Em.computed.and("canEditTitle", "notCreatingPrivateMessage"),
+  canCategorize: Ember.computed.and(
+    "canEditTitle",
+    "notCreatingPrivateMessage"
+  ),
 
   @computed("canEditTitle", "creatingPrivateMessage", "categoryId")
   canEditTopicFeaturedLink(canEditTitle, creatingPrivateMessage, categoryId) {
@@ -402,7 +405,7 @@ const Composer = RestModel.extend({
 
   hasMetaData: function() {
     const metaData = this.get("metaData");
-    return metaData ? Em.isEmpty(Em.keys(this.get("metaData"))) : false;
+    return metaData ? Ember.isEmpty(Ember.keys(this.get("metaData"))) : false;
   }.property("metaData"),
 
   /**
@@ -601,7 +604,7 @@ const Composer = RestModel.extend({
     if (!opts) opts = {};
     this.set("loading", false);
 
-    const replyBlank = Em.isEmpty(this.get("reply"));
+    const replyBlank = Ember.isEmpty(this.get("reply"));
 
     const composer = this;
     if (
@@ -647,7 +650,7 @@ const Composer = RestModel.extend({
 
     this.setProperties({
       archetypeId: opts.archetypeId || this.site.get("default_archetype"),
-      metaData: opts.metaData ? Em.Object.create(opts.metaData) : null,
+      metaData: opts.metaData ? Ember.Object.create(opts.metaData) : null,
       reply: opts.reply || this.get("reply") || ""
     });
 
@@ -990,7 +993,7 @@ const Composer = RestModel.extend({
     });
 
     if (this._clearingStatus) {
-      Em.run.cancel(this._clearingStatus);
+      Ember.run.cancel(this._clearingStatus);
       this._clearingStatus = null;
     }
 
@@ -1041,7 +1044,7 @@ const Composer = RestModel.extend({
     const self = this;
 
     if (draftStatus && !this._clearingStatus) {
-      this._clearingStatus = Em.run.later(
+      this._clearingStatus = Ember.run.later(
         this,
         function() {
           self.set("draftStatus", null);
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 1793be95240..c000b109a58 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -20,7 +20,7 @@ const Group = RestModel.extend({
 
   @computed("automatic_membership_email_domains")
   emailDomains(value) {
-    return Em.isEmpty(value) ? "" : value;
+    return Ember.isEmpty(value) ? "" : value;
   },
 
   @computed("automatic")
@@ -37,7 +37,7 @@ const Group = RestModel.extend({
   },
 
   findMembers(params) {
-    if (Em.isEmpty(this.get("name"))) {
+    if (Ember.isEmpty(this.get("name"))) {
       return;
     }
 
@@ -257,7 +257,7 @@ const Group = RestModel.extend({
           p.user = User.create(p.user);
           p.topic = Topic.create(p.topic);
           p.category = Category.findById(p.category_id);
-          return Em.Object.create(p);
+          return Ember.Object.create(p);
         });
       }
     );
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js.es6
index 1f2ad32ad06..6775f9d10ad 100644
--- a/app/assets/javascripts/discourse/models/invite.js.es6
+++ b/app/assets/javascripts/discourse/models/invite.js.es6
@@ -35,14 +35,14 @@ Invite.reopenClass({
 
   findInvitedBy(user, filter, search, offset) {
     if (!user) {
-      return Em.RSVP.resolve();
+      return Ember.RSVP.resolve();
     }
 
     var data = {};
-    if (!Em.isNone(filter)) {
+    if (!Ember.isNone(filter)) {
       data.filter = filter;
     }
-    if (!Em.isNone(search)) {
+    if (!Ember.isNone(search)) {
       data.search = search;
     }
     data.offset = offset || 0;
@@ -54,17 +54,17 @@ Invite.reopenClass({
         return Invite.create(i);
       });
 
-      return Em.Object.create(result);
+      return Ember.Object.create(result);
     });
   },
 
   findInvitedCount(user) {
     if (!user) {
-      return Em.RSVP.resolve();
+      return Ember.RSVP.resolve();
     }
     return ajax(
       userPath(user.get("username_lower") + "/invited_count.json")
-    ).then(result => Em.Object.create(result.counts));
+    ).then(result => Ember.Object.create(result.counts));
   },
 
   reinviteAll() {
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js.es6 b/app/assets/javascripts/discourse/models/post-action-type.js.es6
index 52799d48a87..fc83f6282a5 100644
--- a/app/assets/javascripts/discourse/models/post-action-type.js.es6
+++ b/app/assets/javascripts/discourse/models/post-action-type.js.es6
@@ -3,5 +3,5 @@ import RestModel from "discourse/models/rest";
 export const MAX_MESSAGE_LENGTH = 500;
 
 export default RestModel.extend({
-  notCustomFlag: Em.computed.not("is_custom_flag")
+  notCustomFlag: Ember.computed.not("is_custom_flag")
 });
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 694681431e7..8da229cfb27 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -28,13 +28,13 @@ const Post = RestModel.extend({
     }
   }.property("url"),
 
-  new_user: Em.computed.equal("trust_level", 0),
-  firstPost: Em.computed.equal("post_number", 1),
+  new_user: Ember.computed.equal("trust_level", 0),
+  firstPost: Ember.computed.equal("post_number", 1),
 
   // Posts can show up as deleted if the topic is deleted
-  deletedViaTopic: Em.computed.and("firstPost", "topic.deleted_at"),
-  deleted: Em.computed.or("deleted_at", "deletedViaTopic"),
-  notDeleted: Em.computed.not("deleted"),
+  deletedViaTopic: Ember.computed.and("firstPost", "topic.deleted_at"),
+  deleted: Ember.computed.or("deleted_at", "deletedViaTopic"),
+  notDeleted: Ember.computed.not("deleted"),
 
   showName: function() {
     const name = this.get("name");
@@ -226,7 +226,7 @@ const Post = RestModel.extend({
       });
     }
 
-    return promise || Em.RSVP.Promise.resolve();
+    return promise || Ember.RSVP.Promise.resolve();
   },
 
   /**
@@ -280,7 +280,7 @@ const Post = RestModel.extend({
         if (key === "reply_to_user" && value && oldValue) {
           skip =
             value.username === oldValue.username ||
-            Em.get(value, "username") === Em.get(oldValue, "username");
+            Ember.get(value, "username") === Ember.get(oldValue, "username");
         }
 
         if (!skip) {
@@ -347,7 +347,7 @@ const Post = RestModel.extend({
 Post.reopenClass({
   munge(json) {
     if (json.actions_summary) {
-      const lookup = Em.Object.create();
+      const lookup = Ember.Object.create();
 
       // this area should be optimized, it is creating way too many objects per post
       json.actions_summary = json.actions_summary.map(function(a) {
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 70ec3bbc9a4..82733e89e6c 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -6,7 +6,7 @@ import RestModel from "discourse/models/rest";
 import PreloadStore from "preload-store";
 
 const Site = RestModel.extend({
-  isReadOnly: Em.computed.alias("is_readonly"),
+  isReadOnly: Ember.computed.alias("is_readonly"),
 
   @computed("notification_types")
   notificationLookup(notificationTypes) {
@@ -87,7 +87,7 @@ const Site = RestModel.extend({
 
   updateCategory(newCategory) {
     const categories = this.get("categories");
-    const categoryId = Em.get(newCategory, "id");
+    const categoryId = Ember.get(newCategory, "id");
     const existingCategory = categories.findBy("id", categoryId);
 
     // Don't update null permissions
@@ -159,7 +159,7 @@ Site.reopenClass(Singleton, {
     }
 
     if (result.post_action_types) {
-      result.postActionByIdLookup = Em.Object.create();
+      result.postActionByIdLookup = Ember.Object.create();
       result.post_action_types = result.post_action_types.map(p => {
         const actionType = PostActionType.create(p);
         result.postActionByIdLookup.set("action" + p.id, actionType);
@@ -168,7 +168,7 @@ Site.reopenClass(Singleton, {
     }
 
     if (result.topic_flag_types) {
-      result.topicFlagByIdLookup = Em.Object.create();
+      result.topicFlagByIdLookup = Ember.Object.create();
       result.topic_flag_types = result.topic_flag_types.map(p => {
         const actionType = PostActionType.create(p);
         result.topicFlagByIdLookup.set("action" + p.id, actionType);
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index edd5e9b2656..48964766ec2 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -20,7 +20,7 @@ function displayCategoryInList(site, category) {
 }
 
 const TopicList = RestModel.extend({
-  canLoadMore: Em.computed.notEmpty("more_topics_url"),
+  canLoadMore: Ember.computed.notEmpty("more_topics_url"),
 
   forEachNew(topics, callback) {
     const topicIds = [];
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
index d29f1c83be6..e2361e23d46 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -218,7 +218,7 @@ const TopicTrackingState = Discourse.Model.extend({
 
   // If we have a cached topic list, we can update it from our tracking information.
   updateTopics(topics) {
-    if (Em.isEmpty(topics)) {
+    if (Ember.isEmpty(topics)) {
       return;
     }
 
@@ -392,8 +392,8 @@ const TopicTrackingState = Discourse.Model.extend({
       );
     }
 
-    let categoryId = category ? Em.get(category, "id") : null;
-    let categoryName = category ? Em.get(category, "name") : null;
+    let categoryId = category ? Ember.get(category, "id") : null;
+    let categoryName = category ? Ember.get(category, "name") : null;
 
     if (name === "new") {
       return this.countNew(categoryId);
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index a02e9c7a7ad..18e1ede1c10 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -163,8 +163,8 @@ const Topic = RestModel.extend({
     });
   }.property(),
 
-  invisible: Em.computed.not("visible"),
-  deleted: Em.computed.notEmpty("deleted_at"),
+  invisible: Ember.computed.not("visible"),
+  deleted: Ember.computed.notEmpty("deleted_at"),
 
   searchContext: function() {
     return { type: "topic", id: this.get("id") };
@@ -297,8 +297,8 @@ const Topic = RestModel.extend({
     );
   }.property("archetype"),
 
-  isPrivateMessage: Em.computed.equal("archetype", "private_message"),
-  isBanner: Em.computed.equal("archetype", "banner"),
+  isPrivateMessage: Ember.computed.equal("archetype", "private_message"),
+  isBanner: Ember.computed.equal("archetype", "banner"),
 
   toggleStatus(property) {
     this.toggleProperty(property);
@@ -344,7 +344,7 @@ const Topic = RestModel.extend({
     this.set("bookmarking", true);
 
     const stream = this.get("postStream");
-    const posts = Em.get(stream, "posts");
+    const posts = Ember.get(stream, "posts");
     const firstPost =
       posts && posts[0] && posts[0].get("post_number") === 1 && posts[0];
     const bookmark = !this.get("bookmarked");
@@ -512,7 +512,7 @@ const Topic = RestModel.extend({
     return emojiUnescape(excerpt);
   },
 
-  hasExcerpt: Em.computed.notEmpty("excerpt"),
+  hasExcerpt: Ember.computed.notEmpty("excerpt"),
 
   excerptTruncated: function() {
     const e = this.get("excerpt");
@@ -520,7 +520,7 @@ const Topic = RestModel.extend({
   }.property("excerpt"),
 
   readLastPost: propertyEqual("last_read_post_number", "highest_post_number"),
-  canClearPin: Em.computed.and("pinned", "readLastPost"),
+  canClearPin: Ember.computed.and("pinned", "readLastPost"),
 
   archiveMessage() {
     this.set("archiving", true);
@@ -598,7 +598,7 @@ Topic.reopenClass({
 
   createActionSummary(result) {
     if (result.actions_summary) {
-      const lookup = Em.Object.create();
+      const lookup = Ember.Object.create();
       result.actions_summary = result.actions_summary.map(function(a) {
         a.post = result;
         a.actionType = Discourse.Site.current().postActionTypeById(a.id);
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index a60f5898235..4bb710d6630 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -118,22 +118,22 @@ const UserAction = RestModel.extend({
     );
   },
 
-  replyType: Em.computed.equal("action_type", UserActionTypes.replies),
-  postType: Em.computed.equal("action_type", UserActionTypes.posts),
-  topicType: Em.computed.equal("action_type", UserActionTypes.topics),
-  bookmarkType: Em.computed.equal("action_type", UserActionTypes.bookmarks),
-  messageSentType: Em.computed.equal(
+  replyType: Ember.computed.equal("action_type", UserActionTypes.replies),
+  postType: Ember.computed.equal("action_type", UserActionTypes.posts),
+  topicType: Ember.computed.equal("action_type", UserActionTypes.topics),
+  bookmarkType: Ember.computed.equal("action_type", UserActionTypes.bookmarks),
+  messageSentType: Ember.computed.equal(
     "action_type",
     UserActionTypes.messages_sent
   ),
-  messageReceivedType: Em.computed.equal(
+  messageReceivedType: Ember.computed.equal(
     "action_type",
     UserActionTypes.messages_received
   ),
-  mentionType: Em.computed.equal("action_type", UserActionTypes.mentions),
-  isPM: Em.computed.or("messageSentType", "messageReceivedType"),
-  postReplyType: Em.computed.or("postType", "replyType"),
-  removableBookmark: Em.computed.and("bookmarkType", "sameUser"),
+  mentionType: Ember.computed.equal("action_type", UserActionTypes.mentions),
+  isPM: Ember.computed.or("messageSentType", "messageReceivedType"),
+  postReplyType: Ember.computed.or("postType", "replyType"),
+  removableBookmark: Ember.computed.and("bookmarkType", "sameUser"),
 
   addChild(action) {
     let groups = this.get("childGroups");
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js.es6
index fb361bc99ce..d746efc2b80 100644
--- a/app/assets/javascripts/discourse/models/user-badge.js.es6
+++ b/app/assets/javascripts/discourse/models/user-badge.js.es6
@@ -94,7 +94,7 @@ UserBadge.reopenClass({
   **/
   findByUsername: function(username, options) {
     if (!username) {
-      return Em.RSVP.resolve([]);
+      return Ember.RSVP.resolve([]);
     }
     var url = "/user-badges/" + username + ".json";
     if (options && options.grouped) {
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
index b6d82f8a33e..0b18349d578 100644
--- a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
@@ -70,7 +70,7 @@ export default RestModel.extend({
           this.set("noContentHelp", result.no_results_help);
         }
         if (result && result.drafts) {
-          const copy = Em.A();
+          const copy = Ember.A();
           result.drafts.forEach(draft => {
             let draftData = JSON.parse(draft.data);
             draft.post_number = draftData.postId || null;
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js.es6
index efbb09124a8..3f1650c3002 100644
--- a/app/assets/javascripts/discourse/models/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-stream.js.es6
@@ -93,7 +93,7 @@ export default RestModel.extend({
           self.set("noContentHelp", result.no_results_help);
         }
         if (result && result.user_actions) {
-          const copy = Em.A();
+          const copy = Ember.A();
           result.user_actions.forEach(function(action) {
             action.title = emojiUnescape(
               Handlebars.Utils.escapeExpression(action.title)
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 95bf5de1223..9b7d28e1ac4 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -26,9 +26,9 @@ export const SECOND_FACTOR_METHODS = { TOTP: 1, BACKUP_CODE: 2 };
 const isForever = dt => moment().diff(dt, "years") < -500;
 
 const User = RestModel.extend({
-  hasPMs: Em.computed.gt("private_messages_stats.all", 0),
-  hasStartedPMs: Em.computed.gt("private_messages_stats.mine", 0),
-  hasUnreadPMs: Em.computed.gt("private_messages_stats.unread", 0),
+  hasPMs: Ember.computed.gt("private_messages_stats.all", 0),
+  hasStartedPMs: Ember.computed.gt("private_messages_stats.mine", 0),
+  hasUnreadPMs: Ember.computed.gt("private_messages_stats.unread", 0),
 
   redirected_to_top: {
     reason: null
@@ -54,7 +54,7 @@ const User = RestModel.extend({
     return UserDraftsStream.create({ user: this });
   },
 
-  staff: Em.computed.or("admin", "moderator"),
+  staff: Ember.computed.or("admin", "moderator"),
 
   destroySession() {
     return ajax(`/session/${this.get("username")}`, { type: "DELETE" });
@@ -80,7 +80,7 @@ const User = RestModel.extend({
   @computed("profile_background")
   profileBackground(bgUrl) {
     if (
-      Em.isEmpty(bgUrl) ||
+      Ember.isEmpty(bgUrl) ||
       !Discourse.SiteSettings.allow_profile_backgrounds
     ) {
       return "".htmlSafe();
@@ -103,7 +103,7 @@ const User = RestModel.extend({
     const keys = this.get("user_api_keys");
     if (keys) {
       return keys.map(raw => {
-        let obj = Em.Object.create(raw);
+        let obj = Ember.Object.create(raw);
 
         obj.revoke = () => {
           this.revokeApiKey(obj);
@@ -190,10 +190,10 @@ const User = RestModel.extend({
     );
   },
 
-  isBasic: Em.computed.equal("trust_level", 0),
-  isLeader: Em.computed.equal("trust_level", 3),
-  isElder: Em.computed.equal("trust_level", 4),
-  canManageTopic: Em.computed.or("staff", "isElder"),
+  isBasic: Ember.computed.equal("trust_level", 0),
+  isLeader: Ember.computed.equal("trust_level", 3),
+  isElder: Ember.computed.equal("trust_level", 4),
+  canManageTopic: Ember.computed.or("staff", "isElder"),
 
   @computed("previous_visit_at")
   previousVisitAt(previous_visit_at) {
@@ -337,7 +337,7 @@ const User = RestModel.extend({
     })
       .then(result => {
         this.set("bio_excerpt", result.user.bio_excerpt);
-        const userProps = Em.getProperties(
+        const userProps = Ember.getProperties(
           this.get("user_option"),
           "enable_quoting",
           "external_links_in_new_tab",
@@ -467,7 +467,7 @@ const User = RestModel.extend({
     return PreloadStore.getAndRemove(`user_${user.get("username")}`, () => {
       return ajax(userPath(`${user.get("username")}.json`), { data: options });
     }).then(json => {
-      if (!Em.isEmpty(json.user.stats)) {
+      if (!Ember.isEmpty(json.user.stats)) {
         json.user.stats = Discourse.User.groupStats(
           json.user.stats.map(s => {
             if (s.count) s.count = parseInt(s.count, 10);
@@ -476,7 +476,7 @@ const User = RestModel.extend({
         );
       }
 
-      if (!Em.isEmpty(json.user.groups)) {
+      if (!Ember.isEmpty(json.user.groups)) {
         const groups = [];
 
         for (let i = 0; i < json.user.groups.length; i++) {
@@ -492,7 +492,7 @@ const User = RestModel.extend({
         json.user.invited_by = Discourse.User.create(json.user.invited_by);
       }
 
-      if (!Em.isEmpty(json.user.featured_user_badge_ids)) {
+      if (!Ember.isEmpty(json.user.featured_user_badge_ids)) {
         const userBadgesMap = {};
         UserBadge.createFromJson(json).forEach(userBadge => {
           userBadgesMap[userBadge.get("id")] = userBadge;
@@ -750,7 +750,7 @@ User.reopenClass(Singleton, {
       responses.set("count", responses.get("count") + stat.get("count"));
     });
 
-    const result = Em.A();
+    const result = Ember.A();
     result.pushObjects(stats.rejectBy("isResponse"));
 
     let insertAt = 0;
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 05777861911..451ceceec68 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -207,7 +207,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
 
   activate() {
     this._super();
-    Em.run.next(function() {
+    Ember.run.next(function() {
       // Support for callbacks once the application has activated
       ApplicationRoute.trigger("activate");
     });
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index 4d9d3dd6ade..7f2d10d24c7 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -49,7 +49,7 @@ export default (filterArg, params) => {
       }
 
       this._setupNavigation(model.category);
-      return Em.RSVP.all([
+      return Ember.RSVP.all([
         this._createSubcategoryList(model.category),
         this._retrieveTopicList(model.category, transition)
       ]);
@@ -77,7 +77,7 @@ export default (filterArg, params) => {
     _createSubcategoryList(category) {
       this._categoryList = null;
       if (
-        Em.isNone(category.get("parentCategory")) &&
+        Ember.isNone(category.get("parentCategory")) &&
         category.get("show_subcategory_list")
       ) {
         return CategoryList.listForParent(this.store, category).then(
@@ -86,7 +86,7 @@ export default (filterArg, params) => {
       }
 
       // If we're not loading a subcategory list just resolve
-      return Em.RSVP.resolve();
+      return Ember.RSVP.resolve();
     },
 
     _retrieveTopicList(category, transition) {
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 5e966491cd0..e1b36bfebaa 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -148,9 +148,9 @@ const TopicRoute = Discourse.Route.extend({
           postUrl += "/" + currentPost;
         }
 
-        Em.run.cancel(scheduledReplace);
+        Ember.run.cancel(scheduledReplace);
         lastScrollPos = parseInt($(document).scrollTop(), 10);
-        scheduledReplace = Em.run.later(
+        scheduledReplace = Ember.run.later(
           this,
           "_replaceUnlessScrolling",
           postUrl,
@@ -166,7 +166,7 @@ const TopicRoute = Discourse.Route.extend({
 
     willTransition() {
       this._super();
-      Em.run.cancel(scheduledReplace);
+      Ember.run.cancel(scheduledReplace);
       isTransitioning = true;
       return true;
     }
@@ -181,7 +181,7 @@ const TopicRoute = Discourse.Route.extend({
       return;
     }
     lastScrollPos = currentPos;
-    scheduledReplace = Em.run.later(
+    scheduledReplace = Ember.run.later(
       this,
       "_replaceUnlessScrolling",
       url,
@@ -191,13 +191,13 @@ const TopicRoute = Discourse.Route.extend({
 
   setupParams(topic, params) {
     const postStream = topic.get("postStream");
-    postStream.set("summary", Em.get(params, "filter") === "summary");
+    postStream.set("summary", Ember.get(params, "filter") === "summary");
 
-    const usernames = Em.get(params, "username_filters"),
+    const usernames = Ember.get(params, "username_filters"),
       userFilters = postStream.get("userFilters");
 
     userFilters.clear();
-    if (!Em.isEmpty(usernames) && usernames !== "undefined") {
+    if (!Ember.isEmpty(usernames) && usernames !== "undefined") {
       userFilters.addObjects(usernames.split(","));
     }
 
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6
index 24093fd3a53..4757ccff070 100644
--- a/app/assets/javascripts/discourse/routes/user.js.es6
+++ b/app/assets/javascripts/discourse/routes/user.js.es6
@@ -59,7 +59,7 @@ export default Discourse.Route.extend({
 
   serialize(model) {
     if (!model) return {};
-    return { username: (Em.get(model, "username") || "").toLowerCase() };
+    return { username: (Ember.get(model, "username") || "").toLowerCase() };
   },
 
   setupController(controller, user) {
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index 0d27ee2fca1..74991a7561e 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -307,7 +307,7 @@ I18n.enableVerboseLocalization = function() {
       if (!_.isEmpty(value)) {
         message += ", parameters: " + JSON.stringify(value);
       }
-      Em.Logger.info(message);
+      Ember.Logger.info(message);
     }
     return t.apply(I18n, [scope, value]) + " (#" + current + ")";
   };
diff --git a/app/assets/javascripts/preload-store.js.es6 b/app/assets/javascripts/preload-store.js.es6
index 6af6282777f..b096afd4c10 100644
--- a/app/assets/javascripts/preload-store.js.es6
+++ b/app/assets/javascripts/preload-store.js.es6
@@ -19,7 +19,7 @@ export default {
   **/
   getAndRemove(key, finder) {
     if (this.data[key]) {
-      var promise = Em.RSVP.resolve(this.data[key]);
+      var promise = Ember.RSVP.resolve(this.data[key]);
       delete this.data[key];
       return promise;
     }
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index 760c3390b5d..edd99f16f9c 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -44,7 +44,7 @@ function initializePolls(api) {
           if (existing) {
             this._polls[p.name].setProperties(p);
           } else {
-            this._polls[p.name] = Em.Object.create(p);
+            this._polls[p.name] = Ember.Object.create(p);
           }
         });
         this.set("pollsObject", this._polls);
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js.es6
index 4272459d959..ed5044edf11 100644
--- a/test/javascripts/controllers/preferences-account-test.js.es6
+++ b/test/javascripts/controllers/preferences-account-test.js.es6
@@ -5,10 +5,10 @@ QUnit.test("updating of associated accounts", function(assert) {
     siteSettings: {
       enable_google_oauth2_logins: true
     },
-    model: Em.Object.create({
+    model: Ember.Object.create({
       second_factor_enabled: true
     }),
-    site: Em.Object.create({
+    site: Ember.Object.create({
       isMobileDevice: false
     })
   });
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 58a7a161b59..6b3b8811193 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -20,7 +20,7 @@ QUnit.module("lib:computed", {
 });
 
 QUnit.test("setting", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     vehicle: setting("vehicle"),
     missingProp: setting("madeUpThing")
   }).create();
@@ -38,7 +38,7 @@ QUnit.test("setting", assert => {
 });
 
 QUnit.test("propertyEqual", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     same: propertyEqual("cookies", "biscuits")
   }).create({
     cookies: 10,
@@ -51,7 +51,7 @@ QUnit.test("propertyEqual", assert => {
 });
 
 QUnit.test("propertyNotEqual", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     diff: propertyNotEqual("cookies", "biscuits")
   }).create({
     cookies: 10,
@@ -64,7 +64,7 @@ QUnit.test("propertyNotEqual", assert => {
 });
 
 QUnit.test("fmt", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     exclaimyUsername: fmt("username", "!!! %@ !!!"),
     multiple: fmt("username", "mood", "%@ is %@")
   }).create({
@@ -98,7 +98,7 @@ QUnit.test("fmt", assert => {
 });
 
 QUnit.test("i18n", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     exclaimyUsername: i18n("username", "!!! %@ !!!"),
     multiple: i18n("username", "mood", "%@ is %@")
   }).create({
@@ -134,7 +134,7 @@ QUnit.test("i18n", assert => {
 QUnit.test("url", assert => {
   var t, testClass;
 
-  testClass = Em.Object.extend({
+  testClass = Ember.Object.extend({
     userUrl: url("username", "/u/%@")
   });
 
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js.es6
index a3e89726cb9..ca6bd1f7b53 100644
--- a/test/javascripts/models/topic-test.js.es6
+++ b/test/javascripts/models/topic-test.js.es6
@@ -33,7 +33,7 @@ QUnit.test("visited", assert => {
 });
 
 QUnit.test("lastUnreadUrl", assert => {
-  const category = Em.Object.create({
+  const category = Ember.Object.create({
     navigate_to_first_post_after_read: true
   });