diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 387c757be33..78be8f2d88c 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -14,7 +14,7 @@ ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
 ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
-ErrorFailedToDeleteJoinedFiles=Can not delete entity because there is some joined files. Remove join files first.
+ErrorFailedToDeleteJoinedFiles=Can not delete environment because there is some joined files. Remove join files first.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2c19fde8a4c..f74347d1ae5 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -66,7 +66,7 @@ SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Last connection
 PreviousConnexion=Previous connection
-ConnectedOnMultiCompany=Connected on entity
+ConnectedOnMultiCompany=Connected on environment
 ConnectedSince=Connected since
 AuthenticationMode=Authentification mode
 RequestedUrl=Requested Url
@@ -464,7 +464,7 @@ BuildPDF=Build PDF
 RebuildPDF=Rebuild PDF
 BuildDoc=Build Doc
 RebuildDoc=Rebuild Doc
-Entity=Entity
+Entity=Environment
 Entities=Entities
 EventLogs=Logs
 CustomerPreview=Customer preview
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 0cb0a57c097..d1d475d11d3 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -8,7 +8,7 @@ ErrorNoImagickReadimage=Function imagick_readimage is not found in this PHP. No
 ErrorRecordAlreadyExists=Record already exists
 ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
-ErrorFailedToFindEntity=Failed to read entity '%s'
+ErrorFailedToFindEntity=Failed to read environment '%s'
 ErrorBadLoginPassword=Bad value for login or password
 ErrorLoginDisabled=Your account has been disabled
 ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index aa3ade610ab..ea271b0b6fb 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -464,8 +464,8 @@ BuildPDF=Générer le PDF
 RebuildPDF=Régénérer le PDF
 BuildDoc=Générer le doc
 RebuildDoc=Régénérer le doc
-Entity=Entité
-Entities=Entités
+Entity=Environnement
+Entities=Environnements
 EventLogs=Suivi
 CustomerPreview=Aperçu client
 SupplierPreview=Aperçu fournisseur
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 10f14bc4062..968709c4635 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -8,7 +8,7 @@ ErrorNoImagickReadimage=La fonction imagick_readimage n'est pas présente sur ce
 ErrorRecordAlreadyExists=Enregistrement déjà existant
 ErrorCantReadFile=Échec de lecture du fichier '%s'
 ErrorCantReadDir=Échec de lecture du répertoire '%s'
-ErrorFailedToFindEntity=Échec de lecture de l'entité '%s'
+ErrorFailedToFindEntity=Échec de lecture de l'environnement '%s'
 ErrorBadLoginPassword=Identifiants login ou mot de passe incorrects
 ErrorLoginDisabled=Votre compte est désactivé
 ErrorFailedToRunExternalCommand=Échec de l'exécution de la commande externe. Vérifiez qu'elle est disponible et exécutable par votre serveur PHP. Si le <b>Safe Mode</b> PHP est actif, vérifiez que la commande se trouve dans un répertoire définie dans le paramètre <b>safe_mode_exec_dir</b>.