diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php
index e07ea30d..fd38a768 100644
--- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php
+++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php
@@ -8,14 +8,13 @@
 use Ibexa\Contracts\Core\Persistence\Content\Location;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Search\VersatileHandler;
-use Netgen\IbexaSearchExtra\Core\Search\Solr\ParentChildReindexAncestorResolver;
 
 final class AncestorIndexer
 {
     public function __construct(
         private readonly VersatileHandler $searchHandler,
         private readonly ContentHandler $contentHandler,
-        private readonly ParentChildReindexAncestorResolver $ancestorResolver,
+        private readonly ParentChildIndexingAncestorResolver $ancestorResolver,
     ) {}
 
     public function indexSingle(Location $location): void
diff --git a/lib/Core/Search/Solr/ParentChildReindexAncestorResolver.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/ParentChildIndexingAncestorResolver.php
similarity index 97%
rename from lib/Core/Search/Solr/ParentChildReindexAncestorResolver.php
rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/ParentChildIndexingAncestorResolver.php
index 1926892f..ae6d26ba 100644
--- a/lib/Core/Search/Solr/ParentChildReindexAncestorResolver.php
+++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/ParentChildIndexingAncestorResolver.php
@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Netgen\IbexaSearchExtra\Core\Search\Solr;
+namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing;
 
 use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler;
 use Ibexa\Contracts\Core\Persistence\Content\Location;
 use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler;
 use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
-
 use function array_merge;
 use function array_shift;
 use function count;
@@ -21,7 +20,7 @@
 use function mb_strlen;
 use function str_starts_with;
 
-final class ParentChildReindexAncestorResolver
+final class ParentChildIndexingAncestorResolver
 {
     /**
      * @var string[]|null
diff --git a/lib/Resources/config/search/common/parent_child_indexing/common.yaml b/lib/Resources/config/search/common/parent_child_indexing/common.yaml
index 34a514b4..af80b90a 100644
--- a/lib/Resources/config/search/common/parent_child_indexing/common.yaml
+++ b/lib/Resources/config/search/common/parent_child_indexing/common.yaml
@@ -11,8 +11,8 @@ services:
         tags:
             - { name: ibexa.search.solr.field.mapper.content.translation }
 
-    netgen_search_extra.parent_child_indexing.parent_child_reindex_ancestor_resolver:
-        class: Netgen\IbexaSearchExtra\Core\Search\Solr\ParentChildReindexAncestorResolver
+    netgen_search_extra.parent_child_indexing.ancestor_resolver:
+        class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\ParentChildIndexingAncestorResolver
         arguments:
             - '@Ibexa\Core\Persistence\Legacy\Content\Handler'
             - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler'
@@ -33,4 +33,4 @@ services:
         arguments:
             - '@Ibexa\Contracts\Core\Search\VersatileHandler'
             - '@Ibexa\Core\Persistence\Legacy\Content\Handler'
-            - '@netgen_search_extra.parent_child_indexing.parent_child_reindex_ancestor_resolver'
+            - '@netgen_search_extra.parent_child_indexing.ancestor_resolver'