Clean up names for consistency

Could you just double check for me that the changes I've made don't cause any problems?

Also...will tests need to be updated?