diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index 49fe9ff..6c37fe0 100644
Binary files a/audio/oriole/tuning/bluenote/recording.gatf and b/audio/oriole/tuning/bluenote/recording.gatf differ
diff --git a/audio/oriole/tuning/bluenote/template.xml b/audio/oriole/tuning/bluenote/template.xml
index 2e72a68..8179e3d 100644
--- a/audio/oriole/tuning/bluenote/template.xml
+++ b/audio/oriole/tuning/bluenote/template.xml
@@ -37,15 +37,15 @@
       <param complex="true" id="24" name="ch1_profileAZ" size="1024" type="float"/>
       <param complex="true" id="25" name="ch2_profileAZ" size="1024" type="float"/>
       <struct id="26">
-        <param default="1" max="10" min="0.0" name="ch_gain" type="float"/>
-        <param default="1" max="10" min="0.0" name="zoom_gain" type="float"/>
+        <param default="1" name="ch_gain" type="float"/>
+        <param default="1" name="zoom_gain" type="float"/>
       </struct>
     </module>
-    <module id="7" name="Multi Channel IIR">
+    <module id="7" name="Multi Channel IIR 2">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <param default="3" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
       <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
       <param id="17" name="coeff" size="300" type="float"/>
       <struct id="18">
@@ -71,7 +71,7 @@
         <param max="20" min="0" name="band0_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band0_rms_ms" type="float"/>
         <param max="30" min="0" name="band0_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band0_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band0_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band0_numOfKnee" type="uint32"/>
         <param name="band0_threadhold_dB" size="3" type="float"/>
         <param name="band0_compressRatio" size="4" type="float"/>
@@ -82,7 +82,7 @@
         <param max="20" min="0" name="band1_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band1_rms_ms" type="float"/>
         <param max="30" min="0" name="band1_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band1_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band1_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band1_numOfKnee" type="uint32"/>
         <param name="band1_threadhold_dB" size="3" type="float"/>
         <param name="band1_compressRatio" size="4" type="float"/>
@@ -93,7 +93,7 @@
         <param max="20" min="0" name="band2_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band2_rms_ms" type="float"/>
         <param max="30" min="0" name="band2_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band2_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band2_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band2_numOfKnee" type="uint32"/>
         <param name="band2_threadhold_dB" size="3" type="float"/>
         <param name="band2_compressRatio" size="4" type="float"/>
@@ -103,7 +103,7 @@
         <param name="band2_hysteresis" size="4" type="float"/>
       </struct>
       <struct id="18">
-        <param max="30" min="0" name="limiter_gain_dB" type="float"/>
+        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
         <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
         <param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
         <param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
@@ -116,11 +116,11 @@
     <module id="14" name="Linear Gain">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param id="16" name="linear_gain_dB" type="float"/>
+      <param default="1" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
+      <param id="16" name="Simple_gain" type="float"/>
     </module>
-    <module id="17" name="WNR">
+    <module id="17" name="Wind Noise Reduction">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="2" id="2" name="numCh_" type="uint32"/>
@@ -183,7 +183,7 @@
       <param default="450" id="71" name="SSC_SOFT_DECISION_MAX_FREQ" type="int32"/>
       <param default="5" id="72" name="SSC_KEEP_SAVED_PROB_SMOOTH_SIZE" type="int32"/>
     </module>
-    <module id="18" name="IIR 1">
+    <module id="18" name="Multi Channel IIR 1">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="2" id="2" name="numCh_" type="uint32"/>
diff --git a/audio/oriole/tuning/bluenote/tuning_constraints_combination.xml b/audio/oriole/tuning/bluenote/tuning_constraints_combination.xml
index a5f51a4..c824fbc 100644
--- a/audio/oriole/tuning/bluenote/tuning_constraints_combination.xml
+++ b/audio/oriole/tuning/bluenote/tuning_constraints_combination.xml
@@ -211,11 +211,11 @@
            rx-path="device_out_usb_others_headset_headphone" />
   <usecase type="playback" name="A2DP"
            rx-path="device_out_bt_a2dp" />
-  <usecase type="record" name="Voice note with main mic"
+  <usecase type="record" name="Voice note with main mic (Google Keep and 3rd party)"
            tx-path="device_in_handset_mic" />
-  <usecase type="record" name="SoloTester with dual mic"
+  <usecase type="record" name="SoloTester with dual mic (3rd party)"
            tx-path="device_in_handset_dual_mic" />
-  <usecase type="record" name="SoloTester with tri mic"
+  <usecase type="record" name="SoloTester with tri mic (3rd party)"
            tx-path="device_in_handset_tri_mic" />
   <usecase type="record" name="Meetings and lectures with rear mic"
            tx-path="device_in_handset_rear_mic" />
@@ -904,13 +904,13 @@
   </usecase-node>
 
   <usecase-node id="usecase_record_voice_note_main_mic" type="record"
-                name="Voice note with main mic" />
+                name="Voice note with main mic (Google Keep and 3rd party)" />
 
   <usecase-node id="usecase_record_solotester_dual_mic" type="record"
-                name="SoloTester with dual mic" />
+                name="SoloTester with dual mic (3rd party)" />
 
   <usecase-node id="usecase_record_solotester_tri_mic" type="record"
-                name="SoloTester with tri mic" />
+                name="SoloTester with tri mic (3rd party)" />
 
   <usecase-node id="usecase_record_meetings_lectures_rear_mic" type="record"
                 name="Meetings and lectures with rear mic" />
diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index 49fe9ff..6c37fe0 100644
Binary files a/audio/raven/tuning/bluenote/recording.gatf and b/audio/raven/tuning/bluenote/recording.gatf differ
diff --git a/audio/raven/tuning/bluenote/template.xml b/audio/raven/tuning/bluenote/template.xml
index 2e72a68..8179e3d 100644
--- a/audio/raven/tuning/bluenote/template.xml
+++ b/audio/raven/tuning/bluenote/template.xml
@@ -37,15 +37,15 @@
       <param complex="true" id="24" name="ch1_profileAZ" size="1024" type="float"/>
       <param complex="true" id="25" name="ch2_profileAZ" size="1024" type="float"/>
       <struct id="26">
-        <param default="1" max="10" min="0.0" name="ch_gain" type="float"/>
-        <param default="1" max="10" min="0.0" name="zoom_gain" type="float"/>
+        <param default="1" name="ch_gain" type="float"/>
+        <param default="1" name="zoom_gain" type="float"/>
       </struct>
     </module>
-    <module id="7" name="Multi Channel IIR">
+    <module id="7" name="Multi Channel IIR 2">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <param default="3" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
       <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
       <param id="17" name="coeff" size="300" type="float"/>
       <struct id="18">
@@ -71,7 +71,7 @@
         <param max="20" min="0" name="band0_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band0_rms_ms" type="float"/>
         <param max="30" min="0" name="band0_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band0_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band0_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band0_numOfKnee" type="uint32"/>
         <param name="band0_threadhold_dB" size="3" type="float"/>
         <param name="band0_compressRatio" size="4" type="float"/>
@@ -82,7 +82,7 @@
         <param max="20" min="0" name="band1_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band1_rms_ms" type="float"/>
         <param max="30" min="0" name="band1_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band1_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band1_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band1_numOfKnee" type="uint32"/>
         <param name="band1_threadhold_dB" size="3" type="float"/>
         <param name="band1_compressRatio" size="4" type="float"/>
@@ -93,7 +93,7 @@
         <param max="20" min="0" name="band2_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band2_rms_ms" type="float"/>
         <param max="30" min="0" name="band2_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band2_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band2_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band2_numOfKnee" type="uint32"/>
         <param name="band2_threadhold_dB" size="3" type="float"/>
         <param name="band2_compressRatio" size="4" type="float"/>
@@ -103,7 +103,7 @@
         <param name="band2_hysteresis" size="4" type="float"/>
       </struct>
       <struct id="18">
-        <param max="30" min="0" name="limiter_gain_dB" type="float"/>
+        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
         <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
         <param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
         <param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
@@ -116,11 +116,11 @@
     <module id="14" name="Linear Gain">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param id="16" name="linear_gain_dB" type="float"/>
+      <param default="1" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
+      <param id="16" name="Simple_gain" type="float"/>
     </module>
-    <module id="17" name="WNR">
+    <module id="17" name="Wind Noise Reduction">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="2" id="2" name="numCh_" type="uint32"/>
@@ -183,7 +183,7 @@
       <param default="450" id="71" name="SSC_SOFT_DECISION_MAX_FREQ" type="int32"/>
       <param default="5" id="72" name="SSC_KEEP_SAVED_PROB_SMOOTH_SIZE" type="int32"/>
     </module>
-    <module id="18" name="IIR 1">
+    <module id="18" name="Multi Channel IIR 1">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="2" id="2" name="numCh_" type="uint32"/>
diff --git a/audio/raven/tuning/bluenote/tuning_constraints_combination.xml b/audio/raven/tuning/bluenote/tuning_constraints_combination.xml
index a5f51a4..c824fbc 100644
--- a/audio/raven/tuning/bluenote/tuning_constraints_combination.xml
+++ b/audio/raven/tuning/bluenote/tuning_constraints_combination.xml
@@ -211,11 +211,11 @@
            rx-path="device_out_usb_others_headset_headphone" />
   <usecase type="playback" name="A2DP"
            rx-path="device_out_bt_a2dp" />
-  <usecase type="record" name="Voice note with main mic"
+  <usecase type="record" name="Voice note with main mic (Google Keep and 3rd party)"
            tx-path="device_in_handset_mic" />
-  <usecase type="record" name="SoloTester with dual mic"
+  <usecase type="record" name="SoloTester with dual mic (3rd party)"
            tx-path="device_in_handset_dual_mic" />
-  <usecase type="record" name="SoloTester with tri mic"
+  <usecase type="record" name="SoloTester with tri mic (3rd party)"
            tx-path="device_in_handset_tri_mic" />
   <usecase type="record" name="Meetings and lectures with rear mic"
            tx-path="device_in_handset_rear_mic" />
@@ -904,13 +904,13 @@
   </usecase-node>
 
   <usecase-node id="usecase_record_voice_note_main_mic" type="record"
-                name="Voice note with main mic" />
+                name="Voice note with main mic (Google Keep and 3rd party)" />
 
   <usecase-node id="usecase_record_solotester_dual_mic" type="record"
-                name="SoloTester with dual mic" />
+                name="SoloTester with dual mic (3rd party)" />
 
   <usecase-node id="usecase_record_solotester_tri_mic" type="record"
-                name="SoloTester with tri mic" />
+                name="SoloTester with tri mic (3rd party)" />
 
   <usecase-node id="usecase_record_meetings_lectures_rear_mic" type="record"
                 name="Meetings and lectures with rear mic" />