Renaming things to follow convention