diff --git a/IPython/frontend/html/notebook/azurenbmanager.py b/IPython/frontend/html/notebook/azurenbmanager.py
index bc0d6ee..b6f635e 100644
--- a/IPython/frontend/html/notebook/azurenbmanager.py
+++ b/IPython/frontend/html/notebook/azurenbmanager.py
@@ -23,7 +23,7 @@ from azure.storage import BlobService
from tornado import web
-from .basenbmanager import BaseNotebookManager
+from .nbmanager import NotebookManager
from IPython.nbformat import current
from IPython.utils.traitlets import Unicode, Instance
@@ -32,7 +32,7 @@ from IPython.utils.traitlets import Unicode, Instance
# Classes
#-----------------------------------------------------------------------------
-class AzureNotebookManager(BaseNotebookManager):
+class AzureNotebookManager(NotebookManager):
account_name = Unicode('', config=True, help='Azure storage account name.')
account_key = Unicode('', config=True, help='Azure storage account key.')
diff --git a/IPython/frontend/html/notebook/filenbmanager.py b/IPython/frontend/html/notebook/filenbmanager.py
index 34d7d26..4ecf77f 100644
--- a/IPython/frontend/html/notebook/filenbmanager.py
+++ b/IPython/frontend/html/notebook/filenbmanager.py
@@ -23,7 +23,7 @@ import glob
from tornado import web
-from .basenbmanager import BaseNotebookManager
+from .nbmanager import NotebookManager
from IPython.nbformat import current
from IPython.utils.traitlets import Unicode, Dict, Bool, TraitError
@@ -31,7 +31,7 @@ from IPython.utils.traitlets import Unicode, Dict, Bool, TraitError
# Classes
#-----------------------------------------------------------------------------
-class FileNotebookManager(BaseNotebookManager):
+class FileNotebookManager(NotebookManager):
save_script = Bool(False, config=True,
help="""Automatically create a Python script when saving the notebook.
diff --git a/IPython/frontend/html/notebook/basenbmanager.py b/IPython/frontend/html/notebook/nbmanager.py
similarity index 99%
rename from IPython/frontend/html/notebook/basenbmanager.py
rename to IPython/frontend/html/notebook/nbmanager.py
index b7e9297..dca6818 100644
--- a/IPython/frontend/html/notebook/basenbmanager.py
+++ b/IPython/frontend/html/notebook/nbmanager.py
@@ -29,7 +29,7 @@ from IPython.utils.traitlets import List, Dict, Unicode, TraitError
# Classes
#-----------------------------------------------------------------------------
-class BaseNotebookManager(LoggingConfigurable):
+class NotebookManager(LoggingConfigurable):
# Todo:
# The notebook_dir attribute is used to mean a couple of different things:
diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
index de80b94..7caacd8 100644
--- a/IPython/frontend/html/notebook/notebookapp.py
+++ b/IPython/frontend/html/notebook/notebookapp.py
@@ -51,7 +51,7 @@ from .handlers import (LoginHandler, LogoutHandler,
MainClusterHandler, ClusterProfileHandler, ClusterActionHandler,
FileFindHandler,
)
-from .basenbmanager import BaseNotebookManager
+from .nbmanager import NotebookManager
from .filenbmanager import FileNotebookManager
from .clustermanager import ClusterManager
@@ -237,7 +237,7 @@ aliases.update({
'port-retries': 'NotebookApp.port_retries',
'keyfile': 'NotebookApp.keyfile',
'certfile': 'NotebookApp.certfile',
- 'notebook-dir': 'BaseNotebookManager.notebook_dir',
+ 'notebook-dir': 'NotebookManager.notebook_dir',
'browser': 'NotebookApp.browser',
})
@@ -265,7 +265,7 @@ class NotebookApp(BaseIPythonApplication):
"""
examples = _examples
- classes = IPythonConsoleApp.classes + [MappingKernelManager, BaseNotebookManager,
+ classes = IPythonConsoleApp.classes + [MappingKernelManager, NotebookManager,
FileNotebookManager]
flags = Dict(flags)
aliases = Dict(aliases)
@@ -431,7 +431,7 @@ class NotebookApp(BaseIPythonApplication):
else:
self.file_to_run = f
nbdir = os.path.dirname(f)
- self.config.BaseNotebookManager.notebook_dir = nbdir
+ self.config.NotebookManager.notebook_dir = nbdir
def init_configurables(self):
# force Session default to be secure