Rename some variables for consistency