diff --git a/modules/Kconfig.atmel b/modules/Kconfig.atmel
index 7da2e3b..25c5a1a 100644
--- a/modules/Kconfig.atmel
+++ b/modules/Kconfig.atmel
@@ -6,7 +6,7 @@
 
 config ASF
 	bool
-	select HAS_CMSIS
+	select HAS_CMSIS_CORE
 	depends on SOC_FAMILY_SAM || SOC_FAMILY_SAM0
 
 config ATMEL_WINC1500
diff --git a/modules/Kconfig.cypress b/modules/Kconfig.cypress
index e0ba1ae..acf57da 100644
--- a/modules/Kconfig.cypress
+++ b/modules/Kconfig.cypress
@@ -6,4 +6,4 @@
 
 config HAS_CYPRESS_DRIVERS
 	bool
-	select HAS_CMSIS
+	select HAS_CMSIS_CORE
diff --git a/modules/Kconfig.imx b/modules/Kconfig.imx
index 21684b7..eb1f918 100644
--- a/modules/Kconfig.imx
+++ b/modules/Kconfig.imx
@@ -5,7 +5,7 @@
 
 config HAS_IMX_HAL
 	bool
-	select HAS_CMSIS
+	select HAS_CMSIS_CORE
 	depends on SOC_FAMILY_IMX
 
 if HAS_IMX_HAL
diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux
index 30635aa..dbb654d 100644
--- a/modules/Kconfig.mcux
+++ b/modules/Kconfig.mcux
@@ -5,7 +5,7 @@
 
 config HAS_MCUX
 	bool
-	select HAS_CMSIS
+	select HAS_CMSIS_CORE
 	depends on SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC
 
 if HAS_MCUX
diff --git a/modules/Kconfig.silabs b/modules/Kconfig.silabs
index 41d43ab..71aba9b 100644
--- a/modules/Kconfig.silabs
+++ b/modules/Kconfig.silabs
@@ -5,5 +5,5 @@
 
 config HAS_SILABS_GECKO
 	bool
-	select HAS_CMSIS
+	select HAS_CMSIS_CORE
 	depends on SOC_FAMILY_EXX32
diff --git a/modules/Kconfig.simplelink b/modules/Kconfig.simplelink
index b2fca60..6f386e8 100644
--- a/modules/Kconfig.simplelink
+++ b/modules/Kconfig.simplelink
@@ -22,7 +22,7 @@
 
 config HAS_MSP432P4XXSDK
 	bool
-	select HAS_CMSIS
+	select HAS_CMSIS_CORE
 
 # Kconfig - CC13X2 / CC26X2 SDK HAL configuration
 
diff --git a/modules/Kconfig.stm32 b/modules/Kconfig.stm32
index 286f468..ad53ec1 100644
--- a/modules/Kconfig.stm32
+++ b/modules/Kconfig.stm32
@@ -5,7 +5,7 @@
 
 config HAS_STM32CUBE
     bool
-    select HAS_CMSIS
+    select HAS_CMSIS_CORE
     depends on SOC_FAMILY_STM32
 
 if HAS_STM32CUBE