Clarified some of the function names