ITPRO-86 Use custom field names from configuration