some more changes in field names