Rename some variables to be clearer