modify some function names