Renaming some methods
WIP