Rename variables for refactoring