diff --git a/IPython/html.py b/IPython/html.py
index 895c535..928cf00 100644
--- a/IPython/html.py
+++ b/IPython/html.py
@@ -8,7 +8,7 @@ import sys
 from warnings import warn
 
 warn("The `IPython.html` package has been deprecated. "
-     "You should import from `jupyter_notebook` instead. "
+     "You should import from `notebook` instead. "
      "`IPython.html.widgets` has moved to `ipython_widgets`.")
 
 from IPython.utils.shimmodule import ShimModule
@@ -17,12 +17,12 @@ _widgets = sys.modules['IPython.html.widgets'] = ShimModule(
     src='IPython.html.widgets', mirror='ipython_widgets')
 
 _html = ShimModule(
-    src='IPython.html', mirror='jupyter_notebook')
+    src='IPython.html', mirror='notebook')
 
 # hook up widgets
 _html.widgets = _widgets
 sys.modules['IPython.html'] = _html
 
 if __name__ == '__main__':
-    from jupyter_notebook import notebookapp as app
+    from notebook import notebookapp as app
     app.launch_new_instance()
diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index fca1881..95cfacb 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -210,8 +210,8 @@ class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
         qtconsole=('qtconsole.console.qtconsoleapp.JupyterQtConsoleApp',
             """DEPRECATD: Launch the Jupyter Qt Console."""
         ),
-        notebook=('jupyter_notebook.notebookapp.NotebookApp',
-            """DEPRECATED: Launch the IPython HTML Notebook Server."""
+        notebook=('notebook.notebookapp.NotebookApp',
+            """DEPRECATED: Launch the Jupyter HTML Notebook Server."""
         ),
         profile = ("IPython.core.profileapp.ProfileApp",
             "Create and manage IPython profiles."
@@ -239,7 +239,7 @@ class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
         ),
     )
     subcommands['install-nbextension'] = (
-        "jupyter_notebook.nbextensions.NBExtensionApp",
+        "notebook.nbextensions.NBExtensionApp",
         "DEPRECATED: Install Jupyter notebook extension files"
     )
 
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 59f5bb8..340e238 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -214,9 +214,9 @@ def temp_pyfile(src, ext='.py'):
     return fname, f
 
 def atomic_writing(*args, **kwargs):
-    """DEPRECATED: moved to jupyter_notebook.services.contents.fileio"""
-    warn("IPython.utils.io.atomic_writing has moved to jupyter_notebook.services.contents.fileio")
-    from jupyter_notebook.services.contents.fileio import atomic_writing
+    """DEPRECATED: moved to notebook.services.contents.fileio"""
+    warn("IPython.utils.io.atomic_writing has moved to notebook.services.contents.fileio")
+    from notebook.services.contents.fileio import atomic_writing
     return atomic_writing(*args, **kwargs)
 
 def raw_print(*args, **kw):
diff --git a/setup.py b/setup.py
index 40d5af7..4702bf6 100755
--- a/setup.py
+++ b/setup.py
@@ -208,7 +208,7 @@ extras_require = dict(
     terminal = [],
     kernel = ['ipykernel'],
     nbformat = ['nbformat'],
-    notebook = ['jupyter_notebook'],
+    notebook = ['notebook'],
     nbconvert = ['nbconvert'],
 )