diff --git a/conf/manager.conf.in b/conf/manager.conf.in
index 363f47343afe828e11f4a421e74fe34fe0bf3419..66286ddb78a4b474683c68a57ad4677a592544da 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf.in
@@ -16,7 +16,6 @@ sendmail_path = /usr/sbin/sendmail
 
 [app]
 version = open Beta 1
-name = eduGAIN Access Check
 url = https://my.fqdn/accountmanager
 support_email = support@my.fqdn
 
diff --git a/lib/AccountManager/WebRequest.pm b/lib/AccountManager/WebRequest.pm
index be22aabfca6f95b8fe1de7f75e6cafe359a08ce4..a4ada762e147b5a92785da28e2133ee81af8946d 100644
--- a/lib/AccountManager/WebRequest.pm
+++ b/lib/AccountManager/WebRequest.pm
@@ -142,7 +142,6 @@ sub respond {
     my ($self, %in) = @_;
 
     $in{data}->{app} = {
-        name          => $self->{configuration}->{app}->{name},
         url           => $self->{configuration}->{app}->{url},
         support_email => $self->{configuration}->{app}->{support_email},
         version       => $self->{configuration}->{app}->{version},
@@ -447,7 +446,6 @@ sub req_complete_challenge {
     my $template = 'send_authentication_token.tt2.eml';
     my $data = {
         app => {
-            name          => $self->{configuration}->{app}->{name},
             url           => $self->{configuration}->{app}->{url},
             support_email => $self->{configuration}->{app}->{support_email},
             version       => $self->{configuration}->{app}->{version},
diff --git a/templates/mail/en/send_authentication_token.tt2.eml b/templates/mail/en/send_authentication_token.tt2.eml
index a8f9f4d474dca666f95f816421a9e4423a673506..a6861b35c046acd0b6ec3c1b8340dcf4788bf3c6 100644
--- a/templates/mail/en/send_authentication_token.tt2.eml
+++ b/templates/mail/en/send_authentication_token.tt2.eml
@@ -1,18 +1,18 @@
-From: [% app.name %] <[% from %]>
+From: eduGAIN Access Check <[% from %]>
 To: [% to %]
-Subject: [% app.name %] - Test accounts request
+Subject: eduGAIN Access Check - Test accounts request
 Content-type: text/plain; charset=UTF-8; format=flowed
 
-This is an email challenge automatically sent to you by [% app.name %]. Somebody with IP address [% sourceip %] has requested to create test accounts for eduGAIN Service Provider with entityID [% entityid %].
+This is an email challenge automatically sent to you by eduGAIN Access Check. Somebody with IP address [% sourceip %] has requested to create test accounts for eduGAIN Service Provider with entityID [% entityid %].
 The address [% to %] is mentioned in the eduGAIN metadata as a contact for this Service Provider.
 
-To complete the creation of test accounts, paste the following validation token in the [% app.name %] web form.
+To complete the creation of test accounts, paste the following validation token in the eduGAIN Access Check web form.
 
 Validation token:  [% token %]
 
-[% app.name %]: [% app.url %]
+eduGAIN Access Check: [% app.url %]
 
-If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [% app.support_email %] to inform them about a potential abuse of the [% app.name %] service.
+If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [% app.support_email %] to inform them about a potential abuse of the eduGAIN Access Check service.
 
 Best Regards
-[% app.name %] Bot
+eduGAIN Access Check Bot
diff --git a/templates/mail/fr/send_authentication_token.tt2.eml b/templates/mail/fr/send_authentication_token.tt2.eml
index 4fc03ea8505ad14f3627b7df797fb109c9935bfc..5f83ded5a449bb6ce9e971b1ca5c845be98789e3 100644
--- a/templates/mail/fr/send_authentication_token.tt2.eml
+++ b/templates/mail/fr/send_authentication_token.tt2.eml
@@ -1,6 +1,6 @@
-From: [% app.name %] <[% from %]>
+From: eduGAIN Access Check <[% from %]>
 To: [% to %]
-Subject: [% app.name %] - Demande de comptes de test
+Subject: eduGAIN Access Check - Demande de comptes de test
 Content-type: text/plain; charset=UTF-8; format=flowed
 
 Ceci est un message envoyé automatiquement par l'application eduGAIN
@@ -14,7 +14,7 @@ validation suivant dans l'application eduGAIN Access Check.
 
 Code de validation:  [% token %]
 
-[% app.name %]: [% app.url %]
+eduGAIN Access Check: [% app.url %]
 
 Si la création de comptes de test n'a pas été demandée par vous ou un
 autre administrateur du service mentionné plus haut, merci de
@@ -23,4 +23,4 @@ d'une utilisation inappropriée de l'application eduGAIN Access
 Check.
 
 Cordialement
-[% app.name %] Bot
+eduGAIN Access Check Bot
diff --git a/templates/web/en/create_accounts.tt2.html b/templates/web/en/create_accounts.tt2.html
index ce1490559fe68de460cadcf6275fb5af370d6f15..9004152e66b03bf30e283a97e408cba03f92d59a 100644
--- a/templates/web/en/create_accounts.tt2.html
+++ b/templates/web/en/create_accounts.tt2.html
@@ -45,7 +45,7 @@ provider.</p>
         </button>
         <h3>List of user attributes associated</h3>
         <p>Below is the list of user attributes associated to this test account. After a successfull authentication process these attributes are transmited
-        via the SAML protocol from [% app.name %] Identity Provider to your Service Provider.</p>
+        via the SAML protocol from eduGAIN Access Check Identity Provider to your Service Provider.</p>
         <div>
             <table>
                 <caption>List of user attributes</caption>
@@ -76,6 +76,6 @@ provider.</p>
 
 <div class="grid-x align-center">
     <div class="cell shrink">
-        <strong>Thank you for using the [% app.name %]</strong>
+        <strong>Thank you for using the eduGAIN Access Check</strong>
     </div>
 </div>
diff --git a/templates/web/en/home.tt2.html b/templates/web/en/home.tt2.html
index a5e1e5c0a6db72020ca5baf00a22a8c7fc42971f..ef9dea200893dcd0f533534d6d9b06072ac1b0ce 100644
--- a/templates/web/en/home.tt2.html
+++ b/templates/web/en/home.tt2.html
@@ -8,7 +8,7 @@ access own services.</p>
 <p><a href="presentation.html">More information</a></p>
 
 <h2>Functionning</h2>
-<img alt="[% app.name %] Basics" src="images/edugain_test_idp_basics.png"/>
+<img alt="eduGAIN Access Check Basics" src="images/edugain_test_idp_basics.png"/>
 
 <h2>Getting started</h2>
 <p>To start testing your own services, start by selecting one your are administrator for.</p>
diff --git a/templates/web/en/index.tt2.html b/templates/web/en/index.tt2.html
index 74a34cd9443bef55066dcfc99b60a8a842f23172..2480d14e0932051f5ba64895adc7ff76efac22e9 100644
--- a/templates/web/en/index.tt2.html
+++ b/templates/web/en/index.tt2.html
@@ -20,7 +20,7 @@
         <script type="text/javascript" src="jquery-validation-1.17.0.min.js"></script>
         <script type="text/javascript" src="account-manager.js"></script>
 
-        <title>[% app.name %]</title>
+        <title>eduGAIN Access Check</title>
 
     </head>
 
@@ -30,7 +30,7 @@
                 <a href="http://www.edugain.org" title="eduGAIN home page" target="_blank" class="float-left"><img alt="eduGAIN logo" width="200" src="images/edugain_logo.png"/></a>
                 <a href="http://www.geant.net" title="Geant home page" target="_blank" class="float-right"><img alt="GEANT logo" width="100" src="images/geant_logo_rgb_300dpi.jpg"/></a>
             </div>
-            <h1>[% app.name %]</h1>
+            <h1>eduGAIN Access Check</h1>
         </header>
 
         <main>
@@ -38,7 +38,7 @@
         </main>
 
         <footer>
-            <p class="text-center">[% app.name %] [% app.version %] - <a href="mailto:[% app.support_email %]">contact us</a></p>
+            <p class="text-center">eduGAIN Access Check [% app.version %] - <a href="mailto:[% app.support_email %]">contact us</a></p>
         </footer>
 
         <script src="foundation/js/vendor/what-input.js"></script>
diff --git a/templates/web/fr/create_accounts.tt2.html b/templates/web/fr/create_accounts.tt2.html
index 48d72c7b4f5ba484e80e0fa801d8cb1e89a90126..3a0bd1036ac733c31b9891a615b823d98382f6bb 100644
--- a/templates/web/fr/create_accounts.tt2.html
+++ b/templates/web/fr/create_accounts.tt2.html
@@ -46,7 +46,7 @@ service fédéré. Pour le faire, sélectionnez <strong>[% idp_displayname
         <h3>Liste des attributs utilisateur</h3>
         <p>Voici la liste des attributs utilisateur associés à ce compte de
         test. Ces attributs sont transmis via le protocole SAML, après une
-        authentification réussie, du fournisseur d'identité [% app.name %] à
+        authentification réussie, du fournisseur d'identité eduGAIN Access Check à
         votre service.</p>
         <div>
             <table>
diff --git a/templates/web/fr/home.tt2.html b/templates/web/fr/home.tt2.html
index 9698d8ee2c7a184c08742774606e49b54d0fba6f..1e3a31f848c2735c7f3e814ac4e214d1c64c4a0e 100644
--- a/templates/web/fr/home.tt2.html
+++ b/templates/web/fr/home.tt2.html
@@ -8,7 +8,7 @@ comptes de test ne peuvent être utilisés qu'avec ce service.</p>
 <p><a href="presentation.html">Plus d'information</a></p>
 
 <h2>Fonctionnement</h2>
-<img alt="[% app.name %] Basics" src="images/edugain_test_idp_basics.png"/>
+<img alt="eduGAIN Access Check Basics" src="images/edugain_test_idp_basics.png"/>
 
 <h2>Commencer</h2>
 <p>Pour commencer à tester vos propres services, commencez par en sélectionner un dont vous êtes l'administrateur.</p>
diff --git a/templates/web/fr/index.tt2.html b/templates/web/fr/index.tt2.html
index 86e8aa0b1d8abda08a593b795a024981571c7468..45cf2dd7df9eb7ddb9b10475fb183ee97ce47ed7 100644
--- a/templates/web/fr/index.tt2.html
+++ b/templates/web/fr/index.tt2.html
@@ -20,7 +20,7 @@
         <script type="text/javascript" src="jquery-validation-1.17.0.min.js"></script>
         <script type="text/javascript" src="account-manager.js"></script>
 
-        <title>[% app.name %]</title>
+        <title>eduGAIN Access Check</title>
 
     </head>
 
@@ -30,7 +30,7 @@
                 <a href="http://www.edugain.org" title="eduGAIN home page" target="_blank" class="float-left"><img alt="eduGAIN logo" width="200" src="images/edugain_logo.png"/></a>
                 <a href="http://www.geant.net" title="Geant home page" target="_blank" class="float-right"><img alt="GEANT logo" width="100" src="images/geant_logo_rgb_300dpi.jpg"/></a>
             </div>
-	    <h1>[% app.name %]</h1>
+	    <h1>eduGAIN Access Check</h1>
         </header>
 
         <main>
@@ -38,7 +38,7 @@
         </main>
 
         <footer>
-            <p class="text-center">[% app.name %] [% app.version %] - <a href="mailto:[% app.support_email %]">contactez nous</a></p>
+            <p class="text-center">eduGAIN Access Check [% app.version %] - <a href="mailto:[% app.support_email %]">contactez nous</a></p>
         </footer>
 
         <script src="foundation/js/vendor/what-input.js"></script>