diff --git a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml
index c7cfa57a8d7..23c763820a1 100644
--- a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml
+++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml
@@ -201,7 +201,7 @@
   id: ADTDroneAntagMiner
   parent: ADTDroneAntagBase
   name: drone miner
-  suffix: Miner
+  suffix: Drone Antag
   description: Вам, вероятно, не стоит стоять рядом с ним, чтобы проверить, включен ли он.
   components:
   - type: Body
@@ -212,7 +212,7 @@
     prototypes: [ ADTAntagDroneGearMiner ]
   - type: InventorySlots
   - type: NameIdentifier
-    group: ADTDroneAntagMiner
+    group: ADTNameDroneAntagMiner
   - type: MovementSpeedModifier
     baseWalkSpeed : 5
     baseSprintSpeed : 5
@@ -359,9 +359,9 @@
 - type: entity
   id: ADTDroneAntagEngineer
   parent: ADTDroneAntagBase
-  name: drone soldier
+  name: drone engineer
+  suffix: Drone Antag
   description: Вам, вероятно, не стоит стоять рядом с ним, чтобы проверить, включен ли он.
-  suffix: Engineer
   components:
   - type: Body
     prototype: ADTDroneAntagBodyEngineer
@@ -371,7 +371,7 @@
     prototypes: [ ADTAntagDroneGearEngineer ]
   - type: InventorySlots
   - type: NameIdentifier
-    group: ADTDroneAntagSoldier
+    group: ADTNameDroneAntagEngineer
   - type: MovementSpeedModifier
     baseWalkSpeed : 5
     baseSprintSpeed : 5
@@ -519,9 +519,9 @@
 - type: entity
   id: ADTDroneAntagCharger
   parent: ADTDroneAntagBase
-  name: drone soldier
+  name: drone charger
+  suffix: Drone Antag
   description: Вам, вероятно, не стоит стоять рядом с ним, чтобы проверить, включен ли он.
-  suffix: Charger
   components:
   - type: Body
     prototype: ADTDroneAntagBodyCharger
@@ -531,7 +531,7 @@
     prototypes: [ ADTAntagDroneGearCharger ]
   - type: InventorySlots
   - type: NameIdentifier
-    group: ADTDroneAntagSoldier
+    group: ADTNameDroneAntagCharger
   - type: MovementSpeedModifier
     baseWalkSpeed : 5
     baseSprintSpeed : 5
@@ -687,15 +687,22 @@
 
 
 # - type: nameIdentifierGroup
-#   id: ADTDroneAntagMiner
+#   id: ADTNameDroneAntagMiner
 #   prefix: drone miner SD
 #   fullName: true
 #   minValue: 100
 #   maxValue: 999
 
 # - type: nameIdentifierGroup
-#   id: ADTDroneAntagSoldier
-#   prefix: drone soldier SD
+#   id: ADTNameDroneAntagEngineer
+#   prefix: drone engineer SD
+#   fullName: true
+#   minValue: 100
+#   maxValue: 999
+
+# - type: nameIdentifierGroup
+#   id: ADTNameDroneAntagCharger
+#   prefix: drone charger SD
 #   fullName: true
 #   minValue: 100
 #   maxValue: 999
@@ -705,11 +712,11 @@
 
 
 # - type: nameIdentifierGroup
-#   id: ADTIPCAntag
-#   prefix: BF
+#   id: ADTNameIPCAntag
+#   prefix: drone soldier BF
 #   fullName: true
-#   minValue: 10000
-#   maxValue: 99999
+#   minValue: 100
+#   maxValue: 999
 
 
 # DRONE RADIO CHANNEL
diff --git a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml
index f8bf1fda5a1..e6a2932bafa 100644
--- a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml
+++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml
@@ -344,7 +344,7 @@
   id: ADTDroneAntagIPC
   parent: ADTipcdronebase2
   name: drone soldier
-  suffix: Antag Drone IPC
+  suffix: Drone Antag
   description: Вам, вероятно, не стоит стоять рядом с ним, чтобы проверить, включен ли он.
   components:
   - type: WiresPanel  # + Тех панель
@@ -441,7 +441,7 @@
     factions:
       - DroneAntag
   - type: NameIdentifier
-    group: ADTDroneAntagSoldier
+    group: ADTNameIPCAntag
   - type: UnpoweredFlashlight
   - type: PointLight
     enabled: false
@@ -599,35 +599,18 @@
     Caustic: 0.3
 
 
-# DRONE NAME IDENTIFIER
 
+# IPC DRONE NAME IDENTIFIER
 
-# - type: nameIdentifierGroup
-#   id: ADTDroneAntagMiner
-#   prefix: drone miner SD
-#   fullName: true
-#   minValue: 100
-#   maxValue: 999
 
 # - type: nameIdentifierGroup
-#   id: ADTDroneAntagSoldier
-#   prefix: drone soldier SD
+#   id: ADTNameIPCAntag
+#   prefix: drone soldier BF
 #   fullName: true
 #   minValue: 100
 #   maxValue: 999
 
 
-# IPC DRONE NAME IDENTIFIER
-
-
-# - type: nameIdentifierGroup
-#   id: ADTIPCAntag
-#   prefix: BF
-#   fullName: true
-#   minValue: 10000
-#   maxValue: 99999
-
-
 # DRONE RADIO CHANNEL
 
 
diff --git a/Resources/Prototypes/name_identifier_groups.yml b/Resources/Prototypes/name_identifier_groups.yml
index 74376ac6524..33bcc86c951 100644
--- a/Resources/Prototypes/name_identifier_groups.yml
+++ b/Resources/Prototypes/name_identifier_groups.yml
@@ -19,22 +19,29 @@
   maxValue: 99999
 
 - type: nameIdentifierGroup
-  id: ADTDroneAntagMiner
+  id: ADTNameDroneAntagMiner
   prefix: drone miner SD
   fullName: true
   minValue: 100
   maxValue: 999
 
 - type: nameIdentifierGroup
-  id: ADTDroneAntagSoldier
-  prefix: drone soldier SD
+  id: ADTNameDroneAntagEngineer
+  prefix: drone engineer SD
   fullName: true
   minValue: 100
   maxValue: 999
 
 - type: nameIdentifierGroup
-  id: ADTIPCAntag
-  prefix: BF
+  id: ADTNameDroneAntagCharger
+  prefix: drone charger SD
+  fullName: true
+  minValue: 100
+  maxValue: 999
+
+- type: nameIdentifierGroup
+  id: ADTNameIPCAntag
+  prefix: drone soldier BF
   fullName: true
   minValue: 100
   maxValue: 999