diff --git a/applications/main/nfc/helpers/protocol_support/type_4_tag/type_4_tag.c b/applications/main/nfc/helpers/protocol_support/type_4_tag/type_4_tag.c
index 3b1fc91f6..3fa6b2593 100644
--- a/applications/main/nfc/helpers/protocol_support/type_4_tag/type_4_tag.c
+++ b/applications/main/nfc/helpers/protocol_support/type_4_tag/type_4_tag.c
@@ -184,7 +184,7 @@ static NfcCommand
             nfc_device_get_data(instance->nfc_device, NfcProtocolType4Tag);
         furi_string_reset(instance->text_box_store);
         view_dispatcher_send_custom_event(instance->view_dispatcher, NfcCustomEventCardDetected);
-    } else if(type_4_tag_event->type == Type4TagPollerEventTypeWriteFail) {
+    } else if(type_4_tag_event->type == Type4TagPollerEventTypeWriteFailed) {
         const char* error_str = type_4_tag_event->data->error == Type4TagErrorCardLocked ?
                                     "Card does not\nallow writing\nnew data" :
                                     "Failed to\nwrite new data";
diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
index 0291d2df9..639f3f1db 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
@@ -4,7 +4,7 @@
 
 #define TAG "Type4TagPoller"
 
-typedef NfcCommand (*Type4TagPollerReadHandler)(Type4TagPoller* instance);
+typedef NfcCommand (*Type4TagPollerStateHandler)(Type4TagPoller* instance);
 
 static const Type4TagData* type_4_tag_poller_get_data(Type4TagPoller* instance) {
     furi_assert(instance);
@@ -191,7 +191,7 @@ static NfcCommand type_4_tag_poller_handler_failed(Type4TagPoller* instance) {
     iso14443_4a_poller_halt(instance->iso14443_4a_poller);
     instance->type_4_tag_event.type = instance->mode == Type4TagPollerModeRead ?
                                           Type4TagPollerEventTypeReadFailed :
-                                          Type4TagPollerEventTypeWriteFail;
+                                          Type4TagPollerEventTypeWriteFailed;
     instance->type_4_tag_event.data->error = instance->error;
     NfcCommand command = instance->callback(instance->general_event, instance->context);
     instance->state = Type4TagPollerStateIdle;
@@ -208,7 +208,7 @@ static NfcCommand type_4_tag_poller_handler_success(Type4TagPoller* instance) {
     return command;
 }
 
-static const Type4TagPollerReadHandler type_4_tag_poller_read_handler[Type4TagPollerStateNum] = {
+static const Type4TagPollerStateHandler type_4_tag_poller_read_handler[Type4TagPollerStateNum] = {
     [Type4TagPollerStateIdle] = type_4_tag_poller_handler_idle,
     [Type4TagPollerStateRequestMode] = type_4_tag_poller_handler_request_mode,
     [Type4TagPollerStateDetectPlatform] = type_4_tag_poller_handler_detect_platform,
diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.h b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.h
index 5ac4fd0f2..8263e3790 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.h
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.h
@@ -19,7 +19,7 @@ typedef enum {
     Type4TagPollerEventTypeReadSuccess, /**< Card was read successfully. */
     Type4TagPollerEventTypeReadFailed, /**< Poller failed to read card. */
     Type4TagPollerEventTypeWriteSuccess, /**< Poller wrote card successfully. */
-    Type4TagPollerEventTypeWriteFail, /**< Poller failed to write card. */
+    Type4TagPollerEventTypeWriteFailed, /**< Poller failed to write card. */
 } Type4TagPollerEventType;
 
 /**