Rename variables to more generic names