diff --git a/src/main/drivers/flash.c b/src/main/drivers/flash.c
index d995aa84ce..739d510523 100644
--- a/src/main/drivers/flash.c
+++ b/src/main/drivers/flash.c
@@ -25,7 +25,7 @@
 
 #include "build/debug.h"
 
-#ifdef USE_FLASH
+#ifdef USE_FLASH_CHIP
 
 #include "flash.h"
 #include "flash_impl.h"
@@ -166,4 +166,4 @@ const flashGeometry_t *flashGetGeometry(void)
 
     return &noFlashGeometry;
 }
-#endif // USE_FLASH
+#endif // USE_FLASH_CHIP
diff --git a/src/main/fc/init.c b/src/main/fc/init.c
index 3671247168..51b115c7db 100644
--- a/src/main/fc/init.c
+++ b/src/main/fc/init.c
@@ -643,7 +643,7 @@ void init(void)
 #endif
 
 #ifdef USE_FLASHFS
-#if defined(USE_FLASH)
+#if defined(USE_FLASH_CHIP)
     flashInit(flashConfig());
 #endif
     flashfsInit();
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index 3d86c1dd31..58ee9dfeba 100644
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -3895,7 +3895,7 @@ const cliResourceValue_t resourceTable[] = {
 #if defined(USE_USB_MSC)
     DEFS( OWNER_USB_MSC_PIN,   PG_USB_CONFIG, usbDev_t, mscButtonPin ),
 #endif
-#ifdef USE_FLASH
+#ifdef USE_FLASH_CHIP
     DEFS( OWNER_FLASH_CS,      PG_FLASH_CONFIG, flashConfig_t, csTag ),
 #endif
 #ifdef USE_MAX7456
diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c
index a11103ee83..211050254c 100644
--- a/src/main/interface/settings.c
+++ b/src/main/interface/settings.c
@@ -1217,7 +1217,7 @@ const clivalue_t valueTable[] = {
     { "usb_msc_pin_pullup", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_USB_CONFIG, offsetof(usbDev_t, mscButtonUsePullup) },
 #endif
 // PG_FLASH_CONFIG
-#ifdef USE_FLASH
+#ifdef USE_FLASH_CHIP
     { "flash_spi_bus", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, SPIDEV_COUNT }, PG_FLASH_CONFIG, offsetof(flashConfig_t, spiDevice) },
 #endif
 // RCDEVICE
diff --git a/src/main/msc/usbd_storage_emfat.c b/src/main/msc/usbd_storage_emfat.c
index b43352a1cd..d7cebc5f63 100644
--- a/src/main/msc/usbd_storage_emfat.c
+++ b/src/main/msc/usbd_storage_emfat.c
@@ -69,7 +69,7 @@ static int8_t STORAGE_Init(uint8_t lun)
     LED0_ON;
 
 #ifdef USE_FLASHFS 
-#ifdef USE_FLASH
+#ifdef USE_FLASH_CHIP
     flashInit(flashConfig());
 #endif
     flashfsInit();
diff --git a/src/main/pg/flash.c b/src/main/pg/flash.c
index feb0bd67b2..87155b3b53 100644
--- a/src/main/pg/flash.c
+++ b/src/main/pg/flash.c
@@ -23,7 +23,7 @@
 
 #include "platform.h"
 
-#ifdef USE_FLASH
+#ifdef USE_FLASH_CHIP
 
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index 776871dc29..a38f4a6134 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -180,7 +180,7 @@
 #endif
 
 #if defined(USE_FLASH_M25P16)
-#define USE_FLASH
+#define USE_FLASH_CHIP
 #endif
 
 #if defined(USE_MAX7456)