6 files changed, 17 insertions, 17 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
index e3ba40c9037..b3f0959029c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
@@ -58,7 +58,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
         owningCluster.addComponent(Component.fromClassAndBundle(com.yahoo.search.schema.SchemaInfo.class, SEARCH_AND_DOCPROC_BUNDLE));
         owningCluster.addComponent(Component.fromClassAndBundle(SearchStatusExtension.class, SEARCH_AND_DOCPROC_BUNDLE));
         owningCluster.addComponent(Component.fromClassAndBundle(RankingExpressionEvaluatorFactory.class, SEARCH_AND_DOCPROC_BUNDLE));
-        owningCluster.addComponent(Component.fromClassAndBundle(com.yahoo.search.ranking.GlobalPhaseHelper.class, SEARCH_AND_DOCPROC_BUNDLE));
+        owningCluster.addComponent(Component.fromClassAndBundle(com.yahoo.search.ranking.GlobalPhaseRanker.class, SEARCH_AND_DOCPROC_BUNDLE));
         cluster.addSearchAndDocprocBundles();
     }
 
@@ -75,7 +75,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
                 var dispatcher = new DispatcherComponent(indexed);
                 owningCluster.addComponent(dispatcher);
                 for (var documentDb : indexed.getDocumentDbs()) {
-                    var factory = new RankingExpressionEvaluatorProxyComponent(documentDb);
+                    var factory = new RankProfilesEvaluatorComponent(documentDb);
                     if (! owningCluster.getComponentsMap().containsKey(factory.getComponentId())) {
                         owningCluster.addComponent(factory);
                     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/RankingExpressionEvaluatorProxyComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/RankProfilesEvaluatorComponent.java
index 6e0f2249d06..75a2802ee53 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/RankingExpressionEvaluatorProxyComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/RankProfilesEvaluatorComponent.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.model.container.search;
 
 import com.yahoo.config.model.producer.AnyConfigProducer;
 import com.yahoo.osgi.provider.model.ComponentModel;
-import com.yahoo.search.ranking.RankingExpressionEvaluatorProxy;
+import com.yahoo.search.ranking.RankProfilesEvaluator;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.core.OnnxModelsConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
@@ -13,7 +13,7 @@ import com.yahoo.vespa.model.container.PlatformBundles;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.search.DocumentDatabase;
 
-public class RankingExpressionEvaluatorProxyComponent
+public class RankProfilesEvaluatorComponent
     extends Component<AnyConfigProducer, ComponentModel>
     implements
         RankProfilesConfig.Producer,
@@ -23,7 +23,7 @@ public class RankingExpressionEvaluatorProxyComponent
 {
     private final DocumentDatabase ddb;
 
-    public RankingExpressionEvaluatorProxyComponent(DocumentDatabase db) {
+    public RankProfilesEvaluatorComponent(DocumentDatabase db) {
         super(toComponentModel(db.getSchemaName()));
         ddb = db;
     }
@@ -31,7 +31,7 @@ public class RankingExpressionEvaluatorProxyComponent
     private static ComponentModel toComponentModel(String p) {
         String myComponentId = "ranking-expression-evaluator." + p;
         return new ComponentModel(myComponentId,
-                                  RankingExpressionEvaluatorProxy.class.getName(),
+                                  RankProfilesEvaluator.class.getName(),
                                   PlatformBundles.SEARCH_AND_DOCPROC_BUNDLE);
     }
 
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 c29c7d12f9a..7787d7d7702 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
@@ -20,7 +20,7 @@ import com.yahoo.search.Searcher;
 import com.yahoo.search.config.ClusterConfig;
 import com.yahoo.search.dispatch.Dispatcher;
 import com.yahoo.search.query.ParameterParser;
-import com.yahoo.search.ranking.GlobalPhaseHelper;
+import com.yahoo.search.ranking.GlobalPhaseRanker;
 import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.schema.SchemaInfo;
 import com.yahoo.search.searchchain.Execution;
@@ -65,7 +65,7 @@ public class ClusterSearcher extends Searcher {
 
     private final VespaBackEndSearcher server;
     private final Executor executor;
-    private final GlobalPhaseHelper globalPhaseHelper;
+    private final GlobalPhaseRanker globalPhaseHelper;
 
     @Inject
     public ClusterSearcher(ComponentId id,
@@ -75,7 +75,7 @@ public class ClusterSearcher extends Searcher {
                            DocumentdbInfoConfig documentDbConfig,
                            SchemaInfo schemaInfo,
                            ComponentRegistry<Dispatcher> dispatchers,
-                           GlobalPhaseHelper globalPhaseHelper,
+                           GlobalPhaseRanker globalPhaseHelper,
                            VipStatus vipStatus,
                            VespaDocumentAccess access) {
         super(id);
diff --git a/container-search/src/main/java/com/yahoo/search/ranking/GlobalPhaseHelper.java b/container-search/src/main/java/com/yahoo/search/ranking/GlobalPhaseRanker.java
index be4ba5444fe..fefe8583f3f 100644
--- a/container-search/src/main/java/com/yahoo/search/ranking/GlobalPhaseHelper.java
+++ b/container-search/src/main/java/com/yahoo/search/ranking/GlobalPhaseRanker.java
@@ -19,15 +19,15 @@ import java.util.Set;
 import java.util.logging.Logger;
 import java.util.function.Supplier;
 
-public class GlobalPhaseHelper {
+public class GlobalPhaseRanker {
 
-    private static final Logger logger = Logger.getLogger(GlobalPhaseHelper.class.getName());
+    private static final Logger logger = Logger.getLogger(GlobalPhaseRanker.class.getName());
     private final RankingExpressionEvaluatorFactory factory;
     private final Set<String> skipProcessing = new HashSet<>();
     private final Map<String, Supplier<FunctionEvaluator>> scorers = new HashMap<>();
 
     @Inject
-    public GlobalPhaseHelper(RankingExpressionEvaluatorFactory factory) {
+    public GlobalPhaseRanker(RankingExpressionEvaluatorFactory factory) {
         this.factory = factory;
         logger.info("using factory: " + factory);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/ranking/RankingExpressionEvaluatorProxy.java b/container-search/src/main/java/com/yahoo/search/ranking/RankProfilesEvaluator.java
index b4ee33263f1..ccb9b9837fe 100644
--- a/container-search/src/main/java/com/yahoo/search/ranking/RankingExpressionEvaluatorProxy.java
+++ b/container-search/src/main/java/com/yahoo/search/ranking/RankProfilesEvaluator.java
@@ -19,12 +19,12 @@ import com.yahoo.vespa.config.search.core.RankingExpressionsConfig;
  * @author arnej
  */
 @Beta
-public class RankingExpressionEvaluatorProxy extends AbstractComponent {
+public class RankProfilesEvaluator extends AbstractComponent {
 
     private final ModelsEvaluator evaluator;
 
     @Inject
-    public RankingExpressionEvaluatorProxy(
+    public RankProfilesEvaluator(
             RankProfilesConfig rankProfilesConfig,
             RankingConstantsConfig constantsConfig,
             RankingExpressionsConfig expressionsConfig,
diff --git a/container-search/src/main/java/com/yahoo/search/ranking/RankingExpressionEvaluatorFactory.java b/container-search/src/main/java/com/yahoo/search/ranking/RankingExpressionEvaluatorFactory.java
index 8ec3fc919db..b7b3020392f 100644
--- a/container-search/src/main/java/com/yahoo/search/ranking/RankingExpressionEvaluatorFactory.java
+++ b/container-search/src/main/java/com/yahoo/search/ranking/RankingExpressionEvaluatorFactory.java
@@ -13,14 +13,14 @@ import com.yahoo.component.provider.ComponentRegistry;
 @Beta
 public class RankingExpressionEvaluatorFactory {
 
-    private final ComponentRegistry<RankingExpressionEvaluatorProxy> registry;
+    private final ComponentRegistry<RankProfilesEvaluator> registry;
 
     @Inject
-    public RankingExpressionEvaluatorFactory(ComponentRegistry<RankingExpressionEvaluatorProxy> registry) {
+    public RankingExpressionEvaluatorFactory(ComponentRegistry<RankProfilesEvaluator> registry) {
         this.registry = registry;
     }
 
-    public RankingExpressionEvaluatorProxy proxyForSchema(String schemaName) {
+    public RankProfilesEvaluator proxyForSchema(String schemaName) {
         var component = registry.getComponent("ranking-expression-evaluator." + schemaName);
         if (component == null) {
             throw new IllegalArgumentException("ranking expression evaluator for schema '" + schemaName + "' not found");