diff --git a/web/chat/composed-message.react.js b/web/chat/composed-message.react.js
--- a/web/chat/composed-message.react.js
+++ b/web/chat/composed-message.react.js
@@ -19,7 +19,7 @@
 import css from './chat-message-list.css';
 import FailedSend from './failed-send.react';
 import { InlineSidebar } from './inline-sidebar.react';
-import MessageActionButton from './message-action-button';
+import MessageActionButtons from './message-action-buttons';
 import MessageReplyButton from './message-reply-button.react';
 import {
   type OnMessagePositionWithContainerInfo,
@@ -148,7 +148,7 @@
         : availableTooltipPositionsForNonViewerMessage;
 
       messageActionButton = (
-        <MessageActionButton
+        <MessageActionButtons
           threadInfo={threadInfo}
           item={item}
           containerPosition={
diff --git a/web/chat/message-action-button.css b/web/chat/message-action-buttons.css
rename from web/chat/message-action-button.css
rename to web/chat/message-action-buttons.css
diff --git a/web/chat/message-action-button.js b/web/chat/message-action-buttons.js
rename from web/chat/message-action-button.js
rename to web/chat/message-action-buttons.js
--- a/web/chat/message-action-button.js
+++ b/web/chat/message-action-buttons.js
@@ -12,7 +12,7 @@
   useOnClickPendingSidebar,
 } from '../selectors/nav-selectors';
 import SWMansionIcon from '../SWMansionIcon.react';
-import css from './message-action-button.css';
+import css from './message-action-buttons.css';
 import type {
   ItemAndContainerPositionInfo,
   PositionInfo,
@@ -25,13 +25,13 @@
 const openSidebarText = 'Go to sidebar';
 const createSidebarText = 'Create sidebar';
 
-type MessageActionTooltipProps = {
+type MessageActionButtonsProps = {
   +threadInfo: ThreadInfo,
   +item: ChatMessageInfoItem,
   +containerPosition: PositionInfo,
   +availableTooltipPositions: $ReadOnlyArray<TooltipPosition>,
 };
-function MessageActionButton(props: MessageActionTooltipProps): React.Node {
+function MessageActionButtons(props: MessageActionButtonsProps): React.Node {
   const {
     threadInfo,
     item,
@@ -161,4 +161,4 @@
   return { className };
 }
 
-export default MessageActionButton;
+export default MessageActionButtons;
diff --git a/web/chat/robotext-message.react.js b/web/chat/robotext-message.react.js
--- a/web/chat/robotext-message.react.js
+++ b/web/chat/robotext-message.react.js
@@ -16,7 +16,7 @@
 import { useSelector } from '../redux/redux-utils';
 import { updateNavInfoActionType } from '../types/nav-types';
 import { InlineSidebar } from './inline-sidebar.react';
-import MessageActionTooltip from './message-action-button';
+import MessageActionButtons from './message-action-buttons';
 import type {
   MessagePositionInfo,
   OnMessagePositionWithContainerInfo,
@@ -66,7 +66,7 @@
       sidebarExistsOrCanBeCreated
     ) {
       messageActionTooltip = (
-        <MessageActionTooltip
+        <MessageActionButtons
           threadInfo={threadInfo}
           item={item}
           containerPosition={