diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index 8c13967de772a069671ee35f6b82a71b54de7356..633b90b265c96d8e404fa027c7c1b027d507c2a7 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -4902,7 +4902,7 @@ if (!defined('_ACKNOWLEDGEMENT_RECEIPTS')) {
     define('_ACKNOWLEDGEMENT_RECEIPTS', 'Acknowledgement of receipts');
 }
 if (!defined('_PUT_IN_SEND_ATTACH')) {
-    define('_PUT_IN_SEND_ATTACH', 'Put in send attachement');
+    define('_PUT_IN_SEND_ATTACH', 'Put in send attachement Maileva');
 }
 if (!defined('_INITIATOR_ENTITY')) {
     define('_INITIATOR_ENTITY', 'Initiator entity');
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index ca70b38b854535727014394829afa4d25f7ada2c..a6b7750be87a7fe2bcd9a378320738fd57324bb0 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -5039,7 +5039,7 @@ if (!defined('_ACKNOWLEDGEMENT_RECEIPTS')) {
     define('_ACKNOWLEDGEMENT_RECEIPTS', 'Accusés de réception');
 }
 if (!defined('_PUT_IN_SEND_ATTACH')) {
-    define('_PUT_IN_SEND_ATTACH', 'Intégrer aux envois');
+    define('_PUT_IN_SEND_ATTACH', 'Intégrer aux envois Maileva');
 }
 if (!defined('_INITIATOR_ENTITY')) {
     define('_INITIATOR_ENTITY', 'Entité initiatrice');
diff --git a/apps/maarch_entreprise/lang/nl.php b/apps/maarch_entreprise/lang/nl.php
index e1a1c5f1f85b1ae294d9cee928ca3e1361b17153..c58215768aa0a787a89c455eb9bfa1b2faa250f9 100755
--- a/apps/maarch_entreprise/lang/nl.php
+++ b/apps/maarch_entreprise/lang/nl.php
@@ -1660,7 +1660,7 @@ if (!defined('_ACKNOWLEDGEMENT_RECEIPTS')) {
     define('_ACKNOWLEDGEMENT_RECEIPTS', 'Acknowledgement of receipts_TO_TRANSLATE');
 }
 if (!defined('_PUT_IN_SEND_ATTACH')) {
-    define('_PUT_IN_SEND_ATTACH', 'Put in send attachement_TO_TRANSLATE');
+    define('_PUT_IN_SEND_ATTACH', 'Put in send attachement Maileva_TO_TRANSLATE');
 }
 if (!defined('_INITIATOR_ENTITY')) {
     define('_INITIATOR_ENTITY', 'Initiator entity_TO_TRANSLATE');
diff --git a/apps/maarch_entreprise/xml/services.xml b/apps/maarch_entreprise/xml/services.xml
index b150f656ec42b30971458fc692a55f8e83326645..1fadb9284a9f1a4c10f79444a2e0c369414ff10e 100755
--- a/apps/maarch_entreprise/xml/services.xml
+++ b/apps/maarch_entreprise/xml/services.xml
@@ -435,8 +435,8 @@
   </SERVICE>
   <SERVICE>
     <id>admin_shippings</id>
-    <name>_SHIPPINGS_ADMIN</name>
-    <comment>_SHIPPINGS_ADMIN_DESC</comment>
+    <name>_MAILEVA_ADMIN</name>
+    <comment>_MAILEVA_ADMIN_DESC</comment>
     <servicepage>/administration/shippings</servicepage>
     <servicetype>admin</servicetype>
     <category>supervision</category>
diff --git a/core/xml/actions_pages.xml b/core/xml/actions_pages.xml
index 1ea357ce8659ea8db99c1076ca8015586a39eaed..ba2fa09116d522a033829cffa206991a3329703f 100755
--- a/core/xml/actions_pages.xml
+++ b/core/xml/actions_pages.xml
@@ -509,7 +509,7 @@ An action page is described in a ACTIONPAGE tag :
     </ACTIONPAGE>
     <ACTIONPAGE>
         <ID>send_shipping</ID>
-        <LABEL>_SEND_SHIPPING</LABEL>
+        <LABEL>_SEND_MAILEVA</LABEL>
         <NAME>send_shipping</NAME>
         <component>sendShippingAction</component>
         <ORIGIN>apps</ORIGIN>
diff --git a/src/app/shipping/controllers/ShippingTemplateController.php b/src/app/shipping/controllers/ShippingTemplateController.php
index 5037734fb232fce1b20e4bc8b33bf81fd9a8d6dc..41c91059937e84b3c8095ed26ec48fb906f8865d 100755
--- a/src/app/shipping/controllers/ShippingTemplateController.php
+++ b/src/app/shipping/controllers/ShippingTemplateController.php
@@ -122,7 +122,7 @@ class ShippingTemplateController
             'recordId'  => $id,
             'eventType' => 'ADD',
             'eventId'   => 'shippingadd',
-            'info'      => _SHIPPING_ADDED . ' : ' . $body['label']
+            'info'      => _MAILEVA_ADDED . ' : ' . $body['label']
         ]);
 
         return $response->withJson(['shippingId' => $id]);
@@ -162,7 +162,7 @@ class ShippingTemplateController
             'recordId'  => $aArgs['id'],
             'eventType' => 'UP',
             'eventId'   => 'shippingup',
-            'info'      => _SHIPPING_UPDATED. ' : ' . $body['label']
+            'info'      => _MAILEVA_UPDATED. ' : ' . $body['label']
         ]);
 
         return $response->withJson(['success' => 'success']);
