Renaming all of the things for better consistency