diff --git a/examples/device/audio_4_channel_mic/src/main.c b/examples/device/audio_4_channel_mic/src/main.c
index 3e0f03a20..de9e8a06a 100644
--- a/examples/device/audio_4_channel_mic/src/main.c
+++ b/examples/device/audio_4_channel_mic/src/main.c
@@ -66,8 +66,8 @@ uint32_t sampFreq;
 uint8_t clkValid;
 
 // Range states
-audio_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
-audio_control_range_4_n_t(1) sampleFreqRng;                                    // Sample frequency range state
+audio20_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
+audio20_control_range_4_n_t(1) sampleFreqRng;                                    // Sample frequency range state
 
 // Audio test data, 4 channels muxed together, buffer[0] for CH0, buffer[1] for CH1, buffer[2] for CH2, buffer[3] for CH3
 uint16_t i2s_dummy_buffer[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX * CFG_TUD_AUDIO_FUNC_1_SAMPLE_RATE / 1000];
@@ -171,7 +171,7 @@ bool tud_audio_set_req_ep_cb(uint8_t rhport, tusb_control_request_t const *p_req
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -191,7 +191,7 @@ bool tud_audio_set_req_itf_cb(uint8_t rhport, tusb_control_request_t const *p_re
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -218,25 +218,25 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   (void) itf;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // If request is for our feature unit
   if (entityID == 2) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Request uses format layout 1
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_1_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_1_t));
 
-        mute[channelNum] = ((audio_control_cur_1_t *) pBuff)->bCur;
+        mute[channelNum] = ((audio20_control_cur_1_t *) pBuff)->bCur;
 
         TU_LOG2("    Set Mute: %d of channel: %u\r\n", mute[channelNum], channelNum);
         return true;
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         // Request uses format layout 2
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_2_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_2_t));
 
-        volume[channelNum] = (uint16_t) ((audio_control_cur_2_t *) pBuff)->bCur;
+        volume[channelNum] = (uint16_t) ((audio20_control_cur_2_t *) pBuff)->bCur;
 
         TU_LOG2("    Set Volume: %d dB of channel: %u\r\n", volume[channelNum], channelNum);
         return true;
@@ -297,13 +297,13 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Input terminal (Microphone input)
   if (entityID == 1) {
     switch (ctrlSel) {
-      case AUDIO_TE_CTRL_CONNECTOR: {
+      case AUDIO20_TE_CTRL_CONNECTOR: {
         // The terminal connector control only has a get request with only the CUR attribute.
-        audio_desc_channel_cluster_t ret;
+        audio20_desc_channel_cluster_t ret;
 
         // Those are dummy values for now
         ret.bNrChannels = 1;
-        ret.bmChannelConfig = (audio_channel_config_t) 0;
+        ret.bmChannelConfig = (audio20_channel_config_t) 0;
         ret.iChannelNames = 0;
 
         TU_LOG2("    Get terminal connector\r\n");
@@ -321,24 +321,23 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Feature unit
   if (entityID == 2) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Audio control mute cur parameter block consists of only one byte - we thus can send it right away
         // There does not exist a range parameter block for mute
         TU_LOG2("    Get Mute of channel: %u\r\n", channelNum);
         return tud_control_xfer(rhport, p_request, &mute[channelNum], 1);
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG2("    Get Volume of channel: %u\r\n", channelNum);
             return tud_control_xfer(rhport, p_request, &volume[channelNum], sizeof(volume[channelNum]));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG2("    Get Volume range of channel: %u\r\n", channelNum);
 
             // Copy values - only for testing - better is version below
-            audio_control_range_2_n_t(1)
-                ret;
+            audio20_control_range_2_n_t(1) ret;
 
             ret.wNumSubRanges = 1;
             ret.subrange[0].bMin = -90;// -90 dB
@@ -364,15 +363,15 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Clock Source unit
   if (entityID == 4) {
     switch (ctrlSel) {
-      case AUDIO_CS_CTRL_SAM_FREQ:
+      case AUDIO20_CS_CTRL_SAM_FREQ:
         // channelNum is always zero in this case
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG2("    Get Sample Freq.\r\n");
             // Buffered control transfer is needed for IN flow control to work
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &sampFreq, sizeof(sampFreq));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG2("    Get Sample Freq. range\r\n");
             return tud_control_xfer(rhport, p_request, &sampleFreqRng, sizeof(sampleFreqRng));
 
@@ -383,7 +382,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
         }
         break;
 
-      case AUDIO_CS_CTRL_CLK_VALID:
+      case AUDIO20_CS_CTRL_CLK_VALID:
         // Only cur attribute exists for this request
         TU_LOG2("    Get Sample Freq. valid\r\n");
         return tud_control_xfer(rhport, p_request, &clkValid, sizeof(clkValid));
diff --git a/examples/device/audio_4_channel_mic_freertos/src/main.c b/examples/device/audio_4_channel_mic_freertos/src/main.c
index 96eca0be9..4572bbb3c 100644
--- a/examples/device/audio_4_channel_mic_freertos/src/main.c
+++ b/examples/device/audio_4_channel_mic_freertos/src/main.c
@@ -102,8 +102,8 @@ uint32_t sampFreq;
 uint8_t clkValid;
 
 // Range states
-audio_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
-audio_control_range_4_n_t(1) sampleFreqRng;                                    // Sample frequency range state
+audio20_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
+audio20_control_range_4_n_t(1) sampleFreqRng;                                    // Sample frequency range state
 
 // Audio test data, 4 channels muxed together, buffer[0] for CH0, buffer[1] for CH1, buffer[2] for CH2, buffer[3] for CH3
 uint16_t i2s_dummy_buffer[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX * CFG_TUD_AUDIO_FUNC_1_SAMPLE_RATE / 1000];
@@ -245,7 +245,7 @@ bool tud_audio_set_req_ep_cb(uint8_t rhport, tusb_control_request_t const *p_req
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -265,7 +265,7 @@ bool tud_audio_set_req_itf_cb(uint8_t rhport, tusb_control_request_t const *p_re
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -292,25 +292,25 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   (void) itf;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // If request is for our feature unit
   if (entityID == 2) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Request uses format layout 1
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_1_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_1_t));
 
-        mute[channelNum] = ((audio_control_cur_1_t *) pBuff)->bCur;
+        mute[channelNum] = ((audio20_control_cur_1_t *) pBuff)->bCur;
 
         TU_LOG1("    Set Mute: %d of channel: %u\r\n", mute[channelNum], channelNum);
         return true;
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         // Request uses format layout 2
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_2_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_2_t));
 
-        volume[channelNum] = ((audio_control_cur_2_t *) pBuff)->bCur;
+        volume[channelNum] = ((audio20_control_cur_2_t *) pBuff)->bCur;
         TU_LOG1("    Set Volume: %d dB of channel: %u\r\n", volume[channelNum], channelNum);
         return true;
 
@@ -368,9 +368,9 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Input terminal (Microphone input)
   if (entityID == 1) {
     switch (ctrlSel) {
-      case AUDIO_TE_CTRL_CONNECTOR: {
+      case AUDIO20_TE_CTRL_CONNECTOR: {
         // The terminal connector control only has a get request with only the CUR attribute.
-        audio_desc_channel_cluster_t ret;
+        audio20_desc_channel_cluster_t ret;
 
         // Those are dummy values for now
         ret.bNrChannels = 1;
@@ -392,23 +392,23 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Feature unit
   if (entityID == 2) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Audio control mute cur parameter block consists of only one byte - we thus can send it right away
         // There does not exist a range parameter block for mute
         TU_LOG1("    Get Mute of channel: %u\r\n", channelNum);
         return tud_control_xfer(rhport, p_request, &mute[channelNum], 1);
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG1("    Get Volume of channel: %u\r\n", channelNum);
             return tud_control_xfer(rhport, p_request, &volume[channelNum], sizeof(volume[channelNum]));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG1("    Get Volume range of channel: %u\r\n", channelNum);
 
             // Copy values - only for testing - better is version below
-            audio_control_range_2_n_t(1) ret;
+            audio20_control_range_2_n_t(1) ret;
 
             ret.wNumSubRanges = 1;
             ret.subrange[0].bMin = -90;// -90 dB
@@ -434,15 +434,15 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Clock Source unit
   if (entityID == 4) {
     switch (ctrlSel) {
-      case AUDIO_CS_CTRL_SAM_FREQ:
+      case AUDIO20_CS_CTRL_SAM_FREQ:
         // channelNum is always zero in this case
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG1("    Get Sample Freq.\r\n");
             // Buffered control transfer is needed for IN flow control to work
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &sampFreq, sizeof(sampFreq));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG1("    Get Sample Freq. range\r\n");
             return tud_control_xfer(rhport, p_request, &sampleFreqRng, sizeof(sampleFreqRng));
 
@@ -453,7 +453,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
         }
         break;
 
-      case AUDIO_CS_CTRL_CLK_VALID:
+      case AUDIO20_CS_CTRL_CLK_VALID:
         // Only cur attribute exists for this request
         TU_LOG1("    Get Sample Freq. valid\r\n");
         return tud_control_xfer(rhport, p_request, &clkValid, sizeof(clkValid));
diff --git a/examples/device/audio_test/src/main.c b/examples/device/audio_test/src/main.c
index 5b3beec24..875d0b7f0 100644
--- a/examples/device/audio_test/src/main.c
+++ b/examples/device/audio_test/src/main.c
@@ -63,8 +63,8 @@ uint32_t sampFreq;
 uint8_t clkValid;
 
 // Range states
-audio_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
-audio_control_range_4_n_t(1) sampleFreqRng;                                    // Sample frequency range state
+audio20_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
+audio20_control_range_4_n_t(1) sampleFreqRng;                                    // Sample frequency range state
 
 // Audio test data
 uint16_t test_buffer_audio[CFG_TUD_AUDIO_FUNC_1_SAMPLE_RATE / 1000 * CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX * CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX / 2];
@@ -157,7 +157,7 @@ bool tud_audio_set_req_ep_cb(uint8_t rhport, tusb_control_request_t const *p_req
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -177,7 +177,7 @@ bool tud_audio_set_req_itf_cb(uint8_t rhport, tusb_control_request_t const *p_re
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -204,25 +204,25 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   (void) itf;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // If request is for our feature unit
   if (entityID == 2) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Request uses format layout 1
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_1_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_1_t));
 
-        mute[channelNum] = ((audio_control_cur_1_t *) pBuff)->bCur;
+        mute[channelNum] = ((audio20_control_cur_1_t *) pBuff)->bCur;
 
         TU_LOG2("    Set Mute: %d of channel: %u\r\n", mute[channelNum], channelNum);
         return true;
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         // Request uses format layout 2
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_2_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_2_t));
 
-        volume[channelNum] = (uint16_t) ((audio_control_cur_2_t *) pBuff)->bCur;
+        volume[channelNum] = (uint16_t) ((audio20_control_cur_2_t *) pBuff)->bCur;
 
         TU_LOG2("    Set Volume: %d dB of channel: %u\r\n", volume[channelNum], channelNum);
         return true;
@@ -283,13 +283,13 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Input terminal (Microphone input)
   if (entityID == 1) {
     switch (ctrlSel) {
-      case AUDIO_TE_CTRL_CONNECTOR: {
+      case AUDIO20_TE_CTRL_CONNECTOR: {
         // The terminal connector control only has a get request with only the CUR attribute.
-        audio_desc_channel_cluster_t ret;
+        audio20_desc_channel_cluster_t ret;
 
         // Those are dummy values for now
         ret.bNrChannels = 1;
-        ret.bmChannelConfig = (audio_channel_config_t) 0;
+        ret.bmChannelConfig = (audio20_channel_config_t) 0;
         ret.iChannelNames = 0;
 
         TU_LOG2("    Get terminal connector\r\n");
@@ -307,23 +307,23 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Feature unit
   if (entityID == 2) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Audio control mute cur parameter block consists of only one byte - we thus can send it right away
         // There does not exist a range parameter block for mute
         TU_LOG2("    Get Mute of channel: %u\r\n", channelNum);
         return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &mute[channelNum], 1);
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG2("    Get Volume of channel: %u\r\n", channelNum);
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &volume[channelNum], sizeof(volume[channelNum]));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG2("    Get Volume range of channel: %u\r\n", channelNum);
 
             // Copy values - only for testing - better is version below
-            audio_control_range_2_n_t(1)
+            audio20_control_range_2_n_t(1)
                 ret;
 
             ret.wNumSubRanges = 1;
@@ -350,14 +350,14 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Clock Source unit
   if (entityID == 4) {
     switch (ctrlSel) {
-      case AUDIO_CS_CTRL_SAM_FREQ:
+      case AUDIO20_CS_CTRL_SAM_FREQ:
         // channelNum is always zero in this case
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG2("    Get Sample Freq.\r\n");
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &sampFreq, sizeof(sampFreq));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG2("    Get Sample Freq. range\r\n");
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &sampleFreqRng, sizeof(sampleFreqRng));
 
@@ -368,7 +368,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
         }
         break;
 
-      case AUDIO_CS_CTRL_CLK_VALID:
+      case AUDIO20_CS_CTRL_CLK_VALID:
         // Only cur attribute exists for this request
         TU_LOG2("    Get Sample Freq. valid\r\n");
         return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &clkValid, sizeof(clkValid));
diff --git a/examples/device/audio_test_freertos/src/main.c b/examples/device/audio_test_freertos/src/main.c
index 1eab5dab8..cf2fb74d1 100644
--- a/examples/device/audio_test_freertos/src/main.c
+++ b/examples/device/audio_test_freertos/src/main.c
@@ -100,8 +100,8 @@ uint32_t sampFreq;
 uint8_t clkValid;
 
 // Range states
-audio_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
-audio_control_range_4_n_t(1) sampleFreqRng;                                    // Sample frequency range state
+audio20_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
+audio20_control_range_4_n_t(1) sampleFreqRng;                                    // Sample frequency range state
 
 // Audio test data
 uint16_t test_buffer_audio[CFG_TUD_AUDIO_FUNC_1_SAMPLE_RATE / 1000 * CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX * CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX / 2];
@@ -231,7 +231,7 @@ bool tud_audio_set_req_ep_cb(uint8_t rhport, tusb_control_request_t const *p_req
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -251,7 +251,7 @@ bool tud_audio_set_req_itf_cb(uint8_t rhport, tusb_control_request_t const *p_re
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -278,25 +278,25 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   (void) itf;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // If request is for our feature unit
   if (entityID == 2) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Request uses format layout 1
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_1_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_1_t));
 
-        mute[channelNum] = ((audio_control_cur_1_t *) pBuff)->bCur;
+        mute[channelNum] = ((audio20_control_cur_1_t *) pBuff)->bCur;
 
         TU_LOG1("    Set Mute: %d of channel: %u\r\n", mute[channelNum], channelNum);
         return true;
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         // Request uses format layout 2
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_2_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_2_t));
 
-        volume[channelNum] = (uint16_t) ((audio_control_cur_2_t *) pBuff)->bCur;
+        volume[channelNum] = (uint16_t) ((audio20_control_cur_2_t *) pBuff)->bCur;
         TU_LOG1("    Set Volume: %d dB of channel: %u\r\n", volume[channelNum], channelNum);
         return true;
 
@@ -354,13 +354,13 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Input terminal (Microphone input)
   if (entityID == 1) {
     switch (ctrlSel) {
-      case AUDIO_TE_CTRL_CONNECTOR: {
+      case AUDIO20_TE_CTRL_CONNECTOR: {
         // The terminal connector control only has a get request with only the CUR attribute.
-        audio_desc_channel_cluster_t ret;
+        audio20_desc_channel_cluster_t ret;
 
         // Those are dummy values for now
         ret.bNrChannels = 1;
-        ret.bmChannelConfig = (audio_channel_config_t) 0;
+        ret.bmChannelConfig = (audio20_channel_config_t) 0;
         ret.iChannelNames = 0;
 
         TU_LOG1("    Get terminal connector\r\n");
@@ -378,23 +378,23 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Feature unit
   if (entityID == 2) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Audio control mute cur parameter block consists of only one byte - we thus can send it right away
         // There does not exist a range parameter block for mute
         TU_LOG1("    Get Mute of channel: %u\r\n", channelNum);
         return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &mute[channelNum], 1);
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG1("    Get Volume of channel: %u\r\n", channelNum);
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &volume[channelNum], sizeof(volume[channelNum]));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG1("    Get Volume range of channel: %u\r\n", channelNum);
 
             // Copy values - only for testing - better is version below
-            audio_control_range_2_n_t(1)
+            audio20_control_range_2_n_t(1)
                 ret;
 
             ret.wNumSubRanges = 1;
@@ -421,14 +421,14 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Clock Source unit
   if (entityID == 4) {
     switch (ctrlSel) {
-      case AUDIO_CS_CTRL_SAM_FREQ:
+      case AUDIO20_CS_CTRL_SAM_FREQ:
         // channelNum is always zero in this case
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG1("    Get Sample Freq.\r\n");
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &sampFreq, sizeof(sampFreq));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG1("    Get Sample Freq. range\r\n");
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &sampleFreqRng, sizeof(sampleFreqRng));
 
@@ -439,7 +439,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
         }
         break;
 
-      case AUDIO_CS_CTRL_CLK_VALID:
+      case AUDIO20_CS_CTRL_CLK_VALID:
         // Only cur attribute exists for this request
         TU_LOG1("    Get Sample Freq. valid\r\n");
         return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &clkValid, sizeof(clkValid));
diff --git a/examples/device/audio_test_multi_rate/src/main.c b/examples/device/audio_test_multi_rate/src/main.c
index 9d467991e..2e8a1dba5 100644
--- a/examples/device/audio_test_multi_rate/src/main.c
+++ b/examples/device/audio_test_multi_rate/src/main.c
@@ -80,7 +80,7 @@ static const uint8_t bytesPerSampleAltList[CFG_TUD_AUDIO_FUNC_1_N_FORMATS] =
         CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_TX,
 };
 
-audio_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
+audio20_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1];// Volume range state
 
 
 // Audio test data
@@ -195,7 +195,7 @@ bool tud_audio_set_req_ep_cb(uint8_t rhport, tusb_control_request_t const *p_req
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -215,7 +215,7 @@ bool tud_audio_set_req_itf_cb(uint8_t rhport, tusb_control_request_t const *p_re
   (void) pBuff;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // Page 91 in UAC2 specification
   uint8_t channelNum = TU_U16_LOW(p_request->wValue);
@@ -242,25 +242,25 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   (void) itf;
 
   // We do not support any set range requests here, only current value requests
-  TU_VERIFY(p_request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
 
   // If request is for our feature unit
   if (entityID == UAC2_ENTITY_FEATURE_UNIT) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Request uses format layout 1
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_1_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_1_t));
 
-        mute[channelNum] = ((audio_control_cur_1_t *) pBuff)->bCur;
+        mute[channelNum] = ((audio20_control_cur_1_t *) pBuff)->bCur;
 
         TU_LOG2("    Set Mute: %d of channel: %u\r\n", mute[channelNum], channelNum);
         return true;
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         // Request uses format layout 2
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_2_t));
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_2_t));
 
-        volume[channelNum] = (uint16_t) ((audio_control_cur_2_t *) pBuff)->bCur;
+        volume[channelNum] = (uint16_t) ((audio20_control_cur_2_t *) pBuff)->bCur;
 
         TU_LOG2("    Set Volume: %d dB of channel: %u\r\n", volume[channelNum], channelNum);
         return true;
@@ -275,10 +275,10 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Clock Source unit
   if (entityID == UAC2_ENTITY_CLOCK) {
     switch (ctrlSel) {
-      case AUDIO_CS_CTRL_SAM_FREQ:
-        TU_VERIFY(p_request->wLength == sizeof(audio_control_cur_4_t));
+      case AUDIO20_CS_CTRL_SAM_FREQ:
+        TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_4_t));
 
-        sampFreq = (uint32_t) ((audio_control_cur_4_t *) pBuff)->bCur;
+        sampFreq = (uint32_t) ((audio20_control_cur_4_t *) pBuff)->bCur;
 
         TU_LOG2("Clock set current freq: %" PRIu32 "\r\n", sampFreq);
 
@@ -342,9 +342,9 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Input terminal (Microphone input)
   if (entityID == UAC2_ENTITY_INPUT_TERMINAL) {
     switch (ctrlSel) {
-      case AUDIO_TE_CTRL_CONNECTOR: {
+      case AUDIO20_TE_CTRL_CONNECTOR: {
         // The terminal connector control only has a get request with only the CUR attribute.
-        audio_desc_channel_cluster_t ret;
+        audio20_desc_channel_cluster_t ret;
 
         // Those are dummy values for now
         ret.bNrChannels = 1;
@@ -366,23 +366,23 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Feature unit
   if (entityID == UAC2_ENTITY_FEATURE_UNIT) {
     switch (ctrlSel) {
-      case AUDIO_FU_CTRL_MUTE:
+      case AUDIO20_FU_CTRL_MUTE:
         // Audio control mute cur parameter block consists of only one byte - we thus can send it right away
         // There does not exist a range parameter block for mute
         TU_LOG2("    Get Mute of channel: %u\r\n", channelNum);
         return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &mute[channelNum], 1);
 
-      case AUDIO_FU_CTRL_VOLUME:
+      case AUDIO20_FU_CTRL_VOLUME:
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG2("    Get Volume of channel: %u\r\n", channelNum);
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &volume[channelNum], sizeof(volume[channelNum]));
 
-          case AUDIO_CS_REQ_RANGE:
+          case AUDIO20_CS_REQ_RANGE:
             TU_LOG2("    Get Volume range of channel: %u\r\n", channelNum);
 
             // Copy values - only for testing - better is version below
-            audio_control_range_2_n_t(1)
+            audio20_control_range_2_n_t(1)
                 ret;
 
             ret.wNumSubRanges = 1;
@@ -409,16 +409,16 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
   // Clock Source unit
   if (entityID == UAC2_ENTITY_CLOCK) {
     switch (ctrlSel) {
-      case AUDIO_CS_CTRL_SAM_FREQ:
+      case AUDIO20_CS_CTRL_SAM_FREQ:
         // channelNum is always zero in this case
         switch (p_request->bRequest) {
-          case AUDIO_CS_REQ_CUR:
+          case AUDIO20_CS_REQ_CUR:
             TU_LOG2("    Get Sample Freq.\r\n");
             return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &sampFreq, sizeof(sampFreq));
 
-          case AUDIO_CS_REQ_RANGE: {
+          case AUDIO20_CS_REQ_RANGE: {
             TU_LOG2("    Get Sample Freq. range\r\n");
-            audio_control_range_4_n_t(N_sampleRates) rangef =
+            audio20_control_range_4_n_t(N_sampleRates) rangef =
                 {
                     .wNumSubRanges = tu_htole16(N_sampleRates)};
             TU_LOG1("Clock get %d freq ranges\r\n", N_sampleRates);
@@ -437,7 +437,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
         }
         break;
 
-      case AUDIO_CS_CTRL_CLK_VALID:
+      case AUDIO20_CS_CTRL_CLK_VALID:
         // Only cur attribute exists for this request
         TU_LOG2("    Get Sample Freq. valid\r\n");
         return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &clkValid, sizeof(clkValid));
diff --git a/examples/device/audio_test_multi_rate/src/usb_descriptors.h b/examples/device/audio_test_multi_rate/src/usb_descriptors.h
index 8381e31f5..277b22d7b 100644
--- a/examples/device/audio_test_multi_rate/src/usb_descriptors.h
+++ b/examples/device/audio_test_multi_rate/src/usb_descriptors.h
@@ -64,15 +64,15 @@
   /* Standard AC Interface Descriptor(4.7.1) */\
   TUD_AUDIO_DESC_STD_AC(/*_itfnum*/ _itfnum, /*_nEPs*/ 0x00, /*_stridx*/ _stridx),\
   /* Class-Specific AC Interface Header Descriptor(4.7.2) */\
-  TUD_AUDIO_DESC_CS_AC(/*_bcdADC*/ 0x0200, /*_category*/ AUDIO_FUNC_MICROPHONE, /*_totallen*/ TUD_AUDIO_DESC_CLK_SRC_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN+TUD_AUDIO_DESC_FEATURE_UNIT_ONE_CHANNEL_LEN, /*_ctrl*/ AUDIO_CS_AS_INTERFACE_CTRL_LATENCY_POS),\
+  TUD_AUDIO_DESC_CS_AC(/*_bcdADC*/ 0x0200, /*_category*/ AUDIO20_FUNC_MICROPHONE, /*_totallen*/ TUD_AUDIO_DESC_CLK_SRC_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN+TUD_AUDIO_DESC_FEATURE_UNIT_ONE_CHANNEL_LEN, /*_ctrl*/ AUDIO20_CS_AS_INTERFACE_CTRL_LATENCY_POS),\
   /* Clock Source Descriptor(4.7.2.1) */\
-  TUD_AUDIO_DESC_CLK_SRC(/*_clkid*/ UAC2_ENTITY_CLOCK, /*_attr*/ AUDIO_CLOCK_SOURCE_ATT_INT_PRO_CLK, /*_ctrl*/ AUDIO_CTRL_RW << AUDIO_CLOCK_SOURCE_CTRL_CLK_FRQ_POS | AUDIO_CTRL_R << AUDIO_CLOCK_SOURCE_CTRL_CLK_VAL_POS, /*_assocTerm*/ 0x01,  /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_CLK_SRC(/*_clkid*/ UAC2_ENTITY_CLOCK, /*_attr*/ AUDIO20_CLOCK_SOURCE_ATT_INT_PRO_CLK, /*_ctrl*/ AUDIO20_CTRL_RW << AUDIO20_CLOCK_SOURCE_CTRL_CLK_FRQ_POS | AUDIO20_CTRL_R << AUDIO20_CLOCK_SOURCE_CTRL_CLK_VAL_POS, /*_assocTerm*/ 0x01,  /*_stridx*/ 0x00),\
   /* Input Terminal Descriptor(4.7.2.4) */\
-  TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_INPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_IN_GENERIC_MIC, /*_assocTerm*/ UAC2_ENTITY_OUTPUT_TERMINAL, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x01, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ AUDIO_CTRL_R << AUDIO_IN_TERM_CTRL_CONNECTOR_POS, /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_INPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_IN_GENERIC_MIC, /*_assocTerm*/ UAC2_ENTITY_OUTPUT_TERMINAL, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x01, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ AUDIO20_CTRL_R << AUDIO20_IN_TERM_CTRL_CONNECTOR_POS, /*_stridx*/ 0x00),\
   /* Output Terminal Descriptor(4.7.2.5) */\
-  TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_OUTPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ UAC2_ENTITY_INPUT_TERMINAL, /*_srcid*/ UAC2_ENTITY_FEATURE_UNIT, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_OUTPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ UAC2_ENTITY_INPUT_TERMINAL, /*_srcid*/ UAC2_ENTITY_FEATURE_UNIT, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
   /* Feature Unit Descriptor(4.7.2.8) */\
-  TUD_AUDIO_DESC_FEATURE_UNIT_ONE_CHANNEL(/*_unitid*/ UAC2_ENTITY_FEATURE_UNIT, /*_srcid*/ 0x01, /*_ctrlch0master*/ AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS, /*_ctrlch1*/ AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS, /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_FEATURE_UNIT_ONE_CHANNEL(/*_unitid*/ UAC2_ENTITY_FEATURE_UNIT, /*_srcid*/ 0x01, /*_ctrlch0master*/ AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS, /*_ctrlch1*/ AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS, /*_stridx*/ 0x00),\
   /* Standard AS Interface Descriptor(4.9.1) */\
   /* Interface 1, Alternate 0 - default alternate setting with 0 bandwidth */\
   TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)((_itfnum)+1), /*_altset*/ 0x00, /*_nEPs*/ 0x00, /*_stridx*/ 0x00),\
@@ -80,23 +80,23 @@
   /* Interface 1, Alternate 1 - alternate interface for data streaming */\
   TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)((_itfnum)+1), /*_altset*/ 0x01, /*_nEPs*/ 0x01, /*_stridx*/ 0x00),\
   /* Class-Specific AS Interface Descriptor(4.9.2) */\
-  TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ 0x01, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ 0x01, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
   /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
   TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_RESOLUTION_RX),\
   /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
   TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epin, /*_attr*/ (TUSB_XFER_ISOCHRONOUS | TUSB_ISO_EP_ATT_ASYNCHRONOUS | TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ CFG_TUD_AUDIO_FUNC_1_FORMAT_1_EP_SZ_IN, /*_interval*/ 0x01),\
   /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-  TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000),\
+  TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000),\
   /* Interface 1, Alternate 2 - alternate interface for data streaming */\
   TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)((_itfnum)+1), /*_altset*/ 0x02, /*_nEPs*/ 0x01, /*_stridx*/ 0x00),\
   /* Class-Specific AS Interface Descriptor(4.9.2) */\
