Merge discriminator settings
Apply naming strategy to discriminator field name