renaming some functions for consistency