diff --git a/lib/AccessCheck/App/SendChallenge.pm b/lib/AccessCheck/App/SendChallenge.pm
index 18035167f7df1117e54bb1d63171ccef0e407c19..073f36bf090a05a1ce4dbab5d2434f49691a78bf 100644
--- a/lib/AccessCheck/App/SendChallenge.pm
+++ b/lib/AccessCheck/App/SendChallenge.pm
@@ -124,8 +124,8 @@ sub run {
     };
     my $text_content;
     my $html_content;
-    $tt2->process('send_authentication_token.tt2.txt',  $data, \$text_content);
-    $tt2->process('send_authentication_token.tt2.html', $data, \$html_content);
+    $tt2->process('send_challenge.txt.tt2',  $data, \$text_content);
+    $tt2->process('send_challenge.html.tt2', $data, \$html_content);
 
     my $message = Email::MIME->create(
         header_str => [
diff --git a/templates/Makefile.am b/templates/Makefile.am
index 64159900f4b0afb44e29c71edef961f3f5642cec..9cfafa1897fe316f62c169b4f5b8fba91ac09b0b 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -12,8 +12,8 @@ nobase_apptemplates_DATA = \
 	accounts/student2.tt2 \
 	accounts/teacher1.tt2 \
 	accounts/teacher2.tt2 \
-	mail/send_authentication_token.tt2.txt \
-	mail/send_authentication_token.tt2.html \
+	mail/send_challenge.txt.tt2 \
+	mail/send_challenge.html.tt2 \
 	other/accounts.csv.tt2 \
 	other/accounts.php.tt2 \
 	web/edugain/errors.html.tt2 \
diff --git a/templates/mail/send_authentication_token.tt2.html b/templates/mail/send_challenge.html.tt2
similarity index 100%
rename from templates/mail/send_authentication_token.tt2.html
rename to templates/mail/send_challenge.html.tt2
diff --git a/templates/mail/send_authentication_token.tt2.txt b/templates/mail/send_challenge.txt.tt2
similarity index 100%
rename from templates/mail/send_authentication_token.tt2.txt
rename to templates/mail/send_challenge.txt.tt2