Rename some variables to make more sense