diff --git a/src/lib/helpers/types/agentTypes.js b/src/lib/helpers/types/agentTypes.js
index 61454ba2..b0fb251e 100644
--- a/src/lib/helpers/types/agentTypes.js
+++ b/src/lib/helpers/types/agentTypes.js
@@ -256,8 +256,8 @@
  */
 
 /**
- * @typedef {Object} RuleCriteria
- * @property {string?} [mode] - Criteria mode: llm, code, etc. Takes precedence over the mode carried on the trigger options.
+ * @typedef {Object} RuleCriteriaConfig
+ * @property {string?} [mode] - Criteria mode: llm, python script, etc. Takes precedence over the mode carried on the trigger options.
  * @property {string?} [criteria] - Criteria text
  */
 
@@ -267,7 +267,7 @@
  * @property {string?} [displayName]
  * @property {boolean} disabled
  * @property {string?} [message] - Message sent to agent
- * @property {RuleCriteria?} [criteria]
+ * @property {RuleCriteriaConfig?} [criteria_config]
  * @property {any?} [output_args]
  * @property {string?} [json_args]
  * @property {string?} [statement]
diff --git a/src/routes/page/agent/[agentId]/agent-components/rules/agent-rule-item.svelte b/src/routes/page/agent/[agentId]/agent-components/rules/agent-rule-item.svelte
index bec880e9..f638bc30 100644
--- a/src/routes/page/agent/[agentId]/agent-components/rules/agent-rule-item.svelte
+++ b/src/routes/page/agent/[agentId]/agent-components/rules/agent-rule-item.svelte
@@ -43,7 +43,7 @@
 
     // Code script can only be generated by admins, once a trigger is picked and criteria text exists.
     let canCompile = $derived(
-        !!rule.trigger_name && !!rule.criteria?.criteria?.trim()
+        !!rule.trigger_name && !!rule.criteria_config?.criteria?.trim()
     );
 
     // The rule's own mode wins; otherwise the trigger option's mode applies.
@@ -250,7 +250,7 @@
                     containerStyles={'width: 100%;'}
                     placeholder={modePlaceholder}
                     disabled={rule.disabled}
-                    selectedValues={rule.criteria?.mode ? [rule.criteria.mode] : []}
+                    selectedValues={rule.criteria_config?.mode ? [rule.criteria_config.mode] : []}
                     options={criteriaModeOptions}
                     onselect={e => changeRule(e, 'criteria_mode')}
                 />
@@ -302,7 +302,7 @@
                     maxlength={textLimit}
                     placeholder="Describe when this rule should trigger..."
                     disabled={rule.disabled}
-                    value={rule.criteria?.criteria || ''}
+                    value={rule.criteria_config?.criteria || ''}
                     oninput={e => changeText(e, 'criteria')}
                 ></textarea>
             </div>
diff --git a/src/routes/page/agent/[agentId]/agent-components/rules/agent-rule.svelte b/src/routes/page/agent/[agentId]/agent-components/rules/agent-rule.svelte
index 6f239471..fb9b7b5c 100644
--- a/src/routes/page/agent/[agentId]/agent-components/rules/agent-rule.svelte
+++ b/src/routes/page/agent/[agentId]/agent-components/rules/agent-rule.svelte
@@ -44,7 +44,7 @@
                 trigger_name: x.trigger_name,
                 disabled: x.disabled,
                 message: x.message || null,
-                criteria: normalizeCriteria(x.criteria),
+                criteria_config: normalizeCriteriaConfig(x.criteria_config),
                 expanded: x.expanded
             };
         });
@@ -64,14 +64,14 @@
     }
 
     /**
-     * Collapse a blank criteria into null so the rule is saved without a
-     * criteria object instead of with an empty one.
-     * @param {import('$agentTypes').RuleCriteria | null | undefined} criteria
-     * @returns {import('$agentTypes').RuleCriteria | null}
+     * Collapse a blank criteria config into null so the rule is saved without a
+     * criteria config instead of with an empty one.
+     * @param {import('$agentTypes').RuleCriteriaConfig | null | undefined} config
+     * @returns {import('$agentTypes').RuleCriteriaConfig | null}
      */
-    function normalizeCriteria(criteria) {
-        const mode = criteria?.mode || '';
-        const text = criteria?.criteria || '';
+    function normalizeCriteriaConfig(config) {
+        const mode = config?.mode || '';
+        const text = config?.criteria || '';
         if (!mode.trim() && !text.trim()) return null;
 
         return {
@@ -187,9 +187,9 @@
         } else if (field === 'message') {
             found.message = value;
         } else if (field === 'criteria') {
-            found.criteria = { ...(found.criteria || {}), criteria: value };
+            found.criteria_config = { ...(found.criteria_config || {}), criteria: value };
         } else if (field === 'criteria_mode') {
-            found.criteria = { ...(found.criteria || {}), mode: value };
+            found.criteria_config = { ...(found.criteria_config || {}), mode: value };
         }
 
         handleAgentChange();
@@ -203,7 +203,7 @@
                 displayName: '',
                 disabled: false,
                 message: '',
-                criteria: { mode: '', criteria: '' },
+                criteria_config: { mode: '', criteria: '' },
                 expanded: true
             }
         ];
@@ -287,7 +287,7 @@
                 script_name: `${rule.trigger_name}_criteria.py`,
                 script_type: AgentCodeScriptType.Src,
                 data: {
-                    "user_request": rule.criteria?.criteria
+                    "user_request": rule.criteria_config?.criteria
                 }
             }
         }).then(res => {