diff --git a/boards/arm/samv7/same70-qmtech/README.txt b/boards/arm/samv7/same70-qmtech/README.txt
index 3ffefb32952..cebc7522bd1 100644
--- a/boards/arm/samv7/same70-qmtech/README.txt
+++ b/boards/arm/samv7/same70-qmtech/README.txt
@@ -797,7 +797,7 @@ Configuration sub-directories
       CONFIG_SAMV7_FORMAT_MCUBOOT=y
       CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
 
-  mcuboot-confirm:
+  mcuboot-slot-confirm:
     This configuration exercises the MCUboot compatible application slot
     confirm example.
 
@@ -811,8 +811,7 @@ Configuration sub-directories
 
       CONFIG_BOARD_LATE_INITIALIZE=y
 
-      CONFIG_BOOT_MCUBOOT=y
-      CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
+      CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
 
       CONFIG_SAMV7_FORMAT_MCUBOOT=y
       CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
diff --git a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-qmtech/configs/mcuboot-slot-confirm/defconfig
similarity index 96%
rename from boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
rename to boards/arm/samv7/same70-qmtech/configs/mcuboot-slot-confirm/defconfig
index bf2d8a76404..4fe7e2a845a 100644
--- a/boards/arm/samv7/same70-qmtech/configs/mcuboot-confirm/defconfig
+++ b/boards/arm/samv7/same70-qmtech/configs/mcuboot-slot-confirm/defconfig
@@ -26,14 +26,13 @@ CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_LAZYFPU=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
-CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
+CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_FS_PROCFS=y
 CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
 CONFIG_MMCSD_MULTIBLOCK_LIMIT=1
 CONFIG_MMCSD_SDIO=y
 CONFIG_NSH_ARCHINIT=y
diff --git a/boards/arm/samv7/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt
index 803ab37603a..8111050c6b2 100644
--- a/boards/arm/samv7/same70-xplained/README.txt
+++ b/boards/arm/samv7/same70-xplained/README.txt
@@ -1719,7 +1719,7 @@ Configuration sub-directories
       CONFIG_SAMV7_FORMAT_MCUBOOT=y
       CONFIG_INIT_ENTRYPOINT="mcuboot_loader_main"
 
-  mcuboot-confirm:
+  mcuboot-slot-confirm:
     This configuration exercises the MCUboot compatible application slot
     confirm example.
 
@@ -1733,8 +1733,7 @@ Configuration sub-directories
 
       CONFIG_BOARD_LATE_INITIALIZE=y
 
-      CONFIG_BOOT_MCUBOOT=y
-      CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
+      CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
 
       CONFIG_SAMV7_FORMAT_MCUBOOT=y
       CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
diff --git a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig b/boards/arm/samv7/same70-xplained/configs/mcuboot-slot-confirm/defconfig
similarity index 97%
rename from boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
rename to boards/arm/samv7/same70-xplained/configs/mcuboot-slot-confirm/defconfig
index f84923a889d..12cc258f6e9 100644
--- a/boards/arm/samv7/same70-xplained/configs/mcuboot-confirm/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mcuboot-slot-confirm/defconfig
@@ -35,15 +35,14 @@ CONFIG_AT24XX_EXTSIZE=160
 CONFIG_AT24XX_SIZE=2
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
-CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
+CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_FS_PROCFS=y
 CONFIG_I2CTOOL_MAXBUS=0
 CONFIG_INIT_ENTRYPOINT="mcuboot_confirm_main"
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
 CONFIG_MMCSD_MULTIBLOCK_LIMIT=1
 CONFIG_MMCSD_SDIO=y
 CONFIG_MTD_AT24XX=y
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index 99d759ebbf1..81467660d71 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -2600,8 +2600,8 @@ Configuration sub-directories
 	      -c 'atsamv gpnvm set 1' \
 	      -c 'reset run' -c shutdown
 
-  mcuboot-nsh:
-    This configuration exercises the MCUboot compatible application slot
+  mcuboot-swap-test:
+    This configuration exercises the MCUboot compatible application swap image
     example. The application is NuttX nsh with some special commands.
 
     Generate signed binaries for MCUboot compatible application:
@@ -2609,12 +2609,12 @@ Configuration sub-directories
       ./apps/boot/mcuboot/mcuboot/scripts/imgtool.py sign \
         --key apps/boot/mcuboot/mcuboot/root-rsa-2048.pem --align 8 \
         --version 1.0.0 --header-size 0x200 --pad-header --slot-size 0xe0000 \
-        nuttx/nuttx.bin mcuboot_nuttx.app.nsh.confirmed-v1.bin
+        nuttx/nuttx.bin mcuboot_nuttx.app.swap.test.confirm-v1.bin
 
       ./apps/boot/mcuboot/mcuboot/scripts/imgtool.py sign \
         --key apps/boot/mcuboot/mcuboot/root-rsa-2048.pem --align 8 \
         --version 2.0.0 --header-size 0x200 --pad-header --slot-size 0xe0000 \
-        nuttx/nuttx.bin mcuboot_nuttx.app.nsh.confirmed-v2.bin
+        nuttx/nuttx.bin mcuboot_nuttx.app.swap.test.confirm-v2.bin
 
       Flash application version 1.0.0 at MCUboot Slot-0:
 
@@ -2625,7 +2625,7 @@ Configuration sub-directories
 	      -c 'reset_config srst_only' \
 	      -c init -c targets \
 	      -c 'reset halt' \
-	      -c 'program mcuboot_nuttx.app.nsh.confirmed-v1.bin 0x420000' \
+	      -c 'program mcuboot_nuttx.app.swap.test.confirm-v1.bin 0x420000' \
 	      -c 'reset halt' \
 	      -c 'atsamv gpnvm set 1' \
 	      -c 'reset run' -c shutdown
@@ -2639,15 +2639,14 @@ Configuration sub-directories
 	      -c 'reset_config srst_only' \
 	      -c init -c targets \
 	      -c 'reset halt' \
-	      -c 'program mcuboot_nuttx.app.nsh.confirmed-v2.bin 0x500000' \
+	      -c 'program mcuboot_nuttx.app.swap.test.confirm-v2.bin 0x500000' \
 	      -c 'reset halt' \
 	      -c 'atsamv gpnvm set 1' \
 	      -c 'reset run' -c shutdown
 
     Relevant configuration settings:
 
-      CONFIG_BOOT_MCUBOOT=y
-      CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
+      CONFIG_EXAMPLES_MCUBOOT_SWAP_TEST=y
 
       CONFIG_SAMV7_FORMAT_MCUBOOT=y
       CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/mcuboot-swap-test/defconfig
similarity index 96%
rename from boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
rename to boards/arm/samv7/samv71-xult/configs/mcuboot-swap-test/defconfig
index 9371e405105..80521525d2c 100644
--- a/boards/arm/samv7/samv71-xult/configs/mcuboot-nsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mcuboot-swap-test/defconfig
@@ -29,11 +29,10 @@ CONFIG_ARMV7M_LAZYFPU=y
 CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=51262
-CONFIG_BOOT_MCUBOOT=y
 CONFIG_BUILTIN=y
+CONFIG_EXAMPLES_MCUBOOT_SWAP_TEST=y
 CONFIG_FS_PROCFS=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512