Rename some variables to be more clear