change some functions names