MB-100: Support for CBD-1066

- Support new naming in packages