diff --git a/arch/arm/bsp/CortexM/Kconfig b/arch/arm/bsp/CortexM/Kconfig
index 9ac67b463c1..317309e89c8 100644
--- a/arch/arm/bsp/CortexM/Kconfig
+++ b/arch/arm/bsp/CortexM/Kconfig
@@ -54,7 +54,7 @@ config CPU_CORTEX_M3_M4
 	help
 	This option signifies the use of either a Cortex-M3 or Cortex-M4 CPU.
 
-config CPU_CORTEXM3
+config CPU_CORTEX_M3
 	# omit prompt to signify a "hidden" option
 	bool "ARM Cortex-M3"
 	default n
@@ -66,7 +66,7 @@ config CPU_CORTEXM4
 	# omit prompt to signify a "hidden" option
 	bool "ARM Cortex-M4"
 	default n
-	select CPU_CORTEXM3
+	select CPU_CORTEX_M3
 	help
 	This option signifies the use of a Cortex-M4 CPU
 
diff --git a/arch/arm/bsp/Kconfig b/arch/arm/bsp/Kconfig
index a00e17f4878..f15afbf9364 100644
--- a/arch/arm/bsp/Kconfig
+++ b/arch/arm/bsp/Kconfig
@@ -43,7 +43,7 @@ config  BSP_FSL_FRDM_K64F
 
 config  BSP_TI_LM3S6965
 	bool "Minimum Configuration for a TI LM3S6965"
-	select CPU_CORTEXM3
+	select CPU_CORTEX_M3
 	select STELLARIS_UART
 
 endchoice
diff --git a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
index df88edce805..c9bfead407f 100644
--- a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
@@ -85,7 +85,7 @@ CONFIG_BSP_FSL_FRDM_K64F=y
 CONFIG_CPU_CORTEX=y
 CONFIG_CPU_CORTEXM=y
 CONFIG_CPU_CORTEX_M3_M4=y
-CONFIG_CPU_CORTEXM3=y
+CONFIG_CPU_CORTEX_M3=y
 CONFIG_CPU_CORTEXM4=y
 
 #
diff --git a/arch/arm/configs/micro_ti_lm3s6965_defconfig b/arch/arm/configs/micro_ti_lm3s6965_defconfig
index c4a2013192a..087b3a5bfb9 100644
--- a/arch/arm/configs/micro_ti_lm3s6965_defconfig
+++ b/arch/arm/configs/micro_ti_lm3s6965_defconfig
@@ -85,7 +85,7 @@ CONFIG_BSP_TI_LM3S6965=y
 CONFIG_CPU_CORTEX=y
 CONFIG_CPU_CORTEXM=y
 CONFIG_CPU_CORTEX_M3_M4=y
-CONFIG_CPU_CORTEXM3=y
+CONFIG_CPU_CORTEX_M3=y
 # CONFIG_CPU_CORTEXM4 is not set
 
 #
diff --git a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
index aa49772b503..c119b535187 100644
--- a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
@@ -64,7 +64,7 @@ CONFIG_BSP_FSL_FRDM_K64F=y
 CONFIG_CPU_CORTEX=y
 CONFIG_CPU_CORTEXM=y
 CONFIG_CPU_CORTEX_M3_M4=y
-CONFIG_CPU_CORTEXM3=y
+CONFIG_CPU_CORTEX_M3=y
 CONFIG_CPU_CORTEXM4=y
 
 #
diff --git a/arch/arm/configs/nano_ti_lm3s6965_defconfig b/arch/arm/configs/nano_ti_lm3s6965_defconfig
index 38fe7000969..3db3d5639fa 100644
--- a/arch/arm/configs/nano_ti_lm3s6965_defconfig
+++ b/arch/arm/configs/nano_ti_lm3s6965_defconfig
@@ -64,7 +64,7 @@ CONFIG_BSP_TI_LM3S6965=y
 CONFIG_CPU_CORTEX=y
 CONFIG_CPU_CORTEXM=y
 CONFIG_CPU_CORTEX_M3_M4=y
-CONFIG_CPU_CORTEXM3=y
+CONFIG_CPU_CORTEX_M3=y
 # CONFIG_CPU_CORTEXM4 is not set
 
 #
diff --git a/arch/arm/defconfig b/arch/arm/defconfig
index df88edce805..c9bfead407f 100644
--- a/arch/arm/defconfig
+++ b/arch/arm/defconfig
@@ -85,7 +85,7 @@ CONFIG_BSP_FSL_FRDM_K64F=y
 CONFIG_CPU_CORTEX=y
 CONFIG_CPU_CORTEXM=y
 CONFIG_CPU_CORTEX_M3_M4=y
-CONFIG_CPU_CORTEXM3=y
+CONFIG_CPU_CORTEX_M3=y
 CONFIG_CPU_CORTEXM4=y
 
 #
diff --git a/scripts/Makefile.arm.preparch b/scripts/Makefile.arm.preparch
index 9b3cb069b40..684e7e8d0a8 100644
--- a/scripts/Makefile.arm.preparch
+++ b/scripts/Makefile.arm.preparch
@@ -1,7 +1,7 @@
 LTO_FLAG-y = $(call cc-option,-flto,)
 SECTION_GC_FLAG = $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,)
 arm_FLAGS = $(call cc-option,-mthumb,)
-ifeq ($(CONFIG_CPU_CORTEXM3),y)
+ifeq ($(CONFIG_CPU_CORTEX_M3),y)
 arm_FLAGS += -mcpu=cortex-m3 -march=armv7-m
 endif
 ifeq ($(CONFIG_CPU_CORTEXM4),y)