@@ -190,7 +190,7 @@ class ShippingTemplateController
             'recordId'  => $aArgs['id'],
             'eventType' => 'DEL',
             'eventId'   => 'shippingdel',
-            'info'      => _SHIPPING_DELETED. ' : ' . $shippingInfo['label']
+            'info'      => _MAILEVA_DELETED. ' : ' . $shippingInfo['label']
         ]);
 
         $shippings = ShippingTemplateModel::get(['select' => ['id', 'label', 'description', 'options', 'fee', 'entities']]);
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index 8c7eb9517df096f15d3dcaa98271b25ffbaaf4cb..dbd1924d983a37c0a1eb2f0ac3adbf63796ca9c5 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -470,14 +470,14 @@ define("_EMAIL_WAIT", "Waiting to be send");
 define("_EMAIL_SENT", "Sent");
 define("_EMAIL_ERROR", "Error when sending");
 
-define("_SHIPPING_ADDED", "Shipping added");
-define("_SHIPPING_UPDATED", "Shipping updated");
-define("_SHIPPING_DELETED", "Shipping deleted");
+define("_MAILEVA_ADDED", "Shipping Maileva added");
+define("_MAILEVA_UPDATED", "Shipping Maileva updated");
+define("_MAILEVA_DELETED", "Shipping Maileva deleted");
 
-define("_SHIPPINGS_ADMIN", "Shippings admin");
-define("_SHIPPINGS_ADMIN_DESC", "Configure mailing templates, for example for Maileva");
+define("_MAILEVA_ADMIN", "Shippings Maileva admin");
+define("_MAILEVA_ADMIN_DESC", "Configure mailing templates for Maileva");
 
-define("_SEND_SHIPPING", "Send to Maileva");
+define("_SEND_MAILEVA", "Send to Maileva");
 
 define("_VIEW_DOCUMENTS_WITH_NOTES", "View mail with notes");
 define("_VIEW_DOCUMENTS_WITH_NOTES_DESC", "View attachment of 'document_with_notes' type");
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index 5a867a40299a6ac14cb686444bc5214e7f633f27..b7736980447849fb7021fecfcfa2d4cab86c4e58 100755
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -470,14 +470,14 @@ define("_EMAIL_WAIT", "En attente d'envoi");
 define("_EMAIL_SENT", "Envoyé");
 define("_EMAIL_ERROR", "Erreur lors de l'envoi");
 
-define("_SHIPPING_ADDED", "Envoi postal ajouté");
-define("_SHIPPING_UPDATED", "Envoi postal mis à jour");
-define("_SHIPPING_DELETED", "Envoi postal supprimé");
+define("_MAILEVA_ADDED", "Envoi postal Maileva ajouté");
+define("_MAILEVA_UPDATED", "Envoi postal Maileva mis à jour");
+define("_MAILEVA_DELETED", "Envoi postal Maileva supprimé");
 
-define("_SHIPPINGS_ADMIN", "Modèles d'envois postaux");
-define("_SHIPPINGS_ADMIN_DESC", "Configurer les modèles d'envois postaux, par exemple pour Maileva");
+define("_MAILEVA_ADMIN", "Modèles d'envois postaux Maileva");
+define("_MAILEVA_ADMIN_DESC", "Configurer les modèles d'envois postaux Maileva");
 