-  TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ 0x01, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ 0x01, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
   /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
   TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_RESOLUTION_RX),\
   /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
   TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epin, /*_attr*/ (TUSB_XFER_ISOCHRONOUS | TUSB_ISO_EP_ATT_ASYNCHRONOUS | TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ CFG_TUD_AUDIO_FUNC_1_FORMAT_2_EP_SZ_IN, /*_interval*/ 0x01),\
   /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-  TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000)
+  TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000)
 
 
 #endif
diff --git a/examples/device/cdc_uac2/src/uac2_app.c b/examples/device/cdc_uac2/src/uac2_app.c
index a1a0dd73d..cb7b716e8 100644
--- a/examples/device/cdc_uac2/src/uac2_app.c
+++ b/examples/device/cdc_uac2/src/uac2_app.c
@@ -80,22 +80,22 @@ void audio_task(void) {
 }
 
 // Helper for clock get requests
-static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t const *request)
+static bool tud_audio_clock_get_request(uint8_t rhport, audio20_control_request_t const *request)
 {
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
 
-  if (request->bControlSelector == AUDIO_CS_CTRL_SAM_FREQ)
+  if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ)
   {
-    if (request->bRequest == AUDIO_CS_REQ_CUR)
+    if (request->bRequest == AUDIO20_CS_REQ_CUR)
     {
       TU_LOG1("Clock get current freq %" PRIu32 "\r\n", current_sample_rate);
 
-      audio_control_cur_4_t curf = { (int32_t) tu_htole32(current_sample_rate) };
+      audio20_control_cur_4_t curf = { (int32_t) tu_htole32(current_sample_rate) };
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &curf, sizeof(curf));
     }
-    else if (request->bRequest == AUDIO_CS_REQ_RANGE)
+    else if (request->bRequest == AUDIO20_CS_REQ_RANGE)
     {
-      audio_control_range_4_n_t(N_SAMPLE_RATES) rangef =
+      audio20_control_range_4_n_t(N_SAMPLE_RATES) rangef =
       {
         .wNumSubRanges = tu_htole16(N_SAMPLE_RATES)
       };
@@ -111,10 +111,10 @@ static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &rangef, sizeof(rangef));
     }
   }
-  else if (request->bControlSelector == AUDIO_CS_CTRL_CLK_VALID &&
-           request->bRequest == AUDIO_CS_REQ_CUR)
+  else if (request->bControlSelector == AUDIO20_CS_CTRL_CLK_VALID &&
+           request->bRequest == AUDIO20_CS_REQ_CUR)
   {
-    audio_control_cur_1_t cur_valid = { .bCur = 1 };
+    audio20_control_cur_1_t cur_valid = { .bCur = 1 };
     TU_LOG1("Clock get is valid %u\r\n", cur_valid.bCur);
     return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &cur_valid, sizeof(cur_valid));
   }
@@ -124,18 +124,18 @@ static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t
 }
 
 // Helper for clock set requests
-static bool tud_audio_clock_set_request(uint8_t rhport, audio_control_request_t const *request, uint8_t const *buf)
+static bool tud_audio_clock_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf)
 {
   (void)rhport;
 
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
-  TU_VERIFY(request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
 
-  if (request->bControlSelector == AUDIO_CS_CTRL_SAM_FREQ)
+  if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ)
   {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_4_t));
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_4_t));
 
-    current_sample_rate = (uint32_t) ((audio_control_cur_4_t const *)buf)->bCur;
+    current_sample_rate = (uint32_t) ((audio20_control_cur_4_t const *)buf)->bCur;
 
     TU_LOG1("Clock set current freq: %" PRIu32 "\r\n", current_sample_rate);
 
@@ -150,21 +150,21 @@ static bool tud_audio_clock_set_request(uint8_t rhport, audio_control_request_t
 }
 
 // Helper for feature unit get requests
-static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio_control_request_t const *request)
+static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio20_control_request_t const *request)
 {
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT);
 
-  if (request->bControlSelector == AUDIO_FU_CTRL_MUTE && request->bRequest == AUDIO_CS_REQ_CUR)
+  if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE && request->bRequest == AUDIO20_CS_REQ_CUR)
   {
-    audio_control_cur_1_t mute1 = { .bCur = mute[request->bChannelNumber] };
+    audio20_control_cur_1_t mute1 = { .bCur = mute[request->bChannelNumber] };
     TU_LOG1("Get channel %u mute %d\r\n", request->bChannelNumber, mute1.bCur);
     return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &mute1, sizeof(mute1));
   }
-  else if (request->bControlSelector == AUDIO_FU_CTRL_VOLUME)
+  else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME)
   {
-    if (request->bRequest == AUDIO_CS_REQ_RANGE)
+    if (request->bRequest == AUDIO20_CS_REQ_RANGE)
     {
-      audio_control_range_2_n_t(1) range_vol = {
+      audio20_control_range_2_n_t(1) range_vol = {
         .wNumSubRanges = tu_htole16(1),
         .subrange[0] = { .bMin = tu_htole16(-VOLUME_CTRL_50_DB), tu_htole16(VOLUME_CTRL_0_DB), tu_htole16(256) }
       };
@@ -172,9 +172,9 @@ static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio_control_req
               range_vol.subrange[0].bMin / 256, range_vol.subrange[0].bMax / 256, range_vol.subrange[0].bRes / 256);
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &range_vol, sizeof(range_vol));
     }
-    else if (request->bRequest == AUDIO_CS_REQ_CUR)
+    else if (request->bRequest == AUDIO20_CS_REQ_CUR)
     {
-      audio_control_cur_2_t cur_vol = { .bCur = tu_htole16(volume[request->bChannelNumber]) };
+      audio20_control_cur_2_t cur_vol = { .bCur = tu_htole16(volume[request->bChannelNumber]) };
       TU_LOG1("Get channel %u volume %d dB\r\n", request->bChannelNumber, cur_vol.bCur / 256);
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &cur_vol, sizeof(cur_vol));
     }
@@ -186,28 +186,28 @@ static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio_control_req
 }
 
 // Helper for feature unit set requests
-static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio_control_request_t const *request, uint8_t const *buf)
+static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf)
 {
   (void)rhport;
 
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT);
-  TU_VERIFY(request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
 
-  if (request->bControlSelector == AUDIO_FU_CTRL_MUTE)
+  if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE)
   {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_1_t));
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_1_t));
 
-    mute[request->bChannelNumber] = ((audio_control_cur_1_t const *)buf)->bCur;
+    mute[request->bChannelNumber] = ((audio20_control_cur_1_t const *)buf)->bCur;
 
     TU_LOG1("Set channel %d Mute: %d\r\n", request->bChannelNumber, mute[request->bChannelNumber]);
 
     return true;
   }
-  else if (request->bControlSelector == AUDIO_FU_CTRL_VOLUME)
+  else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME)
   {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_2_t));
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_2_t));
 
-    volume[request->bChannelNumber] = ((audio_control_cur_2_t const *)buf)->bCur;
+    volume[request->bChannelNumber] = ((audio20_control_cur_2_t const *)buf)->bCur;
 
     TU_LOG1("Set channel %d volume: %d dB\r\n", request->bChannelNumber, volume[request->bChannelNumber] / 256);
 
@@ -228,7 +228,7 @@ static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio_control_req
 // Invoked when audio class specific get request received for an entity
 bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p_request)
 {
-  audio_control_request_t const *request = (audio_control_request_t const *)p_request;
+  audio20_control_request_t const *request = (audio20_control_request_t const *)p_request;
 
   if (request->bEntityID == UAC2_ENTITY_CLOCK)
     return tud_audio_clock_get_request(rhport, request);
@@ -245,7 +245,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
 // Invoked when audio class specific set request received for an entity
 bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t *buf)
 {
-  audio_control_request_t const *request = (audio_control_request_t const *)p_request;
+  audio20_control_request_t const *request = (audio20_control_request_t const *)p_request;
 
   if (request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT)
     return tud_audio_feature_unit_set_request(rhport, request, buf);
diff --git a/examples/device/cdc_uac2/src/usb_descriptors.h b/examples/device/cdc_uac2/src/usb_descriptors.h
index 736feeefe..efffbc0bb 100644
--- a/examples/device/cdc_uac2/src/usb_descriptors.h
+++ b/examples/device/cdc_uac2/src/usb_descriptors.h
@@ -93,19 +93,19 @@ enum
     /* Standard AC Interface Descriptor(4.7.1) */\
     TUD_AUDIO_DESC_STD_AC(/*_itfnum*/ ITF_NUM_AUDIO_CONTROL, /*_nEPs*/ 0x00, /*_stridx*/ _stridx),\
     /* Class-Specific AC Interface Header Descriptor(4.7.2) */\
-    TUD_AUDIO_DESC_CS_AC(/*_bcdADC*/ 0x0200, /*_category*/ AUDIO_FUNC_HEADSET, /*_totallen*/ TUD_AUDIO_DESC_CLK_SRC_LEN+TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN, /*_ctrl*/ AUDIO_CS_AS_INTERFACE_CTRL_LATENCY_POS),\
+    TUD_AUDIO_DESC_CS_AC(/*_bcdADC*/ 0x0200, /*_category*/ AUDIO20_FUNC_HEADSET, /*_totallen*/ TUD_AUDIO_DESC_CLK_SRC_LEN+TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN, /*_ctrl*/ AUDIO20_CS_AS_INTERFACE_CTRL_LATENCY_POS),\
     /* Clock Source Descriptor(4.7.2.1) */\
     TUD_AUDIO_DESC_CLK_SRC(/*_clkid*/ UAC2_ENTITY_CLOCK, /*_attr*/ 3, /*_ctrl*/ 7, /*_assocTerm*/ 0x00,  /*_stridx*/ 0x00),    \
     /* Input Terminal Descriptor(4.7.2.4) */\
-    TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x02, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO_CTRL_R << AUDIO_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x02, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO20_CTRL_R << AUDIO20_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
     /* Feature Unit Descriptor(4.7.2.8) */\
-    TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL(/*_unitid*/ UAC2_ENTITY_SPK_FEATURE_UNIT, /*_srcid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrlch0master*/ (AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS), /*_ctrlch1*/ (AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS), /*_ctrlch2*/ (AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS), /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL(/*_unitid*/ UAC2_ENTITY_SPK_FEATURE_UNIT, /*_srcid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrlch0master*/ (AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS), /*_ctrlch1*/ (AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS), /*_ctrlch2*/ (AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS), /*_stridx*/ 0x00),\
     /* Output Terminal Descriptor(4.7.2.5) */\
-    TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_SPK_OUTPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_OUT_HEADPHONES, /*_assocTerm*/ 0x00, /*_srcid*/ UAC2_ENTITY_SPK_FEATURE_UNIT, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_SPK_OUTPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_OUT_HEADPHONES, /*_assocTerm*/ 0x00, /*_srcid*/ UAC2_ENTITY_SPK_FEATURE_UNIT, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
     /* Input Terminal Descriptor(4.7.2.4) */\
-    TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_MIC_INPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_IN_GENERIC_MIC, /*_assocTerm*/ 0x00, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x01, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO_CTRL_R << AUDIO_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_MIC_INPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_IN_GENERIC_MIC, /*_assocTerm*/ 0x00, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x01, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO20_CTRL_R << AUDIO20_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
     /* Output Terminal Descriptor(4.7.2.5) */\
-    TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_srcid*/ UAC2_ENTITY_MIC_INPUT_TERMINAL, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_srcid*/ UAC2_ENTITY_MIC_INPUT_TERMINAL, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
     /* Standard AS Interface Descriptor(4.9.1) */\
     /* Interface 1, Alternate 0 - default alternate setting with 0 bandwidth */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_SPK), /*_altset*/ 0x00, /*_nEPs*/ 0x00, /*_stridx*/ 0x05),\
@@ -113,23 +113,23 @@ enum
     /* Interface 1, Alternate 1 - alternate interface for data streaming */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_SPK), /*_altset*/ 0x01, /*_nEPs*/ 0x01, /*_stridx*/ 0x05),\
     /* Class-Specific AS Interface Descriptor(4.9.2) */\
-    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
     /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
     TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_RESOLUTION_RX),\
     /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
     TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epout, /*_attr*/ (uint8_t) (TUSB_XFER_ISOCHRONOUS | TUSB_ISO_EP_ATT_ADAPTIVE | TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ TUD_AUDIO_EP_SIZE(CFG_TUD_AUDIO_FUNC_1_MAX_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX), /*_interval*/ 0x01),\
     /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
+    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
     /* Interface 1, Alternate 2 - alternate interface for data streaming */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_SPK), /*_altset*/ 0x02, /*_nEPs*/ 0x01, /*_stridx*/ 0x05),\
     /* Class-Specific AS Interface Descriptor(4.9.2) */\
-    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
     /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
     TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_RESOLUTION_RX),\
     /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
     TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epout, /*_attr*/ (uint8_t) (TUSB_XFER_ISOCHRONOUS | TUSB_ISO_EP_ATT_ADAPTIVE | TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ TUD_AUDIO_EP_SIZE(CFG_TUD_AUDIO_FUNC_1_MAX_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX), /*_interval*/ 0x01),\
     /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
+    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
     /* Standard AS Interface Descriptor(4.9.1) */\
     /* Interface 2, Alternate 0 - default alternate setting with 0 bandwidth */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_MIC), /*_altset*/ 0x00, /*_nEPs*/ 0x00, /*_stridx*/ 0x04),\
@@ -137,22 +137,22 @@ enum
     /* Interface 2, Alternate 1 - alternate interface for data streaming */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_MIC), /*_altset*/ 0x01, /*_nEPs*/ 0x01, /*_stridx*/ 0x04),\
     /* Class-Specific AS Interface Descriptor(4.9.2) */\
-    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
     /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
     TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_RESOLUTION_TX),\
     /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
     TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epin, /*_attr*/ (uint8_t) (TUSB_XFER_ISOCHRONOUS | TUSB_ISO_EP_ATT_ASYNCHRONOUS | TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ TUD_AUDIO_EP_SIZE(CFG_TUD_AUDIO_FUNC_1_MAX_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX), /*_interval*/ 0x01),\
     /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000),\
+    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000),\
     /* Interface 2, Alternate 2 - alternate interface for data streaming */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_MIC), /*_altset*/ 0x02, /*_nEPs*/ 0x01, /*_stridx*/ 0x04),\
     /* Class-Specific AS Interface Descriptor(4.9.2) */\
-    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
     /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
     TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_RESOLUTION_TX),\
     /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
     TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epin, /*_attr*/ (uint8_t) (TUSB_XFER_ISOCHRONOUS | TUSB_ISO_EP_ATT_ASYNCHRONOUS | TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ TUD_AUDIO_EP_SIZE(CFG_TUD_AUDIO_FUNC_1_MAX_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX), /*_interval*/ 0x01),\
     /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000)
+    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000)
 
 #endif
diff --git a/examples/device/uac2_headset/src/main.c b/examples/device/uac2_headset/src/main.c
index 102a6eef1..602225df5 100644
--- a/examples/device/uac2_headset/src/main.c
+++ b/examples/device/uac2_headset/src/main.c
@@ -142,17 +142,17 @@ void tud_resume_cb(void) {
 }
 
 // Helper for clock get requests
-static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t const *request) {
+static bool tud_audio_clock_get_request(uint8_t rhport, audio20_control_request_t const *request) {
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
 
-  if (request->bControlSelector == AUDIO_CS_CTRL_SAM_FREQ) {
-    if (request->bRequest == AUDIO_CS_REQ_CUR) {
+  if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ) {
+    if (request->bRequest == AUDIO20_CS_REQ_CUR) {
       TU_LOG1("Clock get current freq %" PRIu32 "\r\n", current_sample_rate);
 
-      audio_control_cur_4_t curf = {(int32_t) tu_htole32(current_sample_rate)};
+      audio20_control_cur_4_t curf = {(int32_t) tu_htole32(current_sample_rate)};
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &curf, sizeof(curf));
-    } else if (request->bRequest == AUDIO_CS_REQ_RANGE) {
-      audio_control_range_4_n_t(N_SAMPLE_RATES) rangef =
+    } else if (request->bRequest == AUDIO20_CS_REQ_RANGE) {
+      audio20_control_range_4_n_t(N_SAMPLE_RATES) rangef =
           {
               .wNumSubRanges = tu_htole16(N_SAMPLE_RATES)};
       TU_LOG1("Clock get %d freq ranges\r\n", N_SAMPLE_RATES);
@@ -165,9 +165,9 @@ static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t
 
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &rangef, sizeof(rangef));
     }
-  } else if (request->bControlSelector == AUDIO_CS_CTRL_CLK_VALID &&
-             request->bRequest == AUDIO_CS_REQ_CUR) {
-    audio_control_cur_1_t cur_valid = {.bCur = 1};
+  } else if (request->bControlSelector == AUDIO20_CS_CTRL_CLK_VALID &&
+             request->bRequest == AUDIO20_CS_REQ_CUR) {
+    audio20_control_cur_1_t cur_valid = {.bCur = 1};
     TU_LOG1("Clock get is valid %u\r\n", cur_valid.bCur);
     return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &cur_valid, sizeof(cur_valid));
   }
@@ -177,16 +177,16 @@ static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t
 }
 
 // Helper for clock set requests
-static bool tud_audio_clock_set_request(uint8_t rhport, audio_control_request_t const *request, uint8_t const *buf) {
+static bool tud_audio_clock_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf) {
   (void) rhport;
 
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
-  TU_VERIFY(request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
 
-  if (request->bControlSelector == AUDIO_CS_CTRL_SAM_FREQ) {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_4_t));
+  if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ) {
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_4_t));
 
-    current_sample_rate = (uint32_t) ((audio_control_cur_4_t const *) buf)->bCur;
+    current_sample_rate = (uint32_t) ((audio20_control_cur_4_t const *) buf)->bCur;
 
     TU_LOG1("Clock set current freq: %" PRIu32 "\r\n", current_sample_rate);
 
@@ -199,23 +199,23 @@ static bool tud_audio_clock_set_request(uint8_t rhport, audio_control_request_t
 }
 
 // Helper for feature unit get requests
-static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio_control_request_t const *request) {
+static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio20_control_request_t const *request) {
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT);
 
-  if (request->bControlSelector == AUDIO_FU_CTRL_MUTE && request->bRequest == AUDIO_CS_REQ_CUR) {
-    audio_control_cur_1_t mute1 = {.bCur = mute[request->bChannelNumber]};
+  if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE && request->bRequest == AUDIO20_CS_REQ_CUR) {
+    audio20_control_cur_1_t mute1 = {.bCur = mute[request->bChannelNumber]};
     TU_LOG1("Get channel %u mute %d\r\n", request->bChannelNumber, mute1.bCur);
     return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &mute1, sizeof(mute1));
-  } else if (request->bControlSelector == AUDIO_FU_CTRL_VOLUME) {
-    if (request->bRequest == AUDIO_CS_REQ_RANGE) {
-      audio_control_range_2_n_t(1) range_vol = {
+  } else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME) {
+    if (request->bRequest == AUDIO20_CS_REQ_RANGE) {
+      audio20_control_range_2_n_t(1) range_vol = {
           .wNumSubRanges = tu_htole16(1),
           .subrange[0] = {.bMin = tu_htole16(-VOLUME_CTRL_50_DB), tu_htole16(VOLUME_CTRL_0_DB), tu_htole16(256)}};
       TU_LOG1("Get channel %u volume range (%d, %d, %u) dB\r\n", request->bChannelNumber,
               range_vol.subrange[0].bMin / 256, range_vol.subrange[0].bMax / 256, range_vol.subrange[0].bRes / 256);
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &range_vol, sizeof(range_vol));
-    } else if (request->bRequest == AUDIO_CS_REQ_CUR) {
-      audio_control_cur_2_t cur_vol = {.bCur = tu_htole16(volume[request->bChannelNumber])};
+    } else if (request->bRequest == AUDIO20_CS_REQ_CUR) {
+      audio20_control_cur_2_t cur_vol = {.bCur = tu_htole16(volume[request->bChannelNumber])};
       TU_LOG1("Get channel %u volume %d dB\r\n", request->bChannelNumber, cur_vol.bCur / 256);
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &cur_vol, sizeof(cur_vol));
     }
@@ -227,24 +227,24 @@ static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio_control_req
 }
 
 // Helper for feature unit set requests
