diff --git a/firmware/application/apps/ui_subghzd.cpp b/firmware/application/apps/ui_subghzd.cpp
index ca6a171dd..138b8ce0c 100644
--- a/firmware/application/apps/ui_subghzd.cpp
+++ b/firmware/application/apps/ui_subghzd.cpp
@@ -72,7 +72,7 @@ SubGhzDView::SubGhzDView(NavigationView& nav)
                   &button_clear_list,
                   &recent_entries_view});
 
-    baseband::run_image(portapack::spi_flash::image_tag_weather);
+    baseband::run_image(portapack::spi_flash::image_tag_subghzd);
 
     button_clear_list.on_select = [this](Button&) {
         recent.clear();
diff --git a/firmware/application/apps/ui_weatherstation.cpp b/firmware/application/apps/ui_weatherstation.cpp
index a09ae7f23..aab140f91 100644
--- a/firmware/application/apps/ui_weatherstation.cpp
+++ b/firmware/application/apps/ui_weatherstation.cpp
@@ -96,7 +96,7 @@ WeatherView::WeatherView(NavigationView& nav)
                   &button_clear_list,
                   &recent_entries_view});
 
-    baseband::run_image(portapack::spi_flash::image_tag_weather);
+    baseband::run_image(portapack::spi_flash::image_tag_subghzd);
 
     button_clear_list.on_select = [this](Button&) {
         recent.clear();
diff --git a/firmware/baseband/CMakeLists.txt b/firmware/baseband/CMakeLists.txt
index 784b8d6e6..45a9fc3f2 100644
--- a/firmware/baseband/CMakeLists.txt
+++ b/firmware/baseband/CMakeLists.txt
@@ -550,12 +550,12 @@ set(MODE_CPPSRC
 )
 DeclareTargets(PWFM wfm_audio)
 
-### Weather Stations
+### SubGhz Decoders + Weather Stations
 
 set(MODE_CPPSRC
-	proc_weather.cpp
+	proc_subghzd.cpp
 )
-DeclareTargets(PWTH weather)
+DeclareTargets(PWTH subghzd)
 
 
 ### Flash Utility
diff --git a/firmware/baseband/proc_weather.cpp b/firmware/baseband/proc_subghzd.cpp
similarity index 99%
rename from firmware/baseband/proc_weather.cpp
rename to firmware/baseband/proc_subghzd.cpp
index c673eb818..82d66f897 100644
--- a/firmware/baseband/proc_weather.cpp
+++ b/firmware/baseband/proc_subghzd.cpp
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "proc_weather.hpp"
+#include "proc_subghzd.hpp"
 #include "portapack_shared_memory.hpp"
 #include "event_m4.hpp"
 
diff --git a/firmware/baseband/proc_weather.hpp b/firmware/baseband/proc_subghzd.hpp
similarity index 89%
rename from firmware/baseband/proc_weather.hpp
rename to firmware/baseband/proc_subghzd.hpp
index 48ff8626c..5b44c4d7d 100644
--- a/firmware/baseband/proc_weather.hpp
+++ b/firmware/baseband/proc_subghzd.hpp
@@ -41,8 +41,8 @@ class WeatherProcessor : public BasebandProcessor {
     void on_message(const Message* const message) override;
 
    private:
-    static constexpr size_t baseband_fs = 4'000'000;   // it works, I think we need to write that master clock in the baseband_threat , even later we decimate it.
-    static constexpr uint32_t nsPerDecSamp = 250 * 8;  // 10 exp9/baseband_fs * 8
+    static constexpr size_t baseband_fs = 4'000'000;                           // it works, I think we need to write that master clock in the baseband_threat , even later we decimate it.
+    static constexpr uint32_t nsPerDecSamp = 1'000'000'000 / baseband_fs * 8;  // 10 exp9/baseband_fs * 8
 
     /* Array Buffer aux. used in decim0 and decim1 IQ c16 signed  data ; (decim0 defines the max length of the array) */
     std::array<complex16_t, 512> dst{};  // decim0 /4 ,  2048/4 = 512 complex I,Q
diff --git a/firmware/common/spi_image.hpp b/firmware/common/spi_image.hpp
index 2294abd93..c6ff51818 100644
--- a/firmware/common/spi_image.hpp
+++ b/firmware/common/spi_image.hpp
@@ -112,7 +112,7 @@ constexpr image_tag_t image_tag_tones{'P', 'T', 'O', 'N'};
 constexpr image_tag_t image_tag_flash_utility{'P', 'F', 'U', 'T'};
 constexpr image_tag_t image_tag_usb_sd{'P', 'U', 'S', 'B'};
 
-constexpr image_tag_t image_tag_weather{'P', 'W', 'T', 'H'};
+constexpr image_tag_t image_tag_subghzd{'P', 'W', 'T', 'H'};
 
 constexpr image_tag_t image_tag_noop{'P', 'N', 'O', 'P'};