diff --git a/src/plugins/projectexplorer/buildtargetinfo.h b/src/plugins/projectexplorer/buildtargetinfo.h
index d93c03e6fcb..70011fff886 100644
--- a/src/plugins/projectexplorer/buildtargetinfo.h
+++ b/src/plugins/projectexplorer/buildtargetinfo.h
@@ -48,7 +48,6 @@ public:
 
     QString targetName;
 
-    QString displayName; // Used in "RunConfiguration Add ..." drop down.
     Utils::FileName targetFilePath;
     Utils::FileName projectFilePath;
 
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 176fc37a9d9..51dac8d769a 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -453,7 +453,8 @@ IRunConfigurationFactory::availableCreators(Target *parent, IRunConfigurationFac
 {
     Q_UNUSED(mode);
     return Utils::transform(parent->applicationTargets().list, [this](const BuildTargetInfo &ti) {
-        return RunConfigurationCreationInfo(this, m_runConfigBaseId, ti.targetName, ti.displayName);
+        return RunConfigurationCreationInfo(this, m_runConfigBaseId, ti.targetName,
+                                            QFileInfo(ti.targetName).completeBaseName());
     });
 }
 
@@ -476,7 +477,7 @@ void IRunConfigurationFactory::addSupportedProjectType(Core::Id id)
 RunConfigurationCreationInfo
 IRunConfigurationFactory::convert(const BuildTargetInfo &ti) const
 {
-    return convert(ti.displayName, ti.targetName);
+    return convert(QFileInfo(ti.targetName).completeBaseName(), ti.targetName);
 }
 
 RunConfigurationCreationInfo
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 68fe0d4355c..d5f741a947a 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -803,7 +803,6 @@ QList<BuildTargetInfo> QmakeProject::buildTargets(IRunConfigurationFactory::Crea
     return Utils::transform(temp, [](QmakeProFile *f) {
         BuildTargetInfo bti;
         bti.targetName = f->filePath().toString();
-        bti.displayName = QFileInfo(bti.targetName).completeBaseName();
         return bti;
     });
 }
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
index 70f4a6a38f2..2f8ad457daf 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
@@ -33,6 +33,8 @@
 #include <projectexplorer/target.h>
 #include <utils/qtcassert.h>
 
+#include <QFileInfo>
+
 using namespace ProjectExplorer;
 
 namespace RemoteLinux {
@@ -58,8 +60,9 @@ QList<RunConfigurationCreationInfo>
 {
     Q_UNUSED(mode);
     return Utils::transform(parent->applicationTargets().list, [this](const BuildTargetInfo &bti) {
-        return convert(tr("%1 (on Remote Generic Linux Host)").arg(bti.displayName), bti.targetName);
-     });
+        return convert(tr("%1 (on Remote Generic Linux Host)").arg(bti.targetName),
+                       QFileInfo(bti.targetName).completeBaseName());
+    });
  }