diff --git a/configs/client-config_test.js b/configs/client-config_test.js
index c26942dd..45f74285 100755
--- a/configs/client-config_test.js
+++ b/configs/client-config_test.js
@@ -99,7 +99,7 @@ describe("client config consistency", function() {
             }
         });
         
-        var provides = {"auth.bootstrap": 1, "hub": 1};
+        var provides = { "auth.bootstrap": 1, "hub": 1, "app": 1 };
         var paths = {};
         clientPlugins.forEach(function(p) {
             if (paths[p.packagePath]) {
diff --git a/node_modules/architect/architect.js b/node_modules/architect/architect.js
index 2f0e671d..5b9c188d 100644
--- a/node_modules/architect/architect.js
+++ b/node_modules/architect/architect.js
@@ -179,7 +179,8 @@ function checkCycles(config, lookup) {
     });
 
     var resolved = {
-        hub: true
+        hub: true,
+        app: true
     };
     var changed = true;
     var sorted = [];
@@ -253,12 +254,8 @@ function Architect(config) {
     
     var isAdditionalMode;
     var services = app.services = {
-        hub: {
-            on: function (name, callback) {
-                app.on(name, callback);
-            },
-            app: app
-        }
+        hub: app,
+        app: app
     };
 
     // Check the config
diff --git a/plugins/c9.core/ext.js b/plugins/c9.core/ext.js
index 07116c3b..8e07a19f 100644
--- a/plugins/c9.core/ext.js
+++ b/plugins/c9.core/ext.js
@@ -1,11 +1,11 @@
 define(function(require, exports, module) {
-    main.consumes = ["hub"];
+    main.consumes = ["app"];
     main.provides = ["ext", "Plugin"];
     return main;
 
     function main(options, imports, register) {
         var Emitter = require("events").EventEmitter;
-        var architectApp = imports.hub.app;
+        var architectApp = imports.app;
 
 
         var plugins = [];
diff --git a/plugins/c9.ide.configuration/configure.js b/plugins/c9.ide.configuration/configure.js
index 3c26590a..2b066a5c 100644
--- a/plugins/c9.ide.configuration/configure.js
+++ b/plugins/c9.ide.configuration/configure.js
@@ -3,7 +3,7 @@ define(function(require, exports, module) {
         "Plugin", "dialog.error", "ui", "settings", "tabManager", "save", 
         "menus", "preferences.keybindings", "preferences.general",
         "preferences.project", "c9", "commands", "watcher", "fs", 
-        "tree.favorites", "util", "hub"
+        "tree.favorites", "util", "app"
     ];
     main.provides = ["configure"];
     return main;
@@ -22,7 +22,7 @@ define(function(require, exports, module) {
         var kbprefs = imports["preferences.keybindings"];
         var genprefs = imports["preferences.general"];
         var prjprefs = imports["preferences.project"];
-        var services = imports.hub.app.services;
+        var services = imports.app.services;
         var showError = imports["dialog.error"].show;
         var favs = imports["tree.favorites"];
         var util = imports.util;
diff --git a/plugins/c9.ide.plugins/gui.js b/plugins/c9.ide.plugins/gui.js
index d35aae9c..c5d44207 100644
--- a/plugins/c9.ide.plugins/gui.js
+++ b/plugins/c9.ide.plugins/gui.js
@@ -1,9 +1,9 @@
 define(function(require, exports, module) {
     main.consumes = [
-        "PreferencePanel", "settings", "ui", "util", "ext", "c9", "Plugin",
-        "layout", "proc", "menus", "commands", "pluginManager",
+        "app", "ext", "c9", "PreferencePanel", "settings", "ui", "util",
+        "layout", "menus", "commands", "pluginManager",
         "dialog.error", "dialog.info", "tree.favorites", "fs", "tree", "vfs",
-        "preferences.experimental", "apf", "hub", "dialog.notification"
+        "preferences.experimental", "apf","dialog.notification"
     ];
     main.provides = ["pluginManagerUi"];
     return main;
@@ -26,7 +26,7 @@ define(function(require, exports, module) {
         var notify = imports["dialog.notification"].show;
         var experimental = imports["preferences.experimental"];
         var pluginManager = imports.pluginManager;
-        var architectApp = imports.hub.app;
+        var architectApp = imports.app;
 
         var search = require("../c9.ide.navigate/search");
         var Tree = require("ace_tree/tree");
diff --git a/plugins/c9.ide.plugins/manager.js b/plugins/c9.ide.plugins/manager.js
index 99dc0c9c..16196b63 100644
--- a/plugins/c9.ide.plugins/manager.js
+++ b/plugins/c9.ide.plugins/manager.js
@@ -1,7 +1,7 @@
 /*global requirejs*/
 define(function(require, exports, module) {
     main.consumes = [
-        "hub", "ext", "c9", "Plugin", "proc", "fs", "tree", "vfs",
+        "app", "ext", "c9", "Plugin", "proc", "fs", "tree", "vfs",
         "dialog.error", "tree.favorites"
     ];
     main.provides = ["pluginManager", "plugin.manager", "plugin.debug"];
@@ -19,7 +19,7 @@ define(function(require, exports, module) {
         var vfs = imports.vfs;
         var showError = imports["dialog.error"].show;
         var favs = imports["tree.favorites"];
-        var architectApp = imports.hub.app;
+        var architectApp = imports.app;
 
         var join = require("path").join;
         var basename = require("path").basename;