rc: bundles: coerced to flat naming scheme