diff --git a/IPython/html/texteditor/__init__.py b/IPython/html/edit/__init__.py
similarity index 100%
rename from IPython/html/texteditor/__init__.py
rename to IPython/html/edit/__init__.py
diff --git a/IPython/html/texteditor/handlers.py b/IPython/html/edit/handlers.py
similarity index 95%
rename from IPython/html/texteditor/handlers.py
rename to IPython/html/edit/handlers.py
index 50fd3ac..521bd2c 100644
--- a/IPython/html/texteditor/handlers.py
+++ b/IPython/html/edit/handlers.py
@@ -17,7 +17,7 @@ class EditorHandler(IPythonHandler):
             raise web.HTTPError(404, u'File does not exist: %s' % path)
 
         basename = path.rsplit('/', 1)[-1]
-        self.write(self.render_template('texteditor.html',
+        self.write(self.render_template('edit.html',
             file_path=url_escape(path),
             basename=basename,
             page_title=basename + " (editing)",
diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py
index 58639bb..7f56cf4 100644
--- a/IPython/html/notebookapp.py
+++ b/IPython/html/notebookapp.py
@@ -199,7 +199,7 @@ class NotebookWebApplication(web.Application):
         handlers.extend(load_handlers('notebook.handlers'))
         handlers.extend(load_handlers('nbconvert.handlers'))
         handlers.extend(load_handlers('kernelspecs.handlers'))
-        handlers.extend(load_handlers('texteditor.handlers'))
+        handlers.extend(load_handlers('edit.handlers'))
         handlers.extend(load_handlers('services.config.handlers'))
         handlers.extend(load_handlers('services.kernels.handlers'))
         handlers.extend(load_handlers('services.contents.handlers'))
diff --git a/IPython/html/static/texteditor/js/editor.js b/IPython/html/static/edit/js/editor.js
similarity index 100%
rename from IPython/html/static/texteditor/js/editor.js
rename to IPython/html/static/edit/js/editor.js
diff --git a/IPython/html/static/texteditor/js/main.js b/IPython/html/static/edit/js/main.js
similarity index 93%
rename from IPython/html/static/texteditor/js/main.js
rename to IPython/html/static/edit/js/main.js
index d59eb70..79dac22 100644
--- a/IPython/html/static/texteditor/js/main.js
+++ b/IPython/html/static/edit/js/main.js
@@ -7,9 +7,9 @@ require([
     'base/js/page',
     'base/js/events',
     'contents',
-    'texteditor/js/editor',
-    'texteditor/js/menubar',
-    'texteditor/js/notificationarea',
+    'edit/js/editor',
+    'edit/js/menubar',
+    'edit/js/notificationarea',
     'custom/custom',
 ], function(
     IPython,
diff --git a/IPython/html/static/texteditor/js/menubar.js b/IPython/html/static/edit/js/menubar.js
similarity index 100%
rename from IPython/html/static/texteditor/js/menubar.js
rename to IPython/html/static/edit/js/menubar.js
diff --git a/IPython/html/static/texteditor/js/notificationarea.js b/IPython/html/static/edit/js/notificationarea.js
similarity index 100%
rename from IPython/html/static/texteditor/js/notificationarea.js
rename to IPython/html/static/edit/js/notificationarea.js
diff --git a/IPython/html/templates/texteditor.html b/IPython/html/templates/edit.html
similarity index 96%
rename from IPython/html/templates/texteditor.html
rename to IPython/html/templates/edit.html
index da20cf0..7841bd4 100644
--- a/IPython/html/templates/texteditor.html
+++ b/IPython/html/templates/edit.html
@@ -68,5 +68,5 @@ data-file-path="{{file_path}}"
 
     {{super()}}
 
-<script src="{{ static_url("texteditor/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("edit/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
 {% endblock %}