diff --git a/README.md b/README.md
index 681ec5f..f8688b1 100644
--- a/README.md
+++ b/README.md
@@ -3,20 +3,24 @@ N.B.: This README was automatically generated by <https://github.com/YunoHost/ap
 It shall NOT be edited by hand.
 -->
 
-# enDI for YunoHost
+# CAERP for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/endi.svg)](https://ci-apps.yunohost.org/ci/apps/endi/) ![Working status](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/caerp.svg)](https://ci-apps.yunohost.org/ci/apps/caerp/) ![Working status](https://ci-apps.yunohost.org/ci/badges/caerp.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/caerp.maintain.svg)
 
-[![Install enDI with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi)
+[![Install CAERP with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=caerp)
 
 *[Read this README in other languages.](./ALL_README.md)*
 
-> *This package allows you to install enDI quickly and simply on a YunoHost server.*  
+> *This package allows you to install CAERP quickly and simply on a YunoHost server.*  
 > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
 
 ## Overview
 
-enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs.
+enDI is a business management software package. It is the management tool for
+economic and social activity entirely dedicated to CAEs as well as to any
+company and group of independent entrepreneurs.
+
+It's the software behind the enDi and MoOGLi services.
 
 ### Features
 
@@ -25,33 +29,32 @@ enDI is a business management software package. It is the management tool for ec
 - Support for the entrepreneurial journey and commercial activity of entrepreneurs
 
 
-**Shipped version:** 6.6.4~ynh2
+**Shipped version:** 2024.07.05~ynh1
 
 **Demo:** <https://demo.endi.coop>
 
 ## Screenshots
 
-![Screenshot of enDI](./doc/screenshots/accueil.png)
+![Screenshot of CAERP](./doc/screenshots/accueil.png)
 
 ## Documentation and resources
 
 - Official app website: <https://endi.coop>
 - Official user documentation: <https://doc.endi.coop>
-- Official admin documentation: <https://framagit.org/endi/endi>
-- Upstream app code repository: <https://framagit.org/endi/endi>
-- YunoHost Store: <https://apps.yunohost.org/app/endi>
-- Report a bug: <https://github.com/YunoHost-Apps/endi_ynh/issues>
+- Upstream app code repository: <https://framagit.org/caerp/caerp>
+- YunoHost Store: <https://apps.yunohost.org/app/caerp>
+- Report a bug: <https://github.com/YunoHost-Apps/caerp_ynh/issues>
 
 ## Developer info
 
-Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/endi_ynh/tree/testing).
+Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/caerp_ynh/tree/testing).
 
 To try the `testing` branch, please proceed like that:
 
 ```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app install https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 or
-sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app upgrade caerp -u https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 ```
 
 **More info regarding app packaging:** <https://yunohost.org/packaging_apps>
diff --git a/README_es.md b/README_es.md
index 1e2c2e4..61a06e8 100644
--- a/README_es.md
+++ b/README_es.md
@@ -3,20 +3,24 @@ Este archivo README esta generado automaticamente<https://github.com/YunoHost/ap
 No se debe editar a mano.
 -->
 
-# enDI para Yunohost
+# CAERP para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/endi.svg)](https://ci-apps.yunohost.org/ci/apps/endi/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/caerp.svg)](https://ci-apps.yunohost.org/ci/apps/caerp/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/caerp.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/caerp.maintain.svg)
 