-define("_SEND_SHIPPING", "Envoyer vers Maileva");
+define("_SEND_MAILEVA", "Envoyer vers Maileva");
 
 define("_VIEW_DOCUMENTS_WITH_NOTES", "Voir les courriers annotés");
 define("_VIEW_DOCUMENTS_WITH_NOTES_DESC", "Voir les pièces jointes de type 'Document annoté'");
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index 9ff8630410a47814bfb3e710c09b5848db736504..7aa52458b2791a2dfe1b24bd6e819f7dabb60132 100755
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -472,14 +472,14 @@ define("_EMAIL_WAIT", "Waiting to be send_TO_TRANSLATE");
 define("_EMAIL_SENT", "Sent_TO_TRANSLATE");
 define("_EMAIL_ERROR", "Error when sending_TO_TRANSLATE");
 
-define("_SHIPPING_ADDED", "Shipping added_TO_TRANSLATE");
-define("_SHIPPING_UPDATED", "Shipping updated_TO_TRANSLATE");
-define("_SHIPPING_DELETED", "Shipping deleted_TO_TRANSLATE");
+define("_MAILEVA_ADDED", "Shipping Maileva added_TO_TRANSLATE");
+define("_MAILEVA_UPDATED", "Shipping Maileva updated_TO_TRANSLATE");
+define("_MAILEVA_DELETED", "Shipping Maileva deleted_TO_TRANSLATE");
 
-define("_SHIPPINGS_ADMIN", "Shippings admin_TO_TRANSLATE");
-define("_SHIPPINGS_ADMIN_DESC", "Configure mailing templates, for example for Maileva_TO_TRANSLATE");
+define("_MAILEVA_ADMIN", "Shippings Maileva admin_TO_TRANSLATE");
+define("_MAILEVA_ADMIN_DESC", "Configure mailing templatesfor Maileva_TO_TRANSLATE");
 
-define("_SEND_SHIPPING", "Send to Maileva_TO_TRANSLATE");
+define("_SEND_MAILEVA", "Send to Maileva_TO_TRANSLATE");
 
 define("_VIEW_DOCUMENTS_WITH_NOTES", "View mail with notes_TO_TRANSLATE");
 define("_VIEW_DOCUMENTS_WITH_NOTES_DESC", "View attachment of 'document_with_notes' type_TO_TRANSLATE");
diff --git a/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html b/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
index ade8c60b20397df88e4599106d69ba2a8882a8b5..f580f7c8f1c50d61e1a4c100642134fea3357dd3 100644
--- a/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
+++ b/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
@@ -66,7 +66,7 @@
                                     </p>
                                     <ul>
                                         <li>
-                                            {{lang['shipping_'+currentShipping.options.sendMode]}}
+                                            {{lang['maileva_'+currentShipping.options.sendMode]}}
                                         </li>
                                     </ul>
                                 </div>
@@ -76,7 +76,7 @@
                                     </p>
                                     <ul>
                                         <li *ngFor="let option of currentShipping.options.shapingOptions">
-                                            {{lang['shipping_'+option]}}
+                                            {{lang['maileva_'+option]}}
                                         </li>
                                     </ul>
                                 </div>
diff --git a/src/frontend/app/administration/shipping/shipping-administration.component.html b/src/frontend/app/administration/shipping/shipping-administration.component.html
index bd458180f8efab16fca999e68962ce7dbc6315c3..68ca94a24a9e173d18125673bd6d13d49541fbf0 100644
--- a/src/frontend/app/administration/shipping/shipping-administration.component.html
+++ b/src/frontend/app/administration/shipping/shipping-administration.component.html
@@ -36,7 +36,7 @@
                             <mat-list role="list">
                                 <mat-list-item role="listitem" *ngFor="let option of shapingOptions">
                                     <mat-slide-toggle color="primary" name="{{option}}" [checked]="shipping.options.shapingOptions.indexOf(option) > -1"
-                                        (change)="toggleShapingOption(option)">{{lang['shipping_'+option]}}</mat-slide-toggle>
+                                        (change)="toggleShapingOption(option)">{{lang['maileva_'+option]}}</mat-slide-toggle>
                                 </mat-list-item>
                             </mat-list>
                         </div>
