diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java
index 3eef11136bd71..2465d6923e5d6 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexReader.java
@@ -67,7 +67,7 @@ public long countIndexedNodes( long nodeId, Value... propertyValues )
     public IndexSampler createSampler()
     {
         List<IndexSampler> samplers = new ArrayList<>();
-        for ( SpatialIndexPartReader<NativeSchemaValue> partReader : this )
+        for ( SpatialIndexPartReader<NativeIndexValue> partReader : this )
         {
             samplers.add( partReader.createSampler() );
         }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexKey.java
index 0f2743c34ea8b..0b1d23059592c 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexKey.java
@@ -192,7 +192,7 @@ void copyFrom( StringIndexKey key )
         copyFrom( key, key.bytesLength );
     }
 
-    void copyFrom( StringSchemaKey key, int targetLength )
+    void copyFrom( StringIndexKey key, int targetLength )
     {
         setBytesLength( targetLength );
         System.arraycopy( key.bytes, 0, bytes, 0, targetLength );
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringLayout.java
index 574bc70dac64c..eaff3a307781e 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringLayout.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringLayout.java
@@ -83,7 +83,7 @@ public boolean fixedSize()
     }
 
     @Override
-    public void minimalSplitter( StringSchemaKey left, StringSchemaKey right, StringSchemaKey into )
+    public void minimalSplitter( StringIndexKey left, StringIndexKey right, StringIndexKey into )
     {
         int maxLength = Math.min( left.bytesLength, right.bytesLength );
         int targetLength = 0;