ProjectExplorer: Rename Base*Aspect to *Aspect

In most cases they are used directly, so there's not much Base* in that. Added the old name as alias as porting help for a while. Change-Id: I494a8a560b8996bcf74915ea3570b504df6a6b4c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-13 09:16:00 +02:00
parent e62044aa29
commit 51e7bce109
54 changed files with 381 additions and 377 deletions
--- a/src/plugins/android/androidrunconfiguration.cpp
+++ b/src/plugins/android/androidrunconfiguration.cpp
@@ -114,15 +114,15 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id)

    addAspect<ArgumentsAspect>();

-    auto amStartArgsAspect = addAspect<BaseStringAspect>();
+    auto amStartArgsAspect = addAspect<StringAspect>();
    amStartArgsAspect->setId(Constants::ANDROID_AMSTARTARGS);
    amStartArgsAspect->setSettingsKey("Android.AmStartArgsKey");
    amStartArgsAspect->setLabelText(tr("Activity manager start options:"));
-    amStartArgsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    amStartArgsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
    amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History");

-    auto warning = addAspect<BaseStringAspect>();
-    warning->setDisplayStyle(BaseStringAspect::LabelDisplay);
+    auto warning = addAspect<StringAspect>();
+    warning->setDisplayStyle(StringAspect::LabelDisplay);
    warning->setLabelPixmap(Icons::WARNING.pixmap());
    warning->setValue(tr("If the \"am start\" options conflict, the application might not start.\n"
                         "%1 uses: am start -n <package_name>/<Activity_name> [-D].")
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -289,7 +289,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
    m_extraAppParams = runControl->runnable().commandLineArguments;

    if (auto aspect = runControl->aspect(Constants::ANDROID_AMSTARTARGS)) {
-        const QString startArgs = static_cast<BaseStringAspect *>(aspect)->value();
+        const QString startArgs = static_cast<StringAspect *>(aspect)->value();
        m_amStartExtraArgs = QtcProcess::splitArgs(startArgs, OsTypeOtherUnix);
    }

--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -66,7 +66,7 @@ private:
    bool init() override;
    void doRun() override;

-    BaseStringAspect *m_additionalArgumentsAspect = nullptr;
+    StringAspect *m_additionalArgumentsAspect = nullptr;
    bool m_runAutogen = false;
 };

@@ -74,11 +74,11 @@ AutogenStep::AutogenStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep
 {
    setDefaultDisplayName(tr("Autogen"));

-    m_additionalArgumentsAspect = addAspect<BaseStringAspect>();
+    m_additionalArgumentsAspect = addAspect<StringAspect>();
    m_additionalArgumentsAspect->setSettingsKey(
                "AutotoolsProjectManager.AutogenStep.AdditionalArguments");
    m_additionalArgumentsAspect->setLabelText(tr("Arguments:"));
-    m_additionalArgumentsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_additionalArgumentsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
    m_additionalArgumentsAspect->setHistoryCompleter("AutotoolsPM.History.AutogenStepArgs");

    connect(m_additionalArgumentsAspect, &ProjectConfigurationAspect::changed, this, [this] {
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -63,7 +63,7 @@ public:
    void doRun() override;

 private:
-    BaseStringAspect *m_additionalArgumentsAspect = nullptr;
+    StringAspect *m_additionalArgumentsAspect = nullptr;
    bool m_runAutoreconf = false;
 };

@@ -72,11 +72,11 @@ AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Utils::Id id)
 {
    setDefaultDisplayName(tr("Autoreconf"));

-    m_additionalArgumentsAspect = addAspect<BaseStringAspect>();
+    m_additionalArgumentsAspect = addAspect<StringAspect>();
    m_additionalArgumentsAspect->setSettingsKey("AutotoolsProjectManager.AutoreconfStep.AdditionalArguments");
    m_additionalArgumentsAspect->setLabelText(tr("Arguments:"));
    m_additionalArgumentsAspect->setValue("--force --install");
-    m_additionalArgumentsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_additionalArgumentsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
    m_additionalArgumentsAspect->setHistoryCompleter("AutotoolsPM.History.AutoreconfStepArgs");

    connect(m_additionalArgumentsAspect, &ProjectConfigurationAspect::changed, this, [this] {
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -85,7 +85,7 @@ private:
    bool init() override;
    void doRun() override;

-    ProjectExplorer::BaseStringAspect *m_additionalArgumentsAspect = nullptr;
+    ProjectExplorer::StringAspect *m_additionalArgumentsAspect = nullptr;
    bool m_runConfigure = false;
 };

@@ -94,8 +94,8 @@ ConfigureStep::ConfigureStep(BuildStepList *bsl, Utils::Id id)
 {
    setDefaultDisplayName(tr("Configure"));

-    m_additionalArgumentsAspect = addAspect<BaseStringAspect>();
-    m_additionalArgumentsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_additionalArgumentsAspect = addAspect<StringAspect>();
+    m_additionalArgumentsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
    m_additionalArgumentsAspect->setSettingsKey(
                "AutotoolsProjectManager.ConfigureStep.AdditionalArguments");
    m_additionalArgumentsAspect->setLabelText(tr("Arguments:"));
--- a/src/plugins/baremetal/baremetalrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp
@@ -49,7 +49,7 @@ public:
        : RunConfiguration(target, id)
    {
        const auto exeAspect = addAspect<ExecutableAspect>();
-        exeAspect->setDisplayStyle(BaseStringAspect::LabelDisplay);
+        exeAspect->setDisplayStyle(StringAspect::LabelDisplay);
        exeAspect->setPlaceHolderText(tr("Unknown"));

        addAspect<ArgumentsAspect>();
@@ -75,7 +75,7 @@ public:
        const auto exeAspect = addAspect<ExecutableAspect>();
        exeAspect->setSettingsKey("BareMetal.CustomRunConfig.Executable");
        exeAspect->setPlaceHolderText(tr("Unknown"));
-        exeAspect->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+        exeAspect->setDisplayStyle(StringAspect::PathChooserDisplay);
        exeAspect->setHistoryCompleter("BareMetal.CustomRunConfig.History");
        exeAspect->setExpectedKind(PathChooser::Any);

--- a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
+++ b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
@@ -54,7 +54,7 @@ QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl, Utils::Id id)

    auto service = createDeployService<QdbMakeDefaultAppService>();

-    auto selection = addAspect<BaseSelectionAspect>();
+    auto selection = addAspect<SelectionAspect>();
    selection->setSettingsKey("QdbMakeDefaultDeployStep.MakeDefault");
    selection->addOption(tr("Set this application to start by default"));
    selection->addOption(tr("Reset default application"));
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -44,7 +44,7 @@ namespace Internal {

 // FullCommandLineAspect

-class FullCommandLineAspect : public BaseStringAspect
+class FullCommandLineAspect : public StringAspect
 {
    Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbRunConfiguration);

--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -126,7 +126,7 @@ private:
    friend class CMakeProjectImporter;
 };

-class InitialCMakeArgumentsAspect final : public ProjectExplorer::BaseStringAspect
+class InitialCMakeArgumentsAspect final : public ProjectExplorer::StringAspect
 {
    Q_OBJECT

--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -203,14 +203,14 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
            m_cppAspect->setValue(true);
    });

-    m_multiProcessAspect = new BaseBoolAspect;
+    m_multiProcessAspect = new BoolAspect;
    m_multiProcessAspect->setSettingsKey("RunConfiguration.UseMultiProcess");
    m_multiProcessAspect->setLabel(tr("Enable Debugging of Subprocesses"),
-                                   BaseBoolAspect::LabelPlacement::AtCheckBox);
+                                   BoolAspect::LabelPlacement::AtCheckBox);

-    m_overrideStartupAspect = new BaseStringAspect;
+    m_overrideStartupAspect = new StringAspect;
    m_overrideStartupAspect->setSettingsKey("RunConfiguration.OverrideDebuggerStartup");
-    m_overrideStartupAspect->setDisplayStyle(BaseStringAspect::TextEditDisplay);
+    m_overrideStartupAspect->setDisplayStyle(StringAspect::TextEditDisplay);
    m_overrideStartupAspect->setLabelText(tr("Additional startup commands:"));
 }

--- a/src/plugins/debugger/debuggerrunconfigurationaspect.h
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.h
@@ -59,8 +59,8 @@ public:
 private:
    Internal::DebuggerLanguageAspect *m_cppAspect;
    Internal::DebuggerLanguageAspect *m_qmlAspect;
-    ProjectExplorer::BaseBoolAspect *m_multiProcessAspect;
-    ProjectExplorer::BaseStringAspect *m_overrideStartupAspect;
+    ProjectExplorer::BoolAspect *m_multiProcessAspect;
+    ProjectExplorer::StringAspect *m_overrideStartupAspect;
    ProjectExplorer::Target *m_target;
 };

--- a/src/plugins/incredibuild/buildconsolebuildstep.cpp
+++ b/src/plugins/incredibuild/buildconsolebuildstep.cpp
@@ -81,25 +81,25 @@ public:

 private:
    CommandBuilderAspect *m_commandBuilder;
-    BaseBoolAspect *m_avoidLocal{nullptr};
-    BaseStringAspect *m_profileXml{nullptr};
-    BaseIntegerAspect *m_maxCpu{nullptr};
-    BaseSelectionAspect *m_maxWinVer{nullptr};
-    BaseSelectionAspect *m_minWinVer{nullptr};
-    BaseStringAspect *m_title{nullptr};
-    BaseStringAspect *m_monFile{nullptr};
-    BaseBoolAspect *m_suppressStdOut{nullptr};
-    BaseStringAspect *m_logFile{nullptr};
-    BaseBoolAspect *m_showCmd{nullptr};
-    BaseBoolAspect *m_showAgents{nullptr};
-    BaseBoolAspect *m_showTime{nullptr};
-    BaseBoolAspect *m_hideHeader{nullptr};
-    BaseSelectionAspect *m_logLevel{nullptr};
-    BaseStringAspect *m_setEnv{nullptr};
-    BaseBoolAspect *m_stopOnError{nullptr};
-    BaseStringAspect *m_additionalArguments{nullptr};
-    BaseBoolAspect *m_openMonitor{nullptr};
-    BaseBoolAspect *m_keepJobNum{nullptr};
+    BoolAspect *m_avoidLocal{nullptr};
+    StringAspect *m_profileXml{nullptr};
+    IntegerAspect *m_maxCpu{nullptr};
+    SelectionAspect *m_maxWinVer{nullptr};
+    SelectionAspect *m_minWinVer{nullptr};
+    StringAspect *m_title{nullptr};
+    StringAspect *m_monFile{nullptr};
+    BoolAspect *m_suppressStdOut{nullptr};
+    StringAspect *m_logFile{nullptr};
+    BoolAspect *m_showCmd{nullptr};
+    BoolAspect *m_showAgents{nullptr};
+    BoolAspect *m_showTime{nullptr};
+    BoolAspect *m_hideHeader{nullptr};
+    SelectionAspect *m_logLevel{nullptr};
+    StringAspect *m_setEnv{nullptr};
+    BoolAspect *m_stopOnError{nullptr};
+    StringAspect *m_additionalArguments{nullptr};
+    BoolAspect *m_openMonitor{nullptr};
+    BoolAspect *m_keepJobNum{nullptr};
 };

 BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id)
@@ -117,7 +117,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
                                      "parameter value is large enough "
                                      "(such as -j200 for the JOM or Make build tools)"));

-    m_keepJobNum = addAspect<BaseBoolAspect>();
+    m_keepJobNum = addAspect<BoolAspect>();
    m_keepJobNum->setSettingsKey(Constants::BUILDCONSOLE_KEEPJOBNUM);
    m_keepJobNum->setLabel(tr("Keep Original Jobs Num:"));
    m_keepJobNum->setToolTip(tr("Setting this option to true, forces IncrediBuild to not override "
@@ -129,10 +129,10 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id

    addAspect<TextDisplay>("<b>" + tr("IncrediBuild Distribution Control"));

-    m_profileXml = addAspect<BaseStringAspect>();
+    m_profileXml = addAspect<StringAspect>();
    m_profileXml->setSettingsKey(Constants::BUILDCONSOLE_PROFILEXML);
    m_profileXml->setLabelText(tr("Profile.xml:"));
-    m_profileXml->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    m_profileXml->setDisplayStyle(StringAspect::PathChooserDisplay);
    m_profileXml->setExpectedKind(PathChooser::Kind::File);
    m_profileXml->setBaseFileName(FilePath::fromString(PathChooser::homePath()));
    m_profileXml->setHistoryCompleter("IncrediBuild.BuildConsole.ProfileXml.History");
@@ -145,7 +145,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
                                "those packages. It is required to configure distributable "
                                "processes in \"Dev Tools\" builds."));

-    m_avoidLocal = addAspect<BaseBoolAspect>();
+    m_avoidLocal = addAspect<BoolAspect>();
    m_avoidLocal->setSettingsKey(Constants::BUILDCONSOLE_AVOIDLOCAL);
    m_avoidLocal->setLabel(tr("Avoid Local:"));
    m_avoidLocal->setToolTip(tr("Overrides the Agent Settings dialog Avoid task execution on local "
@@ -154,7 +154,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
                                "in scenarios where the initiating machine is bottlenecking the "
                                "build with High CPU usage."));

