diff --git a/board/cr50/board.c b/board/cr50/board.c
index c02d7f19f6..f64a75b374 100644
--- a/board/cr50/board.c
+++ b/board/cr50/board.c
@@ -88,6 +88,7 @@ const void * const usb_strings[] = {
 	[USB_STR_VERSION] = USB_STRING_DESC(CROS_EC_VERSION32),
 	[USB_STR_CONSOLE_NAME] = USB_STRING_DESC("Shell"),
 	[USB_STR_BLOB_NAME] = USB_STRING_DESC("Blob"),
+	[USB_STR_HID_NAME] = USB_STRING_DESC("PokeyPokey"),
 };
 BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT);
 #endif
diff --git a/board/cr50/board.h b/board/cr50/board.h
index de598b5e7f..a42f6a789f 100644
--- a/board/cr50/board.h
+++ b/board/cr50/board.h
@@ -53,6 +53,7 @@ enum usb_strings {
 	USB_STR_VERSION,
 	USB_STR_CONSOLE_NAME,
 	USB_STR_BLOB_NAME,
+	USB_STR_HID_NAME,
 
 	USB_STR_COUNT
 };
diff --git a/chip/g/usb.c b/chip/g/usb.c
index babfd20eb5..f892d65fdb 100644
--- a/chip/g/usb.c
+++ b/chip/g/usb.c
@@ -37,6 +37,7 @@
 #endif
 
 /* Console output macro */
+#define CPRINTS(format, args...) cprints(CC_USB, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_USB, format, ## args)
 
 #ifdef CONFIG_USB_BOS
@@ -249,7 +250,7 @@ static void ep0_tx(void)
 	if (set_addr) {
 		GR_USB_DCFG = (GR_USB_DCFG & ~DCFG_DEVADDR(0x7f))
 			    | DCFG_DEVADDR(set_addr);
-		CPRINTF("SETAD %02x\n", set_addr);
+		CPRINTS("SETAD 0x%02x (%d)", set_addr, set_addr);
 		set_addr = 0;
 	}
 	if (desc_ptr) {
@@ -445,7 +446,7 @@ void usb_init(void)
 	usb_connect();
 #endif
 
-	CPRINTF("USB init done\n");
+	CPRINTS("USB init done");
 }
 #ifndef CONFIG_USB_INHIBIT_INIT
 DECLARE_HOOK(HOOK_INIT, usb_init, HOOK_PRIO_DEFAULT);
diff --git a/chip/g/usb_hid.c b/chip/g/usb_hid.c
index bca7c03a15..5407aa1540 100644
--- a/chip/g/usb_hid.c
+++ b/chip/g/usb_hid.c
@@ -33,7 +33,7 @@ const struct usb_interface_descriptor USB_IFACE_DESC(USB_IFACE_HID) =
 	.bInterfaceClass = USB_CLASS_HID,
 	.bInterfaceSubClass = USB_HID_SUBCLASS_BOOT,
 	.bInterfaceProtocol = USB_HID_PROTOCOL_KEYBOARD,
-	.iInterface = 0,
+	.iInterface = USB_STR_HID_NAME,
 };
 const struct usb_endpoint_descriptor USB_EP_DESC(USB_IFACE_HID, 81) =
 {