Modify some function names