Standardized the naming scheme given to configuration descriptor sub-elements in the Device mode demos, bootloaders and projects.

Fix errors in the MouseHostWithParser demo from incorrect use of the HID_ALIGN_DATA() macro.

28 files changed, 152 insertions, 151 deletions

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
index 42da1a83f..784ce79da 100644
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)

 		},

 

-	.AudioControlInterface = 

+	.Audio_ControlInterface = 

 		{

 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -102,7 +102,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR

 		},

 

-	.AudioControlInterface_SPC = 

+	.Audio_ControlInterface_SPC = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

@@ -116,7 +116,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceNumbers         = {1},

 		},

 

-	.InputTerminal = 

+	.Audio_InputTerminal = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_InputTerminal,

@@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.TerminalStrIndex         = NO_DESCRIPTOR

 		},

 

-	.OutputTerminal = 

+	.Audio_OutputTerminal = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_OutputTerminal,

@@ -146,7 +146,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.TerminalStrIndex         = NO_DESCRIPTOR

 		},

 

-	.AudioStreamInterface_Alt0 = 

+	.Audio_StreamInterface_Alt0 = 

 		{

 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -162,7 +162,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR

 		},

 

-	.AudioStreamInterface_Alt1 = 

+	.Audio_StreamInterface_Alt1 = 

 		{

 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -178,7 +178,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR

 		},

 

-	.AudioStreamInterface_SPC = 

+	.Audio_StreamInterface_SPC = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

@@ -189,7 +189,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.AudioFormat              = 0x0001

 		},

 

-	.AudioFormat = 

+	.Audio_AudioFormat = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Format,

@@ -204,7 +204,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.SampleFrequencies        = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}

 		},

 	

-	.AudioEndpoint = 

+	.Audio_StreamEndpoint = 

 		{

 			.Endpoint = 

 				{

@@ -220,7 +220,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.SyncEndpointNumber       = 0

 		},

 		

-	.AudioEndpoint_SPC = 

+	.Audio_StreamEndpoint_SPC = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

 			.Subtype                  = DSUBTYPE_General,

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.h b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
index 892b2ec4d..9bc94f39f 100644
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
@@ -63,16 +63,16 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_Audio_Interface_AC_t              AudioControlInterface_SPC;

-			USB_Audio_InputTerminal_t             InputTerminal;

-			USB_Audio_OutputTerminal_t            OutputTerminal;

-			USB_Descriptor_Interface_t            AudioStreamInterface_Alt0;

-			USB_Descriptor_Interface_t            AudioStreamInterface_Alt1;

-			USB_Audio_Interface_AS_t              AudioStreamInterface_SPC;

-			USB_Audio_Format_t                    AudioFormat;

-			USB_Audio_StreamEndpoint_Std_t        AudioEndpoint;

-			USB_Audio_StreamEndpoint_Spc_t        AudioEndpoint_SPC;

+			USB_Descriptor_Interface_t            Audio_ControlInterface;

+			USB_Audio_Interface_AC_t              Audio_ControlInterface_SPC;

+			USB_Audio_InputTerminal_t             Audio_InputTerminal;

+			USB_Audio_OutputTerminal_t            Audio_OutputTerminal;

+			USB_Descriptor_Interface_t            Audio_StreamInterface_Alt0;

+			USB_Descriptor_Interface_t            Audio_StreamInterface_Alt1;

+			USB_Audio_Interface_AS_t              Audio_StreamInterface_SPC;

+			USB_Audio_Format_t                    Audio_AudioFormat;

+			USB_Audio_StreamEndpoint_Std_t        Audio_StreamEndpoint;

+			USB_Audio_StreamEndpoint_Spc_t        Audio_StreamEndpoint_SPC;

 		} USB_Descriptor_Configuration_t;

 

 	/* Function Prototypes: */

diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
index af6c982a8..3f62031f7 100644
--- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.AudioControlInterface = 

+	.Audio_ControlInterface = 

 		{

 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -102,7 +102,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR

 		},

 	

