1 files changed, 8 insertions, 8 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
index 77d20657f64..4db5f312cae 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
@@ -30,8 +30,8 @@ public class RankingExpressionWithOnnxTestCase {
 
     private final Path applicationDir = Path.fromString("src/test/integration/onnx/");
 
-    /** The model name - an artifact of the fact that the model here is not placed in the expected directory (models) */
-    private final static String name = "test_integration_onnx_models_mnist_softmax_onnx";
+    /** The model name */
+    private final static String name = "mnist_softmax_onnx";
 
     private final static String vespaExpression = "join(reduce(join(rename(Placeholder, (d0, d1), (d0, d2)), constant(" + name + "_Variable), f(a,b)(a * b)), sum, d2), constant(" + name + "_Variable_1), f(a,b)(a + b))";
 
@@ -168,9 +168,9 @@ public class RankingExpressionWithOnnxTestCase {
         }
         catch (IllegalArgumentException expected) {
             assertEquals("Rank profile 'my_profile' is invalid: Could not use Onnx model from " +
-                            "onnx('mnist_softmax.onnx','y'): " +
-                            "No expressions named 'y' in model 'mnist_softmax.onnx'. Available expressions: mnist_softmax.onnx.default.add",
-                    Exceptions.toMessageString(expected));
+                         "onnx('mnist_softmax.onnx','y'): " +
+                         "No expressions named 'y' in model 'mnist_softmax.onnx'. Available expressions: mnist_softmax_onnx.default.add",
+                         Exceptions.toMessageString(expected));
         }
     }
 
@@ -230,7 +230,7 @@ public class RankingExpressionWithOnnxTestCase {
         search.assertFirstPhaseExpression(vespaExpressionWithoutConstant, "my_profile");
 
         assertNull("Constant overridden by macro is not added",
-                search.search().getRankingConstants().get( name + "_Variable"));
+                search.search().rankingConstants().get( name + "_Variable"));
         assertLargeConstant( name + "_Variable_1", search, Optional.of(10L));
 
         // At this point the expression is stored - copy application to another location which do not have a models dir
@@ -244,7 +244,7 @@ public class RankingExpressionWithOnnxTestCase {
             searchFromStored.compileRankProfile("my_profile", applicationDir.append("models"));
             searchFromStored.assertFirstPhaseExpression(vespaExpressionWithoutConstant, "my_profile");
             assertNull("Constant overridden by macro is not added",
-                    searchFromStored.search().getRankingConstants().get( name + "_Variable"));
+                    searchFromStored.search().rankingConstants().get( name + "_Variable"));
             assertLargeConstant( name + "_Variable_1", searchFromStored, Optional.of(10L));
         } finally {
             IOUtils.recursiveDeleteDir(storedApplicationDirectory.toFile());
@@ -258,7 +258,7 @@ public class RankingExpressionWithOnnxTestCase {
     private void assertLargeConstant(String name, RankProfileSearchFixture search, Optional<Long> expectedSize) {
         try {
             Path constantApplicationPackagePath = Path.fromString("models.generated/mnist_softmax.onnx/constants").append(name + ".tbf");
-            RankingConstant rankingConstant = search.search().getRankingConstants().get(name);
+            RankingConstant rankingConstant = search.search().rankingConstants().get(name);
             assertEquals(name, rankingConstant.getName());
             assertTrue(rankingConstant.getFileName().endsWith(constantApplicationPackagePath.toString()));