Refactoring some function names to be more consistent.