Rename some variables for a minimal increase in clarity.