diff --git a/class/hub/usb_hub.h b/class/hub/usb_hub.h
index 78223b4d..1beb6f29 100644
--- a/class/hub/usb_hub.h
+++ b/class/hub/usb_hub.h
@@ -8,7 +8,7 @@
 #define _USB_HUB_H_
 
 /* HUB Class Descriptor Types */
-#define HUB_DESCRIPTOR_TYPE_HUB          0x29
+#define HUB_DESCRIPTOR_TYPE_HUB 0x29
 
 /* Hub class requests */
 #define HUB_REQUEST_GET_STATUS      USB_REQUEST_GET_STATUS
@@ -22,35 +22,35 @@
 #define HUB_REQUEST_STOP_TT         (0x0b)
 
 /* Hub class features */
-#define HUB_FEATURE_HUB_LOCALPOWER_CHANGE  (0x0)
-#define HUB_FEATURE_HUB_OVERCURRENT_CHANGE (0x1)
+#define HUB_FEATURE_HUB_C_LOCALPOWER  (0x0)
+#define HUB_FEATURE_HUB_C_OVERCURRENT (0x1)
 
 /* Port features */
-#define HUB_PORT_FEATURE_CONNECTION          (0x00)
-#define HUB_PORT_FEATURE_ENABLE              (0x01)
-#define HUB_PORT_FEATURE_SUSPEND             (0x02)
-#define HUB_PORT_FEATURE_OVERCURRENT         (0x03)
-#define HUB_PORT_FEATURE_RESET               (0x04)
-#define HUB_PORT_FEATURE_L1                  (0x05)
-#define HUB_PORT_FEATURE_POWER               (0x08)
-#define HUB_PORT_FEATURE_LOWSPEED            (0x09)
-#define HUB_PORT_FEATURE_HIGHSPEED           (0x0a)
-#define HUB_PORT_FEATURE_CONNECTION_CHANGE   (0x10)
-#define HUB_PORT_FEATURE_ENABLE_CHANGE       (0x11)
-#define HUB_PORT_FEATURE_SUSPEND_CHANGE      (0x12)
-#define HUB_PORT_FEATURE_OVER_CURRENT_CHANGE (0x13)
-#define HUB_PORT_FEATURE_RESET_CHANGE        (0x14)
-#define HUB_PORT_FEATURE_TEST                (0x15)
-#define HUB_PORT_FEATURE_INDICATOR           (0x16)
-#define HUB_PORT_FEATURE_PORTL1_CHANGE       (0x17)
+#define HUB_PORT_FEATURE_CONNECTION    (0x00)
+#define HUB_PORT_FEATURE_ENABLE        (0x01)
+#define HUB_PORT_FEATURE_SUSPEND       (0x02)
+#define HUB_PORT_FEATURE_OVERCURRENT   (0x03)
+#define HUB_PORT_FEATURE_RESET         (0x04)
+#define HUB_PORT_FEATURE_L1            (0x05)
+#define HUB_PORT_FEATURE_POWER         (0x08)
+#define HUB_PORT_FEATURE_LOWSPEED      (0x09)
+#define HUB_PORT_FEATURE_HIGHSPEED     (0x0a)
+#define HUB_PORT_FEATURE_C_CONNECTION  (0x10)
+#define HUB_PORT_FEATURE_C_ENABLE      (0x11)
+#define HUB_PORT_FEATURE_C_SUSPEND     (0x12)
+#define HUB_PORT_FEATURE_C_OVER_CURREN (0x13)
+#define HUB_PORT_FEATURE_C_RESET       (0x14)
+#define HUB_PORT_FEATURE_TEST          (0x15)
+#define HUB_PORT_FEATURE_INDICATOR     (0x16)
+#define HUB_PORT_FEATURE_C_PORTL1      (0x17)
 
 /* Hub status */
 #define HUB_STATUS_LOCALPOWER  (1 << 0)
 #define HUB_STATUS_OVERCURRENT (1 << 1)
 
 /* Hub status change */
-#define HUB_STATUS_CHANGE_LOCALPOWER  (1 << 0)
-#define HUB_STATUS_CHANGE_OVERCURRENT (1 << 1)
+#define HUB_STATUS_C_LOCALPOWER  (1 << 0)
+#define HUB_STATUS_C_OVERCURRENT (1 << 1)
 
 /* Hub port status */
 #define HUB_PORT_STATUS_CONNECTION  (1 << 0)
@@ -66,12 +66,12 @@
 #define HUB_PORT_STATUS_INDICATOR   (1 << 12)
 
 /* Hub port status change */
-#define HUB_PORT_STATUS_CHANGE_CONNECTION  (1 << 0)
-#define HUB_PORT_STATUS_CHANGE_ENABLE      (1 << 1)
-#define HUB_PORT_STATUS_CHANGE_SUSPEND     (1 << 2)
-#define HUB_PORT_STATUS_CHANGE_OVERCURRENT (1 << 3)
-#define HUB_PORT_STATUS_CHANGE_RESET       (1 << 4)
-#define HUB_PORT_STATUS_CHANGE_L1          (1 << 5)
+#define HUB_PORT_STATUS_C_CONNECTION  (1 << 0)
+#define HUB_PORT_STATUS_C_ENABLE      (1 << 1)
+#define HUB_PORT_STATUS_C_SUSPEND     (1 << 2)
+#define HUB_PORT_STATUS_C_OVERCURRENT (1 << 3)
+#define HUB_PORT_STATUS_C_RESET       (1 << 4)
+#define HUB_PORT_STATUS_C_L1          (1 << 5)
 
 /* Hub characteristics */
 #define HUB_CHAR_LPSM_SHIFT      (0) /* Bits 0-1: Logical Power Switching Mode */
@@ -79,7 +79,7 @@
 #define HUB_CHAR_LPSM_GANGED     (0 << HUB_CHAR_LPSM_SHIFT)
 #define HUB_CHAR_LPSM_INDIVIDUAL (1 << HUB_CHAR_LPSM_SHIFT)
 #define HUB_CHAR_COMPOUND        (1 << 2) /* Bit 2: Compound device */
-#define HUB_CHAR_OCPM_SHIFT      (3) /* Bits 3-4: Over-current Protection Mode */
+#define HUB_CHAR_OCPM_SHIFT      (3)      /* Bits 3-4: Over-current Protection Mode */
 #define HUB_CHAR_OCPM_MASK       (3 << HUB_CHAR_OCPM_SHIFT)
 #define HUB_CHAR_OCPM_GLOBAL     (0 << HUB_CHAR_OCPM_SHIFT)
 #define HUB_CHAR_OCPM_INDIVIDUAL (1 << HUB_CHAR_OCPM_SHIFT)
@@ -101,18 +101,20 @@ struct usb_hub_descriptor {
     uint8_t bHubContrCurrent;
     uint8_t DeviceRemovable;
     uint8_t PortPwrCtrlMask;
-};
+} __PACKED;
+
+#define USB_SIZEOF_HUB_DESC 9
 
 /* Hub status */
 struct hub_status {
-    uint8_t status[2];
-    uint8_t change[2];
+    uint16_t wPortStatus;
+    uint16_t wPortChange;
 };
 
 /* Hub port status */
 struct hub_port_status {
-    uint8_t status[2];
-    uint8_t change[2];
+    uint16_t wPortStatus;
+    uint16_t wPortChange;
 };
 
 #endif /* _USB_HUB_H_ */