Remove One.
Rename one_of to new_definition.
Rename OneOf to NewDefinition.