-	.AudioControlInterface_SPC = 

+	.Audio_ControlInterface_SPC = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

@@ -116,7 +116,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceNumbers         = {1},

 		},

 

-	.InputTerminal = 

+	.Audio_InputTerminal = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_InputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_InputTerminal,

@@ -132,7 +132,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.TerminalStrIndex         = NO_DESCRIPTOR

 		},

 

-	.OutputTerminal = 

+	.Audio_OutputTerminal = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_OutputTerminal_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_OutputTerminal,

@@ -146,7 +146,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.TerminalStrIndex         = NO_DESCRIPTOR

 		},

 

-	.AudioStreamInterface_Alt0 = 

+	.Audio_StreamInterface_Alt0 = 

 		{

 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -162,7 +162,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR

 		},

 

-	.AudioStreamInterface_Alt1 = 

+	.Audio_StreamInterface_Alt1 = 

 		{

 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -178,7 +178,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR

 		},

 		

-	.AudioStreamInterface_SPC = 

+	.Audio_StreamInterface_SPC = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_Interface_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

@@ -189,7 +189,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.AudioFormat              = 0x0001

 		},

 		

-	.AudioFormat = 

+	.Audio_AudioFormat = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_Format_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Format,

@@ -204,7 +204,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.SampleFrequencies        = {AUDIO_SAMPLE_FREQ(AUDIO_SAMPLE_FREQUENCY)}

 		},

 	

-	.AudioEndpoint = 

+	.Audio_StreamEndpoint = 

 		{

 			.Endpoint = 

 				{

@@ -220,7 +220,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.SyncEndpointNumber       = 0

 		},

 		

-	.AudioEndpoint_SPC = 

+	.Audio_StreamEndpoint_SPC = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_StreamEndpoint_Spc_t), .Type = DTYPE_AudioEndpoint},

 			.Subtype                  = DSUBTYPE_General,

diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
index 110c8bc15..34dd481b1 100644
--- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
@@ -63,16 +63,16 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_Audio_Interface_AC_t              AudioControlInterface_SPC;

-			USB_Audio_InputTerminal_t             InputTerminal;

-			USB_Audio_OutputTerminal_t            OutputTerminal;

-			USB_Descriptor_Interface_t            AudioStreamInterface_Alt0;

-			USB_Descriptor_Interface_t            AudioStreamInterface_Alt1;

-			USB_Audio_Interface_AS_t              AudioStreamInterface_SPC;

-			USB_Audio_Format_t                    AudioFormat;

-			USB_Audio_StreamEndpoint_Std_t        AudioEndpoint;

-			USB_Audio_StreamEndpoint_Spc_t        AudioEndpoint_SPC;

+			USB_Descriptor_Interface_t            Audio_ControlInterface;

+			USB_Audio_Interface_AC_t              Audio_ControlInterface_SPC;

+			USB_Audio_InputTerminal_t             Audio_InputTerminal;

+			USB_Audio_OutputTerminal_t            Audio_OutputTerminal;

+			USB_Descriptor_Interface_t            Audio_StreamInterface_Alt0;

+			USB_Descriptor_Interface_t            Audio_StreamInterface_Alt1;

+			USB_Audio_Interface_AS_t              Audio_StreamInterface_SPC;

+			USB_Audio_Format_t                    Audio_AudioFormat;

+			USB_Audio_StreamEndpoint_Std_t        Audio_StreamEndpoint;

+			USB_Audio_StreamEndpoint_Spc_t        Audio_StreamEndpoint_SPC;

 		} USB_Descriptor_Configuration_t;

 		

 	/* Function Prototypes: */

diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
index 107d9bd7f..b9bc4b112 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
@@ -98,7 +98,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.IAD1 = 

+	.CDC1_IAD = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},

 

@@ -206,7 +206,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 

-	.IAD2 = 

+	.CDC2_IAD = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},

 

diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
index 2add46ad4..532c266a4 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
@@ -75,7 +75,7 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t    Config;

