rename variables to minimize changes