refact some function name