diff --git a/templates/corporate/billing/billing.html b/templates/corporate/billing/billing.html
index 6915814d03..3f3d572b82 100644
--- a/templates/corporate/billing/billing.html
+++ b/templates/corporate/billing/billing.html
@@ -436,8 +436,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>{{ _('Downgrade') }}</span>
                 </button>
             </footer>
@@ -469,8 +469,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>{{ _('Confirm') }}</span>
                 </button>
             </footer>
@@ -498,8 +498,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>{{ _('Confirm') }}</span>
                 </button>
             </footer>
@@ -524,8 +524,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>{{ _('Downgrade') }}</span>
                 </button>
             </footer>
@@ -552,8 +552,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>{{ _('Downgrade') }}</span>
                 </button>
             </footer>
@@ -580,8 +580,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>{{ _('Cancel upgrade') }}</span>
                 </button>
             </footer>
@@ -617,8 +617,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Never mind') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>{{ _('Confirm') }}</span>
                 </button>
             </footer>
diff --git a/templates/corporate/billing/upgrade.html b/templates/corporate/billing/upgrade.html
index dfa22453c7..ed178ef46c 100644
--- a/templates/corporate/billing/upgrade.html
+++ b/templates/corporate/billing/upgrade.html
@@ -354,8 +354,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>
                         {% if page_params.free_trial_days %}
                         {{ _('Send invoice and start free trial') }}
diff --git a/templates/zerver/change_email_address_visibility_modal.html b/templates/zerver/change_email_address_visibility_modal.html
index 8e7777a0ac..cd4e3db74f 100644
--- a/templates/zerver/change_email_address_visibility_modal.html
+++ b/templates/zerver/change_email_address_visibility_modal.html
@@ -23,8 +23,8 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
-                <button class="modal__btn dialog_submit_button">
+                <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
+                <button class="modal__button dialog_submit_button">
                     <span>{{ _('Confirm') }}</span>
                 </button>
             </footer>
diff --git a/templates/zerver/development/email_log.html b/templates/zerver/development/email_log.html
index 77e4301ee3..a439257151 100644
--- a/templates/zerver/development/email_log.html
+++ b/templates/zerver/development/email_log.html
@@ -61,8 +61,8 @@
                     </div>
                 </main>
                 <footer class="modal__footer">
-                    <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Close') }}</button>
-                    <button class="modal__btn dialog_submit_button">
+                    <button class="modal__button dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Close') }}</button>
+                    <button class="modal__button dialog_submit_button">
                         <span>{{ _('Update') }}</span>
                     </button>
                 </footer>
