diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index fc7f51c6c4..b1642f16ba 100644
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -128,7 +128,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
 			
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
-			.TotalHIDReports        = 0x01,
+			.TotalHIDDescriptors    = 1,
 			.HIDReportType          = DTYPE_Report,
 			.HIDReportLength        = sizeof(HIDReport)
 		},
diff --git a/Bootloaders/TeensyHID/Descriptors.h b/Bootloaders/TeensyHID/Descriptors.h
index 24a0cdaa81..2b84734ca0 100644
--- a/Bootloaders/TeensyHID/Descriptors.h
+++ b/Bootloaders/TeensyHID/Descriptors.h
@@ -50,7 +50,7 @@
 			uint16_t                HIDSpec;
 			uint8_t                 CountryCode;
 		
-			uint8_t                 TotalHIDReports;
+			uint8_t                 TotalHIDDescriptors;
 
 			uint8_t                 HIDReportType;
 			uint16_t                HIDReportLength;
diff --git a/Demos/Device/GenericHID/Descriptors.c b/Demos/Device/GenericHID/Descriptors.c
index a14fc5050d..612450ca33 100644
--- a/Demos/Device/GenericHID/Descriptors.c
+++ b/Demos/Device/GenericHID/Descriptors.c
@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 									 
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
-			.TotalHIDReports        = 0x01,
+			.TotalReportDescriptors = 1,
 			.HIDReportType          = DTYPE_Report,
 			.HIDReportLength        = sizeof(GenericReport)
 		},
diff --git a/Demos/Device/GenericHID/Descriptors.h b/Demos/Device/GenericHID/Descriptors.h
index 720ddd0113..590cea6afa 100644
--- a/Demos/Device/GenericHID/Descriptors.h
+++ b/Demos/Device/GenericHID/Descriptors.h
@@ -52,7 +52,7 @@
 			uint16_t                              HIDSpec;
 			uint8_t                               CountryCode;
 		
-			uint8_t                               TotalHIDReports;
+			uint8_t                               TotalReportDescriptors;
 
 			uint8_t                               HIDReportType;
 			uint16_t                              HIDReportLength;
diff --git a/Demos/Device/Joystick/Descriptors.c b/Demos/Device/Joystick/Descriptors.c
index f1cf8d5c67..1bdce1c0d9 100644
--- a/Demos/Device/Joystick/Descriptors.c
+++ b/Demos/Device/Joystick/Descriptors.c
@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 									 
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
-			.TotalHIDReports        = 0x01,
+			.TotalReportDescriptors = 1,
 			.HIDReportType          = DTYPE_Report,
 			.HIDReportLength        = sizeof(JoystickReport)
 		},
diff --git a/Demos/Device/Joystick/Descriptors.h b/Demos/Device/Joystick/Descriptors.h
index 3463d96237..3d569978c6 100644
--- a/Demos/Device/Joystick/Descriptors.h
+++ b/Demos/Device/Joystick/Descriptors.h
@@ -52,7 +52,7 @@
 			uint16_t                              HIDSpec;
 			uint8_t                               CountryCode;
 		
-			uint8_t                               TotalHIDReports;
+			uint8_t                               TotalReportDescriptors;
 
 			uint8_t                               HIDReportType;
 			uint16_t                              HIDReportLength;
diff --git a/Demos/Device/Keyboard/Descriptors.c b/Demos/Device/Keyboard/Descriptors.c
index 69300eb9b3..02a5b7c385 100644
--- a/Demos/Device/Keyboard/Descriptors.c
+++ b/Demos/Device/Keyboard/Descriptors.c
@@ -151,7 +151,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
-			.TotalHIDReports        = 0x01,
+			.TotalReportDescriptors = 1,
 			.HIDReportType          = DTYPE_Report,
 			.HIDReportLength        = sizeof(KeyboardReport)
 		},
diff --git a/Demos/Device/Keyboard/Descriptors.h b/Demos/Device/Keyboard/Descriptors.h
index aa1bf05b6a..998379725a 100644
--- a/Demos/Device/Keyboard/Descriptors.h
+++ b/Demos/Device/Keyboard/Descriptors.h
@@ -53,7 +53,7 @@
 			uint16_t                HIDSpec;
 			uint8_t                 CountryCode;
 		
-			uint8_t                 TotalHIDReports;
+			uint8_t                 TotalReportDescriptors;
 
 			uint8_t                 HIDReportType;
 			uint16_t                HIDReportLength;
diff --git a/Demos/Device/KeyboardMouse/Descriptors.c b/Demos/Device/KeyboardMouse/Descriptors.c
index bcb0bf93ba..2eb2c6e2e3 100644
--- a/Demos/Device/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/KeyboardMouse/Descriptors.c
@@ -184,7 +184,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
-			.TotalHIDReports        = 0x01,
+			.TotalReportDescriptors = 1,
 			.HIDReportType          = DTYPE_Report,
 			.HIDReportLength        = sizeof(KeyboardReport)
 		},
