Refactor the function names into better/more-consistent names...