diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index 20a9f41e221..14d8ea1c246 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -182,10 +182,10 @@ static ArtisticStyleSettings &settings()
 
 // ArtisticStyleOptionsPage
 
-class ArtisticStyleOptionsPageWidget : public Core::IOptionsPageWidget
+class ArtisticStyleSettingsPageWidget : public Core::IOptionsPageWidget
 {
 public:
-    ArtisticStyleOptionsPageWidget()
+    ArtisticStyleSettingsPageWidget()
     {
         QGroupBox *options = nullptr;
 
@@ -231,21 +231,6 @@ public:
     }
 };
 
-class ArtisticStyleOptionsPage final : public Core::IOptionsPage
-{
-public:
-    ArtisticStyleOptionsPage()
-    {
-        setId("ArtisticStyle");
-        setDisplayName(asDisplayName());
-        setCategory(Constants::OPTION_CATEGORY);
-        setWidgetCreator([] { return new ArtisticStyleOptionsPageWidget; });
-    }
-};
-
-const ArtisticStyleOptionsPage settingsPage;
-
-
 // Style
 
 ArtisticStyle::ArtisticStyle()
@@ -350,4 +335,21 @@ Command ArtisticStyle::textCommand(const QString &cfgFile) const
     return cmd;
 }
 
+
+//  ArtisticStyleSettingsPage
+
+class ArtisticStyleSettingsPage final : public Core::IOptionsPage
+{
+public:
+    ArtisticStyleSettingsPage()
+    {
+        setId("ArtisticStyle");
+        setDisplayName(asDisplayName());
+        setCategory(Constants::OPTION_CATEGORY);
+        setWidgetCreator([] { return new ArtisticStyleSettingsPageWidget; });
+    }
+};
+
+const ArtisticStyleSettingsPage settingsPage;
+
 } // Beautifier::Internal
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp
index 43580eeff0e..6662a6423c5 100644
--- a/src/plugins/beautifier/clangformat/clangformat.cpp
+++ b/src/plugins/beautifier/clangformat/clangformat.cpp
@@ -235,10 +235,10 @@ static ClangFormatSettings &settings()
     return theSettings;
 }
 
-class ClangFormatOptionsPageWidget : public Core::IOptionsPageWidget
+class ClangFormatSettingsPageWidget : public Core::IOptionsPageWidget
 {
 public:
-    explicit ClangFormatOptionsPageWidget()
+    ClangFormatSettingsPageWidget()
     {
         ClangFormatSettings &s = settings();
         QGroupBox *options = nullptr;
@@ -310,21 +310,6 @@ public:
     }
 };
 
-class ClangFormatOptionsPage final : public Core::IOptionsPage
-{
-public:
-    ClangFormatOptionsPage()
-    {
-        setId("ClangFormat");
-        setDisplayName(Tr::tr("Clang Format"));
-        setCategory(Constants::OPTION_CATEGORY);
-        setWidgetCreator([] { return new ClangFormatOptionsPageWidget; });
-    }
-};
-
-const ClangFormatOptionsPage settingsPage;
-
-
 // ClangFormat
 
 ClangFormat::ClangFormat()
@@ -516,4 +501,21 @@ Command ClangFormat::textCommand(int offset, int length) const
     return cmd;
 }
 
+
+// ClangFormatSettingsPage
+
+class ClangFormatSettingsPage final : public Core::IOptionsPage
+{
+public:
+    ClangFormatSettingsPage()
+    {
+        setId("ClangFormat");
+        setDisplayName(Tr::tr("Clang Format"));
+        setCategory(Constants::OPTION_CATEGORY);
+        setWidgetCreator([] { return new ClangFormatSettingsPageWidget; });
+    }
+};
+
+const ClangFormatSettingsPage settingsPage;
+
 } // Beautifier::Internal
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index fb69eac520c..f04e5e61800 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -177,10 +177,10 @@ static UncrustifySettings &settings()
     return theSettings;
 }
 
-class UncrustifyOptionsPageWidget : public Core::IOptionsPageWidget
+class UncrustifySettingsPageWidget : public Core::IOptionsPageWidget
 {
 public:
-    explicit UncrustifyOptionsPageWidget()
+    UncrustifySettingsPageWidget()
     {
         UncrustifySettings &s = settings();
 
@@ -227,20 +227,6 @@ public:
     }
 };
 
-class UncrustifyOptionsPage final : public Core::IOptionsPage
-{
-public:
-    UncrustifyOptionsPage()
-    {
-        setId("Uncrustify");
-        setDisplayName(uDisplayName());
-        setCategory(Constants::OPTION_CATEGORY);
-        setWidgetCreator([] { return new UncrustifyOptionsPageWidget; });
-    }
-};
-
-const UncrustifyOptionsPage settingsPage;
-
 
 // Uncrustify
 
@@ -381,4 +367,21 @@ Command Uncrustify::textCommand(const FilePath &cfgFile, bool fragment) const
     return cmd;
 }
 
+
+// UncrustifySettingsPage
+
+class UncrustifySettingsPage final : public Core::IOptionsPage
+{
+public:
+    UncrustifySettingsPage()
+    {
+        setId("Uncrustify");
+        setDisplayName(uDisplayName());
+        setCategory(Constants::OPTION_CATEGORY);
+        setWidgetCreator([] { return new UncrustifySettingsPageWidget; });
+    }
+};
+
+const UncrustifySettingsPage settingsPage;
+
 } // Beautifier::Internal