@@ -231,7 +231,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
-			.TotalHIDReports        = 0x01,
+			.TotalReportDescriptors = 1,
 			.HIDReportType          = DTYPE_Report,
 			.HIDReportLength        = sizeof(MouseReport)
 		},
diff --git a/Demos/Device/KeyboardMouse/Descriptors.h b/Demos/Device/KeyboardMouse/Descriptors.h
index 59495425cc..5540f4af83 100644
--- a/Demos/Device/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/KeyboardMouse/Descriptors.h
@@ -53,7 +53,7 @@
 			uint16_t                              HIDSpec;
 			uint8_t                               CountryCode;
 		
-			uint8_t                               TotalHIDReports;
+			uint8_t                               TotalReportDescriptors;
 
 			uint8_t                               HIDReportType;
 			uint16_t                              HIDReportLength;
diff --git a/Demos/Device/Mouse/Descriptors.c b/Demos/Device/Mouse/Descriptors.c
index e58e997887..1a2b22ab23 100644
--- a/Demos/Device/Mouse/Descriptors.c
+++ b/Demos/Device/Mouse/Descriptors.c
@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 									 
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
-			.TotalHIDReports        = 0x01,
+			.TotalReportDescriptors = 1,
 			.HIDReportType          = DTYPE_Report,
 			.HIDReportLength        = sizeof(MouseReport)
 		},
diff --git a/Demos/Device/Mouse/Descriptors.h b/Demos/Device/Mouse/Descriptors.h
index 1fcee72128..6385145c12 100644
--- a/Demos/Device/Mouse/Descriptors.h
+++ b/Demos/Device/Mouse/Descriptors.h
@@ -52,7 +52,7 @@
 			uint16_t                HIDSpec;
 			uint8_t                 CountryCode;
 		
-			uint8_t                 TotalHIDReports;
+			uint8_t                 TotalReportDescriptors;
 
 			uint8_t                 HIDReportType;
 			uint16_t                HIDReportLength;
diff --git a/Demos/Host/KeyboardHostWithParser/HIDReport.h b/Demos/Host/KeyboardHostWithParser/HIDReport.h
index a128b8e97c..20968872ef 100644
--- a/Demos/Host/KeyboardHostWithParser/HIDReport.h
+++ b/Demos/Host/KeyboardHostWithParser/HIDReport.h
@@ -63,7 +63,7 @@
 			uint16_t                 HIDSpec; /**< Implemented HID class specification, in BCD encoded format */
 			uint8_t                  CountryCode; /**< Country code value for localized hardware */
 		
-			uint8_t                  TotalHIDReports; /**< Total number of HID report descriptors in the current interface */
+			uint8_t                  TotalHIDDescriptors; /**< Total number of HID report descriptors in the current interface */
 
 			uint8_t                  HIDReportType; /**< HID report type of the first HID report descriptor */
 			uint16_t                 HIDReportLength; /**< Total size in bytes of the first HID report descriptor */
diff --git a/Demos/Host/MouseHostWithParser/HIDReport.h b/Demos/Host/MouseHostWithParser/HIDReport.h
index a4fc76fa7b..b24885544b 100644
--- a/Demos/Host/MouseHostWithParser/HIDReport.h
+++ b/Demos/Host/MouseHostWithParser/HIDReport.h
@@ -72,7 +72,7 @@
 			uint16_t                 HIDSpec; /**< Implemented HID class specification, in BCD encoded format */
 			uint8_t                  CountryCode; /**< Country code value for localized hardware */
 		
-			uint8_t                  TotalHIDReports; /**< Total number of HID report descriptors in the current interface */
+			uint8_t                  TotalHIDDescriptors; /**< Total number of HID report descriptors in the current interface */
 
 			uint8_t                  HIDReportType; /**< HID report type of the first HID report descriptor */
 			uint16_t                 HIDReportLength; /**< Total size in bytes of the first HID report descriptor */
diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 1397893529..dd6b3fb63c 100644
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -142,7 +142,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			
 			.HIDSpec                = VERSION_BCD(01.11),
 			.CountryCode            = 0x00,
-			.TotalHIDReports        = 0x01,
+			.TotalHIDDescriptors    = 1,
 			.HIDReportType          = DTYPE_Report,
 			.HIDReportLength        = sizeof(KeyboardReport)
 		},
diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 2f58545231..16299bbfd0 100644
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -54,7 +54,7 @@
 			uint16_t                HIDSpec; /**< HID specification implemented by the device, in BCD form */
 			uint8_t                 CountryCode; /**< Country code for the country the HID device is localised for */
 		
-			uint8_t                 TotalHIDReports; /**< Total number of HID reports linked to this HID interface */
+			uint8_t                 TotalHIDDescriptors; /**< Total number of HID reports linked to this HID interface */
 
 			uint8_t                 HIDReportType; /**< Type of the first HID report descriptor */
 			uint16_t                HIDReportLength; /**< Length of the first HID report descriptor */