diff --git a/LUFA/Build/lufa.hid.in b/LUFA/Build/lufa.hid.in
index 60be46ddbce3f81c50288f57bc83204928aba1cd..a74197a0bb4ca94b11df8e5e088b95f305fae35c 100644
--- a/LUFA/Build/lufa.hid.in
+++ b/LUFA/Build/lufa.hid.in
@@ -7,7 +7,7 @@
 #
 
 LUFA_BUILD_MODULES         += HID
-LUFA_BUILD_TARGETS         += hid hid-ee hid-teensy hid-teensy-ee
+LUFA_BUILD_TARGETS         += hid hid-ee teensy teensy-ee
 LUFA_BUILD_MANDATORY_VARS  += MCU TARGET
 LUFA_BUILD_OPTIONAL_VARS   += 
 LUFA_BUILD_PROVIDED_VARS   += 
@@ -26,9 +26,9 @@ LUFA_BUILD_PROVIDED_MACROS +=
 #                                hid_bootloader_cli
 #    hid-ee                    - Program EEPROM into target via a temporary
 #                                AVR application and hid_bootloader_cli
-#    hid-teensy                - Program FLASH into target via
+#    teensy                    - Program FLASH into target via
 #                                teensy_loader_cli
-#    hid-teensy-ee             - Program EEPROM into target via a temporary
+#    teensy-ee                 - Program EEPROM into target via a temporary
 #                                AVR application and teensy_loader_cli
 #
 # MANDATORY PARAMETERS:
@@ -74,15 +74,15 @@ hid-ee: $(TARGET).eep $(MAKEFILE_LIST)
 	@echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\"
 	make -C $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/ MCU=$(MCU) clean hid
 
-hid-teensy: $(TARGET).hex $(MAKEFILE_LIST)
+teensy: $(TARGET).hex $(MAKEFILE_LIST)
 	@echo $(MSG_HID_BOOTLOADER_CMD) Programming FLASH with teensy_loader_cli using \"$<\"
 	teensy_loader_cli -mmcu=$(MCU) -v $<
 
-hid-teensy-ee: $(TARGET).hex $(MAKEFILE_LIST)
+teensy-ee: $(TARGET).hex $(MAKEFILE_LIST)
 	@echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\"
 	avr-objcopy -I ihex -O binary $< $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/InputEEData.bin
 	@echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\"
 	make -s -C $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/ MCU=$(MCU) clean hid-teensy
 	
 # Phony build targets for this module
-.PHONY: hid hid-ee hid-teensy hid-teensy-ee
+.PHONY: hid hid-ee teensy teensy-ee
diff --git a/LUFA/DoxygenPages/BuildSystem.txt b/LUFA/DoxygenPages/BuildSystem.txt
index 2c42c7da8bc7ad378dd937f755050116b3b075ca..3ff3ff68d8b68e5d7c5de0fb6be3018ee52dd7b1 100644
--- a/LUFA/DoxygenPages/BuildSystem.txt
+++ b/LUFA/DoxygenPages/BuildSystem.txt
@@ -706,11 +706,11 @@
  *        \note This will erase the currently loaded application in the target.</td>
  *   </tr>
  *   <tr>
- *    <td><tt>hid-teensy</tt></td>
+ *    <td><tt>teensy</tt></td>
  *    <td>Program the device FLASH memory with the application's executable data using <tt>teensy_loader_cli</tt>.</td>
  *   </tr>
  *   <tr>
- *    <td><tt>hid-teensy-ee</tt></td>
+ *    <td><tt>teensy-ee</tt></td>
  *    <td>Program the device EEPROM memory with the application's EEPROM data using <tt>teensy_loader_cli</tt> and
  *        a temporary AVR application programmed into the target's FLASH.
  *        \note This will erase the currently loaded application in the target.</td>