Refactoring: Rename variables