cleanup
Field rename and validation checks