Refactoring - rename variables