diff --git a/src/main/drivers/flash.c b/src/main/drivers/flash.c
index 26fad11aba..3b156cf6b0 100644
--- a/src/main/drivers/flash.c
+++ b/src/main/drivers/flash.c
@@ -63,7 +63,7 @@ bool flashInit(const flashConfig_t *flashConfig)
     IOConfigGPIO(busdev->busdev_u.spi.csnPin, SPI_IO_CS_CFG);
     IOHi(busdev->busdev_u.spi.csnPin);
 
-#ifndef M25P16_SPI_SHARED
+#ifndef FLASH_SPI_SHARED
     //Maximum speed for standard READ command is 20mHz, other commands tolerate 25mHz
     //spiSetDivisor(busdev->busdev_u.spi.instance, SPI_CLOCK_FAST);
     spiSetDivisor(busdev->busdev_u.spi.instance, SPI_CLOCK_STANDARD*2);
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index 3e1bef9d82..6c13b952bf 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -256,8 +256,8 @@ void spiPreInit(void)
 #if defined(RTC6705_CS_PIN) && !defined(USE_VTX_RTC6705_SOFTSPI) // RTC6705 soft SPI initialisation handled elsewhere.
     spiPreInitCs(IO_TAG(RTC6705_CS_PIN));
 #endif
-#ifdef M25P16_CS_PIN
-    spiPreInitCs(IO_TAG(M25P16_CS_PIN));
+#ifdef FLASH_CS_PIN
+    spiPreInitCs(IO_TAG(FLASH_CS_PIN));
 #endif
 #if defined(USE_RX_SPI) && !defined(USE_RX_SOFTSPI)
     spiPreInitCs(IO_TAG(RX_NSS_PIN));
diff --git a/src/main/pg/flash.c b/src/main/pg/flash.c
index cce3059bc1..7c2632d8b1 100644
--- a/src/main/pg/flash.c
+++ b/src/main/pg/flash.c
@@ -37,11 +37,11 @@ PG_REGISTER_WITH_RESET_FN(flashConfig_t, flashConfig, PG_FLASH_CONFIG, 0);
 
 void pgResetFn_flashConfig(flashConfig_t *flashConfig)
 {
-#ifdef M25P16_CS_PIN
-    flashConfig->csTag = IO_TAG(M25P16_CS_PIN);
+#ifdef FLASH_CS_PIN
+    flashConfig->csTag = IO_TAG(FLASH_CS_PIN);
 #else
     flashConfig->csTag = IO_TAG_NONE;
 #endif
-    flashConfig->spiDevice = SPI_DEV_TO_CFG(spiDeviceByInstance(M25P16_SPI_INSTANCE));
+    flashConfig->spiDevice = SPI_DEV_TO_CFG(spiDeviceByInstance(FLASH_SPI_INSTANCE));
 }
 #endif
diff --git a/src/main/target/AIKONF4/target.h b/src/main/target/AIKONF4/target.h
index 3310e8cdfb..1656e08644 100644
--- a/src/main/target/AIKONF4/target.h
+++ b/src/main/target/AIKONF4/target.h
@@ -67,8 +67,8 @@
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           SPI2_NSS_PIN
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            SPI2_NSS_PIN
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_VCP
 #define USE_USB_DETECT
diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h
index 493538c3d3..12fe579567 100644
--- a/src/main/target/AIR32/target.h
+++ b/src/main/target/AIR32/target.h
@@ -87,8 +87,8 @@
 #define USE_SPI
 #define USE_SPI_DEVICE_2
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index eccbec9ab5..9c472a681b 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -84,8 +84,8 @@
 // Performance logging for SD card operations:
 // #define AFATFS_USE_INTROSPECTIVE_LOGGING
 
