diff --git a/tests/lib/Integration/API/DescendantIndexingLocationTest.php b/tests/lib/Integration/API/DescendantIndexingLocationTest.php
index 02de0dec..ab88fa63 100644
--- a/tests/lib/Integration/API/DescendantIndexingLocationTest.php
+++ b/tests/lib/Integration/API/DescendantIndexingLocationTest.php
@@ -59,7 +59,7 @@ public function testAssignSectionToSubtree(): void
             'filter' => new Query\Criterion\LogicalAnd([
                 new Query\Criterion\LocationId($parentLocationId),
                 new Query\Criterion\CustomField(
-                    'ng_child_section_field_1_i',
+                    'ng_child_section_i',
                     Operator::EQ,
                     $mediaSectionId),
                 new Query\Criterion\SectionId($mediaSectionId),
@@ -437,7 +437,7 @@ public function testUpdateLocation(): void
             'filter' => new Query\Criterion\LogicalAnd([
                 new Query\Criterion\LocationId($parentLocationId),
                 new Query\Criterion\CustomField(
-                    'ng_child_location_priority_field_2_i',
+                    'ng_grandchild_location_priority_i',
                     Operator::EQ,
                     3)
             ]),
diff --git a/tests/lib/Integration/API/DescendantIndexingObjectStateTest.php b/tests/lib/Integration/API/DescendantIndexingObjectStateTest.php
index de55fd96..e4d1fe54 100644
--- a/tests/lib/Integration/API/DescendantIndexingObjectStateTest.php
+++ b/tests/lib/Integration/API/DescendantIndexingObjectStateTest.php
@@ -46,7 +46,7 @@ public function testSetObjectState(): void
             'filter' => new Query\Criterion\LogicalAnd([
                 new Query\Criterion\LocationId($parentContent->contentInfo->mainLocationId),
                 new Query\Criterion\CustomField(
-                    'ng_child_object_state_2_s',
+                    'ng_grandchild_object_state_s',
                     Operator::EQ,
                     $lockedState->identifier
                 )
diff --git a/tests/lib/Integration/API/DescendantIndexingSectionTest.php b/tests/lib/Integration/API/DescendantIndexingSectionTest.php
index 2e9cde43..b6ca334d 100644
--- a/tests/lib/Integration/API/DescendantIndexingSectionTest.php
+++ b/tests/lib/Integration/API/DescendantIndexingSectionTest.php
@@ -53,7 +53,7 @@ public function testAssignSection(): void
             'filter' => new Query\Criterion\LogicalAnd([
                 new Query\Criterion\LocationId($parentLocationId),
                 new Query\Criterion\CustomField(
-                    'ng_child_section_field_1_i',
+                    'ng_child_section_i',
                     Operator::EQ,
                     $mediaSectionId)
             ]),
diff --git a/tests/lib/Integration/Implementation/Solr/FieldMapper/LocationPriorityFieldMapper.php b/tests/lib/Integration/Implementation/Solr/FieldMapper/TestLocationPriorityFieldMapper.php
similarity index 96%
rename from tests/lib/Integration/Implementation/Solr/FieldMapper/LocationPriorityFieldMapper.php
rename to tests/lib/Integration/Implementation/Solr/FieldMapper/TestLocationPriorityFieldMapper.php
index ab4db1e3..fb69b442 100644
--- a/tests/lib/Integration/Implementation/Solr/FieldMapper/LocationPriorityFieldMapper.php
+++ b/tests/lib/Integration/Implementation/Solr/FieldMapper/TestLocationPriorityFieldMapper.php
@@ -16,7 +16,7 @@
 use Ibexa\Contracts\Core\Search\Field;
 use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\DescendantFieldMapper\BaseFieldMapper;
 
-class LocationPriorityFieldMapper extends BaseFieldMapper
+class TestLocationPriorityFieldMapper extends BaseFieldMapper
 {
 
     /**
@@ -85,7 +85,7 @@ public function mapFields(SPILocation $location): array
             if (isset($childConfiguration['indexed']) && $childConfiguration['indexed'] === true) {
                 $fieldsGrouped[] = [
                     new Field(
-                        'ng_child_location_priority_field_1',
+                        'ng_child_location_priority',
                         $childLocation->priority,
                         new IntegerField(),
                     ),
@@ -110,7 +110,7 @@ public function mapFields(SPILocation $location): array
                 if (isset($grandChildConfiguration['indexed']) && $grandChildConfiguration['indexed'] === true) {
                     $fieldsGrouped[] = [
                         new Field(
-                            'ng_child_location_priority_field_2',
+                            'ng_grandchild_location_priority',
                             $grandChildLocation->priority,
                             new IntegerField(),
                         ),
diff --git a/tests/lib/Integration/Implementation/Solr/FieldMapper/ObjectStateFieldMapper.php b/tests/lib/Integration/Implementation/Solr/FieldMapper/TestObjectStateFieldMapper.php
similarity index 97%
rename from tests/lib/Integration/Implementation/Solr/FieldMapper/ObjectStateFieldMapper.php
rename to tests/lib/Integration/Implementation/Solr/FieldMapper/TestObjectStateFieldMapper.php
index 325c87f2..a52d1538 100644
--- a/tests/lib/Integration/Implementation/Solr/FieldMapper/ObjectStateFieldMapper.php
+++ b/tests/lib/Integration/Implementation/Solr/FieldMapper/TestObjectStateFieldMapper.php
@@ -16,7 +16,7 @@
 use Ibexa\Contracts\Core\Search\Field;
 use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\DescendantFieldMapper\BaseFieldMapper;
 
-class ObjectStateFieldMapper extends BaseFieldMapper
+class TestObjectStateFieldMapper extends BaseFieldMapper
 {
     /**
      * @var array<int, ?string>
@@ -87,7 +87,7 @@ public function mapFields(Content $content): array
             if (isset($childConfiguration['indexed']) && $childConfiguration['indexed'] === true) {
                 $fieldsGrouped[] = [
                     new Field(
-                        'ng_child_object_state_1',
+                        'ng_child_object_state',
                         $objectState->identifier,
                         new StringField(),
                     ),
@@ -120,7 +120,7 @@ public function mapFields(Content $content): array
                 if (isset($grandChildConfiguration['indexed']) && $grandChildConfiguration['indexed'] === true) {
                     $fieldsGrouped[] = [
                         new Field(
-                            'ng_child_object_state_2',
+                            'ng_grandchild_object_state',
                             $objectState->identifier,
                             new StringField(),
                         ),
diff --git a/tests/lib/Integration/Implementation/Solr/FieldMapper/SectionFieldMapper.php b/tests/lib/Integration/Implementation/Solr/FieldMapper/TestSectionFieldMapper.php
similarity index 97%
rename from tests/lib/Integration/Implementation/Solr/FieldMapper/SectionFieldMapper.php
rename to tests/lib/Integration/Implementation/Solr/FieldMapper/TestSectionFieldMapper.php
index 89ce1ac6..07e78624 100644
--- a/tests/lib/Integration/Implementation/Solr/FieldMapper/SectionFieldMapper.php
+++ b/tests/lib/Integration/Implementation/Solr/FieldMapper/TestSectionFieldMapper.php
@@ -14,7 +14,7 @@
 use Ibexa\Contracts\Core\Search\Field;
 use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\DescendantFieldMapper\BaseFieldMapper;
 
-class SectionFieldMapper extends BaseFieldMapper
+class TestSectionFieldMapper extends BaseFieldMapper
 {
 
     /**
@@ -79,7 +79,7 @@ public function mapFields(Content $content): array
             if (isset($childConfiguration['indexed']) && $childConfiguration['indexed'] === true) {
                 $fieldsGrouped[] = [
                     new Field(
-                        'ng_child_section_field_1',
+                        'ng_child_section',
                         $contentItem->contentInfo->sectionId,
                         new IntegerField(),
                     ),
@@ -103,7 +103,7 @@ public function mapFields(Content $content): array
                 if (isset($grandChildConfiguration['indexed']) && $grandChildConfiguration['indexed'] === true) {
                     $fieldsGrouped[] = [
                         new Field(
-                            'ng_child_section_field_2',
+                            'ng_grandchild_section',
                             $grandChildContentItem->contentInfo->sectionId,
                             new IntegerField(),
                         ),
diff --git a/tests/lib/Integration/Resources/config/services.yaml b/tests/lib/Integration/Resources/config/services.yaml
index 9e23ed73..874e895e 100644
--- a/tests/lib/Integration/Resources/config/services.yaml
+++ b/tests/lib/Integration/Resources/config/services.yaml
@@ -41,7 +41,7 @@ services:
             - { name: ibexa.search.solr.field.mapper.location }
 
     netgen.ibexa_search_extra.solr.field_mapper.location.location_priority:
-        class: Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Solr\FieldMapper\LocationPriorityFieldMapper
+        class: Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Solr\FieldMapper\TestLocationPriorityFieldMapper
         arguments:
           [
               '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler',
@@ -55,7 +55,7 @@ services:
 
 
     netgen.ibexa_search_extra.solr.field_mapper.content.section:
-        class: Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Solr\FieldMapper\SectionFieldMapper
+        class: Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Solr\FieldMapper\TestSectionFieldMapper
         arguments:
           [
               '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler',
@@ -67,7 +67,7 @@ services:
 
 
     netgen.ibexa_search_extra.solr.field_mapper.content.object_state:
-        class: Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Solr\FieldMapper\ObjectStateFieldMapper
+        class: Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Solr\FieldMapper\TestObjectStateFieldMapper
         arguments:
           [
               '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler',