diff --git a/code/espurna/config/custom.h.example b/code/espurna/config/custom.h.example
index bf42eeb8..5a9266fc 100644
--- a/code/espurna/config/custom.h.example
+++ b/code/espurna/config/custom.h.example
@@ -12,7 +12,7 @@
 
 // Example of a Sonoff Basic board with some options disabled to reduce firmware size.
 
-#if defined(MY_SONOFF_BUILD01)    // This section will be used when src_build_flags contains
+#if defined(MY_SONOFF_BUILD01)    // This section will be used when build_src_flags contains
                                   //  -DMY_SONOFF_BUILD01 in 'platformio_override.ini'
 
     #define MANUFACTURER               "ITEAD"
@@ -45,7 +45,7 @@
 // the 'DOUBLE CLICK, LONG CLICK OR LONG-LONG CLICK' trigger. A BMX280 environment
 // sensor is also connected using I2C on GPIO 1 and 3.
 
-#elif defined(MY_SONOFF_BUILD02)    // This section will be used when src_build_flags contains
+#elif defined(MY_SONOFF_BUILD02)    // This section will be used when build_src_flags contains
                                     //  -DMY_SONOFF_BUILD02 in 'platformio_override.ini
 
     // Info - Custom Basic with BMX280 I2C on GPIO 1 and 3
diff --git a/code/espurna/sensor.cpp b/code/espurna/sensor.cpp
index f970ca2d..f4c6cdcd 100644
--- a/code/espurna/sensor.cpp
+++ b/code/espurna/sensor.cpp
@@ -2518,7 +2518,7 @@ void _sensorLoad() {
     #endif
 
     DHT2_PIN and DHT2_TYPE should be globally accessible:
-    - as `src_build_flags = -DDHT2_PIN=... -DDHT2_TYPE=...`
+    - as `build_src_flags = -DDHT2_PIN=... -DDHT2_TYPE=...`
     - in custom.h, as `#define ...`
 
     */
diff --git a/code/platformio.ini b/code/platformio.ini
index 25f801c0..913e8439 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -96,7 +96,7 @@ build_flags = -g -w -DNO_GLOBAL_EEPROM -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BAND
 # ------------------------------------------------------------------------------
 # DEBUG BUILD FLAGS
 #   build flags for the Core, must be set as global build_flag
-#   (src_build_flags would not work)
+#   (build_src_flags would not work)
 #
 # [env:nodemcu-lolin-debug]
 # extends = env:nodemcu-lolin
@@ -194,7 +194,7 @@ lib_ignore =
 # ------------------------------------------------------------------------------
 # Base enrivonments, -DMANUFACTURER=..., -DDEVICE=... must be set:
 # - by using specific hardware.h entry, like -DITEAD_SONOFF_BASIC
-# - by setting PLATFORMIO_SRC_BUILD_FLAGS=... environment variable
+# - by setting PLATFORMIO_BUILD_SRC_FLAGS=... environment variable
 # - by setting ESPURNA_FLAGS=... environment variable
 # ------------------------------------------------------------------------------
 
@@ -256,15 +256,15 @@ board_build.ldscript = ${common.ldscript_4m}
 
 [env:espurna-core-1MB]
 extends = env:esp8266-1m-base
-src_build_flags = -DESPURNA_CORE
+build_src_flags = -DESPURNA_CORE
 
 [env:espurna-core-2MB]
 extends = env:esp8266-2m-base
-src_build_flags = -DESPURNA_CORE
+build_src_flags = -DESPURNA_CORE
 
 [env:espurna-core-4MB]
 extends = env:esp8266-4m-base
-src_build_flags = -DESPURNA_CORE
+build_src_flags = -DESPURNA_CORE
 
 # ------------------------------------------------------------------------------
 # ESPURNA CORE with WebUI
@@ -272,15 +272,15 @@ src_build_flags = -DESPURNA_CORE
 
 [env:espurna-core-webui-1MB]
 extends = env:esp8266-1m-base
-src_build_flags = -DESPURNA_CORE_WEBUI
+build_src_flags = -DESPURNA_CORE_WEBUI
 
 [env:espurna-core-webui-2MB]
 extends = env:esp8266-2m-base
-src_build_flags = -DESPURNA_CORE_WEBUI
+build_src_flags = -DESPURNA_CORE_WEBUI
 
 [env:espurna-core-webui-4MB]
 extends = env:esp8266-4m-base
-src_build_flags = -DESPURNA_CORE_WEBUI
+build_src_flags = -DESPURNA_CORE_WEBUI
 
 # ------------------------------------------------------------------------------
 # DEVELOPMENT BOARDS
@@ -289,26 +289,26 @@ src_build_flags = -DESPURNA_CORE_WEBUI
 [env:wemos-d1mini]
 extends = env:esp8266-4m-base
 board = d1_mini
-src_build_flags = -DWEMOS_D1_MINI -DNOWSAUTH
+build_src_flags = -DWEMOS_D1_MINI -DNOWSAUTH
 
 [env:wemos-d1mini-relayshield]
 extends = env:esp8266-4m-base
 board = d1_mini
-src_build_flags = -DWEMOS_D1_MINI_RELAYSHIELD -DNOWSAUTH
+build_src_flags = -DWEMOS_D1_MINI_RELAYSHIELD -DNOWSAUTH
 
 [env:nodemcu-lolin]
 extends = env:esp8266-4m-base
-src_build_flags = -DNODEMCU_LOLIN -DNOWSAUTH
+build_src_flags = -DNODEMCU_LOLIN -DNOWSAUTH
 
 [env:nodemcu-lolin-secure-client-asynctcp]
 extends = env:esp8266-4m-base
 build_flags = ${common.build_flags} -DASYNC_TCP_SSL_ENABLED=1
-src_build_flags = -DNODEMCU_LOLIN -DNOWSAUTH
+build_src_flags = -DNODEMCU_LOLIN -DNOWSAUTH
 
 [env:nodemcu-lolin-secure-client]
 extends = env:esp8266-4m-base
 board_build.f_cpu = 160000000
-src_build_flags =
+build_src_flags =
 	-DNODEMCU_LOLIN -DNOWSAUTH
 	-DSECURE_CLIENT=SECURE_CLIENT_BEARSSL
 	-DMQTT_LIBRARY=MQTT_LIBRARY_ARDUINOMQTT
@@ -320,28 +320,28 @@ src_build_flags =
 
 [env:tinkerman-espurna-h06]
 extends = env:esp8266-4m-base
-src_build_flags = -DTINKERMAN_ESPURNA_H06
+build_src_flags = -DTINKERMAN_ESPURNA_H06
 
 [env:tinkerman-espurna-h08]
 extends = env:esp8266-4m-base
-src_build_flags = -DTINKERMAN_ESPURNA_H08
+build_src_flags = -DTINKERMAN_ESPURNA_H08
 
 [env:tinkerman-espurna-switch]
 extends = env:esp8266-4m-base
-src_build_flags = -DTINKERMAN_ESPURNA_SWITCH
+build_src_flags = -DTINKERMAN_ESPURNA_SWITCH
 
 [env:wemos-d1-tarpunashield]
 extends = env:esp8266-4m-base
-src_build_flags = -DWEMOS_D1_TARPUNA_SHIELD
+build_src_flags = -DWEMOS_D1_TARPUNA_SHIELD
 
 [env:tinkerman-rfm69gw]
 extends = env:esp8266-4m-base
 board = esp12e
-src_build_flags = -DTINKERMAN_RFM69GW -DNOWSAUTH
+build_src_flags = -DTINKERMAN_RFM69GW -DNOWSAUTH
 
 [env:foxel-lightfox-dual]
 extends = env:esp8266-1m-base
-src_build_flags =
+build_src_flags =
     -DFOXEL_LIGHTFOX_DUAL
     -DDISABLE_POSTMORTEM_STACKDUMP
 
@@ -351,35 +351,35 @@ src_build_flags =
 
 [env:generic-esp01-512kb]
 extends = env:esp8266-512k-base
-src_build_flags = -DGENERIC_ESP01_512KB
+build_src_flags = -DGENERIC_ESP01_512KB
 
 [env:generic-esp01s-relay-40]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_ESP01S_RELAY_V40
+build_src_flags = -DGENERIC_ESP01S_RELAY_V40
 
 [env:generic-esp01s-relay-40-inv]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_ESP01S_RELAY_V40 -DRELAY1_TYPE=RELAY_TYPE_INVERSE
+build_src_flags = -DGENERIC_ESP01S_RELAY_V40 -DRELAY1_TYPE=RELAY_TYPE_INVERSE
 
 [env:generic-esp01s-rgbled-10]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_ESP01S_RGBLED_V10
+build_src_flags = -DGENERIC_ESP01S_RGBLED_V10
 
 [env:generic-esp01s-dht11-10]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_ESP01S_DHT11_V10
+build_src_flags = -DGENERIC_ESP01S_DHT11_V10
 
 [env:generic-esp01s-ds18b20-10]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_ESP01S_DS18B20_V10
+build_src_flags = -DGENERIC_ESP01S_DS18B20_V10
 
 [env:generic-esp01s-pzem004t]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_PZEM004T -DDISABLE_POSTMORTEM_STACKDUMP
+build_src_flags = -DGENERIC_PZEM004T -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:generic-esp12e-pzem004t]
 extends = env:esp8266-4m-base
