diff --git a/firmware/application/apps/analog_audio_app.hpp b/firmware/application/apps/analog_audio_app.hpp
index 008aa4142..5979aecc0 100644
--- a/firmware/application/apps/analog_audio_app.hpp
+++ b/firmware/application/apps/analog_audio_app.hpp
@@ -143,7 +143,7 @@ class WFMAMAptOptionsView : public View {
     };
     OptionsField options_config{
         {3 * 8, 0 * 16},
-        19,  // Max option char length "80k-NOAA Apt LPF-2K" , example.
+        16,  // Max option char length "80k-NOAA Apt LPF" , example.
         {
             // Using common messages from freqman_ui.cpp
         }};
diff --git a/firmware/application/freqman_db.cpp b/firmware/application/freqman_db.cpp
index eb070d4a4..659e759d5 100644
--- a/firmware/application/freqman_db.cpp
+++ b/firmware/application/freqman_db.cpp
@@ -108,9 +108,9 @@ options_t freqman_bandwidths[6] = {
     },
     {
         // WFMAM for NOAA satellites,  137 Mhz band
-        {"80k-NOAA Apt LPF-2K", 0},
-        {"38k-NOAA Apt LPF-2K", 1},
-        {"38k-NOAA Apt BPF-2K", 2},  // Symetrical BPF centred to the 2k4 AM subcarrier,  BW = 2KHz
+        {"80k-NOAA Apt LPF", 0},  // Captured RF IQ filtered BW 80K, APT baseband filtered with Low Pass Filter 4k5 fc -3dB
+        {"38k-NOAA Apt LPF", 1},  // Captured RF IQ filtered BW 38K, APT baseband filtered with Low Pass Filter 4k5 fc -3dB
+        {"38k-NOAA Apt BPF", 2},  // Captured RF IQ filtered BW 38K, APT baseband filtered BPF centred to the 2k4 AM subcarrier,  BW = 2KHz
     },
 };
 
diff --git a/firmware/baseband/proc_noaaapt_rx.cpp b/firmware/baseband/proc_noaaapt_rx.cpp
index 043ba81ad..091eb2700 100644
--- a/firmware/baseband/proc_noaaapt_rx.cpp
+++ b/firmware/baseband/proc_noaaapt_rx.cpp
@@ -157,7 +157,7 @@ void NoaaAptRx::configure(const NoaaAptRxConfigureMessage& message) {
     channel_filter_high_f = taps_38k_wfmam_decim_1.high_frequency_normalized * decim_1_input_fs;
     channel_filter_transition = taps_38k_wfmam_decim_1.transition_normalized * decim_1_input_fs;
     demod.configure(demod_input_fs, 17000);
-    audio_filter.configure(taps_64_lp_1875_2166.taps);
+    audio_filter.configure(taps_64_bpf_2k4_bw_2k.taps);
     audio_output.configure(apt_audio_12k_notch_2k4_config, apt_audio_12k_lpf_2000hz_config);
     // channel_spectrum.set_decimation_factor(1);
     update_params();
diff --git a/firmware/common/dsp_fir_taps.hpp b/firmware/common/dsp_fir_taps.hpp
index 9e1e513d2..6b73820ad 100644
--- a/firmware/common/dsp_fir_taps.hpp
+++ b/firmware/common/dsp_fir_taps.hpp
@@ -1498,7 +1498,7 @@ constexpr fir_taps_real<64> taps_64_lp_1875_2166{
  * -> 12kHz int16_t output, gain of 1.0 (I think).
  */
 constexpr fir_taps_real<64> taps_64_bpf_2k4_bw_2k{
-    .low_frequency_normalized = -0.1875f,  // not updated, this is just for LPF , waterfall GUI,  we are not using in HPF NOAA app.
+    .low_frequency_normalized = -0.1875f,  // not updated, this is just for LPF , waterfall GUI,  we are not using in BPF NOAA app.
     .high_frequency_normalized = 0.1875f,  // not used GUI in NOAA App.
     .transition_normalized = 0.03f,        // not used GUI in NOAA app.
     .taps = {{-45, -29, 32, 63, 0, -125, -181, -81, 61,