this is all of the changes now

tests/e2e/tier3/test_t3_05_rule_criteria.py

@@ -80,7 +80,7 @@ def test_rule_criteria_basic_filtering(client: AttuneClient, test_pack):
         "trigger": trigger_ref,
         "action": action_info,
         "enabled": True,
-        "criteria": "{{ trigger.payload.level == 'info' }}",
+        "criteria": "{{ event.payload.level == 'info' }}",
     }
 
     rule_info_response = client.create_rule(rule_info_data)
@@ -95,7 +95,7 @@ def test_rule_criteria_basic_filtering(client: AttuneClient, test_pack):
         "trigger": trigger_ref,
         "action": action_error,
         "enabled": True,
-        "criteria": "{{ trigger.payload.level == 'error' }}",
+        "criteria": "{{ event.payload.level == 'error' }}",
     }
 
     rule_error_response = client.create_rule(rule_error_data)
@@ -262,7 +262,7 @@ def test_rule_criteria_numeric_comparison(client: AttuneClient, test_pack):
         "trigger": trigger_ref,
         "action": action_low,
         "enabled": True,
-        "criteria": "{{ trigger.payload.priority <= 3 }}",
+        "criteria": "{{ event.payload.priority <= 3 }}",
     }
     rule_low = client.create_rule(rule_low_data)
     print(f"✓ Low priority rule created (priority <= 3)")
@@ -273,7 +273,7 @@ def test_rule_criteria_numeric_comparison(client: AttuneClient, test_pack):
         "trigger": trigger_ref,
         "action": action_high,
         "enabled": True,
-        "criteria": "{{ trigger.payload.priority >= 7 }}",
+        "criteria": "{{ event.payload.priority >= 7 }}",
     }
     rule_high = client.create_rule(rule_high_data)
     print(f"✓ High priority rule created (priority >= 7)")
@@ -356,8 +356,8 @@ def test_rule_criteria_complex_expressions(client: AttuneClient, test_pack):
 
     # Criteria: (level == 'error' AND priority > 5) OR environment == 'production'
     complex_criteria = (
-        "{{ (trigger.payload.level == 'error' and trigger.payload.priority > 5) "
-        "or trigger.payload.environment == 'production' }}"
+        "{{ (event.payload.level == 'error' and event.payload.priority > 5) "
+        "or event.payload.environment == 'production' }}"
     )
 
     rule_data = {
@@ -450,7 +450,7 @@ def test_rule_criteria_list_membership(client: AttuneClient, test_pack):
     print("\n[STEP 2] Creating rule with list membership criteria...")
 
     # Criteria: status in ['critical', 'urgent', 'high']
-    list_criteria = "{{ trigger.payload.status in ['critical', 'urgent', 'high'] }}"
+    list_criteria = "{{ event.payload.status in ['critical', 'urgent', 'high'] }}"
 
     rule_data = {
         "name": f"List Membership Rule {unique_ref()}",

tests/e2e/tier3/test_t3_07_complex_workflows.py

@@ -282,7 +282,7 @@ def test_conditional_workflow_branching(client: AttuneClient, test_pack):
         "action": workflow["ref"],
         "enabled": True,
         "parameters": {
-            "condition": "{{ trigger.payload.condition }}",
+            "condition": "{{ event.payload.condition }}",
         },
     }
     rule_response = client.post("/rules", json=rule_payload)
@@ -665,7 +665,7 @@ print(json.dumps({'result': result, 'step': 2}))
         "action": workflow["ref"],
         "enabled": True,
         "parameters": {
-            "input_text": "{{ trigger.payload.text }}",
+            "input_text": "{{ event.payload.text }}",
         },
     }
     rule_response = client.post("/rules", json=rule_payload)

tests/e2e/tier3/test_t3_08_chained_webhooks.py

@@ -170,7 +170,7 @@ def test_webhook_triggers_workflow_triggers_webhook(client: AttuneClient, test_p
         "action": final_action["ref"],
         "enabled": True,
         "parameters": {
-            "message": "{{ trigger.payload.message }}",
+            "message": "{{ event.payload.message }}",
         },
     }
     rule_b_response = client.post("/rules", json=rule_b_payload)
@@ -522,7 +522,7 @@ print(json.dumps({'transformed_value': transformed, 'original': value}))
         "action": transform_action["ref"],
         "enabled": True,
         "parameters": {
-            "value": "{{ trigger.payload.input_value }}",
+            "value": "{{ event.payload.input_value }}",
         },
     }
     rule_a_response = client.post("/rules", json=rule_a_payload)
@@ -539,7 +539,7 @@ print(json.dumps({'transformed_value': transformed, 'original': value}))
         "action": final_action["ref"],
         "enabled": True,
         "parameters": {
-            "message": "Received: {{ trigger.payload.transformed_value }}",
+            "message": "Received: {{ event.payload.transformed_value }}",
         },
     }
     rule_b_response = client.post("/rules", json=rule_b_payload)

tests/e2e/tier3/test_t3_16_rule_notifications.py

@@ -394,7 +394,7 @@ def test_rule_criteria_evaluation_notification(client: AttuneClient, test_pack):
         "trigger": trigger["ref"],
         "action": action["ref"],
         "enabled": True,
-        "criteria": "{{ trigger.payload.environment == 'production' }}",
+        "criteria": "{{ event.payload.environment == 'production' }}",
         "parameters": {
             "message": "Production deployment approved",
         },

tests/e2e/tier3/test_t3_17_container_runner.py

@@ -212,8 +212,8 @@ print(json.dumps(result))
         "action": action["ref"],
         "enabled": True,
         "parameters": {
-            "name": "{{ trigger.payload.name }}",
-            "count": "{{ trigger.payload.count }}",
+            "name": "{{ event.payload.name }}",
+            "count": "{{ event.payload.count }}",
         },
     }
     rule_response = client.post("/rules", json=rule_payload)