Searcher => Backend

27 files changed, 132 insertions, 134 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
index a05450aa3a0..816e5a074f6 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.documentmodel.SummaryTransform;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 import java.util.logging.Level;
 
-import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
+import static com.yahoo.prelude.fastsearch.VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
 import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes;
 
 /**
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java
index 7e9d79fc858..26107ad2dca 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java
@@ -24,7 +24,7 @@ import com.yahoo.vespa.indexinglanguage.expressions.SetVarExpression;
 import com.yahoo.vespa.indexinglanguage.expressions.StatementExpression;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
-import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
+import static com.yahoo.prelude.fastsearch.VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java
index e425f81c0b4..42457295895 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.documentmodel.DocumentSummary;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
-import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
+import static com.yahoo.prelude.fastsearch.VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
 
 /**
  * Class that processes reference fields and removes attribute aspect of such fields from summary.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
index 13e6ee6684d..f1c85699af5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
@@ -92,8 +92,8 @@ public class PlatformBundles {
             com.yahoo.docproc.SimpleDocumentProcessor.class.getName(),
             com.yahoo.language.simple.SimpleLinguistics.class.getName(),
             com.yahoo.prelude.cluster.ClusterSearcher.class.getName(),
-            com.yahoo.prelude.fastsearch.FastSearcher.class.getName(),
-            com.yahoo.prelude.fastsearch.VespaBackEndSearcher.class.getName(),
+            com.yahoo.prelude.fastsearch.FastBackend.class.getName(),
+            com.yahoo.prelude.fastsearch.VespaBackend.class.getName(),
             com.yahoo.prelude.querytransform.CJKSearcher.class.getName(),
             com.yahoo.prelude.querytransform.CollapsePhraseSearcher.class.getName(),
             com.yahoo.prelude.querytransform.LiteralBoostSearcher.class.getName(),
@@ -144,7 +144,7 @@ public class PlatformBundles {
             com.yahoo.search.searchers.CacheControlSearcher.class.getName(),
             com.yahoo.search.searchers.RateLimitingSearcher.class.getName(),
             com.yahoo.vespa.streamingvisitors.MetricsSearcher.class.getName(),
-            com.yahoo.vespa.streamingvisitors.StreamingSearcher.class.getName()
+            com.yahoo.vespa.streamingvisitors.StreamingBackend.class.getName()
     );
 
 }
diff --git a/container-core/src/main/resources/configdefinitions/container.qr-searchers.def b/container-core/src/main/resources/configdefinitions/container.qr-searchers.def
index f8871e9f315..2cd4af4fdf1 100644
--- a/container-core/src/main/resources/configdefinitions/container.qr-searchers.def
+++ b/container-core/src/main/resources/configdefinitions/container.qr-searchers.def
@@ -25,7 +25,7 @@ com.yahoo.prelude.searcher.XMLStringSearcher.source string default=""
 
 ## Default docsum class the QR server should ask the backend to
 ## use for representing hints as default.
-com.yahoo.prelude.fastsearch.FastSearcher.docsum.defaultclass string default=""
+com.yahoo.prelude.fastsearch.FastBackend.docsum.defaultclass string default=""
 
 com.yahoo.prelude.querytransform.PhrasingSearcher.automatonfile string default=""
 com.yahoo.prelude.querytransform.NonPhrasingSearcher.automatonfile string default=""
diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
index fd69390a745..36e918c9ba3 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
@@ -11,9 +11,9 @@ import com.yahoo.container.core.documentapi.VespaDocumentAccess;
 import com.yahoo.container.handler.VipStatus;
 import com.yahoo.prelude.fastsearch.ClusterParams;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
-import com.yahoo.prelude.fastsearch.FastSearcher;
+import com.yahoo.prelude.fastsearch.FastBackend;
 import com.yahoo.prelude.fastsearch.SummaryParameters;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -25,7 +25,7 @@ import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.schema.Cluster;
 import com.yahoo.search.schema.SchemaInfo;
 import com.yahoo.search.searchchain.Execution;
-import com.yahoo.vespa.streamingvisitors.StreamingSearcher;
+import com.yahoo.vespa.streamingvisitors.StreamingBackend;
 import com.yahoo.yolean.Exceptions;
 
 import java.util.ArrayList;
@@ -60,7 +60,7 @@ public class ClusterSearcher extends Searcher {
     private final String searchClusterName;
 
     // The set of document types contained in this search cluster
-    private final Map<String, VespaBackEndSearcher> schema2Searcher;
+    private final Map<String, VespaBackend> schema2Searcher;
     private final SchemaInfo schemaInfo;
 
     private final long maxQueryTimeout; // in milliseconds
@@ -97,7 +97,7 @@ public class ClusterSearcher extends Searcher {
                 .defaultclass());
 
         String uniqueServerId = UUID.randomUUID().toString();
-        VespaBackEndSearcher streaming = null, indexed = null;
+        VespaBackend streaming = null, indexed = null;
         for (DocumentdbInfoConfig.Documentdb docDb : documentDbConfig.documentdb()) {
             if (docDb.mode() == DocumentdbInfoConfig.Documentdb.Mode.Enum.INDEX) {
                 if (indexed == null) {
@@ -130,34 +130,34 @@ public class ClusterSearcher extends Searcher {
         return new ClusterParams("sc" + searchclusterIndex + ".num" + 0);
     }
 
-    private static FastSearcher searchDispatch(int searchclusterIndex,
-                                               String searchClusterName,
-                                               String serverId,
-                                               SummaryParameters docSumParams,
-                                               DocumentdbInfoConfig documentdbInfoConfig,
-                                               SchemaInfo schemaInfo,
-                                               ComponentRegistry<Dispatcher> dispatchers) {
+    private static FastBackend searchDispatch(int searchclusterIndex,
+                                              String searchClusterName,
+                                              String serverId,
+                                              SummaryParameters docSumParams,
+                                              DocumentdbInfoConfig documentdbInfoConfig,
+                                              SchemaInfo schemaInfo,
+                                              ComponentRegistry<Dispatcher> dispatchers) {
         ClusterParams clusterParams = makeClusterParams(searchclusterIndex);
         ComponentId dispatcherComponentId = new ComponentId("dispatcher." + searchClusterName);
         Dispatcher dispatcher = dispatchers.getComponent(dispatcherComponentId);
         if (dispatcher == null)
             throw new IllegalArgumentException("Configuration error: No dispatcher " + dispatcherComponentId +
                                                " is configured");
-        return new FastSearcher(serverId, dispatcher, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
+        return new FastBackend(serverId, dispatcher, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
     }
 
-    private static StreamingSearcher streamingCluster(String serverId,
-                                                      int searchclusterIndex,
-                                                      QrSearchersConfig.Searchcluster searchClusterConfig,
-                                                      SummaryParameters docSumParams,
-                                                      DocumentdbInfoConfig documentdbInfoConfig,
-                                                      SchemaInfo schemaInfo,
-                                                      VespaDocumentAccess access) {
+    private static StreamingBackend streamingCluster(String serverId,
+                                                     int searchclusterIndex,
+                                                     QrSearchersConfig.Searchcluster searchClusterConfig,
+                                                     SummaryParameters docSumParams,
+                                                     DocumentdbInfoConfig documentdbInfoConfig,
+                                                     SchemaInfo schemaInfo,
+                                                     VespaDocumentAccess access) {
         if (searchClusterConfig.searchdef().size() != 1)
             throw new IllegalArgumentException("Streaming search clusters can only contain a single schema but got " +
                                                searchClusterConfig.searchdef());
         ClusterParams clusterParams = makeClusterParams(searchclusterIndex);
-        StreamingSearcher searcher = new StreamingSearcher(access);
+        StreamingBackend searcher = new StreamingBackend(access);
         searcher.setSearchClusterName(searchClusterConfig.rankprofiles_configid());
         searcher.setStorageClusterRouteSpec(searchClusterConfig.storagecluster().routespec());
         searcher.init(serverId, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
@@ -165,7 +165,7 @@ public class ClusterSearcher extends Searcher {
     }
 
     /** Do not use, for internal testing purposes only. **/
