Fixes to the generation

Some of the bundles use different naming schemes for their bundle-name.