Fixed function names for consistency.