Adjust to use new cb metapackges.