diff --git a/openedx_events/learning/signals.py b/openedx_events/learning/signals.py
index 0f3a74df..a57ddbc5 100644
--- a/openedx_events/learning/signals.py
+++ b/openedx_events/learning/signals.py
@@ -297,7 +297,7 @@
 # .. event_data: DiscussionThreadData
 # .. event_warning: This event is currently incompatible with the event bus, list/dict cannot be serialized yet
 FORUM_THREAD_CREATED = OpenEdxPublicSignal(
-    event_type="org.openedx.learning.thread.created.v1",
+    event_type="org.openedx.learning.forum.thread.created.v1",
     data={
         "thread": DiscussionThreadData,
     }
@@ -309,7 +309,7 @@
 # .. event_data: DiscussionThreadData
 #  .. event_warning: This event is currently incompatible with the event bus, list/dict cannot be serialized yet
 FORUM_THREAD_RESPONSE_CREATED = OpenEdxPublicSignal(
-    event_type="org.openedx.learning.response.created.v1",
+    event_type="org.openedx.learning.forum.thread.response.created.v1",
     data={
         "thread": DiscussionThreadData,
     }
@@ -321,7 +321,7 @@
 # .. event_data: DiscussionThreadData
 # .. event_warning: This event is currently incompatible with the event bus, list/dict cannot be serialized yet
 FORUM_RESPONSE_COMMENT_CREATED = OpenEdxPublicSignal(
-    event_type="org.openedx.learning.response.created.v1",
+    event_type="org.openedx.learning.forum.thread.response.comment.created.v1",
     data={
         "thread": DiscussionThreadData,
     }
diff --git a/openedx_events/tooling.py b/openedx_events/tooling.py
index 1ca53306..7faa0380 100644
--- a/openedx_events/tooling.py
+++ b/openedx_events/tooling.py
@@ -24,9 +24,9 @@
     "org.openedx.content_authoring.course.certificate_config.changed.v1",
     "org.openedx.content_authoring.course.certificate_config.deleted.v1",
     "org.openedx.learning.user.notification.requested.v1",
-    "org.openedx.learning.thread.created.v1",
-    "org.openedx.learning.response.created.v1",
-    "org.openedx.learning.comment.created.v1",
+    "org.openedx.learning.forum.thread.created.v1",
+    "org.openedx.learning.forum.thread.response.created.v1",
+    "org.openedx.learning.forum.thread.response.comment.created.v1",
     "org.openedx.learning.course.notification.requested.v1",
     "org.openedx.learning.ora.submission.created.v1",
 ]