diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index 9f2edc144d0837f7d59c4096642646ff681b53da..51868085d100d62d4b00da40b863c5f5f1317f81 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -1996,9 +1996,6 @@ if (!defined('_IS_EXTERNAL_CONTACT')) {
 if (!defined('_SEARCH_DIRECTORY')) {
     define('_SEARCH_DIRECTORY', 'Directory search');
 }
-if (!defined('_M2M_ID')) {
-    define('_M2M_ID', 'M2GEC ID');
-}
 if (!defined('_CONTACT_ID')) {
     define('_CONTACT_ID', 'Contact ID');
 }
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index 2d28ae6673364670e547f8c6ed866789574ec7df..7a885f30792bebac56e8017c9abde00dda860d9f 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -2017,9 +2017,6 @@ if (!defined('_IS_EXTERNAL_CONTACT')) {
 if (!defined('_SEARCH_DIRECTORY')) {
     define('_SEARCH_DIRECTORY', 'Recherche annuaire');
 }
-if (!defined('_M2M_ID')) {
-    define('_M2M_ID', 'Identifiant M2GEC');
-}
 if (!defined('_CONTACT_ID')) {
     define('_CONTACT_ID', 'ID Contact');
 }
diff --git a/apps/maarch_entreprise/lang/nl.php b/apps/maarch_entreprise/lang/nl.php
index a6cce23424953a2a1615aa5bbb90a085712c8be1..94bc7afa374727ce4275f84c39d3aa18f06639f0 100755
--- a/apps/maarch_entreprise/lang/nl.php
+++ b/apps/maarch_entreprise/lang/nl.php
@@ -645,7 +645,6 @@ if (!defined('_IS_CORPORATE_PERSON')) { define('_IS_CORPORATE_PERSON', 'Rechtspe
 if (!defined('_IS_INTERNAL_CONTACT')) { define('_IS_INTERNAL_CONTACT', 'Intern contact');}
 if (!defined('_IS_EXTERNAL_CONTACT')) { define('_IS_EXTERNAL_CONTACT', 'Extern contact');}
 if (!defined('_SEARCH_DIRECTORY')) { define('_SEARCH_DIRECTORY', 'Opzoeking telefoonboek');}
-if (!defined('_M2M_ID')) { define('_M2M_ID', 'Gebruikersnaam M2GEC');}
 if (!defined('_INDIVIDUAL')) { define('_INDIVIDUAL', 'Privépersoon');}
 if (!defined('_CONTACT_TARGET')) { define('_CONTACT_TARGET', 'Voor welk contact kan dit type gebruikt worden?');}
 if (!defined('_CONTACT_TARGET_LIST')) { define('_CONTACT_TARGET_LIST', 'Doel van het contacttype');}
diff --git a/migration/20.03/2003-postScript.sql b/migration/20.03/2003-postScript.sql
index 0a70245bfd1cb304dba1509acfc753ed34b29586..18860751d779b06cce592a6c773be6232b53e58c 100644
--- a/migration/20.03/2003-postScript.sql
+++ b/migration/20.03/2003-postScript.sql
@@ -38,6 +38,10 @@ UPDATE CONTACTS SET email = null WHERE email = '';
 UPDATE CONTACTS SET phone = null WHERE phone = '';
 UPDATE CONTACTS SET notes = null WHERE notes = '';
 
+UPDATE res_attachments SET attachment_type = 'response_project' WHERE attachment_type = 'outgoing_mail';
+UPDATE res_attachments SET attachment_type = 'signed_response' WHERE attachment_type = 'outgoing_mail_signed';
+UPDATE res_attachments SET attachment_type = 'simple_attachment' WHERE attachment_type = 'document_with_notes';
+
 ALTER TABLE acknowledgement_receipts ALTER COLUMN contact_id set not null;
 ALTER TABLE acknowledgement_receipts DROP COLUMN IF EXISTS contact_address_id;
 ALTER TABLE contacts_groups_lists ALTER COLUMN contact_id set not null;
diff --git a/migration/20.03/2003.sql b/migration/20.03/2003.sql
index cb534a78fff8cf2a1c4de489ff0b79dfa0ee43af..63e3fb87a1d42488a0d6499b7124810af968f001 100644
--- a/migration/20.03/2003.sql
+++ b/migration/20.03/2003.sql
@@ -32,10 +32,6 @@ UPDATE res_letterbox SET fulltext_result = 'ERROR' WHERE fulltext_result = '-1'
 UPDATE res_attachments SET fulltext_result = 'SUCCESS' WHERE fulltext_result = '1' OR fulltext_result = '2';
 UPDATE res_attachments SET fulltext_result = 'ERROR' WHERE fulltext_result = '-1' OR fulltext_result = '-2';
 
-UPDATE res_attachments SET attachment_type = 'response_project' WHERE attachment_type = 'outgoing_mail';
-UPDATE res_attachments SET attachment_type = 'signed_response' WHERE attachment_type = 'outgoing_mail_signed';
-UPDATE res_attachments SET attachment_type = 'simple_attachment' WHERE attachment_type = 'document_with_notes';
-
 /* GROUPS INDEXING */
 ALTER TABLE usergroups ALTER COLUMN group_desc DROP DEFAULT;
 ALTER TABLE usergroups DROP COLUMN IF EXISTS can_index;
diff --git a/migration/20.03/migrateOutgoingAttachments.php b/migration/20.03/migrateOutgoingAttachments.php
index 08a429e092f55a8e63eb270096d0eb683f36bada..a15cb93ce4e93e8d974469c62d62c22dca86764d 100644
--- a/migration/20.03/migrateOutgoingAttachments.php
+++ b/migration/20.03/migrateOutgoingAttachments.php
@@ -61,8 +61,8 @@ foreach ($customs as $custom) {
             ]);
 
             $integration = [];
-            $integration['in_signature_book'] = empty($attachmentInfo['in_signature_book']) ?  'false' : 'true';
-            $integration['in_send_attach']    = empty($attachmentInfo['in_send_attach']) ?  'false' : 'true';
+            $integration['inSignatureBook'] = empty($attachmentInfo['in_signature_book']) ?  'false' : 'true';
+            $integration['inShipping']      = empty($attachmentInfo['in_send_attach']) ?  'false' : 'true';
             $attachmentExternalId = json_decode($attachmentInfo['external_id'], true);
             $externalId           = json_decode($attachmentInfo['letterbox_external_id'], true);
 
diff --git a/src/frontend/app/administration/contact/page/form/contacts-form.component.ts b/src/frontend/app/administration/contact/page/form/contacts-form.component.ts
index 9070de49b23e4d98623103a2d7277171ca846bb6..dac7fea588a9265980d20f981a8a0a3dbdebd52e 100644
--- a/src/frontend/app/administration/contact/page/form/contacts-form.component.ts
+++ b/src/frontend/app/administration/contact/page/form/contacts-form.component.ts
@@ -52,7 +52,7 @@ export class ContactsFormComponent implements OnInit {
 
     @Output() onSubmitEvent = new EventEmitter<number>();
 
-    maarch2GecUrl: string = `https://docs.maarch.org/gitbook/html/MaarchCourrier/${angularGlobals.applicationVersion.split('.')[0] + '.' + angularGlobals.applicationVersion.split('.')[1]}/guat/guat_exploitation/maarch2gec.html`;
+    maarch2maarchUrl: string = `https://docs.maarch.org/gitbook/html/MaarchCourrier/${angularGlobals.applicationVersion.split('.')[0] + '.' + angularGlobals.applicationVersion.split('.')[1]}/guat/guat_exploitation/maarch2maarch.html`;
 
     contactUnit = [
         {
@@ -243,7 +243,7 @@ export class ContactsFormComponent implements OnInit {
             id: 'communicationMeans',
             unit: 'maarch2maarch',
             label: this.lang.communicationMean,
-            desc: `${this.lang.communicationMeanDesc} (${this.lang.see} <a href="${this.maarch2GecUrl}" target="_blank">MAARCH2GEC</a>)`,
+            desc: `${this.lang.communicationMeanDesc} (${this.lang.see} <a href="${this.maarch2maarchUrl}" target="_blank">MAARCH2MAARCH</a>)`,
             type: 'string',
             control: new FormControl(),
             required: false,
@@ -254,8 +254,8 @@ export class ContactsFormComponent implements OnInit {
         {
             id: 'externalId_m2m',
             unit: 'maarch2maarch',
-            label: this.lang.IdMaarch2Gec,
-            desc: `${this.lang.m2mContactInfo} (${this.lang.see} <a href="${this.maarch2GecUrl}" target="_blank">MAARCH2GEC</a>)`,
+            label: this.lang.IdMaarch2Maarch,
+            desc: `${this.lang.m2mContactInfo} (${this.lang.see} <a href="${this.maarch2maarchUrl}" target="_blank">MAARCH2MAARCH</a>)`,
             type: 'string',
             control: new FormControl(),
             required: false,
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 30e99c98fbc68ce9df47f88d867ea88b03210466..e1d03aeead178a24e43f4de5cb4775c000537418 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1382,7 +1382,7 @@ export const LANG_EN = {
     "uriIsEmpty" : "URI of onlyoffice server is empty in documentEditorsConfig.xml",
     "portIsEmpty" : "Port of onlyoffice server is empty in documentEditorsConfig.xml",
     "externalVisaWorkflow" : "Visa workflow Maarch Parapheur",
-    "IdMaarch2Gec" : "MAARCH2GEC identifier",
+    "IdMaarch2Maarch" : "MAARCH2MAARCH identifier",
     "indexingFile" : "Indexation",
     "signUserRequired" : "A signatory is required",
     "signedUserDate" : "Signed",
@@ -1435,7 +1435,7 @@ export const LANG_EN = {
     "displayWebserviceAccount": "Display webservice account",
     "circuitNotStarted": "The workflow has not yet started",
     "searchCommunicationMean": "Search communication mean",
-    "searchExternalIdM2M": "Search M2GEC Identifier",
+    "searchExternalIdM2M": "Search M2M Identifier",
     "goToFolder": "Go to folder",
     "m2mContactInfo": "Expected Format : SIRET/ENTITY_ID of destination entity",
     "ADD": "Add",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 8bc3d73fb0f7781f5a9ec5da60668d801d7246f9..2bcb96dd0214d55611514fd01db696179a3c6016 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1422,7 +1422,7 @@ export const LANG_FR = {
     "uriIsEmpty" : "L'uri du serveur onlyoffice n'est pas renseigné dans documentEditorsConfig.xml",
     "portIsEmpty" : "Le port du serveur onlyoffice n'est pas renseigné dans documentEditorsConfig.xml",
     "externalVisaWorkflow" : "Circuit de visa Maarch Parapheur",
-    "IdMaarch2Gec" : "Identifiant MAARCH2GEC",
+    "IdMaarch2Maarch" : "Identifiant MAARCH2MAARCH",
     "indexingFile" : "Enregistrement de courrier",
     "signUserRequired" : "Un signataire mininum est requis",
     "signedUserDate" : "Signé",
@@ -1475,7 +1475,7 @@ export const LANG_FR = {
     "displayWebserviceAccount": "Afficher les comptes de webservice",
     "circuitNotStarted": "Le circuit n'a pas encore commencé",
     "searchCommunicationMean": "Recherchez un moyen de communication",
-    "searchExternalIdM2M": "Recherchez un identifiant M2GEC",
+    "searchExternalIdM2M": "Recherchez un identifiant M2M",
     "goToFolder": "Accéder au dossier",
     "m2mContactInfo": "Format attendu : SIRET/ENTITY_ID de l'entité destinatrice",
     "ADD": "Ajout",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 050bdda5b037d71b92203345b814d256d54bd566..2010b8f51361067b0dfe742f6f8b0432db120170 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1407,7 +1407,7 @@ export const LANG_NL = {
     "uriIsEmpty" : "URI of onlyoffice server is empty in documentEditorsConfig.xml", //_TO_TRANSLATE
     "portIsEmpty" : "Port of onlyoffice server is empty in documentEditorsConfig.xml", //_TO_TRANSLATE
     "externalVisaWorkflow" : "Visa workflow Maarch Parapheur", //_TO_TRANSLATE
-    "IdMaarch2Gec" : "MAARCH2GEC identifier", //_TO_TRANSLATE
+    "IdMaarch2Maarch" : "MAARCH2MAARCH identifier", //_TO_TRANSLATE
     "indexingFile" : "Indexation", //_TO_TRANSLATE
     "signUserRequired" : "A signatory is required", //_TO_TRANSLATE
     "signedUserDate" : "Signed", //_TO_TRANSLATE
@@ -1460,7 +1460,7 @@ export const LANG_NL = {
     "displayWebserviceAccount": "Display webservice account", //_TO_TRANSLATE
     "circuitNotStarted": "The workflow has not yet started", //_TO_TRANSLATE
     "searchCommunicationMean": "Search communication mean", //_TO_TRANSLATE
-    "searchExternalIdM2M": "Search M2GEC Identifier", //_TO_TRANSLATE
+    "searchExternalIdM2M": "Search M2M Identifier", //_TO_TRANSLATE
     "goToFolder": "Go to folder", //_TO_TRANSLATE
     "m2mContactInfo": "Expected Format : SIRET/ENTITY_ID of destination entity", //_TO_TRANSLATE
     "ADD": "Add", //_TO_TRANSLATE