Renaming some variables in code