Changed function names for consistency.