-src_build_flags = -DGENERIC_PZEM004T -DDISABLE_POSTMORTEM_STACKDUMP
+build_src_flags = -DGENERIC_PZEM004T -DDISABLE_POSTMORTEM_STACKDUMP
 
 # ------------------------------------------------------------------------------
 # ITEAD SONOFF
@@ -387,683 +387,683 @@ src_build_flags = -DGENERIC_PZEM004T -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:itead-sonoff-basic]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_BASIC
+build_src_flags = -DITEAD_SONOFF_BASIC
 
 [env:itead-sonoff-basic-dht]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1
+build_src_flags = -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1
 
 [env:itead-sonoff-basic-r2-dht]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1 -DDHT_PIN=2
+build_src_flags = -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1 -DDHT_PIN=2
 
 [env:itead-sonoff-basic-dallas]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_BASIC -DDALLAS_SUPPORT=1
+build_src_flags = -DITEAD_SONOFF_BASIC -DDALLAS_SUPPORT=1
 
 [env:itead-sonoff-basic-r2-dallas]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_BASIC -DDALLAS_SUPPORT=1 -DDALLAS_PIN=2
+build_src_flags = -DITEAD_SONOFF_BASIC -DDALLAS_SUPPORT=1 -DDALLAS_PIN=2
 
 [env:itead-sonoff-rf]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_RF
+build_src_flags = -DITEAD_SONOFF_RF
 
 [env:itead-sonoff-mini]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_MINI
+build_src_flags = -DITEAD_SONOFF_MINI
 
 [env:itead-sonoff-th]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_TH
+build_src_flags = -DITEAD_SONOFF_TH
 
 [env:itead-sonoff-pow]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_POW
+build_src_flags = -DITEAD_SONOFF_POW
 
 [env:itead-sonoff-pow-r2]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_POW_R2 -DDISABLE_POSTMORTEM_STACKDUMP
+build_src_flags = -DITEAD_SONOFF_POW_R2 -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:itead-sonoff-dual]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_DUAL -DDISABLE_POSTMORTEM_STACKDUMP
+build_src_flags = -DITEAD_SONOFF_DUAL -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:itead-sonoff-dual-r2]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_DUAL_R2
+build_src_flags = -DITEAD_SONOFF_DUAL_R2
 
 [env:itead-sonoff-4ch]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_4CH
+build_src_flags = -DITEAD_SONOFF_4CH
 
 [env:itead-sonoff-4ch-pro]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_4CH_PRO
+build_src_flags = -DITEAD_SONOFF_4CH_PRO
 
 [env:itead-sonoff-touch]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_TOUCH
+build_src_flags = -DITEAD_SONOFF_TOUCH
 
 [env:itead-sonoff-b1]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_B1
+build_src_flags = -DITEAD_SONOFF_B1
 
 [env:itead-sonoff-t1-1ch]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_T1_1CH
+build_src_flags = -DITEAD_SONOFF_T1_1CH
 
 [env:itead-sonoff-t1-2ch]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_T1_2CH
+build_src_flags = -DITEAD_SONOFF_T1_2CH
 
 [env:itead-sonoff-t1-3ch]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_T1_3CH
