Name Changes

Change names to things that aren't insane