Updated function names for consistency