Cosmetics: Rename some variables to be more descriptive of their use.