@@ -46,7 +46,7 @@
                             </div>
                             <mat-radio-group class="radio-group" name="sendMode" [(ngModel)]="shipping.options.sendMode">
                                 <mat-radio-button *ngFor="let mode of sendModes" name="{{mode}}" [value]="mode" color="primary">
-                                    {{lang['shipping_'+mode]}}
+                                    {{lang['maileva_'+mode]}}
                                 </mat-radio-button>
                             </mat-radio-group>
                         </div>
@@ -58,33 +58,33 @@
                             </div>
                             <div class="priceContent">
                                 <label class="priceContent-label" for="firstPagePrice">
-                                    {{lang.shipping_firstPagePrice}}
+                                    {{lang.maileva_firstPagePrice}}
                                 </label>
                                 <mat-form-field appearance="outline">
                                     <input matInput [(ngModel)]="shipping.fee.firstPagePrice" required name="firstPagePrice"
-                                        id="firstPagePrice" title="{{lang.shipping_firstPagePrice}}" type="number"
+                                        id="firstPagePrice" title="{{lang.maileva_firstPagePrice}}" type="number"
                                         maxlength="255" min="0" step="0.1" pattern="^(?=.+)(?:[1-9]\d*|0)?(?:\.\d+)?$">
                                     <span matSuffix>&nbsp;€</span>
                                 </mat-form-field>
                             </div>
                             <div class="priceContent">
                                 <label class="priceContent-label" for="nextPagePrice">
-                                    {{lang.shipping_nextPagePrice}}
+                                    {{lang.maileva_nextPagePrice}}
                                 </label>
                                 <mat-form-field appearance="outline">
                                     <input matInput [(ngModel)]="shipping.fee.nextPagePrice" required name="nextPagePrice"
-                                        id="nextPagePrice" title="{{lang.shipping_nextPagePrice}}" type="number"
+                                        id="nextPagePrice" title="{{lang.maileva_nextPagePrice}}" type="number"
                                         maxlength="255" min="0" step="0.1" pattern="^(?=.+)(?:[1-9]\d*|0)?(?:\.\d+)?$">
                                     <span matSuffix>&nbsp;€</span>
                                 </mat-form-field>
                             </div>
                             <div class="priceContent">
                                 <label class="priceContent-label" for="postagePrice">
-                                    {{lang.shipping_postagePrice}}
+                                    {{lang.maileva_postagePrice}}
                                 </label>
                                 <mat-form-field appearance="outline">
                                     <input matInput [(ngModel)]="shipping.fee.postagePrice" required name="postagePrice"
