Name Changing issue

I cannot fully test this fix without access to more people, but in personal testing it seems to fix the problem.