+build_src_flags = -DITEAD_SONOFF_T1_3CH
 
 [env:itead-sonoff-led]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_LED
+build_src_flags = -DITEAD_SONOFF_LED
 
 [env:itead-sonoff-rfbridge]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_RFBRIDGE -DDISABLE_POSTMORTEM_STACKDUMP
+build_src_flags = -DITEAD_SONOFF_RFBRIDGE -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:itead-sonoff-rfbridge-direct]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_RFBRIDGE -DRFB_PROVIDER=RFB_PROVIDER_RCSWITCH
+build_src_flags = -DITEAD_SONOFF_RFBRIDGE -DRFB_PROVIDER=RFB_PROVIDER_RCSWITCH
 
 [env:itead-slampher]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SLAMPHER
+build_src_flags = -DITEAD_SLAMPHER
 
 [env:itead-s20]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_S20
+build_src_flags = -DITEAD_S20
 
 [env:itead-1ch-inching]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_1CH_INCHING
+build_src_flags = -DITEAD_1CH_INCHING
 
 [env:itead-motor]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_MOTOR
+build_src_flags = -DITEAD_MOTOR
 
 [env:itead-sonoff-sv]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_SV
+build_src_flags = -DITEAD_SONOFF_SV
 
 [env:itead-sonoff-s31]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_S31 -DDISABLE_POSTMORTEM_STACKDUMP
+build_src_flags = -DITEAD_SONOFF_S31 -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:itead-sonoff-s31-lite]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_S31_LITE
+build_src_flags = -DITEAD_SONOFF_S31_LITE
 
 [env:itead-sonoff-ifan02]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_IFAN02
+build_src_flags = -DITEAD_SONOFF_IFAN02
 
 # ------------------------------------------------------------------------------
 
 [env:electrodragon-wifi-iot]
 extends = env:esp8266-4m-base
-src_build_flags = -DELECTRODRAGON_WIFI_IOT -DDHT_SUPPORT=1
+build_src_flags = -DELECTRODRAGON_WIFI_IOT -DDHT_SUPPORT=1
 
 [env:workchoice-ecoplug]
 extends = env:esp8266-1m-base
-src_build_flags = -DWORKCHOICE_ECOPLUG
+build_src_flags = -DWORKCHOICE_ECOPLUG
 
 [env:jangoe-wifi-relay-nc]
 extends = env:esp8266-4m-base
-src_build_flags = -DJANGOE_WIFI_RELAY_NC
+build_src_flags = -DJANGOE_WIFI_RELAY_NC
 
 [env:jangoe-wifi-relay-no]
 extends = env:esp8266-4m-base
-src_build_flags = -DJANGOE_WIFI_RELAY_NO
+build_src_flags = -DJANGOE_WIFI_RELAY_NO
 
 [env:openenergymonitor-mqtt-relay]
 extends = env:esp8266-4m-base
-src_build_flags = -DOPENENERGYMONITOR_MQTT_RELAY -DDALLAS_SUPPORT=1
+build_src_flags = -DOPENENERGYMONITOR_MQTT_RELAY -DDALLAS_SUPPORT=1
 
 [env:jorgegarcia-wifi-relays]
 extends = env:esp8266-1m-base
-src_build_flags = -DJORGEGARCIA_WIFI_RELAYS
+build_src_flags = -DJORGEGARCIA_WIFI_RELAYS
 
 [env:aithinker-ai-light]
 extends = env:esp8266-1m-base
-src_build_flags = -DAITHINKER_AI_LIGHT
+build_src_flags = -DAITHINKER_AI_LIGHT
 
 [env:lyasi-rgb-light]
 extends = env:esp8266-1m-base
-src_build_flags = -DLYASI_LIGHT
+build_src_flags = -DLYASI_LIGHT
 
 [env:magichome-led-controller]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAGICHOME_LED_CONTROLLER
+build_src_flags = -DMAGICHOME_LED_CONTROLLER
 
 [env:magichome-led-controller-20]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAGICHOME_LED_CONTROLLER_20
+build_src_flags = -DMAGICHOME_LED_CONTROLLER_20
 
 [env:magichome-zj-wfmn-a-11]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAGICHOME_ZJ_WFMN_A_11
+build_src_flags = -DMAGICHOME_ZJ_WFMN_A_11
 
 [env:magichome-zj-wfmn-b-11]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAGICHOME_ZJ_WFMN_B_11
+build_src_flags = -DMAGICHOME_ZJ_WFMN_B_11
 
 [env:magichome-zj-espm-5ch-b-13]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAGICHOME_ZJ_ESPM_5CH_B_13
+build_src_flags = -DMAGICHOME_ZJ_ESPM_5CH_B_13
 
 [env:magichome-zj-lb-rgbww-l]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAGICHOME_ZJ_LB_RGBWW_L
+build_src_flags = -DMAGICHOME_ZJ_LB_RGBWW_L
 
 [env:magichome-zj-wfmn-c-11]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAGICHOME_ZJ_WFMN_C_11
+build_src_flags = -DMAGICHOME_ZJ_WFMN_C_11
 
 [env:mirabella-genio-w-a60]
 extends = env:esp8266-1m-base
-src_build_flags = -DMIRABELLA_GENIO_W_A60
+build_src_flags = -DMIRABELLA_GENIO_W_A60
 
 [env:huacanxing-h801]
 extends = env:esp8266-1m-base
-src_build_flags = -DHUACANXING_H801
+build_src_flags = -DHUACANXING_H801
 
 [env:huacanxing-h802]
 extends = env:esp8266-1m-base
-src_build_flags = -DHUACANXING_H802
+build_src_flags = -DHUACANXING_H802
 
 [env:arilux-al-lc01]
 extends = env:esp8266-1m-base
-src_build_flags = -DARILUX_AL_LC01
+build_src_flags = -DARILUX_AL_LC01
 
 [env:arilux-al-lc02]
 extends = env:esp8266-1m-base
-src_build_flags = -DARILUX_AL_LC02
+build_src_flags = -DARILUX_AL_LC02
 
 [env:arilux-al-lc02-v14]
 extends = env:esp8266-1m-base
-src_build_flags = -DARILUX_AL_LC02_V14
+build_src_flags = -DARILUX_AL_LC02_V14
 
 [env:arilux-al-lc06]
 extends = env:esp8266-1m-base
