Fixing names

And making them less insane, I hope