change some variables names around