diff --git a/templates/confirmation/notify_change_in_email_subject.txt b/templates/confirmation/notify_change_in_email.subject
similarity index 100%
rename from templates/confirmation/notify_change_in_email_subject.txt
rename to templates/confirmation/notify_change_in_email.subject
diff --git a/templates/confirmation/notify_change_in_email_body.txt b/templates/confirmation/notify_change_in_email.txt
similarity index 100%
rename from templates/confirmation/notify_change_in_email_body.txt
rename to templates/confirmation/notify_change_in_email.txt
diff --git a/zerver/tests/test_templates.py b/zerver/tests/test_templates.py
index c613d4885d..8f83e57050 100644
--- a/zerver/tests/test_templates.py
+++ b/zerver/tests/test_templates.py
@@ -90,7 +90,7 @@ class TemplateTestCase(ZulipTestCase):
             'confirmation/emailchangestatus_confirmation_email.subject',
             'confirmation/emailchangestatus_confirmation_email.html',
             'confirmation/emailchangestatus_confirmation_email.txt',
-            'confirmation/notify_change_in_email_subject.txt',
+            'confirmation/notify_change_in_email.subject',
             'corporate/mit.html',
             'corporate/zephyr.html',
             'corporate/zephyr-mirror.html',
diff --git a/zerver/views/user_settings.py b/zerver/views/user_settings.py
index 7b9e38db65..6bb5dbe719 100644
--- a/zerver/views/user_settings.py
+++ b/zerver/views/user_settings.py
@@ -60,9 +60,9 @@ def confirm_email_change(request, confirmation_key):
                    'new_email': new_email,
                    }
         subject = render_to_string(
-            'confirmation/notify_change_in_email_subject.txt', context)
+            'confirmation/notify_change_in_email.subject', context)
         body = render_to_string(
-            'confirmation/notify_change_in_email_body.txt', context)
+            'confirmation/notify_change_in_email.txt', context)
         send_mail(subject, body, settings.DEFAULT_FROM_EMAIL, [old_email])
 
     ctx = {