diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 959c799140..c4cac66dde 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -424,7 +424,7 @@ CMSIS-DSP integration:
     - galak
     - XenuIsWatching
   files:
-    - modules/cmsis_dsp/
+    - modules/cmsis-dsp/
     - tests/benchmarks/cmsis_dsp/
     - tests/lib/cmsis_dsp/
   labels:
@@ -438,7 +438,7 @@ CMSIS-NN integration:
     - stephanosio
     - XenuIsWatching
   files:
-    - modules/cmsis_nn/
+    - modules/cmsis-nn/
     - tests/lib/cmsis_nn/
   labels:
     - "area: CMSIS-NN"
@@ -2952,7 +2952,7 @@ West:
   collaborators:
     - stephanosio
   files:
-    - modules/cmsis_dsp/
+    - modules/cmsis-dsp/
   labels:
     - "area: ARM"
 
@@ -2963,7 +2963,7 @@ West:
   collaborators:
     - stephanosio
   files:
-    - modules/cmsis_nn/
+    - modules/cmsis-nn/
   labels:
     - "area: ARM"
 
diff --git a/modules/Kconfig b/modules/Kconfig
index a2dad7e9c4..751884841c 100644
--- a/modules/Kconfig
+++ b/modules/Kconfig
@@ -108,6 +108,12 @@ comment "Segger module not available."
 comment "LVGL module not available."
 	depends on !ZEPHYR_LVGL_MODULE
 
+comment "cmsis-dsp module not available."
+	depends on !ZEPHYR_CMSIS_DSP_MODULE
+
+comment "cmsis-nn module not available."
+	depends on !ZEPHYR_CMSIS_NN_MODULE
+
 # This ensures that symbols are available in Kconfig for dependency checking
 # and referencing, while keeping the settings themselves unavailable when the
 # modules are not present in the workspace
diff --git a/modules/cmsis_dsp/CMakeLists.txt b/modules/cmsis-dsp/CMakeLists.txt
similarity index 100%
rename from modules/cmsis_dsp/CMakeLists.txt
rename to modules/cmsis-dsp/CMakeLists.txt
diff --git a/modules/cmsis_dsp/Kconfig b/modules/cmsis-dsp/Kconfig
similarity index 100%
rename from modules/cmsis_dsp/Kconfig
rename to modules/cmsis-dsp/Kconfig
diff --git a/modules/cmsis_nn/CMakeLists.txt b/modules/cmsis-nn/CMakeLists.txt
similarity index 100%
rename from modules/cmsis_nn/CMakeLists.txt
rename to modules/cmsis-nn/CMakeLists.txt
diff --git a/modules/cmsis_nn/Kconfig b/modules/cmsis-nn/Kconfig
similarity index 100%
rename from modules/cmsis_nn/Kconfig
rename to modules/cmsis-nn/Kconfig