change some func and variable name