diff --git a/IPython/frontend/qt/console/ipythonqt.py b/IPython/frontend/qt/console/qtconsoleapp.py
similarity index 100%
rename from IPython/frontend/qt/console/ipythonqt.py
rename to IPython/frontend/qt/console/qtconsoleapp.py
diff --git a/IPython/frontend/terminal/ipapp.py b/IPython/frontend/terminal/ipapp.py
index 0a82659..505efaf 100755
--- a/IPython/frontend/terminal/ipapp.py
+++ b/IPython/frontend/terminal/ipapp.py
@@ -194,7 +194,6 @@ aliases.update(dict(
 class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
     name = u'ipython'
     description = usage.cl_usage
-    # command_line_loader = IPAppConfigLoader
     default_config_file_name = default_config_file_name
     crash_handler_class = IPAppCrashHandler
     
@@ -202,8 +201,8 @@ class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
     aliases = Dict(aliases)
     classes = [InteractiveShellApp, TerminalInteractiveShell, ProfileDir, PlainTextFormatter]
     subcommands = Dict(dict(
-        qtconsole=('IPython.frontend.qt.console.ipythonqt.IPythonQtConsoleApp',
-            """Launch the IPython QtConsole.  Also launched as ipython-qtconsole"""
+        qtconsole=('IPython.frontend.qt.console.qtconsoleapp.IPythonQtConsoleApp',
+            """Launch the IPython Qt Console."""
         )
     ))
     
diff --git a/IPython/scripts/ipython-qtconsole b/IPython/scripts/ipython-qtconsole
deleted file mode 100755
index b2970cd..0000000
--- a/IPython/scripts/ipython-qtconsole
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from IPython.frontend.qt.console.ipythonqt import main
-
-main()
diff --git a/setupbase.py b/setupbase.py
index c4e0421..efec6f3 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -280,7 +280,7 @@ def find_scripts(entry_points=False):
             'irunner = IPython.lib.irunner:main'
         ]
         gui_scripts = [
-            'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
+            'ipython-qtconsole = IPython.frontend.qt.console.qtconsoleapp:main',
         ]
         scripts = dict(console_scripts=console_scripts, gui_scripts=gui_scripts)
     else:
@@ -292,7 +292,6 @@ def find_scripts(entry_points=False):
                    pjoin(parallel_scripts, 'ipcluster'),
                    pjoin(parallel_scripts, 'iplogger'),
                    pjoin(main_scripts, 'ipython'),
-                   pjoin(main_scripts, 'ipython-qtconsole'),
                    pjoin(main_scripts, 'pycolor'),
                    pjoin(main_scripts, 'irunner'),
                    pjoin(main_scripts, 'iptest')