Renaming more variables for consistency.