diff --git a/community/kernel-api/README.adoc b/community/kernel-api/README.adoc
index 204dd11c5a27..a57d6f6d7b63 100644
--- a/community/kernel-api/README.adoc
+++ b/community/kernel-api/README.adoc
@@ -11,8 +11,8 @@ These are Tobias's API proposals for how the Cypher Runtime should interact with
   This differentiation allows access to data available within the index which makes it possible to defer and sometimes avoid accessing the node store.
 * link:src/main/java/org/neo4j/impl/kernel/api/PropertyCursor.java[PropertyCursor] is used for accessing properties for both nodes and relationships.
 * Property values (and other types of values used in the runtime) are represented by the link:src/main/java/org/neo4j/impl/kernel/api/Value.java[Value class], but for common predicates link:src/main/java/org/neo4j/impl/kernel/api/PropertyCursor.java[PropertyCursor] provides direct methods for performing these without de-serialization.
-* "Legacy Indexes" (called "Search Structures" in this API) are accessed through link:src/main/java/org/neo4j/impl/kernel/api/NodeSearchStructureCursor.java[NodeSearchStructureCursor] and link:src/main/java/org/neo4j/impl/kernel/api/EdgeSearchStructureCursor.java[EdgeSearchStructureCursor].
-  The shared base class link:src/main/java/org/neo4j/impl/kernel/api/SearchStructureCursor.java[SearchStructureCursor] defines access to the lucene information that leaks through from these search structures out via the "Core API".
+* "Manual Indexes" are accessed through link:src/main/java/org/neo4j/impl/kernel/api/NodeManualIndexCursor.java[NodeManualIndexCursor] and link:src/main/java/org/neo4j/impl/kernel/api/EdgeManualIndexCursor.java[EdgeManualIndexCursor].
+  The shared base class link:src/main/java/org/neo4j/impl/kernel/api/ManualIndexCursor.java[ManualIndexCursor] defines access to the lucene information that leaks through from these search structures out via the "Core API".
 * Parallel scans are initialized through a (thread safe) link:src/main/java/org/neo4j/impl/kernel/api/Scan.java[Scan initializer].
   The usage of these is to initialize one cursor per thread.
   Each thread-local cursor will then proceed through ranges of underlying data elements automatically - no re-initialization is required.
diff --git a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/CursorFactory.java b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/CursorFactory.java
index 9d6b781dd9a4..d24e0fe444f3 100644
--- a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/CursorFactory.java
+++ b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/CursorFactory.java
@@ -43,9 +43,9 @@ public interface CursorFactory
 
     NodeLabelIndexCursor allocateNodeLabelIndexCursor();
 
-    // "legacy" indexes
+    // manual indexes
 
-    NodeSearchStructureCursor allocateNodeSearchStructureCursor();
+    NodeManualIndexCursor allocateNodeManualIndexCursor();
 
-    EdgeSearchStructureCursor allocateEdgeSearchStructureCursor();
+    EdgeManualIndexCursor allocateEdgeManualIndexCursor();
 }
diff --git a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/EdgeSearchStructureCursor.java b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/EdgeManualIndexCursor.java
similarity index 90%
rename from community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/EdgeSearchStructureCursor.java
rename to community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/EdgeManualIndexCursor.java
index 2c7799bb2ace..d822db0af7fd 100644
--- a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/EdgeSearchStructureCursor.java
+++ b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/EdgeManualIndexCursor.java
@@ -22,6 +22,6 @@
 /**
  * Cursor for accessing manual index edges.
  */
-public interface EdgeSearchStructureCursor extends EdgeIndexCursor, SearchStructureCursor
+public interface EdgeManualIndexCursor extends EdgeIndexCursor, ManualIndexCursor
 {
 }
diff --git a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/SearchStructureCursor.java b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/ManualIndexCursor.java
similarity index 96%
rename from community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/SearchStructureCursor.java
rename to community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/ManualIndexCursor.java
index 1748d4e314b1..9d15412abf63 100644
--- a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/SearchStructureCursor.java
+++ b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/ManualIndexCursor.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.impl.kernel.api;
 
-interface SearchStructureCursor
+interface ManualIndexCursor
 {
     int totalExpectedCursorSize();
 
diff --git a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/NodeSearchStructureCursor.java b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/NodeManualIndexCursor.java
similarity index 90%
rename from community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/NodeSearchStructureCursor.java
rename to community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/NodeManualIndexCursor.java
index 130efce4ed06..bf2f4feeb827 100644
--- a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/NodeSearchStructureCursor.java
+++ b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/NodeManualIndexCursor.java
@@ -22,6 +22,6 @@
 /**
  * Cursor for accessing manual index nodes.
  */
-public interface NodeSearchStructureCursor extends NodeIndexCursor, SearchStructureCursor
+public interface NodeManualIndexCursor extends NodeIndexCursor, ManualIndexCursor
 {
 }