Fix name changing issue

I cannot fully test this fix without access to more people, but in personal testing it seems to fix the problem.
Merge pull request #31 from tyler569/master

Name Changing issue