rename classes after review

2 files changed, 6 insertions, 6 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);
     }