ProjectExplorer: More name disambiguation for device kit aspects

Finishing 73b0875498b662128c18f794fa9b7e477b0571de.

Change-Id: I225ec83400a4e70d0fe933e8529db289b46f4a81
Reviewed-by: hjk <[email protected]>

48 files changed, 130 insertions, 130 deletions

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 7de8dbfd10b..40a7cabf10d 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -1413,7 +1413,7 @@ void AndroidConfigurations::registerCustomToolchainsAndDebuggers()
 void AndroidConfigurations::updateAutomaticKitList()
 {
     for (Kit *k : KitManager::kits()) {
-        if (DeviceTypeKitAspect::deviceTypeId(k) == Constants::ANDROID_DEVICE_TYPE) {
+        if (RunDeviceTypeKitAspect::deviceTypeId(k) == Constants::ANDROID_DEVICE_TYPE) {
             if (k->value(Constants::ANDROID_KIT_NDK).isNull() || k->value(Constants::ANDROID_KIT_SDK).isNull()) {
                 if (QtVersion *qt = QtKitAspect::qtVersion(k)) {
                     k->setValueSilently(
@@ -1425,7 +1425,7 @@ void AndroidConfigurations::updateAutomaticKitList()
     }
 
     const QList<Kit *> existingKits = Utils::filtered(KitManager::kits(), [](Kit *k) {
-        Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k);
+        Id deviceTypeId = RunDeviceTypeKitAspect::deviceTypeId(k);
         if (k->isAutoDetected() && !k->isSdkProvided()
                 && deviceTypeId == Constants::ANDROID_DEVICE_TYPE) {
             return true;
@@ -1472,7 +1472,7 @@ void AndroidConfigurations::updateAutomaticKitList()
             const auto initializeKit = [&bundle, qt](Kit *k) {
                 k->setAutoDetected(true);
                 k->setAutoDetectionSource("AndroidConfiguration");
-                DeviceTypeKitAspect::setDeviceTypeId(k, Constants::ANDROID_DEVICE_TYPE);
+                RunDeviceTypeKitAspect::setDeviceTypeId(k, Constants::ANDROID_DEVICE_TYPE);
                 ToolchainKitAspect::setBundle(k, bundle);
                 QtKitAspect::setQtVersion(k, qt);
                 QStringList abis = static_cast<const AndroidQtVersion *>(qt)->androidAbis();
@@ -1481,7 +1481,7 @@ void AndroidConfigurations::updateAutomaticKitList()
 
                 BuildDeviceKitAspect::setDeviceId(k, DeviceManager::defaultDesktopDevice()->id());
                 k->setSticky(QtKitAspect::id(), true);
-                k->setSticky(DeviceTypeKitAspect::id(), true);
+                k->setSticky(RunDeviceTypeKitAspect::id(), true);
 
                 QString versionStr = QLatin1String("Qt %{Qt:Version}");
                 if (!qt->isAutodetected())
diff --git a/src/plugins/android/androidmanifesteditor.cpp b/src/plugins/android/androidmanifesteditor.cpp
index 35cd6d222e1..e0f0752438b 100644
--- a/src/plugins/android/androidmanifesteditor.cpp
+++ b/src/plugins/android/androidmanifesteditor.cpp
@@ -79,7 +79,7 @@ static Target *androidTarget(const FilePath &fileName)
     for (Project *project : ProjectManager::projects()) {
         if (Target *target = project->activeTarget()) {
             Kit *kit = target->kit();
-            if (DeviceTypeKitAspect::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE
+            if (RunDeviceTypeKitAspect::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE
                     && fileName.isChildOf(project->projectDirectory()))
                 return target;
         }
diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp
index 20f9fe859e4..430d4df1a7a 100644
--- a/src/plugins/android/javalanguageserver.cpp
+++ b/src/plugins/android/javalanguageserver.cpp
@@ -278,7 +278,7 @@ void JLSClient::updateProjectFiles()
         return;
     if (Target *target = m_currentTarget) {
         Kit *kit = m_currentTarget->kit();
-        if (DeviceTypeKitAspect::deviceTypeId(kit) != Android::Constants::ANDROID_DEVICE_TYPE)
+        if (RunDeviceTypeKitAspect::deviceTypeId(kit) != Android::Constants::ANDROID_DEVICE_TYPE)
             return;
         if (ProjectNode *node = project()->findNodeForBuildKey(target->activeBuildKey())) {
             QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp
index 100e8b391ae..abd166876a2 100644
--- a/src/plugins/autotest/testconfiguration.cpp
+++ b/src/plugins/autotest/testconfiguration.cpp
@@ -84,7 +84,7 @@ TestConfiguration::~TestConfiguration()
 static bool isLocal(Target *target)
 {
     Kit *kit = target ? target->kit() : nullptr;
-    return DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
+    return RunDeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
 }
 
 static FilePath ensureExeEnding(const FilePath &file)
@@ -184,7 +184,7 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
     BuildTargetInfo targetInfo = buildTargets.size() ? buildTargets.first()
                                                      : BuildTargetInfo();
 
-    if (DeviceTypeKitAspect::deviceTypeId(target->kit()) == ANDROID_DEVICE_TYPE) {
+    if (RunDeviceTypeKitAspect::deviceTypeId(target->kit()) == ANDROID_DEVICE_TYPE) {
         // Android can have test runner scripts named as displayName(.bat)
         const FilePath script = ensureBatEnding(
             targetInfo.targetFilePath.parentDir() / targetInfo.displayName);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 16136cac74e..29be8db113e 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1134,17 +1134,17 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
 
 static bool isWebAssembly(const Kit *k)
 {
-    return DeviceTypeKitAspect::deviceTypeId(k) == WebAssembly::Constants::WEBASSEMBLY_DEVICE_TYPE;
+    return RunDeviceTypeKitAspect::deviceTypeId(k) == WebAssembly::Constants::WEBASSEMBLY_DEVICE_TYPE;
 }
 
 static bool isVxWorks(const Kit *k)
 {
-    return DeviceTypeKitAspect::deviceTypeId(k) == VXWORKS_DEVICE_TYPE;
+    return RunDeviceTypeKitAspect::deviceTypeId(k) == VXWORKS_DEVICE_TYPE;
 }
 
 static bool isQnx(const Kit *k)
 {
-    return DeviceTypeKitAspect::deviceTypeId(k) == Qnx::Constants::QNX_QNX_OS_TYPE;
+    return RunDeviceTypeKitAspect::deviceTypeId(k) == Qnx::Constants::QNX_QNX_OS_TYPE;
 }
 
 static bool isWindowsARM64(const Kit *k)
@@ -1496,7 +1496,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
         m_buildSystem->setIsMultiConfig(CMakeGeneratorKitAspect::isMultiConfigGenerator(k));
 
         // Android magic:
-        if (DeviceTypeKitAspect::deviceTypeId(k) == Android::Constants::ANDROID_DEVICE_TYPE) {
+        if (RunDeviceTypeKitAspect::deviceTypeId(k) == Android::Constants::ANDROID_DEVICE_TYPE) {
             auto addUniqueKeyToCmd = [&cmd] (const QString &prefix, const QString &value) -> bool {
                 const bool isUnique =
                     !Utils::contains(cmd.splitArguments(), [&prefix] (const QString &arg) {
@@ -1555,7 +1555,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
                 // and build with "cmake --build . -- -arch <arch>" instead of setting the architecture
                 // and sysroot in the CMake configuration, but that currently doesn't work with Qt/CMake
                 // https://gitlab.kitware.com/cmake/cmake/-/issues/21276
-                const Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+                const Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(k);
                 const QString sysroot = deviceType == Ios::Constants::IOS_DEVICE_TYPE
                                             ? QLatin1String("iphoneos")
                                             : QLatin1String("iphonesimulator");
@@ -1638,7 +1638,7 @@ FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
 
 bool CMakeBuildConfiguration::isIos(const Kit *k)
 {
-    const Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+    const Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(k);
     return deviceType == Ios::Constants::IOS_DEVICE_TYPE
            || deviceType == Ios::Constants::IOS_SIMULATOR_TYPE;
 }
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 0008590f070..042a23903ce 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -202,7 +202,7 @@ static QString initialStagingDir(Kit *kit)
 static bool supportsStageForInstallation(const Kit *kit)
 {
     IDeviceConstPtr runDevice = RunDeviceKitAspect::device(kit);
-    Id runDeviceType = DeviceTypeKitAspect::deviceTypeId(kit);
+    Id runDeviceType = RunDeviceTypeKitAspect::deviceTypeId(kit);
     IDeviceConstPtr buildDevice = BuildDeviceKitAspect::device(kit);
     QTC_ASSERT(runDeviceType.isValid(), return false);
     QTC_ASSERT(buildDevice, return false);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 3547e96ed10..d5ccb107cf5 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -2067,7 +2067,7 @@ const QList<BuildTargetInfo> CMakeBuildSystem::appTargets() const
     QString emulator = cm.stringValueOf("CMAKE_CROSSCOMPILING_EMULATOR");
 
     QList<BuildTargetInfo> appTargetList;
-    const bool forAndroid = DeviceTypeKitAspect::deviceTypeId(kit())
+    const bool forAndroid = RunDeviceTypeKitAspect::deviceTypeId(kit())
                             == Android::Constants::ANDROID_DEVICE_TYPE;
     for (const CMakeBuildTarget &ct : m_buildTargets) {
         if (CMakeBuildSystem::filteredOutTarget(ct))
diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
index c75c98b2841..637f6a16300 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
@@ -56,7 +56,7 @@ namespace Internal {
 
 static bool isIos(const Kit *k)
 {
-    const Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+    const Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(k);
     return deviceType == Ios::Constants::IOS_DEVICE_TYPE
            || deviceType == Ios::Constants::IOS_SIMULATOR_TYPE;
 }
diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp
index 80ba626f223..f46992ac799 100644
--- a/src/plugins/debugger/unstartedappwatcherdialog.cpp
+++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp
@@ -40,7 +40,7 @@ static bool isLocal(RunConfiguration *runConfiguration)
 {
     Target *target = runConfiguration ? runConfiguration->target() : nullptr;
     Kit *kit = target ? target->kit() : nullptr;
-    return DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
+    return RunDeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
 }
 
 /*!
diff --git a/src/plugins/docker/kitdetector.cpp b/src/plugins/docker/kitdetector.cpp
index 460734d42cd..f0e3f0c8026 100644
--- a/src/plugins/docker/kitdetector.cpp
+++ b/src/plugins/docker/kitdetector.cpp
@@ -352,7 +352,7 @@ void KitDetectorPrivate::autoDetect()
         if (cmakeId.isValid())
             k->setValue(CMakeProjectManager::Constants::TOOL_ID, cmakeId.toSetting());
 
-        DeviceTypeKitAspect::setDeviceTypeId(k, m_device->type());
+        RunDeviceTypeKitAspect::setDeviceTypeId(k, m_device->type());
         RunDeviceKitAspect::setDevice(k, m_device);
         BuildDeviceKitAspect::setDevice(k, m_device);
 
@@ -388,7 +388,7 @@ void KitDetectorPrivate::autoDetect()
         k->setSticky(ToolchainKitAspect::id(), true);
         k->setSticky(QtSupport::QtKitAspect::id(), true);
         k->setSticky(RunDeviceKitAspect::id(), true);
-        k->setSticky(DeviceTypeKitAspect::id(), true);
+        k->setSticky(RunDeviceTypeKitAspect::id(), true);
         k->setSticky(BuildDeviceKitAspect::id(), true);
     };
 
diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp
index ba911f773e7..cdccff57fa4 100644
--- a/src/plugins/ios/iosbuildconfiguration.cpp
+++ b/src/plugins/ios/iosbuildconfiguration.cpp
@@ -87,7 +87,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf
     : NamedWidget(Tr::tr("iOS Settings"))
     , m_autoManagedSigning(autoManagedSigning)
     , m_signingIdentifier(signingIdentifier)
-    , m_isDevice(DeviceTypeKitAspect::deviceTypeId(buildConfiguration->kit())
+    , m_isDevice(RunDeviceTypeKitAspect::deviceTypeId(buildConfiguration->kit())
                  == Constants::IOS_DEVICE_TYPE)
 {
     auto detailsWidget = new Utils::DetailsWidget(this);
@@ -455,7 +455,7 @@ void IosQmakeBuildConfiguration::updateQmakeCommand()
         if (signingIdentifier.isEmpty() )
             extraArgs << forceOverrideArg;
 
-        Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
+        Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(kit());
         if (devType == Constants::IOS_DEVICE_TYPE && !signingIdentifier.isEmpty()) {
             if (m_autoManagedSigning()) {
                 extraArgs << qmakeIosTeamSettings + signingIdentifier;
@@ -533,7 +533,7 @@ QList<NamedWidget *> IosCMakeBuildConfiguration::createSubConfigWidgets()
 
 CMakeConfig IosCMakeBuildConfiguration::signingFlags() const
 {
-    if (DeviceTypeKitAspect::deviceTypeId(kit()) != Constants::IOS_DEVICE_TYPE)
+    if (RunDeviceTypeKitAspect::deviceTypeId(kit()) != Constants::IOS_DEVICE_TYPE)
         return {};
     const QString signingIdentifier = m_signingIdentifier();
     if (m_autoManagedSigning()) {
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index ce66978151e..b9eeea159be 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -154,7 +154,7 @@ static QHash<XcodePlatform::ToolchainTarget, ToolchainPair> findToolchains(const
 static QSet<Kit *> existingAutoDetectedIosKits()
 {
     return toSet(filtered(KitManager::kits(), [](Kit *kit) -> bool {
-        Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit);
+        Id deviceKind = RunDeviceTypeKitAspect::deviceTypeId(kit);
         return kit->isAutoDetected() && (deviceKind == Constants::IOS_DEVICE_TYPE
                                          || deviceKind == Constants::IOS_SIMULATOR_TYPE);
     }));
@@ -169,7 +169,7 @@ static void printKits(const QSet<Kit *> &kits)
 static void setupKit(Kit *kit, Id pDeviceType, const ToolchainPair& toolchains,
                      const QVariant &debuggerId, const FilePath &sdkPath, QtVersion *qtVersion)
 {
-    DeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType);
+    RunDeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType);
     if (toolchains.first)
         ToolchainKitAspect::setToolchain(kit, toolchains.first);
     else
@@ -190,7 +190,7 @@ static void setupKit(Kit *kit, Id pDeviceType, const ToolchainPair& toolchains,
 
     kit->setSticky(QtKitAspect::id(), true);
     kit->setSticky(ToolchainKitAspect::id(), true);
-    kit->setSticky(DeviceTypeKitAspect::id(), true);
+    kit->setSticky(RunDeviceTypeKitAspect::id(), true);
     kit->setSticky(SysRootKitAspect::id(), true);
     kit->setSticky(DebuggerKitAspect::id(), false);
 
@@ -272,7 +272,7 @@ void IosConfigurations::updateAutomaticKitList()
                 Kit *kit = findOrDefault(existingKits, [&pDeviceType, &platformToolchains, &qtVersion](const Kit *kit) {
                     // we do not compare the sdk (thus automatically upgrading it in place if a
                     // new Xcode is used). Change?
-                    return DeviceTypeKitAspect::deviceTypeId(kit) == pDeviceType
+                    return RunDeviceTypeKitAspect::deviceTypeId(kit) == pDeviceType
                             && ToolchainKitAspect::cxxToolchain(kit) == platformToolchains.second
                             && ToolchainKitAspect::cToolchain(kit) == platformToolchains.first
                             && QtKitAspect::qtVersion(kit) == qtVersion;
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 224ee7e313f..df7cc2bff64 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -82,7 +82,7 @@ void IosDeviceTypeAspect::deviceChanges()
 
 void IosDeviceTypeAspect::updateDeviceType()
 {
-    if (DeviceTypeKitAspect::deviceTypeId(m_runConfiguration->kit())
+    if (RunDeviceTypeKitAspect::deviceTypeId(m_runConfiguration->kit())
             == Constants::IOS_DEVICE_TYPE)
         m_deviceType = IosDeviceType(IosDeviceType::IosDevice);
     else if (m_deviceType.type == IosDeviceType::IosDevice)
@@ -91,7 +91,7 @@ void IosDeviceTypeAspect::updateDeviceType()
 
 bool IosRunConfiguration::isEnabled(Id runMode) const
 {
-    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
+    Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(kit());
     if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
         return false;
     if (devType == Constants::IOS_SIMULATOR_TYPE)
@@ -120,7 +120,7 @@ QString IosRunConfiguration::applicationName() const
 
 FilePath IosRunConfiguration::bundleDirectory() const
 {
-    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
+    Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(kit());
     bool isDevice = (devType == Constants::IOS_DEVICE_TYPE);
     if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) {
         qCWarning(iosLog) << "unexpected device type in bundleDirForTarget: " << devType.toString();
@@ -233,7 +233,7 @@ void IosDeviceTypeAspect::toMap(Store &map) const
 
 QString IosRunConfiguration::disabledReason(Id runMode) const
 {
-    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
+    Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(kit());
     if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
         return Tr::tr("Kit has incorrect device type for running on iOS devices.");
     IDevice::ConstPtr dev = RunDeviceKitAspect::device(kit());
diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 5320c1a95c6..d095d5cbd6d 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -175,7 +175,7 @@ public:
         if (mcuTarget->toolChainPackage()->isDesktopToolchain())
             return;
 
-        DeviceTypeKitAspect::setDeviceTypeId(k, Constants::DEVICE_TYPE);
+        RunDeviceTypeKitAspect::setDeviceTypeId(k, Constants::DEVICE_TYPE);
     }
 
     static void setKitDependencies(Kit *k,
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 99bdb600475..e309c3826ac 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -760,7 +760,7 @@ bool BuildConfigurationFactory::supportsTargetDeviceType(Utils::Id id) const
 BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const FilePath &projectPath)
 {
     QTC_ASSERT(k, return nullptr);
-    const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+    const Utils::Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(k);
     for (BuildConfigurationFactory *factory : std::as_const(g_buildConfigurationFactories)) {
         if (Utils::mimeTypeForFile(projectPath).matchesName(factory->m_supportedProjectMimeTypeName)
             && factory->supportsTargetDeviceType(deviceType))
@@ -802,7 +802,7 @@ bool BuildConfigurationFactory::canHandle(const Target *target) const
     if (containsType(target->project()->projectIssues(target->kit()), Task::TaskType::Error))
         return false;
 
-    if (!supportsTargetDeviceType(DeviceTypeKitAspect::deviceTypeId(target->kit())))
+    if (!supportsTargetDeviceType(RunDeviceTypeKitAspect::deviceTypeId(target->kit())))
         return false;
 
     return true;
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 581addb5dc4..9b0f6836aef 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -278,7 +278,7 @@ bool BuildStepFactory::canHandle(BuildStepList *bsl) const
     if (!m_supportedDeviceTypes.isEmpty()) {
         Target *target = bsl->target();
         QTC_ASSERT(target, return false);
-        Id deviceType = DeviceTypeKitAspect::deviceTypeId(target->kit());
+        Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(target->kit());
         if (!m_supportedDeviceTypes.contains(deviceType))
             return false;
     }
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index 9fe084f187e..1ea0465f5e8 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -154,7 +154,7 @@ bool DeployConfigurationFactory::canHandle(Target *target) const
 
     if (!m_supportedTargetDeviceTypes.isEmpty()) {
         if (!m_supportedTargetDeviceTypes.contains(
-                    DeviceTypeKitAspect::deviceTypeId(target->kit())))
+                    RunDeviceTypeKitAspect::deviceTypeId(target->kit())))
             return false;
     }
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
index 5f102c1d92e..7f2989876ec 100644
--- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
@@ -32,7 +32,7 @@ public:
         if (device)
             return true;
 
-        Utils::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(kit());
+        Utils::Id deviceTypeId = RunDeviceTypeKitAspect::deviceTypeId(kit());
         IDeviceFactory *factory = IDeviceFactory::find(deviceTypeId);
         if (!factory || !factory->canCreate()) {
             emit addOutput(Tr::tr("No device configured."), OutputFormat::ErrorMessage);
diff --git a/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp b/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp
index 59b8f8c1793..5d914d82f41 100644
--- a/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp
@@ -31,13 +31,13 @@ using namespace Utils;
 namespace ProjectExplorer {
 
 // --------------------------------------------------------------------------
-// DeviceTypeKitAspect:
+// RunDeviceTypeKitAspect:
 // --------------------------------------------------------------------------
 namespace Internal {
-class DeviceTypeKitAspectImpl final : public KitAspect
+class RunDeviceTypeKitAspectImpl final : public KitAspect
 {
 public:
-    DeviceTypeKitAspectImpl(Kit *workingCopy, const KitAspectFactory *factory)
+    RunDeviceTypeKitAspectImpl(Kit *workingCopy, const KitAspectFactory *factory)
         : KitAspect(workingCopy, factory)
     {
         using ItemData = std::tuple<QString, Id, QIcon>;
@@ -53,9 +53,9 @@ public:
                 return std::get<2>(d);
             return {};
         });
-        auto getter = [](const Kit &k) { return DeviceTypeKitAspect::deviceTypeId(&k).toSetting(); };
+        auto getter = [](const Kit &k) { return RunDeviceTypeKitAspect::deviceTypeId(&k).toSetting(); };
         auto setter = [](Kit &k, const QVariant &type) {
-            DeviceTypeKitAspect::setDeviceTypeId(&k, Id::fromSetting(type));
+            RunDeviceTypeKitAspect::setDeviceTypeId(&k, Id::fromSetting(type));
         };
         auto resetModel = [model] {
             model->clear();
@@ -69,10 +69,10 @@ public:
     }
 };
 
-class DeviceTypeKitAspectFactory : public KitAspectFactory
+class RunDeviceTypeKitAspectFactory : public KitAspectFactory
 {
 public:
-    DeviceTypeKitAspectFactory();
+    RunDeviceTypeKitAspectFactory();
 
     void setup(Kit *k) override;
     Tasks validate(const Kit *k) const override;
@@ -83,37 +83,37 @@ public:
     QSet<Id> availableFeatures(const Kit *k) const override;
 };
 
-DeviceTypeKitAspectFactory::DeviceTypeKitAspectFactory()
+RunDeviceTypeKitAspectFactory::RunDeviceTypeKitAspectFactory()
 {
-    setId(DeviceTypeKitAspect::id());
+    setId(RunDeviceTypeKitAspect::id());
     setDisplayName(Tr::tr("Run device type"));
     setDescription(Tr::tr("The type of device to run applications on."));
     setPriority(33000);
     makeEssential();
 }
 
-void DeviceTypeKitAspectFactory::setup(Kit *k)
+void RunDeviceTypeKitAspectFactory::setup(Kit *k)
 {
     if (k && !k->hasValue(id()))
         k->setValue(id(), QByteArray(Constants::DESKTOP_DEVICE_TYPE));
 }
 
-Tasks DeviceTypeKitAspectFactory::validate(const Kit *k) const
+Tasks RunDeviceTypeKitAspectFactory::validate(const Kit *k) const
 {
     Q_UNUSED(k)
     return {};
 }
 
-KitAspect *DeviceTypeKitAspectFactory::createKitAspect(Kit *k) const
+KitAspect *RunDeviceTypeKitAspectFactory::createKitAspect(Kit *k) const
 {
     QTC_ASSERT(k, return nullptr);
-    return new Internal::DeviceTypeKitAspectImpl(k, this);
+    return new Internal::RunDeviceTypeKitAspectImpl(k, this);
 }
 
-KitAspectFactory::ItemList DeviceTypeKitAspectFactory::toUserOutput(const Kit *k) const
+KitAspectFactory::ItemList RunDeviceTypeKitAspectFactory::toUserOutput(const Kit *k) const
 {
     QTC_ASSERT(k, return {});
-    Id type = DeviceTypeKitAspect::deviceTypeId(k);
+    Id type = RunDeviceTypeKitAspect::deviceTypeId(k);
     QString typeDisplayName = Tr::tr("Unknown device type");
     if (type.isValid()) {
         if (IDeviceFactory *factory = IDeviceFactory::find(type))
@@ -122,46 +122,46 @@ KitAspectFactory::ItemList DeviceTypeKitAspectFactory::toUserOutput(const Kit *k
     return {{Tr::tr("Device type"), typeDisplayName}};
 }
 
-QSet<Id> DeviceTypeKitAspectFactory::supportedPlatforms(const Kit *k) const
+QSet<Id> RunDeviceTypeKitAspectFactory::supportedPlatforms(const Kit *k) const
 {
-    return {DeviceTypeKitAspect::deviceTypeId(k)};
+    return {RunDeviceTypeKitAspect::deviceTypeId(k)};
 }
 
-QSet<Id> DeviceTypeKitAspectFactory::availableFeatures(const Kit *k) const
+QSet<Id> RunDeviceTypeKitAspectFactory::availableFeatures(const Kit *k) const
 {
-    Id id = DeviceTypeKitAspect::deviceTypeId(k);
+    Id id = RunDeviceTypeKitAspect::deviceTypeId(k);
     if (id.isValid())
         return {id.withPrefix("DeviceType.")};
     return {};
 }
 
-const DeviceTypeKitAspectFactory theDeviceTypeKitAspectFactory;
+const RunDeviceTypeKitAspectFactory theDeviceTypeKitAspectFactory;
 } // namespace Internal
 
-const Id DeviceTypeKitAspect::id()
+const Id RunDeviceTypeKitAspect::id()
 {
     return "PE.Profile.DeviceType";
 }
 
-const Id DeviceTypeKitAspect::deviceTypeId(const Kit *k)
+const Id RunDeviceTypeKitAspect::deviceTypeId(const Kit *k)
 {
-    return k ? Id::fromSetting(k->value(DeviceTypeKitAspect::id())) : Id();
+    return k ? Id::fromSetting(k->value(RunDeviceTypeKitAspect::id())) : Id();
 }
 
-void DeviceTypeKitAspect::setDeviceTypeId(Kit *k, Id type)
+void RunDeviceTypeKitAspect::setDeviceTypeId(Kit *k, Id type)
 {
     QTC_ASSERT(k, return);
-    k->setValue(DeviceTypeKitAspect::id(), type.toSetting());
+    k->setValue(RunDeviceTypeKitAspect::id(), type.toSetting());
 }
 
 // --------------------------------------------------------------------------
-// DeviceKitAspect:
+// RunDeviceKitAspect:
 // --------------------------------------------------------------------------
 namespace Internal {
-class DeviceKitAspectImpl final : public KitAspect
+class RunDeviceKitAspectImpl final : public KitAspect
 {
 public:
-    DeviceKitAspectImpl(Kit *workingCopy, const KitAspectFactory *factory)
+    RunDeviceKitAspectImpl(Kit *workingCopy, const KitAspectFactory *factory)
         : KitAspect(workingCopy, factory)
     {
         setManagingPage(Constants::DEVICE_SETTINGS_PAGE_ID);
@@ -175,12 +175,12 @@ public:
             RunDeviceKitAspect::setDeviceId(&k, Id::fromSetting(id));
         };
         auto resetModel = [this, model] {
-            model->setTypeFilter(DeviceTypeKitAspect::deviceTypeId(kit()));
+            model->setTypeFilter(RunDeviceTypeKitAspect::deviceTypeId(kit()));
         };
         addListAspectSpec({model, std::move(getter), std::move(setter), std::move(resetModel)});
 
         connect(DeviceManager::instance(), &DeviceManager::updated,
-                this, &DeviceKitAspectImpl::refresh);
+                this, &RunDeviceKitAspectImpl::refresh);
     }
 
 private:
@@ -203,10 +203,10 @@ private:
     }
 };
 
-class DeviceKitAspectFactory : public KitAspectFactory
+class RunDeviceKitAspectFactory : public KitAspectFactory
 {
 public:
-    DeviceKitAspectFactory();
+    RunDeviceKitAspectFactory();
 
 private:
     Tasks validate(const Kit *k) const override;
@@ -229,18 +229,18 @@ private:
     void kitUpdated(Kit *k);
 };
 
-DeviceKitAspectFactory::DeviceKitAspectFactory()
+RunDeviceKitAspectFactory::RunDeviceKitAspectFactory()
 {
     setId(RunDeviceKitAspect::id());
     setDisplayName(Tr::tr("Run device"));
     setDescription(Tr::tr("The device to run the applications on."));
     setPriority(32000);
-    setEmbeddableAspects({DeviceTypeKitAspect::id()});
+    setEmbeddableAspects({RunDeviceTypeKitAspect::id()});
 }
 
-QVariant DeviceKitAspectFactory::defaultValue(const Kit *k) const
+QVariant RunDeviceKitAspectFactory::defaultValue(const Kit *k) const
 {
-    Id type = DeviceTypeKitAspect::deviceTypeId(k);
+    Id type = RunDeviceTypeKitAspect::deviceTypeId(k);
     // Use default device if that is compatible:
     IDevice::ConstPtr dev = DeviceManager::instance()->defaultDevice(type);
     if (dev && dev->isCompatibleWith(k))
@@ -255,7 +255,7 @@ QVariant DeviceKitAspectFactory::defaultValue(const Kit *k) const
     return {};
 }
 
-Tasks DeviceKitAspectFactory::validate(const Kit *k) const
+Tasks RunDeviceKitAspectFactory::validate(const Kit *k) const
 {
     IDevice::ConstPtr dev = RunDeviceKitAspect::device(k);
     Tasks result;
@@ -270,7 +270,7 @@ Tasks DeviceKitAspectFactory::validate(const Kit *k) const
     return result;
 }
 
-void DeviceKitAspectFactory::fix(Kit *k)
+void RunDeviceKitAspectFactory::fix(Kit *k)
 {
     IDevice::ConstPtr dev = RunDeviceKitAspect::device(k);
     if (dev && !dev->isCompatibleWith(k)) {
@@ -280,7 +280,7 @@ void DeviceKitAspectFactory::fix(Kit *k)
     }
 }
 
-void DeviceKitAspectFactory::setup(Kit *k)
+void RunDeviceKitAspectFactory::setup(Kit *k)
 {
     QTC_ASSERT(DeviceManager::instance()->isLoaded(), return);
     IDevice::ConstPtr dev = RunDeviceKitAspect::device(k);
@@ -290,25 +290,25 @@ void DeviceKitAspectFactory::setup(Kit *k)
     RunDeviceKitAspect::setDeviceId(k, Id::fromSetting(defaultValue(k)));
 }
 
-KitAspect *DeviceKitAspectFactory::createKitAspect(Kit *k) const
+KitAspect *RunDeviceKitAspectFactory::createKitAspect(Kit *k) const
 {
     QTC_ASSERT(k, return nullptr);
-    return new Internal::DeviceKitAspectImpl(k, this);
+    return new Internal::RunDeviceKitAspectImpl(k, this);
 }
 
-QString DeviceKitAspectFactory::displayNamePostfix(const Kit *k) const
+QString RunDeviceKitAspectFactory::displayNamePostfix(const Kit *k) const
 {
     IDevice::ConstPtr dev = RunDeviceKitAspect::device(k);
     return dev ? dev->displayName() : QString();
 }
 
-KitAspectFactory::ItemList DeviceKitAspectFactory::toUserOutput(const Kit *k) const
+KitAspectFactory::ItemList RunDeviceKitAspectFactory::toUserOutput(const Kit *k) const
 {
     IDevice::ConstPtr dev = RunDeviceKitAspect::device(k);
     return {{Tr::tr("Device"), dev ? dev->displayName() : Tr::tr("Unconfigured") }};
 }
 
-void DeviceKitAspectFactory::addToMacroExpander(Kit *kit, MacroExpander *expander) const
+void RunDeviceKitAspectFactory::addToMacroExpander(Kit *kit, MacroExpander *expander) const
 {
     QTC_ASSERT(kit, return);
     expander->registerVariable("Device:HostAddress", Tr::tr("Host address"), [kit] {
@@ -337,24 +337,24 @@ void DeviceKitAspectFactory::addToMacroExpander(Kit *kit, MacroExpander *expande
     });
 }
 
-void DeviceKitAspectFactory::onKitsLoaded()
+void RunDeviceKitAspectFactory::onKitsLoaded()
 {
     for (Kit *k : KitManager::kits())
         fix(k);
 
     DeviceManager *dm = DeviceManager::instance();
-    connect(dm, &DeviceManager::deviceListReplaced, this, &DeviceKitAspectFactory::devicesChanged);
-    connect(dm, &DeviceManager::deviceAdded, this, &DeviceKitAspectFactory::devicesChanged);
-    connect(dm, &DeviceManager::deviceRemoved, this, &DeviceKitAspectFactory::devicesChanged);
-    connect(dm, &DeviceManager::deviceUpdated, this, &DeviceKitAspectFactory::deviceUpdated);
+    connect(dm, &DeviceManager::deviceListReplaced, this, &RunDeviceKitAspectFactory::devicesChanged);
+    connect(dm, &DeviceManager::deviceAdded, this, &RunDeviceKitAspectFactory::devicesChanged);
+    connect(dm, &DeviceManager::deviceRemoved, this, &RunDeviceKitAspectFactory::devicesChanged);
+    connect(dm, &DeviceManager::deviceUpdated, this, &RunDeviceKitAspectFactory::deviceUpdated);
 
     connect(KitManager::instance(), &KitManager::kitUpdated,
-            this, &DeviceKitAspectFactory::kitUpdated);
+            this, &RunDeviceKitAspectFactory::kitUpdated);
     connect(KitManager::instance(), &KitManager::unmanagedKitUpdated,
-            this, &DeviceKitAspectFactory::kitUpdated);
+            this, &RunDeviceKitAspectFactory::kitUpdated);
 }
 
-void DeviceKitAspectFactory::deviceUpdated(Id id)
+void RunDeviceKitAspectFactory::deviceUpdated(Id id)
 {
     for (Kit *k : KitManager::kits()) {
         if (RunDeviceKitAspect::deviceId(k) == id)
@@ -362,18 +362,18 @@ void DeviceKitAspectFactory::deviceUpdated(Id id)
     }
 }
 
-void DeviceKitAspectFactory::kitUpdated(Kit *k)
+void RunDeviceKitAspectFactory::kitUpdated(Kit *k)
 {
     setup(k); // Set default device if necessary
 }
 
-void DeviceKitAspectFactory::devicesChanged()
+void RunDeviceKitAspectFactory::devicesChanged()
 {
     for (Kit *k : KitManager::kits())
         setup(k); // Set default device if necessary
 }
 
-const DeviceKitAspectFactory theDeviceKitAspectFactory;
+const RunDeviceKitAspectFactory theDeviceKitAspectFactory;
 
 } // namespace Internal
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicekitaspects.h b/src/plugins/projectexplorer/devicesupport/devicekitaspects.h
index b38acdd50fa..1f57aaeac92 100644
--- a/src/plugins/projectexplorer/devicesupport/devicekitaspects.h
+++ b/src/plugins/projectexplorer/devicesupport/devicekitaspects.h
@@ -13,7 +13,7 @@ namespace Utils { class FilePath; }
 namespace ProjectExplorer {
 class Kit;
 
-class PROJECTEXPLORER_EXPORT DeviceTypeKitAspect
+class PROJECTEXPLORER_EXPORT RunDeviceTypeKitAspect
 {
 public:
     static const Utils::Id id();
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index defb8655b70..860c271a5a7 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -420,7 +420,7 @@ Id IDevice::id() const
 */
 bool IDevice::isCompatibleWith(const Kit *k) const
 {
-    return DeviceTypeKitAspect::deviceTypeId(k) == type();
+    return RunDeviceTypeKitAspect::deviceTypeId(k) == type();
 }
 
 QList<Task> IDevice::validate() const
diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp
index 8af1082c7ac..25f420bdd9e 100644
--- a/src/plugins/projectexplorer/kit.cpp
+++ b/src/plugins/projectexplorer/kit.cpp
@@ -375,7 +375,7 @@ QIcon Kit::icon() const
     }
 
     const Utils::Id deviceType = d->m_deviceTypeForIcon.isValid()
-            ? d->m_deviceTypeForIcon : DeviceTypeKitAspect::deviceTypeId(this);
+            ? d->m_deviceTypeForIcon : RunDeviceTypeKitAspect::deviceTypeId(this);
     const QIcon deviceTypeIcon = iconForDeviceType(deviceType);
     if (!deviceTypeIcon.isNull()) {
         d->m_cachedIcon = deviceTypeIcon;
@@ -679,7 +679,7 @@ void Kit::setMutable(Id id, bool b)
 bool Kit::isMutable(Id id) const
 {
     if (id == RunDeviceKitAspect::id())
-        return DeviceTypeKitAspect::deviceTypeId(this) != Constants::DESKTOP_DEVICE_TYPE;
+        return RunDeviceTypeKitAspect::deviceTypeId(this) != Constants::DESKTOP_DEVICE_TYPE;
     return d->m_mutable.contains(id);
 }
 
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index a7484dc06e5..563cf19b0a7 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -285,7 +285,7 @@ void KitManager::restoreKits()
                 kit->setUnexpandedDisplayName(Tr::tr("Desktop (%1)").arg(it.key().toString()));
             else
                 kit->setUnexpandedDisplayName(it.key().toString());
-            DeviceTypeKitAspect::setDeviceTypeId(kit.get(), deviceTypeForKit(kit.get()));
+            RunDeviceTypeKitAspect::setDeviceTypeId(kit.get(), deviceTypeForKit(kit.get()));
             kit->setup();
             tempList.emplace_back(std::move(kit));
         }
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
index c6b2243e1e1..cecd14b9c3a 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
@@ -263,7 +263,7 @@ bool KitManagerConfigWidget::isDefaultKit() const
 
 void KitManagerConfigWidget::setIcon()
 {
-    const Id deviceType = DeviceTypeKitAspect::deviceTypeId(m_modifiedKit.get());
+    const Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(m_modifiedKit.get());
     QList<IDeviceFactory *> allDeviceFactories = IDeviceFactory::allDeviceFactories();
     if (deviceType.isValid()) {
         const auto less = [deviceType](const IDeviceFactory *f1, const IDeviceFactory *f2) {
diff --git a/src/plugins/projectexplorer/parseissuesdialog.cpp b/src/plugins/projectexplorer/parseissuesdialog.cpp
index 286104aae7d..af1d3928c25 100644
--- a/src/plugins/projectexplorer/parseissuesdialog.cpp
+++ b/src/plugins/projectexplorer/parseissuesdialog.cpp
@@ -66,7 +66,7 @@ ParseIssuesDialog::ParseIssuesDialog(QWidget *parent) : QDialog(parent), d(new P
     d->kitChooser.populate();
     if (!d->kitChooser.hasStartupKit()) {
         for (const Kit * const k : KitManager::kits()) {
-            if (DeviceTypeKitAspect::deviceTypeId(k) == Constants::DESKTOP_DEVICE_TYPE) {
+            if (RunDeviceTypeKitAspect::deviceTypeId(k) == Constants::DESKTOP_DEVICE_TYPE) {
                 d->kitChooser.setCurrentKitId(k->id());
                 break;
             }
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index a26dc987490..1400e8e86ba 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -474,7 +474,7 @@ Target *Project::createKitAndTargetFromStore(const Utils::Store &store)
                                                          transform(KitManager::kits(),
                                                                    &Kit::unexpandedDisplayName));
             kit->setUnexpandedDisplayName(kitName);
-            DeviceTypeKitAspect::setDeviceTypeId(kit, deviceTypeId);
+            RunDeviceTypeKitAspect::setDeviceTypeId(kit, deviceTypeId);
             kit->setup();
         });
     QTC_ASSERT(k, return nullptr);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 4206743e0aa..a9f26c695a5 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -3193,7 +3193,7 @@ expected_str<void> ProjectExplorerPlugin::canRunStartupProject(Utils::Id runMode
     }
 
     // shouldn't actually be shown to the user...
-    if (!RunControl::canRun(runMode, DeviceTypeKitAspect::deviceTypeId(target->kit()),
+    if (!RunControl::canRun(runMode, RunDeviceTypeKitAspect::deviceTypeId(target->kit()),
                             activeRC->id())) {
         return make_unexpected(Tr::tr("Cannot run \"%1\".").arg(activeRC->displayName()));
     }
diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp
index 5b5f6458d1d..239f27e89b9 100644
--- a/src/plugins/projectexplorer/projectimporter.cpp
+++ b/src/plugins/projectexplorer/projectimporter.cpp
@@ -173,7 +173,7 @@ Target *ProjectImporter::preferredTarget(const QList<Target *> &possibleTargets)
             return t;
         if (pickedFallback)
             continue;
-        if (DeviceTypeKitAspect::deviceTypeId(t->kit()) == Constants::DESKTOP_DEVICE_TYPE) {
+        if (RunDeviceTypeKitAspect::deviceTypeId(t->kit()) == Constants::DESKTOP_DEVICE_TYPE) {
             activeTarget = t;
             pickedFallback = true;
         }
diff --git a/src/plugins/projectexplorer/rawprojectpart.cpp b/src/plugins/projectexplorer/rawprojectpart.cpp
index c98bbea4b42..bad242f5380 100644
--- a/src/plugins/projectexplorer/rawprojectpart.cpp
+++ b/src/plugins/projectexplorer/rawprojectpart.cpp
@@ -208,7 +208,7 @@ ProjectUpdateInfo::ProjectUpdateInfo(Project *project,
 void addTargetFlagForIos(QStringList &cFlags, QStringList &cxxFlags, const BuildSystem *bs,
                          const std::function<QString ()> &getDeploymentTarget)
 {
-    const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(bs->target()->kit());
+    const Utils::Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(bs->target()->kit());
     if (deviceType != Ios::Constants::IOS_DEVICE_TYPE
             && deviceType != Ios::Constants::IOS_SIMULATOR_TYPE) {
         return;
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 8a03ee407bb..e1490c6d3b3 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -504,7 +504,7 @@ RunConfigurationFactory::~RunConfigurationFactory()
 QString RunConfigurationFactory::decoratedTargetName(const QString &targetName, Target *target)
 {
     QString displayName = targetName;
-    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target->kit());
+    Utils::Id devType = RunDeviceTypeKitAspect::deviceTypeId(target->kit());
     if (devType != Constants::DESKTOP_DEVICE_TYPE) {
         if (IDevice::ConstPtr dev = RunDeviceKitAspect::device(target->kit())) {
             if (displayName.isEmpty()) {
@@ -608,7 +608,7 @@ bool RunConfigurationFactory::canHandle(Target *target) const
 
     if (!m_supportedTargetDeviceTypes.isEmpty())
         if (!m_supportedTargetDeviceTypes.contains(
-                    DeviceTypeKitAspect::deviceTypeId(kit)))
+                    RunDeviceTypeKitAspect::deviceTypeId(kit)))
             return false;
 
     return true;
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index a1366778df1..a7bc7a147a2 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -526,7 +526,7 @@ void RunControl::forceStop()
 
 RunWorker *RunControl::createWorker(Id runMode)
 {
-    const Id deviceType = DeviceTypeKitAspect::deviceTypeId(d->kit);
+    const Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(d->kit);
     for (RunWorkerFactory *factory : std::as_const(g_runWorkerFactories)) {
         if (factory->canCreate(runMode, deviceType, d->runConfigId.toString()))
             return factory->create(this);
@@ -539,7 +539,7 @@ bool RunControl::createMainWorker()
     const QList<RunWorkerFactory *> candidates
         = filtered(g_runWorkerFactories, [this](RunWorkerFactory *factory) {
               return factory->canCreate(d->runMode,
-                                        DeviceTypeKitAspect::deviceTypeId(d->kit),
+                                        RunDeviceTypeKitAspect::deviceTypeId(d->kit),
                                         d->runConfigId.toString());
           });
 
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index 3085459cd87..eb6105273b6 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -589,7 +589,7 @@ Store Target::toMap() const
 
     Store map;
     map.insert(displayNameKey(), displayName());
-    map.insert(deviceTypeKey(), DeviceTypeKitAspect::deviceTypeId(kit()).toSetting());
+    map.insert(deviceTypeKey(), RunDeviceTypeKitAspect::deviceTypeId(kit()).toSetting());
 
     {
         // FIXME: For compatibility within the 4.11 cycle, remove this block later.
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 0c15c4f4a4e..e64e8a51523 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -58,7 +58,7 @@ static QString extractToolchainPrefix(QString *compilerName)
 
 static QString targetPlatform(const ProjectExplorer::Abi &abi, const ProjectExplorer::Kit *k)
 {
-    const Utils::Id deviceType = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k);
+    const Utils::Id deviceType = ProjectExplorer::RunDeviceTypeKitAspect::deviceTypeId(k);
     if (deviceType == WebAssembly::Constants::WEBASSEMBLY_DEVICE_TYPE)
         return "wasm-emscripten";
 
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 8d149ee2f51..5eac58e8087 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -124,7 +124,7 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Id id)
 
         setBuildDirectory(directory);
 
-        if (DeviceTypeKitAspect::deviceTypeId(target->kit())
+        if (RunDeviceTypeKitAspect::deviceTypeId(target->kit())
                         == Android::Constants::ANDROID_DEVICE_TYPE) {
             buildSteps()->appendStep(Android::Constants::ANDROID_PACKAGE_INSTALL_STEP_ID);
             buildSteps()->appendStep(Android::Constants::ANDROID_BUILD_APK_ID);
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index a8bc46b09fa..e94a2678e45 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -522,7 +522,7 @@ void QMakeStep::separateDebugInfoChanged()
 
 static bool isIos(const Kit *k)
 {
-    const Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+    const Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(k);
     return deviceType == Ios::Constants::IOS_DEVICE_TYPE
            || deviceType == Ios::Constants::IOS_SIMULATOR_TYPE;
 }
diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp
index f44cb0ab24d..93a03772103 100644
--- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp
+++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp
@@ -40,7 +40,7 @@ static void handleAction(const SelectionContext &context)
                 const Kit *kit = startupTarget->kit();
                 if (kit
                     && (kit->supportedPlatforms().contains(Android::Constants::ANDROID_DEVICE_TYPE)
-                        || DeviceTypeKitAspect::deviceTypeId(kit)
+                        || RunDeviceTypeKitAspect::deviceTypeId(kit)
                                == Android::Constants::ANDROID_DEVICE_TYPE)) {
                     skipDeploy = true;
                     // In case of an android kit we don't want the live preview button to be toggled
diff --git a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp
index 146195dc276..731b523b027 100644
--- a/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewfileontargetfinder.cpp
@@ -76,7 +76,7 @@ QString QmlPreviewFileOnTargetFinder::findPath(const QString &filePath, bool *su
 
     if (success) {
         // On desktop, if there is no "remote" path, then the application will load the local path.
-        *success = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(m_target->kit())
+        *success = ProjectExplorer::RunDeviceTypeKitAspect::deviceTypeId(m_target->kit())
                     == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
     }
     return filePath;
diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
index d87d0516a1e..47e0589f5e3 100644
--- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
@@ -151,7 +151,7 @@ QmlPreviewPluginPrivate::QmlPreviewPluginPrivate(QmlPreviewPlugin *parent)
         const Kit *kit = ProjectManager::startupTarget()->kit();
         if (ProjectManager::startupTarget() && kit)
             skipDeploy = kit->supportedPlatforms().contains(Android::Constants::ANDROID_DEVICE_TYPE)
-                || DeviceTypeKitAspect::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE;
+                || RunDeviceTypeKitAspect::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE;
         ProjectExplorerPlugin::runStartupProject(Constants::QML_PREVIEW_RUN_MODE, skipDeploy);
     });
     menu->addAction(
diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
index 5445e9540df..80ff0532e2c 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
@@ -110,7 +110,7 @@ void QmlBuildSystem::updateDeploymentData()
     if (!m_projectItem)
         return;
 
-    if (DeviceTypeKitAspect::deviceTypeId(kit())
+    if (RunDeviceTypeKitAspect::deviceTypeId(kit())
         == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
         return;
     }
@@ -511,7 +511,7 @@ bool QmlBuildSystem::setMainUiFileInMainFile(const Utils::FilePath &newMainUiFil
 Utils::FilePath QmlBuildSystem::targetDirectory() const
 {
     Utils::FilePath result;
-    if (DeviceTypeKitAspect::deviceTypeId(kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
+    if (RunDeviceTypeKitAspect::deviceTypeId(kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
         result = canonicalProjectDir();
     } else if (IDevice::ConstPtr device = RunDeviceKitAspect::device(kit())) {
         if (m_projectItem)
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 7ba18e3d03b..bdcf1837532 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -108,7 +108,7 @@ Project::RestoreResult QmlProject::fromMap(const Store &map, QString *errorMessa
     // find a kit that matches prerequisites (prefer default one)
     const QList<Kit *> kits = Utils::filtered(KitManager::kits(), [this](const Kit *k) {
         return !containsType(projectIssues(k), Task::TaskType::Error)
-               && DeviceTypeKitAspect::deviceTypeId(k)
+               && RunDeviceTypeKitAspect::deviceTypeId(k)
                       == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
     });
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 111185be66d..fd333c6f898 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -156,7 +156,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
         return env;
     };
 
-    const Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(target->kit());
+    const Id deviceTypeId = RunDeviceTypeKitAspect::deviceTypeId(target->kit());
     if (deviceTypeId == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
         environment.addPreferredBaseEnvironment(Tr::tr("System Environment"), [envModifier] {
             return envModifier(Environment::systemEnvironment());
@@ -183,7 +183,7 @@ QString QmlProjectRunConfiguration::disabledReason(Utils::Id runMode) const
         return Tr::tr("No script file to execute.");
 
     const FilePath viewer = qmlRuntimeFilePath();
-    if (DeviceTypeKitAspect::deviceTypeId(kit())
+    if (RunDeviceTypeKitAspect::deviceTypeId(kit())
             == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE
             && !viewer.exists()) {
         return Tr::tr("No QML utility found.");
@@ -278,7 +278,7 @@ void QmlProjectRunConfiguration::setupQtVersionAspect()
                 const QList<Kit *> kits = Utils::filtered(KitManager::kits(), [&](const Kit *k) {
                     QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
                     return (version && version->qtVersion().majorVersion() == preferedQtVersion)
-                           && DeviceTypeKitAspect::deviceTypeId(k)
+                           && RunDeviceTypeKitAspect::deviceTypeId(k)
                                   == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
                 });
 
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 19109e62f20..27f2fa33ecb 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -204,7 +204,7 @@ void showAttachToProcessDialog()
 {
     auto kitChooser = new KitChooser;
     kitChooser->setKitPredicate([](const Kit *k) {
-        return k->isValid() && DeviceTypeKitAspect::deviceTypeId(k) == Constants::QNX_QNX_OS_TYPE;
+        return k->isValid() && RunDeviceTypeKitAspect::deviceTypeId(k) == Constants::QNX_QNX_OS_TYPE;
     });
 
     QnxAttachDebugDialog dlg(kitChooser);
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index 7b0a3fcfa07..8db9af65f14 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -115,7 +115,7 @@ class QnxPlugin final : public ExtensionSystem::IPlugin
         connect(KitManager::instance(), &KitManager::kitsChanged, this,
                 [attachToQnxApplication, debugSeparator] {
             auto isQnxKit = [](const Kit *kit) {
-                return DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE
+                return RunDeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE
                        && RunDeviceKitAspect::device(kit) && kit->isValid();
             };
 
diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp
index a96ff7d8a1d..18ef409d222 100644
--- a/src/plugins/qnx/qnxsettingspage.cpp
+++ b/src/plugins/qnx/qnxsettingspage.cpp
@@ -183,7 +183,7 @@ void QnxConfiguration::deactivate()
     const QList<Kit *> kits = KitManager::kits();
     for (Kit *kit : kits) {
         if (kit->isAutoDetected()
-                && DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE
+                && RunDeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE
                 && toolChainsToRemove.contains(ToolchainKitAspect::cxxToolchain(kit))) {
             KitManager::deregisterKit(kit);
         }
@@ -264,7 +264,7 @@ void QnxConfiguration::createKit(const QnxTarget &target)
         if (debugger.isValid())
             DebuggerKitAspect::setDebugger(k, debugger);
 
-        DeviceTypeKitAspect::setDeviceTypeId(k, Constants::QNX_QNX_OS_TYPE);
+        RunDeviceTypeKitAspect::setDeviceTypeId(k, Constants::QNX_QNX_OS_TYPE);
         // TODO: Add sysroot?
 
         k->setUnexpandedDisplayName(Tr::tr("Kit for %1 (%2)")
@@ -275,7 +275,7 @@ void QnxConfiguration::createKit(const QnxTarget &target)
         k->setAutoDetectionSource(m_envFile.toString());
 
         k->setSticky(ToolchainKitAspect::id(), true);
-        k->setSticky(DeviceTypeKitAspect::id(), true);
+        k->setSticky(RunDeviceTypeKitAspect::id(), true);
         k->setSticky(SysRootKitAspect::id(), true);
         k->setSticky(DebuggerKitAspect::id(), true);
         k->setSticky(QmakeProjectManager::Constants::KIT_INFORMATION_ID, true);
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 31086e823a5..3295121ba2d 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -426,7 +426,7 @@ Tasks QtVersion::validateKit(const Kit *k)
     if (qtAbis.isEmpty()) // No need to test if Qt does not know anyway...
         return result;
 
-    const Id dt = DeviceTypeKitAspect::deviceTypeId(k);
+    const Id dt = RunDeviceTypeKitAspect::deviceTypeId(k);
     if (dt != "DockerDeviceType") {
         const QSet<Id> tdt = targetDeviceTypes();
         if (!tdt.isEmpty() && !tdt.contains(dt))
diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp
index fd9711db7e5..bde243f7ef8 100644
--- a/src/plugins/qtsupport/qtkitaspect.cpp
+++ b/src/plugins/qtsupport/qtkitaspect.cpp
@@ -130,7 +130,7 @@ void QtKitAspectFactory::setup(Kit *k)
     if (!k || k->hasValue(id()))
         return;
     const Abi tcAbi = ToolchainKitAspect::targetAbi(k);
-    const Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+    const Id deviceType = RunDeviceTypeKitAspect::deviceTypeId(k);
 
     const QtVersions matches
             = QtVersionManager::versions([&tcAbi, &deviceType](const QtVersion *qt) {
@@ -436,7 +436,7 @@ int QtKitAspectFactory::weight(const Kit *k) const
     const QtVersion * const qt = QtKitAspect::qtVersion(k);
     if (!qt)
         return 0;
-    if (!qt->targetDeviceTypes().contains(DeviceTypeKitAspect::deviceTypeId(k)))
+    if (!qt->targetDeviceTypes().contains(RunDeviceTypeKitAspect::deviceTypeId(k)))
         return 0;
     const Abi tcAbi = ToolchainKitAspect::targetAbi(k);
     if (qt->qtAbis().contains(tcAbi))
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 42734452bb9..5d63bed1f71 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -708,7 +708,7 @@ bool StudioWelcomePlugin::delayedInitialize()
             const bool autoDetected = valid && version->isAutodetected();
 
             return isQt6 && autoDetected
-                   && ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k)
+                   && RunDeviceTypeKitAspect::deviceTypeId(k)
                           == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
         });
 
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index f0c5f455394..a7e2ddefb93 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -689,7 +689,7 @@ void MemcheckTool::heobAction()
                         = DeviceManager::deviceForPath(sr.command.executable());
                 hasLocalRc = device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
                 if (!hasLocalRc)
-                    hasLocalRc = DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
+                    hasLocalRc = RunDeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
             }
         }
     }