-#define M25P16_CS_PIN        SPI2_NSS_PIN
-#define M25P16_SPI_INSTANCE  SPI2
+#define FLASH_CS_PIN         SPI2_NSS_PIN
+#define FLASH_SPI_INSTANCE   SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h
index df90167a18..ac1f1984e0 100644
--- a/src/main/target/ALIENFLIGHTNGF7/target.h
+++ b/src/main/target/ALIENFLIGHTNGF7/target.h
@@ -98,8 +98,8 @@
 // Performance logging for SD card operations:
 // #define AFATFS_USE_INTROSPECTIVE_LOGGING
 
-#define M25P16_CS_PIN        SPI2_NSS_PIN
-#define M25P16_SPI_INSTANCE  SPI2
+#define FLASH_CS_PIN         SPI2_NSS_PIN
+#define FLASH_SPI_INSTANCE   SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h
index 61afcda258..42b470e335 100644
--- a/src/main/target/ALIENWHOOP/target.h
+++ b/src/main/target/ALIENWHOOP/target.h
@@ -114,8 +114,8 @@
 /* BLACKBOX dataflash available as of V2.1 -- did not exist on V1 and V2 */
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN        SPI3_NSS_PIN
-#define M25P16_SPI_INSTANCE  SPI3
+#define FLASH_CS_PIN         SPI3_NSS_PIN
+#define FLASH_SPI_INSTANCE   SPI3
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 
 /* Motion Processing Unit (MPU) - Invensense 6-axis MPU-6500 or 9-axis MPU-9250
diff --git a/src/main/target/ANYFCM7/target.h b/src/main/target/ANYFCM7/target.h
index 96be54ea3e..d9e3cf20d7 100644
--- a/src/main/target/ANYFCM7/target.h
+++ b/src/main/target/ANYFCM7/target.h
@@ -114,8 +114,8 @@
 #define SPI3_MISO_PIN           PC11
 #define SPI3_MOSI_PIN           PC12
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h
index 3a096ccee6..04b0b7a4ed 100644
--- a/src/main/target/BETAFLIGHTF4/target.h
+++ b/src/main/target/BETAFLIGHTF4/target.h
@@ -64,8 +64,8 @@
 #define MAX7456_SPI_CLK         (SPI_CLOCK_STANDARD) // 10MHz
 #define MAX7456_RESTORE_CLK     (SPI_CLOCK_FAST)
 
-#define M25P16_CS_PIN           PA15
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PA15
+#define FLASH_SPI_INSTANCE      SPI3
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/BLUEJAYF4/initialisation.c b/src/main/target/BLUEJAYF4/initialisation.c
index 614d2d85fe..2ee012a2ce 100644
--- a/src/main/target/BLUEJAYF4/initialisation.c
+++ b/src/main/target/BLUEJAYF4/initialisation.c
@@ -68,7 +68,7 @@ void targetPreInit(void)
 
     /* ensure the CS pin for the flash is pulled hi so any SD card initialisation does not impact the chip */
     if (hardwareRevision == BJF4_REV3) {
-        IO_t flashIo = IOGetByTag(IO_TAG(M25P16_CS_PIN));
+        IO_t flashIo = IOGetByTag(IO_TAG(FLASH_CS_PIN));
         IOConfigGPIO(flashIo, IOCFG_OUT_PP);
         IOHi(flashIo);
 
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index c643a5f664..b346aefdac 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -93,8 +93,8 @@
 // Performance logging for SD card operations:
 // #define AFATFS_USE_INTROSPECTIVE_LOGGING
 
-#define M25P16_CS_PIN           PB7
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PB7
+#define FLASH_SPI_INSTANCE      SPI3
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 6c72e43c3b..e958cce0ef 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -39,13 +39,11 @@
 #define USE_SPI_DEVICE_1
 #define USE_SPI_DEVICE_2
 
-#define MPU6000_CS_GPIO         GPIOA
 #define MPU6000_CS_PIN          PA4
 #define MPU6000_SPI_INSTANCE    SPI1
 
-#define M25P16_CS_GPIO          GPIOB
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h
index 4be1598a37..2eda941055 100644
--- a/src/main/target/CHEBUZZF3/target.h
+++ b/src/main/target/CHEBUZZF3/target.h
@@ -60,13 +60,6 @@
 // Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
 #define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
 
-//#define USE_FLASHFS
-//#define USE_FLASH_M25P16
-
-//#define M25P16_CS_GPIO          GPIOB
-//#define M25P16_CS_PIN           GPIO_Pin_12
-//#define M25P16_SPI_INSTANCE     SPI2
-
 #define USE_GYRO
 #define USE_GYRO_L3GD20
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h
index 8b96e4b00c..e3dc0898d2 100644
--- a/src/main/target/CLRACINGF4/target.h
+++ b/src/main/target/CLRACINGF4/target.h
@@ -87,8 +87,8 @@
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           PB3
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PB3
+#define FLASH_SPI_INSTANCE      SPI3
 
 
 #define USE_VCP
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index b9aef702ce..ae40d63a81 100644
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -65,8 +65,8 @@
 #define USE_BARO
 #define USE_BARO_MS5611
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h
index afe425cab3..508dd64b29 100644
--- a/src/main/target/DALRCF405/target.h
+++ b/src/main/target/DALRCF405/target.h
@@ -83,8 +83,8 @@
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 //GPS ----------------------------------------------
 #define USE_GPS
diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h
index 26c064acba..30e5449725 100644
--- a/src/main/target/DOGE/target.h
+++ b/src/main/target/DOGE/target.h
@@ -69,9 +69,9 @@
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_SPI_SHARED
-#define M25P16_CS_PIN           PC15
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_SPI_SHARED
+#define FLASH_CS_PIN            PC15
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_GYRO
 #define USE_GYRO_MPU6500
diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h
index aa151563dc..4ef63e468a 100644
--- a/src/main/target/FF_FORTINIF4/target.h
+++ b/src/main/target/FF_FORTINIF4/target.h
@@ -82,8 +82,8 @@
 /*---------------------------------*/
 
 /*------------FLASH----------------*/
-#define M25P16_CS_PIN           PB3
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PB3
+#define FLASH_SPI_INSTANCE      SPI3
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h
index 68202021f7..7496b9efbb 100644
--- a/src/main/target/FF_PIKOF4/target.h
+++ b/src/main/target/FF_PIKOF4/target.h
@@ -94,8 +94,8 @@
 /*---------------------------------*/
 #else
 /*------------FLASH----------------*/
-#define M25P16_CS_PIN           PB3
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PB3
+#define FLASH_SPI_INSTANCE      SPI3
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index bde2d83f94..6627c0a8bd 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -96,8 +96,8 @@
 
 #define USE_FLASH_M25P16
 #define USE_FLASHFS
-#define M25P16_CS_PIN           PD2
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PD2
+#define FLASH_SPI_INSTANCE      SPI3
 
 // *************** SDCARD *****************************
 #define USE_SDCARD
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index b583842d85..3225e4145a 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -93,8 +93,8 @@
 
     #define USE_FLASHFS
     #define USE_FLASH_M25P16
-    #define M25P16_CS_PIN           PB12
-    #define M25P16_SPI_INSTANCE     SPI2
+    #define FLASH_CS_PIN            PB12
+    #define FLASH_SPI_INSTANCE      SPI2
 
     #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index e1e9f4a81c..348872608c 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -118,8 +118,8 @@
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           PB3
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PB3
+#define FLASH_SPI_INSTANCE      SPI3
 
 #define USE_VCP
 #define USB_DETECT_PIN          PC5
diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h
index 94aebd2d67..572d489170 100644
--- a/src/main/target/FURYF7/target.h
+++ b/src/main/target/FURYF7/target.h
@@ -92,8 +92,8 @@
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           PA15
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PA15
+#define FLASH_SPI_INSTANCE      SPI3
 
 #define USE_VCP
 #define USE_USB_DETECT
diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h
index 068895f018..3de5a4f41b 100644
--- a/src/main/target/IMPULSERCF3/target.h
+++ b/src/main/target/IMPULSERCF3/target.h
@@ -72,9 +72,8 @@
 #define USE_SPI_DEVICE_1 // PA4, 5, 6, 7
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
 
-#define M25P16_CS_GPIO          GPIOB
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define MPU6000_CS_PIN          PA4
 #define MPU6000_SPI_INSTANCE    SPI1
diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h
index e9216d06ee..3194e0ff6f 100644
--- a/src/main/target/IRCFUSIONF3/target.h
+++ b/src/main/target/IRCFUSIONF3/target.h
@@ -72,8 +72,8 @@
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define USE_ADC
diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h
index f37c4d45fd..c742284e87 100644
--- a/src/main/target/ISHAPEDF3/target.h
+++ b/src/main/target/ISHAPEDF3/target.h
@@ -90,8 +90,8 @@
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define USE_ADC
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index cde4f4e578..78e13e9fae 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -81,8 +81,8 @@
 #define MAX7456_SPI_CLK         (SPI_CLOCK_STANDARD)
 #define MAX7456_RESTORE_CLK     (SPI_CLOCK_FAST)
 
-#define M25P16_CS_PIN           PB3
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PB3
+#define FLASH_SPI_INSTANCE      SPI3
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index 68f1554e19..4a69c7d763 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -104,8 +104,8 @@
 #else
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           SPI3_NSS_PIN
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            SPI3_NSS_PIN
+#define FLASH_SPI_INSTANCE      SPI3
 #endif
 
 #define USE_VCP
diff --git a/src/main/target/LUMBAF3/target.h b/src/main/target/LUMBAF3/target.h
index b7565a3976..52e85e9f9b 100644
--- a/src/main/target/LUMBAF3/target.h
+++ b/src/main/target/LUMBAF3/target.h
@@ -34,13 +34,11 @@
 #define USE_SPI_DEVICE_1
 #define USE_SPI_DEVICE_2
 
-#define MPU6000_CS_GPIO         GPIOA
 #define MPU6000_CS_PIN          PA4
 #define MPU6000_SPI_INSTANCE    SPI1
 
-#define M25P16_CS_GPIO          GPIOB
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index 1f4cc563f4..8043d055d1 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -99,8 +99,8 @@
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           PC0
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PC0
+#define FLASH_SPI_INSTANCE      SPI3
 
 // *************** SD Card **************************
 #define USE_SDCARD
diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h
index 757769bdf0..7ba0dc2d03 100644
--- a/src/main/target/MOTOLAB/target.h
+++ b/src/main/target/MOTOLAB/target.h
@@ -87,8 +87,8 @@
 #define USE_SPI
 #define USE_SPI_DEVICE_2
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h
index 27e57058ff..733fc37f9c 100644
--- a/src/main/target/MULTIFLITEPICO/target.h
+++ b/src/main/target/MULTIFLITEPICO/target.h
@@ -102,8 +102,8 @@
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
 
-//#define M25P16_CS_PIN           PB12
-//#define M25P16_SPI_INSTANCE     SPI2
+//#define FLASH_CS_PIN            PB12
+//#define FLASH_SPI_INSTANCE      SPI2
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define USE_ADC
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 803110da0b..28659bb363 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -71,8 +71,8 @@
 #define NAZE_SPI_CS_PIN         PB12
 
 // We either have this 16mbit flash chip on SPI or the MPU6500 acc/gyro depending on board revision:
-#define M25P16_CS_PIN           NAZE_SPI_CS_PIN
-#define M25P16_SPI_INSTANCE     NAZE_SPI_INSTANCE
+#define FLASH_CS_PIN            NAZE_SPI_CS_PIN
+#define FLASH_SPI_INSTANCE      NAZE_SPI_INSTANCE
 
 #define MPU6500_CS_PIN          NAZE_SPI_CS_PIN
 #define MPU6500_SPI_INSTANCE    NAZE_SPI_INSTANCE
diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h
index 6c211739c9..45612a1324 100644
--- a/src/main/target/NOX/target.h
+++ b/src/main/target/NOX/target.h
@@ -101,8 +101,8 @@
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_SPI_INSTANCE     SPI1
-#define M25P16_CS_PIN           PA15
+#define FLASH_SPI_INSTANCE      SPI1
+#define FLASH_CS_PIN            PA15
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 
 #define USE_ADC
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index b7c15f8386..d9fc8e7032 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -155,20 +155,20 @@
 #define SDCARD_DMA_CHANNEL                      0
 
 // For variants with SDcard replaced with flash chip
-#define M25P16_CS_PIN           SDCARD_SPI_CS_PIN
-#define M25P16_SPI_INSTANCE     SDCARD_SPI_INSTANCE
+#define FLASH_CS_PIN            SDCARD_SPI_CS_PIN
+#define FLASH_SPI_INSTANCE      SDCARD_SPI_INSTANCE
 
 #elif defined(LUXF4OSD)
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 
 #else
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
-#define M25P16_CS_PIN           SPI3_NSS_PIN
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            SPI3_NSS_PIN
+#define FLASH_SPI_INSTANCE      SPI3
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 #endif // OMNIBUSF4
diff --git a/src/main/target/OMNIBUSF4FW/target.h b/src/main/target/OMNIBUSF4FW/target.h
index 36918c51c0..da7f86d683 100644
--- a/src/main/target/OMNIBUSF4FW/target.h
+++ b/src/main/target/OMNIBUSF4FW/target.h
@@ -91,8 +91,8 @@
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
-#define M25P16_SPI_INSTANCE     SPI2
-#define M25P16_CS_PIN           PB12
+#define FLASH_SPI_INSTANCE      SPI2
+#define FLASH_CS_PIN            PB12
 
 #define USE_VCP
 #define VBUS_SENSING_PIN        PC5
diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index 82cab1729e..71a88e6f65 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -198,8 +198,8 @@
 
 #ifdef FPVM_BETAFLIGHTF7
 //FLASH--------------------------------------
-#define M25P16_CS_PIN        SPI4_NSS_PIN
-#define M25P16_SPI_INSTANCE  SPI4
+#define FLASH_CS_PIN         SPI4_NSS_PIN
+#define FLASH_SPI_INSTANCE   SPI4
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/OMNINXT/target.h b/src/main/target/OMNINXT/target.h
index 721d6232ce..fa29d9e0fb 100644
--- a/src/main/target/OMNINXT/target.h
+++ b/src/main/target/OMNINXT/target.h
@@ -96,8 +96,8 @@
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_SPI_INSTANCE     SPI2
-#define M25P16_CS_PIN           PC14
+#define FLASH_SPI_INSTANCE      SPI2
+#define FLASH_CS_PIN            PC14
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 
diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h
index bafd1964a9..743e34a844 100644
--- a/src/main/target/RACEBASE/target.h
+++ b/src/main/target/RACEBASE/target.h
@@ -90,9 +90,9 @@
 #define MAX7456_RESTORE_CLK     (SPI_CLOCK_FAST)
 
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
-#define M25P16_SPI_SHARED
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
+#define FLASH_SPI_SHARED
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 8b7c59e2b4..1a4d07b958 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -176,8 +176,8 @@
 
 #else
 
-#define M25P16_CS_PIN           PB3
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PB3
+#define FLASH_SPI_INSTANCE      SPI3
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 
diff --git a/src/main/target/REVOLT/target.h b/src/main/target/REVOLT/target.h
index a588113026..129dc15889 100644
--- a/src/main/target/REVOLT/target.h
+++ b/src/main/target/REVOLT/target.h
@@ -106,12 +106,12 @@
 #define USE_MPU_DATA_READY_SIGNAL
 
 /*----------Flash Config--------*/
-#define M25P16_CS_PIN           PB3
+#define FLASH_CS_PIN            PB3
 
 #if defined(REVOLTOSD)
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_SPI_INSTANCE      SPI2
 #else
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_SPI_INSTANCE      SPI3
 #endif
 
 
diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h
index 3ffcde9ddd..a0693f0c55 100644
--- a/src/main/target/SINGULARITY/target.h
+++ b/src/main/target/SINGULARITY/target.h
@@ -81,9 +81,8 @@
 #define RTC6705_CS_PIN          PA4
 #define RTC6705_SPI_INSTANCE    SPI1
 
-#define M25P16_CS_GPIO          GPIOB
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_ADC
 
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index c55e4de9bb..2c073e0dfa 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -65,8 +65,8 @@
 #define USE_BARO_MS5611
 //#define USE_BARO_BMP280
 
-#define M25P16_CS_PIN           PB3
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PB3
+#define FLASH_SPI_INSTANCE      SPI3
 
 //#define RFM22B_CS_PIN           PA15
 //#define RFM22B_SPI_INSTANCE     SPI3
diff --git a/src/main/target/SPEEDYBEEF4/target.h b/src/main/target/SPEEDYBEEF4/target.h
index 0dd0df0739..8fbcda0dc7 100644
--- a/src/main/target/SPEEDYBEEF4/target.h
+++ b/src/main/target/SPEEDYBEEF4/target.h
@@ -78,8 +78,8 @@
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           PC0
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            PC0
+#define FLASH_SPI_INSTANCE      SPI3
 
 // *************** OSD *****************************
 #define USE_SPI_DEVICE_2
diff --git a/src/main/target/SPEKTRUMF400/target.h b/src/main/target/SPEKTRUMF400/target.h
index bbbfce566c..c983c0bccd 100644
--- a/src/main/target/SPEKTRUMF400/target.h
+++ b/src/main/target/SPEKTRUMF400/target.h
@@ -48,8 +48,8 @@
 //#define USE_FLASHFS
 //#define USE_FLASH_M25P16
 
-//#define M25P16_CS_PIN           PB12
-//#define M25P16_SPI_INSTANCE     SPI2
+//#define FLASH_CS_PIN            PB12
+//#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6500
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index 097ae86c1e..f30707c4a0 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -163,8 +163,8 @@
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h
index 37ef702fbf..6b524c9edf 100644
--- a/src/main/target/STM32F3DISCOVERY/target.h
+++ b/src/main/target/STM32F3DISCOVERY/target.h
@@ -69,8 +69,8 @@
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 // SPI1
 // PB5  SPI1_MOSI
 // PB4  SPI1_MISO
diff --git a/src/main/target/TINYFISH/target.h b/src/main/target/TINYFISH/target.h
index 4a1e4a7a12..a28b8edd81 100644
--- a/src/main/target/TINYFISH/target.h
+++ b/src/main/target/TINYFISH/target.h
@@ -90,8 +90,8 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define M25P16_CS_PIN           SPI2_NSS_PIN
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            SPI2_NSS_PIN
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h
index 47a04cfdc3..338d7bedd7 100644
--- a/src/main/target/VRRACE/target.h
+++ b/src/main/target/VRRACE/target.h
@@ -87,8 +87,8 @@
 /*
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN         PB3
-#define M25P16_SPI_INSTANCE   SPI3
+#define FLASH_CS_PIN          PB3
+#define FLASH_SPI_INSTANCE    SPI3
 */
 
 #define USE_VCP
diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h
index 93aac6b718..4a5b0efc4a 100644
--- a/src/main/target/X_RACERSPI/target.h
+++ b/src/main/target/X_RACERSPI/target.h
@@ -97,8 +97,8 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define M25P16_CS_PIN           PB12
-#define M25P16_SPI_INSTANCE     SPI2
+#define FLASH_CS_PIN            PB12
+#define FLASH_SPI_INSTANCE      SPI2
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define USE_ADC
diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h
index f711e434b0..3cc686c134 100644
--- a/src/main/target/YUPIF7/target.h
+++ b/src/main/target/YUPIF7/target.h
@@ -113,8 +113,8 @@
 // Dataflash
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
-#define M25P16_CS_PIN           SPI3_NSS_PIN
-#define M25P16_SPI_INSTANCE     SPI3
+#define FLASH_CS_PIN            SPI3_NSS_PIN
+#define FLASH_SPI_INSTANCE      SPI3
 
 // ADC inputs
 #define USE_ADC