Rename some functions for consistency