-			USB_Descriptor_Interface_Association_t   IAD1;

+			USB_Descriptor_Interface_Association_t   CDC1_IAD;

 			USB_Descriptor_Interface_t               CDC1_CCI_Interface;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_IntHeader;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_CallManagement;

@@ -85,7 +85,7 @@
 			USB_Descriptor_Interface_t               CDC1_DCI_Interface;

 			USB_Descriptor_Endpoint_t                CDC1_DataOutEndpoint;

 			USB_Descriptor_Endpoint_t                CDC1_DataInEndpoint;

-			USB_Descriptor_Interface_Association_t   IAD2;

+			USB_Descriptor_Interface_Association_t   CDC2_IAD;

 			USB_Descriptor_Interface_t               CDC2_CCI_Interface;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_IntHeader;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_CallManagement;

diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
index 3cc9817be..953edfe16 100644
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
@@ -112,7 +112,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.Interface = 

+	.HID_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -128,7 +128,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.GenericHID = 

+	.HID_GenericHID = 

 		{

 			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 									 

@@ -139,7 +139,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(GenericReport)

 		},

 

-	.GenericINEndpoint = 

+	.HID_ReportINEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 										 

@@ -226,7 +226,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			

 			break;

 		case DTYPE_HID: 

-			Address = (void*)&ConfigurationDescriptor.GenericHID;

+			Address = (void*)&ConfigurationDescriptor.HID_GenericHID;

 			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.h b/Demos/Device/ClassDriver/GenericHID/Descriptors.h
index efe13938d..26985f1fa 100644
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.h
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.h
@@ -50,9 +50,9 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            Interface;

-			USB_HID_Descriptor_t                  GenericHID;

-	        USB_Descriptor_Endpoint_t             GenericINEndpoint;

+			USB_Descriptor_Interface_t            HID_Interface;

+			USB_HID_Descriptor_t                  HID_GenericHID;

+	        USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;

 		} USB_Descriptor_Configuration_t;

 

 	/* Macros: */

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c
index c8a6c306b..64d72add5 100644
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.c
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c
@@ -122,7 +122,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.Interface = 

+	.HID_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -138,7 +138,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.JoystickHID = 

+	.HID_JoystickHID = 

 		{

 			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

@@ -149,7 +149,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(JoystickReport)

 		},

 

-	.JoystickEndpoint = 

+	.HID_ReportINEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -236,7 +236,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			

 			break;

 		case DTYPE_HID: 

-			Address = (void*)&ConfigurationDescriptor.JoystickHID;

+			Address = (void*)&ConfigurationDescriptor.HID_JoystickHID;

 			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.h b/Demos/Device/ClassDriver/Joystick/Descriptors.h
index b2edc85eb..1777a566c 100644
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.h
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.h
@@ -50,9 +50,9 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            Interface;

-			USB_HID_Descriptor_t                  JoystickHID;

-	        USB_Descriptor_Endpoint_t             JoystickEndpoint;

+			USB_Descriptor_Interface_t            HID_Interface;

+			USB_HID_Descriptor_t                  HID_JoystickHID;

+	        USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;

 		} USB_Descriptor_Configuration_t;

 

 	/* Macros: */

diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.c b/Demos/Device/ClassDriver/Keyboard/Descriptors.c
index 5890cb441..7e12c6596 100644
--- a/Demos/Device/ClassDriver/Keyboard/Descriptors.c
+++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.c
@@ -129,7 +129,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.Interface = 

+	.HID_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -145,7 +145,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.KeyboardHID = 

+	.HID_KeyboardHID = 

 		{  

 			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

@@ -156,7 +156,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(KeyboardReport)

 		},

 		

-	.KeyboardEndpoint = 

+	.HID_ReportINEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -243,7 +243,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			

 			break;

 		case DTYPE_HID: 

-			Address = (void*)&ConfigurationDescriptor.KeyboardHID;

+			Address = (void*)&ConfigurationDescriptor.HID_KeyboardHID;

 			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.h b/Demos/Device/ClassDriver/Keyboard/Descriptors.h
