diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 70284972d79..1991a70ee94 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -689,6 +689,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		newname = dd_replacetext(newname, ">", "'")
 		M.real_name = newname
 		M.name = newname
+		M.original_name = newname
 
 /proc/clname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea
 	var/randomname = pick(clown_names)
@@ -720,6 +721,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		newname = dd_replacetext(newname, ">", "'")
 		M.real_name = newname
 		M.name = newname
+		M.original_name = newname
 
 	for (var/obj/item/device/pda/pda in M.contents)
 		if (pda.owner == oldname)
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 41a4a1885ff..e07e71a1eba 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -452,7 +452,7 @@
 				</ul>
 
 				<h3>Security Cyborg</h3>
-				The Security Cyborg module is equipped with effective secuity measures used to apprehend and arrest criminals without harming them a bit.<br>A Security Cyborg comes with:
+				The Security Cyborg module is equipped with effective security measures used to apprehend and arrest criminals without harming them a bit.<br>A Security Cyborg comes with:
 				<ul>
 				  <li>Stun Baton</li>
 				  <li>Handcuffs</li>
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 90bd7568d71..585e4ce687a 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -11,6 +11,7 @@
 
 	real_name = pickedName
 	name = real_name
+	original_name = real_name
 	anchored = 1
 	canmove = 0
 	loc = loc
diff --git a/code/modules/mob/simple_animal/constructs.dm b/code/modules/mob/simple_animal/constructs.dm
index bf7e50f8f8e..43cfeb57284 100644
--- a/code/modules/mob/simple_animal/constructs.dm
+++ b/code/modules/mob/simple_animal/constructs.dm
@@ -4,6 +4,7 @@
 /mob/living/simple_animal/constructarmoured
 	name = "Juggernaut"
 	real_name = "Juggernaut"
+	original_name = "Juggernaut"
 	desc = "A possessed suit of armour driven by the will of the restless dead"
 	icon = 'mob.dmi'
 	icon_state = "armour"
@@ -143,6 +144,7 @@
 /mob/living/simple_animal/constructwraith
 	name = "Wraith"
 	real_name = "Wraith"
+	original_name = "Wraith"
 	desc = "A wicked bladed shell contraption piloted by a bound spirit"
 	icon = 'mob.dmi'
 	icon_state = "floating"
@@ -272,6 +274,7 @@
 /mob/living/simple_animal/constructbuilder
 	name = "Artificer"
 	real_name = "Artificer"
+	original_name = "Artificer"
 	desc = "A bulbous construct dedicated to building and maintaining The Cult of Nar-Sie's armies"
 	icon = 'mob.dmi'
 	icon_state = "artificer"