diff --git a/right/usb_descriptor_device.h b/right/usb_descriptor_device.h
index c72cafa..597d0ab 100644
--- a/right/usb_descriptor_device.h
+++ b/right/usb_descriptor_device.h
@@ -3,8 +3,8 @@
 
 // Macros:
 
-    #define USB_DEVICE_VENDOR_ID 0x15A2
-    #define USB_DEVICE_PRODUCT_ID 0x007E
+    #define USB_DEVICE_VENDOR_ID 0x16D0
+    #define USB_DEVICE_PRODUCT_ID 0x007E // TODO: Change this to 05EA for 6KRO and 05EB for NKRO
     #define USB_DEVICE_RELEASE_NUMBER 0x0101
 
     #define USB_DEVICE_SPECIFICATION_VERSION 0x0200
diff --git a/right/usb_descriptor_strings.c b/right/usb_descriptor_strings.c
index f8f7019..271dd01 100644
--- a/right/usb_descriptor_strings.c
+++ b/right/usb_descriptor_strings.c
@@ -11,55 +11,64 @@ uint8_t UsbLanguageListStringDescriptor[USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENG
 uint8_t UsbManufacturerString[USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH] = {
     sizeof(UsbManufacturerString),
     USB_DESCRIPTOR_TYPE_STRING,
-    'F', 0x00U,
-    'R', 0x00U,
-    'E', 0x00U,
-    'E', 0x00U,
-    'S', 0x00U,
-    'C', 0x00U,
-    'A', 0x00U,
-    'L', 0x00U,
-    'E', 0x00U,
-    ' ', 0x00U,
-    'S', 0x00U,
-    'E', 0x00U,
-    'M', 0x00U,
-    'I', 0x00U,
-    'C', 0x00U,
-    'O', 0x00U,
-    'N', 0x00U,
-    'D', 0x00U,
     'U', 0x00U,
-    'C', 0x00U,
-    'T', 0x00U,
-    'O', 0x00U,
-    'R', 0x00U,
+    'l', 0x00U,
+    't', 0x00U,
+    'i', 0x00U,
+    'm', 0x00U,
+    'a', 0x00U,
+    't', 0x00U,
+    'e', 0x00U,
     ' ', 0x00U,
-    'I', 0x00U,
-    'N', 0x00U,
-    'C', 0x00U,
-    '.', 0x00U,
+    'G', 0x00U,
+    'a', 0x00U,
+    'd', 0x00U,
+    'g', 0x00U,
+    'e', 0x00U,
+    't', 0x00U,
+    ' ', 0x00U,
+    'L', 0x00U,
+    'a', 0x00U,
+    'b', 0x00U,
+    'o', 0x00U,
+    'r', 0x00U,
+    'a', 0x00U,
+    't', 0x00U,
+    'o', 0x00U,
+    'r', 0x00U,
+    'i', 0x00U,
+    'e', 0x00U,
+    's', 0x00U,
 };
 
 uint8_t UsbProductString[USB_PRODUCT_STRING_DESCRIPTOR_LENGTH] = {
     sizeof(UsbProductString),
     USB_DESCRIPTOR_TYPE_STRING,
-    'C', 0x00U,
-    'O', 0x00U,
-    'M', 0x00U,
-    'P', 0x00U,
-    'O', 0x00U,
-    'S', 0x00U,
-    'I', 0x00U,
-    'T', 0x00U,
-    'E', 0x00U,
+    'U', 0x00U,
+    'l', 0x00U,
+    't', 0x00U,
+    'i', 0x00U,
+    'm', 0x00U,
+    'a', 0x00U,
+    't', 0x00U,
+    'e', 0x00U,
     ' ', 0x00U,
-    'D', 0x00U,
-    'E', 0x00U,
-    'V', 0x00U,
-    'I', 0x00U,
-    'C', 0x00U,
-    'E', 0x00U,
+    'H', 0x00U,
+    'a', 0x00U,
+    'c', 0x00U,
+    'k', 0x00U,
+    'i', 0x00U,
+    'n', 0x00U,
+    'g', 0x00U,
+    ' ', 0x00U,
+    'K', 0x00U,
+    'e', 0x00U,
+    'y', 0x00U,
+    'b', 0x00U,
+    'o', 0x00U,
+    'a', 0x00U,
+    'r', 0x00U,
+    'd', 0x00U,
 };
 
 uint32_t UsbStringDescriptorLengths[USB_STRING_DESCRIPTOR_COUNT] = {
diff --git a/right/usb_descriptor_strings.h b/right/usb_descriptor_strings.h
index 8c78d39..32b172e 100644
--- a/right/usb_descriptor_strings.h
+++ b/right/usb_descriptor_strings.h
@@ -7,7 +7,7 @@
 
     #define USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENGTH 4
     #define USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH  58
-    #define USB_PRODUCT_STRING_DESCRIPTOR_LENGTH       34
+    #define USB_PRODUCT_STRING_DESCRIPTOR_LENGTH       52
 
     #define USB_STRING_DESCRIPTOR_ID_SUPPORTED_LANGUAGES 0
     #define USB_STRING_DESCRIPTOR_ID_MANUFACTURER        1