Renaming some methods to be clearer