fixing data field names