diff --git a/doc/domain_schema.md b/doc/domain_schema.md
index 1784faa..b8cc26d 100644
--- a/doc/domain_schema.md
+++ b/doc/domain_schema.md
@@ -104,7 +104,7 @@ Another, `AddDomainContentToDomainGroup`, will add the same Domain Content to it
 
 ### Custom Field Types
 
-Fields values are handled by the `AddFieldValueToDomainContent` content domain schema worker. It uses Field Value Builders (instances of `Schema\Domain\Content\FieldValueBuilder\FieldValueBuilder`) to generate the type and resolution for each field.
+Fields values are handled by the `AddFieldValueToItem` content domain schema worker. It uses Field Value Builders (instances of `Schema\Domain\Content\FieldValueBuilder\FieldValueBuilder`) to generate the type and resolution for each field.
 
 Basic field types are handled by the `BaseFieldValueBuilder`. It maps each fieldtype, using its identifier, to either a type, or a type and a resolver. For the time being, it can not be customized.
 
diff --git a/doc/howto/custom_field_type.md b/doc/howto/custom_field_type.md
index 1fcb636..2c37924 100644
--- a/doc/howto/custom_field_type.md
+++ b/doc/howto/custom_field_type.md
@@ -124,7 +124,7 @@ class RelationFieldDefinitionMapper extends DecoratingFieldDefinitionMapper impl
 
         if (count($settings['selectionContentTypes']) === 1) {
             $contentType = $this->contentTypeService->loadContentTypeByIdentifier($settings['selectionContentTypes'][0]);
-            $type = $this->nameHelper->domainContentName($contentType);
+            $type = $this->nameHelper->itemName($contentType);
         } else {
             $type = 'DomainContent';
         }
diff --git a/src/bundle/Resources/config/services/resolvers.yaml b/src/bundle/Resources/config/services/resolvers.yaml
index d25fffc..7297f26 100644
--- a/src/bundle/Resources/config/services/resolvers.yaml
+++ b/src/bundle/Resources/config/services/resolvers.yaml
@@ -32,7 +32,6 @@ services:
     Ibexa\GraphQL\Resolver\DomainContentResolver:
         tags:
             - { name: overblog_graphql.resolver, alias: "DomainContentItemsByTypeIdentifier", method: "resolveDomainContentItems" }
-            - { name: overblog_graphql.resolver, alias: "DomainFieldValue", method: "resolveDomainFieldValue" }
             - { name: overblog_graphql.resolver, alias: "DomainContentType", method: "resolveDomainContentType" }
             - { name: overblog_graphql.resolver, alias: "DomainContentItem", method: "resolveDomainContentItem" }
             - { name: overblog_graphql.resolver, alias: "DomainRelationFieldValue", method: "resolveDomainRelationFieldValue" }
@@ -118,7 +117,6 @@ services:
         tags:
             - { name: overblog_graphql.resolver, alias: "SearchContent", method: "searchContent" }
             - { name: overblog_graphql.resolver, alias: "SearchContentOfTypeAsConnection", method: "searchContentOfTypeAsConnection" }
-            - { name: overblog_graphql.resolver, alias: "SearchLocationsOfTypeAsConnection", method: "searchLocationsOfTypeAsConnection" }
         arguments:
             $searchService: '@ibexa.siteaccessaware.service.search'
 
diff --git a/src/bundle/Resources/config/services/schema.yaml b/src/bundle/Resources/config/services/schema.yaml
index b720aff..052cc0b 100644
--- a/src/bundle/Resources/config/services/schema.yaml
+++ b/src/bundle/Resources/config/services/schema.yaml
@@ -49,8 +49,6 @@ services:
         arguments:
             $innerMapper: '@Ibexa\GraphQL\Schema\Domain\Content\Mapper\FieldDefinition\SelectionFieldDefinitionMapper.inner'
 
-    Ibexa\GraphQL\Schema\Domain\Content\Worker\FieldDefinition\AddFieldValueToDomainContent: ~
-
     Ibexa\GraphQL\Schema\Domain\Content\Worker\ContentType\AddItemOfTypeConnectionToGroup: ~
 
     Ibexa\GraphQL\Schema\Domain\Content\Worker\ContentType\AddItemToGroup: ~
@@ -100,8 +98,6 @@ services:
 
     Ibexa\GraphQL\Schema\Generator: ~
 
-    Ibexa\GraphQL\Schema\ImagesVariationsBuilder: ~
-
     Ibexa\GraphQL\Schema\SchemaGenerator: ~
 
     Ibexa\GraphQL\Schema\Domain\Pluralizer: ~
diff --git a/src/lib/Resolver/SearchResolver.php b/src/lib/Resolver/SearchResolver.php
index ce7600e..ad5cdef 100644
--- a/src/lib/Resolver/SearchResolver.php
+++ b/src/lib/Resolver/SearchResolver.php
@@ -17,11 +17,6 @@
  */
 class SearchResolver
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\SearchService
-     */
-    private $searchService;
-
     /**
      * @var \Ibexa\GraphQL\InputMapper\SearchQueryMapper
      */
@@ -32,10 +27,9 @@ class SearchResolver
      */
     private $contentLoader;
 
-    public function __construct(ContentLoader $contentLoader, SearchService $searchService, SearchQueryMapper $queryMapper)
+    public function __construct(ContentLoader $contentLoader, SearchQueryMapper $queryMapper)
     {
         $this->contentLoader = $contentLoader;
-        $this->searchService = $searchService;
         $this->queryMapper = $queryMapper;
     }