diff --git a/CRM/Civirules/Action.php b/CRM/Civirules/Action.php
index e1a202ad9ae8a05536b3fce9acc96048edca9733..eb0272c972cee83c20b786787cf8f7a634da85f9 100644
--- a/CRM/Civirules/Action.php
+++ b/CRM/Civirules/Action.php
@@ -101,10 +101,10 @@ abstract class CRM_Civirules_Action {
    * Logs a message to the logger
    *
    * @param $message
-   * @param \CRM_Civirules_EventData_EventData|NULL $eventData
+   * @param \CRM_Civirules_TriggerData_TriggerData|NULL $triggerData
    * @param string $level Should be one of \Psr\Log\LogLevel
    */
-  protected function logAction($message, CRM_Civirules_EventData_EventData $eventData=null, $level=\Psr\Log\LogLevel::INFO) {
+  protected function logAction($message, CRM_Civirules_TriggerData_TriggerData $triggerData=null, $level=\Psr\Log\LogLevel::INFO) {
     $context = array();
     $context['message'] = $message;
     $context['rule_id'] = $this->ruleAction['rule_id'];
@@ -117,7 +117,7 @@ abstract class CRM_Civirules_Action {
     $context['rule_action_id'] = $this->ruleAction['id'];
     $context['action_label'] = CRM_Civirules_BAO_Action::getActionLabelWithId($this->ruleAction['action_id']);
     $context['action_parameters'] = $this->userFriendlyConditionParams();
-    $context['contact_id'] = $eventData ? $eventData->getContactId() : - 1;
+    $context['contact_id'] = $triggerData ? $triggerData->getContactId() : - 1;
     $msg = "{action_label} (ID: {rule_action_id})\r\n\r\n{message}\r\n\r\nRule: '{rule_title}' with id {rule_id}";
     if ($context['contact_id'] > 0) {
       $msg .= "\r\nFor contact: {contact_id}";
diff --git a/CRM/Civirules/Condition.php b/CRM/Civirules/Condition.php
index 6bb628d48d604ac61ba770ee47e967a916e3f179..a9d5898f4dbeb09357fd451872c2b44749c40102 100644
--- a/CRM/Civirules/Condition.php
+++ b/CRM/Civirules/Condition.php
@@ -70,10 +70,10 @@ abstract class CRM_Civirules_Condition {
    * Logs a message to the logger
    *
    * @param $message
-   * @param \CRM_Civirules_EventData_EventData|NULL $eventData
+   * @param \CRM_Civirules_TriggerData_TriggerData|NULL $triggerData
    * @param string $level Should be one of \Psr\Log\LogLevel
    */
-  protected function logCondition($message, CRM_Civirules_EventData_EventData $eventData=null, $level=\Psr\Log\LogLevel::INFO) {
+  protected function logCondition($message, CRM_Civirules_TriggerData_TriggerData $triggerData=null, $level=\Psr\Log\LogLevel::INFO) {
     $context = array();
     $context['message'] = $message;
     $context['rule_id'] = $this->ruleCondition['rule_id'];
@@ -86,7 +86,7 @@ abstract class CRM_Civirules_Condition {
     $context['rule_condition_id'] = $this->ruleCondition['id'];
     $context['condition_label'] = CRM_Civirules_BAO_Condition::getConditionLabelWithId($this->ruleCondition['condition_id']);
     $context['condition_parameters'] = $this->userFriendlyConditionParams();
-    $context['contact_id'] = $eventData ? $eventData->getContactId() : - 1;
+    $context['contact_id'] = $triggerData ? $triggerData->getContactId() : - 1;
     $msg = "{condition_label} (ID: {rule_condition_id})\r\n\r\n{message}\r\n\r\nRule: '{rule_title}' with id {rule_id}";
     if ($context['contact_id'] > 0) {
       $msg .= "\r\nFor contact: {contact_id}";