Renaming variables from pull request to match my conventions