diff --git a/src/plugins/designer/CMakeLists.txt b/src/plugins/designer/CMakeLists.txt
index f6304e4a67d..18b1cf97692 100644
--- a/src/plugins/designer/CMakeLists.txt
+++ b/src/plugins/designer/CMakeLists.txt
@@ -22,7 +22,7 @@ add_qtc_plugin(Designer
     formeditorfactory.cpp formeditorfactory.h
     formeditorplugin.cpp formeditorplugin.h
     formeditorstack.cpp formeditorstack.h
-    formeditorw.cpp formeditorw.h
+    formeditor.cpp formeditor.h
     formtemplatewizardpage.cpp formtemplatewizardpage.h
     formwindoweditor.cpp formwindoweditor.h
     formwindowfile.cpp formwindowfile.h
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index b730485329d..8b97a494a7c 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -41,7 +41,7 @@ QtcPlugin {
             "formeditorfactory.cpp", "formeditorfactory.h",
             "formeditorplugin.cpp", "formeditorplugin.h",
             "formeditorstack.cpp", "formeditorstack.h",
-            "formeditorw.cpp", "formeditorw.h",
+            "formeditor.cpp", "formeditor.h",
             "formtemplatewizardpage.cpp", "formtemplatewizardpage.h",
             "formwindoweditor.cpp", "formwindoweditor.h",
             "formwindowfile.cpp", "formwindowfile.h",
diff --git a/src/plugins/designer/designercontext.cpp b/src/plugins/designer/designercontext.cpp
index 4c4587defe9..266a347bbb2 100644
--- a/src/plugins/designer/designercontext.cpp
+++ b/src/plugins/designer/designercontext.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "designercontext.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 
 #include <QDesignerFormEditorInterface>
 #include <QDesignerIntegration>
diff --git a/src/plugins/designer/editorwidget.cpp b/src/plugins/designer/editorwidget.cpp
index 9869904287f..664e953b3bc 100644
--- a/src/plugins/designer/editorwidget.cpp
+++ b/src/plugins/designer/editorwidget.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "editorwidget.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 #include "formeditorstack.h"
 
 #include <coreplugin/editormanager/ieditor.h>
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditor.cpp
similarity index 99%
rename from src/plugins/designer/formeditorw.cpp
rename to src/plugins/designer/formeditor.cpp
index 242e77772f9..96e65796500 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditor.cpp
@@ -5,7 +5,7 @@
 #include "designertr.h"
 #include "editordata.h"
 #include "editorwidget.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 #include "formwindoweditor.h"
 #include "formwindowfile.h"
 #include "qtcreatorintegration.h"
diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditor.h
similarity index 100%
rename from src/plugins/designer/formeditorw.h
rename to src/plugins/designer/formeditor.h
diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index 5a650d85829..278cb065f40 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -5,7 +5,7 @@
 
 #include "designerconstants.h"
 #include "designertr.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 
 #include <coreplugin/coreconstants.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 8db713457de..881e6a30eb5 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -6,7 +6,7 @@
 #include "designerconstants.h"
 #include "designertr.h"
 #include "formeditorfactory.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 #include "formtemplatewizardpage.h"
 
 #ifdef CPP_ENABLED
diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp
index 585e607d83b..1bccd341784 100644
--- a/src/plugins/designer/formeditorstack.cpp
+++ b/src/plugins/designer/formeditorstack.cpp
@@ -5,7 +5,7 @@
 
 #include "designerconstants.h"
 #include "formwindoweditor.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 #include "formwindowfile.h"
 
 #include <widgethost.h>
diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp
index fd13a6f1cca..68e3fb17111 100644
--- a/src/plugins/designer/formtemplatewizardpage.cpp
+++ b/src/plugins/designer/formtemplatewizardpage.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "designertr.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 #include "formtemplatewizardpage.h"
 
 #include <projectexplorer/jsonwizard/jsonwizardpagefactory.h>
diff --git a/src/plugins/designer/gotoslot_test.cpp b/src/plugins/designer/gotoslot_test.cpp
index 89740601e0d..f804c2259e3 100644
--- a/src/plugins/designer/gotoslot_test.cpp
+++ b/src/plugins/designer/gotoslot_test.cpp
@@ -3,7 +3,7 @@
 
 #include "formeditorplugin.h"
 
-#include "formeditorw.h"
+#include "formeditor.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/testdatadir.h>
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 2930f7787fa..010ab85a82b 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -5,7 +5,7 @@
 
 #include "designerconstants.h"
 #include "designertr.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 #include "formwindoweditor.h"
 
 #include <widgethost.h>
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp
index d39ef9cc24d..c393503d5ce 100644
--- a/src/plugins/designer/settingspage.cpp
+++ b/src/plugins/designer/settingspage.cpp
@@ -5,7 +5,7 @@
 
 #include "designerconstants.h"
 #include "designertr.h"
-#include "formeditorw.h"
+#include "formeditor.h"
 
 #include <coreplugin/icontext.h>