Rename some variable names