diff --git a/static/js/popovers.js b/static/js/popovers.js
index bd54ffca80..59c4a110ab 100644
--- a/static/js/popovers.js
+++ b/static/js/popovers.js
@@ -471,7 +471,7 @@ export function toggle_actions_popover(element, id) {
         let editability_menu_item;
         if (editability === message_edit.editability_types.FULL) {
             use_edit_icon = true;
-            editability_menu_item = $t({defaultMessage: "Edit"});
+            editability_menu_item = $t({defaultMessage: "Edit message"});
         } else if (editability === message_edit.editability_types.TOPIC_ONLY) {
             use_edit_icon = false;
             editability_menu_item = $t({defaultMessage: "View source / Move message"});
diff --git a/static/templates/actions_popover_content.hbs b/static/templates/actions_popover_content.hbs
index f6a8b8af26..57c2075234 100644
--- a/static/templates/actions_popover_content.hbs
+++ b/static/templates/actions_popover_content.hbs
@@ -49,7 +49,7 @@
     <li>
         <a class="popover_toggle_collapse" data-message-id="{{message_id}}" tabindex="0">
             <i class="fa fa-minus" aria-hidden="true"></i>
-            {{t "Collapse" }} <span class="hotkey-hint">(–)</span>
+            {{t "Collapse message" }} <span class="hotkey-hint">(–)</span>
         </a>
     </li>
     {{/if}}
diff --git a/static/templates/edit_content_button.hbs b/static/templates/edit_content_button.hbs
index f50bdb5214..b8aa17e19b 100644
--- a/static/templates/edit_content_button.hbs
+++ b/static/templates/edit_content_button.hbs
@@ -1,5 +1,5 @@
 {{#if is_editable}}
-<i class="fa fa-pencil edit_content_button" role="button" tabindex="0" aria-label="{{t 'Edit' }} (e)" data-tippy-content="{{#tr}}Edit{{/tr}} (e)"></i>
+<i class="fa fa-pencil edit_content_button" role="button" tabindex="0" aria-label="{{t 'Edit message' }} (e)" data-tippy-content="{{#tr}}Edit message{{/tr}} (e)"></i>
 {{else}}
 <i class="fa fa-file-code-o edit_content_button" role="button" tabindex="0" aria-label="{{t 'View source' }} (e)" data-tippy-content="{{#tr}}View source{{/tr}} (e)" data-message-id="{{msg_id}}"></i>
 {{/if}}
diff --git a/templates/zerver/help/collapse-a-message.md b/templates/zerver/help/collapse-a-message.md
index 4c1ac8cacf..cc028b97b5 100644
--- a/templates/zerver/help/collapse-a-message.md
+++ b/templates/zerver/help/collapse-a-message.md
@@ -10,7 +10,7 @@ remove the message content from view.
 
 {!message-actions-menu.md!}
 
-3. Click **Collapse**.
+3. Click **Collapse message**.
 
 {end_tabs}
 
diff --git a/templates/zerver/help/move-content-to-another-stream.md b/templates/zerver/help/move-content-to-another-stream.md
index 945b3e8d27..330b547435 100644
--- a/templates/zerver/help/move-content-to-another-stream.md
+++ b/templates/zerver/help/move-content-to-another-stream.md
@@ -48,7 +48,7 @@ destination streams.
 {!message-actions-menu.md!}
 
 1. Select the first option. It may be called **View source / Move message**,
-   or simply **Edit**. If it's called **View source**, then you are not
+   or simply **Edit message**. If it's called **View source**, then you are not
    allowed to edit the stream of that message.
 
 1. Select the destination stream for the message from the streams dropdown list.
diff --git a/templates/zerver/help/move-content-to-another-topic.md b/templates/zerver/help/move-content-to-another-topic.md
index 134f0a54ed..b467960e4f 100644
--- a/templates/zerver/help/move-content-to-another-topic.md
+++ b/templates/zerver/help/move-content-to-another-topic.md
@@ -23,7 +23,7 @@ for the details on when topic editing is allowed.
 {!message-actions-menu.md!}
 
 1. Select the first option. It may be called **View source / Move message**,
-   or simply **Edit**. If it's called **View source**, then you are not
+   or simply **Edit message**. If it's called **View source**, then you are not
    allowed to edit the topic of that message.
 
 1. Set the destination topic.
diff --git a/templates/zerver/help/rename-a-topic.md b/templates/zerver/help/rename-a-topic.md
index 66d60bc130..bc850cc28d 100644
--- a/templates/zerver/help/rename-a-topic.md
+++ b/templates/zerver/help/rename-a-topic.md
@@ -37,7 +37,7 @@ for the details on when topic editing is allowed.
 {!message-actions-menu.md!}
 
 1. Select the first option. It may be called **View source / Move message**,
-   or simply **Edit**. If it's called **View source**, then you are not
+   or simply **Edit message**. If it's called **View source**, then you are not
    allowed to edit the topic of that message.
 
 1. Edit the topic.