rename variables to match domain language