Rename variables to more appropriate names