diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp
index 8d500dcd8e7367630f89bf94ec64f8e3fdc1c125..4ac2f0d7381d8b51b7e48351abc2e59ecce83c8f 100644
--- a/src/plugins/coreplugin/coreimpl.cpp
+++ b/src/plugins/coreplugin/coreimpl.cpp
@@ -99,7 +99,7 @@ ProgressManager *CoreImpl::progressManager() const
     return m_mainwindow->progressManager();
 }
 
-ScriptManagerInterface *CoreImpl::scriptManager() const
+ScriptManager *CoreImpl::scriptManager() const
 {
     return m_mainwindow->scriptManager();
 }
diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h
index 01c29e4656d7429295692e0e2159e84d4f3f0613..f658a90ee4fa3ee562f9149c2f5dab9d022a76e0 100644
--- a/src/plugins/coreplugin/coreimpl.h
+++ b/src/plugins/coreplugin/coreimpl.h
@@ -63,7 +63,7 @@ public:
     ExtensionSystem::PluginManager *pluginManager() const;
     EditorManager *editorManager() const;
     ProgressManager *progressManager() const;
-    ScriptManagerInterface *scriptManager() const;
+    ScriptManager *scriptManager() const;
     VariableManager *variableManager() const;
     VCSManager *vcsManager() const;
     ModeManager *modeManager() const;
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index b7dc0a1be196d6cf9642a7afa0a53e35bd057633..3823b96e45aba7f5d4ae9a80e8f6011167134edf 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -132,7 +132,7 @@ HEADERS += mainwindow.h \
     versiondialog.h \
     scriptmanager/metatypedeclarations.h \
     scriptmanager/qworkbench_wrapper.h \
-    scriptmanager/scriptmanagerinterface.h \
+    scriptmanager/scriptmanager.h \
     scriptmanager/scriptmanager_p.h \
     core_global.h \
     basemode.h \
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 5cdc3733dd0fa42ec4779ee8af97b7250d533a9e..e5c84fe17a34047be29d36ed2117f591f02be836 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -106,7 +106,7 @@
 */
 
 /*!
-    \fn ScriptManagerInterface *ICore::scriptManager() const
+    \fn ScriptManager *ICore::scriptManager() const
     \internal
 */
 
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index 4a138b4baaecff75e03f0fa2e8f685c504d0786c..d48baab736782bfbd7ec58e4302137439f39744a 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -58,7 +58,7 @@ class IEditor;
 class UniqueIDManager;
 class EditorManager;
 class ProgressManager;
-class ScriptManagerInterface;
+class ScriptManager;
 class VariableManager;
 class IContext;
 class VCSManager;
@@ -88,7 +88,7 @@ public:
     virtual ExtensionSystem::PluginManager *pluginManager() const = 0;
     virtual EditorManager *editorManager() const = 0;
     virtual ProgressManager *progressManager() const = 0;
-    virtual ScriptManagerInterface *scriptManager() const = 0;
+    virtual ScriptManager *scriptManager() const = 0;
     virtual VariableManager *variableManager() const = 0;
     virtual VCSManager *vcsManager() const = 0;
     virtual ModeManager *modeManager() const = 0;
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index a2c264b2263cd19a166e2c753512ccc35e651680..0910e7f882e243fc5ef266cb926db3592a3c29a7 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -850,7 +850,7 @@ ProgressManager *MainWindow::progressManager() const
     return m_progressManager;
 }
 
-ScriptManagerInterface *MainWindow::scriptManager() const
+ScriptManager *MainWindow::scriptManager() const
 {
      return m_scriptManager;
 }
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 2fe06cd76f71c8e33e8290bee1757a02f8dcaa8a..da6c3ceabf17df1501d323fc662e6c684d43a5c4 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -66,7 +66,7 @@ class MimeDatabase;
 class ModeManager;
 class ProgressManager;
 class RightPaneWidget;
-class ScriptManagerInterface;
+class ScriptManager;
 class UniqueIDManager;
 class VariableManager;
 class VCSManager;
@@ -112,7 +112,7 @@ public:
     ExtensionSystem::PluginManager *pluginManager() const;
     Core::EditorManager *editorManager() const;
     Core::ProgressManager *progressManager() const;