-    m_maxCpu = addAspect<BaseIntegerAspect>();
+    m_maxCpu = addAspect<IntegerAspect>();
    m_maxCpu->setSettingsKey(Constants::BUILDCONSOLE_MAXCPU);
    m_maxCpu->setToolTip(tr("Determines the maximum number of CPU cores that can be used in a "
                            "build, regardless of the number of available Agents. "
@@ -163,19 +163,19 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
    m_maxCpu->setLabel(tr("Maximum CPUs to utilize in the build:"));
    m_maxCpu->setRange(0, 65536);

-    m_maxWinVer = addAspect<BaseSelectionAspect>();
+    m_maxWinVer = addAspect<SelectionAspect>();
    m_maxWinVer->setSettingsKey(Constants::BUILDCONSOLE_MAXWINVER);
    m_maxWinVer->setDisplayName(tr("Newest allowed helper machine OS:"));
-    m_maxWinVer->setDisplayStyle(BaseSelectionAspect::DisplayStyle::ComboBox);
+    m_maxWinVer->setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox);
    m_maxWinVer->setToolTip(tr("Specifies the newest operating system installed on a helper "
                               "machine to be allowed to participate as helper in the build."));
    for (const QString &version : supportedWindowsVersions())
        m_maxWinVer->addOption(version);

-    m_minWinVer = addAspect<BaseSelectionAspect>();
+    m_minWinVer = addAspect<SelectionAspect>();
    m_minWinVer->setSettingsKey(Constants::BUILDCONSOLE_MINWINVER);
    m_minWinVer->setDisplayName(tr("Oldest allowed helper machine OS:"));
-    m_minWinVer->setDisplayStyle(BaseSelectionAspect::DisplayStyle::ComboBox);
+    m_minWinVer->setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox);
    m_minWinVer->setToolTip(tr("Specifies the oldest operating system installed on a helper "
                               "machine to be allowed to participate as helper in the build."));
    for (const QString &version : supportedWindowsVersions())
@@ -183,18 +183,18 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id

    addAspect<TextDisplay>("<b>" + tr("Output and Logging"));

-    m_title = addAspect<BaseStringAspect>();
+    m_title = addAspect<StringAspect>();
    m_title->setSettingsKey(Constants::BUILDCONSOLE_TITLE);
    m_title->setLabelText(tr("Build Title:"));
-    m_title->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_title->setDisplayStyle(StringAspect::LineEditDisplay);
    m_title->setToolTip(tr("Specifies a custom header line which will be displayed in the "
                           "beginning of the build output text. This title will also be used "
                           "for the Build History and Build Monitor displays."));

-    m_monFile = addAspect<BaseStringAspect>();
+    m_monFile = addAspect<StringAspect>();
    m_monFile->setSettingsKey(Constants::BUILDCONSOLE_MONFILE);
    m_monFile->setLabelText(tr("Save IncrediBuild monitor file:"));
-    m_monFile->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    m_monFile->setDisplayStyle(StringAspect::PathChooserDisplay);
    m_monFile->setExpectedKind(PathChooser::Kind::Any);
    m_monFile->setBaseFileName(FilePath::fromString(PathChooser::homePath()));
    m_monFile->setHistoryCompleter(QLatin1String("IncrediBuild.BuildConsole.MonFile.History"));
@@ -203,45 +203,45 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
                             "GUID for the file name. - A message containing the location of the "
                             "saved .ib_mon file is added to the end of the build output"));

-    m_suppressStdOut = addAspect<BaseBoolAspect>();
+    m_suppressStdOut = addAspect<BoolAspect>();
    m_suppressStdOut->setSettingsKey(Constants::BUILDCONSOLE_SUPPRESSSTDOUT);
    m_suppressStdOut->setLabel(tr("Suppress STDOUT:"));
    m_suppressStdOut->setToolTip(tr("Does not write anything to the standard output."));

-    m_logFile = addAspect<BaseStringAspect>();
+    m_logFile = addAspect<StringAspect>();
    m_logFile->setSettingsKey(Constants::BUILDCONSOLE_LOGFILE);
    m_logFile->setLabelText(tr("Output Log file:"));
-    m_logFile->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    m_logFile->setDisplayStyle(StringAspect::PathChooserDisplay);
    m_logFile->setExpectedKind(PathChooser::Kind::SaveFile);
    m_logFile->setBaseFileName(FilePath::fromString(PathChooser::homePath()));
    m_logFile->setHistoryCompleter(QLatin1String("IncrediBuild.BuildConsole.LogFile.History"));
    m_logFile->setToolTip(tr("Writes build output to a file."));

-    m_showCmd = addAspect<BaseBoolAspect>();
+    m_showCmd = addAspect<BoolAspect>();
    m_showCmd->setSettingsKey(Constants::BUILDCONSOLE_SHOWCMD);
    m_showCmd->setLabel(tr("Show Commands in output:"));
    m_showCmd->setToolTip(tr("Shows, for each file built, the command-line used by IncrediBuild "
                             "to build the file."));

-    m_showAgents = addAspect<BaseBoolAspect>();
+    m_showAgents = addAspect<BoolAspect>();
    m_showAgents->setSettingsKey(Constants::BUILDCONSOLE_SHOWAGENTS);
    m_showAgents->setLabel(tr("Show Agents in output:"));
    m_showAgents->setToolTip(tr("Shows the Agent used to build each file."));

-    m_showTime = addAspect<BaseBoolAspect>();
+    m_showTime = addAspect<BoolAspect>();
    m_showTime->setSettingsKey(Constants::BUILDCONSOLE_SHOWTIME);
    m_showTime->setLabel(tr("Show Time in output:"));
    m_showTime->setToolTip(tr("Shows the Start and Finish time for each file built."));

-    m_hideHeader = addAspect<BaseBoolAspect>();
+    m_hideHeader = addAspect<BoolAspect>();
    m_hideHeader->setSettingsKey(Constants::BUILDCONSOLE_HIDEHEADER);
    m_hideHeader->setLabel(tr("Hide IncrediBuild Header in output:"));
    m_hideHeader->setToolTip(tr("Suppresses the \"IncrediBuild\" header in the build output"));

-    m_logLevel = addAspect<BaseSelectionAspect>();
+    m_logLevel = addAspect<SelectionAspect>();
    m_logLevel->setSettingsKey(Constants::BUILDCONSOLE_LOGLEVEL);
    m_logLevel->setDisplayName(tr("Internal IncrediBuild logging level:"));
-    m_logLevel->setDisplayStyle(BaseSelectionAspect::DisplayStyle::ComboBox);
+    m_logLevel->setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox);
    m_logLevel->addOption(QString());
    m_logLevel->addOption("Minimal");
    m_logLevel->addOption("Extended");
@@ -252,13 +252,13 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id

    addAspect<TextDisplay>("<b>" + tr("Miscellaneous"));

-    m_setEnv = addAspect<BaseStringAspect>();
+    m_setEnv = addAspect<StringAspect>();
    m_setEnv->setSettingsKey(Constants::BUILDCONSOLE_SETENV);
    m_setEnv->setLabelText(tr("Set an Environment Variable:"));
-    m_setEnv->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_setEnv->setDisplayStyle(StringAspect::LineEditDisplay);
    m_setEnv->setToolTip(tr("Sets or overrides environment variables for the context of the build."));

-    m_stopOnError = addAspect<BaseBoolAspect>();
+    m_stopOnError = addAspect<BoolAspect>();
    m_stopOnError->setSettingsKey(Constants::BUILDCONSOLE_STOPONERROR);
    m_stopOnError->setLabel(tr("Stop On Errors:"));
    m_stopOnError->setToolTip(tr("When specified, the execution will stop as soon as an error "
@@ -266,16 +266,16 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
                                 "\"Visual Studio\" builds, but not the default for "
                                 "\"Make and Build tools\" or \"Dev Tools\" builds"));

-    m_additionalArguments = addAspect<BaseStringAspect>();
+    m_additionalArguments = addAspect<StringAspect>();
    m_additionalArguments->setSettingsKey(Constants::BUILDCONSOLE_ADDITIONALARGUMENTS);
    m_additionalArguments->setLabelText(tr("Additional Arguments:"));
-    m_additionalArguments->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_additionalArguments->setDisplayStyle(StringAspect::LineEditDisplay);
    m_additionalArguments->setToolTip(tr("Add additional buildconsole arguments manually. "
                                         "The value of this field will be concatenated to the "
                                         "final buildconsole command line"));


-    m_openMonitor = addAspect<BaseBoolAspect>();
+    m_openMonitor = addAspect<BoolAspect>();
    m_openMonitor->setSettingsKey(Constants::BUILDCONSOLE_OPENMONITOR);
    m_openMonitor->setLabel(tr("Open Monitor:"));
    m_openMonitor->setToolTip(tr("Opens an IncrediBuild Build Monitor that graphically displays "
--- a/src/plugins/incredibuild/ibconsolebuildstep.cpp
+++ b/src/plugins/incredibuild/ibconsolebuildstep.cpp
@@ -62,10 +62,10 @@ public:

 private:
    CommandBuilderAspect *m_commandBuilder;
-    BaseIntegerAspect *m_nice{nullptr};
-    BaseBoolAspect *m_keepJobNum{nullptr};
-    BaseBoolAspect *m_forceRemote{nullptr};
-    BaseBoolAspect *m_alternate{nullptr};
+    IntegerAspect *m_nice{nullptr};
+    BoolAspect *m_keepJobNum{nullptr};
+    BoolAspect *m_forceRemote{nullptr};
+    BoolAspect *m_alternate{nullptr};
 };

 IBConsoleBuildStep::IBConsoleBuildStep(BuildStepList *buildStepList, Id id)
@@ -83,7 +83,7 @@ IBConsoleBuildStep::IBConsoleBuildStep(BuildStepList *buildStepList, Id id)
                                      "multi-job parameter value is large enough (such as "
                                      "-j200 for the JOM or Make build tools)"));

