renaming functions to reflect their functions more properly