diff --git a/gestion/lib/Service/Devis/Pdf/DevisPdfService.php b/gestion/lib/Service/Devis/Pdf/DevisPdfService.php
index 7a2c8ae..258c14a 100644
--- a/gestion/lib/Service/Devis/Pdf/DevisPdfService.php
+++ b/gestion/lib/Service/Devis/Pdf/DevisPdfService.php
@@ -137,7 +137,7 @@ class DevisPdfService {
     }
     
     private function getDevisPdfFolder(array $devisPdfData,$racinePath){
-        $clientRacineFolder = $racinePath.'CLIENTS/'.strtoupper($devisPdfData["client_entreprise"]).'/';
+        $clientRacineFolder = $racinePath.'CLIENTS/'.strtoupper($devisPdfData["client_nom"]).'/';
         $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.strtoupper($devisPdfData['defunt_nom']).'/'.'DEVIS'.'/';
         $devisDate = $devisPdfData['devis_date'];
         $devisDatetime = new DateTime($devisDate);
diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php
index bd4e995..bc5514e 100644
--- a/gestion/lib/Service/InvoicePdfHandler.php
+++ b/gestion/lib/Service/InvoicePdfHandler.php
@@ -77,10 +77,10 @@ class InvoicePdfHandler extends FPDF {
         foreach($this->multipleFactureData as $factureData){
             $factureType = $factureData["facture_type"];
             if($factureType == MultipleFactureTypeConstant::CLIENT_FILTER_TYPE){
-                $filename = mb_strtoupper($factureData["client_entreprise"],'UTF-8');
+                $filename = mb_strtoupper($factureData["client_prenom"],'UTF-8');
             }
             else{
-                $filename = 'GROUP_'.mb_strtoupper($factureData["client_entreprise"],'UTF-8');
+                $filename = 'GROUP_'.mb_strtoupper($factureData["client_nom"],'UTF-8');
             }
             $filename .= $month != 0 ? '_'.DateHelpers::GetMonthPlainString($month) :'';
             $filename .= "_".$year;
diff --git a/gestion/lib/Service/InvoicePdfService.php b/gestion/lib/Service/InvoicePdfService.php
index 7b6080b..b218166 100644
--- a/gestion/lib/Service/InvoicePdfService.php
+++ b/gestion/lib/Service/InvoicePdfService.php
@@ -101,7 +101,7 @@ class InvoicePdfService {
     }
     
     private function getFacturesFolder(array $factureData,$racinePath){
-        $clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_entreprise"],'UTF-8').'/';
+        $clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_nom"],'UTF-8').'/';
         $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($factureData['defunt_nom'],'UTF-8').'/'.'FACTURES'.'/';
         $devisDate = $factureData['devis_date'];
         $devisDatetime = new DateTime($devisDate);