-                                        id="postagePrice" title="{{lang.shipping_postagePrice}}" type="number"
+                                        id="postagePrice" title="{{lang.maileva_postagePrice}}" type="number"
                                         maxlength="255" min="0" step="0.1" pattern="^(?=.+)(?:[1-9]\d*|0)?(?:\.\d+)?$">
                                     <span matSuffix>&nbsp;€</span>
                                 </mat-form-field>
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 5c1780b4998608235c174c18133212f3f63b069b..cff1192279407bb1ceeb447f83cc482d943bd814 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -894,28 +894,28 @@ export const LANG_EN = {
     "noPerson"                                  : "No person",
     "willBeAutomaticallyInCopy"                 : "will be automatically <b>in copy</b>",
     "confirm"                                   : "Confirm",
-    "shipping_color"                            : "Color",
-    "shipping_duplexPrinting"                   : "Both sides",
-    "shipping_addressPage"                      : "Address page",
-    "shipping_fast"                             : "Lettre grand compte (J+2)",
-    "shipping_economic"                         : "Ecopli grand compte (J+4)",
-    "shipping_registered_mail"                  : "Registered mail",
-    "shipping_registered_mail_ar"               : "Registered mail AR",
-    "shipping_firstPagePrice"                   : "1st page",
-    "shipping_nextPagePrice"                    : "Next page(s)",
-    "shipping_postagePrice"                     : "Postage up to 20g",
+    "mailleva_color"                            : "Color",
+    "maileva_duplexPrinting"                    : "Both sides",
+    "maileva_addressPage"                       : "Address page",
+    "maileva_fast"                              : "Lettre grand compte (J+2)",
+    "maileva_economic"                          : "Ecopli grand compte (J+4)",
+    "maileva_registered_mail"                   : "Registered mail",
+    "maileva_registered_mail_ar"                : "Registered mail AR",
+    "maileva_firstPagePrice"                    : "1st page",
+    "maileva_nextPagePrice"                     : "Next page(s)",
+    "maileva_postagePrice"                     : "Postage up to 20g",
     "shapingOptions"                            : "Shapings options",
     "sendModes"                                 : "Send modes",
     "sendMode"                                  : "Send mode",
     "pricesInformations"                        : "Prices informations",
-    "shippingModification"                      : "Shipping modification",
-    "shippingCreation"                          : "Shipping creation",
-    "shippingAdded"                             : "Shipping added",
-    "shippingUpdated"                           : "Shipping updated",
-    "shippingDeleted"                           : "Shipping deleted",
-    "shippings"                                 : "Shippings templates",
-    "noShippingTemplate"                        : "No common shipping templates available for these entities",
-    "doShippingParameter"                       : "Please set up a template in <b>Administration</b> > <b>Shippings templates</b>",
+    "shippingModification"                      : "Shipping Maileva modification",
+    "shippingCreation"                          : "Shipping Maileva creation",
+    "shippingAdded"                             : "Shipping Maileva added",
+    "shippingUpdated"                           : "Shipping Maileva updated",
+    "shippingDeleted"                           : "Shipping Maileva deleted",
+    "shippings"                                 : "Shippings Maileva templates",
+    "noShippingTemplate"                        : "No common shipping Maileva templates available for these entities",
+    "doShippingParameter"                       : "Please set up a template in <b>Administration</b> > <b>Shippings Maileva templates</b>",
     "shippingReadyToSend"                       : "document(s) ready to be sent",
     "shippingNotEligible"                       : "Ineligible mail(s) ",
     "accordingTemplateParameters"               : "According to the parameters defined in the model",
@@ -932,7 +932,7 @@ export const LANG_EN = {
     "downloadOriginalFile"                      : "Download the original file",
     "version"                                   : "Version",
     "putInSignatureBook"                        : "Put in signature book",
-    "putInSendAttach"                           : "Put in send attachement",
+    "putInSendAttach"                           : "Put in send attachement Maileva",
     "by"                                        : "By",
     "expectedReturnDate"                        : "Expected return date",
     "returnDate"                                : "Return date",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 540c8e17a5efe11f755ab305a1bc3be1e49a3d46..5e550536a47432db48f39c8140e679aae89477c1 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -921,28 +921,28 @@ export const LANG_FR = {
     "noPerson"                                          : "Aucune personne",
     "willBeAutomaticallyInCopy"                         : "sera automatiquement mis <b>en copie</b>",
     "confirm"                                           : "Confirmer",
-    "shipping_color"                                    : "Couleur",
-    "shipping_duplexPrinting"                           : "Recto verso",
-    "shipping_addressPage"                              : "Page porte adresse",
-    "shipping_fast"                                     : "Lettre grand compte (J+2)",
-    "shipping_economic"                                 : "Ecopli grand compte (J+4)",
-    "shipping_registered_mail"                          : "Recommandé",
-    "shipping_registered_mail_ar"                       : "Recommandé AR",
-    "shipping_firstPagePrice"                           : "1ère page",
-    "shipping_nextPagePrice"                            : "Page(s) suivante(s)",
-    "shipping_postagePrice"                             : "Affranchissement jusqu'à 20g",
+    "maileva_color"                                     : "Couleur",
+    "maileva_duplexPrinting"                            : "Recto verso",
+    "maileva_addressPage"                               : "Page porte adresse",
+    "maileva_fast"                                      : "Lettre grand compte (J+2)",
+    "maileva_economic"                                  : "Ecopli grand compte (J+4)",
+    "maileva_registered_mail"                           : "Recommandé",
+    "maileva_registered_mail_ar"                        : "Recommandé AR",
+    "maileva_firstPagePrice"                            : "1ère page",
+    "maileva_nextPagePrice"                             : "Page(s) suivante(s)",
+    "maileva_postagePrice"                              : "Affranchissement jusqu'à 20g",
     "shapingOptions"                                    : "Options de mise en page",
     "sendModes"                                         : "Modes d'envoi",
     "sendMode"                                          : "Mode d'envoi",
     "pricesInformations"                                : "Tarifs indicatifs",
-    "shippingModification"                              : "Modification du modèle d'envoi",
-    "shippingCreation"                                  : "Création du modèle d'envoi",
-    "shippingAdded"                                     : "Modèle d'envoi ajouté",
-    "shippingUpdated"                                   : "Modèle d'envoi modifié",
-    "shippingDeleted"                                   : "Modèle d'envoi supprimé",
-    "shippings"                                         : "Modèle(s) d'envoi",
-    "noShippingTemplate"                                : "Aucun modèle d'envoi commun disponible pour ces entités",
-    "doShippingParameter"                               : "Veuillez paramétrer un modèle dans <b>Administration</b> > <b>Modèles d'envois postaux</b>",
+    "shippingModification"                              : "Modification du modèle d'envoi Maileva",
+    "shippingCreation"                                  : "Création du modèle d'envoi Maileva",
+    "shippingAdded"                                     : "Modèle d'envoi Maileva ajouté",
+    "shippingUpdated"                                   : "Modèle d'envoi Maileva modifié",
+    "shippingDeleted"                                   : "Modèle d'envoi Maileva supprimé",
+    "shippings"                                         : "Modèle(s) d'envoi Maileva",
+    "noShippingTemplate"                                : "Aucun modèle d'envoi Maileva commun disponible pour ces entités",
+    "doShippingParameter"                               : "Veuillez paramétrer un modèle dans <b>Administration</b> > <b>Modèles d'envois postaux Maileva</b>",
     "shippingReadyToSend"                               : "document(s) prêt(s) à l'envoi",
     "shippingNotEligible"                               : "Courrier(s) non éligible(s)",
     "accordingTemplateParameters"                       : "Selon les paramètres définis dans le modèle",
@@ -959,7 +959,7 @@ export const LANG_FR = {
     "downloadOriginalFile"                              : "Télécharger le fichier original",
     "version"                                           : "Version",
     "putInSignatureBook"                                : "Intégrer au parapheur",
-    "putInSendAttach"                                   : "Intégrer aux envois",
+    "putInSendAttach"                                   : "Intégrer aux envois Maileva",
     "by"                                                : "Par",
     "expectedReturnDate"                                : "Date de retour attendue",
     "returnDate"                                        : "Date de retour",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index fe234e449e9004a4f03bf7ac2230a23d41ecec5d..5146331c0dede761d1162da78a94d8ac35cb64bb 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -921,36 +921,36 @@ export const LANG_NL = {
     "noPerson"                                  : "Geen persoon", //_TO_TRANSLATE
     "willBeAutomaticallyInCopy"                 : "wordt automatisch <b>gekopieerd</b>", //_TO_TRANSLATE
     "confirm"                                   : "Bevestigen", //_TO_TRANSLATE
-    "shipping_color"                            : "Color", //_TO_TRANSLATE
-    "shipping_duplexPrinting"                            : "Both sides", //_TO_TRANSLATE
-    "shipping_addressPage"                            : "Address page", //_TO_TRANSLATE
-    "shipping_fast"                            : "Fast (J+2)", //_TO_TRANSLATE
-    "shipping_economic"                            : "Economic (J+4)", //_TO_TRANSLATE
-    "shipping_registered_mail"                            : "Registered mail", //_TO_TRANSLATE
-    "shipping_registered_mail_ar"                            : "Registered mail AR", //_TO_TRANSLATE
-    "shipping_firstPagePrice"                            : "1st page", //_TO_TRANSLATE
-    "shipping_nextPagePrice"                            : "Next page(s)", //_TO_TRANSLATE
-    "shipping_postagePrice"                            : "Postage up to 20g", //_TO_TRANSLATE
+    "maileva_color"                             : "Color", //_TO_TRANSLATE
+    "maileva_duplexPrinting"                    : "Both sides", //_TO_TRANSLATE
+    "maileva_addressPage"                       : "Address page", //_TO_TRANSLATE
+    "maileva_fast"                              : "Fast (J+2)", //_TO_TRANSLATE
+    "maileva_economic"                          : "Economic (J+4)", //_TO_TRANSLATE
+    "maileva_registered_mail"                   : "Registered mail", //_TO_TRANSLATE
+    "maileva_registered_mail_ar"                : "Registered mail AR", //_TO_TRANSLATE
+    "maileva_firstPagePrice"                    : "1st page", //_TO_TRANSLATE
+    "maileva_nextPagePrice"                     : "Next page(s)", //_TO_TRANSLATE
+    "maileva_postagePrice"                      : "Postage up to 20g", //_TO_TRANSLATE
     "shapingOptions"                            : "Shapings options", //_TO_TRANSLATE
-    "sendModes"                            : "Send modes", //_TO_TRANSLATE
-    "sendMode"                            : "Send mode", //_TO_TRANSLATE
-    "pricesInformations"                            : "Prices informations", //_TO_TRANSLATE
-    "shippingModification"                            : "Shipping modification", //_TO_TRANSLATE
-    "shippingCreation"                            : "Shipping creation", //_TO_TRANSLATE
-    "shippingAdded"                            : "Shipping added", //_TO_TRANSLATE
-    "shippingUpdated"                            : "Shipping updated", //_TO_TRANSLATE
-    "shippingDeleted"                            : "Shipping deleted", //_TO_TRANSLATE
-    "shippings"                            : "Shippings templates", //_TO_TRANSLATE
-    "noShippingTemplate"                        : "No common shipping templates available for these entities", //_TO_TRANSLATE
-    "doShippingParameter"                       : "Please set up a template in <b>Administration</b> > <b>Shippings templates</b>", //_TO_TRANSLATE
+    "sendModes"                                 : "Send modes", //_TO_TRANSLATE
+    "sendMode"                                  : "Send mode", //_TO_TRANSLATE
+    "pricesInformations"                        : "Prices informations", //_TO_TRANSLATE
+    "shippingModification"                      : "Shipping Maileva modification", //_TO_TRANSLATE
+    "shippingCreation"                          : "Shipping Maileva creation", //_TO_TRANSLATE
+    "shippingAdded"                             : "Shipping Maileva added", //_TO_TRANSLATE
+    "shippingUpdated"                           : "Shipping Maileva updated", //_TO_TRANSLATE
+    "shippingDeleted"                           : "Shipping Maileva deleted", //_TO_TRANSLATE
+    "shippings"                                 : "Shippings Maileva templates", //_TO_TRANSLATE
+    "noShippingTemplate"                        : "No common shipping Maileva templates available for these entities", //_TO_TRANSLATE
+    "doShippingParameter"                       : "Please set up a template in <b>Administration</b> > <b>Shippings Maileva templates</b>", //_TO_TRANSLATE
     "shippingReadyToSend"                       : "document(s) ready to be sent", //_TO_TRANSLATE
     "shippingNotEligible"                       : "Ineligible mail(s) ", //_TO_TRANSLATE
     "accordingTemplateParameters"               : "According to the parameters defined in the model", //_TO_TRANSLATE
-    "mailevaAccount"                             : "Maileva account", //_TO_TRANSLATE
-    "destinationChangingInfo"              : "This mail will be reassigned to this entity", //_TO_TRANSLATE
-    "destinationChangingInfoMass"                            : "These mails following external entity of", //_TO_TRANSLATE
-    "destinationChangingInfoMass2"                            : "will be redirected to entity", //_TO_TRANSLATE
-    "selected"                            : "selected", //_TO_TRANSLATE
+    "mailevaAccount"                            : "Maileva account", //_TO_TRANSLATE
+    "destinationChangingInfo"                   : "This mail will be reassigned to this entity", //_TO_TRANSLATE
+    "destinationChangingInfoMass"               : "These mails following external entity of", //_TO_TRANSLATE
+    "destinationChangingInfoMass2"              : "will be redirected to entity", //_TO_TRANSLATE
+    "selected"                                  : "selected", //_TO_TRANSLATE
     "noDiffusionList"                           : "No diffusion list", //_TO_TRANSLATE
     "chooseAnotherEntityUser"                   : "Choose another person from the entity", //_TO_TRANSLATE
     "totalPrice"                                : "Total price", //_TO_TRANSLATE
@@ -959,7 +959,7 @@ export const LANG_NL = {
     "downloadOriginalFile"                      : "Download the original file", //_TO_TRANSLATE
     "version"                                   : "Version", //_TO_TRANSLATE
     "putInSignatureBook"                        : "Put in signature book", //_TO_TRANSLATE
-    "putInSendAttach"                           : "Put in send attachement", //_TO_TRANSLATE
+    "putInSendAttach"                           : "Put in send attachement Maileva", //_TO_TRANSLATE
     "by"                                        : "By", //_TO_TRANSLATE
     "expectedReturnDate"                        : "Expected return date", //_TO_TRANSLATE
     "returnDate"                                : "Datum van terugkeer", //_TO_TRANSLATE