diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 42a1357d85..b72d99ed99 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -144,8 +144,9 @@
 	created_name = t
 	update_state()
 
-/obj/structure/door_assembly/attack_robot(mob/living/user)
-	if(Adjacent(user))
+/obj/structure/door_assembly/attack_robot(mob/living/silicon/robot/user)
+	if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/weapon/robot_module/engineering/general)) \
+	|| istype(user.module,/obj/item/weapon/robot_module/drone))) //Only dron (and engiborg) needs this.
 		rename_door(user)
 
 /obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 67b884fa06..2d9b52acd6 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -77,8 +77,9 @@ obj/structure/windoor_assembly/Destroy()
 	created_name = t
 	update_state()
 
-/obj/structure/windoor_assembly/attack_robot(mob/living/user)
-	if(Adjacent(user))
+/obj/structure/windoor_assembly/attack_robot(mob/living/silicon/robot/user)
+	if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/weapon/robot_module/engineering/general)) \
+	|| istype(user.module,/obj/item/weapon/robot_module/drone))) //Only dron (and engiborg) needs this.
 		rename_door(user)
 
 /obj/structure/windoor_assembly/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/html/changelogs/Nerezza - doortweaks.yml b/html/changelogs/Nerezza - doortweaks.yml
index edfcfb631a..d3d49cc4e0 100644
--- a/html/changelogs/Nerezza - doortweaks.yml	
+++ b/html/changelogs/Nerezza - doortweaks.yml	
@@ -34,5 +34,5 @@ delete-after: True
 # Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
 changes: 
   - rscadd: "Windoors can now be disassembled. Apply crowbar when open."
-  - rscadd: "Borgs can name doors and windoors now. Click an adjacent assembly with no modules active."
+  - rscadd: "Engiborgs and drons can name door and windoor assemblines now. Click an adjacent assembly with no modules active."
   - bugfix: "Windoors now know how to name themselves. In addition, unnamed windoors now spawn with their default name instead of null."