Rename some variables, etc