-    ClusterSearcher(SchemaInfo schemaInfo, Map<String, VespaBackEndSearcher> schema2Searcher, Executor executor) {
+    ClusterSearcher(SchemaInfo schemaInfo, Map<String, VespaBackend> schema2Searcher, Executor executor) {
         this.schemaInfo = schemaInfo;
         searchClusterName = "testScenario";
         maxQueryTimeout = DEFAULT_MAX_QUERY_TIMEOUT;
@@ -176,7 +176,7 @@ public class ClusterSearcher extends Searcher {
     }
 
     /** Do not use, for internal testing purposes only. **/
-    ClusterSearcher(SchemaInfo schemaInfo, Map<String, VespaBackEndSearcher> schema2Searcher) {
+    ClusterSearcher(SchemaInfo schemaInfo, Map<String, VespaBackend> schema2Searcher) {
         this(schemaInfo, schema2Searcher, null);
     }
 
@@ -201,7 +201,7 @@ public class ClusterSearcher extends Searcher {
     private void fill(Result result, String summaryClass) {
         Query query = result.getQuery();
         var restrict = query.getModel().getRestrict();
-        Collection<VespaBackEndSearcher> servers = (restrict != null && ! restrict.isEmpty())
+        Collection<VespaBackend> servers = (restrict != null && ! restrict.isEmpty())
                 ? query.getModel().getRestrict().stream()
                     .map(schema2Searcher::get)
                     .collect(Collectors.toCollection(TinyIdentitySet::new))
@@ -325,7 +325,7 @@ public class ClusterSearcher extends Searcher {
             if (query.getOffset() > 0 || query.getHits() < mergedResult.hits().size()) {
                 if (mergedResult.getHitOrderer() != null) {
                     // Make sure we have the necessary data for sorting
-                    fill(mergedResult, VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
+                    fill(mergedResult, VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
                 }
                 mergedResult.hits().trim(query.getOffset(), query.getHits());
                 query.setOffset(0); // Needed when doing a trim
@@ -389,7 +389,7 @@ public class ClusterSearcher extends Searcher {
 
     @Override
     public void deconstruct() {
-        Map<String, VespaBackEndSearcher> servers = new HashMap<>();
+        Map<String, VespaBackend> servers = new HashMap<>();
         for (var server : schema2Searcher.values()) {
             servers.put(server.getName(), server);
         }
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastBackend.java
index 85b7770a8b2..b1b3483af8c 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastBackend.java
@@ -30,7 +30,7 @@ import java.util.Optional;
 // errors on results and returning them. It could be handy to create a QueryHandlingErrorException
 // or similar which could wrap an error message, and then just always throw that and
 // catch and unwrap into a results with an error in high level methods.  -Jon
-public class FastSearcher extends VespaBackEndSearcher {
+public class FastBackend extends VespaBackend {
 
     /** Used to dispatch directly to search nodes over RPC, replacing the old fnet communication path */
     private final Dispatcher dispatcher;
@@ -48,12 +48,12 @@ public class FastSearcher extends VespaBackEndSearcher {
      * @param clusterParams the cluster number, and other cluster backend parameters
      * @param documentdbInfoConfig document database parameters
      */
-    public FastSearcher(String serverId,
-                        Dispatcher dispatcher,
-                        SummaryParameters docSumParams,
-                        ClusterParams clusterParams,
-                        DocumentdbInfoConfig documentdbInfoConfig,
-                        SchemaInfo schemaInfo) {
+    public FastBackend(String serverId,
+                       Dispatcher dispatcher,
+                       SummaryParameters docSumParams,
+                       ClusterParams clusterParams,
+                       DocumentdbInfoConfig documentdbInfoConfig,
+                       SchemaInfo schemaInfo) {
         init(serverId, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
         this.dispatcher = dispatcher;
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackend.java
index 74f3c740524..5191bfc4f41 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackend.java
@@ -31,7 +31,7 @@ import java.util.Optional;
  *
  * @author baldersheim
  */
-public abstract class VespaBackEndSearcher {
+public abstract class VespaBackend {
 
     /** for vespa-internal use only; consider renaming the summary class */
     public static final String SORTABLE_ATTRIBUTES_SUMMARY_CLASS = "attributeprefetch";
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/BlendingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/BlendingSearcher.java
index 1128ad9570d..634a16d1dee 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/BlendingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/BlendingSearcher.java
@@ -8,7 +8,7 @@ import com.yahoo.component.chain.dependencies.After;
 import com.yahoo.component.chain.dependencies.Before;
 import com.yahoo.component.chain.dependencies.Provides;
 import com.yahoo.container.QrSearchersConfig;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -115,7 +115,7 @@ public class BlendingSearcher extends Searcher {
     private Result sortAndTrimResults(Result result, Query q, int offset, int hits, Execution execution) {
         if (q.getRanking().getSorting() != null) {
             // TODO: remove or rename this internal summary class for Vespa 9
-            execution.fill(result, VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
+            execution.fill(result, VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
             result.hits().sort();
         }
         result.hits().trim(offset, hits);
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index 8ec88bd7f45..1689f6d246e 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -6,7 +6,7 @@ import com.yahoo.component.ComponentId;
 import com.yahoo.component.annotation.Inject;
 import com.yahoo.compress.Compressor;
 import com.yahoo.container.handler.VipStatus;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.processing.request.CompoundName;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
@@ -256,13 +256,13 @@ public class Dispatcher extends AbstractComponent {
         }
     }
 
-    public FillInvoker getFillInvoker(Result result, VespaBackEndSearcher searcher) {
+    public FillInvoker getFillInvoker(Result result, VespaBackend searcher) {
         try (var items = volatileItems()) { // Take a snapshot, and release it when we're done.
             return items.register(items.get().invokerFactory.createFillInvoker(searcher, result));
         }
     }
 
-    public SearchInvoker getSearchInvoker(Query query, VespaBackEndSearcher searcher) {
+    public SearchInvoker getSearchInvoker(Query query, VespaBackend searcher) {
         try (var items = volatileItems()) { // Take a snapshot, and release it when we're done.
             int maxHitsPerNode = dispatchConfig.maxHitsPerNode();
             SearchInvoker invoker = getSearchPathInvoker(query, searcher, searchCluster.groupList(), items.get().invokerFactory, maxHitsPerNode)
@@ -277,7 +277,7 @@ public class Dispatcher extends AbstractComponent {
     }
 
     /** Builds an invoker based on searchpath */
-    private static Optional<SearchInvoker> getSearchPathInvoker(Query query, VespaBackEndSearcher searcher, SearchGroups cluster,
+    private static Optional<SearchInvoker> getSearchPathInvoker(Query query, VespaBackend searcher, SearchGroups cluster,
                                                                 InvokerFactory invokerFactory, int maxHitsPerNode) {
         String searchPath = query.getModel().getSearchPath();
         if (searchPath == null) return Optional.empty();
@@ -297,7 +297,7 @@ public class Dispatcher extends AbstractComponent {
         }
     }
 
-    private static SearchInvoker getInternalInvoker(Query query, VespaBackEndSearcher searcher, SearchCluster cluster,
+    private static SearchInvoker getInternalInvoker(Query query, VespaBackend searcher, SearchCluster cluster,
                                                     LoadBalancer loadBalancer, InvokerFactory invokerFactory, int maxHitsPerNode) {
         Optional<Node> directNode = cluster.localCorpusDispatchTarget();
         if (directNode.isPresent()) {
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InvokerFactory.java b/container-search/src/main/java/com/yahoo/search/dispatch/InvokerFactory.java
index f1d58122570..d7fad148c8c 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InvokerFactory.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InvokerFactory.java
@@ -2,7 +2,7 @@
 package com.yahoo.search.dispatch;
 
 import com.yahoo.concurrent.Timer;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.dispatch.searchcluster.Group;
@@ -34,12 +34,12 @@ public abstract class InvokerFactory {
         this.hitEstimator = new TopKEstimator(30.0, dispatchConfig.topKProbability(), SKEW_FACTOR);
     }
 
-    protected abstract Optional<SearchInvoker> createNodeSearchInvoker(VespaBackEndSearcher searcher,
+    protected abstract Optional<SearchInvoker> createNodeSearchInvoker(VespaBackend searcher,
                                                                        Query query,
                                                                        int maxHits,
                                                                        Node node);
 
-    public abstract FillInvoker createFillInvoker(VespaBackEndSearcher searcher, Result result);
+    public abstract FillInvoker createFillInvoker(VespaBackend searcher, Result result);
 
     /**
      * Creates a {@link SearchInvoker} for a list of content nodes.
@@ -52,7 +52,7 @@ public abstract class InvokerFactory {
      * @return the invoker or empty if some node in the
      *         list is invalid and the remaining coverage is not sufficient
      */
-    Optional<SearchInvoker> createSearchInvoker(VespaBackEndSearcher searcher,
+    Optional<SearchInvoker> createSearchInvoker(VespaBackend searcher,
                                                 Query query,
                                                 List<Node> nodes,
                                                 boolean acceptIncompleteCoverage,
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
index 9da4c91cd16..284b4a4fcbc 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
@@ -14,7 +14,7 @@ import com.yahoo.io.GrowableByteBuffer;
 import com.yahoo.prelude.fastsearch.DocumentDatabase;
 import com.yahoo.prelude.fastsearch.FastHit;
 import com.yahoo.prelude.fastsearch.GroupingListHit;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.dispatch.InvokerResult;
@@ -227,7 +227,7 @@ public class ProtobufSerialization {
         return convertFromResult(searchResult).toByteArray();
     }
 
-    static InvokerResult deserializeToSearchResult(byte[] payload, Query query, VespaBackEndSearcher searcher, int partId, int distKey)
+    static InvokerResult deserializeToSearchResult(byte[] payload, Query query, VespaBackend searcher, int partId, int distKey)
             throws InvalidProtocolBufferException {
         var protobuf = SearchProtocol.SearchReply.parseFrom(payload);
         return convertToResult(query, protobuf, searcher.getDocumentDatabase(query), partId, distKey);
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java
index 8221391afe6..9fd602032e9 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.dispatch.rpc;
 
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.dispatch.FillInvoker;
@@ -37,12 +37,12 @@ public class RpcInvokerFactory extends InvokerFactory {
     }
 
     @Override
-    protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackEndSearcher searcher, Query query, int maxHits, Node node) {
+    protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackend searcher, Query query, int maxHits, Node node) {
         return Optional.of(new RpcSearchInvoker(searcher, compressor, node, rpcResourcePool, maxHits));
     }
 
     @Override
-    public FillInvoker createFillInvoker(VespaBackEndSearcher searcher, Result result) {
+    public FillInvoker createFillInvoker(VespaBackend searcher, Result result) {
         Query query = result.getQuery();
 
         boolean summaryNeedsQuery = searcher.summaryNeedsQuery(query);
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcSearchInvoker.java
index 93e09a04180..fb028358caf 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcSearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcSearchInvoker.java
@@ -2,14 +2,13 @@
 package com.yahoo.search.dispatch.rpc;
 
 import com.yahoo.compress.Compressor;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.dispatch.InvokerResult;
 import com.yahoo.search.dispatch.SearchInvoker;
 import com.yahoo.search.dispatch.rpc.Client.ProtobufResponse;
 import com.yahoo.search.dispatch.searchcluster.Node;
 import com.yahoo.search.result.ErrorMessage;
-import com.yahoo.search.searchchain.Execution;
 
 import java.io.IOException;
 import java.util.Optional;
@@ -26,7 +25,7 @@ public class RpcSearchInvoker extends SearchInvoker implements Client.ResponseRe
 
     private static final String RPC_METHOD = "vespa.searchprotocol.search";
 
-    private final VespaBackEndSearcher searcher;
+    private final VespaBackend searcher;
     private final Node node;
     private final RpcConnectionPool resourcePool;
     private final BlockingQueue<Client.ResponseOrError<ProtobufResponse>> responses;
@@ -35,7 +34,7 @@ public class RpcSearchInvoker extends SearchInvoker implements Client.ResponseRe
 
     private Query query;
 
-    RpcSearchInvoker(VespaBackEndSearcher searcher, CompressPayload compressor, Node node, RpcConnectionPool resourcePool, int maxHits) {
+    RpcSearchInvoker(VespaBackend searcher, CompressPayload compressor, Node node, RpcConnectionPool resourcePool, int maxHits) {
         super(Optional.of(node));
         this.searcher = searcher;
         this.node = node;
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
index 0b3179f5ad6..6eb69c76afd 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
@@ -8,7 +8,7 @@ import com.yahoo.prelude.IndexFacts;
 import com.yahoo.prelude.Ping;
 import com.yahoo.prelude.Pong;
 import com.yahoo.language.process.SpecialTokenRegistry;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.processing.Processor;
 import com.yahoo.processing.Request;
 import com.yahoo.processing.Response;
@@ -534,7 +534,7 @@ public class Execution extends com.yahoo.processing.execution.Execution {
      */
     @Deprecated  // TODO Remove on Vespa 9.
     public void fillAttributes(Result result) {
-        fill(result, VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
+        fill(result, VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
index 0685a77d7a9..64a989fd0e7 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import com.yahoo.component.chain.dependencies.After;
-import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
+import static com.yahoo.prelude.fastsearch.VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
 import com.yahoo.processing.request.CompoundName;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java
index 5fef90c2012..e367bb58f80 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java
@@ -15,7 +15,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.logging.Logger;
 
-import static com.yahoo.vespa.streamingvisitors.StreamingSearcher.STREAMING_STATISTICS;
+import static com.yahoo.vespa.streamingvisitors.StreamingBackend.STREAMING_STATISTICS;
 
 /**
  * Generates mail-specific query metrics.
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingBackend.java
index 2f3b48b5683..9953d76f50a 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingBackend.java
@@ -14,7 +14,7 @@ import com.yahoo.prelude.Pong;
 import com.yahoo.prelude.fastsearch.FastHit;
 import com.yahoo.prelude.fastsearch.GroupingListHit;
 import com.yahoo.prelude.fastsearch.TimeoutException;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.processing.request.CompoundName;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
@@ -44,7 +44,7 @@ import java.util.logging.Logger;
  * @author  baldersheim
  * @author  Ulf Carlin
  */
-public class StreamingSearcher extends VespaBackEndSearcher {
+public class StreamingBackend extends VespaBackend {
 
     private static final CompoundName streamingUserid = CompoundName.from("streaming.userid");
     private static final CompoundName streamingGroupname = CompoundName.from("streaming.groupname");
@@ -53,7 +53,7 @@ public class StreamingSearcher extends VespaBackEndSearcher {
     static final String STREAMING_STATISTICS = "streaming.statistics";
     private final VisitorFactory visitorFactory;
     private final TracingOptions tracingOptions;
-    private static final Logger log = Logger.getLogger(StreamingSearcher.class.getName());
+    private static final Logger log = Logger.getLogger(StreamingBackend.class.getName());
 
     private Route route;
 
@@ -63,17 +63,17 @@ public class StreamingSearcher extends VespaBackEndSearcher {
     /** The route to the storage cluster. */
     private String storageClusterRouteSpec = null;
 
-    StreamingSearcher(VisitorFactory visitorFactory) {
+    StreamingBackend(VisitorFactory visitorFactory) {
         this.visitorFactory = visitorFactory;
         tracingOptions = TracingOptions.DEFAULT;
     }
 
-    StreamingSearcher(VisitorFactory visitorFactory, TracingOptions tracingOptions) {
+    StreamingBackend(VisitorFactory visitorFactory, TracingOptions tracingOptions) {
         this.visitorFactory = visitorFactory;
         this.tracingOptions = tracingOptions;
     }
 
-    public StreamingSearcher(VespaDocumentAccess access) {
+    public StreamingBackend(VespaDocumentAccess access) {
         this(new VespaVisitorFactory(access));
     }
 
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
index e638e0cf12a..bb155e3f934 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/StreamingVisitor.java
@@ -267,7 +267,7 @@ class StreamingVisitor extends VisitorDataHandler implements Visitor {
                 log.log(Level.FINE, () -> "StreamingVisitor returned from waitUntilDone without being completed for " + query +
                                           " with selection " + params.getDocumentSelection());
                 session.abort();
-                throw new TimeoutException("Query timed out in " + StreamingSearcher.class.getName());
+                throw new TimeoutException("Query timed out in " + StreamingBackend.class.getName());
             }
         } finally {
             session.destroy();
diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
index 2b00bac5316..d52fbe580a7 100644
--- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
@@ -9,7 +9,7 @@ import com.yahoo.container.handler.ClustersStatus;
 import com.yahoo.container.handler.VipStatus;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.prelude.fastsearch.FastHit;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.config.ClusterConfig;
@@ -74,7 +74,7 @@ public class ClusterSearcherTestCase {
 
     @Test
     void testThatDocumentTypesAreResolved() {
-        var backend = new MyMockSearcher(false);
+        var backend = new MyMockBackend(false);
         SchemaInfo schemaInfo = createSchemaInfo();
         ClusterSearcher cluster1 = new ClusterSearcher(schemaInfo, Map.of("type1", backend, "type2", backend, "type3", backend));
         try {
@@ -115,7 +115,7 @@ public class ClusterSearcherTestCase {
 
     @Test
     void testThatDocumentTypesAreResolvedTODO_REMOVE() {
-        var backend = new MyMockSearcher(false);
+        var backend = new MyMockBackend(false);
         SchemaInfo schemaInfo = createSchemaInfo();
         ClusterSearcher cluster1 = new ClusterSearcher(schemaInfo, Map.of("type1", backend, "type2", backend, "type3", backend));
         try {
@@ -130,7 +130,7 @@ public class ClusterSearcherTestCase {
         }
     }
 
-    private static class MyMockSearcher extends VespaBackEndSearcher {
+    private static class MyMockBackend extends VespaBackend {
 
         private final String type1 = "type1";
         private final String type2 = "type2";
@@ -187,7 +187,7 @@ public class ClusterSearcherTestCase {
                                              createHit(getId(type3, 2), 5)));
         }
 
-        MyMockSearcher(boolean expectAttributePrefetch) {
+        MyMockBackend(boolean expectAttributePrefetch) {
             this.expectAttributePrefetch = expectAttributePrefetch;
             init();
         }
@@ -254,8 +254,8 @@ public class ClusterSearcherTestCase {
     }
 
     private Execution createExecution(List<String> docTypesList, boolean expectAttributePrefetch) {
-        var backend = new MyMockSearcher(expectAttributePrefetch);
-        Map<String, VespaBackEndSearcher> searchers = new HashMap<>();
+        var backend = new MyMockBackend(expectAttributePrefetch);
+        Map<String, VespaBackend> searchers = new HashMap<>();
         for(String schema : docTypesList) {
             searchers.put(schema, backend);
         }
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
index 8270700a66b..3928743c954 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
@@ -6,9 +6,9 @@ import com.yahoo.container.handler.VipStatus;
 import com.yahoo.container.protect.Error;
 import com.yahoo.prelude.fastsearch.ClusterParams;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
-import com.yahoo.prelude.fastsearch.FastSearcher;
+import com.yahoo.prelude.fastsearch.FastBackend;
 import com.yahoo.prelude.fastsearch.SummaryParameters;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.dispatch.MockDispatcher;
@@ -44,8 +44,8 @@ public class FastSearcherTestCase {
 
     @Test
     void testNullQuery() {
-        Logger.getLogger(FastSearcher.class.getName()).setLevel(Level.ALL);
-        FastSearcher fastSearcher = new FastSearcher("container.0",
+        Logger.getLogger(FastBackend.class.getName()).setLevel(Level.ALL);
+        FastBackend fastSearcher = new FastBackend("container.0",
                 MockDispatcher.create(List.of()),
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -62,7 +62,7 @@ public class FastSearcherTestCase {
         assertEquals(Error.NULL_QUERY.code, message.getCode());
     }
 
-    private Result doSearch(VespaBackEndSearcher searcher, Query query, int offset, int hits) {
+    private Result doSearch(VespaBackend searcher, Query query, int offset, int hits) {
         query.setOffset(offset);
         query.setHits(hits);
         return searcher.search(SCHEMA, query);
@@ -70,7 +70,7 @@ public class FastSearcherTestCase {
 
     @Test
     void testSinglePassGroupingIsForcedWithSingleNodeGroups() {
-        FastSearcher fastSearcher = new FastSearcher("container.0",
+        FastBackend fastSearcher = new FastBackend("container.0",
                 MockDispatcher.create(List.of(new Node(CLUSTER, 0, "host0", 0))),
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -93,7 +93,7 @@ public class FastSearcherTestCase {
 
     @Test
     void testRankProfileValidation() {
-        FastSearcher fastSearcher = new FastSearcher("container.0",
+        FastBackend fastSearcher = new FastBackend("container.0",
                 MockDispatcher.create(List.of(new Node(CLUSTER, 0, "host0", 0))),
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -112,7 +112,7 @@ public class FastSearcherTestCase {
                 .add(new RankProfile.Builder("default").setHasRankFeatures(false)
                         .setHasSummaryFeatures(false)
                         .build());
-        FastSearcher backend = new FastSearcher("container.0",
+        FastBackend backend = new FastBackend("container.0",
                 MockDispatcher.create(Collections.singletonList(new Node(CLUSTER, 0, "host0", 0))),
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -132,7 +132,7 @@ public class FastSearcherTestCase {
     void testSinglePassGroupingIsNotForcedWithSingleNodeGroups() {
         MockDispatcher dispatcher = MockDispatcher.create(List.of(new Node(CLUSTER, 0, "host0", 0), new Node(CLUSTER, 2, "host1", 0)));
 
-        FastSearcher fastSearcher = new FastSearcher("container.0",
+        FastBackend fastSearcher = new FastBackend("container.0",
                 dispatcher,
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -182,11 +182,11 @@ public class FastSearcherTestCase {
         assertTrue(vipStatus.isInRotation()); //Verify that deconstruct does not touch vipstatus
     }
 
-    private String searchError(String query, VespaBackEndSearcher searcher) {
+    private String searchError(String query, VespaBackend searcher) {
         return search(query, searcher).hits().getError().getDetailedMessage();
     }
 
-    private Result search(String query, VespaBackEndSearcher searcher) {
+    private Result search(String query, VespaBackend searcher) {
         return searcher.search(SCHEMA, new Query(query));
     }
 
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java
index a033ccdace6..cf5a0ca7bd9 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java
@@ -3,7 +3,7 @@ package com.yahoo.prelude.fastsearch.test;
 
 import com.yahoo.component.chain.Chain;
 import com.yahoo.prelude.fastsearch.FastHit;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.*;
  */
 public class PartialFillTestCase {
 
-    public static class FS4 extends VespaBackEndSearcher {
+    public static class FS4 extends VespaBackend {
         public List<Result> history = new ArrayList<>();
         protected Result doSearch2(String schema, Query query) {
             return new Result(query);
@@ -32,7 +32,7 @@ public class PartialFillTestCase {
         }
     }
 
-    public static class BadFS4 extends VespaBackEndSearcher {
+    public static class BadFS4 extends VespaBackend {
         protected Result doSearch2(String schema, Query query) {
             return new Result(query);
         }
@@ -137,7 +137,7 @@ public class PartialFillTestCase {
         }
     }
 
-    private void doFill(VespaBackEndSearcher searcher, Result result, String summaryClass) {
+    private void doFill(VespaBackend searcher, Result result, String summaryClass) {
         searcher.fill(result, summaryClass);
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
index 23846db3f0b..c966fbc200d 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
@@ -3,7 +3,7 @@ package com.yahoo.search.dispatch;
 
 import com.yahoo.compress.CompressionType;
 import com.yahoo.prelude.Pong;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.cluster.ClusterMonitor;
@@ -236,7 +236,7 @@ public class DispatcherTest {
 
         // This factory just forwards search to the dummy RPC layer above, nothing more.
         InvokerFactoryFactory invokerFactories = (rpcConnectionPool, searchGroups, dispatchConfig) -> new InvokerFactory(searchGroups, dispatchConfig) {
-            @Override protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackEndSearcher searcher, Query query, int maxHits, Node node) {
+            @Override protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackend searcher, Query query, int maxHits, Node node) {
                 return Optional.of(new SearchInvoker(Optional.of(node)) {
                     @Override protected Object sendSearchRequest(Query query, Object context) {
                         rpcPool.getConnection(node.key()).request(null, null, 0, null, null, 0);
@@ -248,7 +248,7 @@ public class DispatcherTest {
                     @Override protected void release() { }
                 });
             };
-            @Override public FillInvoker createFillInvoker(VespaBackEndSearcher searcher, Result result) {
+            @Override public FillInvoker createFillInvoker(VespaBackend searcher, Result result) {
                 return new FillInvoker() {
                     @Override protected void getFillResults(Result result, String summaryClass) { fail(); }
                     @Override protected void sendFillRequest(Result result, String summaryClass) { fail(); }
@@ -369,7 +369,7 @@ public class DispatcherTest {
         }
 
         @Override
-        public Optional<SearchInvoker> createSearchInvoker(VespaBackEndSearcher searcher,
+        public Optional<SearchInvoker> createSearchInvoker(VespaBackend searcher,
                                                            Query query,
                                                            List<Node> nodes,
                                                            boolean acceptIncompleteCoverage,
@@ -391,7 +391,7 @@ public class DispatcherTest {
         }
 
         @Override
-        protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackEndSearcher searcher,
+        protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackend searcher,
                                                                   Query query,
                                                                   int maxHitsPerNode,
                                                                   Node node) {
@@ -400,7 +400,7 @@ public class DispatcherTest {
         }
 
         @Override
-        public FillInvoker createFillInvoker(VespaBackEndSearcher searcher, Result result) {
+        public FillInvoker createFillInvoker(VespaBackend searcher, Result result) {
             fail("Unexpected call to createFillInvoker");
             return null;
         }
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
index 2600d8612f8..ef8e0522337 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
@@ -5,7 +5,7 @@ package com.yahoo.search.dispatch.rpc;
 import ai.vespa.searchlib.searchprotocol.protobuf.SearchProtocol;
 import com.google.common.collect.ImmutableMap;
 import com.yahoo.compress.CompressionType;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.dispatch.searchcluster.Node;
@@ -117,8 +117,8 @@ public class RpcSearchInvokerTest {
         };
     }
 
-    private VespaBackEndSearcher mockSearcher() {
-        return new VespaBackEndSearcher() {
+    private VespaBackend mockSearcher() {
+        return new VespaBackend() {
             @Override
             protected Result doSearch2(String schema, Query query) {
                 fail("Unexpected call");
diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
index 4455c8a04a5..87d18c18db5 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
@@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 import com.yahoo.search.schema.DocumentSummary;
 import com.yahoo.search.schema.Schema;
@@ -21,7 +20,7 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.search.searchchain.testutil.DocumentSourceSearcher;
 import static com.yahoo.search.searchchain.testutil.DocumentSourceSearcher.DEFAULT_SUMMARY_CLASS;
-import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
+import static com.yahoo.prelude.fastsearch.VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
 
 
 /**
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
index 831261bb91a..5cc0e6b060b 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
@@ -134,9 +134,9 @@ public class MetricsSearcherTestCase {
 
         private void assignContextProperties(Query query, String loadType) {
             if (loadType != null && loadType.equals(LOADTYPE1)) {
-                query.getContext(true).setProperty(StreamingSearcher.STREAMING_STATISTICS, visitorStats);
+                query.getContext(true).setProperty(StreamingBackend.STREAMING_STATISTICS, visitorStats);
             } else {
-                query.getContext(true).setProperty(StreamingSearcher.STREAMING_STATISTICS, null);
+                query.getContext(true).setProperty(StreamingBackend.STREAMING_STATISTICS, null);
             }
         }
     }
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
index c7e95f802ab..b96dd97f76c 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
@@ -159,7 +159,7 @@ public class StreamingSearcherTestCase {
         }
     }
 
-    private static Result executeQuery(StreamingSearcher searcher, Query query) {
+    private static Result executeQuery(StreamingBackend searcher, Query query) {
         return searcher.doSearch2("test", query);
     }
 
@@ -181,7 +181,7 @@ public class StreamingSearcherTestCase {
         return queries;
     }
 
-    private static void checkError(StreamingSearcher searcher, String queryString, String message, String detailedMessage) {
+    private static void checkError(StreamingBackend searcher, String queryString, String message, String detailedMessage) {
         for (Query query : generateTestQueries(queryString)) {
             Result result = executeQuery(searcher, query);
             assertNotNull(result.hits().getError());
@@ -194,7 +194,7 @@ public class StreamingSearcherTestCase {
         }
     }
 
-    private static void checkSearch(StreamingSearcher searcher, String queryString, int hitCount, String idPrefix) {
+    private static void checkSearch(StreamingBackend searcher, String queryString, int hitCount, String idPrefix) {
         for (Query query : generateTestQueries(queryString)) {
             Result result = executeQuery(searcher, query);
             assertNull(result.hits().getError());
@@ -212,11 +212,11 @@ public class StreamingSearcherTestCase {
         }
     }
 
-    private static void checkGrouping(StreamingSearcher searcher, String queryString, int hitCount) {
+    private static void checkGrouping(StreamingBackend searcher, String queryString, int hitCount) {
         checkSearch(searcher, queryString, hitCount, null);
     }
 
-    private static void checkMatchFeatures(StreamingSearcher searcher) {
+    private static void checkMatchFeatures(StreamingBackend searcher) {
         String queryString = "/?streaming.selection=true&query=match_features";
         Result result = executeQuery(searcher, new Query(queryString));
         assertNull(result.hits().getError());
@@ -229,7 +229,7 @@ public class StreamingSearcherTestCase {
     @Test
     void testBasics() {
         MockVisitorFactory factory = new MockVisitorFactory();
-        StreamingSearcher searcher = new StreamingSearcher(factory);
+        StreamingBackend searcher = new StreamingBackend(factory);
 
         var schema = new Schema.Builder("test");
         schema.add(new com.yahoo.search.schema.DocumentSummary.Builder("default").build());
@@ -276,25 +276,25 @@ public class StreamingSearcherTestCase {
         String groupId2 = "id:namespace:mytype:g=group2:userspecific";
         String badId = "unknowscheme:namespace:something";
 
-        assertTrue(StreamingSearcher.verifyDocId(userId1, generalQuery, true));
-
-        assertTrue(StreamingSearcher.verifyDocId(userId1, generalQuery, false));
-        assertTrue(StreamingSearcher.verifyDocId(userId2, generalQuery, false));
-        assertTrue(StreamingSearcher.verifyDocId(groupId1, generalQuery, false));
-        assertTrue(StreamingSearcher.verifyDocId(groupId2, generalQuery, false));
-        assertFalse(StreamingSearcher.verifyDocId(badId, generalQuery, false));
-
-        assertTrue(StreamingSearcher.verifyDocId(userId1, user1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(userId2, user1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(groupId1, user1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(groupId2, user1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(badId, user1Query, false));
-
-        assertFalse(StreamingSearcher.verifyDocId(userId1, group1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(userId2, group1Query, false));
-        assertTrue(StreamingSearcher.verifyDocId(groupId1, group1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(groupId2, group1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(badId, group1Query, false));
+        assertTrue(StreamingBackend.verifyDocId(userId1, generalQuery, true));
+
+        assertTrue(StreamingBackend.verifyDocId(userId1, generalQuery, false));
+        assertTrue(StreamingBackend.verifyDocId(userId2, generalQuery, false));
+        assertTrue(StreamingBackend.verifyDocId(groupId1, generalQuery, false));
+        assertTrue(StreamingBackend.verifyDocId(groupId2, generalQuery, false));
+        assertFalse(StreamingBackend.verifyDocId(badId, generalQuery, false));
+
+        assertTrue(StreamingBackend.verifyDocId(userId1, user1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(userId2, user1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(groupId1, user1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(groupId2, user1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(badId, user1Query, false));
+
+        assertFalse(StreamingBackend.verifyDocId(userId1, group1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(userId2, group1Query, false));
+        assertTrue(StreamingBackend.verifyDocId(groupId1, group1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(groupId2, group1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(badId, group1Query, false));
     }
 
     private static class TraceFixture {
@@ -304,13 +304,13 @@ public class StreamingSearcherTestCase {
         TracingOptions options;
 
         MockVisitorFactory factory;
-        StreamingSearcher searcher;
+        StreamingBackend searcher;
 
         private TraceFixture(Long firstTimestamp, Long... additionalTimestamps) {
             clock = MockUtils.mockedClockReturning(firstTimestamp, additionalTimestamps);
             options = new TracingOptions(sampler, exporter, clock, 8, 2.0);
             factory = new MockVisitorFactory();
-            searcher = new StreamingSearcher(factory, options);
+            searcher = new StreamingBackend(factory, options);
         }
 
         private TraceFixture() {