-    m_keepJobNum = addAspect<BaseBoolAspect>();
+    m_keepJobNum = addAspect<BoolAspect>();
    m_keepJobNum->setSettingsKey(Constants::IBCONSOLE_KEEPJOBNUM);
    m_keepJobNum->setLabel(tr("Keep Original Jobs Num:"));
    m_keepJobNum->setToolTip(tr("Setting this option to true, forces IncrediBuild to not override "
@@ -95,17 +95,17 @@ IBConsoleBuildStep::IBConsoleBuildStep(BuildStepList *buildStepList, Id id)

    addAspect<TextDisplay>("<b>" + tr("IncrediBuild Distribution Control"));

-    m_nice = addAspect<BaseIntegerAspect>();
+    m_nice = addAspect<IntegerAspect>();
    m_nice->setSettingsKey(Constants::IBCONSOLE_NICE);
    m_nice->setToolTip(tr("Specify nice value. Nice Value should be numeric and between -20 and 19"));
    m_nice->setLabel(tr("Nice value:"));
    m_nice->setRange(-20, 19);

-    m_forceRemote = addAspect<BaseBoolAspect>();
+    m_forceRemote = addAspect<BoolAspect>();
    m_forceRemote->setSettingsKey(Constants::IBCONSOLE_ALTERNATE);
    m_forceRemote->setLabel(tr("Force remote:"));

-    m_alternate = addAspect<BaseBoolAspect>();
+    m_alternate = addAspect<BoolAspect>();
    m_alternate->setSettingsKey(Constants::IBCONSOLE_FORCEREMOTE);
    m_alternate->setLabel(tr("Alternate tasks preference:"));
 }
--- a/src/plugins/ios/iosbuildconfiguration.cpp
+++ b/src/plugins/ios/iosbuildconfiguration.cpp
@@ -379,10 +379,10 @@ void IosBuildSettingsWidget::updateWarningText()
 IosBuildConfiguration::IosBuildConfiguration(Target *target, Utils::Id id)
    : QmakeBuildConfiguration(target, id)
 {
-    m_signingIdentifier = addAspect<BaseStringAspect>();
+    m_signingIdentifier = addAspect<StringAspect>();
    m_signingIdentifier->setSettingsKey(signingIdentifierKey);

-    m_autoManagedSigning = addAspect<BaseBoolAspect>();
+    m_autoManagedSigning = addAspect<BoolAspect>();
    m_autoManagedSigning->setDefaultValue(true);
    m_autoManagedSigning->setSettingsKey(autoManagedSigningKey);
 }
--- a/src/plugins/ios/iosbuildconfiguration.h
+++ b/src/plugins/ios/iosbuildconfiguration.h
@@ -46,8 +46,8 @@ private:

    void updateQmakeCommand();

-    ProjectExplorer::BaseStringAspect *m_signingIdentifier = nullptr;
-    ProjectExplorer::BaseBoolAspect *m_autoManagedSigning = nullptr;
+    ProjectExplorer::StringAspect *m_signingIdentifier = nullptr;
+    ProjectExplorer::BoolAspect *m_autoManagedSigning = nullptr;
 };

 class IosBuildConfigurationFactory : public QmakeProjectManager::QmakeBuildConfigurationFactory
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -106,7 +106,7 @@ IosRunConfiguration::IosRunConfiguration(Target *target, Utils::Id id)
    : RunConfiguration(target, id)
 {
    auto executableAspect = addAspect<ExecutableAspect>();
-    executableAspect->setDisplayStyle(BaseStringAspect::LabelDisplay);
+    executableAspect->setDisplayStyle(StringAspect::LabelDisplay);

    addAspect<ArgumentsAspect>();

--- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
+++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
@@ -67,9 +67,9 @@ public:
    FlashAndRunConfiguration(Target *target, Utils::Id id)
        : RunConfiguration(target, id)
    {
-        auto flashAndRunParameters = addAspect<BaseStringAspect>();
+        auto flashAndRunParameters = addAspect<StringAspect>();
        flashAndRunParameters->setLabelText(tr("Flash and run CMake parameters:"));
-        flashAndRunParameters->setDisplayStyle(BaseStringAspect::TextEditDisplay);
+        flashAndRunParameters->setDisplayStyle(StringAspect::TextEditDisplay);
        flashAndRunParameters->setSettingsKey("FlashAndRunConfiguration.Parameters");

        setUpdater([target, flashAndRunParameters] {
@@ -92,7 +92,7 @@ public:
            const Target *target = runControl->target();
            const CommandLine cmd(
                        cmakeFilePath(target),
-                        runControl->runConfiguration()->aspect<BaseStringAspect>()->value(),
+                        runControl->runConfiguration()->aspect<StringAspect>()->value(),
                        CommandLine::Raw);
            Runnable r;
            r.workingDirectory =
--- a/src/plugins/nim/project/nimcompilercleanstep.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstep.cpp
@@ -64,9 +64,9 @@ NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Utils::Id
    setDefaultDisplayName(tr("Nim Clean Step"));
    setDisplayName(tr("Nim Clean Step"));

-    auto workingDirectory = addAspect<BaseStringAspect>();
+    auto workingDirectory = addAspect<StringAspect>();
    workingDirectory->setLabelText(tr("Working directory:"));
-    workingDirectory->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    workingDirectory->setDisplayStyle(StringAspect::LineEditDisplay);

    setSummaryUpdater([this, workingDirectory] {
        workingDirectory->setFilePath(buildDirectory());
--- a/src/plugins/projectexplorer/buildaspects.cpp
+++ b/src/plugins/projectexplorer/buildaspects.cpp
@@ -79,7 +79,7 @@ void BuildDirectoryAspect::setProblem(const QString &description)

 void BuildDirectoryAspect::toMap(QVariantMap &map) const
 {
-    BaseStringAspect::toMap(map);
+    StringAspect::toMap(map);
    if (!d->sourceDir.isEmpty()) {
        const FilePath shadowDir = isChecked() ? filePath() : d->savedShadowBuildDir;
        map.insert(settingsKey() + ".shadowDir", shadowDir.toString());
@@ -88,7 +88,7 @@ void BuildDirectoryAspect::toMap(QVariantMap &map) const

 void BuildDirectoryAspect::fromMap(const QVariantMap &map)
 {
-    BaseStringAspect::fromMap(map);
+    StringAspect::fromMap(map);
    if (!d->sourceDir.isEmpty()) {
        d->savedShadowBuildDir = FilePath::fromString(map.value(settingsKey() + ".shadowDir")
                                                      .toString());
@@ -98,13 +98,13 @@ void BuildDirectoryAspect::fromMap(const QVariantMap &map)

 void BuildDirectoryAspect::addToLayout(LayoutBuilder &builder)
 {
-    BaseStringAspect::addToLayout(builder);
+    StringAspect::addToLayout(builder);
    d->problemLabel = new InfoLabel({}, InfoLabel::Warning);
    d->problemLabel->setElideMode(Qt::ElideNone);
    builder.startNewRow().addItems(QString(), d->problemLabel.data());
    updateProblemLabel();
    if (!d->sourceDir.isEmpty()) {
-        connect(this, &BaseStringAspect::checkedChanged, builder.layout(), [this] {
+        connect(this, &StringAspect::checkedChanged, builder.layout(), [this] {
            if (isChecked()) {
                setFilePath(d->savedShadowBuildDir.isEmpty()
                            ? d->sourceDir : d->savedShadowBuildDir);
--- a/src/plugins/projectexplorer/buildaspects.h
+++ b/src/plugins/projectexplorer/buildaspects.h
@@ -32,7 +32,7 @@ namespace Utils { class FilePath; }

 namespace ProjectExplorer {

-class PROJECTEXPLORER_EXPORT BuildDirectoryAspect : public BaseStringAspect
+class PROJECTEXPLORER_EXPORT BuildDirectoryAspect : public StringAspect
 {
    Q_OBJECT
 public:
@@ -55,7 +55,7 @@ private:
    Private * const d;
 };

-class PROJECTEXPLORER_EXPORT SeparateDebugInfoAspect : public BaseTriStateAspect
+class PROJECTEXPLORER_EXPORT SeparateDebugInfoAspect : public TriStateAspect
 {
    Q_OBJECT
 public:
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -193,7 +193,7 @@ BuildConfiguration::BuildConfiguration(Target *target, Utils::Id id)
    d->m_buildDirectoryAspect->setBaseFileName(target->project()->projectDirectory());
    d->m_buildDirectoryAspect->setEnvironment(environment());
    d->m_buildDirectoryAspect->setMacroExpanderProvider([this] { return macroExpander(); });
-    connect(d->m_buildDirectoryAspect, &BaseStringAspect::changed,
+    connect(d->m_buildDirectoryAspect, &StringAspect::changed,
            this, &BuildConfiguration::emitBuildDirectoryChanged);
    connect(this, &BuildConfiguration::environmentChanged, this, [this] {
        d->m_buildDirectoryAspect->setEnvironment(environment());
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -70,7 +70,7 @@ CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *targe

    auto exeAspect = addAspect<ExecutableAspect>();
    exeAspect->setSettingsKey("ProjectExplorer.CustomExecutableRunConfiguration.Executable");
-    exeAspect->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    exeAspect->setDisplayStyle(StringAspect::PathChooserDisplay);
    exeAspect->setHistoryCompleter("Qt.CustomExecutable.History");
    exeAspect->setExpectedKind(PathChooser::ExistingCommand);
    exeAspect->setEnvironment(envAspect->environment());
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -67,7 +67,7 @@ const char MAKEFLAGS[] = "MAKEFLAGS";
 namespace ProjectExplorer {
 namespace Internal {

-class OverrideMakeflagsAspect final : public BaseBoolAspect
+class OverrideMakeflagsAspect final : public BoolAspect
 {
 public:
    OverrideMakeflagsAspect() {}
@@ -90,7 +90,7 @@ public:
            m_nonOverrideWarning->setPixmap(Icons::WARNING.pixmap());
        }

-        BaseBoolAspect::addToLayout(builder);
+        BoolAspect::addToLayout(builder);
        builder.addItem(m_nonOverrideWarning.data());
    }

@@ -162,19 +162,19 @@ MakeStep::MakeStep(BuildStepList *parent, Utils::Id id)
    setDefaultDisplayName(defaultDisplayName());
    setLowPriority();

-    m_makeCommandAspect = addAspect<BaseStringAspect>();
+    m_makeCommandAspect = addAspect<StringAspect>();
    m_makeCommandAspect->setSettingsKey(id.withSuffix(MAKE_COMMAND_SUFFIX).toString());
-    m_makeCommandAspect->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    m_makeCommandAspect->setDisplayStyle(StringAspect::PathChooserDisplay);
    m_makeCommandAspect->setExpectedKind(PathChooser::ExistingCommand);
    m_makeCommandAspect->setBaseFileName(FilePath::fromString(PathChooser::homePath()));
    m_makeCommandAspect->setHistoryCompleter("PE.MakeCommand.History");

-    m_userArgumentsAspect = addAspect<BaseStringAspect>();
+    m_userArgumentsAspect = addAspect<StringAspect>();
    m_userArgumentsAspect->setSettingsKey(id.withSuffix(MAKE_ARGUMENTS_SUFFIX).toString());
    m_userArgumentsAspect->setLabelText(tr("Make arguments:"));
-    m_userArgumentsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_userArgumentsAspect->setDisplayStyle(StringAspect::LineEditDisplay);

-    m_userJobCountAspect = addAspect<BaseIntegerAspect>();
+    m_userJobCountAspect = addAspect<IntegerAspect>();
    m_userJobCountAspect->setSettingsKey(id.withSuffix(JOBCOUNT_SUFFIX).toString());
    m_userJobCountAspect->setLabel(tr("Parallel jobs:"));
    m_userJobCountAspect->setRange(1, 999);
@@ -184,10 +184,10 @@ MakeStep::MakeStep(BuildStepList *parent, Utils::Id id)
    m_overrideMakeflagsAspect = addAspect<Internal::OverrideMakeflagsAspect>();
    m_overrideMakeflagsAspect->setSettingsKey(id.withSuffix(OVERRIDE_MAKEFLAGS_SUFFIX).toString());

-    m_cleanAspect = addAspect<BaseBoolAspect>();
+    m_cleanAspect = addAspect<BoolAspect>();
    m_cleanAspect->setSettingsKey(id.withSuffix(CLEAN_SUFFIX).toString());

-    m_buildTargetsAspect = addAspect<BaseStringListAspect>();
+    m_buildTargetsAspect = addAspect<StringListAspect>();
    m_buildTargetsAspect->setSettingsKey(id.withSuffix(BUILD_TARGETS_SUFFIX).toString());

    const auto updateMakeLabel = [this] {
@@ -200,7 +200,7 @@ MakeStep::MakeStep(BuildStepList *parent, Utils::Id id)

    updateMakeLabel();

-    connect(m_makeCommandAspect, &BaseStringAspect::changed, this, updateMakeLabel);
+    connect(m_makeCommandAspect, &StringAspect::changed, this, updateMakeLabel);
 }

 void MakeStep::setBuildTarget(const QString &buildTarget)
@@ -486,10 +486,10 @@ BuildStepConfigWidget *MakeStep::createConfigWidget()

    updateDetails();

-    connect(m_makeCommandAspect, &BaseStringAspect::changed, widget, updateDetails);
-    connect(m_userArgumentsAspect, &BaseStringAspect::changed, widget, updateDetails);
-    connect(m_userJobCountAspect, &BaseIntegerAspect::changed, widget, updateDetails);
-    connect(m_overrideMakeflagsAspect, &BaseBoolAspect::changed, widget, updateDetails);
+    connect(m_makeCommandAspect, &StringAspect::changed, widget, updateDetails);
+    connect(m_userArgumentsAspect, &StringAspect::changed, widget, updateDetails);
+    connect(m_userJobCountAspect, &IntegerAspect::changed, widget, updateDetails);
+    connect(m_overrideMakeflagsAspect, &BoolAspect::changed, widget, updateDetails);

    connect(widget->m_targetsList, &QListWidget::itemChanged, this,
            [this, updateDetails](QListWidgetItem *item) {
--- a/src/plugins/projectexplorer/makestep.h
+++ b/src/plugins/projectexplorer/makestep.h
@@ -38,10 +38,10 @@ class MakeStepConfigWidget;
 class OverrideMakeflagsAspect;
 } // Internal

-class BaseBoolAspect;
-class BaseIntegerAspect;
-class BaseStringAspect;
-class BaseStringListAspect;
+class BoolAspect;
+class IntegerAspect;
+class StringAspect;
+class StringListAspect;

 class PROJECTEXPLORER_EXPORT MakeStep : public ProjectExplorer::AbstractProcessStep
 {
@@ -102,13 +102,13 @@ private:
    static int defaultJobCount();
    QStringList jobArguments() const;

-    BaseStringListAspect *m_buildTargetsAspect = nullptr;
+    StringListAspect *m_buildTargetsAspect = nullptr;
    QStringList m_availableTargets;
-    BaseStringAspect *m_makeCommandAspect = nullptr;
-    BaseStringAspect *m_userArgumentsAspect = nullptr;
-    BaseIntegerAspect *m_userJobCountAspect = nullptr;
+    StringAspect *m_makeCommandAspect = nullptr;
+    StringAspect *m_userArgumentsAspect = nullptr;
+    IntegerAspect *m_userJobCountAspect = nullptr;
    Internal::OverrideMakeflagsAspect *m_overrideMakeflagsAspect = nullptr;
-    BaseBoolAspect *m_cleanAspect = nullptr;
+    BoolAspect *m_cleanAspect = nullptr;
    bool m_disablingForSubDirsSupported = false;
    bool m_enabledForSubDirs = true;
 };
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -57,9 +57,9 @@ public:
    void setupOutputFormatter(Utils::OutputFormatter *formatter);
    void setupProcessParameters(ProcessParameters *pp);

-    BaseStringAspect *m_command;
-    BaseStringAspect *m_arguments;
-    BaseStringAspect *m_workingDirectory;
+    StringAspect *m_command;
+    StringAspect *m_arguments;
+    StringAspect *m_workingDirectory;
 };

 ProcessStep::ProcessStep(BuildStepList *bsl, Utils::Id id)
@@ -68,22 +68,22 @@ ProcessStep::ProcessStep(BuildStepList *bsl, Utils::Id id)
    //: Default ProcessStep display name
    setDefaultDisplayName(tr("Custom Process Step"));

-    m_command = addAspect<BaseStringAspect>();
+    m_command = addAspect<StringAspect>();
    m_command->setSettingsKey(PROCESS_COMMAND_KEY);
-    m_command->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    m_command->setDisplayStyle(StringAspect::PathChooserDisplay);
    m_command->setLabelText(tr("Command:"));
    m_command->setExpectedKind(Utils::PathChooser::Command);
    m_command->setHistoryCompleter("PE.ProcessStepCommand.History");

-    m_arguments = addAspect<BaseStringAspect>();
+    m_arguments = addAspect<StringAspect>();
    m_arguments->setSettingsKey(PROCESS_ARGUMENTS_KEY);
-    m_arguments->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_arguments->setDisplayStyle(StringAspect::LineEditDisplay);
    m_arguments->setLabelText(tr("Arguments:"));

-    m_workingDirectory = addAspect<BaseStringAspect>();
+    m_workingDirectory = addAspect<StringAspect>();
    m_workingDirectory->setSettingsKey(PROCESS_WORKINGDIRECTORY_KEY);
    m_workingDirectory->setValue(Constants::DEFAULT_WORKING_DIR);
-    m_workingDirectory->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    m_workingDirectory->setDisplayStyle(StringAspect::PathChooserDisplay);
    m_workingDirectory->setLabelText(tr("Working directory:"));
    m_workingDirectory->setExpectedKind(Utils::PathChooser::Directory);

--- a/src/plugins/projectexplorer/projectconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/projectconfigurationaspects.cpp
@@ -54,10 +54,10 @@ using namespace Utils;
 namespace ProjectExplorer {
 namespace Internal {

-class BaseBoolAspectPrivate
+class BoolAspectPrivate
 {
 public:
-    BaseBoolAspect::LabelPlacement m_labelPlacement = BaseBoolAspect::LabelPlacement::AtCheckBox;
+    BoolAspect::LabelPlacement m_labelPlacement = BoolAspect::LabelPlacement::AtCheckBox;
    bool m_value = false;
    bool m_defaultValue = false;
    bool m_enabled = true;
@@ -67,13 +67,13 @@ public:
    QPointer<QLabel> m_label; // Owned by configuration widget
 };

-class BaseSelectionAspectPrivate
+class SelectionAspectPrivate
 {
 public:
    int m_value = 0;
    int m_defaultValue = 0;
-    BaseSelectionAspect::DisplayStyle m_displayStyle
-            = BaseSelectionAspect::DisplayStyle::RadioButtons;
+    SelectionAspect::DisplayStyle m_displayStyle
+            = SelectionAspect::DisplayStyle::RadioButtons;
    struct Option { QString displayName; QString tooltip; };
    QVector<Option> m_options;

@@ -85,17 +85,17 @@ public:
    QString m_tooltip;
 };

-class BaseStringAspectPrivate
+class StringAspectPrivate
 {
 public:
-    BaseStringAspect::DisplayStyle m_displayStyle = BaseStringAspect::LabelDisplay;
-    BaseStringAspect::CheckBoxPlacement m_checkBoxPlacement
-        = BaseStringAspect::CheckBoxPlacement::Right;
-    BaseStringAspect::UncheckedSemantics m_uncheckedSemantics
-        = BaseStringAspect::UncheckedSemantics::Disabled;
+    StringAspect::DisplayStyle m_displayStyle = StringAspect::LabelDisplay;
+    StringAspect::CheckBoxPlacement m_checkBoxPlacement
+        = StringAspect::CheckBoxPlacement::Right;
+    StringAspect::UncheckedSemantics m_uncheckedSemantics
+        = StringAspect::UncheckedSemantics::Disabled;
    QString m_labelText;
    std::function<QString(const QString &)> m_displayFilter;
-    std::unique_ptr<BaseBoolAspect> m_checker;
+    std::unique_ptr<BoolAspect> m_checker;

    QString m_value;
    QString m_placeHolderText;
@@ -111,7 +111,7 @@ public:
    Utils::MacroExpanderProvider m_expanderProvider;
    QPixmap m_labelPixmap;
    Utils::FilePath m_baseFileName;
-    BaseStringAspect::ValueAcceptor m_valueAcceptor;
+    StringAspect::ValueAcceptor m_valueAcceptor;
    bool m_readOnly = false;
    bool m_showToolTipOnLabel = false;
    bool m_fileDialogOnly = false;
@@ -119,14 +119,14 @@ public:
    template<class Widget> void updateWidgetFromCheckStatus(Widget *w)
    {
        const bool enabled = !m_checker || m_checker->value();
-        if (m_uncheckedSemantics == BaseStringAspect::UncheckedSemantics::Disabled)
+        if (m_uncheckedSemantics == StringAspect::UncheckedSemantics::Disabled)
            w->setEnabled(enabled);
        else
            w->setReadOnly(!enabled);
    }
 };

-class BaseIntegerAspectPrivate
+class IntegerAspectPrivate
 {
 public:
    qint64 m_value = 0;
@@ -144,7 +144,7 @@ public:
    bool m_enabled = true;
 };

-class BaseStringListAspectPrivate
+class StringListAspectPrivate
 {
 public:
    QStringList m_value;
@@ -153,26 +153,26 @@ public:
 } // Internal

 /*!
-    \class ProjectExplorer::BaseStringAspect
+    \class ProjectExplorer::StringAspect
 */

-BaseStringAspect::BaseStringAspect()
-    : d(new Internal::BaseStringAspectPrivate)
+StringAspect::StringAspect()
+    : d(new Internal::StringAspectPrivate)
 {}

-BaseStringAspect::~BaseStringAspect() = default;
+StringAspect::~StringAspect() = default;

-void BaseStringAspect::setValueAcceptor(BaseStringAspect::ValueAcceptor &&acceptor)
+void StringAspect::setValueAcceptor(StringAspect::ValueAcceptor &&acceptor)
 {
    d->m_valueAcceptor = std::move(acceptor);
 }

-QString BaseStringAspect::value() const
+QString StringAspect::value() const
 {
    return d->m_value;
 }

-void BaseStringAspect::setValue(const QString &value)
+void StringAspect::setValue(const QString &value)
 {
    const bool isSame = value == d->m_value;
    if (isSame)
@@ -193,7 +193,7 @@ void BaseStringAspect::setValue(const QString &value)
    emit changed();
 }

-void BaseStringAspect::fromMap(const QVariantMap &map)
+void StringAspect::fromMap(const QVariantMap &map)
 {
    if (!settingsKey().isEmpty())
        d->m_value = map.value(settingsKey()).toString();
@@ -201,7 +201,7 @@ void BaseStringAspect::fromMap(const QVariantMap &map)
        d->m_checker->fromMap(map);
 }

-void BaseStringAspect::toMap(QVariantMap &map) const
+void StringAspect::toMap(QVariantMap &map) const
 {
    if (!settingsKey().isEmpty())
        map.insert(settingsKey(), d->m_value);
@@ -209,63 +209,63 @@ void BaseStringAspect::toMap(QVariantMap &map) const
        d->m_checker->toMap(map);
 }

-FilePath BaseStringAspect::filePath() const
+FilePath StringAspect::filePath() const
 {
    return FilePath::fromUserInput(d->m_value);
 }

-void BaseStringAspect::setFilePath(const FilePath &val)
+void StringAspect::setFilePath(const FilePath &val)
 {
    setValue(val.toUserOutput());
 }

-void BaseStringAspect::setLabelText(const QString &labelText)
+void StringAspect::setLabelText(const QString &labelText)
 {
    d->m_labelText = labelText;
    if (d->m_label)
        d->m_label->setText(labelText);
 }

-void BaseStringAspect::setLabelPixmap(const QPixmap &labelPixmap)
+void StringAspect::setLabelPixmap(const QPixmap &labelPixmap)
 {
    d->m_labelPixmap = labelPixmap;
    if (d->m_label)
        d->m_label->setPixmap(labelPixmap);
 }

-void BaseStringAspect::setShowToolTipOnLabel(bool show)
+void StringAspect::setShowToolTipOnLabel(bool show)
 {
    d->m_showToolTipOnLabel = show;
    update();
 }

-QString BaseStringAspect::labelText() const
+QString StringAspect::labelText() const
 {
    return d->m_labelText;
 }

-void BaseStringAspect::setDisplayFilter(const std::function<QString(const QString &)> &displayFilter)
+void StringAspect::setDisplayFilter(const std::function<QString(const QString &)> &displayFilter)
 {
    d->m_displayFilter = displayFilter;
 }

-bool BaseStringAspect::isChecked() const
+bool StringAspect::isChecked() const
 {
    return !d->m_checker || d->m_checker->value();
 }

-void BaseStringAspect::setChecked(bool checked)
+void StringAspect::setChecked(bool checked)
 {
    QTC_ASSERT(d->m_checker, return);
    d->m_checker->setValue(checked);
 }

-void BaseStringAspect::setDisplayStyle(DisplayStyle displayStyle)
+void StringAspect::setDisplayStyle(DisplayStyle displayStyle)
 {
    d->m_displayStyle = displayStyle;
 }

-void BaseStringAspect::setPlaceHolderText(const QString &placeHolderText)
+void StringAspect::setPlaceHolderText(const QString &placeHolderText)
 {
    d->m_placeHolderText = placeHolderText;
    if (d->m_lineEditDisplay)
@@ -274,7 +274,7 @@ void BaseStringAspect::setPlaceHolderText(const QString &placeHolderText)
        d->m_textEditDisplay->setPlaceholderText(placeHolderText);
 }

-void BaseStringAspect::setHistoryCompleter(const QString &historyCompleterKey)
+void StringAspect::setHistoryCompleter(const QString &historyCompleterKey)
 {
    d->m_historyCompleterKey = historyCompleterKey;
    if (d->m_lineEditDisplay)
@@ -283,35 +283,35 @@ void BaseStringAspect::setHistoryCompleter(const QString &historyCompleterKey)
        d->m_pathChooserDisplay->setHistoryCompleter(historyCompleterKey);
 }

-void BaseStringAspect::setExpectedKind(const PathChooser::Kind expectedKind)
+void StringAspect::setExpectedKind(const PathChooser::Kind expectedKind)
 {
    d->m_expectedKind = expectedKind;
    if (d->m_pathChooserDisplay)
        d->m_pathChooserDisplay->setExpectedKind(expectedKind);
 }

-void BaseStringAspect::setFileDialogOnly(bool requireFileDialog)
+void StringAspect::setFileDialogOnly(bool requireFileDialog)
 {
    d->m_fileDialogOnly = requireFileDialog;
    if (d->m_pathChooserDisplay)
        d->m_pathChooserDisplay->setFileDialogOnly(requireFileDialog);
 }

-void BaseStringAspect::setEnvironment(const Environment &env)
+void StringAspect::setEnvironment(const Environment &env)
 {
    d->m_environment = env;
    if (d->m_pathChooserDisplay)
        d->m_pathChooserDisplay->setEnvironment(env);
 }

-void BaseStringAspect::setBaseFileName(const FilePath &baseFileName)
+void StringAspect::setBaseFileName(const FilePath &baseFileName)
 {
    d->m_baseFileName = baseFileName;
    if (d->m_pathChooserDisplay)
        d->m_pathChooserDisplay->setBaseDirectory(baseFileName);
 }

-void BaseStringAspect::setToolTip(const QString &tooltip)
+void StringAspect::setToolTip(const QString &tooltip)
 {
    d->m_tooltip = tooltip;
    if (d->m_pathChooserDisplay)
@@ -322,7 +322,7 @@ void BaseStringAspect::setToolTip(const QString &tooltip)
        d->m_textEditDisplay->setToolTip(tooltip);
 }

-void BaseStringAspect::setReadOnly(bool readOnly)
+void StringAspect::setReadOnly(bool readOnly)
 {
    d->m_readOnly = readOnly;
    if (d->m_pathChooserDisplay)
@@ -333,12 +333,12 @@ void BaseStringAspect::setReadOnly(bool readOnly)
        d->m_textEditDisplay->setReadOnly(readOnly);
 }

-void BaseStringAspect::setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider)
+void StringAspect::setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider)
 {
    d->m_expanderProvider = expanderProvider;
 }

-void BaseStringAspect::validateInput()
+void StringAspect::validateInput()
 {
    if (d->m_pathChooserDisplay)
        d->m_pathChooserDisplay->triggerChanged();
@@ -346,12 +346,12 @@ void BaseStringAspect::validateInput()
        d->m_lineEditDisplay->validate();
 }

-void BaseStringAspect::setUncheckedSemantics(BaseStringAspect::UncheckedSemantics semantics)
+void StringAspect::setUncheckedSemantics(StringAspect::UncheckedSemantics semantics)
 {
    d->m_uncheckedSemantics = semantics;
 }

-void BaseStringAspect::addToLayout(LayoutBuilder &builder)
+void StringAspect::addToLayout(LayoutBuilder &builder)
 {
    QTC_CHECK(!d->m_label);

@@ -386,7 +386,7 @@ void BaseStringAspect::addToLayout(LayoutBuilder &builder)
        d->m_pathChooserDisplay->setReadOnly(d->m_readOnly);
        useMacroExpander(d->m_pathChooserDisplay->lineEdit());
        connect(d->m_pathChooserDisplay, &PathChooser::pathChanged,
-                this, &BaseStringAspect::setValue);
+                this, &StringAspect::setValue);
        builder.addItem(d->m_pathChooserDisplay.data());
        d->m_pathChooserDisplay->setFileDialogOnly(d->m_fileDialogOnly);
        break;
@@ -398,7 +398,7 @@ void BaseStringAspect::addToLayout(LayoutBuilder &builder)
        d->m_lineEditDisplay->setReadOnly(d->m_readOnly);
        useMacroExpander(d->m_lineEditDisplay);
        connect(d->m_lineEditDisplay, &FancyLineEdit::textEdited,
-                this, &BaseStringAspect::setValue);
+                this, &StringAspect::setValue);
        builder.addItem(d->m_lineEditDisplay.data());
        break;
    case TextEditDisplay:
@@ -430,7 +430,7 @@ void BaseStringAspect::addToLayout(LayoutBuilder &builder)
    update();
 }

-void BaseStringAspect::update()
+void StringAspect::update()
 {
    const QString displayedString = d->m_displayFilter ? d->m_displayFilter(d->m_value)
                                                       : d->m_value;
@@ -467,37 +467,37 @@ void BaseStringAspect::update()
    validateInput();
 }

-void BaseStringAspect::makeCheckable(CheckBoxPlacement checkBoxPlacement,
+void StringAspect::makeCheckable(CheckBoxPlacement checkBoxPlacement,
                                     const QString &checkerLabel, const QString &checkerKey)
 {
    QTC_ASSERT(!d->m_checker, return);
    d->m_checkBoxPlacement = checkBoxPlacement;
-    d->m_checker.reset(new BaseBoolAspect);
+    d->m_checker.reset(new BoolAspect);
    d->m_checker->setLabel(checkerLabel, checkBoxPlacement == CheckBoxPlacement::Top
-                           ? BaseBoolAspect::LabelPlacement::InExtraLabel
-                           : BaseBoolAspect::LabelPlacement::AtCheckBox);
+                           ? BoolAspect::LabelPlacement::InExtraLabel
+                           : BoolAspect::LabelPlacement::AtCheckBox);
    d->m_checker->setSettingsKey(checkerKey);

-    connect(d->m_checker.get(), &BaseBoolAspect::changed, this, &BaseStringAspect::update);
-    connect(d->m_checker.get(), &BaseBoolAspect::changed, this, &BaseStringAspect::changed);
-    connect(d->m_checker.get(), &BaseBoolAspect::changed, this, &BaseStringAspect::checkedChanged);
+    connect(d->m_checker.get(), &BoolAspect::changed, this, &StringAspect::update);
+    connect(d->m_checker.get(), &BoolAspect::changed, this, &StringAspect::changed);
+    connect(d->m_checker.get(), &BoolAspect::changed, this, &StringAspect::checkedChanged);

    update();
 }

 /*!
-    \class ProjectExplorer::BaseBoolAspect
+    \class ProjectExplorer::BoolAspect
 */

-BaseBoolAspect::BaseBoolAspect(const QString &settingsKey)
-    : d(new Internal::BaseBoolAspectPrivate)
+BoolAspect::BoolAspect(const QString &settingsKey)
+    : d(new Internal::BoolAspectPrivate)
 {
    setSettingsKey(settingsKey);
 }

-BaseBoolAspect::~BaseBoolAspect() = default;
+BoolAspect::~BoolAspect() = default;

-void BaseBoolAspect::addToLayout(LayoutBuilder &builder)
+void BoolAspect::addToLayout(LayoutBuilder &builder)
 {
    QTC_CHECK(!d->m_checkBox);
    d->m_checkBox = new QCheckBox();
@@ -519,51 +519,51 @@ void BaseBoolAspect::addToLayout(LayoutBuilder &builder)
    });
 }

-void BaseBoolAspect::fromMap(const QVariantMap &map)
+void BoolAspect::fromMap(const QVariantMap &map)
 {
    d->m_value = map.value(settingsKey(), d->m_defaultValue).toBool();
 }

-void BaseBoolAspect::toMap(QVariantMap &data) const
+void BoolAspect::toMap(QVariantMap &data) const
 {
    data.insert(settingsKey(), d->m_value);
 }

-bool BaseBoolAspect::defaultValue() const
+bool BoolAspect::defaultValue() const
 {
    return d->m_defaultValue;
 }

-void BaseBoolAspect::setDefaultValue(bool defaultValue)
+void BoolAspect::setDefaultValue(bool defaultValue)
 {
    d->m_defaultValue = defaultValue;
    d->m_value = defaultValue;
 }

-bool BaseBoolAspect::value() const
+bool BoolAspect::value() const
 {
    return d->m_value;
 }

-void BaseBoolAspect::setValue(bool value)
+void BoolAspect::setValue(bool value)
 {
    d->m_value = value;
    if (d->m_checkBox)
        d->m_checkBox->setChecked(d->m_value);
 }

-void BaseBoolAspect::setLabel(const QString &labelText, LabelPlacement labelPlacement)
+void BoolAspect::setLabel(const QString &labelText, LabelPlacement labelPlacement)
 {
    d->m_labelText = labelText;
    d->m_labelPlacement = labelPlacement;
 }

-void BaseBoolAspect::setToolTip(const QString &tooltip)
+void BoolAspect::setToolTip(const QString &tooltip)
 {
    d->m_tooltip = tooltip;
 }

-void BaseBoolAspect::setEnabled(bool enabled)
+void BoolAspect::setEnabled(bool enabled)
 {
    d->m_enabled = enabled;
    if (d->m_checkBox)
@@ -571,16 +571,16 @@ void BaseBoolAspect::setEnabled(bool enabled)
 }

 /*!
-    \class ProjectExplorer::BaseSelectionAspect
+    \class ProjectExplorer::SelectionAspect
 */

-BaseSelectionAspect::BaseSelectionAspect()
-    : d(new Internal::BaseSelectionAspectPrivate)
+SelectionAspect::SelectionAspect()
+    : d(new Internal::SelectionAspectPrivate)
 {}

-BaseSelectionAspect::~BaseSelectionAspect() = default;
+SelectionAspect::~SelectionAspect() = default;

-void BaseSelectionAspect::addToLayout(LayoutBuilder &builder)
+void SelectionAspect::addToLayout(LayoutBuilder &builder)
 {
    QTC_CHECK(d->m_buttonGroup == nullptr);
    QTC_CHECK(!d->m_comboBox);
@@ -591,7 +591,7 @@ void BaseSelectionAspect::addToLayout(LayoutBuilder &builder)
        d->m_buttonGroup = new QButtonGroup;
        d->m_buttonGroup->setExclusive(true);
        for (int i = 0, n = d->m_options.size(); i < n; ++i) {
-            const Internal::BaseSelectionAspectPrivate::Option &option = d->m_options.at(i);
+            const Internal::SelectionAspectPrivate::Option &option = d->m_options.at(i);
            auto button = new QRadioButton(option.displayName);
            button->setChecked(i == d->m_value);
            button->setToolTip(option.tooltip);
@@ -619,17 +619,17 @@ void BaseSelectionAspect::addToLayout(LayoutBuilder &builder)
    }
 }

-void BaseSelectionAspect::fromMap(const QVariantMap &map)
+void SelectionAspect::fromMap(const QVariantMap &map)
 {
    d->m_value = map.value(settingsKey(), d->m_defaultValue).toInt();
 }

-void BaseSelectionAspect::toMap(QVariantMap &data) const
+void SelectionAspect::toMap(QVariantMap &data) const
 {
    data.insert(settingsKey(), d->m_value);
 }

-void BaseSelectionAspect::setVisibleDynamic(bool visible)
+void SelectionAspect::setVisibleDynamic(bool visible)
 {
    if (d->m_label)
        d->m_label->setVisible(visible);
@@ -639,32 +639,32 @@ void BaseSelectionAspect::setVisibleDynamic(bool visible)
        button->setVisible(visible);
 }

-int BaseSelectionAspect::defaultValue() const
+int SelectionAspect::defaultValue() const
 {
    return d->m_defaultValue;
 }

-void BaseSelectionAspect::setDefaultValue(int defaultValue)
+void SelectionAspect::setDefaultValue(int defaultValue)
 {
    d->m_defaultValue = defaultValue;
 }

-void BaseSelectionAspect::setDisplayStyle(BaseSelectionAspect::DisplayStyle style)
+void SelectionAspect::setDisplayStyle(SelectionAspect::DisplayStyle style)
 {
    d->m_displayStyle = style;
 }

-void BaseSelectionAspect::setToolTip(const QString &tooltip)
+void SelectionAspect::setToolTip(const QString &tooltip)
 {
    d->m_tooltip = tooltip;
 }

-int BaseSelectionAspect::value() const
+int SelectionAspect::value() const
 {
    return d->m_value;
 }

-void BaseSelectionAspect::setValue(int value)
+void SelectionAspect::setValue(int value)
 {
    d->m_value = value;
    if (d->m_buttonGroup && 0 <= value && value < d->m_buttons.size())
@@ -674,29 +674,29 @@ void BaseSelectionAspect::setValue(int value)
    }
 }

-QString BaseSelectionAspect::stringValue() const
+QString SelectionAspect::stringValue() const
 {
    return d->m_options.at(d->m_value).displayName;
 }

-void BaseSelectionAspect::addOption(const QString &displayName, const QString &toolTip)
+void SelectionAspect::addOption(const QString &displayName, const QString &toolTip)
 {
    d->m_options.append({displayName, toolTip});
 }

 /*!
-    \class ProjectExplorer::BaseIntegerAspect
+    \class ProjectExplorer::IntegerAspect
 */

-// BaseIntegerAspect
+// IntegerAspect

-BaseIntegerAspect::BaseIntegerAspect()
-    : d(new Internal::BaseIntegerAspectPrivate)
+IntegerAspect::IntegerAspect()
+    : d(new Internal::IntegerAspectPrivate)
 {}

-BaseIntegerAspect::~BaseIntegerAspect() = default;
+IntegerAspect::~IntegerAspect() = default;

-void BaseIntegerAspect::addToLayout(LayoutBuilder &builder)
+void IntegerAspect::addToLayout(LayoutBuilder &builder)
 {
    QTC_CHECK(!d->m_label);
    d->m_label = new QLabel(d->m_labelText);
@@ -722,12 +722,12 @@ void BaseIntegerAspect::addToLayout(LayoutBuilder &builder)
    });
 }

-void BaseIntegerAspect::fromMap(const QVariantMap &map)
+void IntegerAspect::fromMap(const QVariantMap &map)
 {
    d->m_value = map.value(settingsKey(), d->m_defaultValue).toLongLong();
 }

-void BaseIntegerAspect::toMap(QVariantMap &data) const
+void IntegerAspect::toMap(QVariantMap &data) const
 {
    if (d->m_value != d->m_defaultValue)
        data.insert(settingsKey(), d->m_value);
@@ -735,52 +735,52 @@ void BaseIntegerAspect::toMap(QVariantMap &data) const
        data.remove(settingsKey());
 }

-qint64 BaseIntegerAspect::value() const
+qint64 IntegerAspect::value() const
 {
    return d->m_value;
 }

-void BaseIntegerAspect::setValue(qint64 value)
+void IntegerAspect::setValue(qint64 value)
 {
    d->m_value = value;
    if (d->m_spinBox)
        d->m_spinBox->setValue(int(d->m_value / d->m_displayScaleFactor));
 }

-void BaseIntegerAspect::setRange(qint64 min, qint64 max)
+void IntegerAspect::setRange(qint64 min, qint64 max)
 {
    d->m_minimumValue = min;
    d->m_maximumValue = max;
 }

-void BaseIntegerAspect::setLabel(const QString &label)
+void IntegerAspect::setLabel(const QString &label)
 {
    d->m_labelText = label;
    if (d->m_label)
        d->m_label->setText(label);
 }

-void BaseIntegerAspect::setPrefix(const QString &prefix)
+void IntegerAspect::setPrefix(const QString &prefix)
 {
    d->m_prefix = prefix;
 }

-void BaseIntegerAspect::setSuffix(const QString &suffix)
+void IntegerAspect::setSuffix(const QString &suffix)
 {
    d->m_suffix = suffix;
 }

-void BaseIntegerAspect::setDisplayIntegerBase(int base)
+void IntegerAspect::setDisplayIntegerBase(int base)
 {
    d->m_displayIntegerBase = base;
 }

-void BaseIntegerAspect::setDisplayScaleFactor(qint64 factor)
+void IntegerAspect::setDisplayScaleFactor(qint64 factor)
 {
    d->m_displayScaleFactor = factor;
 }

-void BaseIntegerAspect::setEnabled(bool enabled)
+void IntegerAspect::setEnabled(bool enabled)
 {
    d->m_enabled = enabled;
    if (d->m_label)
@@ -789,12 +789,12 @@ void BaseIntegerAspect::setEnabled(bool enabled)
        d->m_spinBox->setEnabled(enabled);
 }

-void BaseIntegerAspect::setDefaultValue(qint64 defaultValue)
+void IntegerAspect::setDefaultValue(qint64 defaultValue)
 {
    d->m_defaultValue = defaultValue;
 }

-void BaseIntegerAspect::setToolTip(const QString &tooltip)
+void IntegerAspect::setToolTip(const QString &tooltip)
 {
    d->m_tooltip = tooltip;
 }
@@ -803,7 +803,7 @@ void BaseIntegerAspect::setToolTip(const QString &tooltip)
    \class ProjectExplorer::BaseTristateAspect
 */

-BaseTriStateAspect::BaseTriStateAspect()
+TriStateAspect::TriStateAspect()
 {
    setDisplayStyle(DisplayStyle::ComboBox);
    setDefaultValue(2);
@@ -812,12 +812,12 @@ BaseTriStateAspect::BaseTriStateAspect()
    addOption(tr("Leave at Default"));
 }

-TriState BaseTriStateAspect::setting() const
+TriState TriStateAspect::setting() const
 {
    return TriState::fromVariant(value());
 }

-void BaseTriStateAspect::setSetting(TriState setting)
+void TriStateAspect::setSetting(TriState setting)
 {
    setValue(setting.toVariant().toInt());
 }
@@ -835,37 +835,37 @@ TriState TriState::fromVariant(const QVariant &variant)


 /*!
-    \class ProjectExplorer::BaseStringListAspect
+    \class ProjectExplorer::StringListAspect
 */

-BaseStringListAspect::BaseStringListAspect()
-    : d(new Internal::BaseStringListAspectPrivate)
+StringListAspect::StringListAspect()
+    : d(new Internal::StringListAspectPrivate)
 {}

-BaseStringListAspect::~BaseStringListAspect() = default;
+StringListAspect::~StringListAspect() = default;

-void BaseStringListAspect::addToLayout(LayoutBuilder &builder)
+void StringListAspect::addToLayout(LayoutBuilder &builder)
 {
    Q_UNUSED(builder)
    // TODO - when needed.
 }

-void BaseStringListAspect::fromMap(const QVariantMap &map)
+void StringListAspect::fromMap(const QVariantMap &map)
 {
    d->m_value = map.value(settingsKey()).toStringList();
 }

-void BaseStringListAspect::toMap(QVariantMap &data) const
+void StringListAspect::toMap(QVariantMap &data) const
 {
    data.insert(settingsKey(), d->m_value);
 }

-QStringList BaseStringListAspect::value() const
+QStringList StringListAspect::value() const
 {
    return d->m_value;
 }

-void BaseStringListAspect::setValue(const QStringList &value)
+void StringListAspect::setValue(const QStringList &value)
 {
    d->m_value = value;
 }
--- a/src/plugins/projectexplorer/projectconfigurationaspects.h
+++ b/src/plugins/projectexplorer/projectconfigurationaspects.h
@@ -34,28 +34,24 @@

 #include <memory>

-QT_BEGIN_NAMESPACE
-class QCheckBox;
-QT_END_NAMESPACE
-
 namespace ProjectExplorer {

 namespace Internal {
-class BaseBoolAspectPrivate;
-class BaseIntegerAspectPrivate;
-class BaseSelectionAspectPrivate;
-class BaseStringAspectPrivate;
-class BaseStringListAspectPrivate;
+class BoolAspectPrivate;
+class IntegerAspectPrivate;
+class SelectionAspectPrivate;
+class StringAspectPrivate;
+class StringListAspectPrivate;
 class TextDisplayPrivate;
 } // Internal

-class PROJECTEXPLORER_EXPORT BaseBoolAspect : public ProjectConfigurationAspect
+class PROJECTEXPLORER_EXPORT BoolAspect : public ProjectConfigurationAspect
 {
    Q_OBJECT

 public:
-    explicit BaseBoolAspect(const QString &settingsKey = QString());
-    ~BaseBoolAspect() override;
+    explicit BoolAspect(const QString &settingsKey = QString());
+    ~BoolAspect() override;

    void addToLayout(LayoutBuilder &builder) override;

@@ -75,16 +71,16 @@ public:
    void toMap(QVariantMap &map) const override;

 private:
-    std::unique_ptr<Internal::BaseBoolAspectPrivate> d;
+    std::unique_ptr<Internal::BoolAspectPrivate> d;
 };

-class PROJECTEXPLORER_EXPORT BaseSelectionAspect : public ProjectConfigurationAspect
+class PROJECTEXPLORER_EXPORT SelectionAspect : public ProjectConfigurationAspect
 {
    Q_OBJECT

 public:
-    BaseSelectionAspect();
-    ~BaseSelectionAspect() override;
+    SelectionAspect();
+    ~SelectionAspect() override;

    void addToLayout(LayoutBuilder &builder) override;

@@ -110,20 +106,20 @@ protected:
    void setVisibleDynamic(bool visible) override;

 private:
-    std::unique_ptr<Internal::BaseSelectionAspectPrivate> d;
+    std::unique_ptr<Internal::SelectionAspectPrivate> d;
 };

-class PROJECTEXPLORER_EXPORT BaseStringAspect : public ProjectConfigurationAspect
+class PROJECTEXPLORER_EXPORT StringAspect : public ProjectConfigurationAspect
 {
    Q_OBJECT

 public:
-    BaseStringAspect();
-    ~BaseStringAspect() override;
+    StringAspect();
+    ~StringAspect() override;

    void addToLayout(LayoutBuilder &builder) override;

-    // Hook between UI and BaseStringAspect:
+    // Hook between UI and StringAspect:
    using ValueAcceptor = std::function<Utils::optional<QString>(const QString &, const QString &)>;
    void setValueAcceptor(ValueAcceptor &&acceptor);
    QString value() const;
@@ -175,16 +171,16 @@ signals:
 private:
    void update();

-    std::unique_ptr<Internal::BaseStringAspectPrivate> d;
+    std::unique_ptr<Internal::StringAspectPrivate> d;
 };

-class PROJECTEXPLORER_EXPORT BaseIntegerAspect : public ProjectConfigurationAspect
+class PROJECTEXPLORER_EXPORT IntegerAspect : public ProjectConfigurationAspect
 {
    Q_OBJECT

 public:
-    BaseIntegerAspect();
-    ~BaseIntegerAspect() override;
+    IntegerAspect();
+    ~IntegerAspect() override;

    void addToLayout(LayoutBuilder &builder) override;

@@ -205,7 +201,7 @@ public:
    void toMap(QVariantMap &map) const override;

 private:
-    std::unique_ptr<Internal::BaseIntegerAspectPrivate> d;
+    std::unique_ptr<Internal::IntegerAspectPrivate> d;
 };

 class PROJECTEXPLORER_EXPORT TriState
@@ -230,23 +226,23 @@ private:
    Value m_value = DefaultValue;
 };

-class PROJECTEXPLORER_EXPORT BaseTriStateAspect : public BaseSelectionAspect
+class PROJECTEXPLORER_EXPORT TriStateAspect : public SelectionAspect
 {
    Q_OBJECT
 public:
-    BaseTriStateAspect();
+    TriStateAspect();

    TriState setting() const;
    void setSetting(TriState setting);
 };

-class PROJECTEXPLORER_EXPORT BaseStringListAspect : public ProjectConfigurationAspect
+class PROJECTEXPLORER_EXPORT StringListAspect : public ProjectConfigurationAspect
 {
    Q_OBJECT

 public:
-    BaseStringListAspect();
-    ~BaseStringListAspect() override;
+    StringListAspect();
+    ~StringListAspect() override;

    void addToLayout(LayoutBuilder &builder) override;

@@ -257,7 +253,15 @@ public:
    void toMap(QVariantMap &map) const override;

 private:
-    std::unique_ptr<Internal::BaseStringListAspectPrivate> d;
+    std::unique_ptr<Internal::StringListAspectPrivate> d;
 };

+// FIXME: For migration. Remove after 4.15
+using BaseBoolAspect = BoolAspect;
+using BaseIntegerAspect = IntegerAspect;
+using BaseSelectionAspect = SelectionAspect;
+using BaseStringAspect = StringAspect;
+using BaseStringListAspect = StringListAspect;
+using BaseStringListAspect = StringListAspect;
+
 } // namespace ProjectExplorer
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -407,9 +407,9 @@ ExecutableAspect::ExecutableAspect()
    setExecutablePathStyle(HostOsInfo::hostOs());
    m_executable.setPlaceHolderText(tr("<unknown>"));
    m_executable.setLabelText(tr("Executable:"));
-    m_executable.setDisplayStyle(BaseStringAspect::LabelDisplay);
+    m_executable.setDisplayStyle(StringAspect::LabelDisplay);

-    connect(&m_executable, &BaseStringAspect::changed,
+    connect(&m_executable, &StringAspect::changed,
            this, &ExecutableAspect::changed);
 }

@@ -447,7 +447,7 @@ void ExecutableAspect::setEnvironment(const Environment &env)
        m_alternativeExecutable->setEnvironment(env);
 }

-void ExecutableAspect::setDisplayStyle(BaseStringAspect::DisplayStyle style)
+void ExecutableAspect::setDisplayStyle(StringAspect::DisplayStyle style)
 {
    m_executable.setDisplayStyle(style);
 }
@@ -455,13 +455,13 @@ void ExecutableAspect::setDisplayStyle(BaseStringAspect::DisplayStyle style)
 void ExecutableAspect::makeOverridable(const QString &overridingKey, const QString &useOverridableKey)
 {
    QTC_ASSERT(!m_alternativeExecutable, return);
-    m_alternativeExecutable = new BaseStringAspect;
-    m_alternativeExecutable->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_alternativeExecutable = new StringAspect;
+    m_alternativeExecutable->setDisplayStyle(StringAspect::LineEditDisplay);
    m_alternativeExecutable->setLabelText(tr("Alternate executable on device:"));
    m_alternativeExecutable->setSettingsKey(overridingKey);
-    m_alternativeExecutable->makeCheckable(BaseStringAspect::CheckBoxPlacement::Right,
+    m_alternativeExecutable->makeCheckable(StringAspect::CheckBoxPlacement::Right,
                                           tr("Use this command instead"), useOverridableKey);
-    connect(m_alternativeExecutable, &BaseStringAspect::changed,
+    connect(m_alternativeExecutable, &StringAspect::changed,
            this, &ExecutableAspect::changed);
 }

--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -132,7 +132,7 @@ private:
    std::function<QString()> m_resetter;
 };

-class PROJECTEXPLORER_EXPORT UseLibraryPathsAspect : public BaseBoolAspect
+class PROJECTEXPLORER_EXPORT UseLibraryPathsAspect : public BoolAspect
 {
    Q_OBJECT

@@ -140,7 +140,7 @@ public:
    UseLibraryPathsAspect();
 };

-class PROJECTEXPLORER_EXPORT UseDyldSuffixAspect : public BaseBoolAspect
+class PROJECTEXPLORER_EXPORT UseDyldSuffixAspect : public BoolAspect
 {
    Q_OBJECT

@@ -168,7 +168,7 @@ public:
    void setHistoryCompleter(const QString &historyCompleterKey);
    void setExpectedKind(const Utils::PathChooser::Kind expectedKind);
    void setEnvironment(const Utils::Environment &env);
-    void setDisplayStyle(BaseStringAspect::DisplayStyle style);
+    void setDisplayStyle(StringAspect::DisplayStyle style);

 protected:
    void fromMap(const QVariantMap &map) override;
@@ -177,11 +177,11 @@ protected:
 private:
    QString executableText() const;

-    BaseStringAspect m_executable;
-    BaseStringAspect *m_alternativeExecutable = nullptr;
+    StringAspect m_executable;
+    StringAspect *m_alternativeExecutable = nullptr;
 };

-class PROJECTEXPLORER_EXPORT SymbolFileAspect : public BaseStringAspect
+class PROJECTEXPLORER_EXPORT SymbolFileAspect : public StringAspect
 {
    Q_OBJECT

--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -225,7 +225,7 @@ void InterpreterAspect::updateComboBox()
    updateCurrentInterpreter();
 }

-class MainScriptAspect : public BaseStringAspect
+class MainScriptAspect : public StringAspect
 {
    Q_OBJECT

@@ -249,16 +249,16 @@ PythonRunConfiguration::PythonRunConfiguration(Target *target, Utils::Id id)
    aspect<InterpreterAspect>()->setDefaultInterpreter(
        interpreters.isEmpty() ? PythonSettings::defaultInterpreter() : interpreters.first());

-    auto bufferedAspect = addAspect<BaseBoolAspect>();
+    auto bufferedAspect = addAspect<BoolAspect>();
    bufferedAspect->setSettingsKey("PythonEditor.RunConfiguation.Buffered");
-    bufferedAspect->setLabel(tr("Buffered output"), BaseBoolAspect::LabelPlacement::AtCheckBox);
+    bufferedAspect->setLabel(tr("Buffered output"), BoolAspect::LabelPlacement::AtCheckBox);
    bufferedAspect->setToolTip(tr("Enabling improves output performance, "
                                  "but results in delayed output."));

    auto scriptAspect = addAspect<MainScriptAspect>();
    scriptAspect->setSettingsKey("PythonEditor.RunConfiguation.Script");
    scriptAspect->setLabelText(tr("Script:"));
-    scriptAspect->setDisplayStyle(BaseStringAspect::LabelDisplay);
+    scriptAspect->setDisplayStyle(StringAspect::LabelDisplay);

    addAspect<LocalEnvironmentAspect>(target);

--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -123,11 +123,11 @@ QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id)
        emit qbsConfigurationChanged();
    });

-    m_configurationName = addAspect<BaseStringAspect>();
+    m_configurationName = addAspect<StringAspect>();
    m_configurationName->setLabelText(tr("Configuration name:"));
    m_configurationName->setSettingsKey("Qbs.configName");
-    m_configurationName->setDisplayStyle(BaseStringAspect::LineEditDisplay);
-    connect(m_configurationName, &BaseStringAspect::changed,
+    m_configurationName->setDisplayStyle(StringAspect::LineEditDisplay);
+    connect(m_configurationName, &StringAspect::changed,
            this, &BuildConfiguration::buildDirectoryChanged);

    const auto separateDebugInfoAspect = addAspect<SeparateDebugInfoAspect>();
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
@@ -100,7 +100,7 @@ private:
    QStringList m_changedFiles;
    QStringList m_activeFileTags;
    QStringList m_products;
-    ProjectExplorer::BaseStringAspect *m_configurationName = nullptr;
+    ProjectExplorer::StringAspect *m_configurationName = nullptr;
    QbsBuildSystem *m_buildSystem = nullptr;
 };

--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -54,16 +54,16 @@ QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Core::Id id)
 {
    setDisplayName(tr("Qbs Clean"));

-    m_dryRunAspect = addAspect<BaseBoolAspect>();
+    m_dryRunAspect = addAspect<BoolAspect>();
    m_dryRunAspect->setSettingsKey("Qbs.DryRun");
-    m_dryRunAspect->setLabel(tr("Dry run:"), BaseBoolAspect::LabelPlacement::InExtraLabel);
+    m_dryRunAspect->setLabel(tr("Dry run:"), BoolAspect::LabelPlacement::InExtraLabel);

-    m_keepGoingAspect = addAspect<BaseBoolAspect>();
+    m_keepGoingAspect = addAspect<BoolAspect>();
    m_keepGoingAspect->setSettingsKey("Qbs.DryKeepGoing");
-    m_keepGoingAspect->setLabel(tr("Keep going:"), BaseBoolAspect::LabelPlacement::InExtraLabel);
+    m_keepGoingAspect->setLabel(tr("Keep going:"), BoolAspect::LabelPlacement::InExtraLabel);

-    auto effectiveCommandAspect = addAspect<BaseStringAspect>();
-    effectiveCommandAspect->setDisplayStyle(BaseStringAspect::TextEditDisplay);
+    auto effectiveCommandAspect = addAspect<StringAspect>();
+    effectiveCommandAspect->setDisplayStyle(StringAspect::TextEditDisplay);
    effectiveCommandAspect->setLabelText(tr("Equivalent command line:"));

    setSummaryUpdater([this, effectiveCommandAspect] {
--- a/src/plugins/qbsprojectmanager/qbscleanstep.h
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.h
@@ -60,8 +60,8 @@ private:
    void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
                             const QString &message, const QString &file, int line);

-    ProjectExplorer::BaseBoolAspect *m_dryRunAspect = nullptr;
-    ProjectExplorer::BaseBoolAspect *m_keepGoingAspect = nullptr;
+    ProjectExplorer::BoolAspect *m_dryRunAspect = nullptr;
+    ProjectExplorer::BoolAspect *m_keepGoingAspect = nullptr;

    QStringList m_products;
    QbsSession *m_session = nullptr;
--- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
@@ -77,7 +77,7 @@ QmlMultiLanguageAspect::QmlMultiLanguageAspect(ProjectExplorer::Target *target)
 {
    setVisible(isMultilanguagePresent());
    setSettingsKey(Constants::USE_MULTILANGUAGE_KEY);
-    setLabel(tr("Use MultiLanguage translation database."), BaseBoolAspect::LabelPlacement::AtCheckBox);
+    setLabel(tr("Use MultiLanguage translation database."), BoolAspect::LabelPlacement::AtCheckBox);
    setToolTip(tr("Enable loading application with special desktop SQLite translation database."));

    setDefaultValue(!databaseFilePath().isEmpty());
@@ -112,14 +112,14 @@ Utils::FilePath QmlMultiLanguageAspect::databaseFilePath() const

 void QmlMultiLanguageAspect::toMap(QVariantMap &map) const
 {
-    BaseBoolAspect::toMap(map);
+    BoolAspect::toMap(map);
    if (!m_currentLocale.isEmpty())
        map.insert(Constants::LAST_USED_LANGUAGE, m_currentLocale);
 }

 void QmlMultiLanguageAspect::fromMap(const QVariantMap &map)
 {
-    BaseBoolAspect::fromMap(map);
+    BoolAspect::fromMap(map);
    setCurrentLocale(map.value(Constants::LAST_USED_LANGUAGE, "en").toString());
 }

--- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h
+++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h
@@ -33,7 +33,7 @@

 namespace QmlProjectManager {

-class QMLPROJECTMANAGER_EXPORT QmlMultiLanguageAspect : public ProjectExplorer::BaseBoolAspect
+class QMLPROJECTMANAGER_EXPORT QmlMultiLanguageAspect : public ProjectExplorer::BoolAspect
 {
    Q_OBJECT
 public:
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -80,7 +80,7 @@ private:
    Utils::FilePath qmlScenePath() const;
    QString commandLineArguments() const;

-    BaseStringAspect *m_qmlViewerAspect = nullptr;
+    StringAspect *m_qmlViewerAspect = nullptr;
    QmlMainFileAspect *m_qmlMainFileAspect = nullptr;
    QmlMultiLanguageAspect *m_multiLanguageAspect = nullptr;
 };
@@ -88,10 +88,10 @@ private:
 QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
    : RunConfiguration(target, id)
 {
-    m_qmlViewerAspect = addAspect<BaseStringAspect>();
+    m_qmlViewerAspect = addAspect<StringAspect>();
    m_qmlViewerAspect->setLabelText(tr("QML Viewer:"));
    m_qmlViewerAspect->setPlaceHolderText(commandLine().executable().toString());
-    m_qmlViewerAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    m_qmlViewerAspect->setDisplayStyle(StringAspect::LineEditDisplay);
    m_qmlViewerAspect->setHistoryCompleter("QmlProjectManager.viewer.history");

    auto argumentAspect = addAspect<ArgumentsAspect>();
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -67,7 +67,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Utils::Id id)
    auto libAspect = addAspect<QtLibPathAspect>();
    libAspect->setSettingsKey("Qt4ProjectManager.QnxRunConfiguration.QtLibPath");
    libAspect->setLabelText(tr("Path to Qt libraries on device"));
-    libAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    libAspect->setDisplayStyle(StringAspect::LineEditDisplay);

    setUpdater([this, target, exeAspect, symbolsAspect] {
        const BuildTargetInfo bti = buildTargetInfo();
--- a/src/plugins/qnx/qnxrunconfiguration.h
+++ b/src/plugins/qnx/qnxrunconfiguration.h
@@ -31,7 +31,7 @@
 namespace Qnx {
 namespace Internal {

-class QtLibPathAspect : public ProjectExplorer::BaseStringAspect
+class QtLibPathAspect : public ProjectExplorer::StringAspect
 {
    Q_OBJECT

--- a/src/plugins/qtsupport/qtbuildaspects.cpp
+++ b/src/plugins/qtsupport/qtbuildaspects.cpp
@@ -48,7 +48,7 @@ QmlDebuggingAspect::QmlDebuggingAspect()

 void QmlDebuggingAspect::addToLayout(LayoutBuilder &builder)
 {
-    BaseSelectionAspect::addToLayout(builder);
+    SelectionAspect::addToLayout(builder);
    const auto warningLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Warning);
    warningLabel->setElideMode(Qt::ElideNone);
    builder.startNewRow().addItems(QString(), warningLabel);
@@ -80,7 +80,7 @@ QtQuickCompilerAspect::QtQuickCompilerAspect()

 void QtQuickCompilerAspect::addToLayout(LayoutBuilder &builder)
 {
-    BaseSelectionAspect::addToLayout(builder);
+    SelectionAspect::addToLayout(builder);
    const auto warningLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Warning);
    warningLabel->setElideMode(Qt::ElideNone);
    builder.startNewRow().addItems(QString(), warningLabel);
--- a/src/plugins/qtsupport/qtbuildaspects.h
+++ b/src/plugins/qtsupport/qtbuildaspects.h
@@ -31,7 +31,7 @@

 namespace QtSupport {

-class QTSUPPORT_EXPORT QmlDebuggingAspect : public ProjectExplorer::BaseTriStateAspect
+class QTSUPPORT_EXPORT QmlDebuggingAspect : public ProjectExplorer::TriStateAspect
 {
    Q_OBJECT
 public:
@@ -44,7 +44,7 @@ private:
    const ProjectExplorer::Kit *m_kit = nullptr;
 };

-class QTSUPPORT_EXPORT QtQuickCompilerAspect : public ProjectExplorer::BaseTriStateAspect
+class QTSUPPORT_EXPORT QtQuickCompilerAspect : public ProjectExplorer::TriStateAspect
 {
    Q_OBJECT
 public:
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -42,20 +42,20 @@ GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, Utils::Id i
 {
    auto service = createDeployService<GenericDirectUploadService>();

-    BaseBoolAspect *incremental = nullptr;
+    BoolAspect *incremental = nullptr;
    if (offerIncrementalDeployment) {
-        incremental = addAspect<BaseBoolAspect>();
+        incremental = addAspect<BoolAspect>();
        incremental->setSettingsKey("RemoteLinux.GenericDirectUploadStep.Incremental");
        incremental->setLabel(tr("Incremental deployment"),
-                              BaseBoolAspect::LabelPlacement::AtCheckBox);
+                              BoolAspect::LabelPlacement::AtCheckBox);
        incremental->setValue(true);
        incremental->setDefaultValue(true);
    }

-    auto ignoreMissingFiles = addAspect<BaseBoolAspect>();
+    auto ignoreMissingFiles = addAspect<BoolAspect>();
    ignoreMissingFiles->setSettingsKey("RemoteLinux.GenericDirectUploadStep.IgnoreMissingFiles");
    ignoreMissingFiles->setLabel(tr("Ignore missing files"),
-                                 BaseBoolAspect::LabelPlacement::AtCheckBox);
+                                 BoolAspect::LabelPlacement::AtCheckBox);
    ignoreMissingFiles->setValue(false);

    setInternalInitializer([incremental, ignoreMissingFiles, service] {
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -62,47 +62,47 @@ MakeInstallStep::MakeInstallStep(BuildStepList *parent, Utils::Id id) : MakeStep
    const auto makeAspect = addAspect<ExecutableAspect>();
    makeAspect->setId(MakeAspectId);
    makeAspect->setSettingsKey(MakeAspectId);
-    makeAspect->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    makeAspect->setDisplayStyle(StringAspect::PathChooserDisplay);
    makeAspect->setLabelText(tr("Command:"));
    connect(makeAspect, &ExecutableAspect::changed,
            this, &MakeInstallStep::updateCommandFromAspect);

-    const auto installRootAspect = addAspect<BaseStringAspect>();
+    const auto installRootAspect = addAspect<StringAspect>();
    installRootAspect->setId(InstallRootAspectId);
    installRootAspect->setSettingsKey(InstallRootAspectId);
-    installRootAspect->setDisplayStyle(BaseStringAspect::PathChooserDisplay);
+    installRootAspect->setDisplayStyle(StringAspect::PathChooserDisplay);
    installRootAspect->setExpectedKind(PathChooser::Directory);
    installRootAspect->setLabelText(tr("Install root:"));
-    connect(installRootAspect, &BaseStringAspect::changed,
+    connect(installRootAspect, &StringAspect::changed,
            this, &MakeInstallStep::updateArgsFromAspect);

-    const auto cleanInstallRootAspect = addAspect<BaseBoolAspect>();
+    const auto cleanInstallRootAspect = addAspect<BoolAspect>();
    cleanInstallRootAspect->setId(CleanInstallRootAspectId);
    cleanInstallRootAspect->setSettingsKey(CleanInstallRootAspectId);
    cleanInstallRootAspect->setLabel(tr("Clean install root first:"),
-                                     BaseBoolAspect::LabelPlacement::InExtraLabel);
+                                     BoolAspect::LabelPlacement::InExtraLabel);
    cleanInstallRootAspect->setValue(false);

-    const auto commandLineAspect = addAspect<BaseStringAspect>();
+    const auto commandLineAspect = addAspect<StringAspect>();
    commandLineAspect->setId(FullCommandLineAspectId);
-    commandLineAspect->setDisplayStyle(BaseStringAspect::LabelDisplay);
+    commandLineAspect->setDisplayStyle(StringAspect::LabelDisplay);
    commandLineAspect->setLabelText(tr("Full command line:"));

-    const auto customCommandLineAspect = addAspect<BaseStringAspect>();
+    const auto customCommandLineAspect = addAspect<StringAspect>();
    customCommandLineAspect->setId(CustomCommandLineAspectId);
    customCommandLineAspect->setSettingsKey(CustomCommandLineAspectId);
-    customCommandLineAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    customCommandLineAspect->setDisplayStyle(StringAspect::LineEditDisplay);
    customCommandLineAspect->setLabelText(tr("Custom command line:"));
-    customCommandLineAspect->makeCheckable(BaseStringAspect::CheckBoxPlacement::Top,
+    customCommandLineAspect->makeCheckable(StringAspect::CheckBoxPlacement::Top,
                                           tr("Use custom command line instead:"),
                                           "RemoteLinux.MakeInstall.EnableCustomCommandLine");
-    connect(customCommandLineAspect, &BaseStringAspect::checkedChanged,
+    connect(customCommandLineAspect, &StringAspect::checkedChanged,
            this, &MakeInstallStep::updateCommandFromAspect);
-    connect(customCommandLineAspect, &BaseStringAspect::checkedChanged,
+    connect(customCommandLineAspect, &StringAspect::checkedChanged,
            this, &MakeInstallStep::updateArgsFromAspect);
-    connect(customCommandLineAspect, &BaseStringAspect::checkedChanged,
+    connect(customCommandLineAspect, &StringAspect::checkedChanged,
            this, &MakeInstallStep::updateFromCustomCommandLineAspect);
-    connect(customCommandLineAspect, &BaseStringAspect::changed,
+    connect(customCommandLineAspect, &StringAspect::changed,
            this, &MakeInstallStep::updateFromCustomCommandLineAspect);

    QTemporaryDir tmpDir;
@@ -208,12 +208,12 @@ void MakeInstallStep::stdError(const QString &line)

 FilePath MakeInstallStep::installRoot() const
 {
-    return static_cast<BaseStringAspect *>(aspect(InstallRootAspectId))->filePath();
+    return static_cast<StringAspect *>(aspect(InstallRootAspectId))->filePath();
 }

 bool MakeInstallStep::cleanInstallRoot() const
 {
-    return static_cast<BaseBoolAspect *>(aspect(CleanInstallRootAspectId))->value();
+    return static_cast<BoolAspect *>(aspect(CleanInstallRootAspectId))->value();
 }

 void MakeInstallStep::updateCommandFromAspect()
@@ -229,7 +229,7 @@ void MakeInstallStep::updateArgsFromAspect()
    if (customCommandLineAspect()->isChecked())
        return;
    setUserArguments(QtcProcess::joinArgs(target()->makeInstallCommand(
-        static_cast<BaseStringAspect *>(aspect(InstallRootAspectId))->filePath().toString())
+        static_cast<StringAspect *>(aspect(InstallRootAspectId))->filePath().toString())
                                          .arguments));
    updateFullCommandLine();
 }
@@ -237,7 +237,7 @@ void MakeInstallStep::updateArgsFromAspect()
 void MakeInstallStep::updateFullCommandLine()
 {
    // FIXME: Only executable?
-    static_cast<BaseStringAspect *>(aspect(FullCommandLineAspectId))->setValue(
+    static_cast<StringAspect *>(aspect(FullCommandLineAspectId))->setValue(
                QDir::toNativeSeparators(
                    QtcProcess::quoteArg(makeExecutable().toString()))
                + ' '  + userArguments());
@@ -245,7 +245,7 @@ void MakeInstallStep::updateFullCommandLine()

 void MakeInstallStep::updateFromCustomCommandLineAspect()
 {
-    const BaseStringAspect * const aspect = customCommandLineAspect();
+    const StringAspect * const aspect = customCommandLineAspect();
    if (!aspect->isChecked())
        return;
    const QStringList tokens = QtcProcess::splitArgs(aspect->value());
@@ -253,9 +253,9 @@ void MakeInstallStep::updateFromCustomCommandLineAspect()
    setUserArguments(QtcProcess::joinArgs(tokens.mid(1)));
 }

-BaseStringAspect *MakeInstallStep::customCommandLineAspect() const
+StringAspect *MakeInstallStep::customCommandLineAspect() const
 {
-    return static_cast<BaseStringAspect *>(aspect(CustomCommandLineAspectId));
+    return static_cast<StringAspect *>(aspect(CustomCommandLineAspectId));
 }

 bool MakeInstallStep::fromMap(const QVariantMap &map)
--- a/src/plugins/remotelinux/makeinstallstep.h
+++ b/src/plugins/remotelinux/makeinstallstep.h
@@ -30,7 +30,7 @@
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/makestep.h>

-namespace ProjectExplorer { class BaseStringAspect; }
+namespace ProjectExplorer { class StringAspect; }
 namespace Utils { class FilePath; }

 namespace RemoteLinux {
@@ -60,7 +60,7 @@ private:
    void updateFullCommandLine();
    void updateFromCustomCommandLineAspect();

-    ProjectExplorer::BaseStringAspect *customCommandLineAspect() const;
+    ProjectExplorer::StringAspect *customCommandLineAspect() const;

    ProjectExplorer::DeploymentData m_deploymentData;
    bool m_noInstallTarget = false;
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
@@ -43,13 +43,13 @@ RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep

    auto service = createDeployService<RemoteLinuxCheckForFreeDiskSpaceService>();

-    auto pathToCheckAspect = addAspect<BaseStringAspect>();
+    auto pathToCheckAspect = addAspect<StringAspect>();
    pathToCheckAspect->setSettingsKey("RemoteLinux.CheckForFreeDiskSpaceStep.PathToCheck");
-    pathToCheckAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    pathToCheckAspect->setDisplayStyle(StringAspect::LineEditDisplay);
    pathToCheckAspect->setValue("/");
    pathToCheckAspect->setLabelText(tr("Remote path to check for free space:"));

-    auto requiredSpaceAspect = addAspect<BaseIntegerAspect>();
+    auto requiredSpaceAspect = addAspect<IntegerAspect>();
    requiredSpaceAspect->setSettingsKey("RemoteLinux.CheckForFreeDiskSpaceStep.RequiredSpace");
    requiredSpaceAspect->setLabel(tr("Required disk space:"));
    requiredSpaceAspect->setDisplayScaleFactor(1024*1024);
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
@@ -38,10 +38,10 @@ RemoteLinuxCustomCommandDeploymentStep::RemoteLinuxCustomCommandDeploymentStep
 {
    auto service = createDeployService<RemoteLinuxCustomCommandDeployService>();

-    auto commandLine = addAspect<BaseStringAspect>();
+    auto commandLine = addAspect<StringAspect>();
    commandLine->setSettingsKey("RemoteLinuxCustomCommandDeploymentStep.CommandLine");
    commandLine->setLabelText(tr("Command line:"));
-    commandLine->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    commandLine->setDisplayStyle(StringAspect::LineEditDisplay);
    commandLine->setHistoryCompleter("RemoteLinuxCustomCommandDeploymentStep.History");

    setDefaultDisplayName(displayName());
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
@@ -48,7 +48,7 @@ RemoteLinuxCustomRunConfiguration::RemoteLinuxCustomRunConfiguration(Target *tar
    exeAspect->setSettingsKey("RemoteLinux.CustomRunConfig.RemoteExecutable");
    exeAspect->setLabelText(tr("Remote executable:"));
    exeAspect->setExecutablePathStyle(OsTypeLinux);
-    exeAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    exeAspect->setDisplayStyle(StringAspect::LineEditDisplay);
    exeAspect->setHistoryCompleter("RemoteLinux.CustomExecutable.History");
    exeAspect->setExpectedKind(PathChooser::Any);

--- a/src/plugins/remotelinux/remotelinuxx11forwardingaspect.h
+++ b/src/plugins/remotelinux/remotelinuxx11forwardingaspect.h
@@ -35,7 +35,7 @@ namespace Utils { class MacroExpander; }

 namespace RemoteLinux {

-class REMOTELINUX_EXPORT X11ForwardingAspect : public ProjectExplorer::BaseStringAspect
+class REMOTELINUX_EXPORT X11ForwardingAspect : public ProjectExplorer::StringAspect
 {
    Q_OBJECT

--- a/src/plugins/remotelinux/rsyncdeploystep.cpp
+++ b/src/plugins/remotelinux/rsyncdeploystep.cpp
@@ -182,16 +182,16 @@ RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl, Utils::Id id)
 {
    auto service = createDeployService<Internal::RsyncDeployService>();

-    auto flags = addAspect<BaseStringAspect>();
-    flags->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    auto flags = addAspect<StringAspect>();
+    flags->setDisplayStyle(StringAspect::LineEditDisplay);
    flags->setSettingsKey("RemoteLinux.RsyncDeployStep.Flags");
    flags->setLabelText(tr("Flags:"));
    flags->setValue(defaultFlags());

-    auto ignoreMissingFiles = addAspect<BaseBoolAspect>();
+    auto ignoreMissingFiles = addAspect<BoolAspect>();
    ignoreMissingFiles->setSettingsKey("RemoteLinux.RsyncDeployStep.IgnoreMissingFiles");
    ignoreMissingFiles->setLabel(tr("Ignore missing files:"),
-                                 BaseBoolAspect::LabelPlacement::InExtraLabel);
+                                 BoolAspect::LabelPlacement::InExtraLabel);
    ignoreMissingFiles->setValue(false);

    setDefaultDisplayName(displayName());
--- a/src/plugins/remotelinux/tarpackagecreationstep.cpp
+++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp
@@ -75,14 +75,14 @@ TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl, Utils::Id id)
 {
    setDefaultDisplayName(displayName());

-    m_ignoreMissingFilesAspect = addAspect<BaseBoolAspect>();
+    m_ignoreMissingFilesAspect = addAspect<BoolAspect>();
    m_ignoreMissingFilesAspect->setLabel(tr("Ignore missing files"),
-                                         BaseBoolAspect::LabelPlacement::AtCheckBox);
+                                         BoolAspect::LabelPlacement::AtCheckBox);
    m_ignoreMissingFilesAspect->setSettingsKey(IgnoreMissingFilesKey);

-    m_incrementalDeploymentAspect = addAspect<BaseBoolAspect>();
+    m_incrementalDeploymentAspect = addAspect<BoolAspect>();
    m_incrementalDeploymentAspect->setLabel(tr("Package modified files only"),
-                                            BaseBoolAspect::LabelPlacement::AtCheckBox);
+                                            BoolAspect::LabelPlacement::AtCheckBox);
    m_incrementalDeploymentAspect->setSettingsKey(IncrementalDeploymentKey);

    setSummaryUpdater([this] {
--- a/src/plugins/remotelinux/tarpackagecreationstep.h
+++ b/src/plugins/remotelinux/tarpackagecreationstep.h
@@ -77,8 +77,8 @@ private:

    DeploymentTimeInfo m_deployTimes;

-    ProjectExplorer::BaseBoolAspect *m_incrementalDeploymentAspect = nullptr;
-    ProjectExplorer::BaseBoolAspect *m_ignoreMissingFilesAspect = nullptr;
+    ProjectExplorer::BoolAspect *m_incrementalDeploymentAspect = nullptr;
+    ProjectExplorer::BoolAspect *m_ignoreMissingFilesAspect = nullptr;
    bool m_packagingNeeded = false;
    QList<ProjectExplorer::DeployableFile> m_files;
 };
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -68,9 +68,9 @@ public:
    {
        auto webBrowserAspect = addAspect<WebBrowserSelectionAspect>(target);

-        auto effectiveEmrunCall = addAspect<BaseStringAspect>();
+        auto effectiveEmrunCall = addAspect<StringAspect>();
        effectiveEmrunCall->setLabelText(EmrunRunConfigurationFactory::tr("Effective emrun call:"));
-        effectiveEmrunCall->setDisplayStyle(BaseStringAspect::TextEditDisplay);
+        effectiveEmrunCall->setDisplayStyle(StringAspect::TextEditDisplay);
        effectiveEmrunCall->setReadOnly(true);

        setUpdater([target, effectiveEmrunCall, webBrowserAspect] {
--- a/src/plugins/winrt/winrtrunconfiguration.cpp
+++ b/src/plugins/winrt/winrtrunconfiguration.cpp
@@ -38,7 +38,7 @@ namespace Internal {
 // UninstallAfterStopAspect

 UninstallAfterStopAspect::UninstallAfterStopAspect()
-    : BaseBoolAspect("WinRtRunConfigurationUninstallAfterStopId")
+    : BoolAspect("WinRtRunConfigurationUninstallAfterStopId")
 {
    setLabel(WinRtRunConfiguration::tr("Uninstall package after application stops"),
             LabelPlacement::AtCheckBox);
@@ -47,7 +47,7 @@ UninstallAfterStopAspect::UninstallAfterStopAspect()
 // LoopbackExemptClientAspect

 LoopbackExemptClientAspect::LoopbackExemptClientAspect()
-    : BaseBoolAspect("WinRtRunConfigurationLoopbackExemptClient")
+    : BoolAspect("WinRtRunConfigurationLoopbackExemptClient")
 {
    setLabel(WinRtRunConfiguration::tr("Enable localhost communication for clients"),
             LabelPlacement::AtCheckBox);
@@ -56,7 +56,7 @@ LoopbackExemptClientAspect::LoopbackExemptClientAspect()
 // LoopbackExemptServerAspect

 LoopbackExemptServerAspect::LoopbackExemptServerAspect()
-    : BaseBoolAspect("WinRtRunConfigurationLoopbackExemptServer")
+    : BoolAspect("WinRtRunConfigurationLoopbackExemptServer")
 {
    setLabel(WinRtRunConfiguration::tr("Enable localhost communication for "
                                       "servers (requires elevated rights)"),
--- a/src/plugins/winrt/winrtrunconfiguration.h
+++ b/src/plugins/winrt/winrtrunconfiguration.h
@@ -30,7 +30,7 @@
 namespace WinRt {
 namespace Internal {

-class UninstallAfterStopAspect : public ProjectExplorer::BaseBoolAspect
+class UninstallAfterStopAspect : public ProjectExplorer::BoolAspect
 {
    Q_OBJECT

@@ -38,7 +38,7 @@ public:
    UninstallAfterStopAspect();
 };

-class LoopbackExemptClientAspect : public ProjectExplorer::BaseBoolAspect
+class LoopbackExemptClientAspect : public ProjectExplorer::BoolAspect
 {
    Q_OBJECT

@@ -46,7 +46,7 @@ public:
    LoopbackExemptClientAspect();
 };

-class LoopbackExemptServerAspect : public ProjectExplorer::BaseBoolAspect
+class LoopbackExemptServerAspect : public ProjectExplorer::BoolAspect
 {
    Q_OBJECT