Completed name changes

It's wierd how much you actually have to change when changing name on
the mod.