-static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio_control_request_t const *request, uint8_t const *buf) {
+static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf) {
   (void) rhport;
 
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT);
-  TU_VERIFY(request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
 
-  if (request->bControlSelector == AUDIO_FU_CTRL_MUTE) {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_1_t));
+  if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE) {
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_1_t));
 
-    mute[request->bChannelNumber] = ((audio_control_cur_1_t const *) buf)->bCur;
+    mute[request->bChannelNumber] = ((audio20_control_cur_1_t const *) buf)->bCur;
 
     TU_LOG1("Set channel %d Mute: %d\r\n", request->bChannelNumber, mute[request->bChannelNumber]);
 
     return true;
-  } else if (request->bControlSelector == AUDIO_FU_CTRL_VOLUME) {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_2_t));
+  } else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME) {
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_2_t));
 
-    volume[request->bChannelNumber] = ((audio_control_cur_2_t const *) buf)->bCur;
+    volume[request->bChannelNumber] = ((audio20_control_cur_2_t const *) buf)->bCur;
 
     TU_LOG1("Set channel %d volume: %d dB\r\n", request->bChannelNumber, volume[request->bChannelNumber] / 256);
 
@@ -262,7 +262,7 @@ static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio_control_req
 
 // Invoked when audio class specific get request received for an entity
 bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
-  audio_control_request_t const *request = (audio_control_request_t const *) p_request;
+  audio20_control_request_t const *request = (audio20_control_request_t const *) p_request;
 
   if (request->bEntityID == UAC2_ENTITY_CLOCK)
     return tud_audio_clock_get_request(rhport, request);
@@ -277,7 +277,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
 
 // Invoked when audio class specific set request received for an entity
 bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t *buf) {
-  audio_control_request_t const *request = (audio_control_request_t const *) p_request;
+  audio20_control_request_t const *request = (audio20_control_request_t const *) p_request;
 
   if (request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT)
     return tud_audio_feature_unit_set_request(rhport, request, buf);
@@ -387,11 +387,11 @@ void audio_control_task(void) {
     }
 
     // 6.1 Interrupt Data Message
-    const audio_interrupt_data_t data = {
+    const audio20_interrupt_data_t data = {
         .bInfo = 0,                                      // Class-specific interrupt, originated from an interface
-        .bAttribute = AUDIO_CS_REQ_CUR,                  // Caused by current settings
+        .bAttribute = AUDIO20_CS_REQ_CUR,                  // Caused by current settings
         .wValue_cn_or_mcn = 0,                           // CH0: master volume
-        .wValue_cs = AUDIO_FU_CTRL_VOLUME,               // Volume change
+        .wValue_cs = AUDIO20_FU_CTRL_VOLUME,               // Volume change
         .wIndex_ep_or_int = 0,                           // From the interface itself
         .wIndex_entity_id = UAC2_ENTITY_SPK_FEATURE_UNIT,// From feature unit
     };
diff --git a/examples/device/uac2_headset/src/usb_descriptors.h b/examples/device/uac2_headset/src/usb_descriptors.h
index da0da83e8..4138b5654 100644
--- a/examples/device/uac2_headset/src/usb_descriptors.h
+++ b/examples/device/uac2_headset/src/usb_descriptors.h
@@ -91,19 +91,19 @@ enum
     /* Standard AC Interface Descriptor(4.7.1) */\
     TUD_AUDIO_DESC_STD_AC(/*_itfnum*/ ITF_NUM_AUDIO_CONTROL, /*_nEPs*/ 0x01, /*_stridx*/ _stridx),\
     /* Class-Specific AC Interface Header Descriptor(4.7.2) */\
-    TUD_AUDIO_DESC_CS_AC(/*_bcdADC*/ 0x0200, /*_category*/ AUDIO_FUNC_HEADSET, /*_totallen*/ TUD_AUDIO_DESC_CLK_SRC_LEN+TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN, /*_ctrl*/ AUDIO_CS_AS_INTERFACE_CTRL_LATENCY_POS),\
+    TUD_AUDIO_DESC_CS_AC(/*_bcdADC*/ 0x0200, /*_category*/ AUDIO20_FUNC_HEADSET, /*_totallen*/ TUD_AUDIO_DESC_CLK_SRC_LEN+TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN, /*_ctrl*/ AUDIO20_CS_AS_INTERFACE_CTRL_LATENCY_POS),\
     /* Clock Source Descriptor(4.7.2.1) */\
     TUD_AUDIO_DESC_CLK_SRC(/*_clkid*/ UAC2_ENTITY_CLOCK, /*_attr*/ 3, /*_ctrl*/ 7, /*_assocTerm*/ 0x00,  /*_stridx*/ 0x00),    \
     /* Input Terminal Descriptor(4.7.2.4) */\
-    TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x02, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO_CTRL_R << AUDIO_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x02, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO20_CTRL_R << AUDIO20_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
     /* Feature Unit Descriptor(4.7.2.8) */\
-    TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL(/*_unitid*/ UAC2_ENTITY_SPK_FEATURE_UNIT, /*_srcid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrlch0master*/ (AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS), /*_ctrlch1*/ (AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS), /*_ctrlch2*/ (AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS), /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL(/*_unitid*/ UAC2_ENTITY_SPK_FEATURE_UNIT, /*_srcid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrlch0master*/ (AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS), /*_ctrlch1*/ (AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS), /*_ctrlch2*/ (AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS), /*_stridx*/ 0x00),\
     /* Output Terminal Descriptor(4.7.2.5) */\
-    TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_SPK_OUTPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_OUT_HEADPHONES, /*_assocTerm*/ 0x00, /*_srcid*/ UAC2_ENTITY_SPK_FEATURE_UNIT, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_SPK_OUTPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_OUT_HEADPHONES, /*_assocTerm*/ 0x00, /*_srcid*/ UAC2_ENTITY_SPK_FEATURE_UNIT, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
     /* Input Terminal Descriptor(4.7.2.4) */\
-    TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_MIC_INPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_IN_GENERIC_MIC, /*_assocTerm*/ 0x00, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x01, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO_CTRL_R << AUDIO_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ UAC2_ENTITY_MIC_INPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_IN_GENERIC_MIC, /*_assocTerm*/ 0x00, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_nchannelslogical*/ 0x01, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO20_CTRL_R << AUDIO20_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
     /* Output Terminal Descriptor(4.7.2.5) */\
-    TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_termtype*/ AUDIO_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_srcid*/ UAC2_ENTITY_MIC_INPUT_TERMINAL, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_termtype*/ AUDIO20_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_srcid*/ UAC2_ENTITY_MIC_INPUT_TERMINAL, /*_clkid*/ UAC2_ENTITY_CLOCK, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
     /* Standard AC Interrupt Endpoint Descriptor(4.8.2.1) */\
     TUD_AUDIO_DESC_STD_AC_INT_EP(/*_ep*/ _epint, /*_interval*/ 0x01), \
     /* Standard AS Interface Descriptor(4.9.1) */\
@@ -113,23 +113,23 @@ enum
     /* Interface 1, Alternate 1 - alternate interface for data streaming */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_SPK), /*_altset*/ 0x01, /*_nEPs*/ 0x01, /*_stridx*/ 0x05),\
     /* Class-Specific AS Interface Descriptor(4.9.2) */\
-    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
     /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
     TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_RESOLUTION_RX),\
     /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
     TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epout, /*_attr*/ (uint8_t) ((uint8_t)TUSB_XFER_ISOCHRONOUS | (uint8_t)TUSB_ISO_EP_ATT_ADAPTIVE | (uint8_t)TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ TUD_AUDIO_EP_SIZE(CFG_TUD_AUDIO_FUNC_1_MAX_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX), /*_interval*/ 0x01),\
     /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
+    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
     /* Interface 1, Alternate 2 - alternate interface for data streaming */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_SPK), /*_altset*/ 0x02, /*_nEPs*/ 0x01, /*_stridx*/ 0x05),\
     /* Class-Specific AS Interface Descriptor(4.9.2) */\
-    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_SPK_INPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
     /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
     TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_RESOLUTION_RX),\
     /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
     TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epout, /*_attr*/ (uint8_t) ((uint8_t)TUSB_XFER_ISOCHRONOUS | (uint8_t)TUSB_ISO_EP_ATT_ADAPTIVE | (uint8_t)TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ TUD_AUDIO_EP_SIZE(CFG_TUD_AUDIO_FUNC_1_MAX_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX), /*_interval*/ 0x01),\
     /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
+    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
     /* Standard AS Interface Descriptor(4.9.1) */\
     /* Interface 2, Alternate 0 - default alternate setting with 0 bandwidth */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_MIC), /*_altset*/ 0x00, /*_nEPs*/ 0x00, /*_stridx*/ 0x04),\
@@ -137,22 +137,22 @@ enum
     /* Interface 2, Alternate 1 - alternate interface for data streaming */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_MIC), /*_altset*/ 0x01, /*_nEPs*/ 0x01, /*_stridx*/ 0x04),\
     /* Class-Specific AS Interface Descriptor(4.9.2) */\
-    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
     /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
     TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_RESOLUTION_TX),\
     /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
     TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epin, /*_attr*/ (uint8_t) ((uint8_t)TUSB_XFER_ISOCHRONOUS | (uint8_t)TUSB_ISO_EP_ATT_ASYNCHRONOUS | (uint8_t)TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ TUD_AUDIO_EP_SIZE(CFG_TUD_AUDIO_FUNC_1_MAX_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_FORMAT_1_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX), /*_interval*/ 0x01),\
     /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000),\
+    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000),\
     /* Interface 2, Alternate 2 - alternate interface for data streaming */\
     TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)(ITF_NUM_AUDIO_STREAMING_MIC), /*_altset*/ 0x02, /*_nEPs*/ 0x01, /*_stridx*/ 0x04),\
     /* Class-Specific AS Interface Descriptor(4.9.2) */\
-    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+    TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ UAC2_ENTITY_MIC_OUTPUT_TERMINAL, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
     /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
     TUD_AUDIO_DESC_TYPE_I_FORMAT(CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_RESOLUTION_TX),\
     /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
     TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epin, /*_attr*/ (uint8_t) ((uint8_t)TUSB_XFER_ISOCHRONOUS | (uint8_t)TUSB_ISO_EP_ATT_ASYNCHRONOUS | (uint8_t)TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ TUD_AUDIO_EP_SIZE(CFG_TUD_AUDIO_FUNC_1_MAX_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_FORMAT_2_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX), /*_interval*/ 0x01),\
     /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000)
+    TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED, /*_lockdelay*/ 0x0000)
 
 #endif
diff --git a/examples/device/uac2_speaker_fb/src/main.c b/examples/device/uac2_speaker_fb/src/main.c
index ed9e7716d..2e525ef28 100644
--- a/examples/device/uac2_speaker_fb/src/main.c
+++ b/examples/device/uac2_speaker_fb/src/main.c
@@ -154,17 +154,17 @@ void tud_resume_cb(void) {
 //--------------------------------------------------------------------+
 
 // Helper for clock get requests
-static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t const *request) {
+static bool tud_audio_clock_get_request(uint8_t rhport, audio20_control_request_t const *request) {
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
 
-  if (request->bControlSelector == AUDIO_CS_CTRL_SAM_FREQ) {
-    if (request->bRequest == AUDIO_CS_REQ_CUR) {
+  if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ) {
+    if (request->bRequest == AUDIO20_CS_REQ_CUR) {
       TU_LOG1("Clock get current freq %lu\r\n", current_sample_rate);
 
-      audio_control_cur_4_t curf = {(int32_t) tu_htole32(current_sample_rate)};
+      audio20_control_cur_4_t curf = {(int32_t) tu_htole32(current_sample_rate)};
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &curf, sizeof(curf));
-    } else if (request->bRequest == AUDIO_CS_REQ_RANGE) {
-      audio_control_range_4_n_t(N_SAMPLE_RATES) rangef =
+    } else if (request->bRequest == AUDIO20_CS_REQ_RANGE) {
+      audio20_control_range_4_n_t(N_SAMPLE_RATES) rangef =
           {
               .wNumSubRanges = tu_htole16(N_SAMPLE_RATES)};
       TU_LOG1("Clock get %d freq ranges\r\n", N_SAMPLE_RATES);
@@ -177,9 +177,9 @@ static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t
 
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &rangef, sizeof(rangef));
     }
-  } else if (request->bControlSelector == AUDIO_CS_CTRL_CLK_VALID &&
-             request->bRequest == AUDIO_CS_REQ_CUR) {
-    audio_control_cur_1_t cur_valid = {.bCur = 1};
+  } else if (request->bControlSelector == AUDIO20_CS_CTRL_CLK_VALID &&
+             request->bRequest == AUDIO20_CS_REQ_CUR) {
+    audio20_control_cur_1_t cur_valid = {.bCur = 1};
     TU_LOG1("Clock get is valid %u\r\n", cur_valid.bCur);
     return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &cur_valid, sizeof(cur_valid));
   }
@@ -189,16 +189,16 @@ static bool tud_audio_clock_get_request(uint8_t rhport, audio_control_request_t
 }
 
 // Helper for clock set requests
-static bool tud_audio_clock_set_request(uint8_t rhport, audio_control_request_t const *request, uint8_t const *buf) {
+static bool tud_audio_clock_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf) {
   (void) rhport;
 
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
-  TU_VERIFY(request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
 
-  if (request->bControlSelector == AUDIO_CS_CTRL_SAM_FREQ) {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_4_t));
+  if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ) {
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_4_t));
 
-    current_sample_rate = (uint32_t) ((audio_control_cur_4_t const *) buf)->bCur;
+    current_sample_rate = (uint32_t) ((audio20_control_cur_4_t const *) buf)->bCur;
 
     TU_LOG1("Clock set current freq: %ld\r\n", current_sample_rate);
 
@@ -211,23 +211,23 @@ static bool tud_audio_clock_set_request(uint8_t rhport, audio_control_request_t
 }
 
 // Helper for feature unit get requests
-static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio_control_request_t const *request) {
+static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio20_control_request_t const *request) {
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_FEATURE_UNIT);
 
-  if (request->bControlSelector == AUDIO_FU_CTRL_MUTE && request->bRequest == AUDIO_CS_REQ_CUR) {
-    audio_control_cur_1_t mute1 = {.bCur = mute[request->bChannelNumber]};
+  if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE && request->bRequest == AUDIO20_CS_REQ_CUR) {
+    audio20_control_cur_1_t mute1 = {.bCur = mute[request->bChannelNumber]};
     TU_LOG1("Get channel %u mute %d\r\n", request->bChannelNumber, mute1.bCur);
     return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &mute1, sizeof(mute1));
-  } else if (request->bControlSelector == AUDIO_FU_CTRL_VOLUME) {
-    if (request->bRequest == AUDIO_CS_REQ_RANGE) {
-      audio_control_range_2_n_t(1) range_vol = {
+  } else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME) {
+    if (request->bRequest == AUDIO20_CS_REQ_RANGE) {
+      audio20_control_range_2_n_t(1) range_vol = {
           .wNumSubRanges = tu_htole16(1),
           .subrange[0] = {.bMin = tu_htole16(-VOLUME_CTRL_50_DB), tu_htole16(VOLUME_CTRL_0_DB), tu_htole16(256)}};
       TU_LOG1("Get channel %u volume range (%d, %d, %u) dB\r\n", request->bChannelNumber,
               range_vol.subrange[0].bMin / 256, range_vol.subrange[0].bMax / 256, range_vol.subrange[0].bRes / 256);
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &range_vol, sizeof(range_vol));
-    } else if (request->bRequest == AUDIO_CS_REQ_CUR) {
-      audio_control_cur_2_t cur_vol = {.bCur = tu_htole16(volume[request->bChannelNumber])};
+    } else if (request->bRequest == AUDIO20_CS_REQ_CUR) {
+      audio20_control_cur_2_t cur_vol = {.bCur = tu_htole16(volume[request->bChannelNumber])};
       TU_LOG1("Get channel %u volume %d dB\r\n", request->bChannelNumber, cur_vol.bCur / 256);
       return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &cur_vol, sizeof(cur_vol));
     }
@@ -239,24 +239,24 @@ static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio_control_req
 }
 
 // Helper for feature unit set requests
-static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio_control_request_t const *request, uint8_t const *buf) {
+static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf) {
   (void) rhport;
 
   TU_ASSERT(request->bEntityID == UAC2_ENTITY_FEATURE_UNIT);
-  TU_VERIFY(request->bRequest == AUDIO_CS_REQ_CUR);
+  TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
 
-  if (request->bControlSelector == AUDIO_FU_CTRL_MUTE) {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_1_t));
+  if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE) {
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_1_t));
 
-    mute[request->bChannelNumber] = ((audio_control_cur_1_t const *) buf)->bCur;
+    mute[request->bChannelNumber] = ((audio20_control_cur_1_t const *) buf)->bCur;
 
     TU_LOG1("Set channel %d Mute: %d\r\n", request->bChannelNumber, mute[request->bChannelNumber]);
 
     return true;
-  } else if (request->bControlSelector == AUDIO_FU_CTRL_VOLUME) {
-    TU_VERIFY(request->wLength == sizeof(audio_control_cur_2_t));
+  } else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME) {
+    TU_VERIFY(request->wLength == sizeof(audio20_control_cur_2_t));
 
-    volume[request->bChannelNumber] = ((audio_control_cur_2_t const *) buf)->bCur;
+    volume[request->bChannelNumber] = ((audio20_control_cur_2_t const *) buf)->bCur;
 
     TU_LOG1("Set channel %d volume: %d dB\r\n", request->bChannelNumber, volume[request->bChannelNumber] / 256);
 
@@ -270,7 +270,7 @@ static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio_control_req
 
 // Invoked when audio class specific get request received for an entity
 bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
-  audio_control_request_t const *request = (audio_control_request_t const *) p_request;
+  audio20_control_request_t const *request = (audio20_control_request_t const *) p_request;
 
   if (request->bEntityID == UAC2_ENTITY_CLOCK)
     return tud_audio_clock_get_request(rhport, request);
@@ -285,7 +285,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
 
 // Invoked when audio class specific set request received for an entity
 bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t *buf) {
-  audio_control_request_t const *request = (audio_control_request_t const *) p_request;
+  audio20_control_request_t const *request = (audio20_control_request_t const *) p_request;
 
   if (request->bEntityID == UAC2_ENTITY_FEATURE_UNIT)
     return tud_audio_feature_unit_set_request(rhport, request, buf);
diff --git a/examples/device/uac2_speaker_fb/src/usb_descriptors.h b/examples/device/uac2_speaker_fb/src/usb_descriptors.h
index 9511bf797..005aebeef 100644
--- a/examples/device/uac2_speaker_fb/src/usb_descriptors.h
+++ b/examples/device/uac2_speaker_fb/src/usb_descriptors.h
@@ -53,15 +53,15 @@
   /* Standard AC Interface Descriptor(4.7.1) */\
   TUD_AUDIO_DESC_STD_AC(/*_itfnum*/ _itfnum, /*_nEPs*/ 0x00, /*_stridx*/ _stridx),\
   /* Class-Specific AC Interface Header Descriptor(4.7.2) */\
-  TUD_AUDIO_DESC_CS_AC(/*_bcdADC*/ 0x0200, /*_category*/ AUDIO_FUNC_DESKTOP_SPEAKER, /*_totallen*/ TUD_AUDIO_DESC_CLK_SRC_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN+TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL_LEN, /*_ctrl*/ AUDIO_CS_AS_INTERFACE_CTRL_LATENCY_POS),\
+  TUD_AUDIO_DESC_CS_AC(/*_bcdADC*/ 0x0200, /*_category*/ AUDIO20_FUNC_DESKTOP_SPEAKER, /*_totallen*/ TUD_AUDIO_DESC_CLK_SRC_LEN+TUD_AUDIO_DESC_INPUT_TERM_LEN+TUD_AUDIO_DESC_OUTPUT_TERM_LEN+TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL_LEN, /*_ctrl*/ AUDIO20_CS_AS_INTERFACE_CTRL_LATENCY_POS),\
   /* Clock Source Descriptor(4.7.2.1) */\
-  TUD_AUDIO_DESC_CLK_SRC(/*_clkid*/ 0x04, /*_attr*/ AUDIO_CLOCK_SOURCE_ATT_INT_PRO_CLK, /*_ctrl*/ (AUDIO_CTRL_RW << AUDIO_CLOCK_SOURCE_CTRL_CLK_FRQ_POS), /*_assocTerm*/ 0x01,  /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_CLK_SRC(/*_clkid*/ 0x04, /*_attr*/ AUDIO20_CLOCK_SOURCE_ATT_INT_PRO_CLK, /*_ctrl*/ (AUDIO20_CTRL_RW << AUDIO20_CLOCK_SOURCE_CTRL_CLK_FRQ_POS), /*_assocTerm*/ 0x01,  /*_stridx*/ 0x00),\
   /* Input Terminal Descriptor(4.7.2.4) */\
-  TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ 0x01, /*_termtype*/ AUDIO_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_clkid*/ 0x04, /*_nchannelslogical*/ 0x02, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO_CTRL_R << AUDIO_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_INPUT_TERM(/*_termid*/ 0x01, /*_termtype*/ AUDIO20_TERM_TYPE_USB_STREAMING, /*_assocTerm*/ 0x00, /*_clkid*/ 0x04, /*_nchannelslogical*/ 0x02, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_idxchannelnames*/ 0x00, /*_ctrl*/ 0 * (AUDIO20_CTRL_R << AUDIO20_IN_TERM_CTRL_CONNECTOR_POS), /*_stridx*/ 0x00),\
   /* Output Terminal Descriptor(4.7.2.5) */\
-  TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ 0x03, /*_termtype*/ AUDIO_TERM_TYPE_OUT_DESKTOP_SPEAKER, /*_assocTerm*/ 0x01, /*_srcid*/ 0x02, /*_clkid*/ 0x04, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_OUTPUT_TERM(/*_termid*/ 0x03, /*_termtype*/ AUDIO20_TERM_TYPE_OUT_DESKTOP_SPEAKER, /*_assocTerm*/ 0x01, /*_srcid*/ 0x02, /*_clkid*/ 0x04, /*_ctrl*/ 0x0000, /*_stridx*/ 0x00),\
   /* Feature Unit Descriptor(4.7.2.8) */\
-  TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL(/*_unitid*/ 0x02, /*_srcid*/ 0x01, /*_ctrlch0master*/ AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS, /*_ctrlch1*/ AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS, /*_ctrlch2*/ AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO_CTRL_RW << AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS,/*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_FEATURE_UNIT_TWO_CHANNEL(/*_unitid*/ 0x02, /*_srcid*/ 0x01, /*_ctrlch0master*/ AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS, /*_ctrlch1*/ AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS, /*_ctrlch2*/ AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS | AUDIO20_CTRL_RW << AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS,/*_stridx*/ 0x00),\
   /* Standard AS Interface Descriptor(4.9.1) */\
   /* Interface 1, Alternate 0 - default alternate setting with 0 bandwidth */\
   TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)((_itfnum) + 1), /*_altset*/ 0x00, /*_nEPs*/ 0x00, /*_stridx*/ 0x00),\
@@ -69,13 +69,13 @@
   /* Interface 1, Alternate 1 - alternate interface for data streaming */\
   TUD_AUDIO_DESC_STD_AS_INT(/*_itfnum*/ (uint8_t)((_itfnum) + 1), /*_altset*/ 0x01, /*_nEPs*/ 0x02, /*_stridx*/ 0x00),\
   /* Class-Specific AS Interface Descriptor(4.9.2) */\
-  TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ 0x01, /*_ctrl*/ AUDIO_CTRL_NONE, /*_formattype*/ AUDIO_FORMAT_TYPE_I, /*_formats*/ AUDIO_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ 0x02, /*_channelcfg*/ AUDIO_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
+  TUD_AUDIO_DESC_CS_AS_INT(/*_termid*/ 0x01, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_formattype*/ AUDIO20_FORMAT_TYPE_I, /*_formats*/ AUDIO20_DATA_FORMAT_TYPE_I_PCM, /*_nchannelsphysical*/ 0x02, /*_channelcfg*/ AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED, /*_stridx*/ 0x00),\
   /* Type I Format Type Descriptor(2.3.1.6 - Audio Formats) */\
   TUD_AUDIO_DESC_TYPE_I_FORMAT(_nBytesPerSample, _nBitsUsedPerSample),\
   /* Standard AS Isochronous Audio Data Endpoint Descriptor(4.10.1.1) */\
   TUD_AUDIO_DESC_STD_AS_ISO_EP(/*_ep*/ _epout, /*_attr*/ (uint8_t) ((uint8_t)TUSB_XFER_ISOCHRONOUS | (uint8_t)TUSB_ISO_EP_ATT_ASYNCHRONOUS | (uint8_t)TUSB_ISO_EP_ATT_DATA), /*_maxEPsize*/ _epoutsize, /*_interval*/ 0x01),\
   /* Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2) */\
