diff --git a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
index 45cf5e5aae3e6947511116b832640caf0089c72a..0f901dddbedce24208bcfa1379c16f19487aa70a 100644
--- a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
@@ -99,7 +99,7 @@ int main(void)
 					break;
 				}
 
-				if (USB_HID_Host_SetBootProtocol(&Keyboard_HID_Interface) != 0)
+				if (HID_Host_SetBootProtocol(&Keyboard_HID_Interface) != 0)
 				{
 					printf("Could not Set Boot Protocol Mode.\r\n");
 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
index e9af0c0b2bfd9d15696c114a0f00077faa92bd2e..d8a719d488b70dcb996e2560e5e7e27dd723abea 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -104,7 +104,7 @@ int main(void)
 					break;
 				}
 
-				if (USB_HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)
+				if (HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)
 				{
 					printf("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n");
 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.c b/Demos/Host/ClassDriver/MouseHost/MouseHost.c
index 7434e7c6e3dc01b5aa615fac9d9eaa20e7a7d621..ffeba5da5ab824c2749dc89acd6c24839b7ec993 100644
--- a/Demos/Host/ClassDriver/MouseHost/MouseHost.c
+++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.c
@@ -99,7 +99,7 @@ int main(void)
 					break;
 				}
 
-				if (USB_HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0)
+				if (HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0)
 				{
 					printf("Could not Set Boot Protocol Mode.\r\n");
 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
index 0aa7d4ad6dd21dab9155b9277b3669bf1f5dd795..0beec9a12ca8c1c64480983e3f9171aa2f000e2c 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
@@ -104,7 +104,7 @@ int main(void)
 					break;
 				}
 
-				if (USB_HID_Host_SetReportProtocol(&Mouse_HID_Interface) != 0)
+				if (HID_Host_SetReportProtocol(&Mouse_HID_Interface) != 0)
 				{
 					printf("Error Setting Report Protocol Mode or Not a Valid Mouse.\r\n");
 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
index b420a5b919d3e5baddeec26e64489431c5431345..a8e761d66904cacacf74a4fd0e4ba2b117a6b87b 100644
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -265,7 +265,7 @@ bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
 	return ReportReceived;
 }
 
-uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
+uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
 {
 	if (HIDInterfaceInfo->State.UsingBootProtocol)
 	  return HOST_SENDCONTROL_Successful;
@@ -295,7 +295,7 @@ uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfac
 	return HOST_SENDCONTROL_Successful;
 }
 
-uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
+uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
 {
 	uint8_t ErrorCode;
 
diff --git a/LUFA/Drivers/USB/Class/Host/HID.h b/LUFA/Drivers/USB/Class/Host/HID.h
index 5526990adc0c9c8a3d4024fd80aeac8b0c324d8c..95afbb491ce37144451b86ed6361c98c4895d7c0 100644
--- a/LUFA/Drivers/USB/Class/Host/HID.h
+++ b/LUFA/Drivers/USB/Class/Host/HID.h
@@ -94,7 +94,7 @@
 					uint16_t DataOUTPipeSize;  /**< Size in bytes of the HID interface's OUT data pipe */
 					
 					bool SupportsBootProtocol; /**< Indicates if the current interface instance supports the HID Boot
-					                            *   Protocol when enabled via \ref USB_HID_Host_SetBootProtocol()
+					                            *   Protocol when enabled via \ref HID_Host_SetBootProtocol()
 					                            */
 					bool DeviceUsesOUTPipe; /**< Indicates if the current interface instance uses a seperate OUT data pipe for
 					                         *   OUT reports, or if OUT reports are sent via the control pipe instead.
@@ -136,7 +136,7 @@
 			 *  machine is in the Addressed state.
 			 *
 			 *  \note Once the device pipes are configured, the HID device's reporting protocol <b>must</b> be set via a call
-			 *        to either the \ref USB_HID_Host_SetBootProtocol() or \ref USB_HID_Host_SetReportProtocol() function.
+			 *        to either the \ref HID_Host_SetBootProtocol() or \ref HID_Host_SetReportProtocol() function.
 			 *
 			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state
 			 *  \param[in] ConfigDescriptorSize  Length of the attached device's Configuration Descriptor
@@ -197,7 +197,7 @@
 			 *  \return \ref HID_ERROR_LOGICAL if the device does not support Boot Protocol mode, a value from the
 			 *          \ref USB_Host_SendControlErrorCodes_t enum otherwise
 			 */
-			uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
+			uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
 
 			/** Switches the attached HID device's reporting protocol over to the standard Report protocol mode. This also retrieves
 			 *  and parses the device's HID report descriptor, so that the size of each report can be determined in advance.
@@ -212,7 +212,7 @@
 			 *          not have a valid \ref HID_ReportInfo_t structure set in its configuration, a mask of \ref HID_ERROR_LOGICAL
 			 *          and a value from the \ref HID_Parse_ErrorCodes_t otherwise
 			 */
-			uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
+			uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
 		
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)