renamed NamedBundle to Bundle (and Bundle to BundleEntity)