Rename variables to avoid shadowing built-in