renames some functions to follow our style guide