diff --git a/code/defines/mob/living/silicon/robot.dm b/code/defines/mob/living/silicon/robot.dm
index f059433a17a..a245fe44671 100644
--- a/code/defines/mob/living/silicon/robot.dm
+++ b/code/defines/mob/living/silicon/robot.dm
@@ -1,5 +1,5 @@
 /mob/living/silicon/robot
-	name = "Robot"
+	name = "Cyborg"
 	icon = 'robots.dmi'//
 	icon_state = "robot"
 	health = 300
@@ -36,6 +36,7 @@
 	var/wiresexposed = 0
 	var/locked = 1
 	var/list/req_access = list(access_robotics)
+	var/ident = 0
 	//var/list/laws = list()
 	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list())
 	var/viewalerts = 0
diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm
index 428e78d6c27..9e2b24457df 100644
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -9,8 +9,9 @@
 	if (src.stat == 2)
 		src.verbs += /mob/proc/ghost
 	if(src.real_name == "Cyborg")
+		src.ident = rand(1, 999)
 		src.real_name += " "
-		src.real_name += "-[rand(1, 999)]"
+		src.real_name += "-[ident]"
 		src.name = src.real_name
 	if(!src.connected_ai)
 		for(var/mob/living/silicon/ai/A in world)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index f9785682fd9..4009499c826 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -10,8 +10,10 @@
 		updateicon()
 //		syndicate = syndie
 		if(real_name == "Cyborg")
-			real_name += " [pick(rand(1, 999))]"
+			ident = rand(1, 999)
+			real_name += "-[ident]"
 			name = real_name
+
 	spawn (4)
 		if (client)
 			connected_ai = activeais()