diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index fc7f51c6c409e47ff92d16315752685683a94cf6..b1642f16ba970bd5330de18d3a2b0ff03e3eca28 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 24a0cdaa810e51d1c841658e8039f1fdb8788210..2b84734ca05ce1df4d35d221325cec202efb9c7c 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 a14fc5050de92ff8877e0dbece6b824f46864426..612450ca335ca5dad1575ff824a361413527c9f2 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 720ddd01135496748a6cefc58fbd56a2ab040c7e..590cea6afae984bbd8a732229d773fd63a3e25e7 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 f1cf8d5c671446d8e78f3fd4d9d999e2abcbebfd..1bdce1c0d90b172855aa7dc5e4202c87c4b7867f 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 3463d96237d8dd3b971382e9e61b6d2ef279bb0e..3d569978c6075bcfcdb74dac4aea4484265e275a 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 69300eb9b3a5122ad95af902faa817fbde0a66bd..02a5b7c385e2704f38910952c98dd7c3c20558dc 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 aa1bf05b6adf524c7fbf8ed82208deb58a13501a..998379725a71fb6db81b34791ac3e70384f44ee1 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 bcb0bf93ba510d149e054527fed5ff556f6d345c..2eb2c6e2e3a8e50862b58c212d8b5de6c7572629 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 59495425cc273246b0ce584ab560b7d2cb16e589..5540f4af83eeea18a7f6611a8ede34c86cbd9a92 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 e58e9978874c83417e6aeb10bfa693013993c630..1a2b22ab239af82290cc1a416f7781fef032eac9 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 1fcee72128e5108006c9c08459462c1103be748d..6385145c12cda4ee3dc3968beebc2cbbb6ebc465 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 a128b8e97c4baed971afc9bc4478b625ee477853..20968872ef45337e71d7011ebe603fb3a6d27a5d 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 a4fc76fa7ba155e5749cfff250e7cf95405e3e4e..b24885544b62ff6d0bbf7bc8b8b1683e4db333d7 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 139789352972e88c618923d0481b5b4d9ca8c66d..dd6b3fb63c0ede21ce8a01f852ac90c619420e06 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 2f58545231ccee439b5a73c08ce1606c0d7a0706..16299bbfd03392fc79c91e578f3a002be7d2912a 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 */