diff --git a/src/npc/descriptions/name.js b/src/npc/descriptions/name.js
index 81e195237231ec0bf4b9129ef2dbc5812f0cc0d7..7afd2ff13395d1d0d587c903580ff9bd711a245a 100644
--- a/src/npc/descriptions/name.js
+++ b/src/npc/descriptions/name.js
@@ -65,8 +65,7 @@ App.Desc.name = function(slave) {
 				} else if (slave.slaveSurname !== slave.birthSurname) {
 					r.push(`${slave.birthSurname}.`);
 				}
-			}
-			if (slave.slaveSurname === 0) {
+			} if (slave.slaveSurname === 0) {
 				r.push(`${He} has no surname as a slave, which ${he}`);
 				if (slave.devotion > 95) {
 					r.push(`loves.`);
diff --git a/src/npc/generate/heroCreator.js b/src/npc/generate/heroCreator.js
index b1df47a7b588812bbdd3daf9c9ee1a7dee88695d..0da21a4a1f8171fac4ac74e3f9108496a26859d4 100644
--- a/src/npc/generate/heroCreator.js
+++ b/src/npc/generate/heroCreator.js
@@ -101,11 +101,6 @@ App.Utils.getHeroSlave = function(heroSlave) {
 	// WombInit(heroSlave);
 	const newSlave = BaseSlave();
 	deepAssign(newSlave, heroSlave);
-
-	// Fix names, prevent "undefined" from being overwritten by 0
-	newSlave.slaveName = heroSlave.slaveName;
-	newSlave.slaveSurname = heroSlave.slaveSurname;
-
 	V.heroSlaveID = heroSlave.ID;
 	newSlave.ID = generateSlaveID();
 	repairLimbs(newSlave);