Cleanup namings created new bundles for separation