Changed Individual field names to reflect current data model convention