diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm
index ff45c14ca7c..9b1f2842f96 100644
--- a/code/modules/mob/language/station.dm
+++ b/code/modules/mob/language/station.dm
@@ -259,12 +259,12 @@
 		personal_name += "[pick(name_sounds)]"
 	new_name += "[capitalize(personal_name)]"
 	switch(hive)
-		if("C'thur Hive")
-			new_name += "C'thur"
-		if("K'lax Hive")
-			new_name += "K'lax"
-		if("Zo'ra Hive")
-			new_name += "Zo'ra"
+		if("C'thur")
+			new_name += " C'thur"
+		if("K'lax")
+			new_name += " K'lax"
+		if("Zo'ra")
+			new_name += " Zo'ra"
 		else
 			var/list/hive_names = list("Zo'ra" = 3, "K'lax" = 1, "C'thur" = 1)
 			new_name += " [pickweight(hive_names)]"
diff --git a/html/changelogs/diggiez - BugNameFix.yml b/html/changelogs/diggiez - BugNameFix.yml
new file mode 100644
index 00000000000..12cdef8c041
--- /dev/null
+++ b/html/changelogs/diggiez - BugNameFix.yml	
@@ -0,0 +1,13 @@
+# Your name.
+author: diggiez
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Surplus Vaurca Drones from Cargo have their Hive names properly set."