More CBV and a little renaming