index 5f2a2c024..6a147c62e 100644
--- a/Demos/Device/ClassDriver/Keyboard/Descriptors.h
+++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.h
@@ -51,9 +51,9 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            Interface;

-			USB_HID_Descriptor_t                  KeyboardHID;

-	        USB_Descriptor_Endpoint_t             KeyboardEndpoint;

+			USB_Descriptor_Interface_t            HID_Interface;

+			USB_HID_Descriptor_t                  HID_KeyboardHID;

+	        USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;

 		} USB_Descriptor_Configuration_t;

 					

 	/* Macros: */

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
index 69eaf7c42..2818b6e98 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
@@ -162,7 +162,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.KeyboardInterface = 

+	.HID1_KeyboardInterface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -178,7 +178,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.KeyboardHID = 

+	.HID1_KeyboardHID = 

 		{  

 			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

@@ -189,7 +189,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(KeyboardReport)

 		},

 		

-	.KeyboardInEndpoint = 

+	.HID1_ReportINEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -199,7 +199,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x0A

 		},

 

-	.MouseInterface = 

+	.HID2_MouseInterface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -215,7 +215,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.MouseHID = 

+	.HID2_MouseHID = 

 		{  

 			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

@@ -226,7 +226,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(MouseReport)

 		},

 		

-	.MouseInEndpoint = 

+	.HID2_ReportINEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -315,12 +315,12 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 		case DTYPE_HID: 

 			if (!(wIndex))

 			{

-				Address = (void*)&ConfigurationDescriptor.KeyboardHID;

+				Address = (void*)&ConfigurationDescriptor.HID1_KeyboardHID;

 				Size    = sizeof(USB_HID_Descriptor_t);

 			}

 			else

 			{

-				Address = (void*)&ConfigurationDescriptor.MouseHID;

+				Address = (void*)&ConfigurationDescriptor.HID2_MouseHID;

 				Size    = sizeof(USB_HID_Descriptor_t);			

 			}

 			break;

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
index 38bf13a3b..517b3a08e 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
@@ -51,12 +51,12 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            KeyboardInterface;

-			USB_HID_Descriptor_t                  KeyboardHID;

-	        USB_Descriptor_Endpoint_t             KeyboardInEndpoint;

-			USB_Descriptor_Interface_t            MouseInterface;

-			USB_HID_Descriptor_t                  MouseHID;

-	        USB_Descriptor_Endpoint_t             MouseInEndpoint;

+			USB_Descriptor_Interface_t            HID1_KeyboardInterface;

+			USB_HID_Descriptor_t                  HID1_KeyboardHID;

+	        USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;

+			USB_Descriptor_Interface_t            HID2_MouseInterface;

+			USB_HID_Descriptor_t                  HID2_MouseHID;

+	        USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;

 		} USB_Descriptor_Configuration_t;

 					

 	/* Macros: */

diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.c b/Demos/Device/ClassDriver/MIDI/Descriptors.c
index 2c0bb7846..4b9e03bff 100644
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.c
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.c
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.AudioControlInterface = 

+	.Audio_ControlInterface = 

 		{

 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -102,7 +102,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR

 		},

 	

-	.AudioControlInterface_SPC = 

+	.Audio_ControlInterface_SPC = 

 		{

 			.Header                   = {.Size = sizeof(USB_Audio_Interface_AC_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_Header,

@@ -114,7 +114,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceNumbers         = {1},

 		},

 

-	.AudioStreamInterface = 

+	.Audio_StreamInterface = 

 		{

 			.Header                   = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -130,14 +130,15 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex        = NO_DESCRIPTOR

 		},

 		

-	.AudioStreamInterface_SPC = 

+	.Audio_StreamInterface_SPC = 

 		{

 			.Header                   = {.Size = sizeof(USB_MIDI_AudioInterface_AS_t), .Type = DTYPE_AudioInterface},

 			.Subtype                  = DSUBTYPE_General,

 

 			.AudioSpecification       = VERSION_BCD(01.00),

 			

-			.TotalLength              = (sizeof(USB_Descriptor_Configuration_t) - offsetof(USB_Descriptor_Configuration_t, AudioStreamInterface_SPC))

+			.TotalLength              = (sizeof(USB_Descriptor_Configuration_t) -

+			                             offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC))

 		},

 

 	.MIDI_In_Jack_Emb = 

diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h
index 6cef8422f..ffd261e58 100644
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h
@@ -60,10 +60,10 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            AudioControlInterface;

-			USB_Audio_Interface_AC_t              AudioControlInterface_SPC;

-			USB_Descriptor_Interface_t            AudioStreamInterface;

-			USB_MIDI_AudioInterface_AS_t          AudioStreamInterface_SPC;

+			USB_Descriptor_Interface_t            Audio_ControlInterface;

+			USB_Audio_Interface_AC_t              Audio_ControlInterface_SPC;

+			USB_Descriptor_Interface_t            Audio_StreamInterface;

+			USB_MIDI_AudioInterface_AS_t          Audio_StreamInterface_SPC;

 			USB_MIDI_In_Jack_t                    MIDI_In_Jack_Emb;

 			USB_MIDI_In_Jack_t                    MIDI_In_Jack_Ext;

 			USB_MIDI_Out_Jack_t                   MIDI_Out_Jack_Emb;

diff --git a/Demos/Device/ClassDriver/MassStorage/Descriptors.c b/Demos/Device/ClassDriver/MassStorage/Descriptors.c
index 40ce620a6..856d408ca 100644
--- a/Demos/Device/ClassDriver/MassStorage/Descriptors.c
+++ b/Demos/Device/ClassDriver/MassStorage/Descriptors.c
@@ -98,7 +98,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.Interface = 

+	.MS_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -114,7 +114,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.DataInEndpoint = 

+	.MS_DataInEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -124,7 +124,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 

-	.DataOutEndpoint = 

+	.MS_DataOutEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

diff --git a/Demos/Device/ClassDriver/MassStorage/Descriptors.h b/Demos/Device/ClassDriver/MassStorage/Descriptors.h
index dcaaddaf7..e249fc479 100644
--- a/Demos/Device/ClassDriver/MassStorage/Descriptors.h
+++ b/Demos/Device/ClassDriver/MassStorage/Descriptors.h
@@ -60,9 +60,9 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            Interface;

-			USB_Descriptor_Endpoint_t             DataInEndpoint;

-			USB_Descriptor_Endpoint_t             DataOutEndpoint;

+			USB_Descriptor_Interface_t            MS_Interface;

+			USB_Descriptor_Endpoint_t             MS_DataInEndpoint;

+			USB_Descriptor_Endpoint_t             MS_DataOutEndpoint;

 		} USB_Descriptor_Configuration_t;

 		

 	/* Function Prototypes: */

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
index e8523f460..4f7684c8a 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
@@ -141,7 +141,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.MassStorageInterface = 

+	.MS_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -157,7 +157,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.MassStorageDataInEndpoint = 

+	.MS_DataInEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -167,7 +167,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 

-	.MassStorageDataOutEndpoint = 

+	.MS_DataOutEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -177,7 +177,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 

-	.KeyboardInterface = 

+	.HID_KeyboardInterface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -193,7 +193,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.KeyboardHID = 

+	.HID_KeyboardHID = 

 		{  

 			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 			

@@ -204,7 +204,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(KeyboardReport)

 		},

 		

-	.KeyboardEndpoint = 

+	.HID_ReportINEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -291,7 +291,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			

 			break;

 		case DTYPE_HID:

-			Address = (void*)&ConfigurationDescriptor.KeyboardHID;

+			Address = (void*)&ConfigurationDescriptor.HID_KeyboardHID;

 			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report:

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
index c29d9086d..13fb64c4d 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
@@ -68,12 +68,12 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            MassStorageInterface;

