fixed some functions' names