modify some function and class names