diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliCommands.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliCommands.scala
index 015a2d1..2935e8e 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliCommands.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliCommands.scala
@@ -755,7 +755,7 @@
             synopsis = s"Runs ${y("'NCTestAutoModelValidator'")} model auto-validator.",
             desc = Some(
                 s"Validation consists " +
-                s"of starting an embedded probe, scanning for ${y("'NCIntentSample'")} annotations and their corresponding " +
+                s"of starting an embedded probe, scanning all deployed models for ${y("'NCIntentSample'")} annotations and their corresponding " +
                 s"callback methods, submitting each sample input sentences from ${y("'NCIntentSample'")} annotation and " +
                 s"checking that resulting intent matches the intent the sample was attached to. " +
                 s"See more details at https://nlpcraft.apache.org/tools/test_framework.html"
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java
index 21321a2..885149f 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestAutoModelValidator.java
@@ -22,9 +22,9 @@
 
 /**
  * Data model auto-validator is based on {@link NCIntentSample} annotations. Validation consists of starting an embedded
- * probe, scanning for {@link NCIntentSample} annotations and their corresponding callback methods, submitting each sample input
- * sentences from {@link NCIntentSample} annotation and checking that resulting intent matches the intent the sample
- * was attached to.
+ * probe, scanning all deployed models for {@link NCIntentSample} annotations and their corresponding callback methods,
+ * submitting each sample input sentences from {@link NCIntentSample} annotation and checking that resulting intent
+ * matches the intent the sample was attached to.
  * <p>
  * Note that there can be more than one {@link NCIntentSample} annotation attached to the intent callback. Each such
  * annotation will trigger conversation STM reset before its samples will be submitted. This gives an opportunity