Undo my hated commit

Rename all the things!