-  TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO_CTRL_NONE, /*_lockdelayunit*/ AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
+  TUD_AUDIO_DESC_CS_AS_ISO_EP(/*_attr*/ AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK, /*_ctrl*/ AUDIO20_CTRL_NONE, /*_lockdelayunit*/ AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC, /*_lockdelay*/ 0x0001),\
   /* Standard AS Isochronous Feedback Endpoint Descriptor(4.10.2.1) */\
   TUD_AUDIO_DESC_STD_AS_ISO_FB_EP(/*_ep*/ _epfb, /*_epsize*/ _epfbsize, /*_interval*/ TUD_OPT_HIGH_SPEED ? 4 : 1)\
 
diff --git a/src/class/audio/audio.h b/src/class/audio/audio.h
index 0d1acadcc..7c4c85306 100644
--- a/src/class/audio/audio.h
+++ b/src/class/audio/audio.h
@@ -39,7 +39,9 @@
 extern "C" {
 #endif
 
-/// Audio Device Class Codes
+//--------------------------------------------------------------------+
+// GENERIC AUDIO CLASS CODES (COMMON TO UAC1 AND UAC2)
+//--------------------------------------------------------------------+
 
 /// A.2 - Audio Function Subclass Codes
 typedef enum
@@ -51,6 +53,7 @@ typedef enum
 typedef enum
 {
   AUDIO_FUNC_PROTOCOL_CODE_UNDEF       = 0x00,
+  AUDIO_FUNC_PROTOCOL_CODE_V1          = 0x00, ///< Version 1.0 - same as undefined for backward compatibility
   AUDIO_FUNC_PROTOCOL_CODE_V2          = 0x20, ///< Version 2.0
 } audio_function_protocol_code_t;
 
@@ -67,402 +70,798 @@ typedef enum
 typedef enum
 {
   AUDIO_INT_PROTOCOL_CODE_UNDEF       = 0x00,
+  AUDIO_INT_PROTOCOL_CODE_V1          = 0x00, ///< Version 1.0 - same as undefined for backward compatibility
   AUDIO_INT_PROTOCOL_CODE_V2          = 0x20, ///< Version 2.0
 } audio_interface_protocol_code_t;
 
+//--------------------------------------------------------------------+
+// USB AUDIO CLASS 1.0 (UAC1) DEFINITIONS
+//--------------------------------------------------------------------+
+
+/// A.4 - Audio Class-Specific AC Interface Descriptor Subtypes UAC1
+typedef enum
+{
+  AUDIO10_CS_AC_INTERFACE_AC_DESCRIPTOR_UNDEF = 0x00,
+  AUDIO10_CS_AC_INTERFACE_HEADER              = 0x01,
+  AUDIO10_CS_AC_INTERFACE_INPUT_TERMINAL      = 0x02,
+  AUDIO10_CS_AC_INTERFACE_OUTPUT_TERMINAL     = 0x03,
+  AUDIO10_CS_AC_INTERFACE_MIXER_UNIT          = 0x04,
+  AUDIO10_CS_AC_INTERFACE_SELECTOR_UNIT       = 0x05,
+  AUDIO10_CS_AC_INTERFACE_FEATURE_UNIT        = 0x06,
+  AUDIO10_CS_AC_INTERFACE_PROCESSING_UNIT     = 0x07,
+  AUDIO10_CS_AC_INTERFACE_EXTENSION_UNIT      = 0x08,
+} audio10_cs_ac_interface_subtype_t;
+
+/// A.5 - Audio Class-Specific AS Interface Descriptor Subtypes UAC1
+typedef enum
+{
+  AUDIO10_CS_AS_INTERFACE_AS_DESCRIPTOR_UNDEF = 0x00,
+  AUDIO10_CS_AS_INTERFACE_AS_GENERAL          = 0x01,
+  AUDIO10_CS_AS_INTERFACE_FORMAT_TYPE         = 0x02,
+} audio10_cs_as_interface_subtype_t;
+
+/// A.6 - Audio Class-Specific EP Descriptor Subtypes UAC1
+typedef enum
+{
+  AUDIO10_CS_EP_SUBTYPE_UNDEF                 = 0x00,
+  AUDIO10_CS_EP_SUBTYPE_GENERAL               = 0x01,
+} audio10_cs_ep_subtype_t;
+
+/// A.7 - Audio Class-Specific Request Codes UAC1
+typedef enum
+{
+  AUDIO10_CS_REQ_UNDEF                        = 0x00,
+  AUDIO10_CS_REQ_SET_CUR                      = 0x01,
+  AUDIO10_CS_REQ_GET_CUR                      = 0x81,
+  AUDIO10_CS_REQ_SET_MIN                      = 0x02,
+  AUDIO10_CS_REQ_GET_MIN                      = 0x82,
+  AUDIO10_CS_REQ_SET_MAX                      = 0x03,
+  AUDIO10_CS_REQ_GET_MAX                      = 0x83,
+  AUDIO10_CS_REQ_SET_RES                      = 0x04,
+  AUDIO10_CS_REQ_GET_RES                      = 0x84,
+  AUDIO10_CS_REQ_SET_MEM                      = 0x05,
+  AUDIO10_CS_REQ_GET_MEM                      = 0x85,
+  AUDIO10_CS_REQ_GET_STAT                     = 0xFF,
+} audio10_cs_req_t;
+
+/// A.9.1 - Terminal Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_TE_CTRL_UNDEF                       = 0x00,
+  AUDIO10_TE_CTRL_COPY_PROTECT                = 0x01,
+} audio10_terminal_control_selector_t;
+
+/// A.9.2 - Feature Unit Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_FU_CTRL_UNDEF                       = 0x00,
+  AUDIO10_FU_CTRL_MUTE                        = 0x01,
+  AUDIO10_FU_CTRL_VOLUME                      = 0x02,
+  AUDIO10_FU_CTRL_BASS                        = 0x03,
+  AUDIO10_FU_CTRL_MID                         = 0x04,
+  AUDIO10_FU_CTRL_TREBLE                      = 0x05,
+  AUDIO10_FU_CTRL_GRAPHIC_EQUALIZER           = 0x06,
+  AUDIO10_FU_CTRL_AGC                         = 0x07,
+  AUDIO10_FU_CTRL_DELAY                       = 0x08,
+  AUDIO10_FU_CTRL_BASS_BOOST                  = 0x09,
+  AUDIO10_FU_CTRL_LOUDNESS                    = 0x0A,
+} audio10_feature_unit_control_selector_t;
+
+/// A.9.3 - Up/Down-mix Processing Unit Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_UD_CTRL_UNDEF                       = 0x00,
+  AUDIO10_UD_CTRL_ENABLE                      = 0x01,
+  AUDIO10_UD_CTRL_MODE_SELECT                 = 0x02,
+} audio10_up_down_mix_control_selector_t;
+
+/// A.9.4 - Dolby Prologic Processing Unit Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_DP_CTRL_UNDEF                       = 0x00,
+  AUDIO10_DP_CTRL_ENABLE                      = 0x01,
+  AUDIO10_DP_CTRL_MODE_SELECT                 = 0x02,
+} audio10_dolby_prologic_control_selector_t;
+
+/// A.9.5 - 3D Stereo Extender Processing Unit Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_3D_CTRL_UNDEF                       = 0x00,
+  AUDIO10_3D_CTRL_ENABLE                      = 0x01,
+  AUDIO10_3D_CTRL_SPACIOUSNESS                = 0x02,
+} audio10_3d_stereo_extender_control_selector_t;
+
+/// A.9.6 - Reverberation Processing Unit Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_RV_CTRL_UNDEF                       = 0x00,
+  AUDIO10_RV_CTRL_ENABLE                      = 0x01,
+  AUDIO10_RV_CTRL_REVERB_LEVEL                = 0x02,
+  AUDIO10_RV_CTRL_REVERB_TIME                 = 0x03,
+  AUDIO10_RV_CTRL_REVERB_FEEDBACK             = 0x04,
+} audio10_reverberation_control_selector_t;
+
+/// A.9.7 - Chorus Processing Unit Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_CH_CTRL_UNDEF                       = 0x00,
+  AUDIO10_CH_CTRL_ENABLE                      = 0x01,
+  AUDIO10_CH_CTRL_CHORUS_LEVEL                = 0x02,
+  AUDIO10_CH_CTRL_CHORUS_RATE                 = 0x03,
+  AUDIO10_CH_CTRL_CHORUS_DEPTH                = 0x04,
+} audio10_chorus_control_selector_t;
+
+/// A.9.8 - Dynamic Range Compressor Processing Unit Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_DR_CTRL_UNDEF                       = 0x00,
+  AUDIO10_DR_CTRL_ENABLE                      = 0x01,
+  AUDIO10_DR_CTRL_COMPRESSION_RATE            = 0x02,
+  AUDIO10_DR_CTRL_MAXAMPL                     = 0x03,
+  AUDIO10_DR_CTRL_THRESHOLD                   = 0x04,
+  AUDIO10_DR_CTRL_ATTACK_TIME                 = 0x05,
+  AUDIO10_DR_CTRL_RELEASE_TIME                = 0x06,
+} audio10_dynamic_range_compression_control_selector_t;
+
+/// A.9.9 - Extension Unit Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_XU_CTRL_UNDEF                       = 0x00,
+  AUDIO10_XU_CTRL_ENABLE                      = 0x01,
+} audio10_extension_unit_control_selector_t;
+
+/// A.9.10 - Endpoint Control Selectors UAC1
+typedef enum
+{
+  AUDIO10_EP_CTRL_UNDEF                       = 0x00,
+  AUDIO10_EP_CTRL_SAMPLING_FREQ               = 0x01,
+  AUDIO10_EP_CTRL_PITCH                       = 0x02,
+} audio10_ep_control_selector_t;
+
+/// A.1 - Audio Class-Format Type Codes UAC1
+typedef enum
+{
+  AUDIO10_FORMAT_TYPE_UNDEFINED   = 0x00,
+  AUDIO10_FORMAT_TYPE_I           = 0x01,
+  AUDIO10_FORMAT_TYPE_II          = 0x02,
+  AUDIO10_FORMAT_TYPE_III         = 0x03,
+} audio10_format_type_t;
+
+// A.1.1 - Audio Class-Audio Data Format Type I UAC1
+typedef enum
+{
+  AUDIO10_DATA_FORMAT_TYPE_I_PCM          = 0x0001,
+  AUDIO10_DATA_FORMAT_TYPE_I_PCM8         = 0x0002,
+  AUDIO10_DATA_FORMAT_TYPE_I_IEEE_FLOAT   = 0x0003,
+  AUDIO10_DATA_FORMAT_TYPE_I_ALAW         = 0x0004,
+  AUDIO10_DATA_FORMAT_TYPE_I_MULAW        = 0x0005,
+} audio10_data_format_type_I_t;
+
+// A.1.2 - Audio Class-Audio Data Format Type II UAC1
+typedef enum
+{
+  AUDIO10_DATA_FORMAT_TYPE_II_MPEG        = 0x1001,
+  AUDIO10_DATA_FORMAT_TYPE_II_AC3         = 0x1002,
+} audio10_data_format_type_II_t;
+
+// A.1.3 - Audio Class-Audio Data Format Type III UAC1
+typedef enum
+{
+  AUDIO10_DATA_FORMAT_TYPE_III_IEC1937_AC3_1        = 0x2001,
+  AUDIO10_DATA_FORMAT_TYPE_III_IEC1937_MPEG1_L1_1   = 0x2002,
+  AUDIO10_DATA_FORMAT_TYPE_III_IEC1937_MPEG1_L23_1  = 0x2003,
+  AUDIO10_DATA_FORMAT_TYPE_III_IEC1937_MPEG2_EXT_1  = 0x2004,
+  AUDIO10_DATA_FORMAT_TYPE_III_IEC1937_MPEG2_L1_LS_1 = 0x2005,
+  AUDIO10_DATA_FORMAT_TYPE_III_IEC1937_MPEG2_L23_LS_1 = 0x2006,
+} audio10_data_format_type_III_t;
+
+/// Audio Class-Audio Channel Configuration UAC1 (Table A-7)
+typedef enum
+{
+  AUDIO10_CHANNEL_CONFIG_NON_PREDEFINED       = 0x0000,
+  AUDIO10_CHANNEL_CONFIG_LEFT_FRONT           = 0x0001,
+  AUDIO10_CHANNEL_CONFIG_RIGHT_FRONT          = 0x0002,
+  AUDIO10_CHANNEL_CONFIG_CENTER_FRONT         = 0x0004,
+  AUDIO10_CHANNEL_CONFIG_LOW_FRQ_EFFECTS      = 0x0008,
+  AUDIO10_CHANNEL_CONFIG_LEFT_SURROUND        = 0x0010,
+  AUDIO10_CHANNEL_CONFIG_RIGHT_SURROUND       = 0x0020,
+  AUDIO10_CHANNEL_CONFIG_LEFT_OF_CENTER       = 0x0040,
+  AUDIO10_CHANNEL_CONFIG_RIGHT_OF_CENTER      = 0x0080,
+  AUDIO10_CHANNEL_CONFIG_SURROUND             = 0x0100,
+  AUDIO10_CHANNEL_CONFIG_SIDE_LEFT            = 0x0200,
+  AUDIO10_CHANNEL_CONFIG_SIDE_RIGHT           = 0x0400,
+  AUDIO10_CHANNEL_CONFIG_TOP                  = 0x0800,
+} audio10_channel_config_t;
+
+
+//--------------------------------------------------------------------+
+// USB AUDIO CLASS 1.0 (UAC1) DESCRIPTORS
+//--------------------------------------------------------------------+
+
+/// AUDIO Class-Specific AC Interface Header Descriptor UAC1 (4.3.2)
+#define audio10_desc_cs_ac_interface_n_t(numInterfaces) \
+    struct TU_ATTR_PACKED {                         \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 8+n. */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AC_INTERFACE_HEADER. */\
+  uint16_t bcdADC            ; /* Audio Device Class Specification Release Number in Binary-Coded Decimal. Value: 0x0100 for UAC1. */\
+  uint16_t wTotalLength      ; /* Total number of bytes returned for the class-specific AudioControl interface descriptor. */\
+  uint8_t bInCollection      ; /* The number of AudioStreaming and MIDIStreaming interfaces in the Audio Interface Collection. */\
+  uint8_t baInterfaceNr[numInterfaces]; /* Interface number of the AudioStreaming or MIDIStreaming interface in the Collection. */\
+}
+
+/// AUDIO Input Terminal Descriptor UAC1 (4.3.2.1)
+typedef struct TU_ATTR_PACKED
+{
+  uint8_t bLength            ; ///< Size of this descriptor in bytes: 12.
+  uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO10_CS_AC_INTERFACE_INPUT_TERMINAL.
+  uint8_t bTerminalID        ; ///< Constant uniquely identifying the Terminal within the audio function.
+  uint16_t wTerminalType     ; ///< Constant characterizing the type of Terminal.
+  uint8_t bAssocTerminal     ; ///< ID of the Output Terminal to which this Input Terminal is associated.
+  uint8_t bNrChannels        ; ///< Number of logical output channels in the Terminal's output audio channel cluster.
+  uint16_t wChannelConfig    ; ///< Describes the spatial location of the logical channels.
+  uint8_t iChannelNames      ; ///< Index of a string descriptor, describing the name of the first logical channel.
+  uint8_t iTerminal          ; ///< Index of a string descriptor, describing the Input Terminal.
+} audio10_desc_input_terminal_t;
+
+/// AUDIO Output Terminal Descriptor UAC1 (4.3.2.2)
+typedef struct TU_ATTR_PACKED
+{
+  uint8_t bLength            ; ///< Size of this descriptor in bytes: 9.
+  uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO10_CS_AC_INTERFACE_OUTPUT_TERMINAL.
+  uint8_t bTerminalID        ; ///< Constant uniquely identifying the Terminal within the audio function.
+  uint16_t wTerminalType     ; ///< Constant characterizing the type of Terminal.
+  uint8_t bAssocTerminal     ; ///< Constant, identifying the Input Terminal to which this Output Terminal is associated.
+  uint8_t bSourceID          ; ///< ID of the Unit or Terminal to which this Terminal is connected.
+  uint8_t iTerminal          ; ///< Index of a string descriptor, describing the Output Terminal.
+} audio10_desc_output_terminal_t;
+
+/// AUDIO Mixer Unit Descriptor UAC1 (4.3.2.3)
+#define audio10_desc_mixer_unit_n_t(numInputPins, numControlBytes) \
+    struct TU_ATTR_PACKED {                                      \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 10+p+n. */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AC_INTERFACE_MIXER_UNIT. */\
+  uint8_t bUnitID            ; /* Constant uniquely identifying the Unit within the audio function. */\
+  uint8_t bNrInPins          ; /* Number of Input Pins of this Unit: p. */\
+  uint8_t baSourceID[numInputPins]; /* ID of the Unit or Terminal to which Input Pins of this Mixer Unit are connected. */\
+  uint8_t bNrChannels        ; /* Number of logical output channels in the Mixer Unit's output audio channel cluster. */\
+  uint16_t wChannelConfig    ; /* Describes the spatial location of the logical channels. */\
+  uint8_t iChannelNames      ; /* Index of a string descriptor, describing the name of the first logical channel. */\
+  uint8_t bmControls[numControlBytes]; /* Mixer Unit Controls bitmap. */\
+  uint8_t iMixer             ; /* Index of a string descriptor, describing the Mixer Unit. */\
+}
+
+/// AUDIO Selector Unit Descriptor UAC1 (4.3.2.4)
+#define audio10_desc_selector_unit_n_t(numInputPins) \
+    struct TU_ATTR_PACKED {                        \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 6+p. */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AC_INTERFACE_SELECTOR_UNIT. */\
+  uint8_t bUnitID            ; /* Constant uniquely identifying the Unit within the audio function. */\
+  uint8_t bNrInPins          ; /* Number of Input Pins of this Unit: p. */\
+  uint8_t baSourceID[numInputPins]; /* ID of the Unit or Terminal to which Input Pins of this Selector Unit are connected. */\
+  uint8_t iSelector          ; /* Index of a string descriptor, describing the Selector Unit. */\
+}
+
+/// AUDIO Feature Unit Descriptor UAC1 (4.3.2.5)
+#define audio10_desc_feature_unit_n_t(numChannels, controlSize) \
+    struct TU_ATTR_PACKED {                                     \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 7+(ch+1)*n. */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AC_INTERFACE_FEATURE_UNIT. */\
+  uint8_t bUnitID            ; /* Constant uniquely identifying the Unit within the audio function. */\
+  uint8_t bSourceID          ; /* ID of the Unit or Terminal to which this Feature Unit is connected. */\
+  uint8_t bControlSize       ; /* Size in bytes of an element of the bmaControls() array. */\
+  uint8_t bmaControls[(numChannels+1)*controlSize]; /* Control bitmaps for master + logical channels. */\
+  uint8_t iFeature           ; /* Index of a string descriptor, describing this Feature Unit. */\
+}
+
+/// AUDIO Processing Unit Descriptor UAC1 (4.3.2.6)
+#define audio10_desc_processing_unit_n_t(numInputPins, numControlBytes) \
+    struct TU_ATTR_PACKED {                                           \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 13+p+n. */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AC_INTERFACE_PROCESSING_UNIT. */\
+  uint8_t bUnitID            ; /* Constant uniquely identifying the Unit within the audio function. */\
+  uint16_t wProcessType      ; /* Constant identifying the type of processing this Unit is performing. */\
+  uint8_t bNrInPins          ; /* Number of Input Pins of this Unit: p. */\
+  uint8_t baSourceID[numInputPins]; /* ID of the Unit or Terminal to which Input Pins of this Processing Unit are connected. */\
+  uint8_t bNrChannels        ; /* Number of logical output channels in the Processing Unit's output audio channel cluster. */\
+  uint16_t wChannelConfig    ; /* Describes the spatial location of the logical channels. */\
+  uint8_t iChannelNames      ; /* Index of a string descriptor, describing the name of the first logical channel. */\
+  uint8_t bControlSize       ; /* Size in bytes of the bmControls field. */\
+  uint8_t bmControls[numControlBytes]; /* Processing Unit Controls bitmap. */\
+  uint8_t iProcessing        ; /* Index of a string descriptor, describing the Processing Unit. */\
+}
+
+/// AUDIO Extension Unit Descriptor UAC1 (4.3.2.7)
+#define audio10_desc_extension_unit_n_t(numInputPins, numControlBytes) \
+    struct TU_ATTR_PACKED {                                          \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 13+p+n. */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AC_INTERFACE_EXTENSION_UNIT. */\
+  uint8_t bUnitID            ; /* Constant uniquely identifying the Unit within the audio function. */\
+  uint16_t wExtensionCode    ; /* Vendor-specific code identifying the Extension Unit. */\
+  uint8_t bNrInPins          ; /* Number of Input Pins of this Unit: p. */\
+  uint8_t baSourceID[numInputPins]; /* ID of the Unit or Terminal to which Input Pins of this Extension Unit are connected. */\
+  uint8_t bNrChannels        ; /* Number of logical output channels in the Extension Unit's output audio channel cluster. */\
+  uint16_t wChannelConfig    ; /* Describes the spatial location of the logical channels. */\
+  uint8_t iChannelNames      ; /* Index of a string descriptor, describing the name of the first logical channel. */\
+  uint8_t bControlSize       ; /* Size in bytes of the bmControls field. */\
+  uint8_t bmControls[numControlBytes]; /* Extension Unit Controls bitmap. */\
+  uint8_t iExtension         ; /* Index of a string descriptor, describing the Extension Unit. */\
+}
+
+/// AUDIO Class-Specific AS Interface Descriptor UAC1 (4.5.2)
+typedef struct TU_ATTR_PACKED
+{
+  uint8_t bLength            ; ///< Size of this descriptor in bytes: 7.
+  uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO10_CS_AS_INTERFACE_AS_GENERAL.
+  uint8_t bTerminalLink      ; ///< The Terminal ID of the Terminal to which the endpoint of this interface is connected.
+  uint8_t bDelay             ; ///< Expressed in number of frames.
+  uint16_t wFormatTag        ; ///< The Audio Data Format that has to be used to communicate with this interface.
+} audio10_desc_cs_as_interface_t;
+
+/// AUDIO Type I Format Type Descriptor UAC1 (2.2.5)
+#define audio10_desc_type_I_format_n_t(numSamFreq) \
+    struct TU_ATTR_PACKED {                      \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 8+(ns*3). */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AS_INTERFACE_FORMAT_TYPE. */\
+  uint8_t bFormatType        ; /* Constant identifying the Format Type the AudioStreaming interface is using. */\
+  uint8_t bNrChannels        ; /* Indicates the number of physical channels in the audio data stream. */\
+  uint8_t bSubFrameSize      ; /* The number of bytes occupied by one audio subframe. */\
+  uint8_t bBitResolution     ; /* The number of effectively used bits from the available bits in an audio subframe. */\
+  uint8_t bSamFreqType       ; /* Indicates how the sampling frequency can be programmed. */\
+  uint8_t tSamFreq[numSamFreq*3]; /* Sampling frequency or lower/upper bounds in Hz for the sampling frequency range. */\
+}
+
+/// AUDIO Type II Format Type Descriptor UAC1 (2.3.5)
+#define audio10_desc_type_II_format_n_t(numSamFreq) \
+    struct TU_ATTR_PACKED {                       \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 9+(ns*3). */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AS_INTERFACE_FORMAT_TYPE. */\
+  uint8_t bFormatType        ; /* Constant identifying the Format Type the AudioStreaming interface is using. */\
+  uint16_t wMaxBitRate       ; /* Indicates the maximum number of bits per second this interface can handle. */\
+  uint16_t wSamplesPerFrame  ; /* Indicates the number of PCM audio samples contained in one encoded audio frame. */\
+  uint8_t bSamFreqType       ; /* Indicates how the sampling frequency can be programmed. */\
+  uint8_t tSamFreq[numSamFreq*3]; /* Sampling frequency or lower/upper bounds in Hz for the sampling frequency range. */\
+}
+
+/// AUDIO Type III Format Type Descriptor UAC1 (2.4.5)
+#define audio10_desc_type_III_format_n_t(numSamFreq) \
+    struct TU_ATTR_PACKED {                        \
+  uint8_t bLength            ; /* Size of this descriptor in bytes: 8+(ns*3). */\
+  uint8_t bDescriptorType    ; /* Descriptor Type. Value: TUSB_DESC_CS_INTERFACE. */\
+  uint8_t bDescriptorSubType ; /* Descriptor SubType. Value: AUDIO10_CS_AS_INTERFACE_FORMAT_TYPE. */\
+  uint8_t bFormatType        ; /* Constant identifying the Format Type the AudioStreaming interface is using. */\
+  uint8_t bNrChannels        ; /* Indicates the number of physical channels in the audio data stream. */\
+  uint8_t bSubFrameSize      ; /* The number of bytes occupied by one audio subframe. */\
+  uint8_t bBitResolution     ; /* The number of effectively used bits from the available bits in an audio subframe. */\
+  uint8_t bSamFreqType       ; /* Indicates how the sampling frequency can be programmed. */\
+  uint8_t tSamFreq[numSamFreq*3]; /* Sampling frequency or lower/upper bounds in Hz for the sampling frequency range. */\
+}
+
+/// AUDIO Class-Specific AS Isochronous Audio Data Endpoint Descriptor UAC1 (4.6.1.2)
+typedef struct TU_ATTR_PACKED
+{
+  uint8_t bLength            ; ///< Size of this descriptor in bytes: 7.
+  uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_ENDPOINT.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO10_CS_EP_SUBTYPE_GENERAL.
+  uint8_t bmAttributes       ; ///< Bit 0: Sampling Frequency, Bit 1: Pitch, Bit 7: MaxPacketsOnly.
+  uint8_t bLockDelayUnits    ; ///< Indicates the units used for the wLockDelay field.
+  uint16_t wLockDelay        ; ///< Indicates the time it takes this endpoint to reliably lock its internal clock recovery circuitry.
+} audio10_desc_cs_as_iso_data_ep_t;
+
+/// AUDIO Interrupt Data Message Format UAC1 (3.7.1.2)
+typedef struct TU_ATTR_PACKED
+{
+  uint8_t bStatusType        ; ///< Indicates the type of status information being reported.
+  uint8_t bOriginator        ; ///< Indicates the entity that originated this status information.
+} audio10_interrupt_data_t;
+
+//--------------------------------------------------------------------+
+// USB AUDIO CLASS 2.0 (UAC2) DEFINITIONS
+//--------------------------------------------------------------------+
+
 /// A.7 - Audio Function Category Codes
 typedef enum
 {
-  AUDIO_FUNC_UNDEF              = 0x00,
-  AUDIO_FUNC_DESKTOP_SPEAKER    = 0x01,
-  AUDIO_FUNC_HOME_THEATER       = 0x02,
-  AUDIO_FUNC_MICROPHONE         = 0x03,
-  AUDIO_FUNC_HEADSET            = 0x04,
-  AUDIO_FUNC_TELEPHONE          = 0x05,
-  AUDIO_FUNC_CONVERTER          = 0x06,
-  AUDIO_FUNC_SOUND_RECODER      = 0x07,
-  AUDIO_FUNC_IO_BOX             = 0x08,
-  AUDIO_FUNC_MUSICAL_INSTRUMENT = 0x09,
-  AUDIO_FUNC_PRO_AUDIO          = 0x0A,
-  AUDIO_FUNC_AUDIO_VIDEO        = 0x0B,
-  AUDIO_FUNC_CONTROL_PANEL      = 0x0C,
-  AUDIO_FUNC_OTHER              = 0xFF,
-} audio_function_code_t;
+  AUDIO20_FUNC_UNDEF              = 0x00,
+  AUDIO20_FUNC_DESKTOP_SPEAKER    = 0x01,
+  AUDIO20_FUNC_HOME_THEATER       = 0x02,
+  AUDIO20_FUNC_MICROPHONE         = 0x03,
+  AUDIO20_FUNC_HEADSET            = 0x04,
+  AUDIO20_FUNC_TELEPHONE          = 0x05,
+  AUDIO20_FUNC_CONVERTER          = 0x06,
+  AUDIO20_FUNC_SOUND_RECODER      = 0x07,
+  AUDIO20_FUNC_IO_BOX             = 0x08,
+  AUDIO20_FUNC_MUSICAL_INSTRUMENT = 0x09,
+  AUDIO20_FUNC_PRO_AUDIO          = 0x0A,
+  AUDIO20_FUNC_AUDIO_VIDEO        = 0x0B,
+  AUDIO20_FUNC_CONTROL_PANEL      = 0x0C,
+  AUDIO20_FUNC_OTHER              = 0xFF,
+} audio20_function_code_t;
 
 /// A.9 - Audio Class-Specific AC Interface Descriptor Subtypes UAC2
 typedef enum
 {
-  AUDIO_CS_AC_INTERFACE_AC_DESCRIPTOR_UNDEF   = 0x00,
-  AUDIO_CS_AC_INTERFACE_HEADER                = 0x01,
-  AUDIO_CS_AC_INTERFACE_INPUT_TERMINAL        = 0x02,
-  AUDIO_CS_AC_INTERFACE_OUTPUT_TERMINAL       = 0x03,
-  AUDIO_CS_AC_INTERFACE_MIXER_UNIT            = 0x04,
-  AUDIO_CS_AC_INTERFACE_SELECTOR_UNIT         = 0x05,
-  AUDIO_CS_AC_INTERFACE_FEATURE_UNIT          = 0x06,
-  AUDIO_CS_AC_INTERFACE_EFFECT_UNIT           = 0x07,
-  AUDIO_CS_AC_INTERFACE_PROCESSING_UNIT       = 0x08,
-  AUDIO_CS_AC_INTERFACE_EXTENSION_UNIT        = 0x09,
-  AUDIO_CS_AC_INTERFACE_CLOCK_SOURCE          = 0x0A,
-  AUDIO_CS_AC_INTERFACE_CLOCK_SELECTOR        = 0x0B,
-  AUDIO_CS_AC_INTERFACE_CLOCK_MULTIPLIER      = 0x0C,
-  AUDIO_CS_AC_INTERFACE_SAMPLE_RATE_CONVERTER = 0x0D,
-} audio_cs_ac_interface_subtype_t;
+  AUDIO20_CS_AC_INTERFACE_AC_DESCRIPTOR_UNDEF   = 0x00,
+  AUDIO20_CS_AC_INTERFACE_HEADER                = 0x01,
+  AUDIO20_CS_AC_INTERFACE_INPUT_TERMINAL        = 0x02,
+  AUDIO20_CS_AC_INTERFACE_OUTPUT_TERMINAL       = 0x03,
+  AUDIO20_CS_AC_INTERFACE_MIXER_UNIT            = 0x04,
+  AUDIO20_CS_AC_INTERFACE_SELECTOR_UNIT         = 0x05,
+  AUDIO20_CS_AC_INTERFACE_FEATURE_UNIT          = 0x06,
+  AUDIO20_CS_AC_INTERFACE_EFFECT_UNIT           = 0x07,
+  AUDIO20_CS_AC_INTERFACE_PROCESSING_UNIT       = 0x08,
+  AUDIO20_CS_AC_INTERFACE_EXTENSION_UNIT        = 0x09,
+  AUDIO20_CS_AC_INTERFACE_CLOCK_SOURCE          = 0x0A,
+  AUDIO20_CS_AC_INTERFACE_CLOCK_SELECTOR        = 0x0B,
+  AUDIO20_CS_AC_INTERFACE_CLOCK_MULTIPLIER      = 0x0C,
+  AUDIO20_CS_AC_INTERFACE_SAMPLE_RATE_CONVERTER = 0x0D,
+} audio20_cs_ac_interface_subtype_t;
 
 /// A.10 - Audio Class-Specific AS Interface Descriptor Subtypes UAC2
 typedef enum
 {
-  AUDIO_CS_AS_INTERFACE_AS_DESCRIPTOR_UNDEF   = 0x00,
-  AUDIO_CS_AS_INTERFACE_AS_GENERAL            = 0x01,
-  AUDIO_CS_AS_INTERFACE_FORMAT_TYPE           = 0x02,
-  AUDIO_CS_AS_INTERFACE_ENCODER               = 0x03,
-  AUDIO_CS_AS_INTERFACE_DECODER               = 0x04,
-} audio_cs_as_interface_subtype_t;
+  AUDIO20_CS_AS_INTERFACE_AS_DESCRIPTOR_UNDEF   = 0x00,
+  AUDIO20_CS_AS_INTERFACE_AS_GENERAL            = 0x01,
+  AUDIO20_CS_AS_INTERFACE_FORMAT_TYPE           = 0x02,
+  AUDIO20_CS_AS_INTERFACE_ENCODER               = 0x03,
+  AUDIO20_CS_AS_INTERFACE_DECODER               = 0x04,
+} audio20_cs_as_interface_subtype_t;
 
 /// A.11 - Effect Unit Effect Types
 typedef enum
 {
-  AUDIO_EFFECT_TYPE_UNDEF                     = 0x00,
-  AUDIO_EFFECT_TYPE_PARAM_EQ_SECTION          = 0x01,
-  AUDIO_EFFECT_TYPE_REVERBERATION             = 0x02,
-  AUDIO_EFFECT_TYPE_MOD_DELAY                 = 0x03,
-  AUDIO_EFFECT_TYPE_DYN_RANGE_COMP            = 0x04,
-} audio_effect_unit_effect_type_t;
+  AUDIO20_EFFECT_TYPE_UNDEF                     = 0x00,
+  AUDIO20_EFFECT_TYPE_PARAM_EQ_SECTION          = 0x01,
+  AUDIO20_EFFECT_TYPE_REVERBERATION             = 0x02,
+  AUDIO20_EFFECT_TYPE_MOD_DELAY                 = 0x03,
+  AUDIO20_EFFECT_TYPE_DYN_RANGE_COMP            = 0x04,
+} audio20_effect_unit_effect_type_t;
 
 /// A.12 - Processing Unit Process Types
 typedef enum
 {
-  AUDIO_PROCESS_TYPE_UNDEF                    = 0x00,
-  AUDIO_PROCESS_TYPE_UP_DOWN_MIX              = 0x01,
-  AUDIO_PROCESS_TYPE_DOLBY_PROLOGIC           = 0x02,
-  AUDIO_PROCESS_TYPE_STEREO_EXTENDER          = 0x03,
-} audio_processing_unit_process_type_t;
+  AUDIO20_PROCESS_TYPE_UNDEF                    = 0x00,
+  AUDIO20_PROCESS_TYPE_UP_DOWN_MIX              = 0x01,
+  AUDIO20_PROCESS_TYPE_DOLBY_PROLOGIC           = 0x02,
+  AUDIO20_PROCESS_TYPE_STEREO_EXTENDER          = 0x03,
+} audio20_processing_unit_process_type_t;
 
 /// A.13 - Audio Class-Specific EP Descriptor Subtypes UAC2
 typedef enum
 {
-  AUDIO_CS_EP_SUBTYPE_UNDEF                   = 0x00,
-  AUDIO_CS_EP_SUBTYPE_GENERAL                 = 0x01,
-} audio_cs_ep_subtype_t;
+  AUDIO20_CS_EP_SUBTYPE_UNDEF                   = 0x00,
+  AUDIO20_CS_EP_SUBTYPE_GENERAL                 = 0x01,
+} audio20_cs_ep_subtype_t;
 
