Fixed a few more field names