Rename some variables.

Started out trying to do more, decided to checkpoint here.