rename variables for consistency