diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 37e9c148c59..b91da03e8ea 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -1149,7 +1149,7 @@ void AndroidConfigurations::registerNewToolChains()
     const Toolchains existingAndroidToolChains
             = ToolChainManager::toolchains(Utils::equal(&ToolChain::typeId, Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
 
-    const Toolchains newToolchains = AndroidToolChainFactory::autodetectToolChains(
+    const Toolchains newToolchains = AndroidToolchainFactory::autodetectToolChains(
         existingAndroidToolChains);
 
     for (ToolChain *tc : newToolchains)
@@ -1311,7 +1311,7 @@ void AndroidConfigurations::registerCustomToolChainsAndDebuggers()
 
     const FilePaths customNdks = FileUtils::toFilePathList(currentConfig().getCustomNdkList());
     const Toolchains customToolchains
-        = AndroidToolChainFactory::autodetectToolChainsFromNdks(existingAndroidToolChains,
+        = AndroidToolchainFactory::autodetectToolChainsFromNdks(existingAndroidToolChains,
                                                                 customNdks,
                                                                 true);
     for (ToolChain *tc : customToolchains) {
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index e2c9bfd59d8..cf1a79da15d 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -137,7 +137,7 @@ GccToolChain::DetectedAbisResult AndroidToolChain::detectSupportedAbis() const
 // ToolChainFactory
 // --------------------------------------------------------------------------
 
-AndroidToolChainFactory::AndroidToolChainFactory()
+AndroidToolchainFactory::AndroidToolchainFactory()
 {
     setDisplayName(Tr::tr("Android Clang"));
     setSupportedToolChainType(Constants::ANDROID_TOOLCHAIN_TYPEID);
@@ -169,13 +169,13 @@ static FilePaths uniqueNdksForCurrentQtVersions()
     return uniqueNdks;
 }
 
-ToolChainList AndroidToolChainFactory::autodetectToolChains(const ToolChainList &alreadyKnown)
+ToolChainList AndroidToolchainFactory::autodetectToolChains(const ToolChainList &alreadyKnown)
 {
     const QList<FilePath> uniqueNdks = uniqueNdksForCurrentQtVersions();
     return autodetectToolChainsFromNdks(alreadyKnown, uniqueNdks);
 }
 
-ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
+ToolChainList AndroidToolchainFactory::autodetectToolChainsFromNdks(
     const ToolChainList &alreadyKnown,
     const QList<FilePath> &ndkLocations,
     const bool isCustom)
@@ -253,7 +253,7 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
 
 void setupAndroidToolchain()
 {
-    static AndroidToolChainFactory theAndroidToolchainFactory;
+    static AndroidToolchainFactory theAndroidToolchainFactory;
 }
 
 } // Android::Internal
diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h
index 1d5bdf5af86..f11efa316cb 100644
--- a/src/plugins/android/androidtoolchain.h
+++ b/src/plugins/android/androidtoolchain.h
@@ -32,15 +32,15 @@ protected:
 private:
     explicit AndroidToolChain();
 
-    friend class AndroidToolChainFactory;
+    friend class AndroidToolchainFactory;
 
     mutable Utils::FilePath m_ndkLocation;
 };
 
-class AndroidToolChainFactory : public ProjectExplorer::ToolChainFactory
+class AndroidToolchainFactory : public ProjectExplorer::ToolchainFactory
 {
 public:
-    AndroidToolChainFactory();
+    AndroidToolchainFactory();
 
     class AndroidToolChainInformation
     {
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index e4fba3c3e62..d7bd066ca09 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -314,7 +314,7 @@ public:
 private:
     StringListAspect m_extraCodeModelFlags{this};
 
-    friend class IarToolChainFactory;
+    friend class IarToolchainFactory;
     friend class IarToolChainConfigWidget;
 };
 
@@ -405,12 +405,12 @@ bool IarToolChain::operator==(const ToolChain &other) const
 }
 
 
-// IarToolChainFactory
+// IarToolchainFactory
 
-class IarToolChainFactory final : public ToolChainFactory
+class IarToolchainFactory final : public ToolchainFactory
 {
 public:
-    IarToolChainFactory()
+    IarToolchainFactory()
     {
         setDisplayName(Tr::tr("IAREW"));
         setSupportedToolChainType(Constants::IAREW_TOOLCHAIN_TYPEID);
@@ -431,10 +431,10 @@ private:
 
 void setupIarToolChain()
 {
-    static IarToolChainFactory theIarToolChainFactory;
+    static IarToolchainFactory theIarToolChainFactory;
 }
 
-Toolchains IarToolChainFactory::autoDetect(const ToolchainDetector &detector) const
+Toolchains IarToolchainFactory::autoDetect(const ToolchainDetector &detector) const
 {
     Candidates candidates;
 
@@ -507,12 +507,12 @@ Toolchains IarToolChainFactory::autoDetect(const ToolchainDetector &detector) co
     return autoDetectToolchains(candidates, detector.alreadyKnown);
 }
 
-Toolchains IarToolChainFactory::detectForImport(const ToolChainDescription &tcd) const
+Toolchains IarToolchainFactory::detectForImport(const ToolChainDescription &tcd) const
 {
     return { autoDetectToolchain({tcd.compilerPath, {}}, tcd.language) };
 }
 
-Toolchains IarToolChainFactory::autoDetectToolchains(
+Toolchains IarToolchainFactory::autoDetectToolchains(
         const Candidates &candidates, const Toolchains &alreadyKnown) const
 {
     Toolchains result;
@@ -538,7 +538,7 @@ Toolchains IarToolChainFactory::autoDetectToolchains(
     return result;
 }
 
-Toolchains IarToolChainFactory::autoDetectToolchain(const Candidate &candidate, Id languageId) const
+Toolchains IarToolchainFactory::autoDetectToolchain(const Candidate &candidate, Id languageId) const
 {
     if (ToolChainManager::isBadToolchain(candidate.compilerPath))
         return {};
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index ff3ec22dd56..6b53281bb64 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -454,7 +454,7 @@ public:
 private:
     StringListAspect m_extraCodeModelFlags{this};
 
-    friend class KeilToolChainFactory;
+    friend class KeilToolchainFactory;
     friend class KeilToolChainConfigWidget;
 };
 
@@ -538,10 +538,10 @@ QStringList KeilToolChain::extraCodeModelFlags() const
 
 // KeilToolchainFactory
 
-class KeilToolChainFactory final : public ToolChainFactory
+class KeilToolchainFactory final : public ToolchainFactory
 {
 public:
-    KeilToolChainFactory()
+    KeilToolchainFactory()
     {
         setDisplayName(Tr::tr("KEIL"));
         setSupportedToolChainType(Constants::KEIL_TOOLCHAIN_TYPEID);
@@ -562,7 +562,7 @@ private:
 
 void setupKeilToolChain()
 {
-    static KeilToolChainFactory theKeilToolChainFactory;
+    static KeilToolchainFactory theKeilToolChainFactory;
 }
 
 // Parse the 'tools.ini' file to fetch a toolchain version.
@@ -609,7 +609,7 @@ static QString extractVersion(const QString &toolsFile, const QString &section)
     return {};
 }
 
-Toolchains KeilToolChainFactory::autoDetect(const ToolchainDetector &detector) const
+Toolchains KeilToolchainFactory::autoDetect(const ToolchainDetector &detector) const
 {
 #ifdef Q_OS_WIN64
     static const char kRegistryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Microsoft\\" \
@@ -660,7 +660,7 @@ Toolchains KeilToolChainFactory::autoDetect(const ToolchainDetector &detector) c
     return autoDetectToolchains(candidates, detector.alreadyKnown);
 }
 
-Toolchains KeilToolChainFactory::autoDetectToolchains(
+Toolchains KeilToolchainFactory::autoDetectToolchains(
         const Candidates &candidates, const Toolchains &alreadyKnown) const
 {
     Toolchains result;
@@ -687,7 +687,7 @@ Toolchains KeilToolChainFactory::autoDetectToolchains(
     return result;
 }
 
-Toolchains KeilToolChainFactory::autoDetectToolchain(const Candidate &candidate, Id language) const
+Toolchains KeilToolchainFactory::autoDetectToolchain(const Candidate &candidate, Id language) const
 {
     if (ToolChainManager::isBadToolchain(candidate.compilerPath))
         return {};
diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp
index 082688ff3bf..b682400edf6 100644
--- a/src/plugins/baremetal/sdcctoolchain.cpp
+++ b/src/plugins/baremetal/sdcctoolchain.cpp
@@ -225,7 +225,7 @@ public:
     FilePath makeCommand(const Environment &) const final { return {}; }
 
 private:
-    friend class SdccToolChainFactory;
+    friend class SdccToolchainFactory;
     friend class SdccToolChainConfigWidget;
 };
 
@@ -298,12 +298,12 @@ bool SdccToolChain::operator==(const ToolChain &other) const
             && targetAbi() == customTc->targetAbi();
 }
 
-// SdccToolChainFactory
+// SdccToolchainFactory
 
-class SdccToolChainFactory final : public ToolChainFactory
+class SdccToolchainFactory final : public ToolchainFactory
 {
 public:
-    SdccToolChainFactory()
+    SdccToolchainFactory()
     {
         setDisplayName(Tr::tr("SDCC"));
         setSupportedToolChainType(Constants::SDCC_TOOLCHAIN_TYPEID);
@@ -322,10 +322,10 @@ private:
 
 void setupSdccToolChain()
 {
-    static SdccToolChainFactory theSdccToolChainFactory;
+    static SdccToolchainFactory theSdccToolChainFactory;
 }
 
-Toolchains SdccToolChainFactory::autoDetect(const ToolchainDetector &detector) const
+Toolchains SdccToolchainFactory::autoDetect(const ToolchainDetector &detector) const
 {
     Candidates candidates;
 
@@ -382,7 +382,7 @@ Toolchains SdccToolChainFactory::autoDetect(const ToolchainDetector &detector) c
     return autoDetectToolchains(candidates, detector.alreadyKnown);
 }
 
-Toolchains SdccToolChainFactory::autoDetectToolchains(
+Toolchains SdccToolchainFactory::autoDetectToolchains(
         const Candidates &candidates, const Toolchains &alreadyKnown) const
 {
     Toolchains result;
@@ -406,7 +406,7 @@ Toolchains SdccToolChainFactory::autoDetectToolchains(
     return result;
 }
 
-Toolchains SdccToolChainFactory::autoDetectToolchain(const Candidate &candidate, Id language) const
+Toolchains SdccToolchainFactory::autoDetectToolchain(const Candidate &candidate, Id language) const
 {
     const auto env = Environment::systemEnvironment();
 
diff --git a/src/plugins/docker/kitdetector.cpp b/src/plugins/docker/kitdetector.cpp
index 2408d366dc1..b443b3ef5b0 100644
--- a/src/plugins/docker/kitdetector.cpp
+++ b/src/plugins/docker/kitdetector.cpp
@@ -249,13 +249,13 @@ QtVersions KitDetectorPrivate::autoDetectQtVersions() const
 
 Toolchains KitDetectorPrivate::autoDetectToolChains()
 {
-    const QList<ToolChainFactory *> factories = ToolChainFactory::allToolChainFactories();
+    const QList<ToolchainFactory *> factories = ToolchainFactory::allToolchainFactories();
 
     Toolchains alreadyKnown = ToolChainManager::toolchains();
     Toolchains allNewToolChains;
     QApplication::processEvents();
     emit q->logOutput('\n' + ProjectExplorer::Tr::tr("Searching toolchains..."));
-    for (ToolChainFactory *factory : factories) {
+    for (ToolchainFactory *factory : factories) {
         emit q->logOutput(ProjectExplorer::Tr::tr("Searching toolchains of type %1").arg(factory->displayName()));
         const ToolchainDetector detector(alreadyKnown, m_device, m_searchPaths);
         const Toolchains newToolChains = factory->autoDetect(detector);
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index 105ba236eaa..b7ec36f883f 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -570,13 +570,13 @@ ProvisioningProfilePtr IosConfigurations::provisioningProfile(const QString &pro
                                 equal(&ProvisioningProfile::identifier, profileID));
 }
 
-IosToolChainFactory::IosToolChainFactory()
+IosToolchainFactory::IosToolchainFactory()
 {
     setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID,
                            ProjectExplorer::Constants::CXX_LANGUAGE_ID});
 }
 
-Toolchains IosToolChainFactory::autoDetect(const ToolchainDetector &detector) const
+Toolchains IosToolchainFactory::autoDetect(const ToolchainDetector &detector) const
 {
     if (detector.device->type() != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE)
         return {};
diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h
index 3b77c6d1959..90a98d862bf 100644
--- a/src/plugins/ios/iosconfigurations.h
+++ b/src/plugins/ios/iosconfigurations.h
@@ -69,10 +69,10 @@ private:
 using DevelopmentTeamPtr = std::shared_ptr<DevelopmentTeam>;
 using DevelopmentTeams = QList<DevelopmentTeamPtr>;
 
-class IosToolChainFactory : public ProjectExplorer::ToolChainFactory
+class IosToolchainFactory : public ProjectExplorer::ToolchainFactory
 {
 public:
-    IosToolChainFactory();
+    IosToolchainFactory();
 
     ProjectExplorer::Toolchains autoDetect(
             const ProjectExplorer::ToolchainDetector &detector) const final;
diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp
index 9f790aa17f9..0be01955dd0 100644
--- a/src/plugins/ios/iosplugin.cpp
+++ b/src/plugins/ios/iosplugin.cpp
@@ -47,7 +47,7 @@ class IosPluginPrivate
 public:
     IosQmakeBuildConfigurationFactory qmakeBuildConfigurationFactory;
     IosCMakeBuildConfigurationFactory cmakeBuildConfigurationFactory;
-    IosToolChainFactory toolChainFactory;
+    IosToolchainFactory toolChainFactory;
     IosRunConfigurationFactory runConfigurationFactory;
     IosSettingsPage settingsPage;
     IosQtVersionFactory qtVersionFactory;
diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp
index 84c9d7d2d5c..26f6b80a6c5 100644
--- a/src/plugins/mcusupport/mcupackage.cpp
+++ b/src/plugins/mcusupport/mcupackage.cpp
@@ -414,9 +414,9 @@ static ToolChain *armGccToolChain(const FilePath &path, Id language)
         return t->compilerCommand() == path && t->language() == language;
     });
     if (!toolChain) {
-        ToolChainFactory *gccFactory
-            = Utils::findOrDefault(ToolChainFactory::allToolChainFactories(),
-                                   [](ToolChainFactory *f) {
+        ToolchainFactory *gccFactory
+            = Utils::findOrDefault(ToolchainFactory::allToolchainFactories(),
+                                   [](ToolchainFactory *f) {
                                        return f->supportedToolChainType()
                                               == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID;
                                    });
@@ -441,9 +441,9 @@ static ToolChain *iarToolChain(const FilePath &path, Id language)
                && t->language() == language;
     });
     if (!toolChain) {
-        ToolChainFactory *iarFactory
-            = Utils::findOrDefault(ToolChainFactory::allToolChainFactories(),
-                                   [](ToolChainFactory *f) {
+        ToolchainFactory *iarFactory
+            = Utils::findOrDefault(ToolchainFactory::allToolchainFactories(),
+                                   [](ToolchainFactory *f) {
                                        return f->supportedToolChainType()
                                               == BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID;
                                    });
diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index 13ed66f8035..379395a2933 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -212,9 +212,9 @@ auto expandTargetsAndPackages = [](Targets &targets, Packages &packages) {
 
 void verifyIarToolchain(const McuToolChainPackagePtr &iarToolchainPackage)
 {
-    ProjectExplorer::ToolChainFactory toolchainFactory;
+    ProjectExplorer::ToolchainFactory toolchainFactory;
     Id iarId{BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID};
-    ToolChain *iarToolchain{ProjectExplorer::ToolChainFactory::createToolChain(iarId)};
+    ToolChain *iarToolchain{ProjectExplorer::ToolchainFactory::createToolChain(iarId)};
     iarToolchain->setLanguage(cxxLanguageId);
     ToolChainManager::registerToolChain(iarToolchain);
 
@@ -235,10 +235,10 @@ void verifyIarToolchain(const McuToolChainPackagePtr &iarToolchainPackage)
 void verifyArmGccToolchain(const McuToolChainPackagePtr &armGccPackage, const QStringList &versions)
 {
     //Fake register and fake detect compiler.
-    ProjectExplorer::ToolChainFactory toolchainFactory;
+    ProjectExplorer::ToolchainFactory toolchainFactory;
     Id armGccId{ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID};
 
-    ToolChain *armToolchain{ProjectExplorer::ToolChainFactory::createToolChain(armGccId)};
+    ToolChain *armToolchain{ProjectExplorer::ToolchainFactory::createToolChain(armGccId)};
     armToolchain->setLanguage(cxxLanguageId);
     ToolChainManager::registerToolChain(armToolchain);
 
diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp
index 1b435ae0ebd..d3495f0a24a 100644
--- a/src/plugins/nim/nimplugin.cpp
+++ b/src/plugins/nim/nimplugin.cpp
@@ -54,7 +54,7 @@ public:
     NimCompilerCleanStepFactory cleanStepFactory;
     NimCodeStyleSettingsPage codeStyleSettingsPage;
     NimCodeStylePreferencesFactory codeStylePreferencesPage;
-    NimToolChainFactory toolChainFactory;
+    NimToolchainFactory toolChainFactory;
 
     NimProjectFactory nimProjectFactory;
     NimbleProjectFactory nimbleProjectFactory;
diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp
index a128846f9a0..05efffbb9df 100644
--- a/src/plugins/nim/project/nimtoolchain.cpp
+++ b/src/plugins/nim/project/nimtoolchain.cpp
@@ -118,7 +118,7 @@ bool NimToolChain::parseVersion(const FilePath &path, std::tuple<int, int, int>
     return true;
 }
 
-// NimToolChainConfigWidget
+// NimToolchainConfigWidget
 
 class NimToolChainConfigWidget : public ToolchainConfigWidget
 {
@@ -201,9 +201,9 @@ std::unique_ptr<ToolchainConfigWidget> NimToolChain::createConfigurationWidget()
     return std::make_unique<NimToolChainConfigWidget>(this);
 }
 
-// NimToolChainFactory
+// NimToolchainFactory
 
-NimToolChainFactory::NimToolChainFactory()
+NimToolchainFactory::NimToolchainFactory()
 {
     setDisplayName(Tr::tr("Nim"));
     setSupportedToolChainType(Constants::C_NIMTOOLCHAIN_TYPEID);
@@ -212,7 +212,7 @@ NimToolChainFactory::NimToolChainFactory()
     setUserCreatable(true);
 }
 
-Toolchains NimToolChainFactory::autoDetect(const ToolchainDetector &detector) const
+Toolchains NimToolchainFactory::autoDetect(const ToolchainDetector &detector) const
 {
     Toolchains result;
 
@@ -235,7 +235,7 @@ Toolchains NimToolChainFactory::autoDetect(const ToolchainDetector &detector) co
     return result;
 }
 
-Toolchains NimToolChainFactory::detectForImport(const ToolChainDescription &tcd) const
+Toolchains NimToolchainFactory::detectForImport(const ToolChainDescription &tcd) const
 {
     Toolchains result;
     if (tcd.language == Constants::C_NIMLANGUAGE_ID) {
diff --git a/src/plugins/nim/project/nimtoolchain.h b/src/plugins/nim/project/nimtoolchain.h
index eb6d950d556..992c2084f10 100644
--- a/src/plugins/nim/project/nimtoolchain.h
+++ b/src/plugins/nim/project/nimtoolchain.h
@@ -34,10 +34,10 @@ private:
     std::tuple<int, int, int> m_version;
 };
 
-class NimToolChainFactory : public ProjectExplorer::ToolChainFactory
+class NimToolchainFactory : public ProjectExplorer::ToolchainFactory
 {
 public:
-    NimToolChainFactory();
+    NimToolchainFactory();
 
     ProjectExplorer::Toolchains autoDetect(const ProjectExplorer::ToolchainDetector &detector) const final;
     ProjectExplorer::Toolchains detectForImport(const ProjectExplorer::ToolChainDescription &tcd) const final;
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index a619ed2b897..8300fcf49f7 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -558,7 +558,7 @@ std::unique_ptr<ToolchainConfigWidget> CustomToolChain::createConfigurationWidge
 // CustomToolChainFactory
 // --------------------------------------------------------------------------
 
-CustomToolChainFactory::CustomToolChainFactory()
+CustomToolchainFactory::CustomToolchainFactory()
 {
     setDisplayName(Tr::tr("Custom"));
     setSupportedToolChainType(Constants::CUSTOM_TOOLCHAIN_TYPEID);
diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h
index a8d8616efb9..2263eec5413 100644
--- a/src/plugins/projectexplorer/customtoolchain.h
+++ b/src/plugins/projectexplorer/customtoolchain.h
@@ -7,10 +7,10 @@
 
 namespace ProjectExplorer::Internal {
 
-class CustomToolChainFactory : public ToolChainFactory
+class CustomToolchainFactory : public ToolchainFactory
 {
 public:
-    CustomToolChainFactory();
+    CustomToolchainFactory();
 };
 
 } // ProjectExplorer::Interna;
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index c4a2dcd6b23..5ffb9314c43 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -1276,7 +1276,7 @@ static ToolChain *constructLinuxIccToolchain()
 
 namespace Internal {
 
-class GccToolchainFactory final : public ToolChainFactory
+class GccToolchainFactory final : public ToolchainFactory
 {
 public:
     explicit GccToolchainFactory(GccToolChain::SubType subType)
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index d701a8db320..50000a27e76 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -150,7 +150,7 @@ private:
 
     friend class Internal::GccToolChainConfigWidget;
     friend class Internal::GccToolchainFactory;
-    friend class ToolChainFactory;
+    friend class ToolchainFactory;
 
     // "resolved" on macOS from /usr/bin/clang(++) etc to <DeveloperDir>/usr/bin/clang(++)
     // which is used for comparison with matchesCompilerCommand
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index cbe7673d7f6..8e8482e3584 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -1866,7 +1866,7 @@ ClangClToolChain::BuiltInHeaderPathsRunner ClangClToolChain::createBuiltInHeader
 // MsvcToolchainFactory
 // --------------------------------------------------------------------------
 
-class MsvcToolchainFactory : public ToolChainFactory
+class MsvcToolchainFactory : public ToolchainFactory
 {
 public:
     MsvcToolchainFactory()
@@ -2237,7 +2237,7 @@ bool MsvcToolChain::WarningFlagAdder::triggered() const
 // ClangClToolchainFactory
 // --------------------------------------------------------------------------
 
-class ClangClToolchainFactory : public ToolChainFactory
+class ClangClToolchainFactory : public ToolchainFactory
 {
 public:
     ClangClToolchainFactory()
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index e925ed66d2c..f6c61bded15 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -645,7 +645,7 @@ public:
     WinDebugInterface m_winDebugInterface;
 #endif
 
-    CustomToolChainFactory m_customToolChainFactory;
+    CustomToolchainFactory m_customToolChainFactory;
 
     DesktopDeviceFactory m_desktopDeviceFactory;
 
diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp
index fec26598c33..9507a7e36b9 100644
--- a/src/plugins/projectexplorer/projectimporter.cpp
+++ b/src/plugins/projectexplorer/projectimporter.cpp
@@ -370,7 +370,7 @@ static ProjectImporter::ToolChainData createToolChains(const ToolChainDescriptio
 {
     ProjectImporter::ToolChainData data;
 
-    for (ToolChainFactory *factory : ToolChainFactory::allToolChainFactories()) {
+    for (ToolchainFactory *factory : ToolchainFactory::allToolchainFactories()) {
         data.tcs = factory->detectForImport(tcd);
         if (data.tcs.isEmpty())
             continue;
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 5d51c501715..2d367cd5eb3 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -28,9 +28,9 @@ const char LANGUAGE_KEY_V1[] = "ProjectExplorer.ToolChain.Language"; // For QtCr
 const char LANGUAGE_KEY_V2[] = "ProjectExplorer.ToolChain.LanguageV2"; // For QtCreator > 4.2
 const char CODE_MODEL_TRIPLE_KEY[] = "ExplicitCodeModelTargetTriple";
 
-QList<ToolChainFactory *> &toolChainFactories()
+QList<ToolchainFactory *> &toolchainFactories()
 {
-    static QList<ToolChainFactory *> theToolChainFactories;
+    static QList<ToolchainFactory *> theToolChainFactories;
     return theToolChainFactories;
 }
 
@@ -219,7 +219,7 @@ bool ToolChain::operator == (const ToolChain &tc) const
 
 ToolChain *ToolChain::clone() const
 {
-    for (ToolChainFactory *f : std::as_const(toolChainFactories())) {
+    for (ToolchainFactory *f : std::as_const(toolchainFactories())) {
         if (f->supportedToolChainType() == d->m_typeId) {
             ToolChain *tc = f->create();
             QTC_ASSERT(tc, return nullptr);
@@ -557,44 +557,44 @@ void ToolChain::setExplicitCodeModelTargetTriple(const QString &triple)
     Used by the tool chain manager to restore user-generated tool chains.
 */
 
-ToolChainFactory::ToolChainFactory()
+ToolchainFactory::ToolchainFactory()
 {
-    toolChainFactories().append(this);
+    toolchainFactories().append(this);
 }
 
-ToolChainFactory::~ToolChainFactory()
+ToolchainFactory::~ToolchainFactory()
 {
-    toolChainFactories().removeOne(this);
+    toolchainFactories().removeOne(this);
 }
 
-const QList<ToolChainFactory *> ToolChainFactory::allToolChainFactories()
+const QList<ToolchainFactory *> ToolchainFactory::allToolchainFactories()
 {
-    return toolChainFactories();
+    return toolchainFactories();
 }
 
-Toolchains ToolChainFactory::autoDetect(const ToolchainDetector &detector) const
+Toolchains ToolchainFactory::autoDetect(const ToolchainDetector &detector) const
 {
     Q_UNUSED(detector)
     return {};
 }
 
-Toolchains ToolChainFactory::detectForImport(const ToolChainDescription &tcd) const
+Toolchains ToolchainFactory::detectForImport(const ToolChainDescription &tcd) const
 {
     Q_UNUSED(tcd)
     return {};
 }
 
-bool ToolChainFactory::canCreate() const
+bool ToolchainFactory::canCreate() const
 {
     return m_userCreatable;
 }
 
-ToolChain *ToolChainFactory::create() const
+ToolChain *ToolchainFactory::create() const
 {
     return m_toolchainConstructor ? m_toolchainConstructor() : nullptr;
 }
 
-ToolChain *ToolChainFactory::restore(const Store &data)
+ToolChain *ToolchainFactory::restore(const Store &data)
 {
     if (!m_toolchainConstructor)
         return nullptr;
@@ -618,24 +618,24 @@ static QPair<QString, QString> rawIdData(const Store &data)
     return {raw.mid(0, pos), raw.mid(pos + 1)};
 }
 
-QByteArray ToolChainFactory::idFromMap(const Store &data)
+QByteArray ToolchainFactory::idFromMap(const Store &data)
 {
     return rawIdData(data).second.toUtf8();
 }
 
-Id ToolChainFactory::typeIdFromMap(const Store &data)
+Id ToolchainFactory::typeIdFromMap(const Store &data)
 {
     return Id::fromString(rawIdData(data).first);
 }
 
-void ToolChainFactory::autoDetectionToMap(Store &data, bool detected)
+void ToolchainFactory::autoDetectionToMap(Store &data, bool detected)
 {
     data.insert(AUTODETECT_KEY, detected);
 }
 
-ToolChain *ToolChainFactory::createToolChain(Id toolChainType)
+ToolChain *ToolchainFactory::createToolChain(Id toolChainType)
 {
-    for (ToolChainFactory *factory : std::as_const(toolChainFactories())) {
+    for (ToolchainFactory *factory : std::as_const(toolchainFactories())) {
         if (factory->m_supportedToolChainType == toolChainType) {
             if (ToolChain *tc = factory->create()) {
                 tc->d->m_typeId = toolChainType;
@@ -646,42 +646,42 @@ ToolChain *ToolChainFactory::createToolChain(Id toolChainType)
     return nullptr;
 }
 
-QList<Id> ToolChainFactory::supportedLanguages() const
+QList<Id> ToolchainFactory::supportedLanguages() const
 {
     return m_supportsAllLanguages ? ToolChainManager::allLanguages() : m_supportedLanguages;
 }
 
-Id ToolChainFactory::supportedToolChainType() const
+Id ToolchainFactory::supportedToolChainType() const
 {
     return m_supportedToolChainType;
 }
 
-void ToolChainFactory::setSupportedToolChainType(const Id &supportedToolChain)
+void ToolchainFactory::setSupportedToolChainType(const Id &supportedToolChain)
 {
     m_supportedToolChainType = supportedToolChain;
 }
 
-void ToolChainFactory::setSupportedLanguages(const QList<Id> &supportedLanguages)
+void ToolchainFactory::setSupportedLanguages(const QList<Id> &supportedLanguages)
 {
     m_supportedLanguages = supportedLanguages;
 }
 
-void ToolChainFactory::setSupportsAllLanguages(bool supportsAllLanguages)
+void ToolchainFactory::setSupportsAllLanguages(bool supportsAllLanguages)
 {
     m_supportsAllLanguages = supportsAllLanguages;
 }
 
-void ToolChainFactory::setToolchainConstructor(const ToolChainConstructor &toolchainContructor)
+void ToolchainFactory::setToolchainConstructor(const ToolChainConstructor &toolchainContructor)
 {
     m_toolchainConstructor = toolchainContructor;
 }
 
-ToolChainFactory::ToolChainConstructor ToolChainFactory::toolchainConstructor() const
+ToolchainFactory::ToolChainConstructor ToolchainFactory::toolchainConstructor() const
 {
     return m_toolchainConstructor;
 }
 
-void ToolChainFactory::setUserCreatable(bool userCreatable)
+void ToolchainFactory::setUserCreatable(bool userCreatable)
 {
     m_userCreatable = userCreatable;
 }
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index df711d7a9e2..3c4ea73c53b 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -42,7 +42,6 @@ QString languageId(Language l);
 
 class GccToolChain;
 class ToolchainConfigWidget;
-class ToolChainFactory;
 class Kit;
 
 namespace Internal { class ToolChainSettingsAccessor; }
@@ -198,7 +197,7 @@ private:
     const std::unique_ptr<Internal::ToolChainPrivate> d;
 
     friend class Internal::ToolChainSettingsAccessor;
-    friend class ToolChainFactory;
+    friend class ToolchainFactory;
 };
 
 using Toolchains = QList<ToolChain *>;
@@ -242,16 +241,16 @@ public:
     const Utils::FilePaths searchPaths; // If empty use device path and/or magic.
 };
 
-class PROJECTEXPLORER_EXPORT ToolChainFactory
+class PROJECTEXPLORER_EXPORT ToolchainFactory
 {
-    ToolChainFactory(const ToolChainFactory &) = delete;
-    ToolChainFactory &operator=(const ToolChainFactory &) = delete;
+    ToolchainFactory(const ToolchainFactory &) = delete;
+    ToolchainFactory &operator=(const ToolchainFactory &) = delete;
 
 public:
-    ToolChainFactory();
-    virtual ~ToolChainFactory();
+    ToolchainFactory();
+    virtual ~ToolchainFactory();
 
-    static const QList<ToolChainFactory *> allToolChainFactories();
+    static const QList<ToolchainFactory *> allToolchainFactories();
 
     QString displayName() const { return m_displayName; }
     Utils::Id supportedToolChainType() const;
@@ -288,7 +287,7 @@ protected:
         Utils::FilePath compilerPath;
         QString compilerVersion;
 
-        bool operator==(const ToolChainFactory::Candidate &other) const {
+        bool operator==(const ToolchainFactory::Candidate &other) const {
             return compilerPath == other.compilerPath
                     && compilerVersion == other.compilerVersion;
         }
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index a4efa921634..fcd59e46b08 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -155,8 +155,8 @@ public:
     ToolChainOptionsWidget()
     {
         m_detectionSettings = ToolChainManager::detectionSettings();
-        m_factories = Utils::filtered(ToolChainFactory::allToolChainFactories(),
-                    [](ToolChainFactory *factory) { return factory->canCreate();});
+        m_factories = Utils::filtered(ToolchainFactory::allToolchainFactories(),
+                    [](ToolchainFactory *factory) { return factory->canCreate();});
 
         m_model.setHeader({Tr::tr("Name"), Tr::tr("Type")});
         auto autoRoot = new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
@@ -194,7 +194,7 @@ public:
 
         m_addButton = new QPushButton(Tr::tr("Add"), this);
         auto addMenu = new QMenu;
-        for (ToolChainFactory *factory : std::as_const(m_factories)) {
+        for (ToolchainFactory *factory : std::as_const(m_factories)) {
             QList<Utils::Id> languages = factory->supportedLanguages();
             if (languages.isEmpty())
                 continue;
@@ -295,7 +295,7 @@ public:
 
     void toolChainSelectionChanged();
     void updateState();
-    void createToolChain(ToolChainFactory *factory, const Utils::Id &language);
+    void createToolChain(ToolchainFactory *factory, const Utils::Id &language);
     void cloneToolChain();
     ToolChainTreeItem *currentTreeItem();
 
@@ -305,7 +305,7 @@ public:
     void removeToolChain(ProjectExplorer::ToolChain *);
 
     StaticTreeItem *parentForToolChain(ToolChain *tc);
-    QAction *createAction(const QString &name, ToolChainFactory *factory, Utils::Id language)
+    QAction *createAction(const QString &name, ToolchainFactory *factory, Utils::Id language)
     {
         auto action = new QAction(name, nullptr);
         connect(action, &QAction::triggered, this,
@@ -320,7 +320,7 @@ public:
  private:
     TreeModel<TreeItem, ToolChainTreeItem> m_model;
     KitSettingsSortModel m_sortModel;
-    QList<ToolChainFactory *> m_factories;
+    QList<ToolchainFactory *> m_factories;
     QTreeView *m_toolChainView;
     DetailsWidget *m_container;
     QStackedWidget *m_widgetStack;
@@ -414,7 +414,7 @@ void ToolChainOptionsWidget::redetectToolchains()
     Toolchains toAdd;
     QSet<ToolChain *> toDelete;
     ToolChainManager::resetBadToolchains();
-    for (ToolChainFactory *f : ToolChainFactory::allToolChainFactories()) {
+    for (ToolchainFactory *f : ToolchainFactory::allToolchainFactories()) {
         const ToolchainDetector detector(knownTcs, DeviceManager::defaultDesktopDevice(), {});  // FIXME: Pass search paths
         for (ToolChain * const tc : f->autoDetect(detector)) {
             if (knownTcs.contains(tc) || toDelete.contains(tc))
@@ -508,7 +508,7 @@ void ToolChainOptionsWidget::apply()
     ToolChainManager::setDetectionSettings(m_detectionSettings);
 }
 
-void ToolChainOptionsWidget::createToolChain(ToolChainFactory *factory, const Utils::Id &language)
+void ToolChainOptionsWidget::createToolChain(ToolchainFactory *factory, const Utils::Id &language)
 {
     QTC_ASSERT(factory, return);
     QTC_ASSERT(factory->canCreate(), return);
diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
index 9af52f0bf9c..fcc66e6e956 100644
--- a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
+++ b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
@@ -57,7 +57,7 @@ struct ToolChainOperations
 static Toolchains autoDetectToolChains(const ToolchainDetector &detector)
 {
     Toolchains result;
-    for (ToolChainFactory *f : ToolChainFactory::allToolChainFactories()) {
+    for (ToolchainFactory *f : ToolchainFactory::allToolchainFactories()) {
         NANOTRACE_SCOPE_ARGS("ProjectExplorer",
                              "ToolChainSettingsAccessor::autoDetectToolChains",
                              {"factory", f->displayName().toStdString()});
@@ -243,7 +243,7 @@ void ToolChainSettingsAccessor::saveToolChains(const Toolchains &toolchains, QWi
 Toolchains ToolChainSettingsAccessor::toolChains(const Store &data) const
 {
     Toolchains result;
-    const QList<ToolChainFactory *> factories = ToolChainFactory::allToolChainFactories();
+    const QList<ToolchainFactory *> factories = ToolchainFactory::allToolchainFactories();
 
     const int count = data.value(TOOLCHAIN_COUNT_KEY, 0).toInt();
     for (int i = 0; i < count; ++i) {
@@ -254,9 +254,9 @@ Toolchains ToolChainSettingsAccessor::toolChains(const Store &data) const
         const Store tcMap = storeFromVariant(data.value(key));
 
         bool restored = false;
-        const Utils::Id tcType = ToolChainFactory::typeIdFromMap(tcMap);
+        const Utils::Id tcType = ToolchainFactory::typeIdFromMap(tcMap);
         if (tcType.isValid()) {
-            for (ToolChainFactory *f : factories) {
+            for (ToolchainFactory *f : factories) {
                 if (f->supportedToolChainType() == tcType) {
                     if (ToolChain *tc = f->restore(tcMap)) {
                         result.append(tc);
@@ -269,7 +269,7 @@ Toolchains ToolChainSettingsAccessor::toolChains(const Store &data) const
         if (!restored)
             qWarning("Warning: Unable to restore compiler type '%s' for tool chain %s.",
                      qPrintable(tcType.toString()),
-                     qPrintable(QString::fromUtf8(ToolChainFactory::idFromMap(tcMap))));
+                     qPrintable(QString::fromUtf8(ToolchainFactory::idFromMap(tcMap))));
     }
 
     return result;
@@ -356,16 +356,16 @@ namespace ProjectExplorer {
 
 void ProjectExplorerPlugin::testToolChainMerging_data()
 {
-    class TestToolChainFactory : ToolChainFactory
+    class TestToolchainFactory : ToolchainFactory
     {
     public:
-        TestToolChainFactory() {
+        TestToolchainFactory() {
             setSupportedToolChainType(TestToolChainType);
             setToolchainConstructor([] { return new TTC; });
         }
     };
 
-    TestToolChainFactory factory;
+    TestToolchainFactory factory;
 
     QTest::addColumn<Toolchains>("system");
     QTest::addColumn<Toolchains>("user");
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp
index cfafd7dfcb9..9f278ae7083 100644
--- a/src/plugins/qnx/qnxtoolchain.cpp
+++ b/src/plugins/qnx/qnxtoolchain.cpp
@@ -251,12 +251,12 @@ void QnxToolChainConfigWidget::handleSdpPathChange()
     emit dirty();
 }
 
-// QnxToolChainFactory
+// QnxToolchainFactory
 
-class QnxToolChainFactory : public ToolChainFactory
+class QnxToolchainFactory : public ToolchainFactory
 {
 public:
-    QnxToolChainFactory()
+    QnxToolchainFactory()
     {
         setDisplayName(Tr::tr("QCC"));
         setSupportedToolChainType(Constants::QNX_TOOLCHAIN_ID);
@@ -279,7 +279,7 @@ public:
 
 void setupQnxToolChain()
 {
-    static QnxToolChainFactory theQnxToolChainFactory;
+    static QnxToolchainFactory theQnxToolChainFactory;
 }
 
 } // Qnx::Internal
diff --git a/src/plugins/webassembly/webassemblyplugin.cpp b/src/plugins/webassembly/webassemblyplugin.cpp
index 87b4283e291..d66ae5c9ca8 100644
--- a/src/plugins/webassembly/webassemblyplugin.cpp
+++ b/src/plugins/webassembly/webassemblyplugin.cpp
@@ -34,7 +34,7 @@ namespace WebAssembly::Internal {
 class WebAssemblyPluginPrivate
 {
 public:
-    WebAssemblyToolChainFactory toolChainFactory;
+    WebAssemblyToolchainFactory toolChainFactory;
     WebAssemblyDeviceFactory deviceFactory;
     WebAssemblyQtVersionFactory qtVersionFactory;
     EmrunRunConfigurationFactory emrunRunConfigurationFactory;
diff --git a/src/plugins/webassembly/webassemblytoolchain.cpp b/src/plugins/webassembly/webassemblytoolchain.cpp
index 925b7f5dbfb..e518699d33e 100644
--- a/src/plugins/webassembly/webassemblytoolchain.cpp
+++ b/src/plugins/webassembly/webassemblytoolchain.cpp
@@ -168,7 +168,7 @@ bool WebAssemblyToolChain::areToolChainsRegistered()
     return !ToolChainManager::findToolChains(toolChainAbi()).isEmpty();
 }
 
-WebAssemblyToolChainFactory::WebAssemblyToolChainFactory()
+WebAssemblyToolchainFactory::WebAssemblyToolchainFactory()
 {
     setDisplayName(Tr::tr("Emscripten"));
     setSupportedToolChainType(Constants::WEBASSEMBLY_TOOLCHAIN_TYPEID);
@@ -178,7 +178,7 @@ WebAssemblyToolChainFactory::WebAssemblyToolChainFactory()
     setUserCreatable(true);
 }
 
-Toolchains WebAssemblyToolChainFactory::autoDetect(const ToolchainDetector &detector) const
+Toolchains WebAssemblyToolchainFactory::autoDetect(const ToolchainDetector &detector) const
 {
     return doAutoDetect(detector);
 }
diff --git a/src/plugins/webassembly/webassemblytoolchain.h b/src/plugins/webassembly/webassemblytoolchain.h
index c6c9683597c..2b78a2cbf29 100644
--- a/src/plugins/webassembly/webassemblytoolchain.h
+++ b/src/plugins/webassembly/webassemblytoolchain.h
@@ -25,10 +25,10 @@ public:
     static bool areToolChainsRegistered();
 };
 
-class WebAssemblyToolChainFactory : public ProjectExplorer::ToolChainFactory
+class WebAssemblyToolchainFactory : public ProjectExplorer::ToolchainFactory
 {
 public:
-    WebAssemblyToolChainFactory();
+    WebAssemblyToolchainFactory();
 
     ProjectExplorer::Toolchains autoDetect(
         const ProjectExplorer::ToolchainDetector &detector) const final;