Rename more variables for readability and consistency.