FORGE-2038: Adjusting field names case