Renaming things for proper camelCasing