Clean up incident field names.