-src_build_flags = -DARILUX_AL_LC06
+build_src_flags = -DARILUX_AL_LC06
 
 [env:arilux-al-lc11]
 extends = env:esp8266-1m-base
-src_build_flags = -DARILUX_AL_LC11
+build_src_flags = -DARILUX_AL_LC11
 
 [env:arilux-e27]
 extends = env:esp8266-1m-base
-src_build_flags = -DARILUX_E27
+build_src_flags = -DARILUX_E27
 
 [env:itead-bnsz01]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_BNSZ01
+build_src_flags = -DITEAD_BNSZ01
 
 [env:wion-50055]
 extends = env:esp8266-1m-base
-src_build_flags = -DWION_50055
+build_src_flags = -DWION_50055
 
 [env:exs-wifi-relay-v31]
 extends = env:esp8266-4m-base
-src_build_flags = -DEXS_WIFI_RELAY_V31
+build_src_flags = -DEXS_WIFI_RELAY_V31
 
 [env:exs-wifi-relay-v50]
 extends = env:esp8266-4m-base
-src_build_flags = -DEXS_WIFI_RELAY_V50
+build_src_flags = -DEXS_WIFI_RELAY_V50
 
 [env:wemos-v9261f]
 extends = env:esp8266-4m-base
-src_build_flags = -DGENERIC_V9261F
+build_src_flags = -DGENERIC_V9261F
 
 [env:esp01-v9261f]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_V9261F
+build_src_flags = -DGENERIC_V9261F
 
 [env:wemos-ech1560]
 extends = env:esp8266-4m-base
-src_build_flags = -DGENERIC_ECH1560
+build_src_flags = -DGENERIC_ECH1560
 
 [env:esp01-ech1560]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_ECH1560
+build_src_flags = -DGENERIC_ECH1560
 
 [env:mancavemade-esplive]
 extends = env:esp8266-4m-base
-src_build_flags = -DMANCAVEMADE_ESPLIVE
+build_src_flags = -DMANCAVEMADE_ESPLIVE
 
 [env:tuya-generic-dimmer]
 extends = env:esp8266-1m-base
-src_build_flags = -DTUYA_GENERIC_DIMMER -DDEBUG_SERIAL_SUPPORT=0 -DDISABLE_POSTMORTEM_STACKDUMP
+build_src_flags = -DTUYA_GENERIC_DIMMER -DDEBUG_SERIAL_SUPPORT=0 -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:intermittech-quinled]
 extends = env:esp8266-1m-base
-src_build_flags = -DINTERMITTECH_QUINLED
+build_src_flags = -DINTERMITTECH_QUINLED
 
 [env:xenon-sm-pw702u]
 extends = env:esp8266-1m-base
-src_build_flags = -DXENON_SM_PW702U
+build_src_flags = -DXENON_SM_PW702U
 
 [env:iselector-sm-pw702]
 extends = env:esp8266-1m-base
-src_build_flags = -DISELECTOR_SM_PW702
+build_src_flags = -DISELECTOR_SM_PW702
 
 [env:authometion-lyt8266]
 extends = env:esp8266-1m-base
-src_build_flags = -DAUTHOMETION_LYT8266
+build_src_flags = -DAUTHOMETION_LYT8266
 
 [env:kmc-70011]
 extends = env:esp8266-1m-base
-src_build_flags = -DKMC_70011
+build_src_flags = -DKMC_70011
 
 [env:yjzk-switch-1ch]
 extends = env:esp8266-1m-base
-src_build_flags = -DYJZK_SWITCH_1CH
+build_src_flags = -DYJZK_SWITCH_1CH
 
 [env:yjzk-switch-2ch]
 extends = env:esp8266-1m-base
-src_build_flags = -DYJZK_SWITCH_2CH
+build_src_flags = -DYJZK_SWITCH_2CH
 
 [env:yjzk-switch-3ch]
 extends = env:esp8266-1m-base
-src_build_flags = -DYJZK_SWITCH_3CH
+build_src_flags = -DYJZK_SWITCH_3CH
 
 [env:generic-8ch]
 extends = env:esp8266-4m-base
-src_build_flags = -DGENERIC_8CH
+build_src_flags = -DGENERIC_8CH
 
 [env:gizwits-witty-cloud]
 extends = env:esp8266-4m-base
-src_build_flags = -DGIZWITS_WITTY_CLOUD
+build_src_flags = -DGIZWITS_WITTY_CLOUD
 
 [env:euromate-wifi-stecker-shuko]
 extends = env:esp8266-1m-base
-src_build_flags = -DEUROMATE_WIFI_STECKER_SCHUKO
+build_src_flags = -DEUROMATE_WIFI_STECKER_SCHUKO
 
 [env:euromate-wifi-stecker-shuko-v2]
 extends = env:esp8266-2m-base
-src_build_flags = -DEUROMATE_WIFI_STECKER_SCHUKO_V2
+build_src_flags = -DEUROMATE_WIFI_STECKER_SCHUKO_V2
 
 [env:tonbux-powerstrip02]
 extends = env:esp8266-1m-base
-src_build_flags = -DTONBUX_POWERSTRIP02
+build_src_flags = -DTONBUX_POWERSTRIP02
 
 [env:lingan-swa1]
 extends = env:esp8266-1m-base
-src_build_flags = -DLINGAN_SWA1
+build_src_flags = -DLINGAN_SWA1
 
 [env:stm-relay]
 extends = env:esp8266-1m-base
-src_build_flags = -DSTM_RELAY -DDISABLE_POSTMORTEM_STACKDUMP
+build_src_flags = -DSTM_RELAY -DDISABLE_POSTMORTEM_STACKDUMP
 
 [env:heygo-hy02]
 extends = env:esp8266-1m-base
-src_build_flags = -DHEYGO_HY02
+build_src_flags = -DHEYGO_HY02
 
 [env:maxcio-wus002s]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAXCIO_WUS002S
+build_src_flags = -DMAXCIO_WUS002S
 
 [env:maxcio-wde004]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAXCIO_WDE004
+build_src_flags = -DMAXCIO_WDE004
 
 [env:maxcio-wuk007s]
 extends = env:esp8266-1m-base
