Fixed #22007 -- Fixed cbv docs - make imports consistent