Rename some variables to be a bit more readable