Clean up the names of the functions to be more consistent