Rename variables to match global code style