Rename some variables for clarity