diff --git a/frontend_tests/puppeteer_tests/delete-message.ts b/frontend_tests/puppeteer_tests/delete-message.ts
index 0bf12e0331..e3809ac66d 100644
--- a/frontend_tests/puppeteer_tests/delete-message.ts
+++ b/frontend_tests/puppeteer_tests/delete-message.ts
@@ -19,11 +19,11 @@ async function delete_message_test(page: Page): Promise<void> {
     const last_message_id = await click_delete_and_return_last_msg_id(page);
 
     await page.waitForSelector("#confirm_dialog_modal", {visible: true});
-    await page.click(".confirm_dialog_yes_button");
-    await page.waitForSelector(".confirm_dialog_yes_button .loader", {
+    await page.click(".confirm_dialog_submit_button");
+    await page.waitForSelector(".confirm_dialog_submit_button .loader", {
         visible: true,
     });
-    await page.waitForSelector(".confirm_dialog_yes_button span", {hidden: true});
+    await page.waitForSelector(".confirm_dialog_submit_button span", {hidden: true});
 
     await page.waitForFunction(
         (expected_length: number) => $("#zhome .message_row").length === expected_length,
@@ -32,7 +32,7 @@ async function delete_message_test(page: Page): Promise<void> {
     );
 
     await page.waitForSelector(`#${CSS.escape(last_message_id!)}`, {hidden: true});
-    await page.waitForSelector(".confirm_dialog_yes_button .loader", {
+    await page.waitForSelector(".confirm_dialog_submit_button .loader", {
         hidden: true,
     });
 }
diff --git a/frontend_tests/puppeteer_tests/user-deactivation.ts b/frontend_tests/puppeteer_tests/user-deactivation.ts
index f22f7337e5..77fbff482c 100644
--- a/frontend_tests/puppeteer_tests/user-deactivation.ts
+++ b/frontend_tests/puppeteer_tests/user-deactivation.ts
@@ -33,12 +33,12 @@ async function test_deactivate_user(page: Page): Promise<void> {
     assert.strictEqual(
         await common.get_text_from_selector(
             page,
-            "#confirm_dialog_modal .confirm_dialog_yes_button",
+            "#confirm_dialog_modal .confirm_dialog_submit_button",
         ),
         "Confirm",
         "Deactivate button has incorrect text.",
     );
-    await page.click("#confirm_dialog_modal .confirm_dialog_yes_button");
+    await page.click("#confirm_dialog_modal .confirm_dialog_submit_button");
     await page.waitForSelector("#user-field-status", {hidden: true});
 }
 
diff --git a/static/js/confirm_dialog.js b/static/js/confirm_dialog.js
index fdde9d4472..cb4a810015 100644
--- a/static/js/confirm_dialog.js
+++ b/static/js/confirm_dialog.js
@@ -36,16 +36,16 @@ import * as overlays from "./overlays";
 */
 
 export function hide_confirm_dialog_spinner() {
-    $(".confirm_dialog_yes_button .loader").hide();
-    $(".confirm_dialog_yes_button span").show();
-    $(".confirm_dialog_yes_button").prop("disabled", false);
+    $(".confirm_dialog_submit_button .loader").hide();
+    $(".confirm_dialog_submit_button span").show();
+    $(".confirm_dialog_submit_button").prop("disabled", false);
 }
 
 export function show_confirm_dialog_spinner() {
-    $(".confirm_dialog_yes_button .loader").css("display", "inline-block");
-    $(".confirm_dialog_yes_button span").hide();
-    $(".confirm_dialog_yes_button").prop("disabled", true);
-    $(".confirm_dialog_yes_button object").on("load", function () {
+    $(".confirm_dialog_submit_button .loader").css("display", "inline-block");
+    $(".confirm_dialog_submit_button span").hide();
+    $(".confirm_dialog_submit_button").prop("disabled", true);
+    $(".confirm_dialog_submit_button object").on("load", function () {
         const doc = this.getSVGDocument();
         const $svg = $(doc).find("svg");
         $svg.find("rect").css("fill", "#000");
@@ -89,11 +89,11 @@ export function launch(conf) {
     );
     confirm_dialog.find(".confirm_dialog_body").append(conf.html_body);
 
-    const submit_button_span = confirm_dialog.find(".confirm_dialog_yes_button span");
+    const submit_button_span = confirm_dialog.find(".confirm_dialog_submit_button span");
 
     submit_button_span.html(conf.html_submit_button);
 
-    const submit_button = confirm_dialog.find(".confirm_dialog_yes_button");
+    const submit_button = confirm_dialog.find(".confirm_dialog_submit_button");
     // Set up handlers.
     submit_button.on("click", () => {
         if (conf.loading_spinner) {
diff --git a/static/js/settings_invites.js b/static/js/settings_invites.js
index 0b7b02053b..bb919cf2c6 100644
--- a/static/js/settings_invites.js
+++ b/static/js/settings_invites.js
@@ -97,8 +97,8 @@ function populate_invites(invites_data) {
 }
 
 function do_revoke_invite() {
-    const modal_invite_id = $(".confirm_dialog_yes_button").attr("data-invite-id");
-    const modal_is_multiuse = $(".confirm_dialog_yes_button").attr("data-is-multiuse");
+    const modal_invite_id = $(".confirm_dialog_submit_button").attr("data-invite-id");
+    const modal_is_multiuse = $(".confirm_dialog_submit_button").attr("data-is-multiuse");
     const revoke_button = meta.current_revoke_invite_user_modal_row.find("button.revoke");
 
     if (modal_invite_id !== meta.invite_id || modal_is_multiuse !== meta.is_multiuse) {
@@ -129,7 +129,7 @@ function do_revoke_invite() {
 }
 
 function do_resend_invite() {
-    const modal_invite_id = $(".confirm_dialog_yes_button").attr("data-invite-id");
+    const modal_invite_id = $(".confirm_dialog_submit_button").attr("data-invite-id");
     const resend_button = meta.current_resend_invite_user_modal_row.find("button.resend");
 
     if (modal_invite_id !== meta.invite_id) {
@@ -211,8 +211,8 @@ export function on_load_success(invites_data, initialize_event_handlers) {
             fade: true,
         });
 
-        $(".confirm_dialog_yes_button").attr("data-invite-id", meta.invite_id);
-        $(".confirm_dialog_yes_button").attr("data-is-multiuse", meta.is_multiuse);
+        $(".confirm_dialog_submit_button").attr("data-invite-id", meta.invite_id);
+        $(".confirm_dialog_submit_button").attr("data-is-multiuse", meta.is_multiuse);
     });
 
     $(".admin_invites_table").on("click", ".resend", (e) => {
@@ -237,6 +237,6 @@ export function on_load_success(invites_data, initialize_event_handlers) {
             fade: true,
         });
 
-        $(".confirm_dialog_yes_button").attr("data-invite-id", meta.invite_id);
+        $(".confirm_dialog_submit_button").attr("data-invite-id", meta.invite_id);
     });
 }
diff --git a/static/js/stream_edit.js b/static/js/stream_edit.js
index 646b3c3b41..dcb6ab396c 100644
--- a/static/js/stream_edit.js
+++ b/static/js/stream_edit.js
@@ -926,7 +926,7 @@ export function initialize() {
         }
 
         function do_archive_stream() {
-            const stream_id = $(".confirm_dialog_yes_button").data("stream-id");
+            const stream_id = $(".confirm_dialog_submit_button").data("stream-id");
             if (!stream_id) {
                 ui_report.client_error(
                     $t_html({defaultMessage: "Invalid stream id"}),
@@ -957,7 +957,7 @@ export function initialize() {
             fade: true,
         });
 
-        $(".confirm_dialog_yes_button").attr("data-stream-id", stream_id);
+        $(".confirm_dialog_submit_button").attr("data-stream-id", stream_id);
     });
 
     $("#subscriptions_table").on("click", ".stream-row", function (e) {
diff --git a/static/styles/settings.css b/static/styles/settings.css
index eb06f3d651..99fbdf58d6 100644
--- a/static/styles/settings.css
+++ b/static/styles/settings.css
@@ -1578,7 +1578,7 @@ body:not(.night-mode) #settings_page .custom_user_field .datepicker {
     margin-top: 10px;
 }
 
-.confirm_dialog_yes_button .loader {
+.confirm_dialog_submit_button .loader {
     display: none;
     vertical-align: top;
     position: relative;
diff --git a/static/templates/confirm_dialog.hbs b/static/templates/confirm_dialog.hbs
index e1b3a5a050..f058c6e96b 100644
--- a/static/templates/confirm_dialog.hbs
+++ b/static/templates/confirm_dialog.hbs
@@ -8,7 +8,7 @@
     </div>
     <div class="modal-footer">
         <button class="button rounded close-modal-btn" data-dismiss="modal">{{t "Cancel" }}</button>
-        <button class="button rounded btn-danger confirm_dialog_yes_button">
+        <button class="button rounded btn-danger confirm_dialog_submit_button">
             <object class="loader" type="image/svg+xml" data="/static/images/loader.svg"></object>
             <span></span>
         </button>