-[![Instalar enDI con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi)
+[![Instalar CAERP con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=caerp)
 
 *[Leer este README en otros idiomas.](./ALL_README.md)*
 
-> *Este paquete le permite instalarenDI rapidamente y simplement en un servidor YunoHost.*  
+> *Este paquete le permite instalarCAERP rapidamente y simplement en un servidor YunoHost.*  
 > *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
 
 ## Descripción general
 
-enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs.
+enDI is a business management software package. It is the management tool for
+economic and social activity entirely dedicated to CAEs as well as to any
+company and group of independent entrepreneurs.
+
+It's the software behind the enDi and MoOGLi services.
 
 ### Features
 
@@ -25,33 +29,32 @@ enDI is a business management software package. It is the management tool for ec
 - Support for the entrepreneurial journey and commercial activity of entrepreneurs
 
 
-**Versión actual:** 6.6.4~ynh2
+**Versión actual:** 2024.07.05~ynh1
 
 **Demo:** <https://demo.endi.coop>
 
 ## Capturas
 
-![Captura de enDI](./doc/screenshots/accueil.png)
+![Captura de CAERP](./doc/screenshots/accueil.png)
 
 ## Documentaciones y recursos
 
 - Sitio web oficial: <https://endi.coop>
 - Documentación usuario oficial: <https://doc.endi.coop>
-- Documentación administrador oficial: <https://framagit.org/endi/endi>
-- Repositorio del código fuente oficial de la aplicación : <https://framagit.org/endi/endi>
-- Catálogo YunoHost: <https://apps.yunohost.org/app/endi>
-- Reportar un error: <https://github.com/YunoHost-Apps/endi_ynh/issues>
+- Repositorio del código fuente oficial de la aplicación : <https://framagit.org/caerp/caerp>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/caerp>
+- Reportar un error: <https://github.com/YunoHost-Apps/caerp_ynh/issues>
 
 ## Información para desarrolladores
 
-Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/endi_ynh/tree/testing
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/caerp_ynh/tree/testing
 
 Para probar la rama `testing`, sigue asÍ:
 
 ```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app install https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 o
-sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app upgrade caerp -u https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 ```
 
 **Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>
diff --git a/README_eu.md b/README_eu.md
index b0e792c..51dcf6b 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -3,20 +3,24 @@ Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/t
 EZ editatu eskuz.
 -->
 
-# enDI YunoHost-erako
+# CAERP YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/endi.svg)](https://ci-apps.yunohost.org/ci/apps/endi/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/caerp.svg)](https://ci-apps.yunohost.org/ci/apps/caerp/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/caerp.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/caerp.maintain.svg)
 
-[![Instalatu enDI YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi)
+[![Instalatu CAERP YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=caerp)
 
 *[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
 
-> *Pakete honek enDI YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *Pakete honek CAERP YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
 > *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
 
 ## Aurreikuspena
 
-enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs.
+enDI is a business management software package. It is the management tool for
+economic and social activity entirely dedicated to CAEs as well as to any
+company and group of independent entrepreneurs.
+
+It's the software behind the enDi and MoOGLi services.
 
 ### Features
 
@@ -25,33 +29,32 @@ enDI is a business management software package. It is the management tool for ec
 - Support for the entrepreneurial journey and commercial activity of entrepreneurs
 
 
-**Paketatutako bertsioa:** 6.6.4~ynh2
+**Paketatutako bertsioa:** 2024.07.05~ynh1
 
 **Demoa:** <https://demo.endi.coop>
 
 ## Pantaila-argazkiak
 
-![enDI(r)en pantaila-argazkia](./doc/screenshots/accueil.png)
+![CAERP(r)en pantaila-argazkia](./doc/screenshots/accueil.png)
 
 ## Dokumentazioa eta baliabideak
 
 - Aplikazioaren webgune ofiziala: <https://endi.coop>
 - Erabiltzaileen dokumentazio ofiziala: <https://doc.endi.coop>
-- Administratzaileen dokumentazio ofiziala: <https://framagit.org/endi/endi>
-- Jatorrizko aplikazioaren kode-gordailua: <https://framagit.org/endi/endi>
-- YunoHost Denda: <https://apps.yunohost.org/app/endi>
-- Eman errore baten berri: <https://github.com/YunoHost-Apps/endi_ynh/issues>
+- Jatorrizko aplikazioaren kode-gordailua: <https://framagit.org/caerp/caerp>
+- YunoHost Denda: <https://apps.yunohost.org/app/caerp>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/caerp_ynh/issues>
 
 ## Garatzaileentzako informazioa
 
-Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/endi_ynh/tree/testing).
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/caerp_ynh/tree/testing).
 
 `testing` abarra probatzeko, ondorengoa egin:
 
 ```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app install https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 edo
-sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app upgrade caerp -u https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 ```
 
 **Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>
diff --git a/README_fr.md b/README_fr.md
index e0710be..c048513 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -3,23 +3,25 @@ Nota bene : ce README est automatiquement généré par <https://github.com/Yu
 Il NE doit PAS être modifié à la main.
 -->
 
-# enDI pour YunoHost
+# CAERP pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/endi.svg)](https://ci-apps.yunohost.org/ci/apps/endi/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/caerp.svg)](https://ci-apps.yunohost.org/ci/apps/caerp/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/caerp.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/caerp.maintain.svg)
 
-[![Installer enDI avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi)
+[![Installer CAERP avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=caerp)
 
 *[Lire le README dans d'autres langues.](./ALL_README.md)*
 
-> *Ce package vous permet d’installer enDI rapidement et simplement sur un serveur YunoHost.*  
+> *Ce package vous permet d’installer CAERP rapidement et simplement sur un serveur YunoHost.*  
 > *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.*
 
 ## Vue d’ensemble
 
-enDI est un progiciel de gestion d'entreprise. c'est l'outil de pilotage de
+CAERP est un progiciel de gestion d'entreprise. c'est l'outil de pilotage de
 l'activité économique et sociale entièrement dédié aux CAE ainsi qu'à toute
 entreprise et collectif d'entrepreneur.euse.s indépendant.e.s.
 
+C'est le logiciel derrière les services enDi et MoOGLI.
+
 ### Fonctionnalités
 
 Il permet aux entrepreneur.euse.s :
@@ -35,33 +37,32 @@ Il permet aux équipes d'appui une simplification, et une automatisation sur mes
 * Accompagnement du parcours entrepreneurial et de l'activité commerciale des entrepreneurs
 
 
-**Version incluse :** 6.6.4~ynh2
+**Version incluse :** 2024.07.05~ynh1
 
 **Démo :** <https://demo.endi.coop>
 
 ## Captures d’écran
 
-![Capture d’écran de enDI](./doc/screenshots/accueil.png)
+![Capture d’écran de CAERP](./doc/screenshots/accueil.png)
 
 ## Documentations et ressources
 
 - Site officiel de l’app : <https://endi.coop>
 - Documentation officielle utilisateur : <https://doc.endi.coop>
-- Documentation officielle de l’admin : <https://framagit.org/endi/endi>
-- Dépôt de code officiel de l’app : <https://framagit.org/endi/endi>
-- YunoHost Store : <https://apps.yunohost.org/app/endi>
-- Signaler un bug : <https://github.com/YunoHost-Apps/endi_ynh/issues>
+- Dépôt de code officiel de l’app : <https://framagit.org/caerp/caerp>
+- YunoHost Store : <https://apps.yunohost.org/app/caerp>
+- Signaler un bug : <https://github.com/YunoHost-Apps/caerp_ynh/issues>
 
 ## Informations pour les développeurs
 
-Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/endi_ynh/tree/testing).
+Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/caerp_ynh/tree/testing).
 
 Pour essayer la branche `testing`, procédez comme suit :
 
 ```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app install https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 ou
-sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app upgrade caerp -u https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 ```
 
 **Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
diff --git a/README_gl.md b/README_gl.md
index d08e9f8..ab0fb95 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -3,20 +3,24 @@ NOTA: Este README foi creado automáticamente por <https://github.com/YunoHost/a
 NON debe editarse manualmente.
 -->
 
-# enDI para YunoHost
+# CAERP para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/endi.svg)](https://ci-apps.yunohost.org/ci/apps/endi/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/caerp.svg)](https://ci-apps.yunohost.org/ci/apps/caerp/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/caerp.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/caerp.maintain.svg)
 
-[![Instalar enDI con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi)
+[![Instalar CAERP con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=caerp)
 
 *[Le este README en outros idiomas.](./ALL_README.md)*
 
-> *Este paquete permíteche instalar enDI de xeito rápido e doado nun servidor YunoHost.*  
+> *Este paquete permíteche instalar CAERP de xeito rápido e doado nun servidor YunoHost.*  
 > *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.*
 
 ## Vista xeral
 
-enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs.
+enDI is a business management software package. It is the management tool for
+economic and social activity entirely dedicated to CAEs as well as to any
+company and group of independent entrepreneurs.
+
+It's the software behind the enDi and MoOGLi services.
 
 ### Features
 
@@ -25,33 +29,32 @@ enDI is a business management software package. It is the management tool for ec
 - Support for the entrepreneurial journey and commercial activity of entrepreneurs
 
 
-**Versión proporcionada:** 6.6.4~ynh2
+**Versión proporcionada:** 2024.07.05~ynh1
 
 **Demo:** <https://demo.endi.coop>
 
 ## Capturas de pantalla
 
-![Captura de pantalla de enDI](./doc/screenshots/accueil.png)
+![Captura de pantalla de CAERP](./doc/screenshots/accueil.png)
 
 ## Documentación e recursos
 
 - Web oficial da app: <https://endi.coop>
 - Documentación oficial para usuarias: <https://doc.endi.coop>
-- Documentación oficial para admin: <https://framagit.org/endi/endi>
-- Repositorio de orixe do código: <https://framagit.org/endi/endi>
-- Tenda YunoHost: <https://apps.yunohost.org/app/endi>
-- Informar dun problema: <https://github.com/YunoHost-Apps/endi_ynh/issues>
+- Repositorio de orixe do código: <https://framagit.org/caerp/caerp>
+- Tenda YunoHost: <https://apps.yunohost.org/app/caerp>
+- Informar dun problema: <https://github.com/YunoHost-Apps/caerp_ynh/issues>
 
 ## Info de desenvolvemento
 
-Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/endi_ynh/tree/testing).
+Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/caerp_ynh/tree/testing).
 
 Para probar a rama `testing`, procede deste xeito:
 
 ```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app install https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 ou
-sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app upgrade caerp -u https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 ```
 
 **Máis info sobre o empaquetado da app:** <https://yunohost.org/packaging_apps>
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 06952ce..83063d3 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -3,20 +3,24 @@
 请勿手动编辑。
 -->
 
-# YunoHost 上的 enDI
+# YunoHost 上的 CAERP
 
-[![集成程度](https://dash.yunohost.org/integration/endi.svg)](https://ci-apps.yunohost.org/ci/apps/endi/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/endi.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/endi.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/caerp.svg)](https://ci-apps.yunohost.org/ci/apps/caerp/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/caerp.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/caerp.maintain.svg)
 
-[![使用 YunoHost 安装 enDI](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=endi)
+[![使用 YunoHost 安装 CAERP](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=caerp)
 
 *[阅读此 README 的其它语言版本。](./ALL_README.md)*
 
-> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 enDI。*  
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 CAERP。*  
 > *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
 
 ## 概况
 
-enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs.
+enDI is a business management software package. It is the management tool for
+economic and social activity entirely dedicated to CAEs as well as to any
+company and group of independent entrepreneurs.
+
+It's the software behind the enDi and MoOGLi services.
 
 ### Features
 
@@ -25,33 +29,32 @@ enDI is a business management software package. It is the management tool for ec
 - Support for the entrepreneurial journey and commercial activity of entrepreneurs
 
 
-**分发版本：** 6.6.4~ynh2
+**分发版本：** 2024.07.05~ynh1
 
 **演示：** <https://demo.endi.coop>
 
 ## 截图
 
-![enDI 的截图](./doc/screenshots/accueil.png)
+![CAERP 的截图](./doc/screenshots/accueil.png)
 
 ## 文档与资源
 
 - 官方应用网站： <https://endi.coop>
 - 官方用户文档： <https://doc.endi.coop>
-- 官方管理文档： <https://framagit.org/endi/endi>
-- 上游应用代码库： <https://framagit.org/endi/endi>
-- YunoHost 商店： <https://apps.yunohost.org/app/endi>
-- 报告 bug： <https://github.com/YunoHost-Apps/endi_ynh/issues>
+- 上游应用代码库： <https://framagit.org/caerp/caerp>
+- YunoHost 商店： <https://apps.yunohost.org/app/caerp>
+- 报告 bug： <https://github.com/YunoHost-Apps/caerp_ynh/issues>
 
 ## 开发者信息
 
-请向 [`testing` 分支](https://github.com/YunoHost-Apps/endi_ynh/tree/testing) 发送拉取请求。
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/caerp_ynh/tree/testing) 发送拉取请求。
 
 如要尝试 `testing` 分支，请这样操作：
 
 ```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app install https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 或
-sudo yunohost app upgrade endi -u https://github.com/YunoHost-Apps/endi_ynh/tree/testing --debug
+sudo yunohost app upgrade caerp -u https://github.com/YunoHost-Apps/caerp_ynh/tree/testing --debug
 ```
 
 **有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>
diff --git a/conf/endi.ini b/conf/caerp.ini
similarity index 51%
rename from conf/endi.ini
rename to conf/caerp.ini
index f33bfc2..c68632e 100644
--- a/conf/endi.ini
+++ b/conf/caerp.ini
@@ -1,5 +1,5 @@
-[app:endi]
-use = egg:endi
+[app:caerp]
+use = egg:caerp
 
 pyramid.reload_templates = true
 pyramid.reload_assets = true
@@ -10,29 +10,30 @@ pyramid.debug_routematch = false
 pyramid.debug_templates = true
 pyramid.default_locale_name = fr_FR
 pyramid.includes =
+                    pyramid_retry
                     pyramid_tm
                     pyramid_services
-                    endi_celery
-                    pyramid_mailer.debug
                     pyramid_layout
                     pyramid_mako
                     pyramid_chameleon
                     pyramid_celery
+                    caerp_celery
+                    pyramid_mailer.debug
                     js.deform
                     deform_extensions
 
 ####  MAIL FROM WITHIN THE APPLICATION ####
 # Add this one to pyramid.includes if you configured a mailbox
-                    # pyramid_mailer
+#pyramid_mailer
 
 # Mail configuration
 # Host and port are set to localhost/25 by default
-# mail.host = localhost
-# mail.port = 587
-# mail.username = mygmailaccount@gmail.com
-# mail.password = mygmailpasswd
-# mail.tls=True
-mail.default_sender = noreply@__DOMAIN__
+#mail.host = localhost
+#mail.port=587
+#mail.username=mygmailaccount@gmail.com
+#mail.password=mygmailpasswd
+#mail.tls=True
+mail.default_sender=noreply@__DOMAIN__
 ### Optout address for unsubscription (for local smtp purpose)
 #mail.optout_address=unsubcribe@mail.com
 ## Bounce_url address (should indicate a server redirecting a query to the url passed in the url GET param)
@@ -40,15 +41,15 @@ mail.default_sender = noreply@__DOMAIN__
 
 #### DATABASE ACCESS CONFIGURATION ####
 sqlalchemy.url = mysql://__DB_USER__:__DB_PWD__@localhost/__DB_NAME__?charset=utf8mb4
-# Uncomment the following line to use vagrant
-# sqlalchemy.url = mysql://endi:endi@127.0.0.1:13306/endi?charset=utf8mb4
+# Uncomment the following line to use docker-compose
+# sqlalchemy.url = mysql://caerp:caerp@127.0.0.1:13306/caerp?charset=utf8mb4
 sqlalchemy.echo=False
 # Those variables should be improved to fit your configuration
 sqlalchemy.pool_recycle=7200
 sqlalchemy.pool_size=100
 
 #### MAKO SPECIFIC CONFIGURATION ####
-mako.directories = endi:templates
+mako.directories = caerp:templates
 mako.imports = from markupsafe import escape_silent
 mako.default_filters = escape_silent
 mako.module_directory = %(here)s/mako_compiled_templates
@@ -71,60 +72,98 @@ cache.default_term.expire = 300
 cache.long_term.expire = 20
 
 # static file path (may be an url, allowing to have static datas on different servers)
-endi.static=static
+caerp.statics=static
 # Assets (logo ...) storage path
-endi.assets = %(here)s/data/assets
+caerp.assets = %(here)s/data/assets
 # Temp dir for compiled files (like pdf generation or large export files),
 # is accessible as a static directory
-endi.static_tmp=endi:tmp
+caerp.static_tmp=caerp:tmp
 # treasury related docs upload
-endi.ftpdir=%(here)s/tmp/filesystem
+caerp.ftpdir=%(here)s/tmp/filesystem
 # Max filesize for file attachment (in Bytes)
-endi.maxfilesize=2000000
+caerp.maxfilesize=2000000
 # The instance name
-endi.instance_name=__DOMAIN__
+caerp.instance_name=__DOMAIN__
 # The depot path for storing files locally
-endi.depot_path = %(here)s/tmp/filedepot
+caerp.depot_path = %(here)s/tmp/filedepot
 # Tempdir for file upload (should exist)
 pyramid_deform.tempdir= %(here)s/tmp/tempdir
 # Pyramid services configuration (allow to override default behaviour for some
 # interfaces)
-# endi.services.treasury_invoice_writer=mypackage.InvoiceWriter
-# endi.services.treasury_invoice_producer=mypackage.InvoiceProducer
-#endi.services.treasury_expense_writer=mypackage.ExpenseWriter
-#endi.services.treasury_expense_producer=mypackage.ExpenseProducer
-#endi.services.treasury_payment_writer=mypackage.PaymentWriter
-#endi.services.treasury_payment_producer=mypackage.PaymentProducer
+## ECRITURES ##
+# SAGE GENERATION EXPERT
+# caerp.services.treasury_invoice_producer=caerp.compute.sage_generation_expert.compute.InvoiceProducer
+# caerp.services.treasury_internalinvoice_producer=caerp.compute.sage_generation_expert.compute.InternalInvoiceProducer
+# caerp.services.treasury_invoice_writer=caerp.export.sage_generation_expert.InvoiceWriter
+#
+# caerp.services.treasury_payment_producer=caerp.compute.sage_generation_expert.compute.PaymentProducer
+# caerp.services.treasury_internalpayment_producer=caerp.compute.sage_generation_expert.compute.InternalPaymentProducer
+# caerp.services.treasury_payment_writer=caerp.export.sage_generation_expert.PaymentWriter
+#
+# caerp.services.treasury_expense_producer=caerp.compute.sage_generation_expert.compute.ExpenseProducer
+# caerp.services.treasury_expense_writer=caerp.export.sage_generation_expert.ExpenseWriter
+#
+# caerp.services.treasury_expense_payment_producer=caerp.compute.sage_generation_expert.compute.ExpensePaymentProducer
+# caerp.services.treasury_expense_payment_writer=caerp.export.sage_generation_expert.ExpensePaymentWriter
+#
+# caerp.services.treasury_supplier_invoice_producer=caerp.compute.sage_generation_expert.compute.SupplierInvoiceProducer
+# caerp.services.treasury_internalsupplier_invoice_producer=caerp.compute.sage_generation_expert.compute.InternalSupplierInvoiceProducer
+# caerp.services.treasury_supplier_invoice_writer=caerp.export.sage_generation_expert.SupplierInvoiceWriter
+#
+# caerp.services.treasury_supplier_payment_producer=caerp.compute.sage_generation_expert.compute.SupplierPaymentProducer
+# caerp.services.treasury_supplier_payment_user_producer=caerp.compute.sage_generation_expert.compute.SupplierUserPaymentProducer
+# caerp.services.treasury_internalsupplier_payment_producer=caerp.compute.sage_generation_expert.compute.InternalSupplierPaymentProducer
+# caerp.services.treasury_supplier_payment_writer=caerp.export.sage_generation_expert.SupplierPaymentWriter
 
-# Payment specific configuration see https://framagit.org/endi/endi_payment
-# endi_payment_db.url = mysql://endi_payment:endi@localhost/endi_payment?charset=utf8mb4
-endi.interfaces.IPaymentRecordService = endi_payment.public.PaymentService
+# CEGID
+caerp.services.treasury_invoice_writer=caerp.export.cegid.InvoiceWriter
+
+caerp.services.treasury_payment_writer=caerp.export.cegid.PaymentWriter
+
+caerp.services.treasury_expense_writer=caerp.export.cegid.ExpenseWriter
+
+caerp.services.treasury_expense_payment_writer=caerp.export.cegid.ExpensePaymentWriter
+
+caerp.services.treasury_supplier_invoice_writer=caerp.export.cegid.SupplierInvoiceWriter
+
+caerp.services.treasury_supplier_payment_writer=caerp.export.cegid.SupplierPaymentWriter
+## FIN DE LA CONFIG DES ECRITURES
+
+# Payment specific configuration see https://framagit.org/caerp/caerp_payment
+# caerp_payment_db.url = mysql://caerp_payment:caerp@localhost/caerp_payment?charset=utf8mb4
+caerp.interfaces.IPaymentRecordService = caerp_payment.public.PaymentService
 # Log payment service
-endi_payment.interfaces.IPaymentRecordHistoryService = endi_payment.history.HistoryLogService
+caerp_payment.interfaces.IPaymentRecordHistoryService = caerp_payment.history.HistoryLogService
 
-# endi_payment.interfaces.IPaymentRecordHistoryService = endi_payment.history.HistoryDBService
+# caerp_payment.interfaces.IPaymentRecordHistoryService = caerp_payment.history.HistoryDBService
 # Payment archiving service (here FileArchiveService)
-# endi_payment.interfaces.IPaymentArchiveService = endi_payment.archive.FileArchiveService
-# endi_payment_archive_storage_path = %(here)s/data/payment_storage
+# caerp_payment.interfaces.IPaymentArchiveService = caerp_payment.archive.FileArchiveService
+# caerp_payment_archive_storage_path = %(here)s/data/payment_storage
 
 # Key used for accounting data upload
-# endi.accounting_api_key=
+# caerp.accounting_api_key=
 # Key used to count users
-# endi.users_api_key=
+# caerp.users_api_key=
 
-endi.includes=
-                    endi_payment
-                    endi_payment.views
+caerp.includes=
+                    caerp_payment
+                    caerp_payment.views
+
+
+# URL for tiles layer for companies map ; uncomment to override
+# caerp.leaflet_layer_url=https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
 
 [celery]
-broker_url = redis://localhost:6379/__REDIS_DB__
+broker_url = redis://127.0.0.1:6379/__REDIS_DB__
+# Uncomment the following line to use docker-compose
+# broker_url = redis://127.0.0.1:16379/0
 imports =
-    endi_celery.tasks.tasks
-    endi_celery.tasks.mail
-    endi_celery.tasks.csv_import
-    endi_celery.tasks.export
-    endi_celery.tasks.accounting_measure_compute
-    endi_celery.tasks.accounting_parser
+    caerp_celery.tasks.tasks
+    caerp_celery.tasks.mail
+    caerp_celery.tasks.csv_import
+    caerp_celery.tasks.export
+    caerp_celery.tasks.accounting_measure_compute
+    caerp_celery.tasks.accounting_parser
 
 task_serializer = json
 accept_content=
@@ -140,7 +179,7 @@ bottom=True
 [pipeline:main]
 pipeline =
     fanstatic
-    endi
+    caerp
 
 [server:main]
 use = egg:waitress#main
@@ -148,6 +187,7 @@ host = 127.0.0.1
 port = __PORT__
 
 # Nginx reverse proxy configuration
+# FIXME: is it legacy?
 trusted_proxy = 127.0.0.1
 trusted_proxy_count = 1
 trusted_proxy_headers = x-forwarded-for x-forwarded-host x-forwarded-proto x-forwarded-port
@@ -156,7 +196,7 @@ clear_untrusted_proxy_headers = yes
 
 [pshell]
 default_shell = ipython
-setup = endi.pshell.setup
+setup = caerp.pshell.setup
 
 
 # Begin logging configuration
@@ -174,10 +214,10 @@ level = WARN
 handlers = file, console
 propagate=1
 
-[logger_endi]
+[logger_caerp]
 level = INFO
 handlers = file, console, warnfile
-qualname = endi
+qualname = caerp
 propagate=0
 
 [logger_sqlalchemy]
@@ -193,7 +233,7 @@ propagate=0
 level=INFO
 handlers = celery_file, console
 propagate=0
-qualname = endi.celery
+qualname = caerp.celery
 
 [logger_alembic]
 level = INFO
@@ -220,25 +260,25 @@ propagate=0
 
 
 [handler_console]
-class = endi.log.CustomStreamHandler
+class = caerp.log.CustomStreamHandler
 args = (sys.stderr,)
 level = NOTSET
 formatter = generic
 
 [handler_file]
-class = endi.log.CustomFileHandler
+class = caerp.log.CustomFileHandler
 args = ('/var/log/__APP__/logfile.log','a')
 level = INFO
 formatter = generic
 
 [handler_celery_file]
-class = endi.log.CustomFileHandler
+class = caerp.log.CustomFileHandler
 args = ('/var/log/__APP__/celery.log','a')
 level = INFO
 formatter = generic
 
 [handler_warnfile]
-class = endi.log.CustomFileHandler
+class = caerp.log.CustomFileHandler
 args = ('/var/log/__APP__/warnlogfile.log','a')
 level = WARN
 formatter = generic
@@ -258,5 +298,5 @@ format = %(asctime)-15s %(levelname)-5.5s %(message)s ([%(name)s.%(funcName)s:%(
 # End logging configuration
 #Alembic conf
 [alembic]
-script_location = endi:alembic
+script_location = caerp:alembic
 file_template = %%(slug)s_%%(rev)s
diff --git a/conf/systemd.service b/conf/systemd.service
index d7e1c74..0897631 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=enDI: logiciel de comptabilité pour CAE
+Description=CAERP: logiciel de comptabilité pour CAE
 After=network.target
 
 [Service]
@@ -7,7 +7,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__
-ExecStart=__INSTALL_DIR__/venv/bin/pserve endi.ini
+ExecStart=__INSTALL_DIR__/venv/bin/pserve caerp.ini
 StandardOutput=append:/var/log/__APP__/__APP__.log
 StandardError=inherit
 
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index 8b9988d..9a68a24 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1,4 +1,8 @@
-enDI is a business management software package. It is the management tool for economic and social activity entirely dedicated to CAEs as well as to any company and group of independent entrepreneurs.
+enDI is a business management software package. It is the management tool for
+economic and social activity entirely dedicated to CAEs as well as to any
+company and group of independent entrepreneurs.
+
+It's the software behind the enDi and MoOGLi services.
 
 ### Features
 
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
index 51d12dc..c7a4477 100644
--- a/doc/DESCRIPTION_fr.md
+++ b/doc/DESCRIPTION_fr.md
@@ -1,7 +1,9 @@
-enDI est un progiciel de gestion d'entreprise. c'est l'outil de pilotage de
+CAERP est un progiciel de gestion d'entreprise. c'est l'outil de pilotage de
 l'activité économique et sociale entièrement dédié aux CAE ainsi qu'à toute
 entreprise et collectif d'entrepreneur.euse.s indépendant.e.s.
 
+C'est le logiciel derrière les services enDi et MoOGLI.
+
 ### Fonctionnalités
 
 Il permet aux entrepreneur.euse.s :
diff --git a/manifest.toml b/manifest.toml
index 28aa2bc..560e7bd 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -2,12 +2,12 @@
 
 packaging_format = 2
 
-id = "endi"
-name = "enDI"
-description.en = "Comptability software for CAE companies (french Communauté d'Activité et d'Emploi)"
-description.fr = "Progiciel de gestion comptable à l'usage des CAE (Communauté d'Activité et d'Emploi)"
+id = "caerp"
+name = "CAERP"
+description.en = "Comptability software for CAE companies (french Communauté d'Activité et d'Emploi), the software behind enDi and MoOGLI"
+description.fr = "Progiciel de gestion comptable à l'usage des CAE (Communauté d'Activité et d'Emploi), le logiciel de enDi et MoOGLI"
 
-version = "6.6.4~ynh2"
+version = "2024.07.05~ynh1"
 
 maintainers = ["Salamandar"]
 
@@ -15,9 +15,8 @@ maintainers = ["Salamandar"]
 license = "AGPL-3.0"
 website = "https://endi.coop"
 demo = "https://demo.endi.coop"
-admindoc = "https://framagit.org/endi/endi"
 userdoc = "https://doc.endi.coop"
-code = "https://framagit.org/endi/endi"
+code = "https://framagit.org/caerp/caerp"
 
 [integration]
 yunohost = ">= 11.2.12"
@@ -45,8 +44,8 @@ ram.runtime = "50M"
 
 [resources]
     [resources.sources.main]
-    url = "https://framagit.org/endi/endi/-/archive/ea2d73983d1b4f55201cb606dce5b58bc30a0553/endi-ea2d73983d1b4f55201cb606dce5b58bc30a0553.tar.bz2"
-    sha256 = "ba5e7a636689188d06a5ec4792cbc0f91e97e57d4ec220283fea5398a05f361d"
+    url = "https://framagit.org/caerp/caerp/-/archive/34ed0cc755e66d7150b263d8b2f9ff4881624271/endi-34ed0cc755e66d7150b263d8b2f9ff4881624271.tar.bz2"
+    sha256 = "c98e7210b320b5980846e9f08fe9fdf5a9eee78077e29728914cff0f71a568c7"
     autoupdate.strategy = "latest_gitlab_commit"
 
     [resources.ports]
@@ -76,6 +75,7 @@ ram.runtime = "50M"
         "libmariadb-dev",
         "libmariadb-dev-compat",
         "libpango-1.0-0",
+        "libpangocairo-1.0-0",
         "libssl-dev",
         "libxml2-dev",
         "libxslt1-dev",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index c9531da..fc33fb2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -10,17 +10,10 @@ nodejs_version=16
 # PERSONAL HELPERS
 #=================================================
 
-_ynh_endi_patch_src() {
-    # Patching requirements.txt to use system provided Cython
-    cython_version=$(cython3 --version 2>&1 | sed 's|Cython version ||')
-    sed -i "s|Cython=.*|Cython==$cython_version|" "$install_dir/endi/requirements.txt"
-}
-
-
-_ynh_endi_build_ui() {
+_ynh_caerp_build_ui() {
     ynh_use_nodejs
 
-    pushd "$install_dir/endi" 2>&1
+    pushd "$install_dir/caerp" 2>&1
         ynh_exec_as "$app" "$ynh_node_load_PATH" "$ynh_npm" --prefix js_sources install 2>&1
         ynh_exec_as "$app" "$ynh_node_load_PATH" "$ynh_npm" --prefix vue_sources install 2>&1
 
@@ -29,11 +22,11 @@ _ynh_endi_build_ui() {
     popd 2>&1
 }
 
-_ynh_endi_build_python
+_ynh_caerp_build_python() {
     _ynh_python_venv_setup --venv_dir="$install_dir/venv"
     python_venv_site_packages=$(_ynh_python_venv_get_site_packages_dir -d "$install_dir/venv")
 
-    pushd "$install_dir/endi" 2>&1
+    pushd "$install_dir/caerp" 2>&1
         ynh_exec_as "$app" "$install_dir/venv/bin/python3" -m pip install -r requirements.txt
         ynh_exec_as "$app" "$install_dir/venv/bin/python3" ./setup.py install 2>&1
     popd 2>&1
@@ -43,17 +36,17 @@ _ynh_endi_build_python
     chown -R "$app:www-data" "$install_dir"
 }
 
-_ynh_endi_migratedb() {
+_ynh_caerp_migratedb() {
     pushd "$install_dir" 2>&1
-        ynh_exec_as $app "$install_dir/venv/bin/endi-admin" "$install_dir/endi.ini" \
+        ynh_exec_as "$app" "$install_dir/venv/bin/caerp-admin" "$install_dir/caerp.ini" \
             syncdb
     popd 2>&1
  }
 
-_ynh_endi_add_admin() {
+_ynh_caerp_add_admin() {
     pushd "$install_dir" 2>&1
-        ynh_exec_as $app "$install_dir/venv/bin/endi-admin" "$install_dir/endi.ini" \
-            useradd --group=admin --user="admin" --pwd="$password" --email="admin@$domain"
+        ynh_exec_as "$app" "$install_dir/venv/bin/caerp-admin" "$install_dir/caerp.ini" \
+            useradd --group=admin --user="$admin" --pwd="$password" --email="admin@$domain"
     popd 2>&1
  }
 
@@ -68,7 +61,7 @@ _ynh_python_venv_setup() {
     local packages
     ynh_handle_getopts_args "$@"
 
-    ynh_exec_as "$app" python3 -m venv --system-site-packages "$venv_dir"
+    ynh_exec_as "$app" python3 -m venv "$venv_dir"
 
     if [[ -n "${packages:-}" ]]; then
         IFS=" " read -r -a pip_packages <<< "$packages"
diff --git a/scripts/change_url b/scripts/change_url
index 475c417..bc06fa6 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -26,10 +26,10 @@ ynh_change_url_nginx_config
 #=================================================
 ynh_script_progression --message="Updating $app's configuration file..." --weight=1
 
-ynh_add_config --template="endi.ini" --destination="$install_dir/endi.ini"
+ynh_add_config --template="caerp.ini" --destination="$install_dir/caerp.ini"
 
-chmod 500 "$install_dir/endi.ini"
-chown "$app:$app" "$install_dir/endi.ini"
+chmod 500 "$install_dir/caerp.ini"
+chown "$app:$app" "$install_dir/caerp.ini"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/install b/scripts/install
index 56dc0d0..f0e311b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -20,26 +20,25 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version"
 ynh_script_progression --message="Enabling french system locale..." --weight=1
 
 sed -i 's|^#\? \?\(fr_FR.UTF-8 \?.*\)$|\1|' /etc/locale.gen
+locale-gen
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
-ynh_setup_source --dest_dir="$install_dir/endi"
+ynh_setup_source --dest_dir="$install_dir/caerp"
 
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
 
-# _ynh_endi_patch_src
-
 #=================================================
 # SETUP APPLICATION
 #=================================================
 ynh_script_progression --message="Building $app..." --weight=1
 
-_ynh_endi_build_ui
-_ynh_endi_build_python
+_ynh_caerp_build_ui
+_ynh_caerp_build_python
 
 #=================================================
 # ADD A CONFIGURATION
@@ -49,16 +48,16 @@ ynh_script_progression --message="Adding $app's configuration file..." --weight=
 redis_db=$(ynh_redis_get_free_db)
 ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 
-ynh_add_config --template="endi.ini" --destination="$install_dir/endi.ini"
+ynh_add_config --template="caerp.ini" --destination="$install_dir/caerp.ini"
 
-chmod 500 "$install_dir/endi.ini"
-chown "$app:$app" "$install_dir/endi.ini"
+chmod 500 "$install_dir/caerp.ini"
+chown "$app:$app" "$install_dir/caerp.ini"
 
 #=================================================
 # CREATE LOG DIRECTORY
 #=================================================
 
-mkdir "/var/log/$app"
+mkdir -p "/var/log/$app"
 chown -R "$app:$app" "/var/log/$app"
 chmod 750 "/var/log/$app"
 
@@ -67,20 +66,18 @@ chmod 750 "/var/log/$app"
 #=================================================
 ynh_script_progression --message="Configuring $app..." --weight=1
 
-_ynh_endi_migratedb
-_ynh_endi_add_admin
+_ynh_caerp_migratedb
+_ynh_caerp_add_admin
 
 #=================================================
-# GENERIC FINALIZATION
+# SYSTEM CONFIGURATION
 #=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Configuring log rotation..." --weight=1
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 ynh_add_nginx_config
 
 ynh_add_systemd_config
-yunohost service add "$app" --description="enDI, logiciel de comptabilité pour CAE" --log="/var/log/$app/logfile.log"
+yunohost service add "$app" --description="CAERP, logiciel de comptabilité pour CAE" --log="/var/log/$app/logfile.log"
 
 ynh_use_logrotate --logfile="/var/log/$app/logfile.log"
 
diff --git a/scripts/restore b/scripts/restore
index 4750975..6fd1b41 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -8,6 +8,21 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# INSTALL NODEJS
+#=================================================
+ynh_script_progression --message="Installing NodeJS..." --weight=1
+
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version"
+
+#=================================================
+# ENABLE MANDATORY FRENCH LOCALE
+#=================================================
+ynh_script_progression --message="Enabling french system locale..." --weight=1
+
+sed -i 's|^#\? \?\(fr_FR.UTF-8 \?.*\)$|\1|' /etc/locale.gen
+locale-gen
+
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -34,7 +49,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable "$app.service" --quiet
-yunohost service add "$app" --description="enDI, logiciel de comptabilité pour CAE" --log="/var/log/$app/logfile.log"
+yunohost service add "$app" --description="CAERP, logiciel de comptabilité pour CAE" --log="/var/log/$app/logfile.log"
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index d7d6998..81ed8b9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -14,6 +14,22 @@ ynh_script_progression --message="Stopping $app's systemd service..." --weight=1
 
 ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/logfile.log"
 
+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
+
+if [ -d "$install_dir/endi" ]; then
+    ynh_secure_remove --file="$install_dir/endi"
+fi
+
+if [ -f "$install_dir/endi.ini" ]; then
+    ynh_backup_if_checksum_is_different --file="$install_dir/endi.ini"
+    mv "$install_dir/endi.ini" "$install_dir/caerp.ini"
+    ynh_delete_file_checksum --file="$install_dir/endi.ini"
+    ynh_store_file_checksum --file="$install_dir/caerp.ini"
+fi
+
 #=================================================
 # INSTALL NODEJS
 #=================================================
@@ -21,41 +37,49 @@ ynh_script_progression --message="Updating NodeJS..." --weight=1
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version"
 
+#=================================================
+# ENABLE MANDATORY FRENCH LOCALE
+#=================================================
+ynh_script_progression --message="Enabling french system locale..." --weight=1
+
+sed -i 's|^#\? \?\(fr_FR.UTF-8 \?.*\)$|\1|' /etc/locale.gen
+locale-gen
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Upgrading source files..." --weight=1
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir/endi" --full_replace --keep="endi.ini"
+ynh_setup_source --dest_dir="$install_dir/caerp" --full_replace --keep="endi.ini caerp.ini"
 
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
 
-# _ynh_endi_patch_src
+#=================================================
+# SETUP APPLICATION
+#=================================================
+ynh_script_progression --message="Building $app..." --weight=1
+
+_ynh_caerp_build_ui
+_ynh_caerp_build_python
 
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
 ynh_script_progression --message="Updating $app's configuration file..." --weight=1
 
-ynh_add_config --template="endi.ini" --destination="$install_dir/endi.ini"
+ynh_add_config --template="caerp.ini" --destination="$install_dir/caerp.ini"
 
-chmod 500 "$install_dir/endi.ini"
-chown "$app:$app" "$install_dir/endi.ini"
-
-#=================================================
-# SETUP APPLICATION
-#=================================================
-ynh_script_progression --message="Building $app..." --weight=1
-_ynh_endi_build_ui
-_ynh_endi_build_python
+chmod 500 "$install_dir/caerp.ini"
+chown "$app:$app" "$install_dir/caerp.ini"
 
 #=================================================
 # SETUP APPLICATION
 #=================================================
 ynh_script_progression --message="Migrating databases..." --weight=1
-_ynh_endi_migratedb
+
+_ynh_caerp_migratedb
 
 #=================================================
 # SETUP SYSTEMD
@@ -66,7 +90,7 @@ ynh_add_nginx_config
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
-yunohost service add "$app" --description="enDI, logiciel de comptabilité pour CAE" --log="/var/log/$app/logfile.log"
+yunohost service add "$app" --description="CAERP, logiciel de comptabilité pour CAE" --log="/var/log/$app/logfile.log"
 
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --logfile="/var/log/$app/logfile.log"