Rename and remove fields