diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index e57bf276b4f9481dc90fad1129b54fbce2994744..8ccbf253dc78fa85e4a51425e2e406e12a273a70 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -82,7 +82,7 @@ SOURCES += mainwindow.cpp \
     imode.cpp \
     editormanager/systemeditor.cpp \
     designmode.cpp \
-    designmodetoolbar.cpp
+    editortoolbar.cpp
 
 HEADERS += mainwindow.h \
     editmode.h \
@@ -163,7 +163,7 @@ HEADERS += mainwindow.h \
     eventfilteringmainwindow.h \
     editormanager/systemeditor.h \
     designmode.h \
-    designmodetoolbar.h
+    editortoolbar.h
 
 FORMS += dialogs/newdialog.ui \
     dialogs/shortcutsettings.ui \
diff --git a/src/plugins/coreplugin/designmodetoolbar.cpp b/src/plugins/coreplugin/designmodetoolbar.cpp
index 90fc50dd6e05804e84114458451d3ca5a19d0541..332b0a595e26872f79987044dd15d34c866cfa5d 100644
--- a/src/plugins/coreplugin/designmodetoolbar.cpp
+++ b/src/plugins/coreplugin/designmodetoolbar.cpp
@@ -27,7 +27,7 @@
 **
 **************************************************************************/
 
-#include "designmodetoolbar.h"
+#include "editortoolbar.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/ieditor.h>
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 460fec180194f878211f502d1556389de16b7bf5..7290da9343a6439c8dd88da798bf86d28c57c5be 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -39,7 +39,7 @@
 #include "mimedatabase.h"
 #include "tabpositionindicator.h"
 #include "vcsmanager.h"
-#include "designmodetoolbar.h"
+#include "editortoolbar.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/modemanager.h>
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 8bfea9d752411048a6e9b938ba14c001b988e1b3..32ee75e4feec6cd33e2428e72ffaf015d7666e23 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -33,7 +33,7 @@
 #include "minisplitter.h"
 #include "openeditorsmodel.h"
 
-#include <coreplugin/designmodetoolbar.h>
+#include <coreplugin/editortoolbar.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/ieditor.h>
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 8a8dff3669aa272ecba990762422805a5c77a2e2..e4e896dc247734c5b10dbc581eab3fd04a5baee9 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -41,7 +41,7 @@
 #include "resourcehandler.h"
 #include <widgethost.h>
 
-#include <coreplugin/designmodetoolbar.h>
+#include <coreplugin/editortoolbar.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/designmode.h>
 #include <coreplugin/coreconstants.h>
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 9e6b0368077cff40f9d5c1946584563a0a580ec9..13ced6956cd41313d421a2832399663f03b52819 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -40,7 +40,7 @@
 #include <coreplugin/editormanager/openeditorsmodel.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/modemanager.h>
-#include <coreplugin/designmodetoolbar.h>
+#include <coreplugin/editortoolbar.h>
 
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>