Handle nested names

2 files changed, 5 insertions, 3 deletions

diff --git a/model-integration/src/main/javacc/ModelParser.jj b/model-integration/src/main/javacc/ModelParser.jj
index a5510dd89f3..5dde54e88e2 100644
--- a/model-integration/src/main/javacc/ModelParser.jj
+++ b/model-integration/src/main/javacc/ModelParser.jj
@@ -142,8 +142,9 @@ void model() :
     (<NL>)*
     <EOF>
     {
-        if ( ! name.equals(model.name()))
-            throw new IllegalArgumentException("Model '" + name + "' must be saved in a file named '" + name + ".model'");
+        if ( ! model.name().endsWith(name))
+            throw new IllegalArgumentException("Unexpected model name '" + model.name() +
+                                               "': Model '" + name + "' must be saved in a file named '" + name + ".model'");
     }
 }
 
diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java
index 767af147ad7..25a24792432 100644
--- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java
+++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java
@@ -74,7 +74,8 @@ public class VespaImportTestCase {
             fail("Expected exception");
         }
         catch (IllegalArgumentException e) {
-            assertEquals("Model 'expectedname' must be saved in a file named 'expectedname.model'", e.getMessage());
+            assertEquals("Unexpected model name 'misnamed': " +
+                         "Model 'expectedname' must be saved in a file named 'expectedname.model'", e.getMessage());
         }
     }