diff --git a/arch/arm/src/armv8-m/arm_mpu.c b/arch/arm/src/armv8-m/arm_mpu.c
index 327b3a030c..effd078a90 100644
--- a/arch/arm/src/armv8-m/arm_mpu.c
+++ b/arch/arm/src/armv8-m/arm_mpu.c
@@ -79,7 +79,7 @@ unsigned int mpu_allocregion(void)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_MPU_RESET) || defined(CONFIG_ARM_MPU_EARLY_RESET)
+#if defined(CONFIG_ARM_MPU_RESET) || defined(CONFIG_ARM_MPU_EARLY_RESET)
 static void mpu_reset_internal()
 {
   int region;
@@ -184,7 +184,7 @@ void mpu_configure_region(uintptr_t base, size_t size,
  *   MPU initialization.
  *
  ****************************************************************************/
-#if defined(CONFIG_MPU_RESET)
+#if defined(CONFIG_ARM_MPU_RESET)
 void mpu_reset()
 {
   mpu_reset_internal();
diff --git a/arch/arm/src/armv8-m/mpu.h b/arch/arm/src/armv8-m/mpu.h
index 077eb52a07..8db68a77e9 100644
--- a/arch/arm/src/armv8-m/mpu.h
+++ b/arch/arm/src/armv8-m/mpu.h
@@ -178,7 +178,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_MPU_RESET)
+#if defined(CONFIG_ARM_MPU_RESET)
 void mpu_reset(void);
 #else
 #  define mpu_reset() do { } while (0)