diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
index c1c8a1f7a47..83acc2035bf 100644
--- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
+++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
@@ -49,11 +49,17 @@ static CommandLine flashAndRunCommand(Target *target)
     const CMakeProjectManager::CMakeTool *tool =
             CMakeProjectManager::CMakeKitAspect::cmakeTool(target->kit());
 
+    // TODO: Hack! Implement flash target name handling, properly
+    const QString targetName =
+            target->kit()->value(Constants::KIT_BOARD_VENDOR_KEY).toString() == "NXP"
+            ? QString("flash_%1").arg(projectName)
+            : QString("flash_%1_and_bootloader").arg(projectName);
+
     return CommandLine(tool->filePath(), {
                            "--build",
                            ".",
                            "--target",
-                           QString("flash_%1_and_bootloader").arg(projectName)
+                           targetName
                        });
 }
 
@@ -63,7 +69,6 @@ FlashAndRunConfiguration::FlashAndRunConfiguration(Target *target, Core::Id id)
     auto effectiveFlashAndRunCall = addAspect<BaseStringAspect>();
     effectiveFlashAndRunCall->setLabelText(tr("Effective flash and run call:"));
     effectiveFlashAndRunCall->setDisplayStyle(BaseStringAspect::TextEditDisplay);
-    effectiveFlashAndRunCall->setReadOnly(true);
 
     auto updateConfiguration = [target, effectiveFlashAndRunCall] {
         effectiveFlashAndRunCall->setValue(flashAndRunCommand(target).toUserOutput());