diff --git a/src/plugins/qmleditor/qmleditor.cpp b/src/plugins/qmleditor/qmleditor.cpp
index e7fdc8305098592498da572f67555053893e6ec1..4466ec111f880b5c63d7018962445077acfeaa68 100644
--- a/src/plugins/qmleditor/qmleditor.cpp
+++ b/src/plugins/qmleditor/qmleditor.cpp
@@ -273,7 +273,7 @@ protected:
 #endif
 };
 
-ScriptEditorEditable::ScriptEditorEditable(QmlTextEditor *editor)
+QmlEditorEditable::QmlEditorEditable(QmlTextEditor *editor)
     : BaseTextEditorEditable(editor)
 {
 
@@ -320,7 +320,7 @@ QmlTextEditor::~QmlTextEditor()
 QList<Declaration> QmlTextEditor::declarations() const
 { return m_declarations; }
 
-Core::IEditor *ScriptEditorEditable::duplicate(QWidget *parent)
+Core::IEditor *QmlEditorEditable::duplicate(QWidget *parent)
 {
     QmlTextEditor *newEditor = new QmlTextEditor(parent);
     newEditor->duplicateFrom(editor());
@@ -328,12 +328,12 @@ Core::IEditor *ScriptEditorEditable::duplicate(QWidget *parent)
     return newEditor->editableInterface();
 }
 
-const char *ScriptEditorEditable::kind() const
+const char *QmlEditorEditable::kind() const
 {
     return QmlEditor::Constants::C_QMLEDITOR;
 }
 
-QmlTextEditor::Context ScriptEditorEditable::context() const
+QmlTextEditor::Context QmlEditorEditable::context() const
 {
     return m_context;
 }
@@ -612,12 +612,12 @@ void QmlTextEditor::indentBlock(QTextDocument *, QTextBlock block, QChar /*typed
 
 TextEditor::BaseTextEditorEditable *QmlTextEditor::createEditableInterface()
 {
-    ScriptEditorEditable *editable = new ScriptEditorEditable(this);
+    QmlEditorEditable *editable = new QmlEditorEditable(this);
     createToolBar(editable);
     return editable;
 }
 
-void QmlTextEditor::createToolBar(ScriptEditorEditable *editable)
+void QmlTextEditor::createToolBar(QmlEditorEditable *editable)
 {
     m_methodCombo = new QComboBox;
     m_methodCombo->setMinimumContentsLength(22);
diff --git a/src/plugins/qmleditor/qmleditor.h b/src/plugins/qmleditor/qmleditor.h
index ed30fc582cef29a30035984c55a16b76f2fd51cb..2381ec941ba14bbc2c802dd70b237cae42ca94ba 100644
--- a/src/plugins/qmleditor/qmleditor.h
+++ b/src/plugins/qmleditor/qmleditor.h
@@ -56,12 +56,12 @@ namespace Internal {
 class QmlHighlighter;
 class QmlTextEditor;
 
-class ScriptEditorEditable : public TextEditor::BaseTextEditorEditable
+class QmlEditorEditable : public TextEditor::BaseTextEditorEditable
 {
     Q_OBJECT
 
 public:
-    ScriptEditorEditable(QmlTextEditor *);
+    QmlEditorEditable(QmlTextEditor *);
     QList<int> context() const;
 
     bool duplicateSupported() const { return true; }
@@ -129,7 +129,7 @@ private slots:
 protected:
     void contextMenuEvent(QContextMenuEvent *e);
     TextEditor::BaseTextEditorEditable *createEditableInterface();
-    void createToolBar(ScriptEditorEditable *editable);
+    void createToolBar(QmlEditorEditable *editable);
     TextEditor::BaseTextEditor::Link findLinkAt(const QTextCursor &cursor, bool resolveTarget = true);
 
 private:
diff --git a/src/plugins/qmleditor/qmlhoverhandler.cpp b/src/plugins/qmleditor/qmlhoverhandler.cpp
index e84e4a3800f79ad5dfbf47c0ca8481dc35ff39e7..7d9ee7d7c6c686a14ed626cfb14ec90bf169607c 100644
--- a/src/plugins/qmleditor/qmlhoverhandler.cpp
+++ b/src/plugins/qmleditor/qmlhoverhandler.cpp
@@ -84,7 +84,7 @@ QmlHoverHandler::QmlHoverHandler(QObject *parent)
 
 void QmlHoverHandler::editorOpened(IEditor *editor)
 {
-    ScriptEditorEditable *qmlEditor = qobject_cast<ScriptEditorEditable *>(editor);
+    QmlEditorEditable *qmlEditor = qobject_cast<QmlEditorEditable *>(editor);
     if (!qmlEditor)
         return;