Rename variables to avoid confusion