diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 994d08745ec..dfdbeaa8e53 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -700,6 +700,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)
@@ -731,6 +732,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 bb00b0e1f2a..29ca4003c69 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -451,7 +451,7 @@ It is caused by the unexpected circumstances after awakening in cryo (if cloned
 				</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 b1260a98b7e..0891e201871 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -31,6 +31,7 @@
 
 	real_name = pickedName
 	name = real_name
+	original_name = real_name
 	anchored = 1
 	canmove = 0
 	loc = loc
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 21f8eeefff7..25b9144fafe 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile
 	desc = "A classic revolver. Uses 357 ammo"
-	name = "\improper Revolver"
+	name = "revolver"
 	icon_state = "revolver"
 	caliber = "357"
 	origin_tech = "combat=2;materials=2"
diff --git a/icons/mecha/ripley_construct.dmi b/icons/mecha/ripley_construct.dmi
deleted file mode 100644
index 7aad29c6149..00000000000
Binary files a/icons/mecha/ripley_construct.dmi and /dev/null differ