diff --git a/ReadMe.md b/ReadMe.md
index 2036efcd3..43bdd744a 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -212,8 +212,6 @@ $ ./fbt plugin_dist
 - [Ceasar Cipher (By panki27)](https://github.com/panki27/caesar-cipher)
 - [Clock/Stopwatch (By CompaqDisc, Stopwatch & Sound Alert By RogueMaster)](https://gist.github.com/CompaqDisc/4e329c501bd03c1e801849b81f48ea61) [12/24HR (By non-bin)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/254) [Refactoring (By GMMan)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/256)
 - [DAP Link (By DrZlo13)[OFW]](https://github.com/flipperdevices/flipperzero-firmware/pull/1897)
-- [DSTIKE Deauther (By SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module/tree/FlipperZero-Module-v2/FlipperZeroModule/FlipperZero-ESP8266-Deauth-App) `Req: ESP8266`
-- [Deauther PWNDTOOLS V2.6.0 (By HEX0DAYS)](https://github.com/HEX0DAYS/FlipperZero-PWNDTOOLS) `Req: ESP8266` [Original](https://github.com/SpacehuhnTech/esp8266_deauther)
 - [Dolphin Backup (By nminaylov)[OFW]](https://github.com/flipperdevices/flipperzero-firmware/pull/1384) Modified by RogueMaster
 - [Dolphin Restorer (By nminaylov)](https://github.com/flipperdevices/flipperzero-firmware/pull/1384) Cloned by RogueMaster
 - [DTMF Dolphin (By litui)](https://github.com/litui/dtmf_dolphin)
@@ -246,7 +244,8 @@ $ ./fbt plugin_dist
 - [UPC-A Generator (By McAzzaMan)](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator)
 - [USB Keyboard (By huuck)](https://github.com/huuck/FlipperZeroUSBKeyboard)
 - [WAV Player (By DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player) Updated by Atmanos & RogueMaster To Work
-- [WiFi (Deauther) (By Timmotools)](https://github.com/Timmotools/flipperzero_esp8266_deautherv2) `Req: ESP8266`
+- [WiFi (Deauther) V1 (By SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module/tree/FlipperZero-Module-v2/FlipperZeroModule/FlipperZero-ESP8266-Deauth-App) `Req: ESP8266`  [Original](https://github.com/SpacehuhnTech/esp8266_deauther)
+- [WiFi (Deauther) V2.6.0 (By HEX0DAYS)](https://github.com/HEX0DAYS/FlipperZero-PWNDTOOLS) [WiFi (Deauther) V2 (By Timmotools)](https://github.com/Timmotools/flipperzero_esp8266_deautherv2) `Req: ESP8266`
 - [WiFi (Marauder) (By 0xchocolate)](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion) `Req: ESP32 WITH MARAUDER FLASHED`
 - [WiFi Scanner v.0.4 (By SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module-ESP8266) `Req: ESP8266 or ESP32`
 </details>
diff --git a/applications/plugins/esp8266_deauth/application.fam b/applications/plugins/esp8266_deauth/application.fam
deleted file mode 100644
index 6ce0f4435..000000000
--- a/applications/plugins/esp8266_deauth/application.fam
+++ /dev/null
@@ -1,12 +0,0 @@
-App(
-    appid="ESP8266_Deauther",
-    name="[ESP8266] Deauther",
-    apptype=FlipperAppType.EXTERNAL,
-    entry_point="esp8266_deauth_app",
-    cdefines=["APP_ESP8266_deauth"],
-    requires=["gui"],
-    stack_size=2 * 1024,
-    order=20,
-    fap_icon="wifi_10px.png",
-    fap_category="GPIO",
-)
diff --git a/applications/plugins/esp8266_deauth/FlipperZeroWiFiDeauthModuleDefines.h b/applications/plugins/wifi_deauther/FlipperZeroWiFiDeauthModuleDefines.h
similarity index 100%
rename from applications/plugins/esp8266_deauth/FlipperZeroWiFiDeauthModuleDefines.h
rename to applications/plugins/wifi_deauther/FlipperZeroWiFiDeauthModuleDefines.h
diff --git a/applications/plugins/wifi_deauther/application.fam b/applications/plugins/wifi_deauther/application.fam
index 80724181e..c75c20030 100644
--- a/applications/plugins/wifi_deauther/application.fam
+++ b/applications/plugins/wifi_deauther/application.fam
@@ -1,12 +1,12 @@
 App(
-    appid="ESP8266_Wifi_Deauther_V2",
-    name="[ESP8266] WiFi (Deauther) V2",
+    appid="ESP8266_Wifi_Deauther",
+    name="[ESP8266] WiFi (Deauther)",
     apptype=FlipperAppType.EXTERNAL,
-    entry_point="wifi_deauther_app",
-    cdefines=["APP_WIFI_deauther"],
+    entry_point="esp8266_deauth_app",
+    cdefines=["APP_ESP8266_deauth"],
     requires=["gui"],
-    stack_size=1 * 1024,
-    order=30,
+    stack_size=2 * 1024,
+    order=20,
     fap_icon="wifi_10px.png",
     fap_category="GPIO",
 )
diff --git a/applications/plugins/esp8266_deauth/esp8266_deauth.c b/applications/plugins/wifi_deauther/esp8266_deauth.c
similarity index 100%
rename from applications/plugins/esp8266_deauth/esp8266_deauth.c
rename to applications/plugins/wifi_deauther/esp8266_deauth.c
diff --git a/applications/plugins/wifi_deauther/LICENSE b/applications/plugins/wifi_deauther_v2/LICENSE
similarity index 100%
rename from applications/plugins/wifi_deauther/LICENSE
rename to applications/plugins/wifi_deauther_v2/LICENSE
diff --git a/applications/plugins/wifi_deauther/README.md b/applications/plugins/wifi_deauther_v2/README.md
similarity index 100%
rename from applications/plugins/wifi_deauther/README.md
rename to applications/plugins/wifi_deauther_v2/README.md
diff --git a/applications/plugins/wifi_deauther_v2/application.fam b/applications/plugins/wifi_deauther_v2/application.fam
new file mode 100644
index 000000000..80724181e
--- /dev/null
+++ b/applications/plugins/wifi_deauther_v2/application.fam
@@ -0,0 +1,12 @@
+App(
+    appid="ESP8266_Wifi_Deauther_V2",
+    name="[ESP8266] WiFi (Deauther) V2",
+    apptype=FlipperAppType.EXTERNAL,
+    entry_point="wifi_deauther_app",
+    cdefines=["APP_WIFI_deauther"],
+    requires=["gui"],
+    stack_size=1 * 1024,
+    order=30,
+    fap_icon="wifi_10px.png",
+    fap_category="GPIO",
+)
diff --git a/applications/plugins/wifi_deauther/scenes/wifi_deauther_scene.c b/applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene.c
similarity index 100%
rename from applications/plugins/wifi_deauther/scenes/wifi_deauther_scene.c
rename to applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene.c
diff --git a/applications/plugins/wifi_deauther/scenes/wifi_deauther_scene.h b/applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene.h
similarity index 100%
rename from applications/plugins/wifi_deauther/scenes/wifi_deauther_scene.h
rename to applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene.h
diff --git a/applications/plugins/wifi_deauther/scenes/wifi_deauther_scene_config.h b/applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_config.h
similarity index 100%
rename from applications/plugins/wifi_deauther/scenes/wifi_deauther_scene_config.h
rename to applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_config.h
diff --git a/applications/plugins/wifi_deauther/scenes/wifi_deauther_scene_console_output.c b/applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_console_output.c
similarity index 100%
rename from applications/plugins/wifi_deauther/scenes/wifi_deauther_scene_console_output.c
rename to applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_console_output.c
diff --git a/applications/plugins/wifi_deauther/scenes/wifi_deauther_scene_start.c b/applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_start.c
similarity index 100%
rename from applications/plugins/wifi_deauther/scenes/wifi_deauther_scene_start.c
rename to applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_start.c
diff --git a/applications/plugins/wifi_deauther/scenes/wifi_deauther_scene_text_input.c b/applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_text_input.c
similarity index 100%
rename from applications/plugins/wifi_deauther/scenes/wifi_deauther_scene_text_input.c
rename to applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_text_input.c
diff --git a/applications/plugins/esp8266_deauth/wifi_10px.png b/applications/plugins/wifi_deauther_v2/wifi_10px.png
similarity index 100%
rename from applications/plugins/esp8266_deauth/wifi_10px.png
rename to applications/plugins/wifi_deauther_v2/wifi_10px.png
diff --git a/applications/plugins/wifi_deauther/wifi_deauther_app.c b/applications/plugins/wifi_deauther_v2/wifi_deauther_app.c
similarity index 100%
rename from applications/plugins/wifi_deauther/wifi_deauther_app.c
rename to applications/plugins/wifi_deauther_v2/wifi_deauther_app.c
diff --git a/applications/plugins/wifi_deauther/wifi_deauther_app.h b/applications/plugins/wifi_deauther_v2/wifi_deauther_app.h
similarity index 100%
rename from applications/plugins/wifi_deauther/wifi_deauther_app.h
rename to applications/plugins/wifi_deauther_v2/wifi_deauther_app.h
diff --git a/applications/plugins/wifi_deauther/wifi_deauther_app_i.h b/applications/plugins/wifi_deauther_v2/wifi_deauther_app_i.h
similarity index 100%
rename from applications/plugins/wifi_deauther/wifi_deauther_app_i.h
rename to applications/plugins/wifi_deauther_v2/wifi_deauther_app_i.h
diff --git a/applications/plugins/wifi_deauther/wifi_deauther_custom_event.h b/applications/plugins/wifi_deauther_v2/wifi_deauther_custom_event.h
similarity index 100%
rename from applications/plugins/wifi_deauther/wifi_deauther_custom_event.h
rename to applications/plugins/wifi_deauther_v2/wifi_deauther_custom_event.h
diff --git a/applications/plugins/wifi_deauther/wifi_deauther_uart.c b/applications/plugins/wifi_deauther_v2/wifi_deauther_uart.c
similarity index 100%
rename from applications/plugins/wifi_deauther/wifi_deauther_uart.c
rename to applications/plugins/wifi_deauther_v2/wifi_deauther_uart.c
diff --git a/applications/plugins/wifi_deauther/wifi_deauther_uart.h b/applications/plugins/wifi_deauther_v2/wifi_deauther_uart.h
similarity index 100%
rename from applications/plugins/wifi_deauther/wifi_deauther_uart.h
rename to applications/plugins/wifi_deauther_v2/wifi_deauther_uart.h