Fix issue where OverridePropertyName didn't work with SetValidator/SetCollectionValidator