diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack/hwdef.dat
index a5bee5f806..883ef69169 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack/hwdef.dat
@@ -6,7 +6,7 @@ include ../fmuv3/hwdef.dat
 
 # USB setup
 USB_VENDOR 0x2DAE # ONLY FOR USE BY HEX! NOBODY ELSE
-USB_PRODUCT 0x1001
+USB_PRODUCT 0x1011
 USB_STRING_MANUFACTURER "Hex/ProfiCNC"
 USB_STRING_PRODUCT "CubeBlack"
 USB_STRING_SERIAL  "%SERIAL%"
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat
similarity index 94%
rename from libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat
rename to libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat
index 1053b5bc3a..893d4243e0 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat
@@ -1,4 +1,4 @@
-# hwdef for bootloader for cube-orange
+# hwdef for bootloader for CubeYellow
 
 # MCU class and specific type
 MCU STM32F7xx STM32F777xx
@@ -27,7 +27,7 @@ FLASH_SIZE_KB 2048
 USB_VENDOR 0x2DAE # ONLY FOR USE BY ProfiCNC / HEX! NOBODY ELSE
 USB_PRODUCT 0x1002
 USB_STRING_MANUFACTURER "Hex/ProfiCNC"
-USB_STRING_PRODUCT "CubeBlack-BL"
+USB_STRING_PRODUCT "CubeYellow-BL"
 USB_STRING_SERIAL  "%SERIAL%"
 
 # order of UARTs (and USB)
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat
similarity index 99%
rename from libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat
rename to libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat
index 4387f0dcdd..19d99d81f6 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat
@@ -1,4 +1,5 @@
-# The CUBE orange is a varient of The CUBE Black from ProfiCNC/Hex with a STM32F777 MCU
+# The CUBE Yellow is a varient of The CUBE Black from ProfiCNC/Hex
+# with a STM32F777 MCU
 
 # MCU class and specific type
 MCU STM32F7xx STM32F777xx
@@ -77,9 +78,9 @@ FLASH_SIZE_KB 2048
 
 # USB setup
 USB_VENDOR 0x2DAE # ONLY FOR USE BY ProfiCNC / HEX! NOBODY ELSE
-USB_PRODUCT 0x1002
+USB_PRODUCT 0x1012
 USB_STRING_MANUFACTURER "Hex/ProfiCNC"
-USB_STRING_PRODUCT "CubeBlack"
+USB_STRING_PRODUCT "CubeYellow"
 USB_STRING_SERIAL  "%SERIAL%"
 
 # now define the order that I2C buses are presented in the hal.i2c API