diff --git a/app/models/comment.rb b/app/models/comment.rb
index 859b33941..e7f094ffb 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -10,9 +10,10 @@ class Comment < ApplicationRecord
 
   before_destroy :cleanup_events
 
-  def created_via(message)
-    message.card.watch_by creator
-    message.card.track_event :commented, comment_id: id
+  # Called when a new comment is captured as a message during creation
+  def created_via_message
+    card.watch_by creator
+    card.track_event :commented, comment_id: id
   end
 
   def to_partial_path
diff --git a/app/models/concerns/messageable.rb b/app/models/concerns/messageable.rb
index 4f1fffb30..edf1a002a 100644
--- a/app/models/concerns/messageable.rb
+++ b/app/models/concerns/messageable.rb
@@ -8,11 +8,11 @@ module Messageable
     has_one :card, through: :message
   end
 
-  def created_via(message)
+  def created_via_message
     # Overwrite in Messageable class
   end
 
-  def destroyed_via(message)
+  def destroyed_via_message
     # Overwrite in Messageable class
   end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 67ec3b294..550619471 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -5,6 +5,6 @@ class Message < ApplicationRecord
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
 
-  after_create  -> { messageable.created_via(self) }
-  after_destroy -> { messageable.destroyed_via(self) }
+  after_create  -> { messageable.created_via_message }
+  after_destroy -> { messageable.destroyed_via_message }
 end