diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml
index fb119d5..b166614 100644
--- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml
@@ -407,12 +407,20 @@
     <ctl name="BT_RX Mixer EP2" value="1" />
   </path>
 
-  <path name="primary-playback -> usb-headset">
+  <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
 
-  <path name="primary-playback -> usb-dock">
-    <ctl name="USB_RX Mixer EP2" value="1" />
+  <path name="primary-playback-0 -> usb-headset">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
+  <path name="primary-playback-0 -> usb-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
+  <path name="primary-playback-0 -> usb-dock">
+    <path name="primary-playback-0 -> usb" />
   </path>
 
   <path name="raw-playback -> speaker">
@@ -435,12 +443,16 @@
     <ctl name="BT_RX Mixer RAW" value="1" />
   </path>
 
-  <path name="raw-playback -> usb-headset">
+  <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
 
-  <path name="raw-playback -> usb-dock">
-    <ctl name="USB_RX Mixer RAW" value="1" />
+  <path name="raw-playback-0 -> usb-headset">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
+  <path name="raw-playback-0 -> usb-device">
+    <path name="raw-playback-0 -> usb" />
   </path>
 
   <path name="deep-buffer-playback -> speaker">
@@ -463,12 +475,20 @@
     <ctl name="BT_RX Mixer EP6" value="1" />
   </path>
 
-  <path name="deep-buffer-playback -> usb-headset">
+  <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
 
-  <path name="deep-buffer-playback -> usb-dock">
-      <ctl name="USB_RX Mixer EP6" value="1"/>
+  <path name="deep-buffer-playback-0 -> usb-headset">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> usb-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> usb-dock">
+    <path name="deep-buffer-playback-0 -> usb" />
   </path>
 
   <path name="compress-offload-playback">
@@ -496,12 +516,20 @@
     <ctl name="BT_RX Mixer EP7" value="1" />
   </path>
 
-  <path name="compress-offload-playback -> usb-headset">
+  <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
 
-  <path name="compress-offload-playback -> usb-dock">
-      <ctl name="USB_RX Mixer EP7" value="1"/>
+  <path name="compress-offload-playback-0 -> usb-headset">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> usb-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> usb-dock">
+    <path name="compress-offload-playback-0 -> usb" />
   </path>
 
   <path name="mmap-playback -> speaker">
@@ -524,20 +552,32 @@
     <ctl name="BT_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="mmap-playback -> usb-headset">
+  <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="mmap-playback -> usb-dock">
-    <ctl name="USB_RX Mixer EP1" value="1" />
+  <path name="mmap-playback-0 -> usb-headset">
+    <path name="mmap-playback-0 -> usb" />
   </path>
 
-  <path name="hifi-playback -> usb-headset">
+  <path name="mmap-playback-0 -> usb-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
+  <path name="mmap-playback-0 -> usb-dock">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
+  <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
 
-  <path name="hifi-playback -> usb-dock">
-    <ctl name="USB_RX Mixer HIFI" value="1" />
+  <path name="hifi-playback-0 -> usb-headset">
+    <path name="hifi-playback-0 -> usb" />
+  </path>
+
+  <path name="hifi-playback-0 -> usb-device">
+    <path name="hifi-playback-0 -> usb" />
   </path>
 
   <path name="voip-playback -> speaker">
@@ -560,12 +600,20 @@
     <ctl name="BT_RX Mixer VOIP" value="1" />
   </path>
 
-  <path name="voip-playback -> usb-headset">
+  <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
 
-  <path name="voip-playback -> usb-dock">
-    <ctl name="USB_RX Mixer VOIP" value="1" />
+  <path name="voip-playback-0 -> usb-headset">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
+  <path name="voip-playback-0 -> usb-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
+  <path name="voip-playback-0 -> usb-dock">
+    <path name="voip-playback-0 -> usb" />
   </path>
 
   <path name="immersive-playback -> speaker">
@@ -588,12 +636,16 @@
     <ctl name="BT_RX Mixer IMSV" value="1" />
   </path>
 
-  <path name="immersive-playback -> usb-headset">
+  <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
 
-  <path name="immersive-playback -> usb-dock">
-    <ctl name="USB_RX Mixer IMSV" value="1" />
+  <path name="immersive-playback-0 -> usb-headset">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb-device">
+    <path name="immersive-playback-0 -> usb" />
   </path>
 
   <path name="haptic-playback -> speaker">
@@ -618,14 +670,21 @@
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
-  <path name="haptic-playback -> usb-headset">
+  <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
-  <path name="haptic-playback -> usb-dock">
-    <ctl name="USB_RX Mixer EP3" value="1" />
-    <ctl name="TDM_0_RX Mixer EP8" value="1" />
+  <path name="haptic-playback-0 -> usb-headset">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
+  <path name="haptic-playback-0 -> usb-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
+  <path name="haptic-playback-0 -> usb-dock">
+    <path name="haptic-playback-0 -> usb" />
   </path>
 
   <!-- audio capture dynamic route -->
@@ -637,10 +696,18 @@
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> primary-capture-0">
+  <path name="usb-microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> primary-capture-0">
+    <path name="usb-microphones-> primary-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> primary-capture-0">
+    <path name="usb-microphones -> primary-capture-0" />
+  </path>
+
   <path name="microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -649,10 +716,18 @@
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> voip-capture-0">
+  <path name="usb-microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> voip-capture-0">
+    <path name="usb-microphones -> voip-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-capture-0">
+    <path name="usb-microphones -> voip-capture-0" />
+  </path>
+
   <path name="bt-mic -> voip-capture-0">
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
@@ -665,10 +740,18 @@
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> fast-capture-0">
+  <path name="usb-microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> fast-capture-0">
+    <path name="usb-microphones -> fast-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> fast-capture-0">
+    <path name="usb-microphones -> fast-capture-0" />
+  </path>
+
   <path name="bt-mic -> fast-capture-0">
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
@@ -695,12 +778,20 @@
     <ctl name="BT_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-call-downlink-0 -> usb-headphone">
+  <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
 
+  <path name="voice-call-downlink-0 -> usb-headset">
+    <path name="voice-call-downlink-0 -> usb" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> usb-device">
+    <path name="voice-call-downlink-0 -> usb" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb-dock">
-    <ctl name="USB_RX Mixer EP5" value="1" />
+    <path name="voice-call-downlink-0 -> usb" />
   </path>
 
   <path name="voice-call-downlink-0 -> null-sink">
@@ -715,10 +806,18 @@
     <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> voice-call-uplink-0">
+  <path name="usb-microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> voice-call-uplink-0">
+    <path name="usb-microphones -> voice-call-uplink-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voice-call-uplink-0">
+    <path name="usb-microphones -> voice-call-uplink-0" />
+  </path>
+
   <path name="bt-mic -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
@@ -771,10 +870,18 @@
     <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> mmap-capture-0">
+  <path name="usb-microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
   <path name="bt-mic -> mmap-capture-0">
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
@@ -987,7 +1094,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="usb-headset-mic">
+  <path name="usb-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />