diff --git a/boards/feather-esp32s3-reverse-tft/definition.json b/boards/feather-esp32s3-reverse-tft/definition.json
index 898aa9dc..accc0436 100644
--- a/boards/feather-esp32s3-reverse-tft/definition.json
+++ b/boards/feather-esp32s3-reverse-tft/definition.json
@@ -1,5 +1,6 @@
 {
     "boardName":"feather-esp32s3-reverse-tft",
+    "bootDiskName":"FTHRS3BOOT",
     "mcuName":"esp32s3",
     "mcuRefVoltage":2.6,
     "displayName":"ESP32-S3 Reverse TFT Feather",
diff --git a/boards/rpi-pico-2w/definition.json b/boards/rpi-pico-2w/definition.json
index f7a5e549..d6e57598 100644
--- a/boards/rpi-pico-2w/definition.json
+++ b/boards/rpi-pico-2w/definition.json
@@ -1,5 +1,6 @@
 {
     "boardName":"rpi-pico-2w",
+    "bootDiskName":"RP2350",
     "mcuName":"rp2350",
     "mcuRefVoltage":3.3,
     "displayName":"Raspberry Pi Pico 2W",
@@ -224,7 +225,7 @@
                 "hasServo":true
             },
             {
-                "name":"D32",
+                "name":"D64",
                 "displayName":"LED (BUILT-IN)",
                 "dataType":"bool"
             }
diff --git a/boards/rpi-pico-2w/magic.json b/boards/rpi-pico-2w/magic.json
index ae53ba9b..acdb56b1 100644
--- a/boards/rpi-pico-2w/magic.json
+++ b/boards/rpi-pico-2w/magic.json
@@ -9,7 +9,7 @@
   "components": [
     {
       "name": "LED",
-      "pinName": "D32",
+      "pinName": "D64",
       "type": "led",
       "mode": "DIGITAL",
       "direction": "OUTPUT",
diff --git a/boards/rpi-pico-w/definition.json b/boards/rpi-pico-w/definition.json
index f97e9a0a..91648924 100644
--- a/boards/rpi-pico-w/definition.json
+++ b/boards/rpi-pico-w/definition.json
@@ -1,5 +1,6 @@
 {
     "boardName":"rpi-pico-w",
+    "bootDiskName":"RP2",
     "mcuName":"rp2040",
     "mcuRefVoltage":3.3,
     "displayName":"Raspberry Pi Pico W",
@@ -223,7 +224,7 @@
                 "hasServo":true
             },
             {
-                "name":"D32",
+                "name":"D64",
                 "displayName":"LED (BUILT-IN)",
                 "dataType":"bool"
             }
diff --git a/boards/rpi-pico-w/magic.json b/boards/rpi-pico-w/magic.json
index 084b04e3..2008d77f 100644
--- a/boards/rpi-pico-w/magic.json
+++ b/boards/rpi-pico-w/magic.json
@@ -9,7 +9,7 @@
   "components": [
     {
       "name": "LED",
-      "pinName": "D32",
+      "pinName": "D64",
       "type": "led",
       "mode": "DIGITAL",
       "direction": "OUTPUT",
diff --git a/boards/schema.json b/boards/schema.json
index 44dc500e..b56716f1 100644
--- a/boards/schema.json
+++ b/boards/schema.json
@@ -11,6 +11,12 @@
       "minLength": 3,
       "maxLength": 40
     },
+    "bootDiskName": {
+      "description": "The name of the disk that the board will appear as when connected in bootloader mode to a computer. e.g. RP2",
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 40
+    },
     "mcuName": {
       "description": "Microcontroller name.",
       "type": "string",