diff --git a/applications/plugins/namechanger/namechanger.- b/applications/plugins/namechanger/namechanger.-
deleted file mode 100644
index 1519f5814..000000000
--- a/applications/plugins/namechanger/namechanger.-
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-typedef struct NameChanger NameChanger;
diff --git a/applications/plugins/namechanger/scenes/namechanger_scene_revert_failed.- b/applications/plugins/namechanger/scenes/namechanger_scene_revert_failed.-
deleted file mode 100644
index 636eb8034..000000000
--- a/applications/plugins/namechanger/scenes/namechanger_scene_revert_failed.-
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "../namechanger_i.h"
-#include <dolphin/dolphin.h>
-
-static void namechanger_scene_revert_failed_popup_callback(void* context) {
-    NameChanger* namechanger = context;
-    view_dispatcher_send_custom_event(namechanger->view_dispatcher, NameChangerCustomEventBack);
-}
-
-void namechanger_scene_revert_failed_on_enter(void* context) {
-    NameChanger* namechanger = context;
-    Popup* popup = namechanger->popup;
-
-    popup_set_icon(popup, 5, 10, &I_Cry_dolph_55x52);
-    popup_set_header(popup, "Revert", 80, 20, AlignLeft, AlignTop);
-    popup_set_text(popup, "Failed.", 80, 35, AlignLeft, AlignTop);
-
-    popup_set_callback(popup, namechanger_scene_revert_failed_popup_callback);
-    popup_set_context(popup, namechanger);
-    popup_set_timeout(popup, 5000);
-    popup_enable_timeout(popup);
-
-    view_dispatcher_switch_to_view(namechanger->view_dispatcher, NameChangerViewPopup);
-}
-
-bool namechanger_scene_revert_failed_on_event(void* context, SceneManagerEvent event) {
-    NameChanger* namechanger = context;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        consumed = true;
-        if(event.event == NameChangerCustomEventBack) {
-            scene_manager_search_and_switch_to_previous_scene(
-                namechanger->scene_manager, NameChangerSceneStart);
-        }
-    }
-
-    return consumed;
-}
-
-void namechanger_scene_revert_failed_on_exit(void* context) {
-    NameChanger* namechanger = context;
-    Popup* popup = namechanger->popup;
-
-    popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop);
-    popup_set_icon(popup, 0, 0, NULL);
-
-    popup_disable_timeout(popup);
-    popup_set_context(popup, NULL);
-    popup_set_callback(popup, NULL);
-}
diff --git a/applications/plugins/namechanger/scenes/namechanger_scene_save_failed.- b/applications/plugins/namechanger/scenes/namechanger_scene_save_failed.-
deleted file mode 100644
index 9c9ee1bc7..000000000
--- a/applications/plugins/namechanger/scenes/namechanger_scene_save_failed.-
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "../namechanger_i.h"
-#include <dolphin/dolphin.h>
-
-static void namechanger_scene_save_failed_popup_callback(void* context) {
-    NameChanger* namechanger = context;
-    view_dispatcher_send_custom_event(namechanger->view_dispatcher, NameChangerCustomEventBack);
-}
-
-void namechanger_scene_save_failed_on_enter(void* context) {
-    NameChanger* namechanger = context;
-    Popup* popup = namechanger->popup;
-
-    popup_set_icon(popup, 5, 10, &I_Cry_dolph_55x52);
-    popup_set_header(popup, "Save", 80, 20, AlignLeft, AlignTop);
-    popup_set_text(popup, "Failed.", 80, 35, AlignLeft, AlignTop);
-
-    popup_set_callback(popup, namechanger_scene_save_failed_popup_callback);
-    popup_set_context(popup, namechanger);
-    popup_set_timeout(popup, 5000);
-    popup_enable_timeout(popup);
-
-    view_dispatcher_switch_to_view(namechanger->view_dispatcher, NameChangerViewPopup);
-}
-
-bool namechanger_scene_save_failed_on_event(void* context, SceneManagerEvent event) {
-    NameChanger* namechanger = context;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        consumed = true;
-        if(event.event == NameChangerCustomEventBack) {
-            scene_manager_search_and_switch_to_previous_scene(
-                namechanger->scene_manager, NameChangerSceneStart);
-        }
-    }
-
-    return consumed;
-}
-
-void namechanger_scene_save_failed_on_exit(void* context) {
-    NameChanger* namechanger = context;
-    Popup* popup = namechanger->popup;
-
-    popup_set_text(popup, NULL, 0, 0, AlignCenter, AlignTop);
-    popup_set_icon(popup, 0, 0, NULL);
-
-    popup_disable_timeout(popup);
-    popup_set_context(popup, NULL);
-    popup_set_callback(popup, NULL);
-}