diff --git a/right/build/kds/.project b/right/build/kds/.project
index 32f185d..ed69fef 100644
--- a/right/build/kds/.project
+++ b/right/build/kds/.project
@@ -181,14 +181,14 @@
 			<locationURI>$%7BPARENT-3-PROJECT_LOC%7D/lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/osa/usb_osa_bm.h</locationURI>
 		</link>
 		<link>
-			<name>sources/composite.c</name>
+			<name>sources/usb_composite_device.c</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/composite.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/usb_composite_device.c</locationURI>
 		</link>
 		<link>
-			<name>sources/composite.h</name>
+			<name>sources/usb_composite_device.h</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/composite.h</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/usb_composite_device.h</locationURI>
 		</link>
 		<link>
 			<name>sources/usb_descriptor_configuration.c</name>
diff --git a/right/composite.c b/right/usb_composite_device.c
similarity index 99%
rename from right/composite.c
rename to right/usb_composite_device.c
index b8f959b..046d4b4 100644
--- a/right/composite.c
+++ b/right/usb_composite_device.c
@@ -5,7 +5,7 @@
 #include "include/usb/usb_device_hid.h"
 #include "include/usb/usb_device_ch9.h"
 #include "usb_descriptor_device.h"
-#include "composite.h"
+#include "usb_composite_device.h"
 #include "usb_interface_keyboard.h"
 #include "usb_interface_mouse.h"
 #include "usb_interface_generic_hid.h"
diff --git a/right/composite.h b/right/usb_composite_device.h
similarity index 100%
rename from right/composite.h
rename to right/usb_composite_device.h
diff --git a/right/usb_descriptor_configuration.c b/right/usb_descriptor_configuration.c
index 3744647..2698636 100644
--- a/right/usb_descriptor_configuration.c
+++ b/right/usb_descriptor_configuration.c
@@ -4,7 +4,7 @@
 #include "include/usb/usb_device_class.h"
 #include "include/usb/usb_device_hid.h"
 #include "usb_descriptor_device.h"
-#include "composite.h"
+#include "usb_composite_device.h"
 #include "usb_descriptor_keyboard_report.h"
 #include "usb_descriptor_mouse_report.h"
 #include "usb_descriptor_generic_hid_report.h"
diff --git a/right/usb_descriptor_device.c b/right/usb_descriptor_device.c
index a29fa42..02ac002 100644
--- a/right/usb_descriptor_device.c
+++ b/right/usb_descriptor_device.c
@@ -4,7 +4,7 @@
 #include "include/usb/usb_device_class.h"
 #include "include/usb/usb_device_hid.h"
 #include "usb_descriptor_device.h"
-#include "composite.h"
+#include "usb_composite_device.h"
 #include "usb_descriptor_strings.h"
 
 uint8_t UsbDeviceDescriptor[USB_DESCRIPTOR_LENGTH_DEVICE] = {
diff --git a/right/usb_interface_generic_hid.c b/right/usb_interface_generic_hid.c
index 4146209..085ae15 100644
--- a/right/usb_interface_generic_hid.c
+++ b/right/usb_interface_generic_hid.c
@@ -8,7 +8,7 @@
 #include "include/usb/usb_device_ch9.h"
 #include "usb_interface_generic_hid.h"
 #include "usb_descriptor_configuration.h"
-#include "composite.h"
+#include "usb_composite_device.h"
 
 static usb_device_endpoint_struct_t UsbGenericHidEndpoints[USB_GENERIC_HID_ENDPOINT_COUNT] =
 {
diff --git a/right/usb_interface_keyboard.c b/right/usb_interface_keyboard.c
index 1802ba0..f9a1d0c 100644
--- a/right/usb_interface_keyboard.c
+++ b/right/usb_interface_keyboard.c
@@ -6,7 +6,7 @@
 #include "include/usb/usb_device_class.h"
 #include "include/usb/usb_device_hid.h"
 #include "include/usb/usb_device_ch9.h"
-#include "composite.h"
+#include "usb_composite_device.h"
 #include "include/lufa/HIDClassCommon.h"
 #include "usb_interface_keyboard.h"
 #include "usb_descriptor_configuration.h"
diff --git a/right/usb_interface_mouse.c b/right/usb_interface_mouse.c
index b105044..5d25495 100644
--- a/right/usb_interface_mouse.c
+++ b/right/usb_interface_mouse.c
@@ -6,7 +6,7 @@
 #include "include/usb/usb_device_class.h"
 #include "include/usb/usb_device_hid.h"
 #include "include/usb/usb_device_ch9.h"
-#include "composite.h"
+#include "usb_composite_device.h"
 #include "usb_interface_mouse.h"
 #include "usb_descriptor_configuration.h"