Done, and fixed the other place where this was called. I actually think this helps with some confusion that I was having with set_default_name.