diff --git a/templates/email.php b/templates/email.php
index 41c1eae..3033d65 100644
--- a/templates/email.php
+++ b/templates/email.php
@@ -1,9 +1,9 @@
 <?php
 $MAIL_TEMPLATE = (object)[
-        "subject" => "[" . $SERVICE_NAME . "] Confirm your email address",
+        "subject" => "[" . $SERVICE_ACRONYM . "] Confirm your email address",
         "text"    => "To complete your registration please paste this to your browser: {{url}}",
         "html" => "<html><body>
-                <p>Almost there! Click on the confirm button below to confirm your email address and to complete your " . $SERVICE_NAME . " registration</p>
+                <p>Almost there! Click on the confirm button below to confirm your email address and to complete your " . $SERVICE_ACRONYM . " registration</p>
                 <a style='display: inline-block; outline: 0; cursor: pointer;
                 padding: 5px 16px;
                 font-size: 14px;
@@ -24,15 +24,15 @@
                     border-color: #1b1f2326;
                     transition-duration: 0.1s;
                 }
-            ' href='{{url}}'>Confirm " . $SERVICE_NAME . " registration</a>
+            ' href='{{url}}'>Confirm " . $SERVICE_ACRONYM . " registration</a>
         </body></html>"
 ];
 
 
 $RECOVERY_EMAIL_TEMPLATE = (object)[
-        "subject" => "[" . $SERVICE_NAME . "] Reset password for your " . $SERVICE_NAME . " account",
+        "subject" => "[" . $SERVICE_ACRONYM . "] Reset password for your " . $SERVICE_ACRONYM . " account",
         "text"    => "Seems you requested a password reset. If that wasn't you please ignore this message. Otherwise go to this url to change your password: {{url}}",
-        "html"    => "<html><body><h3>Forgot your " . $SERVICE_NAME . " password?</h3>
+        "html"    => "<html><body><h3>Forgot your " . $SERVICE_ACRONYM . " password?</h3>
                 <p>It seems that you requested a password reset. If that wasn't you please ignore this message. Otherwise click the button below to reset your password</p>
                 <a style='
                 display: inline-block;
@@ -51,16 +51,16 @@
                     transition: all .1s ease;
                     box-shadow: 0 0 0 0 #fff, 0 0 0 3px #1de9b6;
                 }
-            ' href='{{url}}'>Reset your " . $SERVICE_NAME . " password</a>
+            ' href='{{url}}'>Reset your " . $SERVICE_ACRONYM . " password</a>
         </body></html>"
 ];
 
 
 // Add the support email there
 $PASSWORD_CHANGED_EMAIL_TEMPLATE = (object)[
-        "subject" => "[" . $SERVICE_NAME . "] Your " . $SERVICE_NAME . " password was changed",
+        "subject" => "[" . $SERVICE_ACRONYM . "] Your " . $SERVICE_ACRONYM . " password was changed",
         "text"    => "Your password was changed successfully. If this wasn't you please contact support",
         "html"    => "<html><body>
-                <h3>" . $SERVICE_NAME . " password changed</h3><p>Your password was changed successfully. If this wasn't you please contact support.</p>
+                <h3>" . $SERVICE_ACRONYM . " password changed</h3><p>Your password was changed successfully. If this wasn't you please contact support.</p>
         </body></html>"
 ];
diff --git a/templates/header.htm b/templates/header.htm
index 8fe407c..119cc9b 100644
--- a/templates/header.htm
+++ b/templates/header.htm
@@ -5,9 +5,9 @@
     <!-- Required meta tags -->
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Sign up for <?php echo $SERVICE_NAME; ?></title>
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
+    <title>Sign up for <?php echo $SERVICE_ACRONYM; ?></title>
     <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css" rel="stylesheet">
     <link rel="stylesheet" href="<?php echo $BASE_URL?>/static/main.css" >
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.3/jquery.min.js" integrity="sha512-STof4xm1wgkfm7heWqFJVn58Hm3EtS31XFaagaa8VMReCXAkQnJZ+jEy8PCC/iT18dFy95WcExNHFTqLyp72eQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
diff --git a/templates/recover_email_form.htm b/templates/recover_email_form.htm
index 393d166..6560354 100644
--- a/templates/recover_email_form.htm
+++ b/templates/recover_email_form.htm
@@ -1,4 +1,4 @@
-<h1>Reset your <?php echo $SERVICE_NAME;?> password</h1>
+<h1>Reset your <?php echo $SERVICE_ACRONYM;?> password</h1>
 
 <form action="" method="POST">
     <!-- Email input -->
diff --git a/templates/recover_new_password_form.htm b/templates/recover_new_password_form.htm
index 95dbe7e..7c56c74 100644
--- a/templates/recover_new_password_form.htm
+++ b/templates/recover_new_password_form.htm
@@ -1,4 +1,4 @@
-<h2>Renewing <?php echo "$SERVICE_NAME password for " . $_SESSION['email_change'];?></h2>
+<h2>Renewing <?php echo "$SERVICE_ACRONYM password for " . $_SESSION['email_change'];?></h2>
 
 <form action="" method="POST">
     <!-- Password input -->
diff --git a/templates/register.htm b/templates/register.htm
index cf80d4c..cc15175 100644
--- a/templates/register.htm
+++ b/templates/register.htm
@@ -1,5 +1,5 @@
-<h1>Sign up for
-    <?php echo $SERVICE_NAME;?>
+  <h1>Sign up for 
+    <?php echo $SERVICE_ACRONYM;?>
 </h1>
 
 <form class="row g-3 needs-validation" novalidate action="" method="POST">