-/// A.14 - Audio Class-Specific Request Codes
+/// A.14 - Audio Class-Specific Request Codes UAC2
 typedef enum
 {
-  AUDIO_CS_REQ_UNDEF                          = 0x00,
-  AUDIO_CS_REQ_CUR                            = 0x01,
-  AUDIO_CS_REQ_RANGE                          = 0x02,
-  AUDIO_CS_REQ_MEM                            = 0x03,
-} audio_cs_req_t;
+  AUDIO20_CS_REQ_UNDEF                          = 0x00,
+  AUDIO20_CS_REQ_CUR                            = 0x01,
+  AUDIO20_CS_REQ_RANGE                          = 0x02,
+  AUDIO20_CS_REQ_MEM                            = 0x03,
+} audio20_cs_req_t;
 
-/// A.17 - Control Selector Codes
+/// A.17 - Control Selector Codes UAC2
 
 /// A.17.1 - Clock Source Control Selectors
 typedef enum
 {
-  AUDIO_CS_CTRL_UNDEF                         = 0x00,
-  AUDIO_CS_CTRL_SAM_FREQ                      = 0x01,
-  AUDIO_CS_CTRL_CLK_VALID                     = 0x02,
-} audio_clock_src_control_selector_t;
+  AUDIO20_CS_CTRL_UNDEF                         = 0x00,
+  AUDIO20_CS_CTRL_SAM_FREQ                      = 0x01,
+  AUDIO20_CS_CTRL_CLK_VALID                     = 0x02,
+} audio20_clock_src_control_selector_t;
 
 /// A.17.2 - Clock Selector Control Selectors
 typedef enum
 {
-  AUDIO_CX_CTRL_UNDEF                         = 0x00,
-  AUDIO_CX_CTRL_CONTROL                       = 0x01,
-} audio_clock_sel_control_selector_t;
+  AUDIO20_CX_CTRL_UNDEF                         = 0x00,
+  AUDIO20_CX_CTRL_CONTROL                       = 0x01,
+} audio20_clock_sel_control_selector_t;
 
 /// A.17.3 - Clock Multiplier Control Selectors
 typedef enum
 {
-  AUDIO_CM_CTRL_UNDEF                         = 0x00,
-  AUDIO_CM_CTRL_NUMERATOR_CONTROL             = 0x01,
-  AUDIO_CM_CTRL_DENOMINATOR_CONTROL           = 0x02,
-} audio_clock_mul_control_selector_t;
+  AUDIO20_CM_CTRL_UNDEF                         = 0x00,
+  AUDIO20_CM_CTRL_NUMERATOR_CONTROL             = 0x01,
+  AUDIO20_CM_CTRL_DENOMINATOR_CONTROL           = 0x02,
+} audio20_clock_mul_control_selector_t;
 
-/// A.17.4 - Terminal Control Selectors
+/// A.17.4 - Terminal Control Selectors UAC2
 typedef enum
 {
-  AUDIO_TE_CTRL_UNDEF                         = 0x00,
-  AUDIO_TE_CTRL_COPY_PROTECT                  = 0x01,
-  AUDIO_TE_CTRL_CONNECTOR                     = 0x02,
-  AUDIO_TE_CTRL_OVERLOAD                      = 0x03,
-  AUDIO_TE_CTRL_CLUSTER                       = 0x04,
-  AUDIO_TE_CTRL_UNDERFLOW                     = 0x05,
-  AUDIO_TE_CTRL_OVERFLOW                      = 0x06,
-  AUDIO_TE_CTRL_LATENCY                       = 0x07,
-} audio_terminal_control_selector_t;
+  AUDIO20_TE_CTRL_UNDEF                         = 0x00,
+  AUDIO20_TE_CTRL_COPY_PROTECT                  = 0x01,
+  AUDIO20_TE_CTRL_CONNECTOR                     = 0x02,
+  AUDIO20_TE_CTRL_OVERLOAD                      = 0x03,
+  AUDIO20_TE_CTRL_CLUSTER                       = 0x04,
+  AUDIO20_TE_CTRL_UNDERFLOW                     = 0x05,
+  AUDIO20_TE_CTRL_OVERFLOW                      = 0x06,
+  AUDIO20_TE_CTRL_LATENCY                       = 0x07,
+} audio20_terminal_control_selector_t;
 
 /// A.17.5 - Mixer Control Selectors
 typedef enum
 {
-  AUDIO_MU_CTRL_UNDEF                         = 0x00,
-  AUDIO_MU_CTRL_MIXER                         = 0x01,
-  AUDIO_MU_CTRL_CLUSTER                       = 0x02,
-  AUDIO_MU_CTRL_UNDERFLOW                     = 0x03,
-  AUDIO_MU_CTRL_OVERFLOW                      = 0x04,
-  AUDIO_MU_CTRL_LATENCY                       = 0x05,
-} audio_mixer_control_selector_t;
+  AUDIO20_MU_CTRL_UNDEF                         = 0x00,
+  AUDIO20_MU_CTRL_MIXER                         = 0x01,
+  AUDIO20_MU_CTRL_CLUSTER                       = 0x02,
+  AUDIO20_MU_CTRL_UNDERFLOW                     = 0x03,
+  AUDIO20_MU_CTRL_OVERFLOW                      = 0x04,
+  AUDIO20_MU_CTRL_LATENCY                       = 0x05,
+} audio20_mixer_control_selector_t;
 
 /// A.17.6 - Selector Control Selectors
 typedef enum
 {
-  AUDIO_SU_CTRL_UNDEF                         = 0x00,
-  AUDIO_SU_CTRL_SELECTOR                      = 0x01,
-  AUDIO_SU_CTRL_LATENCY                       = 0x02,
-} audio_sel_control_selector_t;
+  AUDIO20_SU_CTRL_UNDEF                         = 0x00,
+  AUDIO20_SU_CTRL_SELECTOR                      = 0x01,
+  AUDIO20_SU_CTRL_LATENCY                       = 0x02,
+} audio20_sel_control_selector_t;
 
