Rename variables in listener