Rename some variables