Finished renaming things, making things consistent