diff --git a/lib_xua/src/core/buffer/decouple/decouple.xc b/lib_xua/src/core/buffer/decouple/decouple.xc
index 4920c2da..c8d7ed8b 100644
--- a/lib_xua/src/core/buffer/decouple/decouple.xc
+++ b/lib_xua/src/core/buffer/decouple/decouple.xc
@@ -18,8 +18,8 @@
 #define MAX(x,y) ((x)>(y) ? (x) : (y))
 
 #if((defined USB_CMD_CFG_SAMP_FREQ) || (defined USB_DESCRIPTOR_OVERRIDE_RATE_RES))
-unsigned int xua_lite_curAudOutFreq(void);
-unsigned int xua_lite_curAudInFreq(void);
+unsigned int xua_lite_curAudToUsbFreq(void);
+unsigned int xua_lite_curUsbToAudFreq(void);
 unsigned int xua_lite_curUSB_Res_In(void);
 unsigned int xua_lite_curUSB_Res_Out(void);
 #endif
diff --git a/lib_xua/src/core/endpoint0/xua_endpoint0.c b/lib_xua/src/core/endpoint0/xua_endpoint0.c
index 8c39d1b9..96126702 100755
--- a/lib_xua/src/core/endpoint0/xua_endpoint0.c
+++ b/lib_xua/src/core/endpoint0/xua_endpoint0.c
@@ -65,8 +65,8 @@ extern void device_reboot(void);
 #endif
 
 #if((defined USB_CMD_CFG_SAMP_FREQ) || (defined USB_DESCRIPTOR_OVERRIDE_RATE_RES))
-unsigned int xua_lite_curAudOutFreq(void);
-unsigned int xua_lite_curAudInFreq(void);
+unsigned int xua_lite_curAudToUsbFreq(void);
+unsigned int xua_lite_curUsbToAudFreq(void);
 unsigned int xua_lite_curUSB_Res_In(void);
 unsigned int xua_lite_curUSB_Res_Out(void);
 #endif
@@ -319,16 +319,16 @@ void XUA_Endpoint0_init(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioCont
     int i=0;
     for(i=0;i<num_of_usb_descriptor_freq;i++)
     {
-        cfgDesc_Audio1[USB_AS_IN_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i] = xua_lite_curAudOutFreq() & 0xff;
-        cfgDesc_Audio1[USB_AS_IN_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i + 1] = (xua_lite_curAudOutFreq() & 0xff00)>> 8;
-        cfgDesc_Audio1[USB_AS_IN_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i + 2] = (xua_lite_curAudOutFreq() & 0xff0000)>> 16;
+        cfgDesc_Audio1[USB_AS_IN_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i] = xua_lite_curAudToUsbFreq() & 0xff;
+        cfgDesc_Audio1[USB_AS_IN_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i + 1] = (xua_lite_curAudToUsbFreq() & 0xff00)>> 8;
+        cfgDesc_Audio1[USB_AS_IN_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i + 2] = (xua_lite_curAudToUsbFreq() & 0xff0000)>> 16;
     }
     
     for(i=0;i<num_of_usb_descriptor_freq;i++)
     {
-        cfgDesc_Audio1[USB_AS_OUT_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i] = xua_lite_curAudInFreq() & 0xff;
-        cfgDesc_Audio1[USB_AS_OUT_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i + 1] = (xua_lite_curAudInFreq() & 0xff00)>> 8;
-        cfgDesc_Audio1[USB_AS_OUT_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i + 2] = (xua_lite_curAudInFreq() & 0xff0000)>> 16;
+        cfgDesc_Audio1[USB_AS_OUT_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i] = xua_lite_curUsbToAudFreq() & 0xff;
+        cfgDesc_Audio1[USB_AS_OUT_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i + 1] = (xua_lite_curUsbToAudFreq() & 0xff00)>> 8;
+        cfgDesc_Audio1[USB_AS_OUT_INTERFACE_DESCRIPTOR_OFFSET_FREQ + 3*i + 2] = (xua_lite_curUsbToAudFreq() & 0xff0000)>> 16;
     }
     
     cfgDesc_Audio1[USB_AS_IN_EP_DESCRIPTOR_OFFSET_MAXPACKETSIZE] = ((xua_lite_curUSB_Res_In() >> 3) * MAX_PACKET_SIZE_MULT_IN_FS) & 0xff; 	//max packet size
diff --git a/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc b/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
index 7226f4ec..28979a3f 100644
--- a/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
+++ b/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
@@ -55,8 +55,8 @@ extern unsigned char mixSel[MAX_MIX_COUNT][MIX_INPUTS];
 
 /* Global var for current frequency, set to default freq */
 #ifdef USB_CMD_CFG_SAMP_FREQ
-#define g_curUSBin_SamFreq xua_lite_curAudOutFreq()
-#define g_curUSBout_SamFreq xua_lite_curAudInFreq()
+#define g_curUSBin_SamFreq xua_lite_curAudToUsbFreq()
+#define g_curUSBout_SamFreq xua_lite_curUsbToAudFreq()
 
 unsigned int g_curSamFreq = DEFAULT_FREQ;	// should no longer be used
 #else