-/// A.17.7 - Feature Unit Control Selectors
+/// A.17.7 - Feature Unit Control Selectors UAC2
 typedef enum
 {
-  AUDIO_FU_CTRL_UNDEF                         = 0x00,
-  AUDIO_FU_CTRL_MUTE                          = 0x01,
-  AUDIO_FU_CTRL_VOLUME                        = 0x02,
-  AUDIO_FU_CTRL_BASS                          = 0x03,
-  AUDIO_FU_CTRL_MID                           = 0x04,
-  AUDIO_FU_CTRL_TREBLE                        = 0x05,
-  AUDIO_FU_CTRL_GRAPHIC_EQUALIZER             = 0x06,
-  AUDIO_FU_CTRL_AGC                           = 0x07,
-  AUDIO_FU_CTRL_DELAY                         = 0x08,
-  AUDIO_FU_CTRL_BASS_BOOST                    = 0x09,
-  AUDIO_FU_CTRL_LOUDNESS                      = 0x0A,
-  AUDIO_FU_CTRL_INPUT_GAIN                    = 0x0B,
-  AUDIO_FU_CTRL_GAIN_PAD                      = 0x0C,
-  AUDIO_FU_CTRL_INVERTER                      = 0x0D,
-  AUDIO_FU_CTRL_UNDERFLOW                     = 0x0E,
-  AUDIO_FU_CTRL_OVERVLOW                      = 0x0F,
-  AUDIO_FU_CTRL_LATENCY                       = 0x10,
-} audio_feature_unit_control_selector_t;
+  AUDIO20_FU_CTRL_UNDEF                         = 0x00,
+  AUDIO20_FU_CTRL_MUTE                          = 0x01,
+  AUDIO20_FU_CTRL_VOLUME                        = 0x02,
+  AUDIO20_FU_CTRL_BASS                          = 0x03,
+  AUDIO20_FU_CTRL_MID                           = 0x04,
+  AUDIO20_FU_CTRL_TREBLE                        = 0x05,
+  AUDIO20_FU_CTRL_GRAPHIC_EQUALIZER             = 0x06,
+  AUDIO20_FU_CTRL_AGC                           = 0x07,
+  AUDIO20_FU_CTRL_DELAY                         = 0x08,
+  AUDIO20_FU_CTRL_BASS_BOOST                    = 0x09,
+  AUDIO20_FU_CTRL_LOUDNESS                      = 0x0A,
+  AUDIO20_FU_CTRL_INPUT_GAIN                    = 0x0B,
+  AUDIO20_FU_CTRL_GAIN_PAD                      = 0x0C,
+  AUDIO20_FU_CTRL_INVERTER                      = 0x0D,
+  AUDIO20_FU_CTRL_UNDERFLOW                     = 0x0E,
+  AUDIO20_FU_CTRL_OVERVLOW                      = 0x0F,
+  AUDIO20_FU_CTRL_LATENCY                       = 0x10,
+} audio20_feature_unit_control_selector_t;
 
 /// A.17.8 Effect Unit Control Selectors
 
 /// A.17.8.1 Parametric Equalizer Section Effect Unit Control Selectors
 typedef enum
 {
-  AUDIO_PE_CTRL_UNDEF                         = 0x00,
-  AUDIO_PE_CTRL_ENABLE                        = 0x01,
-  AUDIO_PE_CTRL_CENTERFREQ                    = 0x02,
-  AUDIO_PE_CTRL_QFACTOR                       = 0x03,
-  AUDIO_PE_CTRL_GAIN                          = 0x04,
-  AUDIO_PE_CTRL_UNDERFLOW                     = 0x05,
-  AUDIO_PE_CTRL_OVERFLOW                      = 0x06,
-  AUDIO_PE_CTRL_LATENCY                       = 0x07,
-} audio_parametric_equalizer_control_selector_t;
+  AUDIO20_PE_CTRL_UNDEF                         = 0x00,
+  AUDIO20_PE_CTRL_ENABLE                        = 0x01,
+  AUDIO20_PE_CTRL_CENTERFREQ                    = 0x02,
+  AUDIO20_PE_CTRL_QFACTOR                       = 0x03,
+  AUDIO20_PE_CTRL_GAIN                          = 0x04,
+  AUDIO20_PE_CTRL_UNDERFLOW                     = 0x05,
+  AUDIO20_PE_CTRL_OVERFLOW                      = 0x06,
+  AUDIO20_PE_CTRL_LATENCY                       = 0x07,
+} audio20_parametric_equalizer_control_selector_t;
 
 /// A.17.8.2 Reverberation Effect Unit Control Selectors
 typedef enum
 {
-  AUDIO_RV_CTRL_UNDEF                         = 0x00,
-  AUDIO_RV_CTRL_ENABLE                        = 0x01,
-  AUDIO_RV_CTRL_TYPE                          = 0x02,
-  AUDIO_RV_CTRL_LEVEL                         = 0x03,
-  AUDIO_RV_CTRL_TIME                          = 0x04,
-  AUDIO_RV_CTRL_FEEDBACK                      = 0x05,
-  AUDIO_RV_CTRL_PREDELAY                      = 0x06,
-  AUDIO_RV_CTRL_DENSITY                       = 0x07,
-  AUDIO_RV_CTRL_HIFREQ_ROLLOFF                = 0x08,
-  AUDIO_RV_CTRL_UNDERFLOW                     = 0x09,
-  AUDIO_RV_CTRL_OVERFLOW                      = 0x0A,
-  AUDIO_RV_CTRL_LATENCY                       = 0x0B,
-} audio_reverberation_effect_control_selector_t;
+  AUDIO20_RV_CTRL_UNDEF                         = 0x00,
+  AUDIO20_RV_CTRL_ENABLE                        = 0x01,
+  AUDIO20_RV_CTRL_TYPE                          = 0x02,
+  AUDIO20_RV_CTRL_LEVEL                         = 0x03,
+  AUDIO20_RV_CTRL_TIME                          = 0x04,
+  AUDIO20_RV_CTRL_FEEDBACK                      = 0x05,
+  AUDIO20_RV_CTRL_PREDELAY                      = 0x06,
+  AUDIO20_RV_CTRL_DENSITY                       = 0x07,
+  AUDIO20_RV_CTRL_HIFREQ_ROLLOFF                = 0x08,
+  AUDIO20_RV_CTRL_UNDERFLOW                     = 0x09,
+  AUDIO20_RV_CTRL_OVERFLOW                      = 0x0A,
+  AUDIO20_RV_CTRL_LATENCY                       = 0x0B,
+} audio20_reverberation_effect_control_selector_t;
 
 /// A.17.8.3 Modulation Delay Effect Unit Control Selectors
 typedef enum
 {
-  AUDIO_MD_CTRL_UNDEF                         = 0x00,
-  AUDIO_MD_CTRL_ENABLE                        = 0x01,
-  AUDIO_MD_CTRL_BALANCE                       = 0x02,
-  AUDIO_MD_CTRL_RATE                          = 0x03,
-  AUDIO_MD_CTRL_DEPTH                         = 0x04,
-  AUDIO_MD_CTRL_TIME                          = 0x05,
-  AUDIO_MD_CTRL_FEEDBACK                      = 0x06,
-  AUDIO_MD_CTRL_UNDERFLOW                     = 0x07,
-  AUDIO_MD_CTRL_OVERFLOW                      = 0x08,
-  AUDIO_MD_CTRL_LATENCY                       = 0x09,
-} audio_modulation_delay_control_selector_t;
+  AUDIO20_MD_CTRL_UNDEF                         = 0x00,
+  AUDIO20_MD_CTRL_ENABLE                        = 0x01,
+  AUDIO20_MD_CTRL_BALANCE                       = 0x02,
+  AUDIO20_MD_CTRL_RATE                          = 0x03,
+  AUDIO20_MD_CTRL_DEPTH                         = 0x04,
+  AUDIO20_MD_CTRL_TIME                          = 0x05,
+  AUDIO20_MD_CTRL_FEEDBACK                      = 0x06,
+  AUDIO20_MD_CTRL_UNDERFLOW                     = 0x07,
+  AUDIO20_MD_CTRL_OVERFLOW                      = 0x08,
+  AUDIO20_MD_CTRL_LATENCY                       = 0x09,
+} audio20_modulation_delay_control_selector_t;
 
 /// A.17.8.4 Dynamic Range Compressor Effect Unit Control Selectors
 typedef enum
 {
-  AUDIO_DR_CTRL_UNDEF                         = 0x00,
-  AUDIO_DR_CTRL_ENABLE                        = 0x01,
-  AUDIO_DR_CTRL_COMPRESSION_RATE              = 0x02,
-  AUDIO_DR_CTRL_MAXAMPL                       = 0x03,
-  AUDIO_DR_CTRL_THRESHOLD                     = 0x04,
-  AUDIO_DR_CTRL_ATTACK_TIME                   = 0x05,
-  AUDIO_DR_CTRL_RELEASE_TIME                  = 0x06,
-  AUDIO_DR_CTRL_UNDERFLOW                     = 0x07,
-  AUDIO_DR_CTRL_OVERFLOW                      = 0x08,
-  AUDIO_DR_CTRL_LATENCY                       = 0x09,
-} audio_dynamic_range_compression_control_selector_t;
+  AUDIO20_DR_CTRL_UNDEF                         = 0x00,
+  AUDIO20_DR_CTRL_ENABLE                        = 0x01,
+  AUDIO20_DR_CTRL_COMPRESSION_RATE              = 0x02,
+  AUDIO20_DR_CTRL_MAXAMPL                       = 0x03,
+  AUDIO20_DR_CTRL_THRESHOLD                     = 0x04,
+  AUDIO20_DR_CTRL_ATTACK_TIME                   = 0x05,
+  AUDIO20_DR_CTRL_RELEASE_TIME                  = 0x06,
+  AUDIO20_DR_CTRL_UNDERFLOW                     = 0x07,
+  AUDIO20_DR_CTRL_OVERFLOW                      = 0x08,
+  AUDIO20_DR_CTRL_LATENCY                       = 0x09,
+} audio20_dynamic_range_compression_control_selector_t;
 
 /// A.17.9 Processing Unit Control Selectors
 
 /// A.17.9.1 Up/Down-mix Processing Unit Control Selectors
 typedef enum
 {
-  AUDIO_UD_CTRL_UNDEF                         = 0x00,
-  AUDIO_UD_CTRL_ENABLE                        = 0x01,
-  AUDIO_UD_CTRL_MODE_SELECT                   = 0x02,
-  AUDIO_UD_CTRL_CLUSTER                       = 0x03,
-  AUDIO_UD_CTRL_UNDERFLOW                     = 0x04,
-  AUDIO_UD_CTRL_OVERFLOW                      = 0x05,
-  AUDIO_UD_CTRL_LATENCY                       = 0x06,
-} audio_up_down_mix_control_selector_t;
+  AUDIO20_UD_CTRL_UNDEF                         = 0x00,
+  AUDIO20_UD_CTRL_ENABLE                        = 0x01,
+  AUDIO20_UD_CTRL_MODE_SELECT                   = 0x02,
+  AUDIO20_UD_CTRL_CLUSTER                       = 0x03,
+  AUDIO20_UD_CTRL_UNDERFLOW                     = 0x04,
+  AUDIO20_UD_CTRL_OVERFLOW                      = 0x05,
+  AUDIO20_UD_CTRL_LATENCY                       = 0x06,
+} audio20_up_down_mix_control_selector_t;
 
 /// A.17.9.2 Dolby Prologic ™ Processing Unit Control Selectors
 typedef enum
 {
-  AUDIO_DP_CTRL_UNDEF                         = 0x00,
-  AUDIO_DP_CTRL_ENABLE                        = 0x01,
-  AUDIO_DP_CTRL_MODE_SELECT                   = 0x02,
-  AUDIO_DP_CTRL_CLUSTER                       = 0x03,
-  AUDIO_DP_CTRL_UNDERFLOW                     = 0x04,
-  AUDIO_DP_CTRL_OVERFLOW                      = 0x05,
-  AUDIO_DP_CTRL_LATENCY                       = 0x06,
-} audio_dolby_prologic_control_selector_t;
+  AUDIO20_DP_CTRL_UNDEF                         = 0x00,
+  AUDIO20_DP_CTRL_ENABLE                        = 0x01,
+  AUDIO20_DP_CTRL_MODE_SELECT                   = 0x02,
+  AUDIO20_DP_CTRL_CLUSTER                       = 0x03,
+  AUDIO20_DP_CTRL_UNDERFLOW                     = 0x04,
+  AUDIO20_DP_CTRL_OVERFLOW                      = 0x05,
+  AUDIO20_DP_CTRL_LATENCY                       = 0x06,
+} audio20_dolby_prologic_control_selector_t;
 
 /// A.17.9.3 Stereo Extender Processing Unit Control Selectors
 typedef enum
 {
-  AUDIO_ST_EXT_CTRL_UNDEF                     = 0x00,
-  AUDIO_ST_EXT_CTRL_ENABLE                    = 0x01,
-  AUDIO_ST_EXT_CTRL_WIDTH                     = 0x02,
-  AUDIO_ST_EXT_CTRL_UNDERFLOW                 = 0x03,
-  AUDIO_ST_EXT_CTRL_OVERFLOW                  = 0x04,
-  AUDIO_ST_EXT_CTRL_LATENCY                   = 0x05,
-} audio_stereo_extender_control_selector_t;
+  AUDIO20_ST_EXT_CTRL_UNDEF                     = 0x00,
+  AUDIO20_ST_EXT_CTRL_ENABLE                    = 0x01,
+  AUDIO20_ST_EXT_CTRL_WIDTH                     = 0x02,
+  AUDIO20_ST_EXT_CTRL_UNDERFLOW                 = 0x03,
+  AUDIO20_ST_EXT_CTRL_OVERFLOW                  = 0x04,
+  AUDIO20_ST_EXT_CTRL_LATENCY                   = 0x05,
+} audio20_stereo_extender_control_selector_t;
 
 /// A.17.10 Extension Unit Control Selectors
 typedef enum
 {
-  AUDIO_XU_CTRL_UNDEF                         = 0x00,
-  AUDIO_XU_CTRL_ENABLE                        = 0x01,
-  AUDIO_XU_CTRL_CLUSTER                       = 0x02,
-  AUDIO_XU_CTRL_UNDERFLOW                     = 0x03,
-  AUDIO_XU_CTRL_OVERFLOW                      = 0x04,
-  AUDIO_XU_CTRL_LATENCY                       = 0x05,
-} audio_extension_unit_control_selector_t;
+  AUDIO20_XU_CTRL_UNDEF                         = 0x00,
+  AUDIO20_XU_CTRL_ENABLE                        = 0x01,
+  AUDIO20_XU_CTRL_CLUSTER                       = 0x02,
+  AUDIO20_XU_CTRL_UNDERFLOW                     = 0x03,
+  AUDIO20_XU_CTRL_OVERFLOW                      = 0x04,
+  AUDIO20_XU_CTRL_LATENCY                       = 0x05,
+} audio20_extension_unit_control_selector_t;
 
 /// A.17.11 AudioStreaming Interface Control Selectors
 typedef enum
 {
-  AUDIO_AS_CTRL_UNDEF                         = 0x00,
-  AUDIO_AS_CTRL_ACT_ALT_SETTING               = 0x01,
-  AUDIO_AS_CTRL_VAL_ALT_SETTINGS              = 0x02,
-  AUDIO_AS_CTRL_AUDIO_DATA_FORMAT             = 0x03,
-} audio_audiostreaming_interface_control_selector_t;
+  AUDIO20_AS_CTRL_UNDEF                         = 0x00,
+  AUDIO20_AS_CTRL_ACT_ALT_SETTING               = 0x01,
+  AUDIO20_AS_CTRL_VAL_ALT_SETTINGS              = 0x02,
+  AUDIO20_AS_CTRL_AUDIO_DATA_FORMAT             = 0x03,
+} audio20_audiostreaming_interface_control_selector_t;
 
 /// A.17.12 Encoder Control Selectors
 typedef enum
 {
-  AUDIO_EN_CTRL_UNDEF                         = 0x00,
-  AUDIO_EN_CTRL_BIT_RATE                      = 0x01,
-  AUDIO_EN_CTRL_QUALITY                       = 0x02,
-  AUDIO_EN_CTRL_VBR                           = 0x03,
-  AUDIO_EN_CTRL_TYPE                          = 0x04,
-  AUDIO_EN_CTRL_UNDERFLOW                     = 0x05,
-  AUDIO_EN_CTRL_OVERFLOW                      = 0x06,
-  AUDIO_EN_CTRL_ENCODER_ERROR                 = 0x07,
-  AUDIO_EN_CTRL_PARAM1                        = 0x08,
-  AUDIO_EN_CTRL_PARAM2                        = 0x09,
-  AUDIO_EN_CTRL_PARAM3                        = 0x0A,
-  AUDIO_EN_CTRL_PARAM4                        = 0x0B,
-  AUDIO_EN_CTRL_PARAM5                        = 0x0C,
-  AUDIO_EN_CTRL_PARAM6                        = 0x0D,
-  AUDIO_EN_CTRL_PARAM7                        = 0x0E,
-  AUDIO_EN_CTRL_PARAM8                        = 0x0F,
-} audio_encoder_control_selector_t;
+  AUDIO20_EN_CTRL_UNDEF                         = 0x00,
+  AUDIO20_EN_CTRL_BIT_RATE                      = 0x01,
+  AUDIO20_EN_CTRL_QUALITY                       = 0x02,
+  AUDIO20_EN_CTRL_VBR                           = 0x03,
+  AUDIO20_EN_CTRL_TYPE                          = 0x04,
+  AUDIO20_EN_CTRL_UNDERFLOW                     = 0x05,
+  AUDIO20_EN_CTRL_OVERFLOW                      = 0x06,
+  AUDIO20_EN_CTRL_ENCODER_ERROR                 = 0x07,
+  AUDIO20_EN_CTRL_PARAM1                        = 0x08,
+  AUDIO20_EN_CTRL_PARAM2                        = 0x09,
+  AUDIO20_EN_CTRL_PARAM3                        = 0x0A,
+  AUDIO20_EN_CTRL_PARAM4                        = 0x0B,
+  AUDIO20_EN_CTRL_PARAM5                        = 0x0C,
+  AUDIO20_EN_CTRL_PARAM6                        = 0x0D,
+  AUDIO20_EN_CTRL_PARAM7                        = 0x0E,
+  AUDIO20_EN_CTRL_PARAM8                        = 0x0F,
+} audio20_encoder_control_selector_t;
 
 /// A.17.13 Decoder Control Selectors
 
 /// A.17.13.1 MPEG Decoder Control Selectors
 typedef enum
 {
-  AUDIO_MPD_CTRL_UNDEF                        = 0x00,
-  AUDIO_MPD_CTRL_DUAL_CHANNEL                 = 0x01,
-  AUDIO_MPD_CTRL_SECOND_STEREO                = 0x02,
-  AUDIO_MPD_CTRL_MULTILINGUAL                 = 0x03,
-  AUDIO_MPD_CTRL_DYN_RANGE                    = 0x04,
-  AUDIO_MPD_CTRL_SCALING                      = 0x05,
-  AUDIO_MPD_CTRL_HILO_SCALING                 = 0x06,
-  AUDIO_MPD_CTRL_UNDERFLOW                    = 0x07,
-  AUDIO_MPD_CTRL_OVERFLOW                     = 0x08,
-  AUDIO_MPD_CTRL_DECODER_ERROR                = 0x09,
-} audio_MPEG_decoder_control_selector_t;
+  AUDIO20_MPD_CTRL_UNDEF                        = 0x00,
+  AUDIO20_MPD_CTRL_DUAL_CHANNEL                 = 0x01,
+  AUDIO20_MPD_CTRL_SECOND_STEREO                = 0x02,
+  AUDIO20_MPD_CTRL_MULTILINGUAL                 = 0x03,
+  AUDIO20_MPD_CTRL_DYN_RANGE                    = 0x04,
+  AUDIO20_MPD_CTRL_SCALING                      = 0x05,
+  AUDIO20_MPD_CTRL_HILO_SCALING                 = 0x06,
+  AUDIO20_MPD_CTRL_UNDERFLOW                    = 0x07,
+  AUDIO20_MPD_CTRL_OVERFLOW                     = 0x08,
+  AUDIO20_MPD_CTRL_DECODER_ERROR                = 0x09,
+} audio20_MPEG_decoder_control_selector_t;
 
 /// A.17.13.2 AC-3 Decoder Control Selectors
 typedef enum
 {
-  AUDIO_AD_CTRL_UNDEF                         = 0x00,
-  AUDIO_AD_CTRL_MODE                          = 0x01,
-  AUDIO_AD_CTRL_DYN_RANGE                     = 0x02,
-  AUDIO_AD_CTRL_SCALING                       = 0x03,
-  AUDIO_AD_CTRL_HILO_SCALING                  = 0x04,
-  AUDIO_AD_CTRL_UNDERFLOW                     = 0x05,
-  AUDIO_AD_CTRL_OVERFLOW                      = 0x06,
-  AUDIO_AD_CTRL_DECODER_ERROR                 = 0x07,
-} audio_AC3_decoder_control_selector_t;
+  AUDIO20_AD_CTRL_UNDEF                         = 0x00,
+  AUDIO20_AD_CTRL_MODE                          = 0x01,
+  AUDIO20_AD_CTRL_DYN_RANGE                     = 0x02,
+  AUDIO20_AD_CTRL_SCALING                       = 0x03,
+  AUDIO20_AD_CTRL_HILO_SCALING                  = 0x04,
+  AUDIO20_AD_CTRL_UNDERFLOW                     = 0x05,
+  AUDIO20_AD_CTRL_OVERFLOW                      = 0x06,
+  AUDIO20_AD_CTRL_DECODER_ERROR                 = 0x07,
+} audio20_AC3_decoder_control_selector_t;
 
 /// A.17.13.3 WMA Decoder Control Selectors
 typedef enum
 {
-  AUDIO_WD_CTRL_UNDEF                         = 0x00,
-  AUDIO_WD_CTRL_UNDERFLOW                     = 0x01,
-  AUDIO_WD_CTRL_OVERFLOW                      = 0x02,
-  AUDIO_WD_CTRL_DECODER_ERROR                 = 0x03,
-} audio_WMA_decoder_control_selector_t;
+  AUDIO20_WD_CTRL_UNDEF                         = 0x00,
+  AUDIO20_WD_CTRL_UNDERFLOW                     = 0x01,
+  AUDIO20_WD_CTRL_OVERFLOW                      = 0x02,
+  AUDIO20_WD_CTRL_DECODER_ERROR                 = 0x03,
+} audio20_WMA_decoder_control_selector_t;
 
 /// A.17.13.4 DTS Decoder Control Selectors
 typedef enum
 {
-  AUDIO_DD_CTRL_UNDEF                         = 0x00,
-  AUDIO_DD_CTRL_UNDERFLOW                     = 0x01,
-  AUDIO_DD_CTRL_OVERFLOW                      = 0x02,
-  AUDIO_DD_CTRL_DECODER_ERROR                 = 0x03,
-} audio_DTS_decoder_control_selector_t;
+  AUDIO20_DD_CTRL_UNDEF                         = 0x00,
+  AUDIO20_DD_CTRL_UNDERFLOW                     = 0x01,
+  AUDIO20_DD_CTRL_OVERFLOW                      = 0x02,
+  AUDIO20_DD_CTRL_DECODER_ERROR                 = 0x03,
+} audio20_DTS_decoder_control_selector_t;
 
 /// A.17.14 Endpoint Control Selectors
 typedef enum
 {
-  AUDIO_EP_CTRL_UNDEF                         = 0x00,
-  AUDIO_EP_CTRL_PITCH                         = 0x01,
-  AUDIO_EP_CTRL_DATA_OVERRUN                  = 0x02,
-  AUDIO_EP_CTRL_DATA_UNDERRUN                 = 0x03,
-} audio_EP_control_selector_t;
+  AUDIO20_EP_CTRL_UNDEF                         = 0x00,
+  AUDIO20_EP_CTRL_PITCH                         = 0x01,
+  AUDIO20_EP_CTRL_DATA_OVERRUN                  = 0x02,
+  AUDIO20_EP_CTRL_DATA_UNDERRUN                 = 0x03,
+} audio20_EP_control_selector_t;
 
 /// Terminal Types
 
 /// 2.1 - Audio Class-Terminal Types UAC2
 typedef enum
 {
-  AUDIO_TERM_TYPE_USB_UNDEFINED       = 0x0100,
-  AUDIO_TERM_TYPE_USB_STREAMING       = 0x0101,
-  AUDIO_TERM_TYPE_USB_VENDOR_SPEC     = 0x01FF,
-} audio_terminal_type_t;
+  AUDIO20_TERM_TYPE_USB_UNDEFINED       = 0x0100,
+  AUDIO20_TERM_TYPE_USB_STREAMING       = 0x0101,
+  AUDIO20_TERM_TYPE_USB_VENDOR_SPEC     = 0x01FF,
+} audio20_terminal_type_t;
 
 /// 2.2 - Audio Class-Input Terminal Types UAC2
 typedef enum
 {
-  AUDIO_TERM_TYPE_IN_UNDEFINED        = 0x0200,
-  AUDIO_TERM_TYPE_IN_GENERIC_MIC      = 0x0201,
-  AUDIO_TERM_TYPE_IN_DESKTOP_MIC      = 0x0202,
-  AUDIO_TERM_TYPE_IN_PERSONAL_MIC     = 0x0203,
-  AUDIO_TERM_TYPE_IN_OMNI_MIC         = 0x0204,
-  AUDIO_TERM_TYPE_IN_ARRAY_MIC        = 0x0205,
-  AUDIO_TERM_TYPE_IN_PROC_ARRAY_MIC   = 0x0206,
-} audio_terminal_input_type_t;
+  AUDIO20_TERM_TYPE_IN_UNDEFINED        = 0x0200,
+  AUDIO20_TERM_TYPE_IN_GENERIC_MIC      = 0x0201,
+  AUDIO20_TERM_TYPE_IN_DESKTOP_MIC      = 0x0202,
+  AUDIO20_TERM_TYPE_IN_PERSONAL_MIC     = 0x0203,
+  AUDIO20_TERM_TYPE_IN_OMNI_MIC         = 0x0204,
+  AUDIO20_TERM_TYPE_IN_ARRAY_MIC        = 0x0205,
+  AUDIO20_TERM_TYPE_IN_PROC_ARRAY_MIC   = 0x0206,
+} audio20_terminal_input_type_t;
 
 /// 2.3 - Audio Class-Output Terminal Types UAC2
 typedef enum
 {
-  AUDIO_TERM_TYPE_OUT_UNDEFINED               = 0x0300,
-  AUDIO_TERM_TYPE_OUT_GENERIC_SPEAKER         = 0x0301,
-  AUDIO_TERM_TYPE_OUT_HEADPHONES              = 0x0302,
-  AUDIO_TERM_TYPE_OUT_HEAD_MNT_DISP_AUIDO     = 0x0303,
-  AUDIO_TERM_TYPE_OUT_DESKTOP_SPEAKER         = 0x0304,
-  AUDIO_TERM_TYPE_OUT_ROOM_SPEAKER            = 0x0305,
-  AUDIO_TERM_TYPE_OUT_COMMUNICATION_SPEAKER   = 0x0306,
-  AUDIO_TERM_TYPE_OUT_LOW_FRQ_EFFECTS_SPEAKER = 0x0307,
-} audio_terminal_output_type_t;
+  AUDIO20_TERM_TYPE_OUT_UNDEFINED               = 0x0300,
+  AUDIO20_TERM_TYPE_OUT_GENERIC_SPEAKER         = 0x0301,
+  AUDIO20_TERM_TYPE_OUT_HEADPHONES              = 0x0302,
+  AUDIO20_TERM_TYPE_OUT_HEAD_MNT_DISP_AUIDO     = 0x0303,
+  AUDIO20_TERM_TYPE_OUT_DESKTOP_SPEAKER         = 0x0304,
+  AUDIO20_TERM_TYPE_OUT_ROOM_SPEAKER            = 0x0305,
+  AUDIO20_TERM_TYPE_OUT_COMMUNICATION_SPEAKER   = 0x0306,
+  AUDIO20_TERM_TYPE_OUT_LOW_FRQ_EFFECTS_SPEAKER = 0x0307,
+} audio20_terminal_output_type_t;
 
 /// Rest is yet to be implemented
 
