Consistent naming for bundles