diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayout.java
index 0bfbebf8e9bb8..bc9ce0cbba0b5 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayout.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayout.java
@@ -54,7 +54,7 @@ public SpatialSchemaKey copyKey( SpatialSchemaKey key, SpatialSchemaKey into )
     {
         into.rawValueBits = key.rawValueBits;
         into.setEntityId( key.getEntityId() );
-        into.setEntityIdIsSpecialTieBreaker( key.getEntityIdIsSpecialTieBreaker() );
+        into.setCompareId( key.getCompareId() );
         into.crs = key.crs;
         into.curve = key.curve;
         return into;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutUnique.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutUnique.java
index 1dcbf62473b49..7e6ea3a02755a 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutUnique.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutUnique.java
@@ -63,7 +63,7 @@ public int compare( SpatialSchemaKey o1, SpatialSchemaKey o2 )
         if ( comparison == 0 )
         {
             // This is a special case where we need also compare entityId to support inclusive/exclusive
-            if ( o1.getEntityIdIsSpecialTieBreaker() || o2.getEntityIdIsSpecialTieBreaker() )
+            if ( o1.getCompareId() || o2.getCompareId() )
             {
                 return Long.compare( o1.getEntityId(), o2.getEntityId() );
             }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaKey.java
index 459182194b70d..7ecb53bbdce98 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaKey.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaKey.java
@@ -41,7 +41,7 @@ class SpatialSchemaKey implements NativeSchemaKey
             Long.BYTES;  /* entityId */
 
     private long entityId;
-    private boolean entityIdIsSpecialTieBreaker;
+    private boolean compareId;
 
     long rawValueBits;
     CoordinateReferenceSystem crs;
@@ -54,15 +54,15 @@ class SpatialSchemaKey implements NativeSchemaKey
     }
 
     @Override
-    public void setEntityIdIsSpecialTieBreaker( boolean entityIdIsSpecialTieBreaker )
+    public void setCompareId( boolean entityIdIsSpecialTieBreaker )
     {
-        this.entityIdIsSpecialTieBreaker = entityIdIsSpecialTieBreaker;
+        this.compareId = entityIdIsSpecialTieBreaker;
     }
 
     @Override
-    public boolean getEntityIdIsSpecialTieBreaker()
+    public boolean getCompareId()
     {
-        return entityIdIsSpecialTieBreaker;
+        return compareId;
     }
 
     @Override
@@ -82,7 +82,7 @@ public void from( long entityId, Value... values )
     {
         extractRawBits( assertValidValue( values ) );
         this.entityId = entityId;
-        entityIdIsSpecialTieBreaker = false;
+        compareId = false;
     }
 
     @Override
@@ -109,7 +109,7 @@ public void initAsLowest()
         Arrays.fill(limit, Double.NEGATIVE_INFINITY);
         writePoint( limit );
         entityId = Long.MIN_VALUE;
-        entityIdIsSpecialTieBreaker = true;
+        compareId = true;
     }
 
     @Override
@@ -120,14 +120,14 @@ public void initAsHighest()
         double[] limit = {Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY};
         writePoint( limit );
         entityId = Long.MAX_VALUE;
-        entityIdIsSpecialTieBreaker = true;
+        compareId = true;
     }
 
     public void fromDerivedValue( long entityId, long derivedValue )
     {
         rawValueBits = derivedValue;
         this.entityId = entityId;
-        this.entityIdIsSpecialTieBreaker = false;
+        this.compareId = false;
     }
 
     /**