diff --git a/cpu/stm32/Kconfig b/cpu/stm32/Kconfig
index 8a96cde81d..eb98cff77b 100644
--- a/cpu/stm32/Kconfig
+++ b/cpu/stm32/Kconfig
@@ -36,8 +36,8 @@ config ERROR_MODULES_CONFLICT
     default "On STM32, the RTC and RTT map to the same hardware peripheral." if MODULE_PERIPH_RTC && MODULE_PERIPH_RTT
     depends on CPU_STM32
 
-orsource "kconfig/*/Kconfig"
-orsource "kconfig/*/Kconfig.lines"
-orsource "kconfig/*/Kconfig.models"
+orsource "kconfigs/*/Kconfig"
+orsource "kconfigs/*/Kconfig.lines"
+orsource "kconfigs/*/Kconfig.models"
 
 source "$(RIOTCPU)/cortexm_common/Kconfig"
diff --git a/cpu/stm32/kconfig/f0/Kconfig b/cpu/stm32/kconfigs/f0/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/f0/Kconfig
rename to cpu/stm32/kconfigs/f0/Kconfig
diff --git a/cpu/stm32/kconfig/f0/Kconfig.lines b/cpu/stm32/kconfigs/f0/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/f0/Kconfig.lines
rename to cpu/stm32/kconfigs/f0/Kconfig.lines
diff --git a/cpu/stm32/kconfig/f0/Kconfig.models b/cpu/stm32/kconfigs/f0/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/f0/Kconfig.models
rename to cpu/stm32/kconfigs/f0/Kconfig.models
diff --git a/cpu/stm32/kconfig/f1/Kconfig b/cpu/stm32/kconfigs/f1/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/f1/Kconfig
rename to cpu/stm32/kconfigs/f1/Kconfig
diff --git a/cpu/stm32/kconfig/f1/Kconfig.lines b/cpu/stm32/kconfigs/f1/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/f1/Kconfig.lines
rename to cpu/stm32/kconfigs/f1/Kconfig.lines
diff --git a/cpu/stm32/kconfig/f1/Kconfig.models b/cpu/stm32/kconfigs/f1/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/f1/Kconfig.models
rename to cpu/stm32/kconfigs/f1/Kconfig.models
diff --git a/cpu/stm32/kconfig/f2/Kconfig b/cpu/stm32/kconfigs/f2/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/f2/Kconfig
rename to cpu/stm32/kconfigs/f2/Kconfig
diff --git a/cpu/stm32/kconfig/f2/Kconfig.lines b/cpu/stm32/kconfigs/f2/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/f2/Kconfig.lines
rename to cpu/stm32/kconfigs/f2/Kconfig.lines
diff --git a/cpu/stm32/kconfig/f2/Kconfig.models b/cpu/stm32/kconfigs/f2/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/f2/Kconfig.models
rename to cpu/stm32/kconfigs/f2/Kconfig.models
diff --git a/cpu/stm32/kconfig/f3/Kconfig b/cpu/stm32/kconfigs/f3/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/f3/Kconfig
rename to cpu/stm32/kconfigs/f3/Kconfig
diff --git a/cpu/stm32/kconfig/f3/Kconfig.lines b/cpu/stm32/kconfigs/f3/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/f3/Kconfig.lines
rename to cpu/stm32/kconfigs/f3/Kconfig.lines
diff --git a/cpu/stm32/kconfig/f3/Kconfig.models b/cpu/stm32/kconfigs/f3/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/f3/Kconfig.models
rename to cpu/stm32/kconfigs/f3/Kconfig.models
diff --git a/cpu/stm32/kconfig/f4/Kconfig b/cpu/stm32/kconfigs/f4/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/f4/Kconfig
rename to cpu/stm32/kconfigs/f4/Kconfig
diff --git a/cpu/stm32/kconfig/f4/Kconfig.lines b/cpu/stm32/kconfigs/f4/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/f4/Kconfig.lines
rename to cpu/stm32/kconfigs/f4/Kconfig.lines
diff --git a/cpu/stm32/kconfig/f4/Kconfig.models b/cpu/stm32/kconfigs/f4/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/f4/Kconfig.models
rename to cpu/stm32/kconfigs/f4/Kconfig.models
diff --git a/cpu/stm32/kconfig/f7/Kconfig b/cpu/stm32/kconfigs/f7/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/f7/Kconfig
rename to cpu/stm32/kconfigs/f7/Kconfig
diff --git a/cpu/stm32/kconfig/f7/Kconfig.lines b/cpu/stm32/kconfigs/f7/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/f7/Kconfig.lines
rename to cpu/stm32/kconfigs/f7/Kconfig.lines
diff --git a/cpu/stm32/kconfig/f7/Kconfig.models b/cpu/stm32/kconfigs/f7/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/f7/Kconfig.models
rename to cpu/stm32/kconfigs/f7/Kconfig.models
diff --git a/cpu/stm32/kconfig/g0/Kconfig b/cpu/stm32/kconfigs/g0/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/g0/Kconfig
rename to cpu/stm32/kconfigs/g0/Kconfig
diff --git a/cpu/stm32/kconfig/g0/Kconfig.lines b/cpu/stm32/kconfigs/g0/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/g0/Kconfig.lines
rename to cpu/stm32/kconfigs/g0/Kconfig.lines
diff --git a/cpu/stm32/kconfig/g0/Kconfig.models b/cpu/stm32/kconfigs/g0/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/g0/Kconfig.models
rename to cpu/stm32/kconfigs/g0/Kconfig.models
diff --git a/cpu/stm32/kconfig/g4/Kconfig b/cpu/stm32/kconfigs/g4/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/g4/Kconfig
rename to cpu/stm32/kconfigs/g4/Kconfig
diff --git a/cpu/stm32/kconfig/g4/Kconfig.lines b/cpu/stm32/kconfigs/g4/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/g4/Kconfig.lines
rename to cpu/stm32/kconfigs/g4/Kconfig.lines
diff --git a/cpu/stm32/kconfig/g4/Kconfig.models b/cpu/stm32/kconfigs/g4/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/g4/Kconfig.models
rename to cpu/stm32/kconfigs/g4/Kconfig.models
diff --git a/cpu/stm32/kconfig/l0/Kconfig b/cpu/stm32/kconfigs/l0/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/l0/Kconfig
rename to cpu/stm32/kconfigs/l0/Kconfig
diff --git a/cpu/stm32/kconfig/l0/Kconfig.lines b/cpu/stm32/kconfigs/l0/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/l0/Kconfig.lines
rename to cpu/stm32/kconfigs/l0/Kconfig.lines
diff --git a/cpu/stm32/kconfig/l0/Kconfig.models b/cpu/stm32/kconfigs/l0/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/l0/Kconfig.models
rename to cpu/stm32/kconfigs/l0/Kconfig.models
diff --git a/cpu/stm32/kconfig/l1/Kconfig b/cpu/stm32/kconfigs/l1/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/l1/Kconfig
rename to cpu/stm32/kconfigs/l1/Kconfig
diff --git a/cpu/stm32/kconfig/l1/Kconfig.lines b/cpu/stm32/kconfigs/l1/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/l1/Kconfig.lines
rename to cpu/stm32/kconfigs/l1/Kconfig.lines
diff --git a/cpu/stm32/kconfig/l1/Kconfig.models b/cpu/stm32/kconfigs/l1/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/l1/Kconfig.models
rename to cpu/stm32/kconfigs/l1/Kconfig.models
diff --git a/cpu/stm32/kconfig/l4/Kconfig b/cpu/stm32/kconfigs/l4/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/l4/Kconfig
rename to cpu/stm32/kconfigs/l4/Kconfig
diff --git a/cpu/stm32/kconfig/l4/Kconfig.lines b/cpu/stm32/kconfigs/l4/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/l4/Kconfig.lines
rename to cpu/stm32/kconfigs/l4/Kconfig.lines
diff --git a/cpu/stm32/kconfig/l4/Kconfig.models b/cpu/stm32/kconfigs/l4/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/l4/Kconfig.models
rename to cpu/stm32/kconfigs/l4/Kconfig.models
diff --git a/cpu/stm32/kconfig/wb/Kconfig b/cpu/stm32/kconfigs/wb/Kconfig
similarity index 100%
rename from cpu/stm32/kconfig/wb/Kconfig
rename to cpu/stm32/kconfigs/wb/Kconfig
diff --git a/cpu/stm32/kconfig/wb/Kconfig.lines b/cpu/stm32/kconfigs/wb/Kconfig.lines
similarity index 100%
rename from cpu/stm32/kconfig/wb/Kconfig.lines
rename to cpu/stm32/kconfigs/wb/Kconfig.lines
diff --git a/cpu/stm32/kconfig/wb/Kconfig.models b/cpu/stm32/kconfigs/wb/Kconfig.models
similarity index 100%
rename from cpu/stm32/kconfig/wb/Kconfig.models
rename to cpu/stm32/kconfigs/wb/Kconfig.models