Rename some attributes