Renaming some functions for a better understanding