@@ -471,226 +870,230 @@ typedef enum
 /// A.1 - Audio Class-Format Type Codes UAC2
 typedef enum
 {
-  AUDIO_FORMAT_TYPE_UNDEFINED     = 0x00,
-  AUDIO_FORMAT_TYPE_I             = 0x01,
-  AUDIO_FORMAT_TYPE_II            = 0x02,
-  AUDIO_FORMAT_TYPE_III           = 0x03,
-  AUDIO_FORMAT_TYPE_IV            = 0x04,
-  AUDIO_EXT_FORMAT_TYPE_I         = 0x81,
-  AUDIO_EXT_FORMAT_TYPE_II        = 0x82,
-  AUDIO_EXT_FORMAT_TYPE_III       = 0x83,
-} audio_format_type_t;
+  AUDIO20_FORMAT_TYPE_UNDEFINED     = 0x00,
+  AUDIO20_FORMAT_TYPE_I             = 0x01,
+  AUDIO20_FORMAT_TYPE_II            = 0x02,
+  AUDIO20_FORMAT_TYPE_III           = 0x03,
+  AUDIO20_FORMAT_TYPE_IV            = 0x04,
+  AUDIO20_EXT_FORMAT_TYPE_I         = 0x81,
+  AUDIO20_EXT_FORMAT_TYPE_II        = 0x82,
+  AUDIO20_EXT_FORMAT_TYPE_III       = 0x83,
+} audio20_format_type_t;
 
 // A.2.1 - Audio Class-Audio Data Format Type I UAC2
 typedef enum
 {
-  AUDIO_DATA_FORMAT_TYPE_I_PCM            = (uint32_t) (1 << 0),
-  AUDIO_DATA_FORMAT_TYPE_I_PCM8           = (uint32_t) (1 << 1),
-  AUDIO_DATA_FORMAT_TYPE_I_IEEE_FLOAT     = (uint32_t) (1 << 2),
-  AUDIO_DATA_FORMAT_TYPE_I_ALAW           = (uint32_t) (1 << 3),
-  AUDIO_DATA_FORMAT_TYPE_I_MULAW          = (uint32_t) (1 << 4),
-  AUDIO_DATA_FORMAT_TYPE_I_RAW_DATA       = 0x80000000u,
-} audio_data_format_type_I_t;
+  AUDIO20_DATA_FORMAT_TYPE_I_PCM            = (uint32_t) (1 << 0),
+  AUDIO20_DATA_FORMAT_TYPE_I_PCM8           = (uint32_t) (1 << 1),
+  AUDIO20_DATA_FORMAT_TYPE_I_IEEE_FLOAT     = (uint32_t) (1 << 2),
+  AUDIO20_DATA_FORMAT_TYPE_I_ALAW           = (uint32_t) (1 << 3),
+  AUDIO20_DATA_FORMAT_TYPE_I_MULAW          = (uint32_t) (1 << 4),
+  AUDIO20_DATA_FORMAT_TYPE_I_RAW_DATA       = 0x80000000u,
+} audio20_data_format_type_I_t;
+
+/// Audio Class-Audio Channel Configuration UAC2 (Table A-11)
+typedef enum
+{
+  AUDIO20_CHANNEL_CONFIG_NON_PREDEFINED       = 0x00000000,
+  AUDIO20_CHANNEL_CONFIG_FRONT_LEFT           = 0x00000001,
+  AUDIO20_CHANNEL_CONFIG_FRONT_RIGHT          = 0x00000002,
+  AUDIO20_CHANNEL_CONFIG_FRONT_CENTER         = 0x00000004,
+  AUDIO20_CHANNEL_CONFIG_LOW_FRQ_EFFECTS      = 0x00000008,
+  AUDIO20_CHANNEL_CONFIG_BACK_LEFT            = 0x00000010,
+  AUDIO20_CHANNEL_CONFIG_BACK_RIGHT           = 0x00000020,
+  AUDIO20_CHANNEL_CONFIG_FRONT_LEFT_OF_CENTER = 0x00000040,
+  AUDIO20_CHANNEL_CONFIG_FRONT_RIGHT_OF_CENTER = 0x00000080,
+  AUDIO20_CHANNEL_CONFIG_BACK_CENTER          = 0x00000100,
+  AUDIO20_CHANNEL_CONFIG_SIDE_LEFT            = 0x00000200,
+  AUDIO20_CHANNEL_CONFIG_SIDE_RIGHT           = 0x00000400,
+  AUDIO20_CHANNEL_CONFIG_TOP_CENTER           = 0x00000800,
+  AUDIO20_CHANNEL_CONFIG_TOP_FRONT_LEFT       = 0x00001000,
+  AUDIO20_CHANNEL_CONFIG_TOP_FRONT_CENTER     = 0x00002000,
+  AUDIO20_CHANNEL_CONFIG_TOP_FRONT_RIGHT      = 0x00004000,
+  AUDIO20_CHANNEL_CONFIG_TOP_BACK_LEFT        = 0x00008000,
+  AUDIO20_CHANNEL_CONFIG_TOP_BACK_CENTER      = 0x00010000,
+  AUDIO20_CHANNEL_CONFIG_TOP_BACK_RIGHT       = 0x00020000,
+  AUDIO20_CHANNEL_CONFIG_TOP_FRONT_LEFT_OF_CENTER = 0x00040000,
+  AUDIO20_CHANNEL_CONFIG_TOP_FRONT_RIGHT_OF_CENTER = 0x00080000,
+  AUDIO20_CHANNEL_CONFIG_LEFT_LOW_FRQ_EFFECTS = 0x00100000,
+  AUDIO20_CHANNEL_CONFIG_RIGHT_LOW_FRQ_EFFECTS = 0x00200000,
+  AUDIO20_CHANNEL_CONFIG_TOP_SIDE_LEFT        = 0x00400000,
+  AUDIO20_CHANNEL_CONFIG_TOP_SIDE_RIGHT       = 0x00800000,
+  AUDIO20_CHANNEL_CONFIG_BOTTOM_CENTER        = 0x01000000,
+  AUDIO20_CHANNEL_CONFIG_BACK_LEFT_OF_CENTER  = 0x02000000,
+  AUDIO20_CHANNEL_CONFIG_BACK_RIGHT_OF_CENTER = 0x04000000,
+  AUDIO20_CHANNEL_CONFIG_RAW_DATA             = 0x80000000,
+} audio20_channel_config_t;
 
 /// All remaining definitions are taken from the descriptor descriptions in the UAC2 main specification
 
 /// Audio Class-Control Values UAC2
 typedef enum
 {
-  AUDIO_CTRL_NONE     = 0x00,         ///< No Host access
-  AUDIO_CTRL_R        = 0x01,         ///< Host read access only
-  AUDIO_CTRL_RW       = 0x03,         ///< Host read write access
-} audio_control_t;
+  AUDIO20_CTRL_NONE     = 0x00,         ///< No Host access
+  AUDIO20_CTRL_R        = 0x01,         ///< Host read access only
+  AUDIO20_CTRL_RW       = 0x03,         ///< Host read write access
+} audio20_control_t;
 
 /// Audio Class-Specific AC Interface Descriptor Controls UAC2
 typedef enum
 {
-  AUDIO_CS_AS_INTERFACE_CTRL_LATENCY_POS  = 0,
-} audio_cs_ac_interface_control_pos_t;
+  AUDIO20_CS_AS_INTERFACE_CTRL_LATENCY_POS  = 0,
+} audio20_cs_ac_interface_control_pos_t;
 
 /// Audio Class-Specific AS Interface Descriptor Controls UAC2
 typedef enum
 {
-  AUDIO_CS_AS_INTERFACE_CTRL_ACTIVE_ALT_SET_POS   = 0,
-  AUDIO_CS_AS_INTERFACE_CTRL_VALID_ALT_SET_POS    = 2,
-} audio_cs_as_interface_control_pos_t;
+  AUDIO20_CS_AS_INTERFACE_CTRL_ACTIVE_ALT_SET_POS   = 0,
+  AUDIO20_CS_AS_INTERFACE_CTRL_VALID_ALT_SET_POS    = 2,
+} audio20_cs_as_interface_control_pos_t;
 
 /// Audio Class-Specific AS Isochronous Data EP Attributes UAC2
 typedef enum
 {
-  AUDIO_CS_AS_ISO_DATA_EP_ATT_MAX_PACKETS_ONLY    = 0x80,
-  AUDIO_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK  = 0x00,
-} audio_cs_as_iso_data_ep_attribute_t;
+  AUDIO20_CS_AS_ISO_DATA_EP_ATT_MAX_PACKETS_ONLY    = 0x80,
+  AUDIO20_CS_AS_ISO_DATA_EP_ATT_NON_MAX_PACKETS_OK  = 0x00,
+} audio20_cs_as_iso_data_ep_attribute_t;
 
 /// Audio Class-Specific AS Isochronous Data EP Controls UAC2
 typedef enum
 {
-  AUDIO_CS_AS_ISO_DATA_EP_CTRL_PITCH_POS          = 0,
-  AUDIO_CS_AS_ISO_DATA_EP_CTRL_DATA_OVERRUN_POS   = 2,
-  AUDIO_CS_AS_ISO_DATA_EP_CTRL_DATA_UNDERRUN_POS  = 4,
-} audio_cs_as_iso_data_ep_control_pos_t;
+  AUDIO20_CS_AS_ISO_DATA_EP_CTRL_PITCH_POS          = 0,
+  AUDIO20_CS_AS_ISO_DATA_EP_CTRL_DATA_OVERRUN_POS   = 2,
+  AUDIO20_CS_AS_ISO_DATA_EP_CTRL_DATA_UNDERRUN_POS  = 4,
+} audio20_cs_as_iso_data_ep_control_pos_t;
 
 /// Audio Class-Specific AS Isochronous Data EP Lock Delay Units UAC2
 typedef enum
 {
-  AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED       = 0x00,
-  AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC        = 0x01,
-  AUDIO_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_PCM_SAMPLES     = 0x02,
-} audio_cs_as_iso_data_ep_lock_delay_unit_t;
+  AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_UNDEFINED       = 0x00,
+  AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_MILLISEC        = 0x01,
+  AUDIO20_CS_AS_ISO_DATA_EP_LOCK_DELAY_UNIT_PCM_SAMPLES     = 0x02,
+} audio20_cs_as_iso_data_ep_lock_delay_unit_t;
 
 /// Audio Class-Clock Source Attributes UAC2
 typedef enum
 {
-  AUDIO_CLOCK_SOURCE_ATT_EXT_CLK      = 0x00,
-  AUDIO_CLOCK_SOURCE_ATT_INT_FIX_CLK  = 0x01,
-  AUDIO_CLOCK_SOURCE_ATT_INT_VAR_CLK  = 0x02,
-  AUDIO_CLOCK_SOURCE_ATT_INT_PRO_CLK  = 0x03,
-  AUDIO_CLOCK_SOURCE_ATT_CLK_SYC_SOF  = 0x04,
-} audio_clock_source_attribute_t;
+  AUDIO20_CLOCK_SOURCE_ATT_EXT_CLK      = 0x00,
+  AUDIO20_CLOCK_SOURCE_ATT_INT_FIX_CLK  = 0x01,
+  AUDIO20_CLOCK_SOURCE_ATT_INT_VAR_CLK  = 0x02,
+  AUDIO20_CLOCK_SOURCE_ATT_INT_PRO_CLK  = 0x03,
+  AUDIO20_CLOCK_SOURCE_ATT_CLK_SYC_SOF  = 0x04,
+} audio20_clock_source_attribute_t;
 
 /// Audio Class-Clock Source Controls UAC2
 typedef enum
 {
-  AUDIO_CLOCK_SOURCE_CTRL_CLK_FRQ_POS     = 0,
-  AUDIO_CLOCK_SOURCE_CTRL_CLK_VAL_POS     = 2,
-} audio_clock_source_control_pos_t;
+  AUDIO20_CLOCK_SOURCE_CTRL_CLK_FRQ_POS     = 0,
+  AUDIO20_CLOCK_SOURCE_CTRL_CLK_VAL_POS     = 2,
+} audio20_clock_source_control_pos_t;
 
 /// Audio Class-Clock Selector Controls UAC2
 typedef enum
 {
-  AUDIO_CLOCK_SELECTOR_CTRL_POS   = 0,
-} audio_clock_selector_control_pos_t;
+  AUDIO20_CLOCK_SELECTOR_CTRL_POS   = 0,
+} audio20_clock_selector_control_pos_t;
 
 /// Audio Class-Clock Multiplier Controls UAC2
 typedef enum
 {
-  AUDIO_CLOCK_MULTIPLIER_CTRL_NUMERATOR_POS       = 0,
-  AUDIO_CLOCK_MULTIPLIER_CTRL_DENOMINATOR_POS     = 2,
-} audio_clock_multiplier_control_pos_t;
+  AUDIO20_CLOCK_MULTIPLIER_CTRL_NUMERATOR_POS       = 0,
+  AUDIO20_CLOCK_MULTIPLIER_CTRL_DENOMINATOR_POS     = 2,
+} audio20_clock_multiplier_control_pos_t;
 
 /// Audio Class-Input Terminal Controls UAC2
 typedef enum
 {
-  AUDIO_IN_TERM_CTRL_CPY_PROT_POS     = 0,
-  AUDIO_IN_TERM_CTRL_CONNECTOR_POS    = 2,
-  AUDIO_IN_TERM_CTRL_OVERLOAD_POS     = 4,
-  AUDIO_IN_TERM_CTRL_CLUSTER_POS      = 6,
-  AUDIO_IN_TERM_CTRL_UNDERFLOW_POS    = 8,
-  AUDIO_IN_TERM_CTRL_OVERFLOW_POS     = 10,
-} audio_terminal_input_control_pos_t;
+  AUDIO20_IN_TERM_CTRL_CPY_PROT_POS     = 0,
+  AUDIO20_IN_TERM_CTRL_CONNECTOR_POS    = 2,
+  AUDIO20_IN_TERM_CTRL_OVERLOAD_POS     = 4,
+  AUDIO20_IN_TERM_CTRL_CLUSTER_POS      = 6,
+  AUDIO20_IN_TERM_CTRL_UNDERFLOW_POS    = 8,
+  AUDIO20_IN_TERM_CTRL_OVERFLOW_POS     = 10,
+} audio20_terminal_input_control_pos_t;
 
 /// Audio Class-Output Terminal Controls UAC2
 typedef enum
 {
-  AUDIO_OUT_TERM_CTRL_CPY_PROT_POS    = 0,
-  AUDIO_OUT_TERM_CTRL_CONNECTOR_POS   = 2,
-  AUDIO_OUT_TERM_CTRL_OVERLOAD_POS    = 4,
-  AUDIO_OUT_TERM_CTRL_UNDERFLOW_POS   = 6,
-  AUDIO_OUT_TERM_CTRL_OVERFLOW_POS    = 8,
-} audio_terminal_output_control_pos_t;
+  AUDIO20_OUT_TERM_CTRL_CPY_PROT_POS    = 0,
+  AUDIO20_OUT_TERM_CTRL_CONNECTOR_POS   = 2,
+  AUDIO20_OUT_TERM_CTRL_OVERLOAD_POS    = 4,
+  AUDIO20_OUT_TERM_CTRL_UNDERFLOW_POS   = 6,
+  AUDIO20_OUT_TERM_CTRL_OVERFLOW_POS    = 8,
+} audio20_terminal_output_control_pos_t;
 
 /// Audio Class-Feature Unit Controls UAC2
 typedef enum
 {
-  AUDIO_FEATURE_UNIT_CTRL_MUTE_POS            = 0,
-  AUDIO_FEATURE_UNIT_CTRL_VOLUME_POS          = 2,
-  AUDIO_FEATURE_UNIT_CTRL_BASS_POS            = 4,
-  AUDIO_FEATURE_UNIT_CTRL_MID_POS             = 6,
-  AUDIO_FEATURE_UNIT_CTRL_TREBLE_POS          = 8,
-  AUDIO_FEATURE_UNIT_CTRL_GRAPHIC_EQU_POS     = 10,
-  AUDIO_FEATURE_UNIT_CTRL_AGC_POS             = 12,
-  AUDIO_FEATURE_UNIT_CTRL_DELAY_POS           = 14,
-  AUDIO_FEATURE_UNIT_CTRL_BASS_BOOST_POS      = 16,
-  AUDIO_FEATURE_UNIT_CTRL_LOUDNESS_POS        = 18,
-  AUDIO_FEATURE_UNIT_CTRL_INPUT_GAIN_POS      = 20,
-  AUDIO_FEATURE_UNIT_CTRL_INPUT_GAIN_PAD_POS  = 22,
-  AUDIO_FEATURE_UNIT_CTRL_PHASE_INV_POS       = 24,
-  AUDIO_FEATURE_UNIT_CTRL_UNDERFLOW_POS       = 26,
-  AUDIO_FEATURE_UNIT_CTRL_OVERFLOW_POS        = 28,
-} audio_feature_unit_control_pos_t;
+  AUDIO20_FEATURE_UNIT_CTRL_MUTE_POS            = 0,
+  AUDIO20_FEATURE_UNIT_CTRL_VOLUME_POS          = 2,
+  AUDIO20_FEATURE_UNIT_CTRL_BASS_POS            = 4,
+  AUDIO20_FEATURE_UNIT_CTRL_MID_POS             = 6,
+  AUDIO20_FEATURE_UNIT_CTRL_TREBLE_POS          = 8,
+  AUDIO20_FEATURE_UNIT_CTRL_GRAPHIC_EQU_POS     = 10,
+  AUDIO20_FEATURE_UNIT_CTRL_AGC_POS             = 12,
+  AUDIO20_FEATURE_UNIT_CTRL_DELAY_POS           = 14,
+  AUDIO20_FEATURE_UNIT_CTRL_BASS_BOOST_POS      = 16,
+  AUDIO20_FEATURE_UNIT_CTRL_LOUDNESS_POS        = 18,
+  AUDIO20_FEATURE_UNIT_CTRL_INPUT_GAIN_POS      = 20,
+  AUDIO20_FEATURE_UNIT_CTRL_INPUT_GAIN_PAD_POS  = 22,
+  AUDIO20_FEATURE_UNIT_CTRL_PHASE_INV_POS       = 24,
+  AUDIO20_FEATURE_UNIT_CTRL_UNDERFLOW_POS       = 26,
+  AUDIO20_FEATURE_UNIT_CTRL_OVERFLOW_POS        = 28,
+} audio20_feature_unit_control_pos_t;
 
-/// Audio Class-Audio Channel Configuration UAC2
-typedef enum
-{
-  AUDIO_CHANNEL_CONFIG_NON_PREDEFINED             = 0x00000000,
-  AUDIO_CHANNEL_CONFIG_FRONT_LEFT                 = 0x00000001,
-  AUDIO_CHANNEL_CONFIG_FRONT_RIGHT                = 0x00000002,
-  AUDIO_CHANNEL_CONFIG_FRONT_CENTER               = 0x00000004,
-  AUDIO_CHANNEL_CONFIG_LOW_FRQ_EFFECTS            = 0x00000008,
-  AUDIO_CHANNEL_CONFIG_BACK_LEFT                  = 0x00000010,
-  AUDIO_CHANNEL_CONFIG_BACK_RIGHT                 = 0x00000020,
-  AUDIO_CHANNEL_CONFIG_FRONT_LEFT_OF_CENTER       = 0x00000040,
-  AUDIO_CHANNEL_CONFIG_FRONT_RIGHT_OF_CENTER      = 0x00000080,
-  AUDIO_CHANNEL_CONFIG_BACK_CENTER                = 0x00000100,
-  AUDIO_CHANNEL_CONFIG_SIDE_LEFT                  = 0x00000200,
-  AUDIO_CHANNEL_CONFIG_SIDE_RIGHT                 = 0x00000400,
-  AUDIO_CHANNEL_CONFIG_TOP_CENTER                 = 0x00000800,
-  AUDIO_CHANNEL_CONFIG_TOP_FRONT_LEFT             = 0x00001000,
-  AUDIO_CHANNEL_CONFIG_TOP_FRONT_CENTER           = 0x00002000,
-  AUDIO_CHANNEL_CONFIG_TOP_FRONT_RIGHT            = 0x00004000,
-  AUDIO_CHANNEL_CONFIG_TOP_BACK_LEFT              = 0x00008000,
-  AUDIO_CHANNEL_CONFIG_TOP_BACK_CENTER            = 0x00010000,
-  AUDIO_CHANNEL_CONFIG_TOP_BACK_RIGHT             = 0x00020000,
-  AUDIO_CHANNEL_CONFIG_TOP_FRONT_LEFT_OF_CENTER   = 0x00040000,
-  AUDIO_CHANNEL_CONFIG_TOP_FRONT_RIGHT_OF_CENTER  = 0x00080000,
-  AUDIO_CHANNEL_CONFIG_LEFT_LOW_FRQ_EFFECTS       = 0x00100000,
-  AUDIO_CHANNEL_CONFIG_RIGHT_LOW_FRQ_EFFECTS      = 0x00200000,
-  AUDIO_CHANNEL_CONFIG_TOP_SIDE_LEFT              = 0x00400000,
-  AUDIO_CHANNEL_CONFIG_TOP_SIDE_RIGHT             = 0x00800000,
-  AUDIO_CHANNEL_CONFIG_BOTTOM_CENTER              = 0x01000000,
-  AUDIO_CHANNEL_CONFIG_BACK_LEFT_OF_CENTER        = 0x02000000,
-  AUDIO_CHANNEL_CONFIG_BACK_RIGHT_OF_CENTER       = 0x04000000,
-  AUDIO_CHANNEL_CONFIG_RAW_DATA                   = 0x80000000u,
-} audio_channel_config_t;
+//--------------------------------------------------------------------+
+// USB AUDIO CLASS 2.0 (UAC2) DESCRIPTORS
+//--------------------------------------------------------------------+
 
-/// AUDIO Channel Cluster Descriptor (4.1)
+/// AUDIO Channel Cluster Descriptor UAC2 (4.1)
 typedef struct TU_ATTR_PACKED {
   uint8_t                 bNrChannels;        ///< Number of channels currently connected.
-  audio_channel_config_t  bmChannelConfig;    ///< Bitmap according to 'audio_channel_config_t' with a 1 set if channel is connected and 0 else. In case channels are non-predefined ignore them here (see UAC2 specification 4.1 Audio Channel Cluster Descriptor.
+  audio20_channel_config_t  bmChannelConfig;    ///< Bitmap according to 'audio20_channel_config_t' with a 1 set if channel is connected and 0 else. In case channels are non-predefined ignore them here (see UAC2 specification 4.1 Audio Channel Cluster Descriptor.
   uint8_t                 iChannelNames;      ///< Index of a string descriptor, describing the name of the first inserted channel with a non-predefined spatial location.
-} audio_desc_channel_cluster_t;
+} audio20_desc_channel_cluster_t;
 
-/// AUDIO Class-Specific AC Interface Header Descriptor (4.7.2)
+/// AUDIO Class-Specific AC Interface Header Descriptor UAC2 (4.7.2)
 typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor in bytes: 9.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AC_INTERFACE_HEADER.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_AC_INTERFACE_HEADER.
   uint16_t bcdADC            ; ///< Audio Device Class Specification Release Number in Binary-Coded Decimal. Value: U16_TO_U8S_LE(0x0200).
-  uint8_t bCategory          ; ///< Constant, indicating the primary use of this audio function, as intended by the manufacturer. See: audio_function_t.
+  uint8_t bCategory          ; ///< Constant, indicating the primary use of this audio function, as intended by the manufacturer. See: audio20_function_code_t.
   uint16_t wTotalLength      ; ///< Total number of bytes returned for the class-specific AudioControl interface descriptor. Includes the combined length of this descriptor header and all Clock Source, Unit and Terminal descriptors.
-  uint8_t bmControls         ; ///< See: audio_cs_ac_interface_control_pos_t.
-} audio_desc_cs_ac_interface_t;
-TU_VERIFY_STATIC(sizeof(audio_desc_cs_ac_interface_t) == 9, "size is not correct");
+  uint8_t bmControls         ; ///< See: audio20_cs_ac_interface_control_pos_t.
+} audio20_desc_cs_ac_interface_t;
+TU_VERIFY_STATIC(sizeof(audio20_desc_cs_ac_interface_t) == 9, "size is not correct");
 
-/// AUDIO Clock Source Descriptor (4.7.2.1)
+/// AUDIO Clock Source Descriptor UAC2 (4.7.2.1)
 typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor in bytes: 8.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AC_INTERFACE_CLOCK_SOURCE.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_AC_INTERFACE_CLOCK_SOURCE.
   uint8_t bClockID           ; ///< Constant uniquely identifying the Clock Source Entity within the audio function. This value is used in all requests to address this Entity.
-  uint8_t bmAttributes       ; ///< See: audio_clock_source_attribute_t.
-  uint8_t bmControls         ; ///< See: audio_clock_source_control_pos_t.
+  uint8_t bmAttributes       ; ///< See: audio20_clock_source_attribute_t.
+  uint8_t bmControls         ; ///< See: audio20_clock_source_control_pos_t.
   uint8_t bAssocTerminal     ; ///< Terminal ID of the Terminal that is associated with this Clock Source.
   uint8_t iClockSource       ; ///< Index of a string descriptor, describing the Clock Source Entity.
-} audio_desc_clock_source_t;
+} audio20_desc_clock_source_t;
 
-/// AUDIO Clock Selector Descriptor (4.7.2.2) for ONE pin
+/// AUDIO Clock Selector Descriptor UAC2 (4.7.2.2) for ONE pin
 typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor, in bytes: 7+p.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AC_INTERFACE_CLOCK_SELECTOR.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_AC_INTERFACE_CLOCK_SELECTOR.
   uint8_t bClockID           ; ///< Constant uniquely identifying the Clock Selector Entity within the audio function. This value is used in all requests to address this Entity.
   uint8_t bNrInPins          ; ///< Number of Input Pins of this Unit: p = 1 thus bNrInPins = 1.
   uint8_t baCSourceID        ; ///< ID of the Clock Entity to which the first Clock Input Pin of this Clock Selector Entity is connected..
-  uint8_t bmControls         ; ///< See: audio_clock_selector_control_pos_t.
+  uint8_t bmControls         ; ///< See: audio20_clock_selector_control_pos_t.
   uint8_t iClockSource       ; ///< Index of a string descriptor, describing the Clock Selector Entity.
-} audio_desc_clock_selector_t;
+} audio20_desc_clock_selector_t;
 
 /// AUDIO Clock Selector Descriptor (4.7.2.2) for multiple pins
-#define audio_desc_clock_selector_n_t(source_num) \
+#define audio20_desc_clock_selector_n_t(source_num) \
     struct TU_ATTR_PACKED {       \
   uint8_t bLength               ; \
   uint8_t bDescriptorType       ; \
@@ -704,17 +1107,17 @@ typedef struct TU_ATTR_PACKED
   uint8_t iClockSource          ; \
 }
 
-/// AUDIO Clock Multiplier Descriptor (4.7.2.3)
+/// AUDIO Clock Multiplier Descriptor UAC2 (4.7.2.3)
 typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor, in bytes: 7.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AC_INTERFACE_CLOCK_MULTIPLIER.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_AC_INTERFACE_CLOCK_MULTIPLIER.
   uint8_t bClockID           ; ///< Constant uniquely identifying the Clock Multiplier Entity within the audio function. This value is used in all requests to address this Entity.
   uint8_t bCSourceID         ; ///< ID of the Clock Entity to which the last Clock Input Pin of this Clock Selector Entity is connected.
-  uint8_t bmControls         ; ///< See: audio_clock_multiplier_control_pos_t.
+  uint8_t bmControls         ; ///< See: audio20_clock_multiplier_control_pos_t.
   uint8_t iClockSource       ; ///< Index of a string descriptor, describing the Clock Multiplier Entity.
-} audio_desc_clock_multiplier_t;
+} audio20_desc_clock_multiplier_t;
 
 /// AUDIO Input Terminal Descriptor(4.7.2.4)
 typedef struct TU_ATTR_PACKED
