change some variable names