Normalize Bundle Naming