diff --git a/IPython/frontend/kernelmixinapp.py b/IPython/frontend/consoleapp.py
similarity index 91%
rename from IPython/frontend/kernelmixinapp.py
rename to IPython/frontend/consoleapp.py
index ba51c69..e932a4f 100644
--- a/IPython/frontend/kernelmixinapp.py
+++ b/IPython/frontend/consoleapp.py
@@ -69,11 +69,11 @@ flags = dict(ipkernel_flags)
 # these must be scrubbed before being passed to the kernel,
 # or it will raise an error on unrecognized flags
 app_flags = {
-    'existing' : ({'IPythonMixinConsoleApp' : {'existing' : 'kernel*.json'}},
+    'existing' : ({'IPythonConsoleApp' : {'existing' : 'kernel*.json'}},
             "Connect to an existing kernel. If no argument specified, guess most recent"),
 }
 app_flags.update(boolean_flag(
-    'confirm-exit', 'IPythonMixinConsoleApp.confirm_exit',
+    'confirm-exit', 'IPythonConsoleApp.confirm_exit',
     """Set to display confirmation dialog on exit. You can always use 'exit' or 'quit',
        to force a direct exit without any confirmation.
     """,
@@ -87,16 +87,16 @@ aliases = dict(ipkernel_aliases)
 
 # also scrub aliases from the frontend
 app_aliases = dict(
-    hb = 'IPythonMixinConsoleApp.hb_port',
-    shell = 'IPythonMixinConsoleApp.shell_port',
-    iopub = 'IPythonMixinConsoleApp.iopub_port',
-    stdin = 'IPythonMixinConsoleApp.stdin_port',
-    ip = 'IPythonMixinConsoleApp.ip',
-    existing = 'IPythonMixinConsoleApp.existing',
-    f = 'IPythonMixinConsoleApp.connection_file',
+    hb = 'IPythonConsoleApp.hb_port',
+    shell = 'IPythonConsoleApp.shell_port',
+    iopub = 'IPythonConsoleApp.iopub_port',
+    stdin = 'IPythonConsoleApp.stdin_port',
+    ip = 'IPythonConsoleApp.ip',
+    existing = 'IPythonConsoleApp.existing',
+    f = 'IPythonConsoleApp.connection_file',
 
 
-    ssh = 'IPythonMixinConsoleApp.sshserver',
+    ssh = 'IPythonConsoleApp.sshserver',
 )
 aliases.update(app_aliases)
 
@@ -105,11 +105,11 @@ aliases.update(app_aliases)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# IPythonMixinConsole
+# IPythonConsole
 #-----------------------------------------------------------------------------
 
 
-class IPythonMixinConsoleApp(Configurable):
+class IPythonConsoleApp(Configurable):
     name = 'ipython-console-mixin'
     default_config_file_name='ipython_config.py'
 
@@ -372,7 +372,7 @@ class IPythonMixinConsoleApp(Configurable):
     def initialize(self, argv=None):
         """
         Classes which mix this class in should call:
-               IPythonMixinConsoleApp.initialize(self,argv)
+               IPythonConsoleApp.initialize(self,argv)
         """
         self.init_connection_file()
         default_secure(self.config)
diff --git a/IPython/frontend/qt/console/qtconsoleapp.py b/IPython/frontend/qt/console/qtconsoleapp.py
index 32d6463..4c6c9f0 100644
--- a/IPython/frontend/qt/console/qtconsoleapp.py
+++ b/IPython/frontend/qt/console/qtconsoleapp.py
@@ -49,8 +49,8 @@ from IPython.zmq.ipkernel import IPKernelApp
 from IPython.zmq.session import Session, default_secure
 from IPython.zmq.zmqshell import ZMQInteractiveShell
 
-from IPython.frontend.kernelmixinapp import (
-        IPythonMixinConsoleApp, app_aliases, app_flags, flags, aliases
+from IPython.frontend.consoleapp import (
+        IPythonConsoleApp, app_aliases, app_flags, flags, aliases
     )
 
 #-----------------------------------------------------------------------------
@@ -121,7 +121,7 @@ qt_flags = set(qt_flags.keys())
 #-----------------------------------------------------------------------------
 
 
-class IPythonQtConsoleApp(BaseIPythonApplication, IPythonMixinConsoleApp):
+class IPythonQtConsoleApp(BaseIPythonApplication, IPythonConsoleApp):
     name = 'ipython-qtconsole'
 
     description = """
@@ -323,7 +323,7 @@ class IPythonQtConsoleApp(BaseIPythonApplication, IPythonMixinConsoleApp):
     @catch_config_error
     def initialize(self, argv=None):
         super(IPythonQtConsoleApp, self).initialize(argv)
-        IPythonMixinConsoleApp.initialize(self,argv)
+        IPythonConsoleApp.initialize(self,argv)
         self.init_qt_elements()
         self.init_colors()
         self.init_signal()
diff --git a/IPython/frontend/terminal/console/app.py b/IPython/frontend/terminal/console/app.py
index adbf0b3..020ee95 100644
--- a/IPython/frontend/terminal/console/app.py
+++ b/IPython/frontend/terminal/console/app.py
@@ -27,8 +27,8 @@ from IPython.utils.warn import warn,error
 from IPython.zmq.ipkernel import IPKernelApp
 from IPython.zmq.session import Session, default_secure
 from IPython.zmq.zmqshell import ZMQInteractiveShell
-from IPython.frontend.kernelmixinapp import (
-        IPythonMixinConsoleApp, app_aliases, app_flags, aliases, app_aliases, flags
+from IPython.frontend.consoleapp import (
+        IPythonConsoleApp, app_aliases, app_flags, aliases, app_aliases, flags
     )
 
 from IPython.frontend.terminal.console.interactiveshell import ZMQTerminalInteractiveShell
@@ -77,7 +77,7 @@ frontend_flags = set(frontend_flags.keys())
 #-----------------------------------------------------------------------------
 
 
-class ZMQTerminalIPythonApp(TerminalIPythonApp, IPythonMixinConsoleApp):
+class ZMQTerminalIPythonApp(TerminalIPythonApp, IPythonConsoleApp):
     name = "ipython-console"
     """Start a terminal frontend to the IPython zmq kernel."""
 
@@ -108,7 +108,7 @@ class ZMQTerminalIPythonApp(TerminalIPythonApp, IPythonMixinConsoleApp):
         self.swallow_args(frontend_aliases,frontend_flags,argv=argv)
 
     def init_shell(self):
-        IPythonMixinConsoleApp.initialize(self)
+        IPythonConsoleApp.initialize(self)
         # relay sigint to kernel
         signal.signal(signal.SIGINT, self.handle_sigint)
         self.shell = ZMQTerminalInteractiveShell.instance(config=self.config,