diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 77fd22715ad..79bda6f3109 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -380,7 +380,7 @@ if ($action == 'create') {
     print '<td valign="top" rowspan="13"><textarea name="comment" wrap="soft" cols="40" rows="25"></textarea></td></tr>';
 
     print '<tr><td>'.$langs->trans("Firstname").'*</td><td><input type="text" name="prenom" size="40"></td></tr>';
-    print '<tr><td>'.$langs->trans("LastName").'*</td><td><input type="text" name="nom" size="40"></td></tr>';
+    print '<tr><td>'.$langs->trans("Lastname").'*</td><td><input type="text" name="nom" size="40"></td></tr>';
     print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40"></td></tr>';
     print '<tr><td>'.$langs->trans("Address").'</td><td>';
     print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>';
@@ -531,7 +531,7 @@ if ($rowid > 0)
 
     print '<tr><td width="15%">'.$langs->trans("Firstname").'*</td><td class="valeur" width="35%">'.$adh->prenom.'&nbsp;</td></tr>';
 
-    print '<tr><td>'.$langs->trans("LastName").'*</td><td class="valeur">'.$adh->nom.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("Lastname").'*</td><td class="valeur">'.$adh->nom.'&nbsp;</td></tr>';
 
     print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$adh->societe.'&nbsp;</td></tr>';
     print '<tr><td>'.$langs->trans("Address").'</td><td class="valeur">'.nl2br($adh->adresse).'&nbsp;</td></tr>';
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index c61f6d0c5af..35fa58a5f06 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -143,7 +143,7 @@ print "</tr>\n";
 print "<tr $bc[$var]>";
 print '<td>';
 
-print $langs->trans("LastName").'/'.$langs->trans("Firstname").' <input type="text" name="search" class="flat" size="20">';
+print $langs->trans("Lastname").'/'.$langs->trans("Firstname").' <input type="text" name="search" class="flat" size="20">';
 
 print '&nbsp; <input class="flat" type="submit" value="'.$langs->trans("Search").'">';
 print '</td></tr>';
diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php
index d89ff792ac7..02e8678943c 100644
--- a/htdocs/boutique/commande/ca.php
+++ b/htdocs/boutique/commande/ca.php
@@ -42,7 +42,7 @@ print_barre_liste("Liste des commandes", $page, "ca.php");
 
 print '<table class="noborder" cellspacing="0" cellpadding="3">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>';
-print '<td align="right">'.$langs->trans("LastName").'</td></tr>';
+print '<td align="right">'.$langs->trans("Lastname").'</td></tr>';
 
 $sql = "SELECT sum(t.value) as value";
 $sql .= " FROM ".DB_NAME_OSC.".orders_total as t";
diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php
index d3eb16ec420..34f7762c467 100644
--- a/htdocs/boutique/commande/fiche.php
+++ b/htdocs/boutique/commande/fiche.php
@@ -112,7 +112,7 @@ if ($id)
       print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
       print "<tr>";
       print '<td width="20%">Frais d\'expéditions</td><td width="80%">'.price($commande->total_ot_shipping).' EUR</td></tr>';
-      print '<td width="20%">'.$langs->trans("LastName").'</td><td width="80%">'.price($commande->total_ot_total).' EUR</td></tr>';
+      print '<td width="20%">'.$langs->trans("Lastname").'</td><td width="80%">'.price($commande->total_ot_total).' EUR</td></tr>';
       print "</table>";
 
       
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index f7234c67951..bb1ba7be191 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -434,7 +434,7 @@ if ($_socid > 0)
        */
       print '<table class="noborder" width="100%">';
 
-      print '<tr class="liste_titre"><td>'.$langs->trans("Firstname").' '.$langs->trans("LastName").'</td>';
+      print '<tr class="liste_titre"><td>'.$langs->trans("Firstname").' '.$langs->trans("Lastname").'</td>';
       print '<td>'.$langs->trans("Poste").'</td><td>'.$langs->trans("Tel").'</td>';
       print '<td>'.$langs->trans("Fax").'</td><td>'.$langs->trans("EMail").'</td>';
       print "<td align=\"center\"><a href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$objsoc->id."&amp;action=create\">".$langs->trans("AddContact")."</a></td>";
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index d840c89a753..210be49adcc 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -213,7 +213,7 @@ if ($_GET["action"] == 'create') {
   $langs->load("companies");
   print "<tr $bc[1]>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40"></td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40"></td></tr>';
-  print "<tr $bc[1]>".'<td>'.$langs->trans("LastName").'</td><td><input type="text" name="nom" size="40"></td></tr>';
+  print "<tr $bc[1]>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40"></td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Address").'</td><td>';
   print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>';
@@ -290,7 +290,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
   $langs->load("companies");
   print "<tr $bc[1]>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$don->societe.'"></td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.$don->prenom.'"></td></tr>';
-  print "<tr $bc[1]>".'<td>'.$langs->trans("LastName").'</td><td><input type="text" name="nom" size="40" value="'.$don->nom.'"></td></tr>';
+  print "<tr $bc[1]>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40" value="'.$don->nom.'"></td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Address").'</td><td>';
   print '<textarea name="adresse" wrap="soft" cols="40" rows="3">'.$don->adresse.'</textarea></td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8" value="'.$don->cp.'"> <input type="text" name="ville" size="40" value="'.$don->ville.'"></td></tr>';
@@ -356,7 +356,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
 
   print "<tr $bc[1]>".'<td>'.$langs->trans("Company").'</td><td>'.$don->societe.'</td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Firstname").'</td><td>'.$don->prenom.'</td></tr>';
-  print "<tr $bc[1]>".'<td>'.$langs->trans("LastName").'</td><td>'.$don->nom.'</td></tr>';
+  print "<tr $bc[1]>".'<td>'.$langs->trans("Lastname").'</td><td>'.$don->nom.'</td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Address").'</td><td>'.nl2br($don->adresse).'</td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.' '.$don->ville.'</td></tr>';
   print "<tr $bc[1]>".'<td>'.$langs->trans("Country").'</td><td>'.$don->pays.'</td></tr>';
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index d2f5480a612..aa3901ce182 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -221,7 +221,7 @@ if ($_GET["action"] == 'create')
   print $form->select_civilite($obj->civilite);
   print '</td></tr>';
 
-  print '<tr><td>'.$langs->trans("LastName").'</td><td><input name="name" type="text" size="20" maxlength="80"></td>';
+  print '<tr><td>'.$langs->trans("Lastname").'</td><td><input name="name" type="text" size="20" maxlength="80"></td>';
   print '<td>'.$langs->trans("Firstname").'</td><td><input name="firstname" type="text" size="15" maxlength="80"></td>';
 
   print '<td>Tel Pro</td><td><input name="phone_pro" type="text" size="18" maxlength="80" value="'.$contact->phone_pro.'"></td></tr>';
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 915afdfb6ee..5a894317f22 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -226,9 +226,9 @@ if ( $societe->fetch($socid) )
    */
   $langs->load("companies");
 
-  print '<br><table class="noborder" cellspacing="0" cellpadding="2" width="100%">';
+  print '<br><table class="noborder" width="100%">';
 
-  print '<tr class="liste_titre"><td><b>'.$langs->trans("FirstName").' '.$langs->trans("LastName").'</b></td>';
+  print '<tr class="liste_titre"><td><b>'.$langs->trans("Firstname").' '.$langs->trans("Lastname").'</b></td>';
   print '<td><b>Poste</b></td><td><b>'.$langs->trans("Tel").'</b></td>';
   print "<td><b>".$langs->trans("Fax")."</b></td><td><b>".$langs->trans("EMail")."</b></td>";
   print "<td align=\"center\"><a href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a></td></tr>";
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 0b41f078bda..1de2d55f57a 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -6,8 +6,8 @@ NewCompany=New company (prospect, customer, supplier)
 Company=Company
 Companies=Companies
 Name=Name
-LastName=Lastname
-FirstName=Firstname
+Lastname=Lastname
+Firstname=Firstname
 UserTitle=Title
 Surname=Surname/Pseudo
 Address=Address
diff --git a/htdocs/langs/fr_BE/companies.lang b/htdocs/langs/fr_BE/companies.lang
index 5b9ad4bf09f..fb10281e7c4 100644
--- a/htdocs/langs/fr_BE/companies.lang
+++ b/htdocs/langs/fr_BE/companies.lang
@@ -4,8 +4,8 @@ NewCompany=Nouvelle soci
 Company=Société
 Companies=Sociétés
 Name=Nom
-LastName=Nom
-FirstName=Prénom
+Lastname=Nom
+Firstname=Prénom
 Surname=Prénom
 Address=Adresse
 State=Province
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index a6ad535f6c5..17ce18fb59f 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -7,7 +7,7 @@ NewCompany=Nouvelle soci
 Company=Société
 Companies=Sociétés
 Name=Nom
-LastName=Nom
+Lastname=Nom
 Firstname=Prénom
 UserTitle=Titre civilité
 Surname=Surnom/Pseudo
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index 0107a494bb5..401e0363711 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -3,8 +3,8 @@ NewCompany=Nieuwe bedrijf (vooruitzicht, klant, leverancier)
 Company=Bedrijf
 Companies=Bedrijven
 Name=Naam
-LastName=Naam
-FirstName=Voornaam
+Lastname=Naam
+Firstname=Voornaam
 Surname=De familienaam
 Address=Het adres
 State=Provincie
diff --git a/htdocs/user/addon.php b/htdocs/user/addon.php
index b497afeb44e..3d62973236b 100644
--- a/htdocs/user/addon.php
+++ b/htdocs/user/addon.php
@@ -95,9 +95,9 @@ if ($_GET["id"])
   
   print '<table class="border" width="100%">';
   
-  print "<tr>".'<td width="25%" valign="top">'.$langs->trans("LastName").'</td>';
+  print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
   print '<td width="25%" class="valeur">'.$fuser->nom.'</td>';
-  print '<td width="25%" valign="top">'.$langs->trans("FirstName").'</td>';
+  print '<td width="25%" valign="top">'.$langs->trans("Firstname").'</td>';
   print '<td width="25%" class="valeur">'.$fuser->prenom.'</td>';
   print "</tr>\n";
   
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 11d7e3becb3..3646700b75a 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -146,10 +146,10 @@ if ($action == 'create')
 
     print '<table class="border" width="100%">';
 
-    print '<tr><td valign="top" width="20%">'.$langs->trans("FirstName").'</td>';
+    print '<tr><td valign="top" width="20%">'.$langs->trans("Firstname").'</td>';
     print '<td class="valeur"><input size="30" type="text" name="prenom" value=""></td></tr>';
 
-    print "<tr>".'<td valign="top">'.$langs->trans("LastName").'</td>';
+    print "<tr>".'<td valign="top">'.$langs->trans("Lastname").'</td>';
     print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>';
 
     print "<tr>".'<td valign="top">'.$langs->trans("Login").'</td>';
@@ -314,9 +314,9 @@ else
 	    
             print '<table class="border" width="100%">';
 	    
-            print "<tr>".'<td width="25%" valign="top">'.$langs->trans("LastName").'</td>';
+            print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
             print '<td width="25%" class="valeur">'.$fuser->nom.'</td>';
-            print '<td width="25%" valign="top">'.$langs->trans("FirstName").'</td>';
+            print '<td width="25%" valign="top">'.$langs->trans("Firstname").'</td>';
             print '<td width="25%" class="valeur">'.$fuser->prenom.'</td>';
             print "</tr>\n";
 	    
@@ -437,10 +437,10 @@ else
             print '<input type="hidden" name="action" value="update">';
             print '<table wdith="100%" class="border">';
 
-            print "<tr>".'<td valign="top">'.$langs->trans("LastName").'</td>';
+            print "<tr>".'<td valign="top">'.$langs->trans("Lastname").'</td>';
             print '<td><input size="30" type="text" name="nom" value="'.$fuser->nom.'"></td></tr>';
 
-            print "<tr>".'<td valign="top">'.$langs->trans("FirstName").'</td>';
+            print "<tr>".'<td valign="top">'.$langs->trans("Firstname").'</td>';
             print '<td><input size="20" type="text" name="prenom" value="'.$fuser->prenom.'"></td></tr>';
 
             print "<tr>".'<td valign="top">'.$langs->trans("Login").'</td>';
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 4d596f9d09c..bd34a9ad156 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -58,8 +58,8 @@ if ($result)
 
     print "<table class=\"noborder\" width=\"100%\">";
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("LastName"),"index.php","name","","","",$sortfield);
-    print_liste_field_titre($langs->trans("FirstName"),"index.php","firstname","","","",$sortfield);
+    print_liste_field_titre($langs->trans("Lastname"),"index.php","name","","","",$sortfield);
+    print_liste_field_titre($langs->trans("Firstname"),"index.php","firstname","","","",$sortfield);
     print_liste_field_titre($langs->trans("Login"),"index.php","login","","","",$sortfield);
     print_liste_field_titre($langs->trans("Code"),"index.php","code","","","",$sortfield);
     print "</tr>\n";