diff --git a/src/machine/board_circuitplay_express.go b/src/machine/board_circuitplay_express.go
index 3da61d87..fe315294 100644
--- a/src/machine/board_circuitplay_express.go
+++ b/src/machine/board_circuitplay_express.go
@@ -91,7 +91,7 @@ const (
 
 // USB CDC identifiers
 const (
-	usb_STRING_PRODUCT      = "Circuit Playground Express"
+	usb_STRING_PRODUCT      = "Adafruit Circuit Playground Express"
 	usb_STRING_MANUFACTURER = "Adafruit"
 )
 
diff --git a/src/machine/board_feather-m0.go b/src/machine/board_feather-m0.go
index 13186887..af00fc98 100644
--- a/src/machine/board_feather-m0.go
+++ b/src/machine/board_feather-m0.go
@@ -105,7 +105,7 @@ const (
 
 // USB CDC identifiers
 const (
-	usb_STRING_PRODUCT      = "Feather M0 Express"
+	usb_STRING_PRODUCT      = "Adafruit Feather M0 Express"
 	usb_STRING_MANUFACTURER = "Adafruit"
 )
 
diff --git a/src/machine/board_feather-m4.go b/src/machine/board_feather-m4.go
index 8007162a..fee8c2e4 100644
--- a/src/machine/board_feather-m4.go
+++ b/src/machine/board_feather-m4.go
@@ -91,7 +91,7 @@ var (
 // USB CDC identifiers
 const (
 	usb_STRING_PRODUCT      = "Adafruit Feather M4"
-	usb_STRING_MANUFACTURER = "Adafruit LLC"
+	usb_STRING_MANUFACTURER = "Adafruit"
 )
 
 var (
diff --git a/src/machine/board_itsybitsy-m0.go b/src/machine/board_itsybitsy-m0.go
index 9d917e7a..598edd4a 100644
--- a/src/machine/board_itsybitsy-m0.go
+++ b/src/machine/board_itsybitsy-m0.go
@@ -126,7 +126,7 @@ var (
 
 // USB CDC identifiers
 const (
-	usb_STRING_PRODUCT      = "ItsyBitsy M0 Express"
+	usb_STRING_PRODUCT      = "Adafruit ItsyBitsy M0 Express"
 	usb_STRING_MANUFACTURER = "Adafruit"
 )
 
diff --git a/src/machine/board_itsybitsy-m4.go b/src/machine/board_itsybitsy-m4.go
index e4f67d9d..c6d3390b 100644
--- a/src/machine/board_itsybitsy-m4.go
+++ b/src/machine/board_itsybitsy-m4.go
@@ -93,7 +93,7 @@ var (
 // USB CDC identifiers
 const (
 	usb_STRING_PRODUCT      = "Adafruit ItsyBitsy M4"
-	usb_STRING_MANUFACTURER = "Adafruit LLC"
+	usb_STRING_MANUFACTURER = "Adafruit"
 )
 
 var (
diff --git a/src/machine/board_metro-m4-airlift.go b/src/machine/board_metro-m4-airlift.go
index 49560b99..a62c4c24 100644
--- a/src/machine/board_metro-m4-airlift.go
+++ b/src/machine/board_metro-m4-airlift.go
@@ -120,7 +120,7 @@ var (
 // USB CDC identifiers
 const (
 	usb_STRING_PRODUCT      = "Adafruit Metro M4 Airlift Lite"
-	usb_STRING_MANUFACTURER = "Adafruit LLC"
+	usb_STRING_MANUFACTURER = "Adafruit"
 )
 
 var (
diff --git a/src/machine/board_pybadge.go b/src/machine/board_pybadge.go
index d8a496a3..84ccb7ba 100644
--- a/src/machine/board_pybadge.go
+++ b/src/machine/board_pybadge.go
@@ -137,7 +137,7 @@ var (
 // USB CDC identifiers
 const (
 	usb_STRING_PRODUCT      = "Adafruit pyBadge M4"
-	usb_STRING_MANUFACTURER = "Adafruit LLC"
+	usb_STRING_MANUFACTURER = "Adafruit"
 )
 
 var (
diff --git a/src/machine/board_pyportal.go b/src/machine/board_pyportal.go
index 5258cf16..7000631e 100644
--- a/src/machine/board_pyportal.go
+++ b/src/machine/board_pyportal.go
@@ -147,7 +147,7 @@ var (
 // USB CDC identifiers
 const (
 	usb_STRING_PRODUCT      = "Adafruit PyPortal M4"
-	usb_STRING_MANUFACTURER = "Adafruit LLC"
+	usb_STRING_MANUFACTURER = "Adafruit"
 )
 
 var (
diff --git a/src/machine/board_trinket.go b/src/machine/board_trinket.go
index 7381b5c1..ba9758b5 100644
--- a/src/machine/board_trinket.go
+++ b/src/machine/board_trinket.go
@@ -96,7 +96,7 @@ const (
 
 // USB CDC identifiers
 const (
-	usb_STRING_PRODUCT      = "Trinket M0"
+	usb_STRING_PRODUCT      = "Adafruit Trinket M0"
 	usb_STRING_MANUFACTURER = "Adafruit"
 )