renaming things to follow standard conventions