diff --git a/boards/arm/v2m_musca_b1/Kconfig.defconfig b/boards/arm/v2m_musca_b1/Kconfig.defconfig
index 9beea88ed02..cc6041e9710 100644
--- a/boards/arm/v2m_musca_b1/Kconfig.defconfig
+++ b/boards/arm/v2m_musca_b1/Kconfig.defconfig
@@ -5,7 +5,7 @@ if BOARD_MUSCA_B1
 
 config BOARD
 	default "musca_b1" if TRUSTED_EXECUTION_SECURE || !TRUSTED_EXECUTION_NONSECURE
-	default "musca_b1_nonsecure"
+	default "musca_b1_ns"
 
 if GPIO
 
diff --git a/boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.dts b/boards/arm/v2m_musca_b1/v2m_musca_b1_ns.dts
similarity index 100%
rename from boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.dts
rename to boards/arm/v2m_musca_b1/v2m_musca_b1_ns.dts
diff --git a/boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.yaml b/boards/arm/v2m_musca_b1/v2m_musca_b1_ns.yaml
similarity index 77%
rename from boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.yaml
rename to boards/arm/v2m_musca_b1/v2m_musca_b1_ns.yaml
index 137f9340446..7a43ef19844 100644
--- a/boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.yaml
+++ b/boards/arm/v2m_musca_b1/v2m_musca_b1_ns.yaml
@@ -1,4 +1,4 @@
-identifier: v2m_musca_b1_nonsecure
+identifier: v2m_musca_b1_ns
 name: ARM V2M MUSCA B1 NonSecure
 type: mcu
 arch: arm
diff --git a/boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure_defconfig b/boards/arm/v2m_musca_b1/v2m_musca_b1_ns_defconfig
similarity index 100%
rename from boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure_defconfig
rename to boards/arm/v2m_musca_b1/v2m_musca_b1_ns_defconfig
diff --git a/samples/subsys/ipc/ipm_mhu_dual_core/README.rst b/samples/subsys/ipc/ipm_mhu_dual_core/README.rst
index abd1eae535f..5fef48d6642 100644
--- a/samples/subsys/ipc/ipm_mhu_dual_core/README.rst
+++ b/samples/subsys/ipc/ipm_mhu_dual_core/README.rst
@@ -30,12 +30,12 @@ It can be built and executed on Musca B1 CPU 0 as follows:
    :goals: run
    :compact:
 
-This project outputs 'IPM MHU sample on v2m_musca_b1_nonsecure' to the console.
+This project outputs 'IPM MHU sample on v2m_musca_b1_ns' to the console.
 It can be built and executed on Musca B1 CPU 1 as follows:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/subsys/ipc/ipm_mhu_dual_core
-   :board: v2m_musca_b1_nonsecure
+   :board: v2m_musca_b1_ns
    :goals: run
    :compact:
 
diff --git a/samples/subsys/ipc/ipm_mhu_dual_core/sample.yaml b/samples/subsys/ipc/ipm_mhu_dual_core/sample.yaml
index b3fcba4da41..c39803b6380 100644
--- a/samples/subsys/ipc/ipm_mhu_dual_core/sample.yaml
+++ b/samples/subsys/ipc/ipm_mhu_dual_core/sample.yaml
@@ -5,4 +5,4 @@ sample:
 tests:
   sample.ipc.ipm.ipm_mhu_dual_core:
     tags: ipm
-    platform_allow: v2m_musca_b1 v2m_musca_b1_nonsecure
+    platform_allow: v2m_musca_b1 v2m_musca_b1_ns
diff --git a/samples/subsys/ipc/openamp/CMakeLists.txt b/samples/subsys/ipc/openamp/CMakeLists.txt
index d09336d0b35..6fd759a3537 100644
--- a/samples/subsys/ipc/openamp/CMakeLists.txt
+++ b/samples/subsys/ipc/openamp/CMakeLists.txt
@@ -15,7 +15,7 @@ elseif("${BOARD}" STREQUAL "mps2_an521")
   set(QEMU_EXTRA_FLAGS "-device;loader,file=${REMOTE_ZEPHYR_DIR}/zephyr.elf")
   set(BOARD_REMOTE "mps2_an521_remote")
 elseif("${BOARD}" STREQUAL "v2m_musca_b1")
