diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index c53296c0d1..adaaa5b963 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -187,17 +187,17 @@ its easier to just keep the beam vertical.
 
 
 //All atoms
-/atom/proc/examine(mob/user, var/distance = -1, var/sufix = "")
+/atom/proc/examine(mob/user, var/distance = -1, var/infix = "", var/suffix = "")
 	//This reformat names to get a/an properly working on item descriptions when they are bloody
-	var/f_name = "\a [src]."
+	var/f_name = "\a [src][infix]."
 	if(src.blood_DNA && !istype(src, /obj/effect/decal))
 		if(gender == PLURAL)
 			f_name = "some "
 		else
 			f_name = "a "
-		f_name += "<span class='danger'>blood-stained</span> [name]!"
+		f_name += "<span class='danger'>blood-stained</span> [name][infix]!"
 
-	user << "\icon[src] That's [f_name] [sufix]"
+	user << "\icon[src] That's [f_name] [suffix]"
 
 	if(desc)
 		user << desc
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 149890aa7e..978598eecc 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -117,8 +117,8 @@
 			size = "huge"
 		else
 	//if ((CLUMSY in usr.mutations) && prob(50)) t = "funny-looking"
-	var/custom_sufix = "It is a [size] item."
-	return ..(user, distance, custom_sufix)
+	var/custom_suffix = "It is a [size] item."
+	return ..(user, distance, suffix = custom_suffix)
 
 /obj/item/attack_hand(mob/user as mob)
 	if (!user) return
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index 8641476deb..20820369f5 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -1,5 +1,6 @@
 /mob/living/silicon/robot/examine(mob/user)
-	..(user)
+	var/custom_infix = custom_name ? ", [modtype] [braintype]" : ""
+	..(user, infix = custom_infix)
 
 	var/msg = ""
 	msg += "<span class='warning'>"