diff --git a/hardware/keyboardio/avr/bootloaders/caterina/Descriptors.c b/hardware/keyboardio/avr/bootloaders/caterina/Descriptors.c
index b5e51507..08116492 100644
--- a/hardware/keyboardio/avr/bootloaders/caterina/Descriptors.c
+++ b/hardware/keyboardio/avr/bootloaders/caterina/Descriptors.c
@@ -194,9 +194,9 @@ const USB_Descriptor_String_t ProductString =
 	.Header                 = {.Size = USB_STRING_LEN(16), .Type = DTYPE_String},
 
 	#if DEVICE_PID == 0x0036
-	.UnicodeString          = L"Arduino Leonardo" 
+	.UnicodeString          = L"Keyboardio Boot " 
 	#elif DEVICE_PID == 0x0037
-	.UnicodeString			= L"Arduino Micro   "
+	.UnicodeString			= L"Keyboardio Boot "
 	#elif DEVICE_PID == 0x003C
 	.UnicodeString			= L"Arduino Esplora "
 	#else
@@ -209,7 +209,7 @@ const USB_Descriptor_String_t ManufNameString =
 	.Header					= {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
 	
 	#if DEVICE_VID == 0x2341
-	.UnicodeString			= L"Arduino LLC"
+	.UnicodeString			= L"Keyboardio "
 	#else
 	.UnicodeString			= L"Unknown    "
 	#endif
diff --git a/hardware/keyboardio/avr/bootloaders/caterina/Makefile b/hardware/keyboardio/avr/bootloaders/caterina/Makefile
index d5edf6df..cedddd8c 100644
--- a/hardware/keyboardio/avr/bootloaders/caterina/Makefile
+++ b/hardware/keyboardio/avr/bootloaders/caterina/Makefile
@@ -56,7 +56,7 @@ VID = 0x2341
 # official Leonardo PID
 # PID = 0x0036
 # official Micro PID
-PID = 0x0037
+PID = 0x0036
 # official Esplora PID
 # PID = 0x003C