diff --git a/rflx/generator/common.py b/rflx/generator/common.py
index 241051f4a..7e039de52 100644
--- a/rflx/generator/common.py
+++ b/rflx/generator/common.py
@@ -775,7 +775,7 @@ def field_condition_call(
         [
             Variable("Ctx"),
             Variable(package * field.affixed_name),
-            *([value] if has_value_dependent_condition(message) else []),
+            *([value] if has_scalar_value_dependent_condition(message) else []),
             *([aggregate] if has_aggregate_dependent_condition(message) else []),
             *([size] if has_size_dependent_condition(message, field) else []),
         ],
@@ -820,7 +820,7 @@ def contains_function_name(refinement_package: ID, pdu: ID, sdu: ID, field: ID)
     return f"{sdu_name.flat}_In_{pdu_name.flat}_{field}"
 
 
-def has_value_dependent_condition(message: model.Message) -> bool:
+def has_scalar_value_dependent_condition(message: model.Message) -> bool:
     return any(
         True
         for l in message.structure
diff --git a/rflx/generator/message.py b/rflx/generator/message.py
index 124da33bf..cc697a023 100644
--- a/rflx/generator/message.py
+++ b/rflx/generator/message.py
@@ -2198,7 +2198,7 @@ def condition(field: Field, message: Message) -> Expr:
         Parameter(["Fld"], "Field"),
         *(
             [Parameter(["Val"], const.TYPES_BASE_INT)]
-            if common.has_value_dependent_condition(message)
+            if common.has_scalar_value_dependent_condition(message)
             else []
         ),
         *(
@@ -2235,7 +2235,7 @@ def condition(field: Field, message: Message) -> Expr:
                                         [Variable("Fld"), Variable("Val")],
                                     ),
                                 ]
-                                if common.has_value_dependent_condition(message)
+                                if common.has_scalar_value_dependent_condition(message)
                                 else []
                             ),
                             Call(
diff --git a/rflx/generator/parser.py b/rflx/generator/parser.py
index f71215111..7dba035cb 100644
--- a/rflx/generator/parser.py
+++ b/rflx/generator/parser.py
@@ -252,7 +252,11 @@ def create_verify_procedure(
                 [
                     Variable("Ctx"),
                     Variable("Fld"),
-                    *([Variable("Value")] if common.has_value_dependent_condition(message) else []),
+                    *(
+                        [Variable("Value")]
+                        if common.has_scalar_value_dependent_condition(message)
+                        else []
+                    ),
                     *(
                         [
                             Slice(