diff --git a/profile.cc b/profile.cc
index 46d979e..d87bbf2 100644
--- a/profile.cc
+++ b/profile.cc
@@ -146,15 +146,15 @@
   return service->Save(storage_.get()) && storage_->Flush();
 }
 
-bool Profile::MergeService(const ServiceRefPtr &service) {
-  if (!storage_->ContainsGroup(service->GetStorageIdentifier()))
+bool Profile::ConfigureService(const ServiceRefPtr &service) {
+  if (!ContainsService(service))
     return false;
   service->set_profile(this);
   return service->Load(storage_.get());
 }
 
 bool Profile::ContainsService(const ServiceConstRefPtr &service) {
-  return storage_->ContainsGroup(service->GetStorageIdentifier());
+  return service->IsLoadableFrom(storage_.get());
 }
 
 bool Profile::IsValidIdentifierToken(const std::string &token) {