-src_build_flags = -DMAXCIO_WUK007S
+build_src_flags = -DMAXCIO_WUK007S
 
 [env:yidian-xsssa05]
 extends = env:esp8266-1m-base
-src_build_flags = -DYIDIAN_XSSSA05
+build_src_flags = -DYIDIAN_XSSSA05
 
 [env:oukitel-p1]
 extends = env:esp8266-1m-base
-src_build_flags = -DOUKITEL_P1
+build_src_flags = -DOUKITEL_P1
 
 [env:tonbux-xsssa01]
 extends = env:esp8266-1m-base
-src_build_flags = -DTONBUX_XSSSA01
+build_src_flags = -DTONBUX_XSSSA01
 
 [env:tonbux-xsssa06]
 extends = env:esp8266-1m-base
-src_build_flags = -DTONBUX_XSSSA06
+build_src_flags = -DTONBUX_XSSSA06
 
 [env:green-esp8266relay]
 extends = env:esp8266-4m-base
-src_build_flags = -DGREEN_ESP8266RELAY
+build_src_flags = -DGREEN_ESP8266RELAY
 
 [env:ike-espike]
 extends = env:esp8266-4m-base
-src_build_flags = -DIKE_ESPIKE
+build_src_flags = -DIKE_ESPIKE
 
 [env:arniex-swifitch]
 extends = env:esp8266-4m-base
-src_build_flags = -DARNIEX_SWIFITCH
+build_src_flags = -DARNIEX_SWIFITCH
 
 [env:zhilde-44eu-w]
 extends = env:esp8266-1m-base
-src_build_flags = -DZHILDE_44EU_W
+build_src_flags = -DZHILDE_44EU_W
 
 [env:zhilde-64eu-w]
 extends = env:esp8266-1m-base
-src_build_flags = -DZHILDE_64EU_W
+build_src_flags = -DZHILDE_64EU_W
 
 [env:luani-hvio]
 extends = env:esp8266-1m-base
-src_build_flags = -DLUANI_HVIO
+build_src_flags = -DLUANI_HVIO
 
 [env:avatto-power-plug-wifi]
 extends = env:esp8266-1m-base
-src_build_flags = -DAVATTO_NAS_WR01W
+build_src_flags = -DAVATTO_NAS_WR01W
 
 [env:neo-coolcam-power-plug-wifi]
 extends = env:esp8266-1m-base
-src_build_flags = -DNEO_COOLCAM_NAS_WR01W
+build_src_flags = -DNEO_COOLCAM_NAS_WR01W
 
 [env:deltaco-sh-p01]
 extends = env:esp8266-1m-base
-src_build_flags = -DDELTACO_SH_P01
+build_src_flags = -DDELTACO_SH_P01
 
 [env:deltaco-sh-p03usb]
 extends = env:esp8266-1m-base
-src_build_flags = -DDELTACO_SH_P03USB
+build_src_flags = -DDELTACO_SH_P03USB
 
 [env:deltaco-sh-lexxw]
 extends = env:esp8266-1m-base
-src_build_flags = -DDELTACO_SH_LEXXW
+build_src_flags = -DDELTACO_SH_LEXXW
 
 [env:deltaco-sh-lexxrgb]
 extends = env:esp8266-1m-base
-src_build_flags = -DDELTACO_SH_LEXXRGB
+build_src_flags = -DDELTACO_SH_LEXXRGB
 
 [env:estink-wifi-power-strip]
 extends = env:esp8266-1m-base
-src_build_flags = -DFORNORM_ZLD_34EU
+build_src_flags = -DFORNORM_ZLD_34EU
 
 [env:iwoole-led-table-lamp]
 extends = env:esp8266-1m-base
-src_build_flags = -DIWOOLE_LED_TABLE_LAMP
+build_src_flags = -DIWOOLE_LED_TABLE_LAMP
 
 [env:lombex-lux-nova2-tunable-white]
 extends = env:esp8266-1m-base
-src_build_flags = -DLOMBEX_LUX_NOVA2_TUNABLE_WHITE
+build_src_flags = -DLOMBEX_LUX_NOVA2_TUNABLE_WHITE
 
 [env:lombex-lux-nova2-white-color]
 extends = env:esp8266-1m-base
-src_build_flags = -DLOMBEX_LUX_NOVA2_WHITE_COLOR
+build_src_flags = -DLOMBEX_LUX_NOVA2_WHITE_COLOR
 
 [env:heltec-touch-relay]
 extends = env:esp8266-1m-base
-src_build_flags = -DHELTEC_TOUCHRELAY
+build_src_flags = -DHELTEC_TOUCHRELAY
 
 [env:allnet-4duino-iot-wlan-relais]
 extends = env:esp8266-4m-base
-src_build_flags = -DALLNET_4DUINO_IOT_WLAN_RELAIS
+build_src_flags = -DALLNET_4DUINO_IOT_WLAN_RELAIS
 
 [env:tonbux-mosquito-killer]
 extends = env:esp8266-1m-base
-src_build_flags = -DTONBUX_MOSQUITO_KILLER
+build_src_flags = -DTONBUX_MOSQUITO_KILLER
 
 [env:pilotak-esp-din-v1]
 extends = env:esp8266-1m-base
-src_build_flags = -DPILOTAK_ESP_DIN_V1
+build_src_flags = -DPILOTAK_ESP_DIN_V1
 
 [env:nodemcu-geiger]
 extends = env:esp8266-4m-base
-src_build_flags = -DNODEMCU_BASIC -DGEIGER_SUPPORT=1 -DEVENTS_SUPPORT=0 -DINFLUXDB_SUPPORT=1 -DALEXA_SUPPORT=0 -DALEXA_ENABLED=0
+build_src_flags = -DNODEMCU_BASIC -DGEIGER_SUPPORT=1 -DEVENTS_SUPPORT=0 -DINFLUXDB_SUPPORT=1 -DALEXA_SUPPORT=0 -DALEXA_ENABLED=0
 
 [env:blitzwolf-bwshpx]
 extends = env:esp8266-1m-base
-src_build_flags = -DBLITZWOLF_BWSHPX
+build_src_flags = -DBLITZWOLF_BWSHPX
 
 [env:blitzwolf-bwshpx-v23]
 extends = env:esp8266-1m-base
