diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
index f510428e97e..ea8d4312597 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
@@ -172,7 +172,7 @@ RunWorker *GdbServerProvider::targetRunner(RunControl *runControl) const
 
     // Command arguments are in host OS style as the bare metal's GDB servers are launched
     // on the host, not on that target.
-    auto worker = new SimpleTargetRunner(runControl);
+    auto worker = new ProcessRunner(runControl);
     worker->setId("BareMetalGdbServer");
     // Baremetal's GDB servers are launched on the host, not on the target.
     worker->setStartModifier([worker, cmd = command()] {
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index c71c0d894af..0ccf87661d1 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -204,7 +204,7 @@ bool UvscServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMess
 
 ProjectExplorer::RunWorker *UvscServerProvider::targetRunner(RunControl *runControl) const
 {
-    auto worker = new SimpleTargetRunner(runControl);
+    auto worker = new ProcessRunner(runControl);
     worker->setId("BareMetalUvscServer");
     worker->setCommandLine({DebuggerKitAspect::runnable(runControl->kit()).command.executable(),
                             {"-j0", QStringLiteral("-s%1").arg(m_channel.port())}});
diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
index 5018b45d2fb..f46c2c7e746 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
@@ -29,7 +29,7 @@ namespace Qdb::Internal {
 static RunWorker *createQdbDeviceInferiorWorker(RunControl *runControl,
                                                 QmlDebugServicesPreset qmlServices)
 {
-    auto worker = new SimpleTargetRunner(runControl);
+    auto worker = new ProcessRunner(runControl);
     worker->setId("QdbDeviceInferiorWorker");
 
     worker->setStartModifier([worker, runControl, qmlServices] {
@@ -90,7 +90,7 @@ public:
     QdbRunWorkerFactory()
     {
         setProducer([](RunControl *runControl) {
-            auto worker = new SimpleTargetRunner(runControl);
+            auto worker = new ProcessRunner(runControl);
             worker->setStartModifier([worker] {
                 const CommandLine remoteCommand = worker->commandLine();
                 const FilePath remoteExe = remoteCommand.executable();
diff --git a/src/plugins/haskell/haskellrunconfiguration.cpp b/src/plugins/haskell/haskellrunconfiguration.cpp
index c2acef8cb49..749fe050e78 100644
--- a/src/plugins/haskell/haskellrunconfiguration.cpp
+++ b/src/plugins/haskell/haskellrunconfiguration.cpp
@@ -91,7 +91,7 @@ public:
 void setupHaskellRunSupport()
 {
     static HaskellRunConfigurationFactory runConfigFactory;
-    static SimpleTargetRunnerFactory runWorkerFactory{{Constants::C_HASKELL_RUNCONFIG_ID}};
+    static ProcessRunnerFactory runWorkerFactory{{Constants::C_HASKELL_RUNCONFIG_ID}};
     static SimpleDebugRunnerFactory debugWorkerFactory{{Constants::C_HASKELL_RUNCONFIG_ID}};
 }
 
diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
index 781b27e9740..87d8e20a8ae 100644
--- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
+++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
@@ -84,7 +84,7 @@ McuSupportRunConfigurationFactory::McuSupportRunConfigurationFactory()
 FlashRunWorkerFactory::FlashRunWorkerFactory()
 {
     setProducer([](RunControl *runControl) {
-        auto worker = new SimpleTargetRunner(runControl);
+        auto worker = new ProcessRunner(runControl);
         worker->setStartModifier([worker, runControl] {
             const Target *target = runControl->target();
             worker->setCommandLine({cmakeFilePath(target),
diff --git a/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp
index 65c732f335c..caf0823e7cd 100644
--- a/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp
@@ -97,7 +97,7 @@ void setupMesonRunConfiguration()
 void setupMesonRunAndDebugWorkers()
 {
     using namespace Debugger;
-    static SimpleTargetRunnerFactory theMesonRunWorkerFactory({Constants::MESON_RUNCONFIG_ID});
+    static ProcessRunnerFactory theMesonRunWorkerFactory({Constants::MESON_RUNCONFIG_ID});
     static SimpleDebugRunnerFactory theMesonDebugRunWorkerFactory({Constants::MESON_RUNCONFIG_ID});
 }
 
diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp
index 577f464a958..6315b5e92cc 100644
--- a/src/plugins/nim/nimplugin.cpp
+++ b/src/plugins/nim/nimplugin.cpp
@@ -49,11 +49,11 @@ public:
     NimRunConfigurationFactory nimRunConfigFactory;
     NimbleRunConfigurationFactory nimbleRunConfigFactory;
     NimbleTestConfigurationFactory nimbleTestConfigFactory;
-    SimpleTargetRunnerFactory nimRunWorkerFactory{{nimRunConfigFactory.runConfigurationId()}};
-    SimpleTargetRunnerFactory nimbleRunWorkerFactory{{nimbleRunConfigFactory.runConfigurationId()}};
+    ProcessRunnerFactory nimRunWorkerFactory{{nimRunConfigFactory.runConfigurationId()}};
+    ProcessRunnerFactory nimbleRunWorkerFactory{{nimbleRunConfigFactory.runConfigurationId()}};
     SimpleDebugRunnerFactory nimDebugWorkerFactory{{nimRunConfigFactory.runConfigurationId()}};
     SimpleDebugRunnerFactory nimbleDebugWorkerFactory{{nimbleRunConfigFactory.runConfigurationId()}};
-    SimpleTargetRunnerFactory nimbleTestWorkerFactory{{nimbleTestConfigFactory.runConfigurationId()}};
+    ProcessRunnerFactory nimbleTestWorkerFactory{{nimbleTestConfigFactory.runConfigurationId()}};
     NimbleBuildStepFactory nimbleBuildStepFactory;
     NimbleTaskStepFactory nimbleTaskStepFactory;
     NimCompilerBuildStepFactory buildStepFactory;
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index b9c746703c5..fe4b707bf64 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -75,7 +75,7 @@ CustomExecutableRunConfigurationFactory::CustomExecutableRunConfigurationFactory
 
 CustomExecutableRunWorkerFactory::CustomExecutableRunWorkerFactory()
 {
-    setProduct<SimpleTargetRunner>();
+    setProduct<ProcessRunner>();
     addSupportedRunMode(Constants::NORMAL_RUN_MODE);
     addSupportedRunConfig(Constants::CUSTOM_EXECUTABLE_RUNCONFIG_ID);
 }
diff --git a/src/plugins/projectexplorer/desktoprunconfiguration.cpp b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
index 3582dad2bf8..b3545746d8e 100644
--- a/src/plugins/projectexplorer/desktoprunconfiguration.cpp
+++ b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
@@ -3,7 +3,7 @@
 
 #include "desktoprunconfiguration.h"
 
-#include "buildsystem.h"
+#include "deploymentdata.h"
 #include "projectexplorerconstants.h"
 #include "projectexplorertr.h"
 #include "runconfigurationaspects.h"
@@ -237,7 +237,7 @@ void setupDesktopRunConfigurations()
 
 void setupDesktopRunWorker()
 {
-    static SimpleTargetRunnerFactory theDesktopRunWorkerFactory({
+    static ProcessRunnerFactory theDesktopRunWorkerFactory({
         Constants::CMAKE_RUNCONFIG_ID,
         Constants::QBS_RUNCONFIG_ID,
         Constants::QMAKE_RUNCONFIG_ID
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index 83a2eecb608..22d0f538ce5 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -1366,15 +1366,15 @@ void RunControlPrivate::debugMessage(const QString &msg) const
 }
 
 
-// SimpleTargetRunnerPrivate
+// ProcessRunnerPrivate
 
 namespace Internal {
 
-class SimpleTargetRunnerPrivate : public QObject
+class ProcessRunnerPrivate : public QObject
 {
 public:
-    explicit SimpleTargetRunnerPrivate(SimpleTargetRunner *parent);
-    ~SimpleTargetRunnerPrivate() override;
+    explicit ProcessRunnerPrivate(ProcessRunner *parent);
+    ~ProcessRunnerPrivate() override;
 
     void start();
     void stop();
@@ -1391,7 +1391,7 @@ public:
     qint64 privateApplicationPID() const;
     bool isRunning() const;
 
-    SimpleTargetRunner *q = nullptr;
+    ProcessRunner *q = nullptr;
 
     bool m_runAsRoot = false;
 
@@ -1425,16 +1425,16 @@ static QProcess::ProcessChannelMode defaultProcessChannelMode()
             ? QProcess::MergedChannels : QProcess::SeparateChannels;
 }
 
-SimpleTargetRunnerPrivate::SimpleTargetRunnerPrivate(SimpleTargetRunner *parent)
+ProcessRunnerPrivate::ProcessRunnerPrivate(ProcessRunner *parent)
     : q(parent)
 {
     m_process.setProcessChannelMode(defaultProcessChannelMode());
-    connect(&m_process, &Process::started, this, &SimpleTargetRunnerPrivate::forwardStarted);
-    connect(&m_process, &Process::done, this, &SimpleTargetRunnerPrivate::handleDone);
+    connect(&m_process, &Process::started, this, &ProcessRunnerPrivate::forwardStarted);
+    connect(&m_process, &Process::done, this, &ProcessRunnerPrivate::handleDone);
     connect(&m_process, &Process::readyReadStandardError,
-                this, &SimpleTargetRunnerPrivate::handleStandardError);
+                this, &ProcessRunnerPrivate::handleStandardError);
     connect(&m_process, &Process::readyReadStandardOutput,
-                this, &SimpleTargetRunnerPrivate::handleStandardOutput);
+                this, &ProcessRunnerPrivate::handleStandardOutput);
     connect(&m_process, &Process::requestingStop, this, [this] {
         q->appendMessage(Tr::tr("Requesting process to stop ...."), NormalMessageFormat);
     });
@@ -1471,13 +1471,13 @@ SimpleTargetRunnerPrivate::SimpleTargetRunnerPrivate(SimpleTargetRunner *parent)
     }
 }
 
-SimpleTargetRunnerPrivate::~SimpleTargetRunnerPrivate()
+ProcessRunnerPrivate::~ProcessRunnerPrivate()
 {
     if (m_state == Run)
         forwardDone();
 }
 
-void SimpleTargetRunnerPrivate::stop()
+void ProcessRunnerPrivate::stop()
 {
     if (m_stopRequested || m_state != Run)
         return;
@@ -1489,12 +1489,12 @@ void SimpleTargetRunnerPrivate::stop()
     m_process.stop();
 }
 
-bool SimpleTargetRunnerPrivate::isRunning() const
+bool ProcessRunnerPrivate::isRunning() const
 {
     return m_process.state() != QProcess::NotRunning;
 }
 
-qint64 SimpleTargetRunnerPrivate::privateApplicationPID() const
+qint64 ProcessRunnerPrivate::privateApplicationPID() const
 {
     if (!isRunning())
         return 0;
@@ -1502,14 +1502,14 @@ qint64 SimpleTargetRunnerPrivate::privateApplicationPID() const
     return m_process.processId();
 }
 
-void SimpleTargetRunnerPrivate::handleDone()
+void ProcessRunnerPrivate::handleDone()
 {
     m_resultData = m_process.resultData();
     QTC_CHECK(m_state == Run);
     forwardDone();
 }
 
-void SimpleTargetRunnerPrivate::handleStandardOutput()
+void ProcessRunnerPrivate::handleStandardOutput()
 {
     if (m_suppressDefaultStdOutHandling)
         return;
@@ -1518,7 +1518,7 @@ void SimpleTargetRunnerPrivate::handleStandardOutput()
     q->appendMessage(msg, StdOutFormat, false);
 }
 
-void SimpleTargetRunnerPrivate::handleStandardError()
+void ProcessRunnerPrivate::handleStandardError()
 {
     if (m_suppressDefaultStdOutHandling)
         return;
@@ -1527,7 +1527,7 @@ void SimpleTargetRunnerPrivate::handleStandardError()
     q->appendMessage(msg, StdErrFormat, false);
 }
 
-void SimpleTargetRunnerPrivate::start()
+void ProcessRunnerPrivate::start()
 {
     CommandLine cmdLine = m_command;
     Environment env = m_environment;
@@ -1576,9 +1576,9 @@ void SimpleTargetRunnerPrivate::start()
 }
 
 /*!
-    \class ProjectExplorer::SimpleTargetRunner
+    \class ProjectExplorer::ProcessRunner
 
-    \brief The SimpleTargetRunner class is the application launcher of the
+    \brief The ProcessRunner class is the application launcher of the
     ProjectExplorer plugin.
 
     Encapsulates processes running in a console or as GUI processes,
@@ -1586,15 +1586,15 @@ void SimpleTargetRunnerPrivate::start()
 
     \sa Utils::Process
 */
-SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl)
-    : RunWorker(runControl), d(new Internal::SimpleTargetRunnerPrivate(this))
+ProcessRunner::ProcessRunner(RunControl *runControl)
+    : RunWorker(runControl), d(new Internal::ProcessRunnerPrivate(this))
 {
-    setId("SimpleTargetRunner");
+    setId("ProcessRunner");
 }
 
-SimpleTargetRunner::~SimpleTargetRunner() = default;
+ProcessRunner::~ProcessRunner() = default;
 
-void SimpleTargetRunnerPrivate::forwardDone()
+void ProcessRunnerPrivate::forwardDone()
 {
     if (m_stopReported)
         return;
@@ -1615,7 +1615,7 @@ void SimpleTargetRunnerPrivate::forwardDone()
     q->reportStopped();
 }
 
-void SimpleTargetRunnerPrivate::forwardStarted()
+void ProcessRunnerPrivate::forwardStarted()
 {
     const bool isDesktop = m_command.executable().isLocal();
     if (isDesktop) {
@@ -1628,7 +1628,7 @@ void SimpleTargetRunnerPrivate::forwardStarted()
     q->reportStarted();
 }
 
-void SimpleTargetRunner::start()
+void ProcessRunner::start()
 {
     d->m_command = runControl()->commandLine();
     d->m_workingDirectory = runControl()->workingDirectory();
@@ -1673,53 +1673,53 @@ void SimpleTargetRunner::start()
     d->start();
 }
 
-void SimpleTargetRunner::stop()
+void ProcessRunner::stop()
 {
     d->m_stopForced = true;
     d->stop();
 }
 
-void SimpleTargetRunner::setStartModifier(const std::function<void ()> &startModifier)
+void ProcessRunner::setStartModifier(const std::function<void ()> &startModifier)
 {
     d->m_startModifier = startModifier;
 }
 
-CommandLine SimpleTargetRunner::commandLine() const
+CommandLine ProcessRunner::commandLine() const
 {
     return d->m_command;
 }
 
-void SimpleTargetRunner::setCommandLine(const Utils::CommandLine &commandLine)
+void ProcessRunner::setCommandLine(const Utils::CommandLine &commandLine)
 {
     d->m_command = commandLine;
 }
 
-void SimpleTargetRunner::setEnvironment(const Environment &environment)
+void ProcessRunner::setEnvironment(const Environment &environment)
 {
     d->m_environment = environment;
 }
 
-void SimpleTargetRunner::setWorkingDirectory(const FilePath &workingDirectory)
+void ProcessRunner::setWorkingDirectory(const FilePath &workingDirectory)
 {
     d->m_workingDirectory = workingDirectory;
 }
 
-void SimpleTargetRunner::setProcessMode(Utils::ProcessMode processMode)
+void ProcessRunner::setProcessMode(Utils::ProcessMode processMode)
 {
     d->m_process.setProcessMode(processMode);
 }
 
-Process *SimpleTargetRunner::process() const
+Process *ProcessRunner::process() const
 {
     return &d->m_process;
 }
 
-void SimpleTargetRunner::suppressDefaultStdOutHandling()
+void ProcessRunner::suppressDefaultStdOutHandling()
 {
     d->m_suppressDefaultStdOutHandling = true;
 }
 
-void SimpleTargetRunner::forceRunOnHost()
+void ProcessRunner::forceRunOnHost()
 {
     const FilePath executable = d->m_command.executable();
     if (!executable.isLocal()) {
@@ -2031,11 +2031,11 @@ void addOutputParserFactory(const std::function<Utils::OutputLineParser *(Target
     g_outputParserFactories.append(factory);
 }
 
-// SimpleTargetRunnerFactory
+// ProcessRunnerFactory
 
-SimpleTargetRunnerFactory::SimpleTargetRunnerFactory(const QList<Id> &runConfigs)
+ProcessRunnerFactory::ProcessRunnerFactory(const QList<Id> &runConfigs)
 {
-    setProduct<SimpleTargetRunner>();
+    setProduct<ProcessRunner>();
     addSupportedRunMode(ProjectExplorer::Constants::NORMAL_RUN_MODE);
     setSupportedRunConfigs(runConfigs);
 }
diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h
index e7ca277ea06..4b273191636 100644
--- a/src/plugins/projectexplorer/runcontrol.h
+++ b/src/plugins/projectexplorer/runcontrol.h
@@ -38,7 +38,7 @@ class Target;
 namespace Internal {
 class RunControlPrivate;
 class RunWorkerPrivate;
-class SimpleTargetRunnerPrivate;
+class ProcessRunnerPrivate;
 } // Internal
 
 class PROJECTEXPLORER_EXPORT RunWorker : public QObject
@@ -277,17 +277,11 @@ private:
     const std::unique_ptr<Internal::RunControlPrivate> d;
 };
 
-
-/**
- * A simple TargetRunner for cases where a plain ApplicationLauncher is
- * sufficient for running purposes.
- */
-
-class PROJECTEXPLORER_EXPORT SimpleTargetRunner final : public RunWorker
+class PROJECTEXPLORER_EXPORT ProcessRunner final : public RunWorker
 {
 public:
-    explicit SimpleTargetRunner(RunControl *runControl);
-    ~SimpleTargetRunner() override;
+    explicit ProcessRunner(RunControl *runControl);
+    ~ProcessRunner() override;
 
     void setStartModifier(const std::function<void()> &startModifier);
 
@@ -309,13 +303,13 @@ private:
     const Utils::ProcessRunData &runnable() const = delete;
     void setRunnable(const Utils::ProcessRunData &) = delete;
 
-    const std::unique_ptr<Internal::SimpleTargetRunnerPrivate> d;
+    const std::unique_ptr<Internal::ProcessRunnerPrivate> d;
 };
 
-class PROJECTEXPLORER_EXPORT SimpleTargetRunnerFactory : public RunWorkerFactory
+class PROJECTEXPLORER_EXPORT ProcessRunnerFactory : public RunWorkerFactory
 {
 public:
-    explicit SimpleTargetRunnerFactory(const QList<Utils::Id> &runConfig);
+    explicit ProcessRunnerFactory(const QList<Utils::Id> &runConfig);
 };
 
 
diff --git a/src/plugins/projectexplorer/workspaceproject.cpp b/src/plugins/projectexplorer/workspaceproject.cpp
index fbba5d3a556..56872416298 100644
--- a/src/plugins/projectexplorer/workspaceproject.cpp
+++ b/src/plugins/projectexplorer/workspaceproject.cpp
@@ -437,7 +437,7 @@ class WorkspaceProjectRunWorkerFactory : public RunWorkerFactory
 public:
     WorkspaceProjectRunWorkerFactory()
     {
-        setProduct<SimpleTargetRunner>();
+        setProduct<ProcessRunner>();
         addSupportedRunMode(Constants::NORMAL_RUN_MODE);
         addSupportedRunConfig(WORKSPACE_PROJECT_RUNCONFIG_ID);
     }
diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index e8f6719a0ab..7a53f0427ec 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -178,7 +178,7 @@ void setupPythonRunConfiguration()
 
 void setupPythonRunWorker()
 {
-    static SimpleTargetRunnerFactory thePythonRunWorkerFactory(
+    static ProcessRunnerFactory thePythonRunWorkerFactory(
         {Constants::C_PYTHONRUNCONFIGURATION_ID}
     );
 }
diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
index 322b4b2df20..f37ad564a01 100644
--- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
@@ -178,7 +178,7 @@ LocalQmlPreviewSupportFactory::LocalQmlPreviewSupportFactory()
 {
     setId(ProjectExplorer::Constants::QML_PREVIEW_RUN_FACTORY);
     setProducer([](RunControl *runControl) {
-        auto worker = new SimpleTargetRunner(runControl);
+        auto worker = new ProcessRunner(runControl);
         worker->setId("LocalQmlPreviewSupport");
 
         runControl->setQmlChannel(Utils::urlFromLocalSocket());
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
index ec416eb38d1..e745af59d7d 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
@@ -144,7 +144,7 @@ void QmlProfilerRunner::profilerStateChanged()
 
 RunWorker *createLocalQmlProfilerWorker(RunControl *runControl)
 {
-    auto worker = new SimpleTargetRunner(runControl);
+    auto worker = new ProcessRunner(runControl);
 
     worker->setId("LocalQmlProfilerSupport");
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 42d6b5b62df..5eca23749db 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -272,7 +272,7 @@ private:
     void extensionsInitialized() final
     {
         // These rely on the base tool factories being present:
-        static SimpleTargetRunnerFactory runWorkerFactory{{Constants::QML_RUNCONFIG_ID}};
+        static ProcessRunnerFactory runWorkerFactory{{Constants::QML_RUNCONFIG_ID}};
         static SimpleQmlProfilerRunnerFactory qmlProfilerRunWorkerFactory{{Constants::QML_RUNCONFIG_ID}};
         static SimpleDebugRunnerFactory debugRunWorkerFactory{{Constants::QML_RUNCONFIG_ID}};
         static SimplePreviewRunnerFactory previewRunWorkerFactory{{Constants::QML_RUNCONFIG_ID}};
diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp
index 923c00af4de..bb1489579cd 100644
--- a/src/plugins/qnx/qnxanalyzesupport.cpp
+++ b/src/plugins/qnx/qnxanalyzesupport.cpp
@@ -21,7 +21,7 @@ public:
     QnxQmlProfilerWorkerFactory()
     {
         setProducer([](RunControl *runControl) {
-            auto worker = new SimpleTargetRunner(runControl);
+            auto worker = new ProcessRunner(runControl);
             worker->setId("QnxQmlProfilerSupport");
             worker->appendMessage(Tr::tr("Preparing remote side..."), LogMessageFormat);
 
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 1bdabaea923..9470298dc63 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -136,7 +136,7 @@ void showAttachToProcessDialog()
     debugger->setupPortsGatherer();
     debugger->setUseCtrlCStub(true);
     if (debugger->isCppDebugging()) {
-        auto pdebugRunner = new SimpleTargetRunner(runControl);
+        auto pdebugRunner = new ProcessRunner(runControl);
         pdebugRunner->setId("PDebugRunner");
         pdebugRunner->setStartModifier([pdebugRunner, debugger] {
             const int pdebugPort = debugger->debugChannel().port();
@@ -175,7 +175,7 @@ public:
 
             debugger->setupPortsGatherer();
 
-            auto debuggeeRunner = new SimpleTargetRunner(runControl);
+            auto debuggeeRunner = new ProcessRunner(runControl);
             debuggeeRunner->setId("QnxDebuggeeRunner");
 
             debuggeeRunner->setStartModifier([debuggeeRunner] {
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 37092106346..7c866c830a0 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -95,7 +95,7 @@ public:
 void setupQnxRunnning()
 {
     static QnxRunConfigurationFactory theQnxRunConfigurationFactory;
-    static SimpleTargetRunnerFactory theQnxRunWorkerFactory({Constants::QNX_RUNCONFIG_ID});
+    static ProcessRunnerFactory theQnxRunWorkerFactory({Constants::QNX_RUNCONFIG_ID});
 }
 
 } // Qnx::Internal
diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
index 9066f77d52b..aa6ab14c3e4 100644
--- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
+++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
@@ -43,7 +43,7 @@ namespace AppManager::Internal {
 
 static RunWorker *createInferiorRunner(RunControl *runControl, QmlDebugServicesPreset qmlServices)
 {
-    auto worker = new SimpleTargetRunner(runControl);
+    auto worker = new ProcessRunner(runControl);
     worker->setId(AppManager::Constants::DEBUG_LAUNCHER_ID);
     worker->setEssential(true);
 
@@ -193,7 +193,7 @@ public:
     AppManagerRunWorkerFactory()
     {
         setProducer([](RunControl *runControl) {
-            auto worker = new SimpleTargetRunner(runControl);
+            auto worker = new ProcessRunner(runControl);
             worker->setId("ApplicationManagerPlugin.Run.TargetRunner");
             QObject::connect(worker, &RunWorker::stopped, worker, [worker, runControl] {
                 worker->appendMessage(
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index 69dec931378..dd6c8912bd7 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -32,7 +32,7 @@ class RemoteLinuxRunWorkerFactory final : public RunWorkerFactory
 public:
     RemoteLinuxRunWorkerFactory()
     {
-        setProduct<SimpleTargetRunner>();
+        setProduct<ProcessRunner>();
         addSupportedRunMode(ProjectExplorer::Constants::NORMAL_RUN_MODE);
         addSupportedDeviceType(Constants::GenericLinuxOsType);
         setSupportedRunConfigs(supportedRunConfigs());
@@ -76,7 +76,7 @@ public:
         setProducer([](RunControl *runControl) {
             runControl->requestQmlChannel();
 
-            auto worker = new SimpleTargetRunner(runControl);
+            auto worker = new ProcessRunner(runControl);
             worker->setId("RemoteLinuxQmlToolingSupport");
 
             auto runworker = runControl->createWorker(runnerIdForRunMode(runControl->runMode()));
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index 8783150a55d..89f239ac6a3 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -216,7 +216,7 @@ public:
     EmrunRunWorkerFactory()
     {
         setProducer([](RunControl *runControl) {
-            auto worker = new SimpleTargetRunner(runControl);
+            auto worker = new ProcessRunner(runControl);
             runControl->requestWorkerChannel();
 
             worker->setStartModifier([worker, runControl] {