diff --git a/web/src/dialog_widget.ts b/web/src/dialog_widget.ts
index 97217fd579..a751c5f381 100644
--- a/web/src/dialog_widget.ts
+++ b/web/src/dialog_widget.ts
@@ -90,7 +90,7 @@ type RequestOpts = {
 export function hide_dialog_spinner(): void {
     const dialog_widget_selector = current_dialog_widget_selector();
     const $spinner = $(`${dialog_widget_selector} .modal__spinner`);
-    $(`${dialog_widget_selector} .modal__btn`).prop("disabled", false);
+    $(`${dialog_widget_selector} .modal__button`).prop("disabled", false);
 
     loading.hide_spinner($(".dialog_submit_button"), $spinner);
 }
@@ -98,7 +98,7 @@ export function hide_dialog_spinner(): void {
 export function show_dialog_spinner(): void {
     const dialog_widget_selector = current_dialog_widget_selector();
     // Disable both the buttons.
-    $(`${dialog_widget_selector} .modal__btn`).prop("disabled", true);
+    $(`${dialog_widget_selector} .modal__button`).prop("disabled", true);
 
     const $spinner = $(`${dialog_widget_selector} .modal__spinner`);
 
diff --git a/web/styles/modal.css b/web/styles/modal.css
index f2a8043542..9a41f0e9fd 100644
--- a/web/styles/modal.css
+++ b/web/styles/modal.css
@@ -111,7 +111,7 @@
     }
 }
 
-.modal__btn {
+.modal__button {
     /* We need the backup value for billing related html files where
        this variable is not defined. */
     font-size: var(--base-font-size-px, 14px);
@@ -139,8 +139,8 @@
     }
 }
 
-.modal__btn:focus,
-.modal__btn:hover {
+.modal__button:focus,
+.modal__button:hover {
     transform: scale(1.05);
     /* The extremely subtle 1.05 scale can cause
        a gap to appear between the outline and
diff --git a/web/templates/dialog_widget.hbs b/web/templates/dialog_widget.hbs
index ecba618cb4..7b80cd8ccd 100644
--- a/web/templates/dialog_widget.hbs
+++ b/web/templates/dialog_widget.hbs
@@ -16,10 +16,10 @@
             </main>
             <footer class="modal__footer">
                 {{#unless single_footer_button}}
-                <button class="modal__btn dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{{ html_exit_button }}}</button>
+                <button class="modal__button dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{{ html_exit_button }}}</button>
                 {{/unless}}
                 <div class="dialog_submit_button_container">
-                    <button class="modal__btn dialog_submit_button"{{#if single_footer_button}} aria-label="{{t 'Close this dialog window' }}" data-micromodal-close{{/if}}>
+                    <button class="modal__button dialog_submit_button"{{#if single_footer_button}} aria-label="{{t 'Close this dialog window' }}" data-micromodal-close{{/if}}>
                         <span class="submit-button-text">{{{ html_submit_button }}}</span>
                         <div class="modal__spinner"></div>
                     </button>
diff --git a/web/templates/login_to_access.hbs b/web/templates/login_to_access.hbs
index 421f7e3d9d..473ac7537f 100644
--- a/web/templates/login_to_access.hbs
+++ b/web/templates/login_to_access.hbs
@@ -22,10 +22,10 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <a class="modal__btn dialog_submit_button" href="{{signup_link}}">
+                <a class="modal__button dialog_submit_button" href="{{signup_link}}">
                     <span>{{t "Sign up" }}</span>
                 </a>
-                <a class="modal__btn dialog_submit_button" href="{{login_link}}">
+                <a class="modal__button dialog_submit_button" href="{{login_link}}">
                     <span>{{t "Log in" }}</span>
                 </a>
             </footer>
diff --git a/web/templates/profile_access_error_modal.hbs b/web/templates/profile_access_error_modal.hbs
index ff6a70bbe7..dd85b1ee5b 100644
--- a/web/templates/profile_access_error_modal.hbs
+++ b/web/templates/profile_access_error_modal.hbs
@@ -13,7 +13,7 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button type="button" class="modal__btn dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{t "Close" }}</button>
+                <button type="button" class="modal__button dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{t "Close" }}</button>
             </footer>
         </div>
     </div>
diff --git a/web/templates/settings/api_key_modal.hbs b/web/templates/settings/api_key_modal.hbs
index eaa08d44ce..8ff45e97f0 100644
--- a/web/templates/settings/api_key_modal.hbs
+++ b/web/templates/settings/api_key_modal.hbs
@@ -33,12 +33,12 @@
                 </div>
             </main>
             <footer class="modal__footer">
-                <button type="submit" name="view_api_key" id="get_api_key_button" class="modal__btn dialog_submit_button">
+                <button type="submit" name="view_api_key" id="get_api_key_button" class="modal__button dialog_submit_button">
                     {{t 'Get API key' }}
                 </button>
                 <div id="api_key_buttons">
-                    <button class="modal__btn dialog_submit_button" id="regenerate_api_key" aria-label="{{t 'Generate new API key' }}">{{t "Generate new API key" }}</button>
-                    <a class="modal__btn dialog_submit_button" id="download_zuliprc" download="zuliprc" tabindex="0">{{t "Download zuliprc" }}</a>
+                    <button class="modal__button dialog_submit_button" id="regenerate_api_key" aria-label="{{t 'Generate new API key' }}">{{t "Generate new API key" }}</button>
+                    <a class="modal__button dialog_submit_button" id="download_zuliprc" download="zuliprc" tabindex="0">{{t "Download zuliprc" }}</a>
                 </div>
             </footer>
         </div>
diff --git a/web/templates/user_profile_modal.hbs b/web/templates/user_profile_modal.hbs
index 508c5c0a39..0126a4fd8e 100644
--- a/web/templates/user_profile_modal.hbs
+++ b/web/templates/user_profile_modal.hbs
@@ -138,8 +138,8 @@
             <div class="manage-profile-tab-footer">
                 <footer class="modal__footer">
                     <div class="save-success"></div>
-                    <button type="button" class="modal__btn dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{t "Cancel" }}</button>
-                    <button type="button" class="modal__btn dialog_submit_button">
+                    <button type="button" class="modal__button dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{t "Cancel" }}</button>
+                    <button type="button" class="modal__button dialog_submit_button">
                         <span class="submit-button-text">{{t "Save changes"}}</span>
                         <div class="modal__spinner"></div>
                     </button>