modify some function names again