renaming things to have proper naming conventions