diff --git a/arch/xtensa/src/esp32s2/Kconfig b/arch/xtensa/src/esp32s2/Kconfig
index 1f4ba7323b9..daaf2db4a37 100644
--- a/arch/xtensa/src/esp32s2/Kconfig
+++ b/arch/xtensa/src/esp32s2/Kconfig
@@ -650,17 +650,17 @@ config ESP32S2_OTA_SCRATCH_DEVPATH
 
 endif
 
-comment "General MTD configuration"
+comment "General storage MTD configuration"
 
-config ESP32S2_MTD_OFFSET
-	hex "MTD base address in SPI Flash"
+config ESP32S2_STORAGE_MTD_OFFSET
+	hex "Storage MTD base address in SPI Flash"
 	default 0x180000 if !ESP32S2_HAVE_OTA_PARTITION
 	default 0x250000 if ESP32S2_HAVE_OTA_PARTITION
 	---help---
 		MTD base address in SPI Flash.
 
-config ESP32S2_MTD_SIZE
-	hex "MTD size in SPI Flash"
+config ESP32S2_STORAGE_MTD_SIZE
+	hex "Storage MTD size in SPI Flash"
 	default 0x100000
 	---help---
 		MTD size in SPI Flash.