change some vars name