-  set(BOARD_REMOTE "v2m_musca_b1_nonsecure")
+  set(BOARD_REMOTE "v2m_musca_b1_ns")
 else()
   message(FATAL_ERROR "${BOARD} was not supported for this sample")
 endif()
diff --git a/samples/subsys/ipc/openamp/remote/CMakeLists.txt b/samples/subsys/ipc/openamp/remote/CMakeLists.txt
index 2cbfd2efd61..108a9c8717a 100644
--- a/samples/subsys/ipc/openamp/remote/CMakeLists.txt
+++ b/samples/subsys/ipc/openamp/remote/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.13.1)
 if(("${BOARD}" STREQUAL "lpcxpresso54114_m0")
 	OR "${BOARD}" STREQUAL "lpcxpresso55s69_cpu1"
 	OR "${BOARD}" STREQUAL "mps2_an521_remote"
-	OR "${BOARD}" STREQUAL "v2m_musca_b1_nonsecure")
+	OR "${BOARD}" STREQUAL "v2m_musca_b1_ns")
 	message(INFO " ${BOARD} compiles as remote in this sample")
 else()
 	message(FATAL_ERROR "${BOARD} was not supported for this sample")
diff --git a/samples/subsys/ipc/rpmsg_service/CMakeLists.txt b/samples/subsys/ipc/rpmsg_service/CMakeLists.txt
index 2237d4b6204..be4370a5456 100644
--- a/samples/subsys/ipc/rpmsg_service/CMakeLists.txt
+++ b/samples/subsys/ipc/rpmsg_service/CMakeLists.txt
@@ -15,7 +15,7 @@ elseif("${BOARD}" STREQUAL "mps2_an521")
   set(QEMU_EXTRA_FLAGS "-device;loader,file=${REMOTE_ZEPHYR_DIR}/zephyr.elf")
   set(BOARD_REMOTE "mps2_an521_remote")
 elseif("${BOARD}" STREQUAL "v2m_musca_b1")
-  set(BOARD_REMOTE "v2m_musca_b1_nonsecure")
+  set(BOARD_REMOTE "v2m_musca_b1_ns")
 else()
   message(FATAL_ERROR "${BOARD} was not supported for this sample")
 endif()
diff --git a/samples/subsys/ipc/rpmsg_service/remote/CMakeLists.txt b/samples/subsys/ipc/rpmsg_service/remote/CMakeLists.txt
index 9073f76a895..ad23bd8425a 100644
--- a/samples/subsys/ipc/rpmsg_service/remote/CMakeLists.txt
+++ b/samples/subsys/ipc/rpmsg_service/remote/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.13.1)
 if("${BOARD}" STREQUAL "nrf5340dk_nrf5340_cpunet"
 	OR "${BOARD}" STREQUAL "lpcxpresso54114_m0"
 	OR "${BOARD}" STREQUAL "mps2_an521_remote"
-	OR "${BOARD}" STREQUAL "v2m_musca_b1_nonsecure")
+	OR "${BOARD}" STREQUAL "v2m_musca_b1_ns")
 	message(INFO " ${BOARD} compile as slave in this sample")
 else()
 	message(FATAL_ERROR "${BOARD} was not supported for this sample")
diff --git a/samples/tfm_integration/tfm_ipc/sample.yaml b/samples/tfm_integration/tfm_ipc/sample.yaml
index 3800514c7d5..b2ec171c514 100644
--- a/samples/tfm_integration/tfm_ipc/sample.yaml
+++ b/samples/tfm_integration/tfm_ipc/sample.yaml
@@ -7,7 +7,7 @@ tests:
         tags: introduction tfm
         platform_allow: mps2_an521_ns lpcxpresso55s69_ns
           nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns nucleo_l552ze_q_ns
-          stm32l562e_dk_ns v2m_musca_s1_nonsecure v2m_musca_b1_nonsecure bl5340_dvk_cpuapp_ns
+          stm32l562e_dk_ns v2m_musca_s1_nonsecure v2m_musca_b1_ns bl5340_dvk_cpuapp_ns
         harness: console
         harness_config:
           type: multi_line