diff --git a/right/usb_composite_device.c b/right/usb_composite_device.c
index f0f789c..7cad41a 100644
--- a/right/usb_composite_device.c
+++ b/right/usb_composite_device.c
@@ -17,7 +17,7 @@
 #include "usb_descriptor_strings.h"
 
 static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param);
-usb_device_composite_struct_t UsbCompositeDevice;
+usb_composite_device_t UsbCompositeDevice;
 
 usb_device_class_config_struct_t UsbDeviceCompositeClassConfig[USB_COMPOSITE_INTERFACE_COUNT] = {
     {UsbKeyboardCallback,   (class_handle_t)NULL, &UsbKeyboardClass},
@@ -127,4 +127,3 @@ void USB_DeviceApplicationInit(void)
 
     USB_DeviceRun(UsbCompositeDevice.deviceHandle);
 }
-
diff --git a/right/usb_composite_device.h b/right/usb_composite_device.h
index 1e74c4c..28a5607 100644
--- a/right/usb_composite_device.h
+++ b/right/usb_composite_device.h
@@ -20,11 +20,11 @@
         uint8_t attach;
         uint8_t currentConfiguration;
         uint8_t currentInterfaceAlternateSetting[USB_COMPOSITE_INTERFACE_COUNT];
-    } usb_device_composite_struct_t;
+    } usb_composite_device_t;
 
 // Variables:
 
-    extern usb_device_composite_struct_t UsbCompositeDevice;
+    extern usb_composite_device_t UsbCompositeDevice;
 
 //Functions: