Renaming some methods for consistency