diff --git a/boards/arm/mps2/Kconfig.mps2 b/boards/arm/mps2/Kconfig.mps2
index c350ffeb8cb..811aa31a24c 100644
--- a/boards/arm/mps2/Kconfig.mps2
+++ b/boards/arm/mps2/Kconfig.mps2
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MPS2
-	select SOC_MPS2_AN383 if BOARD_MPS2_AN383
-	select SOC_MPS2_AN385 if BOARD_MPS2_AN385
-	select SOC_MPS2_AN386 if BOARD_MPS2_AN386
-	select SOC_MPS2_AN500 if BOARD_MPS2_AN500
-	select SOC_MPS2_AN521_CPU0 if BOARD_MPS2_AN521_CPU0
-	select SOC_MPS2_AN521_CPU0 if BOARD_MPS2_AN521_CPU0_NS
-	select SOC_MPS2_AN521_CPU1 if BOARD_MPS2_AN521_CPU1
+	select SOC_AN383 if BOARD_MPS2_AN383
+	select SOC_AN385 if BOARD_MPS2_AN385
+	select SOC_AN386 if BOARD_MPS2_AN386
+	select SOC_AN500 if BOARD_MPS2_AN500
+	select SOC_AN521_CPU0 if BOARD_MPS2_AN521_CPU0
+	select SOC_AN521_CPU0 if BOARD_MPS2_AN521_CPU0_NS
+	select SOC_AN521_CPU1 if BOARD_MPS2_AN521_CPU1
diff --git a/samples/subsys/ipc/openamp/remote/src/main.c b/samples/subsys/ipc/openamp/remote/src/main.c
index cae2682cf41..275fdbaa243 100644
--- a/samples/subsys/ipc/openamp/remote/src/main.c
+++ b/samples/subsys/ipc/openamp/remote/src/main.c
@@ -55,7 +55,7 @@ static uint32_t ipc_virtio_get_features(struct virtio_device *dev)
 
 static void ipc_virtio_notify(struct virtqueue *vq)
 {
-#if defined(CONFIG_SOC_MPS2_AN521) || \
+#if defined(CONFIG_SOC_AN521) || \
 	defined(CONFIG_SOC_MUSCA_B1)
 	uint32_t current_core = sse_200_platform_get_cpu_id();
 
@@ -64,7 +64,7 @@ static void ipc_virtio_notify(struct virtqueue *vq)
 	uint32_t dummy_data = 0x00110011; /* Some data must be provided */
 
 	ipm_send(ipm_handle, 0, 0, &dummy_data, sizeof(dummy_data));
-#endif /* #if defined(CONFIG_SOC_MPS2_AN521) */
+#endif /* #if defined(CONFIG_SOC_AN521) */
 }
 
 struct virtio_dispatch dispatch = {
diff --git a/samples/subsys/ipc/openamp/src/main.c b/samples/subsys/ipc/openamp/src/main.c
index 27b998c3a24..7aba82f3277 100644
--- a/samples/subsys/ipc/openamp/src/main.c
+++ b/samples/subsys/ipc/openamp/src/main.c
@@ -65,7 +65,7 @@ static void ipc_virtio_set_features(struct virtio_device *dev, uint32_t features
 
 static void ipc_virtio_notify(struct virtqueue *vq)
 {
-#if defined(CONFIG_SOC_MPS2_AN521) || \
+#if defined(CONFIG_SOC_AN521) || \
 	defined(CONFIG_SOC_MUSCA_B1)
 	uint32_t current_core = sse_200_platform_get_cpu_id();
 
@@ -74,7 +74,7 @@ static void ipc_virtio_notify(struct virtqueue *vq)
 	uint32_t dummy_data = 0x55005500; /* Some data must be provided */
 
 	ipm_send(ipm_handle, 0, 0, &dummy_data, sizeof(dummy_data));
-#endif /* #if defined(CONFIG_SOC_MPS2_AN521) */
+#endif /* #if defined(CONFIG_SOC_AN521) */
 }
 
 struct virtio_dispatch dispatch = {
@@ -253,11 +253,11 @@ int main(void)
 			app_task,
 			NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
 
-#if defined(CONFIG_SOC_MPS2_AN521) || \
+#if defined(CONFIG_SOC_AN521) || \
 	defined(CONFIG_SOC_MUSCA_B1)
 	wakeup_cpu1();
 	k_msleep(500);
-#endif /* #if defined(CONFIG_SOC_MPS2_AN521) */
+#endif /* #if defined(CONFIG_SOC_AN521) */
 	return 0;
 }
 
diff --git a/samples/subsys/ipc/rpmsg_service/src/main.c b/samples/subsys/ipc/rpmsg_service/src/main.c
index 2bffc2acdc4..d597a4a2290 100644
--- a/samples/subsys/ipc/rpmsg_service/src/main.c
+++ b/samples/subsys/ipc/rpmsg_service/src/main.c
@@ -88,10 +88,10 @@ int main(void)
 	k_thread_create(&thread_data, thread_stack, CONFIG_MAIN_APP_TASK_STACK_SIZE, app_task,
 			NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
 
-#if defined(CONFIG_SOC_MPS2_AN521) || defined(CONFIG_SOC_MUSCA_B1)
+#if defined(CONFIG_SOC_AN521) || defined(CONFIG_SOC_MUSCA_B1)
 	wakeup_cpu1();
 	k_msleep(500);
-#endif /* #if defined(CONFIG_SOC_MPS2_AN521) */
+#endif /* #if defined(CONFIG_SOC_AN521) */
 	return 0;
 }
 
diff --git a/soc/arm/mps2/Kconfig b/soc/arm/mps2/Kconfig
index 2c999393a77..ee4ef879418 100644
--- a/soc/arm/mps2/Kconfig
+++ b/soc/arm/mps2/Kconfig
@@ -6,32 +6,32 @@ config SOC_SERIES_MPS2
 	select ARM
 	select GPIO_MMIO32 if GPIO
 
-config SOC_MPS2_AN521
+config SOC_AN521
 	select CPU_CORTEX_M33
 	select CPU_HAS_ARM_MPU
 
-config SOC_MPS2_AN383
+config SOC_AN383
 	select CPU_CORTEX_M0PLUS
 	select CPU_HAS_ARM_MPU
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select CPU_CORTEX_M_HAS_VTOR
 
-config SOC_MPS2_AN385
+config SOC_AN385
 	select CPU_CORTEX_M3
 	select CPU_HAS_ARM_MPU
 
-config SOC_MPS2_AN386
+config SOC_AN386
 	select CPU_CORTEX_M4
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_VFP
 
-config SOC_MPS2_AN500
+config SOC_AN500
 	select CPU_CORTEX_M7
 	select CPU_HAS_ARM_MPU
 
-config SOC_MPS2_AN521_CPU0
+config SOC_AN521_CPU0
 	select CPU_HAS_ARM_SAU
 
-config SOC_MPS2_AN521_CPU1
+config SOC_AN521_CPU1
 	select CPU_HAS_FPU
 	select ARMV8_M_DSP
diff --git a/soc/arm/mps2/Kconfig.defconfig.an383 b/soc/arm/mps2/Kconfig.defconfig.an383
index 0d59cb09d26..dff73cdd9c6 100644
--- a/soc/arm/mps2/Kconfig.defconfig.an383
+++ b/soc/arm/mps2/Kconfig.defconfig.an383
@@ -1,7 +1,7 @@
 # Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_MPS2_AN383
+if SOC_AN383
 
 config NUM_IRQS
 	default 32
diff --git a/soc/arm/mps2/Kconfig.defconfig.an385 b/soc/arm/mps2/Kconfig.defconfig.an385
index fbcec3977f1..873c407590d 100644
--- a/soc/arm/mps2/Kconfig.defconfig.an385
+++ b/soc/arm/mps2/Kconfig.defconfig.an385
@@ -1,7 +1,7 @@
 # Copyright (c) 2017 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_MPS2_AN385
+if SOC_AN385
 
 config NUM_IRQS
 	default 32
diff --git a/soc/arm/mps2/Kconfig.defconfig.an386 b/soc/arm/mps2/Kconfig.defconfig.an386
index 9c75afbef8b..106372c8c4f 100644
--- a/soc/arm/mps2/Kconfig.defconfig.an386
+++ b/soc/arm/mps2/Kconfig.defconfig.an386
@@ -1,7 +1,7 @@
 # Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_MPS2_AN386
+if SOC_AN386
 
 config NUM_IRQS
 	default 32
diff --git a/soc/arm/mps2/Kconfig.defconfig.an500 b/soc/arm/mps2/Kconfig.defconfig.an500
index 8cf914f573a..48c708f7ab2 100644
--- a/soc/arm/mps2/Kconfig.defconfig.an500
+++ b/soc/arm/mps2/Kconfig.defconfig.an500
@@ -1,7 +1,7 @@
 # Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_MPS2_AN500
+if SOC_AN500
 
 config NUM_IRQS
 	default 32
diff --git a/soc/arm/mps2/Kconfig.defconfig.an521 b/soc/arm/mps2/Kconfig.defconfig.an521
index 944bdf4f067..378dca10d7b 100644
--- a/soc/arm/mps2/Kconfig.defconfig.an521
+++ b/soc/arm/mps2/Kconfig.defconfig.an521
@@ -1,7 +1,7 @@
 # Copyright (c) 2018-2019 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_MPS2_AN521
+if SOC_AN521
 
 config NUM_IRQS
 	default 96
diff --git a/soc/arm/mps2/Kconfig.soc b/soc/arm/mps2/Kconfig.soc
index 42ba48639bb..771394370e7 100644
--- a/soc/arm/mps2/Kconfig.soc
+++ b/soc/arm/mps2/Kconfig.soc
@@ -8,43 +8,43 @@ config SOC_SERIES_MPS2
 	help
 	  Enable support for ARM MPS2 MCU Series
 
-config SOC_MPS2_AN383
+config SOC_AN383
 	bool
 	select SOC_SERIES_MPS2
 	help
 	  ARM Cortex-M0+ SMM on V2M-MPS2 (Application Note AN383)
 
-config SOC_MPS2_AN385
+config SOC_AN385
 	bool
 	select SOC_SERIES_MPS2
 	help
 	  ARM Cortex-M3 SMM on V2M-MPS2 (Application Note AN385)
 
-config SOC_MPS2_AN386
+config SOC_AN386
 	bool
 	select SOC_SERIES_MPS2
 	help
 	  ARM Cortex-M4 SMM on V2M-MPS2 (Application Note AN386)
 
-config SOC_MPS2_AN500
+config SOC_AN500
 	bool
 	select SOC_SERIES_MPS2
 	help
 	  ARM Cortex-M7 SMM on V2M-MPS2+ (Application Note AN500)
 
-config SOC_MPS2_AN521
+config SOC_AN521
 	bool
 	select SOC_SERIES_MPS2
 
-config SOC_MPS2_AN521_CPU0
+config SOC_AN521_CPU0
 	bool
-	select SOC_MPS2_AN521
+	select SOC_AN521
 	help
 	  ARM Cortex-M33 SMM-SSE-200 on V2M-MPS2+ (AN521) CPU0
 
-config SOC_MPS2_AN521_CPU1
+config SOC_AN521_CPU1
 	bool
-	select SOC_MPS2_AN521
+	select SOC_AN521
 	help
 	  ARM Cortex-M33 SMM-SSE-200 on V2M-MPS2+ (AN521) CPU1
 
@@ -52,8 +52,8 @@ config SOC_SERIES
 	default "mps2" if SOC_SERIES_MPS2
 
 config SOC
-	default "an383" if SOC_MPS2_AN383
-	default "an385" if SOC_MPS2_AN385
-	default "an386" if SOC_MPS2_AN386
-	default "an500" if SOC_MPS2_AN500
-	default "an521" if SOC_MPS2_AN521
+	default "an383" if SOC_AN383
+	default "an385" if SOC_AN385
+	default "an386" if SOC_AN386
+	default "an500" if SOC_AN500
+	default "an521" if SOC_AN521
diff --git a/subsys/ipc/rpmsg_service/rpmsg_backend.c b/subsys/ipc/rpmsg_service/rpmsg_backend.c
index 6594c0bf1cd..4e77e951282 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_backend.c
+++ b/subsys/ipc/rpmsg_service/rpmsg_backend.c
@@ -105,7 +105,7 @@ static void ipc_virtio_notify(struct virtqueue *vq)
 	status = ipm_send(ipm_tx_handle, 0, 0, NULL, 0);
 #elif defined(CONFIG_RPMSG_SERVICE_SINGLE_IPM_SUPPORT)
 
-#if defined(CONFIG_SOC_MPS2_AN521) || \
+#if defined(CONFIG_SOC_AN521) || \
 	defined(CONFIG_SOC_MUSCA_B1)
 	uint32_t current_core = sse_200_platform_get_cpu_id();
 
@@ -123,7 +123,7 @@ static void ipc_virtio_notify(struct virtqueue *vq)
 	uint32_t dummy_data = 0x55005500;
 
 	status = ipm_send(ipm_handle, 0, 0, &dummy_data, sizeof(dummy_data));
-#endif /* #if defined(CONFIG_SOC_MPS2_AN521) */
+#endif /* #if defined(CONFIG_SOC_AN521) */
 
 #endif
 
diff --git a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2 b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
index 448c9cc1308..8005b28ad64 100644
--- a/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
+++ b/tests/cmake/hwm/board_extend/oot_root/boards/arm/mps2/Kconfig.mps2
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MPS2
-	select SOC_MPS2_AN521_CPUTEST if BOARD_MPS2_AN521_CPUTEST
+	select SOC_AN521_CPUTEST if BOARD_MPS2_AN521_CPUTEST
diff --git a/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc b/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
index a699e8413a1..f518afe047a 100644
--- a/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
+++ b/tests/cmake/hwm/board_extend/oot_root/soc/arm/Kconfig.soc
@@ -1,6 +1,6 @@
 # Copyright (c) 2024, Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_MPS2_AN521_CPUTEST
+config SOC_AN521_CPUTEST
 	bool
-	select SOC_MPS2_AN521
+	select SOC_AN521
diff --git a/tests/cmake/hwm/board_extend/src/main.c b/tests/cmake/hwm/board_extend/src/main.c
index 9795bd8dcb8..76258f0ee34 100644
--- a/tests/cmake/hwm/board_extend/src/main.c
+++ b/tests/cmake/hwm/board_extend/src/main.c
@@ -36,7 +36,7 @@
 #define BASE_BOARD_CONFIG 0
 #endif
 
-#ifdef CONFIG_SOC_MPS2_AN521_CPUTEST
+#ifdef CONFIG_SOC_AN521_CPUTEST
 #define EXTENDED_SOC 1
 #else
 #define EXTENDED_SOC 0
diff --git a/tests/lib/heap/src/main.c b/tests/lib/heap/src/main.c
index 3f82cfd744a..24f901abc5b 100644
--- a/tests/lib/heap/src/main.c
+++ b/tests/lib/heap/src/main.c
@@ -13,7 +13,7 @@
  * platform, with workarounds.
  */
 
-#if defined(CONFIG_SOC_MPS2_AN521) && defined(CONFIG_QEMU_TARGET)
+#if defined(CONFIG_SOC_AN521) && defined(CONFIG_QEMU_TARGET)
 /* mps2/an521 blows up if allowed to link into large area, even though
  * the link is successful and it claims the memory is there.  We get
  * hard faults on boot in qemu before entry to cstart() once MEMSZ is