Rename some functions to make it more clear