Refactor: rename variables