[BM-341] Unify Plug-in name (bundle names) of bundlemaker bundles