More nextgen -> cbsu path updates