-src_build_flags = -DBLITZWOLF_BWSHPX_V23
+build_src_flags = -DBLITZWOLF_BWSHPX_V23
 
 [env:blitzwolf-bwshp5]
 extends = env:esp8266-1m-base
-src_build_flags = -DBLITZWOLF_BWSHP5
+build_src_flags = -DBLITZWOLF_BWSHP5
 
 [env:teckin-sp21]
 extends = env:esp8266-1m-base
-src_build_flags = -DTECKIN_SP21
+build_src_flags = -DTECKIN_SP21
 
 [env:teckin-sp22-v14]
 extends = env:esp8266-1m-base
-src_build_flags = -DTECKIN_SP22_V14
+build_src_flags = -DTECKIN_SP22_V14
 
 [env:teckin-sp23-v13]
 extends = env:esp8266-1m-base
-src_build_flags = -DTECKIN_SP23_V13
+build_src_flags = -DTECKIN_SP23_V13
 
 [env:gosund-wp3]
 extends = env:esp8266-1m-base
-src_build_flags = -DGOSUND_WP3
+build_src_flags = -DGOSUND_WP3
 
 [env:gosund-ws1]
 extends = env:esp8266-1m-base
-src_build_flags = -DGOSUND_WS1
+build_src_flags = -DGOSUND_WS1
 
 [env:gosund-sp111]
 extends = env:esp8266-1m-base
-src_build_flags = -DGOSUND_SP111
+build_src_flags = -DGOSUND_SP111
 
 [env:gosund-p1]
 extends = env:esp8266-1m-base
-src_build_flags = -DGOSUND_P1
+build_src_flags = -DGOSUND_P1
 
 [env:digoo-nx-sp202]
 extends = env:esp8266-1m-base
-src_build_flags = -DDIGOO_NX_SP202
+build_src_flags = -DDIGOO_NX_SP202
 
 [env:tflag-nx-smx00]
 extends = env:esp8266-1m-base
-src_build_flags = -DTFLAG_NX_SMX00
+build_src_flags = -DTFLAG_NX_SMX00
 
 [env:homecube-16a]
 extends = env:esp8266-1m-base
-src_build_flags = -DHOMECUBE_16A
+build_src_flags = -DHOMECUBE_16A
 
 [env:bh-onofre]
 extends = env:esp8266-4m-base
-src_build_flags = -DBH_ONOFRE
+build_src_flags = -DBH_ONOFRE
 
 [env:generic-ag-l4]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_AG_L4
+build_src_flags = -DGENERIC_AG_L4
 
 [env:generic-ag-l4-v3]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_AG_L4_V3
+build_src_flags = -DGENERIC_AG_L4_V3
 
 [env:lohas-e27-9w]
 extends = env:esp8266-1m-base
-src_build_flags = -DLOHAS_E27_9W
+build_src_flags = -DLOHAS_E27_9W
 
 [env:lohas-e26-a19]
 extends = env:esp8266-1m-base
-src_build_flags = -DLOHAS_E26_A19
+build_src_flags = -DLOHAS_E26_A19
 
 [env:teckin-sb53]
 extends = env:esp8266-1m-base
-src_build_flags = -DTECKIN_SB53
+build_src_flags = -DTECKIN_SB53
 
 [env:allterco-shelly1]
 extends = env:esp8266-2m-base
-src_build_flags = -DALLTERCO_SHELLY1
+build_src_flags = -DALLTERCO_SHELLY1
 
 [env:allterco-shelly2]
 extends = env:esp8266-2m-base
-src_build_flags = -DALLTERCO_SHELLY2
+build_src_flags = -DALLTERCO_SHELLY2
 
 [env:allterco-shelly1pm]
 extends = env:esp8266-2m-base
-src_build_flags = -DALLTERCO_SHELLY1PM
+build_src_flags = -DALLTERCO_SHELLY1PM
 
 [env:allterco-shelly25]
 extends = env:esp8266-2m-base
-src_build_flags = -DALLTERCO_SHELLY25
+build_src_flags = -DALLTERCO_SHELLY25
 
 [env:xiaomi-smart-desk-lamp]
 extends = env:esp8266-1m-base
-src_build_flags = -DXIAOMI_SMART_DESK_LAMP
+build_src_flags = -DXIAOMI_SMART_DESK_LAMP
 
 [env:phyx-esp12-rgb]
 extends = env:esp8266-1m-base
-src_build_flags = -DPHYX_ESP12_RGB
+build_src_flags = -DPHYX_ESP12_RGB
 
 [env:bestek-mrj1011]
 extends = env:esp8266-1m-base
-src_build_flags = -DBESTEK_MRJ1011
+build_src_flags = -DBESTEK_MRJ1011
 
 [env:gblife-rgbw-socket]
 extends = env:esp8266-1m-base
-src_build_flags = -DGBLIFE_RGBW_SOCKET
+build_src_flags = -DGBLIFE_RGBW_SOCKET
 
 [env:smartlife-mini-smart-socket]
 extends = env:esp8266-1m-base
-src_build_flags = -DSMARTLIFE_MINI_SMART_SOCKET
+build_src_flags = -DSMARTLIFE_MINI_SMART_SOCKET
 
 [env:hama-wifi-steckdose-00176533]
 extends = env:esp8266-1m-base
-src_build_flags = -DHAMA_WIFI_STECKDOSE_00176533
+build_src_flags = -DHAMA_WIFI_STECKDOSE_00176533
 
 [env:teckin-sp20]
 extends = env:esp8266-1m-base
-src_build_flags = -DTECKIN_SP20
+build_src_flags = -DTECKIN_SP20
 
 [env:litesun-la-wf3]
 extends = env:esp8266-1m-base
-src_build_flags = -DLITESUN_LA_WF3
+build_src_flags = -DLITESUN_LA_WF3
 
 [env:generic-gu10]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_GU10
+build_src_flags = -DGENERIC_GU10
 
 [env:generic-e14]
 extends = env:esp8266-1m-base
-src_build_flags = -DGENERIC_E14
+build_src_flags = -DGENERIC_E14
 
 [env:nexete-a19]
 extends = env:esp8266-1m-base
-src_build_flags = -DNEXETE_A19
+build_src_flags = -DNEXETE_A19
 
 [env:psh-wifi-plug]
 extends = env:esp8266-1m-base
