diff --git a/code/datums/voice_of_god_command.dm b/code/datums/voice_of_god_command.dm
index b08c4a7c36a..a9ccb19be21 100644
--- a/code/datums/voice_of_god_command.dm
+++ b/code/datums/voice_of_god_command.dm
@@ -21,10 +21,6 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands())
 		separator = "|" // Shouldn't be at the start or end of the regex, or it won't work.
 	GLOB.all_voice_of_god_triggers = regex(all_triggers, "i")
 
-//////////////////////////////////////
-///////////VOICE OF GOD///////////////
-//////////////////////////////////////
-
 /*
  * The main proc for the voice of god power. it makes the user shout a message in an ominous way,
  * The first matching command (from a list of static datums) the listeners must obey,
@@ -253,15 +249,39 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands())
 		target.throw_at(get_step_towards(user, target), 3 * power_multiplier, 1 * power_multiplier)
 
 /// This command forces the listeners to say their true name (so masks and hoods won't help).
+/// Basic and simple mobs who are forced to state their name and don't have one already will... reveal their actual one!
 /datum/voice_of_god_command/who_are_you
 	trigger = "who\\s*are\\s*you|say\\s*your\\s*name|state\\s*your\\s*name|identify"
 
 /datum/voice_of_god_command/who_are_you/execute(list/listeners, mob/living/user, power_multiplier = 1, message)
 	var/iteration = 1
 	for(var/mob/living/target as anything in listeners)
-		addtimer(CALLBACK(target, /atom/movable/proc/say, target.real_name), 0.5 SECONDS * iteration)
+		addtimer(CALLBACK(src, .proc/state_name, target), 0.5 SECONDS * iteration)
 		iteration++
 
+///just states the target's name, but also includes the renaming funny.
+/datum/voice_of_god_command/who_are_you/proc/state_name(mob/living/target)
+	if(QDELETED(target))
+		return
+	var/gold_core_spawnable = NO_SPAWN
+	if(isbasicmob(target))
+		var/mob/living/basic/basic_bandy = target
+		gold_core_spawnable = basic_bandy.gold_core_spawnable
+	else if(isanimal(target))
+		var/mob/living/simple_animal/simple_sandy = target
+		gold_core_spawnable = simple_sandy.gold_core_spawnable
+	if(target.name == initial(target.name) && gold_core_spawnable == FRIENDLY_SPAWN)
+		var/canonical_deep_lore_name
+		switch(target.gender)
+			if(MALE)
+				canonical_deep_lore_name = pick(GLOB.first_names_male)
+			if(FEMALE)
+				canonical_deep_lore_name = pick(GLOB.first_names_female)
+			else
+				canonical_deep_lore_name = pick(GLOB.first_names)
+		target.fully_replace_character_name(target.real_name, canonical_deep_lore_name)
+	target.say(target.real_name)
+
 /// This command forces the listeners to say the user's name
 /datum/voice_of_god_command/say_my_name
 	trigger = "say\\s*my\\s*name|who\\s*am\\s*i"