adjust some function name