diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json
index 66310f921..4691051e4 100644
--- a/boards/esp32-cam.json
+++ b/boards/esp32-cam.json
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "AI Thinker ESP32-CAM, 4M Flash 4MB PSRAM, Tasmota 1856k Code/OTA, 320k SPIFFS",
+  "name": "AI Thinker ESP32-CAM, 4M Flash 4MB PSRAM, Tasmota 1856k Code/OTA, 320k FS",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp32-m5core2.json b/boards/esp32-m5core2.json
index 266f6d7f3..137f023a9 100644
--- a/boards/esp32-m5core2.json
+++ b/boards/esp32-m5core2.json
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "M5Stack Core2 16M Flash, 4MB PSRAM, Tasmota 2944k Code/OTA, 10M SPIFFS",
+  "name": "M5Stack Core2 16M Flash, 4MB PSRAM, Tasmota 2944k Code/OTA, 10M FS",
   "upload": {
     "flash_size": "16MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp32-odroid.json b/boards/esp32-odroid.json
index 6354b6436..119af3d9e 100644
--- a/boards/esp32-odroid.json
+++ b/boards/esp32-odroid.json
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "ESP32 ODROID-GO 16M Flash, 4MB PSRAM, Tasmota 2944k Code/OTA, 10M SPIFFS",
+  "name": "ESP32 ODROID-GO 16M Flash, 4MB PSRAM, Tasmota 2944k Code/OTA, 10M FS",
   "upload": {
     "flash_size": "16MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp32_16M.json b/boards/esp32_16M.json
index 4e6dab9af..9667b46ff 100644
--- a/boards/esp32_16M.json
+++ b/boards/esp32_16M.json
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif Generic ESP32 16M Flash, Tasmota 2944k Code/OTA, 10M SPIFFS",
+  "name": "Espressif Generic ESP32 16M Flash, Tasmota 2944k Code/OTA, 10M FS",
   "upload": {
     "flash_size": "16MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json
index 1e1df8162..ee7effe39 100644
--- a/boards/esp32_4M.json
+++ b/boards/esp32_4M.json
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif Generic ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k SPIFFS",
+  "name": "Espressif Generic ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp32_8M.json b/boards/esp32_8M.json
index 5177a06ab..b5dcfd676 100644
--- a/boards/esp32_8M.json
+++ b/boards/esp32_8M.json
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif Generic ESP32 8M Flash, Tasmota 2944k Code/OTA, 2112k SPIFFS",
+  "name": "Espressif Generic ESP32 8M Flash, Tasmota 2944k Code/OTA, 2112k FS",
   "upload": {
     "flash_size": "8MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp32_solo1_4M.json b/boards/esp32_solo1_4M.json
index 270ff2bf2..e5b86ade8 100644
--- a/boards/esp32_solo1_4M.json
+++ b/boards/esp32_solo1_4M.json
@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif Generic ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k SPIFFS",
+  "name": "Espressif Generic ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp32c3.json b/boards/esp32c3.json
index d7cb2da8f..762172fc3 100644
--- a/boards/esp32c3.json
+++ b/boards/esp32c3.json
@@ -22,7 +22,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Espressif Generic ESP32-C3 4M Flash, Tasmota 1856k Code/OTA, 320k SPIFFS",
+  "name": "Espressif Generic ESP32-C3 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp32s2.json b/boards/esp32s2.json
index 0be6047cf..e0736aa29 100644
--- a/boards/esp32s2.json
+++ b/boards/esp32s2.json
@@ -22,7 +22,7 @@
     "espidf",
     "arduino"
   ],
-  "name": "Espressif Generic ESP32-S2 4M Flash, Tasmota 1856k Code/OTA, 320k SPIFFS",
+  "name": "Espressif Generic ESP32-S2 4M Flash, Tasmota 1856k Code/OTA, 320k FS",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
diff --git a/boards/esp8266_1M.json b/boards/esp8266_1M.json
index bc5b1f49b..7cd01ec90 100644
--- a/boards/esp8266_1M.json
+++ b/boards/esp8266_1M.json
@@ -19,7 +19,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "Espressif Generic ESP8266 Tasmota 1M sketch NO SPIFFS",
+  "name": "Espressif Generic ESP8266 Tasmota 1M sketch NO FS",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 995326,
diff --git a/boards/esp8266_2M1M.json b/boards/esp8266_2M1M.json
index e3a675373..afe54a343 100644
--- a/boards/esp8266_2M1M.json
+++ b/boards/esp8266_2M1M.json
@@ -19,7 +19,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "Espressif Generic ESP8266 Tasmota 1M sketch 1M SPIFFS",
+  "name": "Espressif Generic ESP8266 Tasmota 1M sketch 1M FS",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 995326,
diff --git a/boards/esp8266_2M256.json b/boards/esp8266_2M256.json
index 734f62537..335b84ade 100644
--- a/boards/esp8266_2M256.json
+++ b/boards/esp8266_2M256.json
@@ -19,7 +19,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "Espressif Generic ESP8266 Tasmota 1M sketch 772k OTA 256k SPIFFS",
+  "name": "Espressif Generic ESP8266 Tasmota 1M sketch 772k OTA 256k FS",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 995326,
diff --git a/boards/esp8266_4M2M.json b/boards/esp8266_4M2M.json
index 873c84f24..7b0e0c364 100644
--- a/boards/esp8266_4M2M.json
+++ b/boards/esp8266_4M2M.json
@@ -19,7 +19,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "Espressif Generic ESP8266 Tasmota 1M sketch 1M OTA 2M SPIFFS",
+  "name": "Espressif Generic ESP8266 Tasmota 1M sketch 1M OTA 2M FS",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 995326,
diff --git a/boards/esp8266_4M3M.json b/boards/esp8266_4M3M.json
index c845d6e96..fec296cf0 100644
--- a/boards/esp8266_4M3M.json
+++ b/boards/esp8266_4M3M.json
@@ -19,7 +19,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "Espressif Generic ESP8266 Tasmota 1M sketch 3M SPIFFS",
+  "name": "Espressif Generic ESP8266 Tasmota 1M sketch 3M FS",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 995326,
diff --git a/boards/esp8266_zbbridge.json b/boards/esp8266_zbbridge.json
index 73cff2dbe..dbc229004 100644
--- a/boards/esp8266_zbbridge.json
+++ b/boards/esp8266_zbbridge.json
@@ -19,7 +19,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "Sonoff ZbBridge Tasmota 1M sketch 772k OTA 256k SPIFFS",
+  "name": "Sonoff ZbBridge Tasmota 1M sketch 772k OTA 256k FS",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 995326,