diff --git a/applications/lfrfid/helpers/decoder-emmarine.cpp b/applications/lfrfid/helpers/decoder-emmarin.cpp
similarity index 84%
rename from applications/lfrfid/helpers/decoder-emmarine.cpp
rename to applications/lfrfid/helpers/decoder-emmarin.cpp
index 5ca57e27..3954e22e 100644
--- a/applications/lfrfid/helpers/decoder-emmarine.cpp
+++ b/applications/lfrfid/helpers/decoder-emmarin.cpp
@@ -1,5 +1,5 @@
-#include "emmarine.h"
-#include "decoder-emmarine.h"
+#include "emmarin.h"
+#include "decoder-emmarin.h"
 #include <furi.h>
 #include <furi-hal.h>
 
@@ -13,19 +13,19 @@ constexpr uint32_t short_time_high = short_time + jitter_time;
 constexpr uint32_t long_time_low = long_time - jitter_time;
 constexpr uint32_t long_time_high = long_time + jitter_time;
 
-void DecoderEMMarine::reset_state() {
+void DecoderEMMarin::reset_state() {
     ready = false;
     readed_data = 0;
     manchester_advance(
         manchester_saved_state, ManchesterEventReset, &manchester_saved_state, nullptr);
 }
 
-bool DecoderEMMarine::read(uint8_t* data, uint8_t data_size) {
+bool DecoderEMMarin::read(uint8_t* data, uint8_t data_size) {
     bool result = false;
 
     if(ready) {
         result = true;
-        em_marine.decode(
+        em_marin.decode(
             reinterpret_cast<const uint8_t*>(&readed_data), sizeof(uint64_t), data, data_size);
         ready = false;
     }
@@ -33,7 +33,7 @@ bool DecoderEMMarine::read(uint8_t* data, uint8_t data_size) {
     return result;
 }
 
-void DecoderEMMarine::process_front(bool polarity, uint32_t time) {
+void DecoderEMMarin::process_front(bool polarity, uint32_t time) {
     if(ready) return;
     if(time < short_time_low) return;
 
@@ -61,12 +61,12 @@ void DecoderEMMarine::process_front(bool polarity, uint32_t time) {
         if(data_ok) {
             readed_data = (readed_data << 1) | data;
 
-            ready = em_marine.can_be_decoded(
+            ready = em_marin.can_be_decoded(
                 reinterpret_cast<const uint8_t*>(&readed_data), sizeof(uint64_t));
         }
     }
 }
 
-DecoderEMMarine::DecoderEMMarine() {
+DecoderEMMarin::DecoderEMMarin() {
     reset_state();
 }
diff --git a/applications/lfrfid/helpers/decoder-emmarine.h b/applications/lfrfid/helpers/decoder-emmarin.h
similarity index 82%
rename from applications/lfrfid/helpers/decoder-emmarine.h
rename to applications/lfrfid/helpers/decoder-emmarin.h
index 014e3f3e..dd81a944 100644
--- a/applications/lfrfid/helpers/decoder-emmarine.h
+++ b/applications/lfrfid/helpers/decoder-emmarin.h
@@ -3,12 +3,12 @@
 #include <atomic>
 #include "manchester-decoder.h"
 #include "protocols/protocol-emmarin.h"
-class DecoderEMMarine {
+class DecoderEMMarin {
 public:
     bool read(uint8_t* data, uint8_t data_size);
     void process_front(bool polarity, uint32_t time);
 
-    DecoderEMMarine();
+    DecoderEMMarin();
 
 private:
     void reset_state();
@@ -17,5 +17,5 @@ private:
     std::atomic<bool> ready;
 
     ManchesterState manchester_saved_state;
-    ProtocolEMMarin em_marine;
+    ProtocolEMMarin em_marin;
 };
diff --git a/applications/lfrfid/helpers/emmarine.h b/applications/lfrfid/helpers/emmarin.h
similarity index 100%
rename from applications/lfrfid/helpers/emmarine.h
rename to applications/lfrfid/helpers/emmarin.h
diff --git a/applications/lfrfid/helpers/encoder-emmarine.cpp b/applications/lfrfid/helpers/encoder-emmarin.cpp
similarity index 95%
rename from applications/lfrfid/helpers/encoder-emmarine.cpp
rename to applications/lfrfid/helpers/encoder-emmarin.cpp
index 44eea5bb..f61c9e40 100644
--- a/applications/lfrfid/helpers/encoder-emmarine.cpp
+++ b/applications/lfrfid/helpers/encoder-emmarin.cpp
@@ -1,4 +1,4 @@
-#include "encoder-emmarine.h"
+#include "encoder-emmarin.h"
 #include "protocols/protocol-emmarin.h"
 #include <furi.h>
 
diff --git a/applications/lfrfid/helpers/encoder-emmarine.h b/applications/lfrfid/helpers/encoder-emmarin.h
similarity index 100%
rename from applications/lfrfid/helpers/encoder-emmarine.h
rename to applications/lfrfid/helpers/encoder-emmarin.h
diff --git a/applications/lfrfid/helpers/key-info.cpp b/applications/lfrfid/helpers/key-info.cpp
index cd04e1e1..fe0e31af 100644
--- a/applications/lfrfid/helpers/key-info.cpp
+++ b/applications/lfrfid/helpers/key-info.cpp
@@ -20,7 +20,7 @@ const char* lfrfid_key_get_type_string(LfrfidKeyType type) {
 const char* lfrfid_key_get_manufacturer_string(LfrfidKeyType type) {
     switch(type) {
     case LfrfidKeyType::KeyEM4100:
-        return "Em-Marine";
+        return "EM-Marin";
         break;
     case LfrfidKeyType::KeyH10301:
         return "HID";
diff --git a/applications/lfrfid/helpers/rfid-reader.h b/applications/lfrfid/helpers/rfid-reader.h
index 004cad89..e62c4196 100644
--- a/applications/lfrfid/helpers/rfid-reader.h
+++ b/applications/lfrfid/helpers/rfid-reader.h
@@ -1,7 +1,7 @@
 #pragma once
 //#include "decoder-analyzer.h"
 #include "decoder-gpio-out.h"
-#include "decoder-emmarine.h"
+#include "decoder-emmarin.h"
 #include "decoder-hid26.h"
 #include "decoder-indala.h"
 #include "key-info.h"
@@ -31,7 +31,7 @@ private:
 #ifdef RFID_GPIO_DEBUG
     DecoderGpioOut decoder_gpio_out;
 #endif
-    DecoderEMMarine decoder_em;
+    DecoderEMMarin decoder_em;
     DecoderHID26 decoder_hid26;
     DecoderIndala decoder_indala;
 
diff --git a/applications/lfrfid/helpers/rfid-timer-emulator.h b/applications/lfrfid/helpers/rfid-timer-emulator.h
index d99ce982..b05f5434 100644
--- a/applications/lfrfid/helpers/rfid-timer-emulator.h
+++ b/applications/lfrfid/helpers/rfid-timer-emulator.h
@@ -2,7 +2,7 @@
 #include <furi-hal.h>
 #include "key-info.h"
 #include "encoder-generic.h"
-#include "encoder-emmarine.h"
+#include "encoder-emmarin.h"
 #include "encoder-hid-h10301.h"
 #include "encoder-indala-40134.h"
 #include "pulse-joiner.h"