@@ -727,43 +1130,43 @@ typedef struct TU_ATTR_PACKED
   uint8_t bAssocTerminal     ; ///< ID of the Output Terminal to which this Input Terminal is associated.
   uint8_t bCSourceID         ; ///< ID of the Clock Entity to which this Input Terminal is connected.
   uint8_t bNrChannels        ; ///< Number of logical output channels in the Terminal’s output audio channel cluster.
-  uint32_t bmChannelConfig   ; ///< Describes the spatial location of the logical channels. See:audio_channel_config_t.
+  uint32_t bmChannelConfig   ; ///< Describes the spatial location of the logical channels. See:audio20_channel_config_t.
   uint8_t iChannelNames      ; ///< Index of a string descriptor, describing the name of the first logical channel.
   uint16_t bmControls        ; ///< See: audio_terminal_input_control_pos_t.
   uint8_t iTerminal          ; ///< Index of a string descriptor, describing the Input Terminal.
-} audio_desc_input_terminal_t;
+} audio20_desc_input_terminal_t;
 
-/// AUDIO Output Terminal Descriptor(4.7.2.5)
+/// AUDIO Output Terminal Descriptor UAC2 (4.7.2.5)
 typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor, in bytes: 12.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AC_INTERFACE_OUTPUT_TERMINAL.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_AC_INTERFACE_OUTPUT_TERMINAL.
   uint8_t bTerminalID        ; ///< Constant uniquely identifying the Terminal within the audio function. This value is used in all requests to address this Terminal.
-  uint16_t wTerminalType     ; ///< Constant characterizing the type of Terminal. See: audio_terminal_type_t for USB streaming and audio_terminal_output_type_t for other output types.
+  uint16_t wTerminalType     ; ///< Constant characterizing the type of Terminal. See: audio20_terminal_type_t for USB streaming and audio20_terminal_output_type_t for other output types.
   uint8_t bAssocTerminal     ; ///< Constant, identifying the Input Terminal to which this Output Terminal is associated.
   uint8_t bSourceID          ; ///< ID of the Unit or Terminal to which this Terminal is connected.
   uint8_t bCSourceID         ; ///< ID of the Clock Entity to which this Output Terminal is connected.
-  uint16_t bmControls        ; ///< See: audio_terminal_output_type_t.
+  uint16_t bmControls        ; ///< See: audio20_terminal_output_control_pos_t.
   uint8_t iTerminal          ; ///< Index of a string descriptor, describing the Output Terminal.
-} audio_desc_output_terminal_t;
+} audio20_desc_output_terminal_t;
 
-/// AUDIO Feature Unit Descriptor(4.7.2.8) for ONE channel
+/// AUDIO Feature Unit Descriptor UAC2 (4.7.2.8) for ONE channel
 typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor, in bytes: 14.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AC_INTERFACE_FEATURE_UNIT.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_AC_INTERFACE_FEATURE_UNIT.
   uint8_t bUnitID            ; ///< Constant uniquely identifying the Unit within the audio function. This value is used in all requests to address this Unit.
   uint8_t bSourceID          ; ///< ID of the Unit or Terminal to which this Feature Unit is connected.
   struct TU_ATTR_PACKED {
-    uint32_t bmaControls     ; ///< See: audio_feature_unit_control_pos_t. Controls0 is master channel 0 (always present) and Controls1 is logical channel 1.
+    uint32_t bmaControls     ; ///< See: audio20_feature_unit_control_pos_t. Controls0 is master channel 0 (always present) and Controls1 is logical channel 1.
   } controls[2]              ;
   uint8_t iTerminal          ; ///< Index of a string descriptor, describing this Feature Unit.
-} audio_desc_feature_unit_t;
+} audio20_desc_feature_unit_t;
 
 /// AUDIO Feature Unit Descriptor(4.7.2.8) for multiple channels
-#define audio_desc_feature_unit_n_t(ch_num)\
+#define audio20_desc_feature_unit_n_t(ch_num)\
     struct TU_ATTR_PACKED {         \
   uint8_t bLength               ; /* 6+(ch_num+1)*4 */\
     uint8_t bDescriptorType     ; \
@@ -781,38 +1184,38 @@ typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor, in bytes: 16.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AS_INTERFACE_AS_GENERAL.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_AS_INTERFACE_AS_GENERAL.
   uint8_t bTerminalLink      ; ///< The Terminal ID of the Terminal to which this interface is connected.
-  uint8_t bmControls         ; ///< See: audio_cs_as_interface_control_pos_t.
-  uint8_t bFormatType        ; ///< Constant identifying the Format Type the AudioStreaming interface is using. See: audio_format_type_t.
-  uint32_t bmFormats         ; ///< The Audio Data Format(s) that can be used to communicate with this interface.See: audio_data_format_type_I_t.
+  uint8_t bmControls         ; ///< See: audio20_cs_as_interface_control_pos_t.
+  uint8_t bFormatType        ; ///< Constant identifying the Format Type the AudioStreaming interface is using. See: audio20_format_type_t.
+  uint32_t bmFormats         ; ///< The Audio Data Format(s) that can be used to communicate with this interface.See: audio20_data_format_type_I_t.
   uint8_t bNrChannels        ; ///< Number of physical channels in the AS Interface audio channel cluster.
-  uint32_t bmChannelConfig   ; ///< Describes the spatial location of the physical channels. See: audio_channel_config_t.
+  uint32_t bmChannelConfig   ; ///< Describes the spatial location of the physical channels. See: audio20_channel_config_t.
   uint8_t iChannelNames      ; ///< Index of a string descriptor, describing the name of the first physical channel.
-} audio_desc_cs_as_interface_t;
+} audio20_desc_cs_as_interface_t;
 
 /// AUDIO Type I Format Type Descriptor(2.3.1.6 - Audio Formats)
 typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor, in bytes: 6.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AS_INTERFACE_FORMAT_TYPE.
-  uint8_t bFormatType        ; ///< Constant identifying the Format Type the AudioStreaming interface is using. Value: AUDIO_FORMAT_TYPE_I.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_AS_INTERFACE_FORMAT_TYPE.
+  uint8_t bFormatType        ; ///< Constant identifying the Format Type the AudioStreaming interface is using. Value: AUDIO20_FORMAT_TYPE_I.
   uint8_t bSubslotSize       ; ///< The number of bytes occupied by one audio subslot. Can be 1, 2, 3 or 4.
   uint8_t bBitResolution     ; ///< The number of effectively used bits from the available bits in an audio subslot.
-} audio_desc_type_I_format_t;
+} audio20_desc_type_I_format_t;
 
 /// AUDIO Class-Specific AS Isochronous Audio Data Endpoint Descriptor(4.10.1.2)
 typedef struct TU_ATTR_PACKED
 {
   uint8_t bLength            ; ///< Size of this descriptor, in bytes: 8.
   uint8_t bDescriptorType    ; ///< Descriptor Type. Value: TUSB_DESC_CS_ENDPOINT.
-  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_EP_SUBTYPE_GENERAL.
-  uint8_t bmAttributes       ; ///< See: audio_cs_as_iso_data_ep_attribute_t.
-  uint8_t bmControls         ; ///< See: audio_cs_as_iso_data_ep_control_pos_t.
-  uint8_t bLockDelayUnits    ; ///< Indicates the units used for the wLockDelay field. See: audio_cs_as_iso_data_ep_lock_delay_unit_t.
+  uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO20_CS_EP_SUBTYPE_GENERAL.
+  uint8_t bmAttributes       ; ///< See: audio20_cs_as_iso_data_ep_attribute_t.
+  uint8_t bmControls         ; ///< See: audio20_cs_as_iso_data_ep_control_pos_t.
+  uint8_t bLockDelayUnits    ; ///< Indicates the units used for the wLockDelay field. See: audio20_cs_as_iso_data_ep_lock_delay_unit_t.
   uint16_t wLockDelay        ; ///< Indicates the time it takes this endpoint to reliably lock its internal clock recovery circuitry. Units used depend on the value of the bLockDelayUnits field.
-} audio_desc_cs_as_iso_data_ep_t;
+} audio20_desc_cs_as_iso_data_ep_t;
 
 // 5.2.2 Control Request Layout
 typedef struct TU_ATTR_PACKED
@@ -839,7 +1242,7 @@ typedef struct TU_ATTR_PACKED
     };
     uint8_t bEntityID;
     uint16_t wLength;
-} audio_control_request_t;
+} audio20_control_request_t;
 
 //// 5.2.3 Control Request Parameter Block Layout
 
@@ -847,53 +1250,24 @@ typedef struct TU_ATTR_PACKED
 typedef struct TU_ATTR_PACKED
 {
   int8_t bCur               ;   ///< The setting for the CUR attribute of the addressed Control
-} audio_control_cur_1_t;
+} audio20_control_cur_1_t;
 
 // 5.2.3.2 2-byte Control CUR Parameter Block
 typedef struct TU_ATTR_PACKED
 {
   int16_t bCur              ;   ///< The setting for the CUR attribute of the addressed Control
-} audio_control_cur_2_t;
+} audio20_control_cur_2_t;
 
 // 5.2.3.3 4-byte Control CUR Parameter Block
 typedef struct TU_ATTR_PACKED
 {
   int32_t bCur              ;   ///< The setting for the CUR attribute of the addressed Control
-} audio_control_cur_4_t;
+} audio20_control_cur_4_t;
 
-// Use the following ONLY for RECEIVED data - compiler does not know how many subranges are defined! Use the one below for predefined lengths - or if you know what you are doing do what you like
-// 5.2.3.1 1-byte Control RANGE Parameter Block
-typedef struct TU_ATTR_PACKED {
-  uint16_t wNumSubRanges;
-  struct TU_ATTR_PACKED {
-    int8_t bMin             ; /*The setting for the MIN attribute of the nth subrange of the addressed Control*/
-    int8_t bMax             ; /*The setting for the MAX attribute of the nth subrange of the addressed Control*/
-    uint8_t bRes            ; /*The setting for the RES attribute of the nth subrange of the addressed Control*/
-  } subrange[]              ;
-} audio_control_range_1_t;
-
-// 5.2.3.2 2-byte Control RANGE Parameter Block
-typedef struct TU_ATTR_PACKED {
-  uint16_t wNumSubRanges;
-  struct TU_ATTR_PACKED {
-    int16_t bMin            ; /*The setting for the MIN attribute of the nth subrange of the addressed Control*/
-    int16_t bMax            ; /*The setting for the MAX attribute of the nth subrange of the addressed Control*/
-    uint16_t bRes           ; /*The setting for the RES attribute of the nth subrange of the addressed Control*/
-  } subrange[]              ;
-} audio_control_range_2_t;
-
-// 5.2.3.3 4-byte Control RANGE Parameter Block
-typedef struct TU_ATTR_PACKED {
-  uint16_t wNumSubRanges;
-  struct TU_ATTR_PACKED {
-    int32_t bMin            ; /*The setting for the MIN attribute of the nth subrange of the addressed Control*/
-    int32_t bMax            ; /*The setting for the MAX attribute of the nth subrange of the addressed Control*/
-    uint32_t bRes           ; /*The setting for the RES attribute of the nth subrange of the addressed Control*/
-  } subrange[]              ;
-} audio_control_range_4_t;
+// Use the following ONLY for RECEIVED data - compiler does not know how many subranges are defined! Use the #define macros below for predefined lengths.
 
 // 5.2.3.1 1-byte Control RANGE Parameter Block
-#define audio_control_range_1_n_t(numSubRanges) \
+#define audio20_control_range_1_n_t(numSubRanges) \
     struct TU_ATTR_PACKED {                     \
   uint16_t wNumSubRanges;                       \
   struct TU_ATTR_PACKED {                       \
@@ -904,7 +1278,7 @@ typedef struct TU_ATTR_PACKED {
 }
 
 /// 5.2.3.2 2-byte Control RANGE Parameter Block
-#define audio_control_range_2_n_t(numSubRanges) \
+#define audio20_control_range_2_n_t(numSubRanges) \
     struct TU_ATTR_PACKED {                     \
   uint16_t wNumSubRanges;                       \
   struct TU_ATTR_PACKED {                       \
@@ -915,7 +1289,7 @@ typedef struct TU_ATTR_PACKED {
 }
 
 // 5.2.3.3 4-byte Control RANGE Parameter Block
-#define audio_control_range_4_n_t(numSubRanges) \
+#define audio20_control_range_4_n_t(numSubRanges) \
     struct TU_ATTR_PACKED {                     \
   uint16_t wNumSubRanges;                       \
   struct TU_ATTR_PACKED {                       \
@@ -948,7 +1322,7 @@ typedef struct TU_ATTR_PACKED
       uint8_t wIndex_entity_id;
     };
   };
-} audio_interrupt_data_t;
+} audio20_interrupt_data_t;
 
 /** @} */
 
diff --git a/src/class/audio/audio_device.c b/src/class/audio/audio_device.c
index 701411401..f795603c5 100644
--- a/src/class/audio/audio_device.c
+++ b/src/class/audio/audio_device.c
@@ -283,7 +283,7 @@ typedef struct
 
 // Encoding parameters - parameters are set when alternate AS interface is set by host
 #if CFG_TUD_AUDIO_ENABLE_EP_IN && CFG_TUD_AUDIO_EP_IN_FLOW_CONTROL
-  audio_format_type_t format_type_tx;
+  audio20_format_type_t format_type_tx;
   uint8_t n_channels_tx;
   uint8_t n_bytes_per_sample_tx;
 #endif
@@ -597,7 +597,7 @@ static bool audiod_tx_xfer_isr(uint8_t rhport, audiod_function_t * audio, uint16
 
 #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
 // If no interrupt transmit is pending bytes get written into buffer and a transmit is scheduled - once transmit completed tud_audio_int_done_cb() is called in inform user
-bool tud_audio_int_n_write(uint8_t func_id, const audio_interrupt_data_t *data) {
+bool tud_audio_int_n_write(uint8_t func_id, const audio20_interrupt_data_t *data) {
   TU_VERIFY(func_id < CFG_TUD_AUDIO && _audiod_fct[func_id].p_desc != NULL);
 
   TU_VERIFY(_audiod_fct[func_id].ep_int != 0);
@@ -606,7 +606,7 @@ bool tud_audio_int_n_write(uint8_t func_id, const audio_interrupt_data_t *data)
   TU_VERIFY(usbd_edpt_claim(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int));
 
   // Check length
-  if (tu_memcpy_s(int_ep_buf[func_id].buf, sizeof(int_ep_buf[func_id].buf), data, sizeof(audio_interrupt_data_t)) == 0) {
+  if (tu_memcpy_s(int_ep_buf[func_id].buf, sizeof(int_ep_buf[func_id].buf), data, sizeof(audio20_interrupt_data_t)) == 0) {
     // Schedule transmit
     TU_ASSERT(usbd_edpt_xfer(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int, int_ep_buf[func_id].buf, sizeof(int_ep_buf[func_id].buf)), 0);
   } else {
@@ -937,8 +937,8 @@ uint16_t audiod_open(uint8_t rhport, tusb_desc_interface_t const *itf_desc, uint
                 _audiod_fct[i].interval_tx = desc_ep->bInterval;
               }
             }
-          } else if (tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE && tu_desc_subtype(p_desc) == AUDIO_CS_AC_INTERFACE_OUTPUT_TERMINAL) {
-            if (tu_unaligned_read16(p_desc + 4) == AUDIO_TERM_TYPE_USB_STREAMING) {
+          } else if (tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE && tu_desc_subtype(p_desc) == AUDIO20_CS_AC_INTERFACE_OUTPUT_TERMINAL) {
+            if (tu_unaligned_read16(p_desc + 4) == AUDIO20_TERM_TYPE_USB_STREAMING) {
               _audiod_fct[i].bclock_id_tx = p_desc[8];
             }
           }
@@ -1277,7 +1277,7 @@ static bool audiod_control_complete(uint8_t rhport, tusb_control_request_t const
 
 #if CFG_TUD_AUDIO_ENABLE_EP_IN && CFG_TUD_AUDIO_EP_IN_FLOW_CONTROL
           uint8_t ctrlSel = TU_U16_HIGH(p_request->wValue);
-          if (_audiod_fct[func_id].bclock_id_tx == entityID && ctrlSel == AUDIO_CS_CTRL_SAM_FREQ && p_request->bRequest == AUDIO_CS_REQ_CUR) {
+          if (_audiod_fct[func_id].bclock_id_tx == entityID && ctrlSel == AUDIO20_CS_CTRL_SAM_FREQ && p_request->bRequest == AUDIO20_CS_REQ_CUR) {
             _audiod_fct[func_id].sample_rate_tx = tu_unaligned_read32(_audiod_fct[func_id].ctrl_buf);
           }
 #endif
@@ -1655,7 +1655,7 @@ bool tud_audio_buffer_and_schedule_control_xfer(uint8_t rhport, tusb_control_req
   if (p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_CLASS && p_request->bmRequestType_bit.recipient == TUSB_REQ_RCPT_INTERFACE) {
     uint8_t entityID = TU_U16_HIGH(p_request->wIndex);
     uint8_t ctrlSel = TU_U16_HIGH(p_request->wValue);
-    if (_audiod_fct[func_id].bclock_id_tx == entityID && ctrlSel == AUDIO_CS_CTRL_SAM_FREQ && p_request->bRequest == AUDIO_CS_REQ_CUR) {
+    if (_audiod_fct[func_id].bclock_id_tx == entityID && ctrlSel == AUDIO20_CS_CTRL_SAM_FREQ && p_request->bRequest == AUDIO20_CS_REQ_CUR) {
       _audiod_fct[func_id].sample_rate_tx = tu_unaligned_read32(_audiod_fct[func_id].ctrl_buf);
     }
   }
@@ -1673,7 +1673,7 @@ static bool audiod_verify_entity_exists(uint8_t itf, uint8_t entityID, uint8_t *
     if (_audiod_fct[i].p_desc && ((tusb_desc_interface_t const *) _audiod_fct[i].p_desc)->bInterfaceNumber == itf) {
       // Get pointers after class specific AC descriptors and end of AC descriptors - entities are defined in between
       uint8_t const *p_desc = tu_desc_next(_audiod_fct[i].p_desc);// Points to CS AC descriptor
-      uint8_t const *p_desc_end = ((audio_desc_cs_ac_interface_t const *) p_desc)->wTotalLength + p_desc;
+      uint8_t const *p_desc_end = ((audio20_desc_cs_ac_interface_t const *) p_desc)->wTotalLength + p_desc;
       p_desc = tu_desc_next(p_desc);// Get past CS AC descriptor
 
       // Condition modified from p_desc < p_desc_end to prevent gcc>=12 strict-overflow warning
@@ -1719,7 +1719,7 @@ static bool audiod_verify_ep_exists(uint8_t ep, uint8_t *func_id) {
 
       // Advance past AC descriptors - EP we look for are streaming EPs
       uint8_t const *p_desc = tu_desc_next(_audiod_fct[i].p_desc);
-      p_desc += ((audio_desc_cs_ac_interface_t const *) p_desc)->wTotalLength;
+      p_desc += ((audio20_desc_cs_ac_interface_t const *) p_desc)->wTotalLength;
 
       // Condition modified from p_desc < p_desc_end to prevent gcc>=12 strict-overflow warning
       while (p_desc_end - p_desc > 0) {
@@ -1740,19 +1740,19 @@ static void audiod_parse_flow_control_params(audiod_function_t *audio, uint8_t c
   p_desc = tu_desc_next(p_desc);// Exclude standard AS interface descriptor of current alternate interface descriptor
 
   // Look for a Class-Specific AS Interface Descriptor(4.9.2) to verify format type and format and also to get number of physical channels
-  if (tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE && tu_desc_subtype(p_desc) == AUDIO_CS_AS_INTERFACE_AS_GENERAL) {
-    audio->n_channels_tx = ((audio_desc_cs_as_interface_t const *) p_desc)->bNrChannels;
-    audio->format_type_tx = (audio_format_type_t) (((audio_desc_cs_as_interface_t const *) p_desc)->bFormatType);
+  if (tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE && tu_desc_subtype(p_desc) == AUDIO20_CS_AS_INTERFACE_AS_GENERAL) {
+    audio->n_channels_tx = ((audio20_desc_cs_as_interface_t const *) p_desc)->bNrChannels;
+    audio->format_type_tx = (audio20_format_type_t) (((audio20_desc_cs_as_interface_t const *) p_desc)->bFormatType);
     // Look for a Type I Format Type Descriptor(2.3.1.6 - Audio Formats)
     p_desc = tu_desc_next(p_desc);
-    if (tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE && tu_desc_subtype(p_desc) == AUDIO_CS_AS_INTERFACE_FORMAT_TYPE && ((audio_desc_type_I_format_t const *) p_desc)->bFormatType == AUDIO_FORMAT_TYPE_I) {
-      audio->n_bytes_per_sample_tx = ((audio_desc_type_I_format_t const *) p_desc)->bSubslotSize;
+    if (tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE && tu_desc_subtype(p_desc) == AUDIO20_CS_AS_INTERFACE_FORMAT_TYPE && ((audio20_desc_type_I_format_t const *) p_desc)->bFormatType == AUDIO20_FORMAT_TYPE_I) {
+      audio->n_bytes_per_sample_tx = ((audio20_desc_type_I_format_t const *) p_desc)->bSubslotSize;
     }
   }
 }
 
 static bool audiod_calc_tx_packet_sz(audiod_function_t *audio) {
-  TU_VERIFY(audio->format_type_tx == AUDIO_FORMAT_TYPE_I);
+  TU_VERIFY(audio->format_type_tx == AUDIO20_FORMAT_TYPE_I);
   TU_VERIFY(audio->n_channels_tx);
   TU_VERIFY(audio->n_bytes_per_sample_tx);
   TU_VERIFY(audio->interval_tx);
diff --git a/src/class/audio/audio_device.h b/src/class/audio/audio_device.h
index fd47c649d..ec710aed5 100644
--- a/src/class/audio/audio_device.h
+++ b/src/class/audio/audio_device.h
@@ -220,7 +220,7 @@ tu_fifo_t* tud_audio_n_get_ep_in_ff   (uint8_t func_id);
 #endif
 
 #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
-bool    tud_audio_int_n_write                     (uint8_t func_id, const audio_interrupt_data_t * data);
+bool    tud_audio_int_n_write                     (uint8_t func_id, const audio20_interrupt_data_t * data);
 #endif
 
 //--------------------------------------------------------------------+
@@ -244,7 +244,7 @@ static inline tu_fifo_t* tud_audio_get_ep_in_ff   (void);
 // INT CTR API
 
 #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
-static inline bool tud_audio_int_write                      (const audio_interrupt_data_t * data);
+static inline bool tud_audio_int_write                      (const audio20_interrupt_data_t * data);
 #endif
 
 // Buffer control EP data and schedule a transmit
@@ -434,7 +434,7 @@ TU_ATTR_ALWAYS_INLINE static inline tu_fifo_t* tud_audio_get_ep_in_ff(void) {
 #endif
 
 #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
-TU_ATTR_ALWAYS_INLINE static inline bool tud_audio_int_write(const audio_interrupt_data_t * data) {
+TU_ATTR_ALWAYS_INLINE static inline bool tud_audio_int_write(const audio20_interrupt_data_t * data) {
   return tud_audio_int_n_write(0, data);
 }
 #endif
diff --git a/src/class/midi/midi_host.c b/src/class/midi/midi_host.c
index e6ace316c..46b8284ee 100644
--- a/src/class/midi/midi_host.c
+++ b/src/class/midi/midi_host.c
@@ -93,6 +93,8 @@ typedef struct {
 static midih_interface_t _midi_host[CFG_TUH_MIDI];
 CFG_TUH_MEM_SECTION static midih_epbuf_t _midi_epbuf[CFG_TUH_MIDI];
 
+typedef audio10_desc_cs_ac_interface_n_t(1) midi10_desc_cs_ac_interface_t;
+
 //--------------------------------------------------------------------+
 // Helper
 //--------------------------------------------------------------------+
@@ -220,7 +222,7 @@ bool midih_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *d
   // driver after parsing the audio control interface and then resume parsing
   // the streaming audio interface.
   if (AUDIO_SUBCLASS_CONTROL == desc_itf->bInterfaceSubClass) {
-    TU_VERIFY(max_len > 2*sizeof(tusb_desc_interface_t) + sizeof(audio_desc_cs_ac_interface_t));
+    TU_VERIFY(max_len > 2*sizeof(tusb_desc_interface_t) + sizeof(midi10_desc_cs_ac_interface_t));
 
     p_desc = tu_desc_next(p_desc);
     TU_VERIFY(tu_desc_type(p_desc) == TUSB_DESC_CS_INTERFACE &&