change some function names