more complete NCP RBD/SPF renaming to Bundle/Group