-src_build_flags = -DPSH_WIFI_PLUG
+build_src_flags = -DPSH_WIFI_PLUG
 
 [env:psh-rgbw-controller]
 extends = env:esp8266-4m-base
-src_build_flags = -DPSH_RGBW_CONTROLLER
+build_src_flags = -DPSH_RGBW_CONTROLLER
 
 [env:psh-wifi-sensor]
 extends = env:esp8266-4m-base
-src_build_flags = -DPSH_WIFI_SENSOR
+build_src_flags = -DPSH_WIFI_SENSOR
 
 [env:jinvoo-valve-sm-aw713]
 extends = env:esp8266-1m-base
-src_build_flags = -DJINVOO_VALVE_SM_AW713
+build_src_flags = -DJINVOO_VALVE_SM_AW713
 
 [env:etekcity-esw01-usa]
 extends = env:esp8266-1m-base
-src_build_flags = -DETEKCITY_ESW01_USA
+build_src_flags = -DETEKCITY_ESW01_USA
 
 [env:fs-uap1]
 extends = env:esp8266-4m-base
-src_build_flags = -DFS_UAP1
+build_src_flags = -DFS_UAP1
 
 [env:muvit-io-miobulb001]
 extends = env:esp8266-1m-base
-src_build_flags = -DMUVIT_IO_MIOBULB001
+build_src_flags = -DMUVIT_IO_MIOBULB001
 
 [env:hykker-smart-home-power-plug]
 extends = env:esp8266-1m-base
-src_build_flags = -DHYKKER_SMART_HOME_POWER_PLUG
+build_src_flags = -DHYKKER_SMART_HOME_POWER_PLUG
 
 [env:kogan-smarter-home-plug-w-pow]
 extends = env:esp8266-1m-base
-src_build_flags = -DKOGAN_SMARTER_HOME_PLUG_W_POW
+build_src_flags = -DKOGAN_SMARTER_HOME_PLUG_W_POW
 
 [env:lsc-smart-led-light-strip]
 extends = env:esp8266-1m-base
-src_build_flags = -DLSC_SMART_LED_LIGHT_STRIP
+build_src_flags = -DLSC_SMART_LED_LIGHT_STRIP
 
 [env:linksprite-linknode-r4]
 extends = env:esp8266-4m-base
-src_build_flags = -DLINKSPRITE_LINKNODE_R4
+build_src_flags = -DLINKSPRITE_LINKNODE_R4
 
 [env:ehomediy-wt02]
 extends = env:esp8266-1m-base
-src_build_flags = -DEHOMEDIY_WT02
+build_src_flags = -DEHOMEDIY_WT02
 
 [env:ehomediy-wt03]
 extends = env:esp8266-1m-base
-src_build_flags = -DEHOMEDIY_WT03
+build_src_flags = -DEHOMEDIY_WT03
 
 [env:kingart-curtain-switch]
 extends = env:esp8266-1m-base
-src_build_flags = -DKINGART_CURTAIN_SWITCH
+build_src_flags = -DKINGART_CURTAIN_SWITCH
 
 [env:aoycocr-x5p]
 extends = env:esp8266-1m-base
-src_build_flags = -DAOYCOCR_X5P
+build_src_flags = -DAOYCOCR_X5P
 
 [env:hugoai-awp02l-n]
 extends = env:esp8266-1m-base
-src_build_flags = -DHUGOAI_AWP02L_N
+build_src_flags = -DHUGOAI_AWP02L_N
 
 [env:nedis-wifip310fwt]
 extends = env:esp8266-1m-base
-src_build_flags = -DNEDIS_WIFIP310FWT
+build_src_flags = -DNEDIS_WIFIP310FWT
 
 [env:nedis-wifip310fwt-sensor]
 extends = env:esp8266-1m-base
-src_build_flags = -DNEDIS_WIFIP310FWT -DANALOG_SUPPORT=1
+build_src_flags = -DNEDIS_WIFIP310FWT -DANALOG_SUPPORT=1
 
 [env:arlec-pc190ha]
 extends = env:esp8266-1m-base
-src_build_flags = -DARLEC_PC190HA
+build_src_flags = -DARLEC_PC190HA
 
 [env:arlec-pb89ha]
 extends = env:esp8266-1m-base
-src_build_flags = -DARLEC_PB89HA
+build_src_flags = -DARLEC_PB89HA
 
 [env:prodino-wifi]
 extends = env:esp8266-2m-base
-src_build_flags = -DPRODINO_WIFI -DNOWSAUTH
+build_src_flags = -DPRODINO_WIFI -DNOWSAUTH
 
 [env:fcmila-e27-7w-rgbw]
 extends = env:esp8266-1m-base
-src_build_flags = -DFCMILA_E27_7W_RGBW
+build_src_flags = -DFCMILA_E27_7W_RGBW
 
 [env:benexmart-gu53-rgbww]
 extends = env:esp8266-1m-base
-src_build_flags = -DBENEXMART_GU53_RGBWW
+build_src_flags = -DBENEXMART_GU53_RGBWW
 
 [env:lsc-e27-10w-white]
 extends = env:esp8266-1m-base
-src_build_flags = -DLSC_E27_10W_WHITE
+build_src_flags = -DLSC_E27_10W_WHITE
 
 [env:garland-wemos]
 extends = env:esp8266-4m-base
 board = d1_mini
-src_build_flags = -DWEMOS_D1_MINI -DGARLAND_SUPPORT=1
+build_src_flags = -DWEMOS_D1_MINI -DGARLAND_SUPPORT=1
 
 [env:yagusmart-touch-hwmod-1g]
 extends = env:esp8266-1m-base
-src_build_flags = -DYAGUSMART_TOUCH_HWMOD_1G
+build_src_flags = -DYAGUSMART_TOUCH_HWMOD_1G
 
 [env:yagusmart-touch-hwmod-2g]
 extends = env:esp8266-1m-base
-src_build_flags = -DYAGUSMART_TOUCH_HWMOD_2G
+build_src_flags = -DYAGUSMART_TOUCH_HWMOD_2G
 
 [env:yagusmart-touch-hwmod-3g]
 extends = env:esp8266-1m-base
