Rename variables to be more descriptive