-			USB_Descriptor_Endpoint_t             MassStorageDataInEndpoint;

-			USB_Descriptor_Endpoint_t             MassStorageDataOutEndpoint;

-			USB_Descriptor_Interface_t            KeyboardInterface;

-			USB_HID_Descriptor_t                  KeyboardHID;

-	        USB_Descriptor_Endpoint_t             KeyboardEndpoint;

+			USB_Descriptor_Interface_t            MS_Interface;

+			USB_Descriptor_Endpoint_t             MS_DataInEndpoint;

+			USB_Descriptor_Endpoint_t             MS_DataOutEndpoint;

+			USB_Descriptor_Interface_t            HID_KeyboardInterface;

+			USB_HID_Descriptor_t                  HID_KeyboardHID;

+	        USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;

 		} USB_Descriptor_Configuration_t;

 		

 	/* Function Prototypes: */

diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.c b/Demos/Device/ClassDriver/Mouse/Descriptors.c
index c6aeb2ad7..7a5fc349e 100644
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.c
@@ -122,7 +122,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.Interface = 

+	.HID_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -138,7 +138,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.MouseHID = 

+	.HID_MouseHID = 

 		{

 			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 

@@ -149,7 +149,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(MouseReport)

 		},

 

-	.MouseEndpoint = 

+	.HID_ReportINEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -236,7 +236,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			

 			break;

 		case DTYPE_HID: 

-			Address = (void*)&ConfigurationDescriptor.MouseHID;

+			Address = (void*)&ConfigurationDescriptor.HID_MouseHID;

 			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.h b/Demos/Device/ClassDriver/Mouse/Descriptors.h
index aa291f320..f5364ce15 100644
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.h
@@ -50,9 +50,9 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t Config;

-			USB_Descriptor_Interface_t            Interface;

-			USB_HID_Descriptor_t                  MouseHID;

-	        USB_Descriptor_Endpoint_t             MouseEndpoint;

+			USB_Descriptor_Interface_t            HID_Interface;

+			USB_HID_Descriptor_t                  HID_MouseHID;

+	        USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;

 		} USB_Descriptor_Configuration_t;

 					

 	/* Macros: */

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
index 09b5261cc..5d5400d53 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.CCI_Interface = 

+	.CDC_CCI_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.Data                   = {0x00, 0x01}

 		},

 

-	.ManagementEndpoint = 

+	.CDC_ManagementEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x02

 		},

 

-	.DCI_Interface = 

+	.CDC_DCI_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -160,7 +160,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.DataOutEndpoint = 

+	.RNDIS_DataOutEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			 

@@ -170,7 +170,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 		

-	.DataInEndpoint = 

+	.RNDIS_DataInEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
index b43aab7ac..a5e351725 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
@@ -66,15 +66,15 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t    Config;

-			USB_Descriptor_Interface_t               CCI_Interface;

+			USB_Descriptor_Interface_t               CDC_CCI_Interface;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Header;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_CallManagement;

 			CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;

-			USB_Descriptor_Endpoint_t                ManagementEndpoint;

-			USB_Descriptor_Interface_t               DCI_Interface;

-			USB_Descriptor_Endpoint_t                DataOutEndpoint;

-			USB_Descriptor_Endpoint_t                DataInEndpoint;

+			USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;

+			USB_Descriptor_Interface_t               CDC_DCI_Interface;

+			USB_Descriptor_Endpoint_t                RNDIS_DataOutEndpoint;

+			USB_Descriptor_Endpoint_t                RNDIS_DataInEndpoint;

 		} USB_Descriptor_Configuration_t;

 

 	/* Function Prototypes: */

diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
index 07380cb15..4d513cc50 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
+++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
@@ -98,7 +98,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

 		},

 		

-	.CCI_Interface = 

+	.CDC_CCI_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -146,7 +146,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.Data                   = {0x00, 0x01}

 		},

 

-	.ManagementEndpoint = 

+	.CDC_ManagementEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -156,7 +156,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0xFF

 		},

 

