diff --git a/inc/webadmin-edit.php b/inc/webadmin-edit.php
index c8a579f..6ae1795 100644
--- a/inc/webadmin-edit.php
+++ b/inc/webadmin-edit.php
@@ -217,10 +217,10 @@ if (isset($_GET['del']) ) {
                 }
             }
             else {
-              print "<h2>Ajout d'un serveralias</h2><hr>";
+              print "<h2>Ajout d'un alias</h2><hr>";
                     print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
                     print "   <fieldset>";
-                    print "        <legend>Ajout d'un serveralias</legend>";
+                    print "        <legend>Ajout d'un alias</legend>";
                     print $form;
                     print "        <p><input type=\"submit\" value=\"Créer\"/></p>";
                     print "     </fieldset>";
@@ -228,10 +228,10 @@ if (isset($_GET['del']) ) {
 
             }
         } else {
-			print "<h2>Ajout d'un serveralias</h2><hr>";
+			print "<h2>Ajout d'un alias</h2><hr>";
             print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
             print "   <fieldset>";
-            print "        <legend>Ajout d'un serveralias</legend>";
+            print "        <legend>Ajout d'un alias</legend>";
             print $form;
             print "        <p><input type=\"submit\" value=\"Créer\"/></p>";
             print "     </fieldset>";
diff --git a/inc/webadmin-servername.php b/inc/webadmin-servername.php
index a68d7c2..c8915f6 100644
--- a/inc/webadmin-servername.php
+++ b/inc/webadmin-servername.php
@@ -24,8 +24,8 @@ if (isset($_GET['edit']) ) {
     include_once EVOADMIN_BASE . '../tpl/header.tpl.php';
     include_once EVOADMIN_BASE . '../tpl/menu.tpl.php';
 
-        $form = new FormPage("Modification du ServerName", FALSE);
-        $form->addField('domain_servername', new DomainInputFormField("ServerName", TRUE), $_GET['edit']);
+        $form = new FormPage("Modification du Servername", FALSE);
+        $form->addField('domain_servername', new DomainInputFormField("Servername", TRUE), $_GET['edit']);
         $form->addField('previous_servername', new DomainInputFormField("", TRUE, TRUE), $_GET['edit']);
 
         if (!empty($_POST)) {
@@ -122,40 +122,40 @@ if (isset($_GET['edit']) ) {
                       if ($exec_return == 0) {
                           //domain_add($serveralias['alias'], gethostbyname($master) , false); TODO avec l'IP du load balancer
                           print "<center>";
-                          printf ('<p>Le ServerName %s a bien été modifié</p>', $servername['servername']);
-                          printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
+                          printf ('<p>Le Servername %s a bien été modifié</p>', $servername['servername']);
+                          printf ('<p><a href="%s">Retour à la liste des Servernames</a></p>', $_SERVER['REDIRECT_URL']);
                           print "</center>";
                       }
                       else {
                           print "<center>";
-                          printf ('<p>Echec dans la modification du ServerName %s</p>', $servername['servername']);
-                          printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
+                          printf ('<p>Echec dans la modification du Servername %s</p>', $servername['servername']);
+                          printf ('<p><a href="%s">Retour à la liste des Servernames</a></p>', $_SERVER['REDIRECT_URL']);
                           print "</center>";
                       }
                     }
                     else {
                       print "<center>";
-                      printf ('<p>Echec dans la modification du ServerName %s</p>', $servername['servername']);
+                      printf ('<p>Echec dans la modification du Servername %s</p>', $servername['servername']);
                       print  ('<p>Le domaine existe déjà dans d\'autres vhosts.');
-                      printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
+                      printf ('<p><a href="%s">Retour à la liste des Servernames</a></p>', $_SERVER['REDIRECT_URL']);
                       print "</center>";
                     }
                 }
             } else {
-              print "<h2>Modification du ServerName</h2><hr>";
+              print "<h2>Modification du Servername</h2><hr>";
               print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
               print "   <fieldset>";
-              print "        <legend>Modification du ServerName</legend>";
+              print "        <legend>Modification du Servername</legend>";
               print $form;
               print "        <p><input type=\"submit\" value=\"Modifier\"/></p>";
               print "     </fieldset>";
               print "</form>";
             }
         } else {
-          print "<h2>Modification du ServerName</h2><hr>";
+          print "<h2>Modification du Servername</h2><hr>";
           print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
           print "   <fieldset>";
-          print "        <legend>Modification du ServerName</legend>";
+          print "        <legend>Modification du Servername</legend>";
           print $form;
           print "        <p><input type=\"submit\" value=\"Modifier\"/></p>";
           print "     </fieldset>";
diff --git a/tpl/webadmin-edit.tpl.php b/tpl/webadmin-edit.tpl.php
index 146dfdc..d1402c5 100644
--- a/tpl/webadmin-edit.tpl.php
+++ b/tpl/webadmin-edit.tpl.php
@@ -35,19 +35,19 @@
         </tr>
         </thead>
         <tbody>
-        <?php 
-            for ( $i=0; $i < count($alias_list); ++$i ) { 
+        <?php
+            for ( $i=0; $i < count($alias_list); ++$i ) {
                 print '<tr>';
-                printf('<td><a href="http://%s">http://%s</a></td>',
+                printf('<td>%s</td>',
                     $alias_list[$i]['alias'], $alias_list[$i]['alias']);
-                if (is_superadmin()) 
-                    printf('<td><a href="/webadmin/edit/%s?del=%s">Supprimer</a></td>', 
+                if (is_superadmin())
+                    printf('<td><a href="/webadmin/edit/%s?del=%s">Supprimer</a></td>',
                             $domain, $alias_list[$i]['alias']);
                 print '</tr>';
         } ?>
         </tbody>
     </table>
-<?php 
+<?php
    } else {
        print "<p>Aucun alias existant pour le domaine $domain !</p>";
         if (is_superadmin()) {
diff --git a/tpl/webadmin-itk.tpl.php b/tpl/webadmin-itk.tpl.php
index 7d1f596..9554eea 100644
--- a/tpl/webadmin-itk.tpl.php
+++ b/tpl/webadmin-itk.tpl.php
@@ -22,7 +22,7 @@
     <table id="tab-list">
         <thead>
         <tr>
-           <th>ServerName</th>
+           <th>Servername</th>
            <th>Utilisateur</th>
            <?php if (is_superadmin()) {
                print '<th>Action</th>';
diff --git a/tpl/webadmin-servername.tpl.php b/tpl/webadmin-servername.tpl.php
index 5e218cb..90930a9 100644
--- a/tpl/webadmin-servername.tpl.php
+++ b/tpl/webadmin-servername.tpl.php
@@ -13,7 +13,7 @@
 
 ?>
 
-<h2>ServerNames</h2>
+<h2>Servernames</h2>
 
 <?php
 
@@ -22,7 +22,7 @@
     <table id="tab-list">
         <thead>
         <tr>
-           <th>ServerName</th>
+           <th>Servername</th>
            <?php if (is_superadmin()) {
                print '<th>Action</th>';
            } ?>
@@ -43,7 +43,7 @@
     </table>
 <?php
    } else {
-       print "<p>Aucun ServerName existant pour le domaine $domain !</p>";
+       print "<p>Aucun Servername existant pour le domaine $domain !</p>";
    }
 
 
diff --git a/tpl/webadmin.tpl.php b/tpl/webadmin.tpl.php
index 67e6981..1d1f52d 100755
--- a/tpl/webadmin.tpl.php
+++ b/tpl/webadmin.tpl.php
@@ -22,9 +22,9 @@
       <thead>
       <tr>
         <?php if(is_superadmin()) {
-            print '<th>Propriétaire</th>';
+            print '<th>Virtual Host</th>';
         } ?>
-        <th>Domaine</th>
+        <th>Servername</th>
         <?php if(is_superadmin()) {
             print '<th>Alias</th>';
         }
@@ -61,7 +61,7 @@
           if(is_superadmin()) {
             printf('<td>%s</td>', $vhost_info['owner']);
           }
-          printf('<td><a href="http://%s">http://%s</a></td>',
+          printf('<td>%s</td>',
                   $vhost_info['server_name'], $vhost_info['server_name']);
 
           if ($conf['cluster']) {
@@ -87,7 +87,7 @@
                   printf('<td>%s</td>', $vhost_info['slave']);
 	  }
 
-          printf('<td align="left">%s</td>', preg_replace('/,/','<br />',$vhost_info['server_alias']));
+          printf('<td>%s</td>', preg_replace('/,/','<br />',$vhost_info['server_alias']));
 
           if ($conf['quota']) {
             printf('<td>%s</td>', $vhost_info['size']);
@@ -105,11 +105,11 @@
               printf('<a href="/webadmin/edit/%s">Alias</a> - ', $vhost_info['owner']);
               printf('<a href="/webadmin/servername/%s">Servername</a> - ', $vhost_info['owner']);
               if(is_multiphp()) {
-                  printf('<a href="/webadmin/php/%s">PHP</a>', $vhost_info['owner']);
+                  printf('<a href="/webadmin/php/%s">PHP</a> - ', $vhost_info['owner']);
               } else {
-                  printf('<a href="/webadmin/itk/%s">ITK</a>', $vhost_info['owner']);
+                  printf('<a href="/webadmin/itk/%s">ITK</a> - ', $vhost_info['owner']);
               }
-              printf('<a href="/webadmin/%s/delete/"> - Supprimer</a>', $vhost_info['owner']);
+              printf('<a href="/webadmin/%s/delete/">Supprimer</a>', $vhost_info['owner']);
               printf('</td>');
 
           }