diff --git a/boards/adafruit_feather.json b/boards/adafruit_feather.json
index dec96a6..46c114d 100644
--- a/boards/adafruit_feather.json
+++ b/boards/adafruit_feather.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_feather",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_feather",
         "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x80f1",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "Feather RP2040"
+        "usb_pid": "0x80f1"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
\ No newline at end of file
+}
diff --git a/boards/adafruit_itsybitsy.json b/boards/adafruit_itsybitsy.json
index 14622dd..3119dac 100644
--- a/boards/adafruit_itsybitsy.json
+++ b/boards/adafruit_itsybitsy.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_itsybitsy",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_itsybitsy",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x80fd",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "ItsyBitsy RP2040"
+        "usb_pid": "0x80fd"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
\ No newline at end of file
+}
diff --git a/boards/adafruit_kb2040.json b/boards/adafruit_kb2040.json
index 4be755f..d77f37a 100644
--- a/boards/adafruit_kb2040.json
+++ b/boards/adafruit_kb2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_kb2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_kb2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x8105",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "KB2040"
+        "usb_pid": "0x8105"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
\ No newline at end of file
+}
diff --git a/boards/adafruit_macropad2040.json b/boards/adafruit_macropad2040.json
index c066254..34c7a12 100644
--- a/boards/adafruit_macropad2040.json
+++ b/boards/adafruit_macropad2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_macropad2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_macropad2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x8107",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "MacroPad RP2040"
+        "usb_pid": "0x8107"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
\ No newline at end of file
+}
diff --git a/boards/adafruit_qtpy.json b/boards/adafruit_qtpy.json
index 21f09fa..f372308 100644
--- a/boards/adafruit_qtpy.json
+++ b/boards/adafruit_qtpy.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_qtpy",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_qtpy",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x80f7",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "QT Py RP2040"
+        "usb_pid": "0x80f7"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
\ No newline at end of file
+}
diff --git a/boards/adafruit_stemmafriend.json b/boards/adafruit_stemmafriend.json
index 89a8f0c..d9c1667 100644
--- a/boards/adafruit_stemmafriend.json
+++ b/boards/adafruit_stemmafriend.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_stemmafriend",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_stemmafriend",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x80e3",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "STEMMA Friend RP2040"
+        "usb_pid": "0x80e3"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
\ No newline at end of file
+}
diff --git a/boards/adafruit_trinkeyrp2040qt.json b/boards/adafruit_trinkeyrp2040qt.json
index 6c873c9..3472ccc 100644
--- a/boards/adafruit_trinkeyrp2040qt.json
+++ b/boards/adafruit_trinkeyrp2040qt.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_trinkeyrp2040qt",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_trinkeyrp2040qt",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x8109",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "Trinkey RP2040 QT"
+        "usb_pid": "0x8109"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
\ No newline at end of file
+}
diff --git a/boards/arduino_nano_connect.json b/boards/arduino_nano_connect.json
index a294f93..a8235e0 100644
--- a/boards/arduino_nano_connect.json
+++ b/boards/arduino_nano_connect.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "arduino_nano_connect",
     "arduino": {
       "earlephilhower": {
-        "variant": "arduino_nano_connect",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2341",
-        "usb_pid": "0x0058",
-        "usb_manufacturer": "Arduino",
-        "usb_product": "Nano RP2040 Connect"
+        "usb_pid": "0x0058"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Arduino"
-}
\ No newline at end of file
+}
diff --git a/boards/challenger_2040_lora.json b/boards/challenger_2040_lora.json
index e47abf4..7e75c39 100644
--- a/boards/challenger_2040_lora.json
+++ b/boards/challenger_2040_lora.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "challenger_2040_lora",
     "arduino": {
       "earlephilhower": {
-        "variant": "challenger_2040_lora",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1023",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 LoRa"
+        "usb_pid": "0x1023"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
\ No newline at end of file
+}
diff --git a/boards/challenger_2040_lte.json b/boards/challenger_2040_lte.json
index 7b5991b..5e59e2d 100644
--- a/boards/challenger_2040_lte.json
+++ b/boards/challenger_2040_lte.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "challenger_2040_lte",
     "arduino": {
       "earlephilhower": {
-        "variant": "challenger_2040_lte",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x100b",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 LTE"
+        "usb_pid": "0x100b"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
\ No newline at end of file
+}
diff --git a/boards/challenger_2040_wifi.json b/boards/challenger_2040_wifi.json
index 5111111..e286c81 100644
--- a/boards/challenger_2040_wifi.json
+++ b/boards/challenger_2040_wifi.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "challenger_2040_wifi",
     "arduino": {
       "earlephilhower": {
-        "variant": "challenger_2040_wifi",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1006",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 WiFi"
+        "usb_pid": "0x1006"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
\ No newline at end of file
+}
diff --git a/boards/challenger_2040_wifi_ble.json b/boards/challenger_2040_wifi_ble.json
index b7f1783..78cfefa 100644
--- a/boards/challenger_2040_wifi_ble.json
+++ b/boards/challenger_2040_wifi_ble.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "challenger_2040_wifi_ble",
     "arduino": {
       "earlephilhower": {
-        "variant": "challenger_2040_wifi_ble",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x102C",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 WiFi/BLE"
+        "usb_pid": "0x102C"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
\ No newline at end of file
+}
diff --git a/boards/challenger_nb_2040_wifi.json b/boards/challenger_nb_2040_wifi.json
index b1ee114..8adff86 100644
--- a/boards/challenger_nb_2040_wifi.json
+++ b/boards/challenger_nb_2040_wifi.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "challenger_nb_2040_wifi",
     "arduino": {
       "earlephilhower": {
-        "variant": "challenger_nb_2040_wifi",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x100b",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger NB 2040 WiFi"
+        "usb_pid": "0x100b"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
\ No newline at end of file
+}
diff --git a/boards/cytron_maker_nano_rp2040.json b/boards/cytron_maker_nano_rp2040.json
index cb7314c..2b78995 100644
--- a/boards/cytron_maker_nano_rp2040.json
+++ b/boards/cytron_maker_nano_rp2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "cytron_maker_nano_rp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "cytron_maker_nano_rp2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x100f",
-        "usb_manufacturer": "Cytron",
-        "usb_product": "Maker Nano RP2040"
+        "usb_pid": "0x100f"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Cytron"
-}
\ No newline at end of file
+}
diff --git a/boards/cytron_maker_pi_rp2040.json b/boards/cytron_maker_pi_rp2040.json
index d5ed15c..a3985ac 100644
--- a/boards/cytron_maker_pi_rp2040.json
+++ b/boards/cytron_maker_pi_rp2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "cytron_maker_pi_rp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "cytron_maker_pi_rp2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1000",
-        "usb_manufacturer": "Cytron",
-        "usb_product": "Maker Pi RP2040"
+        "usb_pid": "0x1000"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Cytron"
-}
\ No newline at end of file
+}
diff --git a/boards/dfrobot_beetle_rp2040.json b/boards/dfrobot_beetle_rp2040.json
index 95df8f8..f0c1f55 100644
--- a/boards/dfrobot_beetle_rp2040.json
+++ b/boards/dfrobot_beetle_rp2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "dfrobot_beetle_rp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "dfrobot_beetle_rp2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x3343",
-        "usb_pid": "0x4253",
-        "usb_manufacturer": "DFRobot",
-        "usb_product": "Beetle RP2040"
+        "usb_pid": "0x4253"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "DFRobot"
-}
\ No newline at end of file
+}
diff --git a/boards/flyboard2040_core.json b/boards/flyboard2040_core.json
index b60e0ba..b7f0b83 100644
--- a/boards/flyboard2040_core.json
+++ b/boards/flyboard2040_core.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "flyboard2040_core",
     "arduino": {
       "earlephilhower": {
-        "variant": "flyboard2040_core",
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x008a",
-        "usb_manufacturer": "DeRuiLab",
-        "usb_product": "FlyBoard2040Core"
+        "usb_pid": "0x008a"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "DeRuiLab"
-}
\ No newline at end of file
+}
diff --git a/boards/generic.json b/boards/generic.json
index fa89b11..4785e67 100644
--- a/boards/generic.json
+++ b/boards/generic.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "generic",
     "arduino": {
       "earlephilhower": {
-        "variant": "generic",
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0xf00a",
-        "usb_manufacturer": "Generic",
-        "usb_product": "RP2040"
+        "usb_pid": "0xf00a"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Generic"
-}
\ No newline at end of file
+}
diff --git a/boards/ilabs_rpico32.json b/boards/ilabs_rpico32.json
index 058e458..ee1dedf 100644
--- a/boards/ilabs_rpico32.json
+++ b/boards/ilabs_rpico32.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "ilabs_rpico32",
     "arduino": {
       "earlephilhower": {
-        "variant": "ilabs_rpico32",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1010",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "RPICO32"
+        "usb_pid": "0x1010"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
\ No newline at end of file
+}
diff --git a/boards/melopero_shake_rp2040.json b/boards/melopero_shake_rp2040.json
index 9813457..761f215 100644
--- a/boards/melopero_shake_rp2040.json
+++ b/boards/melopero_shake_rp2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "melopero_shake_rp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "melopero_shake_rp2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1005",
-        "usb_manufacturer": "Melopero",
-        "usb_product": "Shake RP2040"
+        "usb_pid": "0x1005"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Melopero"
-}
\ No newline at end of file
+}
diff --git a/boards/rpipico.json b/boards/rpipico.json
index 4d688ab..b5020bc 100644
--- a/boards/rpipico.json
+++ b/boards/rpipico.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "rpipico",
     "arduino": {
       "earlephilhower": {
-        "variant": "rpipico",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x000a",
-        "usb_manufacturer": "Raspberry Pi",
-        "usb_product": "Pico"
+        "usb_pid": "0x000a"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Raspberry Pi"
-}
\ No newline at end of file
+}
diff --git a/boards/seeed_xiao_rp2040.json b/boards/seeed_xiao_rp2040.json
index d70f696..8609f62 100644
--- a/boards/seeed_xiao_rp2040.json
+++ b/boards/seeed_xiao_rp2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "seeed_xiao_rp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "seeed_xiao_rp2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x000a",
-        "usb_manufacturer": "Seeed",
-        "usb_product": "XAIO RP2040"
+        "usb_pid": "0x000a"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Seeed"
-}
\ No newline at end of file
+}
diff --git a/boards/solderparty_rp2040_stamp.json b/boards/solderparty_rp2040_stamp.json
index 6f3ac69..57280be 100644
--- a/boards/solderparty_rp2040_stamp.json
+++ b/boards/solderparty_rp2040_stamp.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "solderparty_rp2040_stamp",
     "arduino": {
       "earlephilhower": {
-        "variant": "solderparty_rp2040_stamp",
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x1209",
-        "usb_pid": "0xa182",
-        "usb_manufacturer": "Solder Party",
-        "usb_product": "RP2040 Stamp"
+        "usb_pid": "0xa182"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Solder Party"
-}
\ No newline at end of file
+}
diff --git a/boards/sparkfun_promicrorp2040.json b/boards/sparkfun_promicrorp2040.json
index 630630e..efd2fee 100644
--- a/boards/sparkfun_promicrorp2040.json
+++ b/boards/sparkfun_promicrorp2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "sparkfun_promicrorp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "sparkfun_promicrorp2040",
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x1b4f",
-        "usb_pid": "0x0026",
-        "usb_manufacturer": "SparkFun",
-        "usb_product": "ProMicro RP2040"
+        "usb_pid": "0x0026"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "SparkFun"
-}
\ No newline at end of file
+}
diff --git a/boards/sparkfun_thingplusrp2040.json b/boards/sparkfun_thingplusrp2040.json
index 982b55a..9c4a14c 100644
--- a/boards/sparkfun_thingplusrp2040.json
+++ b/boards/sparkfun_thingplusrp2040.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "sparkfun_thingplusrp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "sparkfun_thingplusrp2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x1b4f",
-        "usb_pid": "0x0026",
-        "usb_manufacturer": "SparkFun",
-        "usb_product": "Thing Plus RP2040"
+        "usb_pid": "0x0026"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "SparkFun"
-}
\ No newline at end of file
+}
diff --git a/boards/upesy_rp2040_devkit.json b/boards/upesy_rp2040_devkit.json
index 3452f7e..dcf85d4 100644
--- a/boards/upesy_rp2040_devkit.json
+++ b/boards/upesy_rp2040_devkit.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "upesy_rp2040_devkit",
     "arduino": {
       "earlephilhower": {
-        "variant": "upesy_rp2040_devkit",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1007",
-        "usb_manufacturer": "uPesy",
-        "usb_product": "RP2040 DevKit"
+        "usb_pid": "0x1007"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "uPesy"
-}
\ No newline at end of file
+}
diff --git a/boards/wiznet_5100s_evb_pico.json b/boards/wiznet_5100s_evb_pico.json
index 2e66dba..1f82358 100644
--- a/boards/wiznet_5100s_evb_pico.json
+++ b/boards/wiznet_5100s_evb_pico.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "wiznet_5100s_evb_pico",
     "arduino": {
       "earlephilhower": {
-        "variant": "wiznet_5100s_evb_pico",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1027",
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "W5100S-EVB-Pico"
+        "usb_pid": "0x1027"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "WIZnet"
-}
\ No newline at end of file
+}
diff --git a/boards/wiznet_5500_evb_pico.json b/boards/wiznet_5500_evb_pico.json
index 27bfe0d..a39122f 100644
--- a/boards/wiznet_5500_evb_pico.json
+++ b/boards/wiznet_5500_evb_pico.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "wiznet_5500_evb_pico",
     "arduino": {
       "earlephilhower": {
-        "variant": "wiznet_5500_evb_pico",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1029",
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "W5500-EVB-Pico"
+        "usb_pid": "0x1029"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "WIZnet"
-}
\ No newline at end of file
+}
diff --git a/boards/wiznet_wizfi360_evb_pico.json b/boards/wiznet_wizfi360_evb_pico.json
index e696ca2..43f00bc 100644
--- a/boards/wiznet_wizfi360_evb_pico.json
+++ b/boards/wiznet_wizfi360_evb_pico.json
@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "wiznet_wizfi360_evb_pico",
     "arduino": {
       "earlephilhower": {
-        "variant": "wiznet_wizfi360_evb_pico",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1028",
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "WizFi360-EVB-Pico"
+        "usb_pid": "0x1028"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "WIZnet"
-}
\ No newline at end of file
+}