Rename variables to prevent confusion