Made field names more consistent