change some variable name