A pass at improving the function names for consistency.