diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 0c08775c4694222c1fe02aa0222353f62e308ca9..ed8b55b2d7b123c93b701980ef56a28b32d2fa4f 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -240,7 +240,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')	// Edit
     // Firstname/Name
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
-	$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Name"),1=>$langs->trans("Name").' '.$langs->trans("Firstname"));
+	$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"),1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
     print $html->selectarray('MAIN_FIRSTNAME_NAME_POSITION',$array,(isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0));
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -440,8 +440,8 @@ else	// Show
 	// Firstname / Name position
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
-    if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Name"); }
-    else { print $langs->trans("Name").' '.$langs->trans("Firstname"); }
+    if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Lastname"); }
+    else { print $langs->trans("Lastname").' '.$langs->trans("Firstname"); }
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 15f49b8882cfa67fcb2653d8fe023de8a8092541..d62c53526a6e5d21183a5ba5f9a0b9aeb1503d16 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -285,7 +285,7 @@ NumberOfModelFilesFound=Number of ODT templates files found in those directories
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=By adding such tags into template, you will get a substitution with personalized value when generating document: 
 FullListOnOnlineDocumentation=Full list of all available tags can be found on user documentation of module on wiki http://wiki.dolibarr.org
-FirstnameNamePosition=Position of firstname/name
+FirstnameNamePosition=Position of Name/Lastname
 DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
 KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
 
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index fe8eab1bd432de9739f71bc6be39a17cb717112a..c94b2a4d9b6509ce9de3e32043ee26258735ac36 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -50,7 +50,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Name=Name
 Lastname=Lastname
-Firstname=Firstname
+Firstname=Name
 PostOrFunction=Post/Function
 UserTitle=Title
 Surname=Surname/Pseudo