-	.DCI_Interface = 

+	.CDC_DCI_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -172,7 +172,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.DataOutEndpoint = 

+	.CDC_DataOutEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -182,7 +182,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 		

-	.DataInEndpoint = 

+	.CDC_DataInEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
index 2141812bf..2c56fa349 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
@@ -66,15 +66,15 @@
 		typedef struct

 		{

 			USB_Descriptor_Configuration_Header_t    Config;

-			USB_Descriptor_Interface_t               CCI_Interface;

+			USB_Descriptor_Interface_t               CDC_CCI_Interface;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_CallManagement;

 			CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;

-			USB_Descriptor_Endpoint_t                ManagementEndpoint;

-			USB_Descriptor_Interface_t               DCI_Interface;

-			USB_Descriptor_Endpoint_t                DataOutEndpoint;

-			USB_Descriptor_Endpoint_t                DataInEndpoint;

+			USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;

+			USB_Descriptor_Interface_t               CDC_DCI_Interface;

+			USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;

+			USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;

 		} USB_Descriptor_Configuration_t;

 

 	/* Function Prototypes: */

diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
index 8bb8a1eed..c55aa0c0c 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
@@ -148,7 +148,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.IADStrIndex            = NO_DESCRIPTOR

 		},

 		

-	.CCI_Interface = 

+	.CDC_CCI_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -196,7 +196,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.Data                   = {0x00, 0x01}

 		},

 

-	.ManagementEndpoint = 

+	.CDC_ManagementEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -206,7 +206,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0xFF

 		},

 

-	.DCI_Interface = 

+	.CDC_DCI_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -222,7 +222,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.DataOutEndpoint = 

+	.CDC_DataOutEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -232,7 +232,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 		

-	.DataInEndpoint = 

+	.CDC_DataInEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 			

@@ -242,7 +242,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.PollingIntervalMS      = 0x00

 		},

 

-	.InterfaceHID = 

+	.HID_Interface = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

@@ -258,7 +258,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR

 		},

 

-	.MouseHID = 

+	.HID_MouseHID = 

 		{

 			.Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},

 

@@ -269,7 +269,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.HIDReportLength        = sizeof(MouseReport)

 		},

 

-	.MouseEndpoint = 

+	.HID_ReportINEndpoint = 

 		{

 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

@@ -356,7 +356,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 			

 			break;

 		case DTYPE_HID: 

-			Address = (void*)&ConfigurationDescriptor.MouseHID;

+			Address = (void*)&ConfigurationDescriptor.HID_MouseHID;

 			Size    = sizeof(USB_HID_Descriptor_t);

 			break;

 		case DTYPE_Report: 

diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
index cab52083b..c754dbe07 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
@@ -74,18 +74,18 @@
 		{

 			USB_Descriptor_Configuration_Header_t    Config;

 			USB_Descriptor_Interface_Association_t   CDC_IAD;

-			USB_Descriptor_Interface_t               CCI_Interface;

+			USB_Descriptor_Interface_t               CDC_CCI_Interface;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_CallManagement;

 			CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;

 			CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;

-			USB_Descriptor_Endpoint_t                ManagementEndpoint;

-			USB_Descriptor_Interface_t               DCI_Interface;

-			USB_Descriptor_Endpoint_t                DataOutEndpoint;

-			USB_Descriptor_Endpoint_t                DataInEndpoint;

-			USB_Descriptor_Interface_t               InterfaceHID;

-			USB_HID_Descriptor_t                     MouseHID;

-	        USB_Descriptor_Endpoint_t                MouseEndpoint;

+			USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;

+			USB_Descriptor_Interface_t               CDC_DCI_Interface;

+			USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;

+			USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;

+			USB_Descriptor_Interface_t               HID_Interface;

+			USB_HID_Descriptor_t                     HID_MouseHID;

+	        USB_Descriptor_Endpoint_t                HID_ReportINEndpoint;

 		} USB_Descriptor_Configuration_t;

 

 	/* Function Prototypes: */