fix yang and factories to fit CVNI perfectly