-    Core::ScriptManagerInterface *scriptManager() const;
+    Core::ScriptManager *scriptManager() const;
     Core::VariableManager *variableManager() const;
     Core::ModeManager *modeManager() const;
     Core::MimeDatabase *mimeDatabase() const;
@@ -181,7 +181,7 @@ private:
     FileManager *m_fileManager;
     MessageManager *m_messageManager;
     ProgressManagerPrivate *m_progressManager;
-    ScriptManagerInterface *m_scriptManager;
+    ScriptManager *m_scriptManager;
     VariableManager *m_variableManager;
     VCSManager *m_vcsManager;
     ViewManager *m_viewManager;
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index 8e18fa9a85261995b7315b6180622b0a731f9913..3ef59d372a5cd00c5ab8b6afbaaf0f45fd366500 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
@@ -183,7 +183,7 @@ namespace Core {
 namespace Internal {
 
 ScriptManagerPrivate::ScriptManagerPrivate(QObject *parent, ICore *core)  :
-    ScriptManagerInterface(parent),
+    ScriptManager(parent),
     m_core(core),
     m_initialized(false)
 {
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h b/src/plugins/coreplugin/scriptmanager/scriptmanager.h
similarity index 89%
rename from src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h
rename to src/plugins/coreplugin/scriptmanager/scriptmanager.h
index d8273ac958482efeafd57928f0f2f53bb5a2cfa9..cc0a06816b74430854fd2fd84365655a2c6e4b66 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.h
@@ -31,8 +31,8 @@
 **
 ***************************************************************************/
 
-#ifndef SCRIPTMANAGERINTERFACE_H
-#define SCRIPTMANAGERINTERFACE_H
+#ifndef SCRIPTMANAGER_H
+#define SCRIPTMANAGER_H
 
 #include <coreplugin/core_global.h>
 
@@ -47,7 +47,7 @@ namespace Core {
  * Qt Creator's interfaces and allows for running scripts.
  * @{todo} Should it actually manage script files, too? */
 
-class CORE_EXPORT ScriptManagerInterface : public QObject
+class CORE_EXPORT ScriptManager : public QObject
 {
     Q_OBJECT
 public:
@@ -60,8 +60,8 @@ public:
     };
     typedef QList<StackFrame> Stack;
 
-    ScriptManagerInterface(QObject *parent = 0) : QObject(parent) {}
-    virtual ~ScriptManagerInterface() { }
+    ScriptManager(QObject *parent = 0) : QObject(parent) {}
+    virtual ~ScriptManager() { }
 
     // Access the engine (for plugins to wrap additional interfaces).
     virtual QScriptEngine &scriptEngine() = 0;
@@ -73,4 +73,4 @@ public:
 
 } // namespace Core
 
-#endif // SCRIPTMANAGERINTERFACE_H
+#endif // SCRIPTMANAGER_H
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
index ab4a2276e4de33bcf6c57dd84d356c52b6ca818b..5ab1e8d69c52722858ef441762e5f167ef26e39e 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
@@ -34,7 +34,7 @@
 #ifndef SCRIPTMANAGER_P_H
 #define SCRIPTMANAGER_P_H
 
-#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
+#include <coreplugin/scriptmanager/scriptmanager.h>
 #include <coreplugin/icore.h>
 
 #include <QtCore/QObject>
@@ -44,7 +44,7 @@
 namespace Core {
 namespace Internal {
 
-class ScriptManagerPrivate : public Core::ScriptManagerInterface
+class ScriptManagerPrivate : public Core::ScriptManager
 {
     Q_OBJECT
 
diff --git a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
index 0ed9105c181fe2b7d1ad84e4408a45f42356154b..a33a120615874f23421f74b40197edf3a8b2dc8f 100644
--- a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
@@ -36,7 +36,7 @@
 #include "qtscripteditor.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
+#include <coreplugin/scriptmanager/scriptmanager.h>
 
 #include <QtGui/QAction>
 #include <QtGui/QMessageBox>
@@ -79,7 +79,7 @@ void QtScriptEditorActionHandler::updateActions(UpdateMode um)
 
 void QtScriptEditorActionHandler::run()
 {
-    typedef Core::ScriptManagerInterface::Stack Stack;
+    typedef Core::ScriptManager::Stack Stack;
     if (!currentEditor())
         return;