-src_build_flags = -DYAGUSMART_TOUCH_HWMOD_3G
+build_src_flags = -DYAGUSMART_TOUCH_HWMOD_3G
diff --git a/code/platformio_override.ini.example b/code/platformio_override.ini.example
index 02e6b220..599f0579 100644
--- a/code/platformio_override.ini.example
+++ b/code/platformio_override.ini.example
@@ -15,7 +15,7 @@
 
 [env:my-sonoff-build-dht]
 extends = env:esp8266-1m-base
-src_build_flags = -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1 -DDHT_PIN=2
+build_src_flags = -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1 -DDHT_PIN=2
 
 
 # Example for an environment based on a 1M byte esp8266 board. E.G. Sonoff Basic R2 or R3.
@@ -27,11 +27,11 @@ src_build_flags = -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1 -DDHT_PIN=2
 
 [env:my-sonoff-build01]
 extends = env:esp8266-1m-latest-base
-src_build_flags = -DMY_SONOFF_BUILD01 -DUSE_CUSTOM_H
+build_src_flags = -DMY_SONOFF_BUILD01 -DUSE_CUSTOM_H
 
 
 # Example for an environment the same as 'my-sonoff-build01' but with a different 'custom.h' configuration.
 
 [env:my-sonoff-build02]
 extends = env:esp8266-1m-latest-base
-src_build_flags = -DMY_SONOFF_BUILD02 -DUSE_CUSTOM_H
+build_src_flags = -DMY_SONOFF_BUILD02 -DUSE_CUSTOM_H
diff --git a/code/scripts/generate_release_sh.py b/code/scripts/generate_release_sh.py
index 89f653f7..79d4bdbd 100755
--- a/code/scripts/generate_release_sh.py
+++ b/code/scripts/generate_release_sh.py
@@ -21,7 +21,7 @@ import shlex
 import configparser
 import collections
 
-Build = collections.namedtuple("Build", "env extends build_flags src_build_flags")
+Build = collections.namedtuple("Build", "env extends build_flags build_src_flags")
 
 
 def expand_variables(cfg, value):
@@ -47,7 +47,7 @@ def get_builds(cfg):
             continue
 
         build_flags = None
-        src_build_flags = None
+        build_src_flags = None
 
         try:
             build_flags = cfg.get(section, "build_flags")
@@ -59,9 +59,9 @@ def get_builds(cfg):
             pass
 
         try:
-            src_build_flags = cfg.get(section, "src_build_flags")
-            src_build_flags = RE_NEWLINE.sub(" ", src_build_flags).strip()
-            src_build_flags = expand_variables(cfg, src_build_flags)
+            build_src_flags = cfg.get(section, "build_src_flags")
+            build_src_flags = RE_NEWLINE.sub(" ", build_src_flags).strip()
+            build_src_flags = expand_variables(cfg, build_src_flags)
         except configparser.NoOptionError:
             pass
 
@@ -69,7 +69,7 @@ def get_builds(cfg):
             section.replace("env:", ""),
             cfg.get(section, "extends").replace("env:", ""),
             build_flags,
-            src_build_flags,
+            build_src_flags,
         )
 
 
@@ -92,8 +92,8 @@ def generate_lines(builds, ignore):
         flags = []
         if build.build_flags:
             flags.append('PLATFORMIO_BUILD_FLAGS="{}"'.format(build.build_flags))
-        if build.src_build_flags:
-            flags.append('ESPURNA_FLAGS="{}"'.format(build.src_build_flags))
+        if build.build_src_flags:
+            flags.append('ESPURNA_FLAGS="{}"'.format(build.build_src_flags))
         flags.append('ESPURNA_BUILD_NAME="{env}"'.format(env=build.env))
 
         cmd = ["env"]
@@ -104,7 +104,7 @@ def generate_lines(builds, ignore):
 
         # push core variants to the front as they definetly include global build_flags
         output = generic
-        if "ESPURNA_CORE" in build.src_build_flags:
+        if "ESPURNA_CORE" in build.build_src_flags:
             output = cores
 
         output.append(line)
diff --git a/code/scripts/memanalyzer.py b/code/scripts/memanalyzer.py
index 71a12623..387569fd 100644
--- a/code/scripts/memanalyzer.py
+++ b/code/scripts/memanalyzer.py
@@ -99,7 +99,7 @@ def run(prefix, env, modules, debug):
     flags = " ".join("-D{}_SUPPORT={:d}".format(k, v) for k, v in modules.items())
 
     os_env = os.environ.copy()
-    os_env["PLATFORMIO_SRC_BUILD_FLAGS"] = flags
+    os_env["PLATFORMIO_BUILD_SRC_FLAGS"] = flags
     os_env["PLATFORMIO_BUILD_CACHE_DIR"] = "test/pio_cache"
 
     command = [os.path.join(prefix, "platformio"), "run"]
diff --git a/code/scripts/pio_main.py b/code/scripts/pio_main.py
index 2fc569ea..22f7ac04 100644
--- a/code/scripts/pio_main.py
+++ b/code/scripts/pio_main.py
@@ -54,7 +54,7 @@ if "DISABLE_POSTMORTEM_STACKDUMP" in env["CPPFLAGS"]:
 app_inject_version(projenv)
 
 # handle ESPURNA_BOARD and ESPURNA_FLAGS here, since projenv is not available in pre-scripts
-# TODO: prefer PLATFORMIO_SRC_BUILD_FLAGS instead? both of these only allow -D...
+# TODO: prefer PLATFORMIO_BUILD_SRC_FLAGS instead? both of these only allow -D...
 app_inject_flags(projenv)
 
 # handle when CI does a tagged build or user explicitly asked to store the firmware.bin
diff --git a/code/scripts/test_build.py b/code/scripts/test_build.py
index 0b59067b..c48b46ab 100755
--- a/code/scripts/test_build.py
+++ b/code/scripts/test_build.py
@@ -55,7 +55,7 @@ def build_configurations(args, configurations):
         if not args.no_single_source:
             os_env["ESPURNA_BUILD_SINGLE_SOURCE"] = "1"
 
-        os_env["PLATFORMIO_SRC_BUILD_FLAGS"] = " ".join(
+        os_env["PLATFORMIO_BUILD_SRC_FLAGS"] = " ".join(
             [
                 '-DMANUFACTURER=\\"TEST_BUILD\\"',
                 '-DDEVICE=\\"{}\\"'.format(cfg.stem.replace(" ", "_").upper()),