Breaking changes to NamedEntityType