Rename variables to make type clearer