Rename some of the variables