diff --git a/include/XMLDocument/error_message.class.php b/include/XMLDocument/error_message.class.php
index de60b4a6a..72f80b71f 100644
--- a/include/XMLDocument/error_message.class.php
+++ b/include/XMLDocument/error_message.class.php
@@ -50,7 +50,7 @@ namespace Noalyss\XMLDocument;
         - 'COMPANY_LEGAL_REGISTRATION' full name
         - 'COMPANY_BANK_IBAN' IBAN bank account
         - 'COMPANY_BANK_BIC'  BIC bank account
-        - 'COMPANY_UBL_ID'    PEPPOL id ==> normalement c'est BE0999999999
+        - 'COMPANY_PEPPOL_ID'    PEPPOL id ==> normalement c'est BE0999999999
         - 'MY_COUNTRY_CODE'   country code (normally BE)
         - 'MY_NAME'           short company name
         - 'MY_STREET'         address
@@ -80,7 +80,7 @@ class Error_Message
             , 'COMPANY_LEGAL_REGISTRATION' => _("Nom complet de la société")
             , 'COMPANY_BANK_IBAN' => _("Compte en banque (IBAN) de la société")
             , 'COMPANY_BANK_BIC' => _("Code BIC de compte en banque")
-            , 'COMPANY_UBL_ID' => _("Identifiant PEPPOL")
+            , 'COMPANY_PEPPOL_ID' => _("Identifiant PEPPOL")
             , 'MY_COUNTRY_CODE' => _('Code Pays')
             , 'MY_NAME' => _("Nom de la société")
             , 'MY_STREET' => _("Adresse de la société")
diff --git a/include/XMLDocument/facturx.class.php b/include/XMLDocument/facturx.class.php
index 6f66da593..1dda0853e 100644
--- a/include/XMLDocument/facturx.class.php
+++ b/include/XMLDocument/facturx.class.php
@@ -48,7 +48,7 @@ class FacturX extends XMLInvoice
         , 'COMPANY_LEGAL_REGISTRATION'
         , 'COMPANY_BANK_IBAN'
         , 'COMPANY_BANK_BIC'
-        , 'COMPANY_UBL_ID'
+        , 'COMPANY_PEPPOL_ID'
         , 'COUNTRY_CODE'
         , 'MY_NAME'
         , 'MY_STREET'
diff --git a/include/XMLDocument/invoiceubl21.class.php b/include/XMLDocument/invoiceubl21.class.php
index c7f123ad5..8035d587a 100644
--- a/include/XMLDocument/invoiceubl21.class.php
+++ b/include/XMLDocument/invoiceubl21.class.php
@@ -86,11 +86,11 @@ class InvoiceUBL21 extends XMLInvoice {
         /**
          * check that PEPPOL ID is valid
          */
-        if ( isset($company['COMPANY_UBL_ID'])) 
+        if ( isset($company['COMPANY_PEPPOL_ID'])) 
         {
-            if ( strpos($company['COMPANY_UBL_ID'],':') == 0 )
+            if ( strpos($company['COMPANY_PEPPOL_ID'],':') == 0 )
             {
-                $a_error[]="COMPANY_UBL_ID";
+                $a_error[]="COMPANY_PEPPOL_ID";
             }
             
         }
@@ -234,7 +234,7 @@ class InvoiceUBL21 extends XMLInvoice {
         
         $supplier=$this->createElement('cac:AccountingSupplierParty');
         $supplier_party=$supplier->appendChild($this->createElement('cac:Party'));
-        list($scheme_id,$peppol)=explode( ":",$company['COMPANY_UBL_ID']);
+        list($scheme_id,$peppol)=explode( ":",$company['COMPANY_PEPPOL_ID']);
         $supplier_party->appendChild($this->createElement('cbc:EndpointID',$peppol))
                 ->setAttribute('schemeID', $scheme_id);
         
diff --git a/include/XMLDocument/xmlinvoice.class.php b/include/XMLDocument/xmlinvoice.class.php
index e99032610..0bca8fdc1 100644
--- a/include/XMLDocument/xmlinvoice.class.php
+++ b/include/XMLDocument/xmlinvoice.class.php
@@ -511,8 +511,8 @@ abstract class XMLInvoice extends \DOMDocument
         $result['COMPANY_LEGAL_ENTITY']=$a_parameter['COMPANY_LEGAL_ENTITY']??"";
         $result['INVOICE_CONTACT_NAME']=$a_parameter['INVOICE_CONTACT_NAME']??"";
         $result['INVOICE_EMAIL_COMPANY']=$a_parameter['INVOICE_EMAIL_COMPANY']??"";
-        //$result['COMPANY_UBL_ID']=$a_parameter['COMPANY_UBL_ID']??"";
-        $result['COMPANY_UBL_ID']="9925:".$result['supplier_vat_id'];
+        //$result['COMPANY_PEPPOL_ID']=$a_parameter['COMPANY_PEPPOL_ID']??"";
+        $result['COMPANY_PEPPOL_ID']="9925:".$result['supplier_vat_id'];
         return $result;
     }
     /**
diff --git a/include/sql/patch/upgrade204.sql b/include/sql/patch/upgrade204.sql
index e9f453345..29545e92d 100644
--- a/include/sql/patch/upgrade204.sql
+++ b/include/sql/patch/upgrade204.sql
@@ -234,7 +234,7 @@ insert into parameter_extra(pe_code,pe_label) values ('COMPANY_LEGAL_REGISTRATIO
 insert into parameter_extra(pe_code,pe_label) values ('COMPANY_LEGAL_ENTITY','Forme légal de la société (SRL,ASBL,AISBL,...') on conflict do nothing;
 insert into parameter_extra(pe_code,pe_label) values ('COMPANY_BANK_IBAN','Compte en banque (IBAN)') on conflict do nothing;
 insert into parameter_extra(pe_code,pe_label) values ('COMPANY_BANK_BIC','BIC Bank Identification Code') on conflict do nothing;
-insert into parameter_extra(pe_code,pe_label) values ('COMPANY_UBL_ID','Identifiant PEPPOL') on conflict do nothing;
+insert into parameter_extra(pe_code,pe_label) values ('COMPANY_PEPPOL_ID','Identifiant PEPPOL') on conflict do nothing;
 insert into parameter_extra(pe_code,pe_label) values ('SIREN','n° SIREN') on conflict do nothing;
 insert into parameter_extra(pe_code,pe_label) values ('SIRET','n° SIRET') on conflict do nothing;