diff --git a/notebook/static/base/js/namespace.js b/notebook/static/base/js/namespace.js
index eff4e879d..b86fa39dc 100644
--- a/notebook/static/base/js/namespace.js
+++ b/notebook/static/base/js/namespace.js
@@ -67,9 +67,14 @@ define(function(){
     jglobal('MarkdownCell','notebook/js/textcell');
     jglobal('RawCell','notebook/js/textcell');
     jglobal('Cell','notebook/js/cell');
+    jglobal('MainToolBar','notebook/js/maintoolbar');
+    jglobal('NotebookNotificationArea','notebook/js/notificationarea');
+    jglobal('NotebookTour', 'notebook/js/tour');
 
     // tree
     jglobal('SessionList','tree/js/sessionlist');
+    jglobal('ClusterList','tree/js/clusterlist');
+    jglobal('ClusterItem','tree/js/clusterlist');
 
     Jupyter.version = "4.0.0.dev";
     Jupyter._target = '_blank';
diff --git a/notebook/static/notebook/js/maintoolbar.js b/notebook/static/notebook/js/maintoolbar.js
index b31bd69c3..9be2bf01d 100644
--- a/notebook/static/notebook/js/maintoolbar.js
+++ b/notebook/static/notebook/js/maintoolbar.js
@@ -3,11 +3,10 @@
 
 define([
     'require',
-    'base/js/namespace',
     'jquery',
     './toolbar',
     './celltoolbar'
-], function(require, IPython, $, toolbar, celltoolbar) {
+], function(require, $, toolbar, celltoolbar) {
     "use strict";
 
     var MainToolBar = function (selector, options) {
@@ -158,8 +157,5 @@ define([
         return wrapper;
     };
 
-    // Backwards compatibility.
-    IPython.MainToolBar = MainToolBar;
-
     return {'MainToolBar': MainToolBar};
 });
diff --git a/notebook/static/notebook/js/notificationarea.js b/notebook/static/notebook/js/notificationarea.js
index a083bf179..497934376 100644
--- a/notebook/static/notebook/js/notificationarea.js
+++ b/notebook/static/notebook/js/notificationarea.js
@@ -1,11 +1,10 @@
 define([
-    'base/js/namespace',
     'jquery',
     'base/js/utils',
     'base/js/dialog',
     'base/js/notificationarea',
     'moment'
-], function(IPython, $, utils, dialog, notificationarea, moment) {
+], function($, utils, dialog, notificationarea, moment) {
     "use strict";
     var NotificationArea = notificationarea.NotificationArea;
     
@@ -340,8 +339,5 @@ define([
         });
     };
 
-    // Backwards compatibility.
-    IPython.NotificationArea = NotebookNotificationArea;
-    
     return {'NotebookNotificationArea': NotebookNotificationArea};
 });
diff --git a/notebook/static/notebook/js/tour.js b/notebook/static/notebook/js/tour.js
index e644e1769..2ae5ae2d5 100644
--- a/notebook/static/notebook/js/tour.js
+++ b/notebook/static/notebook/js/tour.js
@@ -2,10 +2,9 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    'base/js/namespace',
     'jquery',
     'bootstraptour',
-], function(IPython, $, Tour) {
+], function($, Tour) {
     "use strict";
 
     var tour_style = "<div class='popover tour'>\n" +
@@ -113,7 +112,7 @@ define([
                 title: "Fin.",
                 placement: 'bottom',
                 orphan: true,
-                content: "This concludes the IPython Notebook User Interface Tour. Happy hacking!"
+                content: "This concludes the Jupyter Notebook User Interface Tour. Happy hacking!"
             }
         ];
 
@@ -159,9 +158,6 @@ define([
         this.notebook.edit_mode();
     };
 
-    // For backwards compatability.
-    IPython.NotebookTour = NotebookTour;
-
     return {'Tour': NotebookTour};
 
 });
diff --git a/notebook/static/services/kernels/comm.js b/notebook/static/services/kernels/comm.js
index 5191739e7..cd10ce4d7 100644
--- a/notebook/static/services/kernels/comm.js
+++ b/notebook/static/services/kernels/comm.js
@@ -34,7 +34,7 @@ define([
     CommManager.prototype.new_comm = function (target_name, data, callbacks, metadata) {
         /**
          * Create a new Comm, register it, and open its Kernel-side counterpart
-         * Mimics the auto-registration in `Comm.__init__` in the IPython Comm
+         * Mimics the auto-registration in `Comm.__init__` in the Jupyter Comm
          */
         var comm = new Comm(target_name);
         this.register_comm(comm);
diff --git a/notebook/static/tree/js/clusterlist.js b/notebook/static/tree/js/clusterlist.js
index 7e0c056e7..d60149f97 100644
--- a/notebook/static/tree/js/clusterlist.js
+++ b/notebook/static/tree/js/clusterlist.js
@@ -2,10 +2,9 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    'base/js/namespace',
     'jquery',
     'base/js/utils',
-], function(IPython, $, utils) {
+], function($, utils) {
     "use strict";
 
     var ClusterList = function (selector, options) {
@@ -182,10 +181,6 @@ define([
         });
     };
 
-    // For backwards compatability.
-    IPython.ClusterList = ClusterList;
-    IPython.ClusterItem = ClusterItem;
-
     return {
         'ClusterList': ClusterList,
         'ClusterItem': ClusterItem,