1 files changed, 6 insertions, 6 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorFlowTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorFlowTestCase.java
index 970df5b858a..2460e70bd8b 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorFlowTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorFlowTestCase.java
@@ -264,10 +264,10 @@ public class RankingExpressionWithTensorFlowTestCase {
     public void testImportingFromStoredExpressionsWithFunctionOverridingConstantAndInheritance() throws IOException {
         String rankProfiles =
                 "  rank-profile my_profile {\n" +
-                "    macro Placeholder() {\n" +
+                "    function Placeholder() {\n" +
                 "      expression: tensor(d0[2],d1[784])(0.0)\n" +
                 "    }\n" +
-                "    macro " + name + "_layer_Variable_read() {\n" +
+                "    function " + name + "_layer_Variable_read() {\n" +
                 "      expression: tensor(d1[10],d2[784])(0.0)\n" +
                 "    }\n" +
                 "    first-phase {\n" +
@@ -285,7 +285,7 @@ public class RankingExpressionWithTensorFlowTestCase {
         search.assertFirstPhaseExpression(vespaExpressionWithoutConstant, "my_profile");
         search.assertFirstPhaseExpression(vespaExpressionWithoutConstant, "my_profile_child");
 
-        assertNull("Constant overridden by macro is not added",
+        assertNull("Constant overridden by function is not added",
                    search.search().rankingConstants().get("mnist_softmax_saved_layer_Variable_read"));
 
         // At this point the expression is stored - copy application to another location which do not have a models dir
@@ -300,7 +300,7 @@ public class RankingExpressionWithTensorFlowTestCase {
             searchFromStored.compileRankProfile("my_profile_child", applicationDir.append("models"));
             searchFromStored.assertFirstPhaseExpression(vespaExpressionWithoutConstant, "my_profile");
             searchFromStored.assertFirstPhaseExpression(vespaExpressionWithoutConstant, "my_profile_child");
-            assertNull("Constant overridden by macro is not added",
+            assertNull("Constant overridden by function is not added",
                        searchFromStored.search().rankingConstants().get("mnist_softmax_saved_layer_Variable_read"));
         }
         finally {
@@ -339,7 +339,7 @@ public class RankingExpressionWithTensorFlowTestCase {
         final String name = "mnist_saved";
         final String rankProfiles =
                 "  rank-profile my_profile {\n" +
-                "    macro input() {\n" +
+                "    function input() {\n" +
                 "      expression: tensor(d0[1],d1[784])(0.0)\n" +
                 "    }\n" +
                 "    first-phase {\n" +
@@ -440,7 +440,7 @@ public class RankingExpressionWithTensorFlowTestCase {
                     application,
                     application.getQueryProfiles(),
                     "  rank-profile my_profile {\n" +
-                    "    macro " + functionName + "() {\n" +
+                    "    function " + functionName + "() {\n" +
                     "      expression: " + functionExpression +
                     "    }\n" +
                     "    first-phase {\n" +