diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala
index 0eefd48c86e5..615bb2d3171a 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala
@@ -634,7 +634,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper, val re
 
     def indexGet(name: String, key: String, value: Any): Iterator[Relationship] = {
       val cursor = allocateAndTraceRelationshipExplicitIndexCursor()
-      tc.kernelTransaction.indexRead().relationshipExplicitIndexGet(cursor, name, key, Values.of(value), -1, -1)
+      tc.kernelTransaction.indexRead().relationshipExplicitIndexLookup(cursor, name, key, Values.of(value), -1, -1)
       new CursorIterator[Relationship] {
         override protected def fetchNext(): Relationship = {
           while (cursor.next() ) {
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala
index e8acc24bc24d..c3a4cc161db0 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala
@@ -655,7 +655,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper,
 
     def indexGet(name: String, key: String, value: Any): Iterator[Relationship] = {
       val cursor = allocateAndTraceRelationshipExplicitIndexCursor()
-      txContext.kernelTransaction.indexRead().relationshipExplicitIndexGet(cursor, name, key, Values.of(value), -1, -1)
+      txContext.kernelTransaction.indexRead().relationshipExplicitIndexLookup(cursor, name, key, Values.of(value), -1, -1)
       new CursorIterator[Relationship] {
         override protected def fetchNext(): Relationship = {
           while (cursor.next() ) {
diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/ExplicitIndexRead.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/ExplicitIndexRead.java
index 99851689017f..b77d14767fb5 100644
--- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/ExplicitIndexRead.java
+++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/ExplicitIndexRead.java
@@ -36,7 +36,7 @@ void nodeExplicitIndexQuery( NodeExplicitIndexCursor cursor, String index, Objec
     void nodeExplicitIndexQuery( NodeExplicitIndexCursor cursor, String index, String key, Object query )
             throws KernelException;
 
-    void relationshipExplicitIndexGet(
+    void relationshipExplicitIndexLookup(
             RelationshipExplicitIndexCursor cursor, String index, String key, Value value, long source, long target )
             throws KernelException;
 
diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Read.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Read.java
index 615679c2e945..85a90bd253db 100644
--- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Read.java
+++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Read.java
@@ -236,9 +236,9 @@ long nodeUniqueIndexSeek( IndexReference index, IndexQuery.ExactPredicate... pre
 
     Scan<RelationshipScanCursor> allRelationshipsScan();
 
-    void relationshipLabelScan( int label, RelationshipScanCursor cursor );
+    void relationshipTypeScan( int type, RelationshipScanCursor cursor );
 
-    Scan<RelationshipScanCursor> relationshipLabelScan( int label );
+    Scan<RelationshipScanCursor> relationshipTypeScan( int type );
 
     /**
      * @param nodeReference
diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/ExplicitIndexCursorTestBase.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/ExplicitIndexCursorTestBase.java
index 377f85d13b05..5a647bfed086 100644
--- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/ExplicitIndexCursorTestBase.java
+++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/ExplicitIndexCursorTestBase.java
@@ -111,7 +111,7 @@ public void shouldFindRelationshipByLookup() throws Exception
               PrimitiveLongSet edges = Primitive.longSet() )
         {
             // when
-            indexRead.relationshipExplicitIndexGet(
+            indexRead.relationshipExplicitIndexLookup(
                     cursor,
                     "rels",
                     "alpha",
@@ -123,7 +123,7 @@ public void shouldFindRelationshipByLookup() throws Exception
             assertFoundRelationships( cursor, 1, edges );
 
             // when
-            indexRead.relationshipExplicitIndexGet( cursor, "rels", "bar", stringValue( "not that" ), -1, -1 );
+            indexRead.relationshipExplicitIndexLookup( cursor, "rels", "bar", stringValue( "not that" ), -1, -1 );
 
             // then
             assertFoundRelationships( cursor, 0, edges );
diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRead.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRead.java
index da2fd1c30816..b231f9c15ff8 100644
--- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRead.java
+++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRead.java
@@ -152,13 +152,13 @@ public Scan<RelationshipScanCursor> allRelationshipsScan()
     }
 
     @Override
-    public void relationshipLabelScan( int label, RelationshipScanCursor cursor )
+    public void relationshipTypeScan( int type, RelationshipScanCursor cursor )
     {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Scan<RelationshipScanCursor> relationshipLabelScan( int label )
+    public Scan<RelationshipScanCursor> relationshipTypeScan( int type )
     {
         throw new UnsupportedOperationException();
     }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java
index 36cb5da9d7db..fe4cee5bcbc3 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java
@@ -264,7 +264,7 @@ public Stream<RelationshipResult> relationshipManualIndexSeek( @Name( "indexName
         try ( Statement ignore = tx.acquireStatement() )
         {
             RelationshipExplicitIndexCursor cursor = tx.cursors().allocateRelationshipExplicitIndexCursor();
-            tx.indexRead().relationshipExplicitIndexGet( cursor, manualIndexName, key, Values.of( value ),
+            tx.indexRead().relationshipExplicitIndexLookup( cursor, manualIndexName, key, Values.of( value ),
                     -1, -1 );
             return toStream( cursor, id -> new RelationshipResult( graphDatabaseAPI.getRelationshipById( id ) ) );
         }
@@ -406,7 +406,7 @@ public Stream<RelationshipResult> relationshipAutoIndexSeek( @Name( "key" ) Stri
         {
             RelationshipExplicitIndexCursor cursor = tx.cursors().allocateRelationshipExplicitIndexCursor();
             tx.indexRead()
-                    .relationshipExplicitIndexGet( cursor, "relationship_auto_index", key, Values.of( value ), -1, -1 );
+                    .relationshipExplicitIndexLookup( cursor, "relationship_auto_index", key, Values.of( value ), -1, -1 );
             return toStream( cursor, id -> new RelationshipResult( graphDatabaseAPI.getRelationshipById( id ) ) );
         }
         catch ( KernelException e )
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java
index fad5b8492e63..41721bb288e2 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java
@@ -934,7 +934,7 @@ public ConstraintDescriptor relationshipPropertyExistenceConstraintCreate( Relat
         assertConstraintDoesNotExist( constraint );
 
         //enforce constraints
-        allStoreHolder.relationshipLabelScan( descriptor.getRelTypeId(), relationshipCursor );
+        allStoreHolder.relationshipTypeScan( descriptor.getRelTypeId(), relationshipCursor );
         constraintSemantics
                 .validateRelationshipPropertyExistenceConstraint( relationshipCursor, propertyCursor, descriptor );
 
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
index 675f40ead280..e272d9aa9c7c 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
@@ -301,14 +301,14 @@ public final Scan<RelationshipScanCursor> allRelationshipsScan()
     }
 
     @Override
-    public final void relationshipLabelScan( int label, RelationshipScanCursor cursor )
+    public final void relationshipTypeScan( int type, RelationshipScanCursor cursor )
     {
         ktx.assertOpen();
-        ((DefaultRelationshipScanCursor) cursor).scan( label, this );
+        ((DefaultRelationshipScanCursor) cursor).scan( type, this );
     }
 
     @Override
-    public final Scan<RelationshipScanCursor> relationshipLabelScan( int label )
+    public final Scan<RelationshipScanCursor> relationshipTypeScan( int type )
     {
         ktx.assertOpen();
         throw new UnsupportedOperationException( "not implemented" );
@@ -463,7 +463,7 @@ public final void nodeExplicitIndexQuery(
     }
 
     @Override
-    public void relationshipExplicitIndexGet(
+    public void relationshipExplicitIndexLookup(
             RelationshipExplicitIndexCursor cursor,
             String index,
             String key,