diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 392a7aabd2a..9d55457bacf 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -134,6 +134,9 @@
 	updatename(modtype)
 	updateicon()
 	if(mmi && mmi.brainobj)
+		mmi.brainmob.name = src.name
+		mmi.brainmob.real_name = src.name
+		mmi.name = "[initial(mmi.name)]: [src.name]"
 		mmi.brainobj.lobotomized = 1
 
 	radio = new /obj/item/device/radio/borg(src)
@@ -337,6 +340,10 @@
 
 	real_name = changed_name
 	name = real_name
+	if(mmi)
+		mmi.brainmob.name = src.name
+		mmi.brainmob.real_name = src.name
+		mmi.name = "[initial(mmi.name)]: [src.name]"
 
 	// if we've changed our name, we also need to update the display name for our PDA
 	setup_PDA()
@@ -365,17 +372,16 @@
 /mob/living/silicon/robot/verb/Namepick()
 	set category = "Robot Commands"
 	if(custom_name)
-		return 0
+		return FALSE
 
-	spawn(0)
-		var/newname
-		newname = sanitizeSafe(input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN)
-		if (newname)
-			custom_name = newname
+	var/newname
+	newname = sanitizeSafe(input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN)
+	if(newname)
+		custom_name = newname
 
-		updatename()
-		updateicon()
-		SSrecords.reset_manifest()
+	updatename()
+	updateicon()
+	SSrecords.reset_manifest()
 
 // this verb lets cyborgs see the stations manifest
 /mob/living/silicon/robot/verb/cmd_station_manifest()
diff --git a/html/changelogs/geeves-mmi_naming.yml b/html/changelogs/geeves-mmi_naming.yml
new file mode 100644
index 00000000000..62e3cfcfad1
--- /dev/null
+++ b/html/changelogs/geeves-mmi_naming.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - rscadd: "Cyborgs' and robots' MMIs, Posibrains, or Robotic Circuits, will now receive their name designation when a name is picked."
\ No newline at end of file