diff --git a/src/components/Message/MessageThreadReplyInChannelButtonIndicator.tsx b/src/components/Message/MessageIsThreadReplyInChannelButtonIndicator.tsx
similarity index 94%
rename from src/components/Message/MessageThreadReplyInChannelButtonIndicator.tsx
rename to src/components/Message/MessageIsThreadReplyInChannelButtonIndicator.tsx
index 99a8ff6df..6b9f3f379 100644
--- a/src/components/Message/MessageThreadReplyInChannelButtonIndicator.tsx
+++ b/src/components/Message/MessageIsThreadReplyInChannelButtonIndicator.tsx
@@ -9,7 +9,7 @@ import {
   useTranslationContext,
 } from '../../context';
 
-export const MessageThreadReplyInChannelButtonIndicator = () => {
+export const MessageIsThreadReplyInChannelButtonIndicator = () => {
   const { client } = useChatContext();
   const { t } = useTranslationContext();
   const { channel } = useChannelStateContext();
@@ -36,7 +36,7 @@ export const MessageThreadReplyInChannelButtonIndicator = () => {
           },
           origin: {
             context: { threadReply: message },
-            emitter: 'MessageThreadReplyInChannelButtonIndicator',
+            emitter: 'MessageIsThreadReplyInChannelButtonIndicator',
           },
         });
       });
diff --git a/src/components/Message/MessageSimple.tsx b/src/components/Message/MessageSimple.tsx
index 2739cf025..68b7a8404 100644
--- a/src/components/Message/MessageSimple.tsx
+++ b/src/components/Message/MessageSimple.tsx
@@ -12,7 +12,7 @@ import { MessageText } from './MessageText';
 import { MessageTimestamp as DefaultMessageTimestamp } from './MessageTimestamp';
 import { StreamedMessageText as DefaultStreamedMessageText } from './StreamedMessageText';
 import { isDateSeparatorMessage } from '../MessageList';
-import { MessageThreadReplyInChannelButtonIndicator as DefaultMessageIsThreadReplyInChannelButtonIndicator } from './MessageThreadReplyInChannelButtonIndicator';
+import { MessageIsThreadReplyInChannelButtonIndicator as DefaultMessageIsThreadReplyInChannelButtonIndicator } from './MessageIsThreadReplyInChannelButtonIndicator';
 import { ReminderNotification as DefaultReminderNotification } from './ReminderNotification';
 import { useMessageReminder } from './hooks';
 import {
diff --git a/src/context/ComponentContext.tsx b/src/context/ComponentContext.tsx
index 176f01750..362f80630 100644
--- a/src/context/ComponentContext.tsx
+++ b/src/context/ComponentContext.tsx
@@ -125,7 +125,7 @@ export type ComponentContextValue = {
   MessageBlocked?: React.ComponentType;
   /** Custom UI component for a deleted message, defaults to and accepts same props as: [MessageDeleted](https://github.com/GetStream/stream-chat-react/blob/master/src/components/Message/MessageDeleted.tsx) */
   MessageDeleted?: React.ComponentType<MessageDeletedProps>;
-  /** Custom UI component for an indicator that a message is a thread reply sent to channel list: [MessageThreadReplyInChannelButtonIndicator](https://github.com/GetStream/stream-chat-react/blob/master/src/components/Message/MessageIsThreadReplyInChannelButtonIndicator.tsx) */
+  /** Custom UI component for an indicator that a message is a thread reply sent to channel list: [MessageIsThreadReplyInChannelButtonIndicator](https://github.com/GetStream/stream-chat-react/blob/master/src/components/Message/MessageIsThreadReplyInChannelButtonIndicator.tsx) */
   MessageIsThreadReplyInChannelButtonIndicator?: React.ComponentType;
   MessageListMainPanel?: React.ComponentType<PropsWithChildrenOnly>;
   /** Custom UI component that displays message and connection status notifications in the `MessageList`, defaults to and accepts same props as [DefaultMessageListNotifications](https://github.com/GetStream/stream-chat-react/blob/master/src/components/MessageList/MessageListNotifications.tsx) */