diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0833bc9cf7defcbd7a2b540a6c65253722f29d6..f2459b620921ad2a158feae731d739a06ba26b80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ image: urgi/docker-browsers:latest
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
   GRADLE_USER_HOME: $CI_PROJECT_DIR/.gradle
-  APP_NAME: gpds
+  APP_NAME: faidare
   JAR_PATH: "backend/build/libs/${APP_NAME}.jar"
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a8af27885cb35113f48b4065d7626544908bfa67..a5d7d2ddaffc191b3ac38931a8a153211cca929d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# How to contribute to GPDS
+# How to contribute to FAIDARE
 
 ## Git management
 
@@ -27,9 +27,9 @@
 	Total 0 (delta 0), reused 0 (delta 0)
 	remote:
 	remote: To create a merge request for chore/explaining_how_to_merge, visit:
-	remote:   https://forgemia.inra.fr/urgi-is/gpds/merge_requests/new?merge_request%5Bsource_branch%5D=chore/explaining_how_to_merge
+	remote:   https://forgemia.inra.fr/urgi-is/faidare/merge_requests/new?merge_request%5Bsource_branch%5D=chore/explaining_how_to_merge
 	remote:
-	To forgemia.inra.fr:urgi-is/gpds.git
+	To forgemia.inra.fr:urgi-is/faidare.git
 	* [new branch]      chore/explaining_how_to_merge -> chore/explaining_how_to_merge
 	La branche 'chore/explaining_how_to_merge' est paramétrée pour suivre la branche distante 'chore/explaining_how_to_merge' depuis 'origin'.
 	```
diff --git a/README.md b/README.md
index 97ad87f471fe9f3b3acf099fa8a167fd91e0b59e..53eeec3809a970bf8b7d5796e14c5b0dca3781f1 100644
--- a/README.md
+++ b/README.md
@@ -65,10 +65,10 @@ If you just need access to API (to run the `ng serve` on top of it), you can run
 Otherwise, for the complete server (backend APIs + frontend interface), you can run:
 
 ```sh
-./gradlew assemble && java -jar backend/build/libs/gpds.jar
+./gradlew assemble && java -jar backend/build/libs/faidare.jar
 ```
 
-The server should then be accessible at http://localhost:8380/gpds-dev
+The server should then be accessible at http://localhost:8380/faidare-dev
 
 ## Run frontend development server
 
@@ -105,7 +105,7 @@ The details of this remote server are filled in the `bootstrap.yml` file.
 By default, it tries to connect to the remote server on http://localhost:8888
 but it can of course be changed, or even configured via the `SPRING_CONFIG_URI` environment variable.
 
-It will try to fetch the configuration for the application name `gpds`, and the default profile.
+It will try to fetch the configuration for the application name `faidare`, and the default profile.
 If such a configuration is not found, it will then fallback to the local `application.yml` properties.
 To avoid running the Spring Cloud config server every time when developing the application,
 all the properties are still available in `application.yml` even if they are configured on the remote Spring Cloud server as well.
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/Application.java b/backend/src/main/java/fr/inra/urgi/faidare/Application.java
similarity index 73%
rename from backend/src/main/java/fr/inra/urgi/gpds/Application.java
rename to backend/src/main/java/fr/inra/urgi/faidare/Application.java
index 8b76ec2c86ad4bc0665f4fd52ea060f6fe936e77..75c1b74a4f90825eaa8175d679ad51e63267cea1 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/Application.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/Application.java
@@ -1,19 +1,19 @@
-package fr.inra.urgi.gpds;
+package fr.inra.urgi.faidare;
 
-import fr.inra.urgi.gpds.config.GPDSProperties;
+import fr.inra.urgi.faidare.config.FaidareProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
- * The main gpds Application
+ * The main faidare Application
  *
  * @author gcornut
  */
 @SpringBootApplication
 @EnableAsync
-@EnableConfigurationProperties(GPDSProperties.class)
+@EnableConfigurationProperties(FaidareProperties.class)
 public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/BadRequestException.java b/backend/src/main/java/fr/inra/urgi/faidare/api/BadRequestException.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/BadRequestException.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/BadRequestException.java
index f1f0646ed14b0b5367fe94c9fb32f33fda2f5827..cd0991dc2c9fd2cc7435cf4c4d9f556a0b4167ec 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/BadRequestException.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/BadRequestException.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.api;
+package fr.inra.urgi.faidare.api;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/NotFoundException.java b/backend/src/main/java/fr/inra/urgi/faidare/api/NotFoundException.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/NotFoundException.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/NotFoundException.java
index a12839da6480b150767398e1d18e3b5b72ac01f4..a6a49f20cc9970c455f99af49148fd4e97cfdeeb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/NotFoundException.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/NotFoundException.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.api;
+package fr.inra.urgi.faidare.api;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiExceptionHandler.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiExceptionHandler.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiExceptionHandler.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiExceptionHandler.java
index ae35d695d514003e1a263ef423d78f5c25537fdb..181d5b368694ec1626e12b1843d14722c4111d89 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiExceptionHandler.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiExceptionHandler.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
-
-import fr.inra.urgi.gpds.api.BadRequestException;
-import fr.inra.urgi.gpds.api.NotFoundException;
-import fr.inra.urgi.gpds.api.brapi.v1.exception.BrapiPaginationException;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiPagination;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiStatus;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
+package fr.inra.urgi.faidare.api.brapi.v1;
+
+import fr.inra.urgi.faidare.api.BadRequestException;
+import fr.inra.urgi.faidare.api.NotFoundException;
+import fr.inra.urgi.faidare.api.brapi.v1.exception.BrapiPaginationException;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiPagination;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiStatus;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindException;
@@ -26,7 +26,7 @@ import java.util.List;
  *
  * @author gcornut
  */
-@ControllerAdvice(basePackages = "fr.inra.urgi.gpds.api.brapi.v1")
+@ControllerAdvice(basePackages = "fr.inra.urgi.faidare.api.brapi.v1")
 public class BrapiExceptionHandler {
 
     private static ResponseEntity<Object> createErrorResponse(
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiJSONViewHandler.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiJSONViewHandler.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiJSONViewHandler.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiJSONViewHandler.java
index a7999650af96b284c22659bcda8a55aff7b56d85..f881453103b1a86d69065990d788a28f69fbf122 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiJSONViewHandler.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiJSONViewHandler.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -20,7 +20,7 @@ import java.util.List;
  *
  * @author gcornut
  */
-@ControllerAdvice(basePackages = "fr.inra.urgi.gpds.api.brapi.v1")
+@ControllerAdvice(basePackages = "fr.inra.urgi.faidare.api.brapi.v1")
 @Order(Ordered.HIGHEST_PRECEDENCE)
 public class BrapiJSONViewHandler extends AbstractMappingJacksonResponseBodyAdvice {
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/CallsController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/CallsController.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/CallsController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/CallsController.java
index 9796212845c770a087eff1f25cfafb54faa097eb..b2bc193af41580435493cc50f6d36cd4fe0be74d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/CallsController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/CallsController.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
 import com.google.common.collect.ImmutableSet;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiCall;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.CallVO;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiCall;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.CallVO;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/GermplasmController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/GermplasmController.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/GermplasmController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/GermplasmController.java
index 45544b9610b9ad80b5f14a44afdba5965c310d40..3a50dff4f31314230d52ec2b68ca668d4e7c8670 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/GermplasmController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/GermplasmController.java
@@ -1,22 +1,22 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.api.NotFoundException;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasm;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasmAttributeValueList;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiPedigree;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiProgeny;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiResponse;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmAttributeCriteria;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmGETSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmPOSTSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.response.Pagination;
-import fr.inra.urgi.gpds.repository.es.GermplasmAttributeRepository;
-import fr.inra.urgi.gpds.service.es.GermplasmService;
+import fr.inra.urgi.faidare.api.NotFoundException;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasm;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasmAttributeValueList;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiPedigree;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiProgeny;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiResponse;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmAttributeCriteria;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmGETSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmPOSTSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.response.Pagination;
+import fr.inra.urgi.faidare.repository.es.GermplasmAttributeRepository;
+import fr.inra.urgi.faidare.service.es.GermplasmService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/LocationController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/LocationController.java
similarity index 76%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/LocationController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/LocationController.java
index 590c8c642f68ca4912516fcc6edcdad399ea4510..2cfec94ad00c7dac6a23f8f22bd161739b56a856 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/LocationController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/LocationController.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.api.NotFoundException;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiLocation;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiResponse;
-import fr.inra.urgi.gpds.domain.criteria.LocationCriteria;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.LocationRepository;
+import fr.inra.urgi.faidare.api.NotFoundException;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiLocation;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiResponse;
+import fr.inra.urgi.faidare.domain.criteria.LocationCriteria;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.LocationRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/ObservationVariableController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/ObservationVariableController.java
similarity index 81%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/ObservationVariableController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/ObservationVariableController.java
index fb989b1b4da11ee7add8bc39201f1565a3cc8a0e..e19b3f8e112e148b1ef33506590e6cd2f1cff221 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/ObservationVariableController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/ObservationVariableController.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.api.NotFoundException;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservationVariable;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiOntology;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiResponse;
-import fr.inra.urgi.gpds.domain.criteria.ObservationVariableCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.repository.file.CropOntologyRepository;
+import fr.inra.urgi.faidare.api.NotFoundException;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservationVariable;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiOntology;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiResponse;
+import fr.inra.urgi.faidare.domain.criteria.ObservationVariableCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.repository.file.CropOntologyRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/PhenotypeController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/PhenotypeController.java
similarity index 75%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/PhenotypeController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/PhenotypeController.java
index 8f00560df1d17e8e684de95fe6feb8fb6f618981..3aab607c9ed04fa95d046462bcc75a52dee191f1 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/PhenotypeController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/PhenotypeController.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservationUnit;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.criteria.ObservationUnitCriteria;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.ObservationUnitRepository;
+package fr.inra.urgi.faidare.api.brapi.v1;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservationUnit;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.criteria.ObservationUnitCriteria;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.ObservationUnitRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/ProgramController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/ProgramController.java
similarity index 77%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/ProgramController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/ProgramController.java
index 9d1ad16de3e1891e71c64435ceb38f7c2af14f9b..8a892c8b057aad664d0c446adfab8cbbb550d4e9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/ProgramController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/ProgramController.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.api.NotFoundException;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiProgram;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiResponse;
-import fr.inra.urgi.gpds.domain.criteria.ProgramCriteria;
-import fr.inra.urgi.gpds.domain.data.ProgramVO;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.ProgramRepository;
+import fr.inra.urgi.faidare.api.NotFoundException;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiProgram;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiResponse;
+import fr.inra.urgi.faidare.domain.criteria.ProgramCriteria;
+import fr.inra.urgi.faidare.domain.data.ProgramVO;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.ProgramRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/StudyController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/StudyController.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/StudyController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/StudyController.java
index ddf7320f73c8aa57e391b3fc3350e345e5896f60..39b2f72d759ff78a549af444893992a7a9f438f3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/StudyController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/StudyController.java
@@ -1,26 +1,26 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import fr.inra.urgi.gpds.api.NotFoundException;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.*;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiResponse;
-import fr.inra.urgi.gpds.domain.criteria.*;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationUnitVO;
-import fr.inra.urgi.gpds.domain.data.study.StudyDetailVO;
-import fr.inra.urgi.gpds.domain.data.study.StudySummaryVO;
-import fr.inra.urgi.gpds.domain.data.variable.ObservationVariableVO;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.response.Pagination;
-import fr.inra.urgi.gpds.repository.es.GermplasmRepository;
-import fr.inra.urgi.gpds.repository.es.ObservationUnitRepository;
-import fr.inra.urgi.gpds.repository.es.StudyRepository;
-import fr.inra.urgi.gpds.repository.file.CropOntologyRepository;
-import fr.inra.urgi.gpds.utils.StringFunctions;
+import fr.inra.urgi.faidare.api.NotFoundException;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.*;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiResponse;
+import fr.inra.urgi.faidare.domain.criteria.*;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationUnitVO;
+import fr.inra.urgi.faidare.domain.data.study.StudyDetailVO;
+import fr.inra.urgi.faidare.domain.data.study.StudySummaryVO;
+import fr.inra.urgi.faidare.domain.data.variable.ObservationVariableVO;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.response.Pagination;
+import fr.inra.urgi.faidare.repository.es.GermplasmRepository;
+import fr.inra.urgi.faidare.repository.es.ObservationUnitRepository;
+import fr.inra.urgi.faidare.repository.es.StudyRepository;
+import fr.inra.urgi.faidare.repository.file.CropOntologyRepository;
+import fr.inra.urgi.faidare.utils.StringFunctions;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/TrialController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/TrialController.java
similarity index 74%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/TrialController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/TrialController.java
index 25a6e5bece1f76604235d4c551a81657755bcbdb..7a49b76c5c3a5d69d2daccd2106e41cb7d36f6ae 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/TrialController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/TrialController.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
-
-import fr.inra.urgi.gpds.api.NotFoundException;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiTrial;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiResponse;
-import fr.inra.urgi.gpds.domain.criteria.TrialCriteria;
-import fr.inra.urgi.gpds.domain.data.TrialVO;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.TrialRepository;
+package fr.inra.urgi.faidare.api.brapi.v1;
+
+import fr.inra.urgi.faidare.api.NotFoundException;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiTrial;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiResponse;
+import fr.inra.urgi.faidare.domain.criteria.TrialCriteria;
+import fr.inra.urgi.faidare.domain.data.TrialVO;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.TrialRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/exception/BrapiException.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/exception/BrapiException.java
similarity index 54%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/exception/BrapiException.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/exception/BrapiException.java
index 8a02af3922203d4c12039b6bafaa35d7c52e32b5..74f7732a3f9f9c1abe15bc59e5d838452dbafdcb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/exception/BrapiException.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/exception/BrapiException.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.api.brapi.v1.exception;
+package fr.inra.urgi.faidare.api.brapi.v1.exception;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/exception/BrapiPaginationException.java b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/exception/BrapiPaginationException.java
similarity index 69%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/exception/BrapiPaginationException.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/exception/BrapiPaginationException.java
index 0a88195d9b77f200fb0995a21bc0daa4c8242e54..2ba358ad25427267dc3fa3735aa57dcaebde9597 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/brapi/v1/exception/BrapiPaginationException.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/brapi/v1/exception/BrapiPaginationException.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.api.brapi.v1.exception;
+package fr.inra.urgi.faidare.api.brapi.v1.exception;
 
-import fr.inra.urgi.gpds.api.BadRequestException;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiPagination;
+import fr.inra.urgi.faidare.api.BadRequestException;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiPagination;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/DataDiscoveryController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/DataDiscoveryController.java
similarity index 78%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/DataDiscoveryController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/DataDiscoveryController.java
index 25579d0fd4b4cff79dfac0dd5176c28226152319..c249c80957e668934ae91aa6e2c5e5dcc8f2ddff 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/DataDiscoveryController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/DataDiscoveryController.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.api.gnpis.v1;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataSource;
-import fr.inra.urgi.gpds.domain.datadiscovery.response.DataDiscoveryResponse;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.repository.es.DataDiscoveryRepository;
-import fr.inra.urgi.gpds.repository.file.DataSourceRepository;
-import fr.inra.urgi.gpds.utils.StringFunctions;
+package fr.inra.urgi.faidare.api.gnpis.v1;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataSource;
+import fr.inra.urgi.faidare.domain.datadiscovery.response.DataDiscoveryResponse;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.repository.es.DataDiscoveryRepository;
+import fr.inra.urgi.faidare.repository.file.DataSourceRepository;
+import fr.inra.urgi.faidare.utils.StringFunctions;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISExceptionHandler.java b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISExceptionHandler.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISExceptionHandler.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISExceptionHandler.java
index a1849425ee9c00ae42578c2656a69914b4dd865b..96ee0096d79adb11411da9a7423c852cdfa3b95d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISExceptionHandler.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISExceptionHandler.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.gnpis.v1;
 
-import fr.inra.urgi.gpds.api.BadRequestException;
-import fr.inra.urgi.gpds.api.NotFoundException;
+import fr.inra.urgi.faidare.api.BadRequestException;
+import fr.inra.urgi.faidare.api.NotFoundException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindException;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
  *
  * @author gcornut
  */
-@ControllerAdvice(basePackages = "fr.inra.urgi.gpds.api.gnpis.v1")
+@ControllerAdvice(basePackages = "fr.inra.urgi.faidare.api.gnpis.v1")
 public class GnpISExceptionHandler {
 
     /**
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISGermplasmController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmController.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISGermplasmController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmController.java
index 7a0755303d0f9fe2f166f408456ae23a3e1f90f6..5b32adbbc07cb46ef6bfffc9db29dba362e6458d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISGermplasmController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmController.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.gnpis.v1;
 
 import com.google.common.base.Strings;
-import fr.inra.urgi.gpds.api.BadRequestException;
-import fr.inra.urgi.gpds.api.NotFoundException;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmGETSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmPOSTSearchCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.service.es.GermplasmService;
+import fr.inra.urgi.faidare.api.BadRequestException;
+import fr.inra.urgi.faidare.api.NotFoundException;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmGETSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmPOSTSearchCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.service.es.GermplasmService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISJSONViewHandler.java b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISJSONViewHandler.java
similarity index 85%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISJSONViewHandler.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISJSONViewHandler.java
index 41e14ce708c47e7ab02907706602de2332cd82ed..b7836a4b24c03952c3ccf9929a736f2886381268 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISJSONViewHandler.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISJSONViewHandler.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.gnpis.v1;
 
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.json.MappingJacksonValue;
@@ -12,7 +12,7 @@ import org.springframework.web.servlet.mvc.method.annotation.AbstractMappingJack
 /**
  * @author gcornut
  */
-@ControllerAdvice(basePackages = "fr.inra.urgi.gpds.api.gnpis.v1")
+@ControllerAdvice(basePackages = "fr.inra.urgi.faidare.api.gnpis.v1")
 public class GnpISJSONViewHandler extends AbstractMappingJacksonResponseBodyAdvice {
 
     @Override
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/XRefDocumentController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/XRefDocumentController.java
similarity index 81%
rename from backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/XRefDocumentController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/XRefDocumentController.java
index 1ae63a8af8a418fd9bd62280b4d94500ed11890b..95bdc960eb7c284d6ca782f5fa994fa13ee4a9a8 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/api/gnpis/v1/XRefDocumentController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/XRefDocumentController.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.gnpis.v1;
 
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentSearchCriteria;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentVO;
-import fr.inra.urgi.gpds.repository.es.XRefDocumentRepository;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentSearchCriteria;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentVO;
+import fr.inra.urgi.faidare.repository.es.XRefDocumentRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/config/ElasticSearchConfig.java b/backend/src/main/java/fr/inra/urgi/faidare/config/ElasticSearchConfig.java
similarity index 97%
rename from backend/src/main/java/fr/inra/urgi/gpds/config/ElasticSearchConfig.java
rename to backend/src/main/java/fr/inra/urgi/faidare/config/ElasticSearchConfig.java
index 90d5dbbc01551227fa5636aeb8a3c939d637a514..8d4901f956946b6e21a6b74d978d5b44e72557ca 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/config/ElasticSearchConfig.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/config/ElasticSearchConfig.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.config;
+package fr.inra.urgi.faidare.config;
 
 import org.apache.http.HttpHost;
 import org.apache.http.impl.nio.reactor.IOReactorConfig;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/config/GPDSProperties.java b/backend/src/main/java/fr/inra/urgi/faidare/config/FaidareProperties.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/config/GPDSProperties.java
rename to backend/src/main/java/fr/inra/urgi/faidare/config/FaidareProperties.java
index 93a8080d01966d74988d533a7fa69418dec1a969..6ee8ae90bdb088066e6183dcaa8954c97e549f38 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/config/GPDSProperties.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/config/FaidareProperties.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.config;
+package fr.inra.urgi.faidare.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -9,8 +9,8 @@ import javax.validation.constraints.NotBlank;
  *
  * @author gcornut
  */
-@ConfigurationProperties(prefix = "gpds")
-public class GPDSProperties {
+@ConfigurationProperties(prefix = "faidare")
+public class FaidareProperties {
 
     @NotBlank
     private String elasticsearchAliasTemplate;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/config/JSONConfig.java b/backend/src/main/java/fr/inra/urgi/faidare/config/JSONConfig.java
similarity index 97%
rename from backend/src/main/java/fr/inra/urgi/gpds/config/JSONConfig.java
rename to backend/src/main/java/fr/inra/urgi/faidare/config/JSONConfig.java
index 147eab64cba92bf723d3df7cc1875e7db03edd12..458bec1da50ff19b1d3eac10675dc3c327966ed9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/config/JSONConfig.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/config/JSONConfig.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.config;
+package fr.inra.urgi.faidare.config;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/config/RestClientConfig.java b/backend/src/main/java/fr/inra/urgi/faidare/config/RestClientConfig.java
similarity index 97%
rename from backend/src/main/java/fr/inra/urgi/gpds/config/RestClientConfig.java
rename to backend/src/main/java/fr/inra/urgi/faidare/config/RestClientConfig.java
index 4b5b19ded35bd1bbb48b94b89971ab7321c60875..51fc54031b6555d58a3dc188f90841deebeb7028 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/config/RestClientConfig.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/config/RestClientConfig.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.config;
+package fr.inra.urgi.faidare.config;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/config/SecurityConfig.java b/backend/src/main/java/fr/inra/urgi/faidare/config/SecurityConfig.java
similarity index 97%
rename from backend/src/main/java/fr/inra/urgi/gpds/config/SecurityConfig.java
rename to backend/src/main/java/fr/inra/urgi/faidare/config/SecurityConfig.java
index cefe4bae37c6cc888313b5e73b0f837f7ceca88d..25b71df768766c7765cc196d2f4bc1d148bd8540 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/config/SecurityConfig.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/config/SecurityConfig.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.config;
+package fr.inra.urgi.faidare.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/config/SwaggerConfig.java b/backend/src/main/java/fr/inra/urgi/faidare/config/SwaggerConfig.java
similarity index 93%
rename from backend/src/main/java/fr/inra/urgi/gpds/config/SwaggerConfig.java
rename to backend/src/main/java/fr/inra/urgi/faidare/config/SwaggerConfig.java
index eee191bfe8e26912517f305fe2aace348f3b78ad..cfa2aad25a3a99b09833ab0b860a71287d265d3d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/config/SwaggerConfig.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/config/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.config;
+package fr.inra.urgi.faidare.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -18,7 +18,7 @@ public class SwaggerConfig {
     @Bean
     public Docket api() {
         return new Docket(DocumentationType.SWAGGER_2).select()
-            .apis(RequestHandlerSelectors.basePackage("fr.inra.urgi.gpds.api"))
+            .apis(RequestHandlerSelectors.basePackage("fr.inra.urgi.faidare.api"))
             .paths(PathSelectors.regex("/.*"))
             .build();
     }
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/JSONView.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/JSONView.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/JSONView.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/JSONView.java
index 0dae0a74996e4917d49d4621be45e7be3376d4d9..37a643806a2e094a31e265c2d0231ff1f30196b8 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/JSONView.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/JSONView.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain;
+package fr.inra.urgi.faidare.domain;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
 
 /**
  * Collection of Jack JSON views used to annotate Java bean properties using {@link JsonView}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmAttributeCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmAttributeCriteria.java
similarity index 75%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmAttributeCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmAttributeCriteria.java
index c6ef8f14e379695393a372d839c85c439d6671e2..eeb03593ecba586128fb99884e5e2b1133139020 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmAttributeCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmAttributeCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmAttributeListCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmAttributeListCriteria.java
similarity index 73%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmAttributeListCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmAttributeListCriteria.java
index 07640cfc073dcdb1e0d57045be482add7c1fbc58..01ba6513e9641381a8e99e8c78155449fefd961b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmAttributeListCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmAttributeListCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmGETSearchCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmGETSearchCriteria.java
similarity index 81%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmGETSearchCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmGETSearchCriteria.java
index 335975ba083b6a7e9fe51982b777a18bc3dae6f2..398efdc5162ba5b10859c0d3a80b87e76e4cce40 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmGETSearchCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmGETSearchCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmPOSTSearchCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmPOSTSearchCriteria.java
similarity index 87%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmPOSTSearchCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmPOSTSearchCriteria.java
index b66c0cef9215bd65a66bb79941b25e72e862d9f1..1b3d82911a9edd1bd3cfd17c0e365e2e281392cf 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiGermplasmPOSTSearchCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiGermplasmPOSTSearchCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiLocationCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiLocationCriteria.java
similarity index 74%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiLocationCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiLocationCriteria.java
index f5e33dec77c60bdb333fe6dbd2f02e0090183a78..e61ab3e39648b49a364bbe93f2125d9216fc8658 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiLocationCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiLocationCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiObservationUnitCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiObservationUnitCriteria.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiObservationUnitCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiObservationUnitCriteria.java
index 3bd40198099fba172b1ef3ee0c7c3389b4507de8..a0666582c439436d54f84a19d94d585d5c0e6947 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiObservationUnitCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiObservationUnitCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.List;
 import java.util.Set;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiObservationVariableCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiObservationVariableCriteria.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiObservationVariableCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiObservationVariableCriteria.java
index 9b3ea0a6115b193a9c3c4f02012eddadd1e9c12d..a5d90e66e76ead70d5b6a81191c7fddd189d2002 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiObservationVariableCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiObservationVariableCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiPaginationCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiPaginationCriteria.java
similarity index 76%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiPaginationCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiPaginationCriteria.java
index cbf89336388d5294f54a5c15745e040336187bf3..caac92a7c5ba040161199c52d375853118aaed9b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiPaginationCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiPaginationCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiProgramCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiProgramCriteria.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiProgramCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiProgramCriteria.java
index a7a8af26eaa57b37b1726f73e273ab36eec72529..ea8837556d717da5cd0cff4a0986f4e7a4a6c36f 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiProgramCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiProgramCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiSortCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiSortCriteria.java
similarity index 68%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiSortCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiSortCriteria.java
index 33747e9251f381e8fb424d51904ca8db1ba02a42..ccb49dd6f22d1de638921d833b75b45cbb9745b9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiSortCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiSortCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudyCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudyCriteria.java
similarity index 87%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudyCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudyCriteria.java
index a9ab2d69625ce7e0a45829d14aabeff06c3ccaa6..8e592fd699c5e9232f3709acdeff662ef8898eee 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudyCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudyCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudyObservationUnitCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudyObservationUnitCriteria.java
similarity index 73%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudyObservationUnitCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudyObservationUnitCriteria.java
index 1996d79c90387a6028b44c92a0e9e0a5a65f6bb0..52e19f2c09840e2d3b3222471f376db086f4b0ac 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudyObservationUnitCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudyObservationUnitCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudySearchCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudySearchCriteria.java
similarity index 83%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudySearchCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudySearchCriteria.java
index 8135ac821500060402333084365464631c02cce7..0043f99f074c5192a248abe4f0c34235f0de7554 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiStudySearchCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiStudySearchCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiTrialCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiTrialCriteria.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiTrialCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiTrialCriteria.java
index b147b40e1815fce568f7d170565e2d1552de6609..4ce30335614ff748de139efa4d824d9f9a9fe094 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/criteria/BrapiTrialCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/criteria/BrapiTrialCriteria.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.criteria;
+package fr.inra.urgi.faidare.domain.brapi.v1.criteria;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiAdditionalInfo.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiAdditionalInfo.java
similarity index 92%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiAdditionalInfo.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiAdditionalInfo.java
index 047c156af79b6b48383961f9123d6699176d9294..a1f7074ab309c406052750217d7d2470f7b1a8b2 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiAdditionalInfo.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiAdditionalInfo.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiCall.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiCall.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiCall.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiCall.java
index 056ecd55dc9f774f2900e05f7b4a69539f6ee7f3..d5f0c33fb2d101cf5edd5c47e249aa90f2e589e6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiCall.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiCall.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiContact.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiContact.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiContact.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiContact.java
index d2163f411a7867cbae9caf432bea3ee5d85c31f2..ef4d398c024c085bfc844107cde29432d83be7d4 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiContact.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiContact.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasm.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasm.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasm.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasm.java
index 48eaea5dddc86e7ab167f0f648c9d5dd98a38fb5..c798100b21536dcb9c4287fe830e5a7c122a2605 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasm.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasm.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmAttributeValue.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmAttributeValue.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmAttributeValue.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmAttributeValue.java
index 2bae6a7957b3314fe96c9b07d28a944ca17acfbf..5d1d946527153ff5d1da61532f3863acece6242e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmAttributeValue.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmAttributeValue.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.Date;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmAttributeValueList.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmAttributeValueList.java
similarity index 77%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmAttributeValueList.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmAttributeValueList.java
index deee6b48185178d1bb9d231c123396257bae3029..b828aa22226d02961b65fea6722786c178dcecdc 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmAttributeValueList.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmAttributeValueList.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmDonor.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmDonor.java
similarity index 78%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmDonor.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmDonor.java
index 6a10909a1734ef1b7f218e008b33e62333c5cf07..84d9f16c8e0e83e0764642b4c346de0def016475 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmDonor.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmDonor.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmTaxonSource.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmTaxonSource.java
similarity index 73%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmTaxonSource.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmTaxonSource.java
index afbcb457a7c53071473757e18494ed22b7a9db0f..4977846e61965623d2f0f4e3c189e1555adf1c77 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiGermplasmTaxonSource.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiGermplasmTaxonSource.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiLocation.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiLocation.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiLocation.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiLocation.java
index 77f866ed0515de0731347249817e4128407d318d..9a1a35a7cd68262ad81faa0ec7e4df0b11e34550 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiLocation.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiLocation.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiMethod.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiMethod.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiMethod.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiMethod.java
index 92e3a57c91c7e93ae9c6590367eb3169a0142049..c00d9dbd0691f4b2373b53d9441e52d9b1f51cd3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiMethod.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiMethod.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservation.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservation.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservation.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservation.java
index 799710616715e981bef09ae37180060c7193d7af..96d45884585ab3ebd2f03cd70dd899fedf8da1db 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservation.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservation.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.Date;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnit.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnit.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnit.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnit.java
index b2e28cc713a4c7db681851f0f4ac267da0959b94..2eaaae70b69dcc84f14e5be13370c9e12f055754 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnit.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnit.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnitTreatment.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnitTreatment.java
similarity index 73%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnitTreatment.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnitTreatment.java
index 8ba35b2550054310c15ca1aa700cf98a0e75ea12..4c43bfe40188fee50b4cec0235e024a68158a3d3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnitTreatment.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnitTreatment.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnitXRef.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnitXRef.java
similarity index 72%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnitXRef.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnitXRef.java
index f6d865909a9d1f1d829a97bed06d902bc5b34352..6a7bd8713eac6f8676940041475551fb0aae7625 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationUnitXRef.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationUnitXRef.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationVariable.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationVariable.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationVariable.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationVariable.java
index 6bb19b99b50c340302240c42664437e5f0247531..7a5753dd950302567976150212a55da1382f4d0c 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiObservationVariable.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiObservationVariable.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiOntology.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiOntology.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiOntology.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiOntology.java
index a01e225f09ab1ae6298feb84fac9ca64e0f0a0b6..0f1c8186a297b8512517885887620042c2681884 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiOntology.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiOntology.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiOntologyLink.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiOntologyLink.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiOntologyLink.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiOntologyLink.java
index 19dfe1b3627192850464a111412d5232ee5307a1..2ac55f317f1fa402cbed80f952dda3aba320de43 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiOntologyLink.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiOntologyLink.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiParentProgeny.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiParentProgeny.java
similarity index 76%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiParentProgeny.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiParentProgeny.java
index 94ef6ef3391d288a84e6f8545f0d6201c32307cb..67d8d5a24993fb1d35710f6b50b1dd42b7c138de 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiParentProgeny.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiParentProgeny.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 public interface BrapiParentProgeny {
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiPedigree.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiPedigree.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiPedigree.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiPedigree.java
index 863ef0662305e7559790ba819f2db5a31e9bd959..87a63f60482b6c61b5c49190bf6164f058f2e8bd 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiPedigree.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiPedigree.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiProgeny.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiProgeny.java
similarity index 80%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiProgeny.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiProgeny.java
index e477e400788ad2d48f81afdda7c9eb4d9916a2b3..66bfc823b4051beb17dcac61f62549a940139fc3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiProgeny.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiProgeny.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiProgram.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiProgram.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiProgram.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiProgram.java
index b19b2ad8efaa39becfcf11887d17b61988fe37ac..952b9b12e32515193d9f6a043117f17440ce8cfe 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiProgram.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiProgram.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiScale.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiScale.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiScale.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiScale.java
index 9e83e8a9710687265bd5b1f13bffa28222d6d4e9..3376e2e3bcea1a4513a6fadb9a6af76940f4b58c 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiScale.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiScale.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiScaleValidValue.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiScaleValidValue.java
similarity index 87%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiScaleValidValue.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiScaleValidValue.java
index 4113fd1a22b34c0b89646982a7fca3947d303d7f..e38ed0fcc45f871a5a38b3080dce7d1b98f8eef4 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiScaleValidValue.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiScaleValidValue.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiSibling.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiSibling.java
similarity index 71%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiSibling.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiSibling.java
index 4efeac5cbfa68f4a9e6bac7ab3f62ce6baa5ce11..282361731260d07ca3cda190c73872aa337db1cb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiSibling.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiSibling.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 public interface BrapiSibling {
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudy.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudy.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudy.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudy.java
index 37805b8a617cfd30477a97d67906e15bf9ed96b4..aacd23722d863c53059f0c0d59be034f94753c12 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudy.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudy.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.Date;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyDataLink.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyDataLink.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyDataLink.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyDataLink.java
index 7ec697e93a68155f7f35658bd6f89b30792c6618..dc6eca031e32ee8ac79570f9dc7d0e40677503c3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyDataLink.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyDataLink.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyDetail.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyDetail.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyDetail.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyDetail.java
index 40a89d7e276c21fba38414a19e3cb769b9f4bfcd..4a41e83e385c590112d676507bde643682109842 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyDetail.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyDetail.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyLastUpdate.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyLastUpdate.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyLastUpdate.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyLastUpdate.java
index 746d6563b18577c9f635235ed72f8c22f965a1eb..060f7cd7c251ac912f74021e0535a209a174c1f7 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudyLastUpdate.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudyLastUpdate.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudySummary.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudySummary.java
similarity index 83%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudySummary.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudySummary.java
index c616245d912873f12268d4caf2f4333c64a719d1..08ada70747e998a5126fd4233d812896762df4f5 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiStudySummary.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiStudySummary.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrait.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrait.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrait.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrait.java
index 0513211ddebb074dbe6ea28d2e3b9009eb3ce920..9473924c19c0d75c03c6b5304153b6165c8ab77b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrait.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrait.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrial.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrial.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrial.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrial.java
index 90c5f8413827d629d14870abd6b1057a77cd9939..f88dd346a9cd928ca122dc2a9dc2f2b4c7b28f52 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrial.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrial.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.Date;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrialDatasetAuthorship.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrialDatasetAuthorship.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrialDatasetAuthorship.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrialDatasetAuthorship.java
index 9dd709c2635835981abc3ab0d492fa3bed47d686..fc62675fc6d836c6833b3296cda9a40cac08991e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrialDatasetAuthorship.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrialDatasetAuthorship.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrialStudy.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrialStudy.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrialStudy.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrialStudy.java
index c3769d3ae3b0a2f287212f96cb59b7ba8b33441a..6c50078c0b9a697146d000470ee2305cbc08e752 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/BrapiTrialStudy.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/BrapiTrialStudy.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/HasBrapiDocumentationURL.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/HasBrapiDocumentationURL.java
similarity index 72%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/HasBrapiDocumentationURL.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/HasBrapiDocumentationURL.java
index f8ea9e43aec9baa02952fba3ae8b96a24731a659..bb0379891d47010c8c835e2c935d9d4fb8721728 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/data/HasBrapiDocumentationURL.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/data/HasBrapiDocumentationURL.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.data;
+package fr.inra.urgi.faidare.domain.brapi.v1.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * Has BrAPI v1.3 documentationUrl field
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/package-info.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/package-info.java
similarity index 81%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/package-info.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/package-info.java
index f55dda01f84982dad837fd311a5b02656239689a..5f4c903b534420326a13001140b9180db142a106 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/package-info.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/package-info.java
@@ -4,4 +4,4 @@
  *
  * @author gcornut
  */
-package fr.inra.urgi.gpds.domain.brapi.v1;
+package fr.inra.urgi.faidare.domain.brapi.v1;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiData.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiData.java
similarity index 67%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiData.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiData.java
index a5b634b1ced9521817f758289cb7d81b5d94cf15..ba74640b054e92dff18953ac6185d3430d7e00ae 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiData.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiData.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.response;
+package fr.inra.urgi.faidare.domain.brapi.v1.response;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiListResponse.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiListResponse.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiListResponse.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiListResponse.java
index 8d0fc74ef8e9b3cb21e1ed679f95accb21fa158d..c67194a15df16b558d13d5f807cfce4c3e01c8c6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiListResponse.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiListResponse.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.response;
+package fr.inra.urgi.faidare.domain.brapi.v1.response;
 
 /**
  * bean for general paginated response structure for breeding API
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiMetadata.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiMetadata.java
similarity index 78%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiMetadata.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiMetadata.java
index 57c0bf6d59ae6293e35a571e102e13783177d63f..fde394084d30c6b5b621db2db8e0bb580004aa52 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiMetadata.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiMetadata.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.response;
+package fr.inra.urgi.faidare.domain.brapi.v1.response;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiPagination.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiPagination.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiPagination.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiPagination.java
index 91a76f89487498b75c62faa8436a5fd20b64f94b..33fb0fb2feac3b5b071dc6d27ff74c90defb45ca 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiPagination.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiPagination.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.response;
+package fr.inra.urgi.faidare.domain.brapi.v1.response;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiResponse.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiResponse.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiResponse.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiResponse.java
index 78708965e85974018545568925fc8b5706582bf6..b95cf714dca413c587c50c0839931e33d48f8397 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiResponse.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiResponse.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.response;
+package fr.inra.urgi.faidare.domain.brapi.v1.response;
 
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * bean for general response structure for breeding API
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiStatus.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiStatus.java
similarity index 70%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiStatus.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiStatus.java
index 7925672149a45a23ffdc9efbba3541b4e00a1a1c..8ec5b05d266c8bc15560a931ac527baf68602a3d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/brapi/v1/response/BrapiStatus.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/brapi/v1/response/BrapiStatus.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.brapi.v1.response;
+package fr.inra.urgi.faidare.domain.brapi.v1.response;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmAttributeCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmAttributeCriteria.java
similarity index 64%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmAttributeCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmAttributeCriteria.java
index 237f1b85859e7ceddfe6a60e02b2d81377cdb621..7aaa5f60148530d5c179e17eed93d79b3181188e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmAttributeCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmAttributeCriteria.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.domain.criteria;
+package fr.inra.urgi.faidare.domain.criteria;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiGermplasmAttributeCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmAttributeValueListVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiGermplasmAttributeCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmAttributeValueListVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmAttributeListCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmAttributeListCriteria.java
similarity index 56%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmAttributeListCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmAttributeListCriteria.java
index 4916fbb0716065b7c2023feebe8d46189c309626..74ceec99dd031ad0f7ff3036a37963461bcbb8a3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmAttributeListCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmAttributeListCriteria.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.domain.criteria;
+package fr.inra.urgi.faidare.domain.criteria;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiGermplasmAttributeListCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmAttributeValueListVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiGermplasmAttributeListCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmAttributeValueListVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmGETSearchCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmGETSearchCriteria.java
similarity index 71%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmGETSearchCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmGETSearchCriteria.java
index 6a1050a385bf7b2ff78d5adc2664fa1f7f7bab3e..02274c9fb62b6ea7d8f041d0157a1d3535889cfc 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmGETSearchCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmGETSearchCriteria.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.domain.criteria;
+package fr.inra.urgi.faidare.domain.criteria;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiGermplasmGETSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiGermplasmGETSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmPOSTSearchCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmPOSTSearchCriteria.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmPOSTSearchCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmPOSTSearchCriteria.java
index 18676fd55a3079706e855fb8c5cbe86da6413731..55d6dd1aec505d8129ea42466d0831aaad719734 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmPOSTSearchCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmPOSTSearchCriteria.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.domain.criteria;
+package fr.inra.urgi.faidare.domain.criteria;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiGermplasmPOSTSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiGermplasmPOSTSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmSearchCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmSearchCriteria.java
similarity index 62%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmSearchCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmSearchCriteria.java
index 0ed4a83ce3948bbc525c5ff3682ab22aa5dab883..897999f0d1b59e0a4b54ca91be4a6295ee93f93c 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/GermplasmSearchCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/GermplasmSearchCriteria.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.criteria;
+package fr.inra.urgi.faidare.domain.criteria;
 
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
 
 /**
  * Regroups {@link GermplasmGETSearchCriteria} & {@link GermplasmPOSTSearchCriteria}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/LocationCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/LocationCriteria.java
similarity index 50%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/LocationCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/LocationCriteria.java
index 246039950ae2475c2813c68a5dfdc33d5cc4e6a8..c641c3a8294bff336ba432383a4ed14f9d657a76 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/LocationCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/LocationCriteria.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.domain.criteria;
+package fr.inra.urgi.faidare.domain.criteria;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiLocationCriteria;
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiPaginationCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.LocationVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiLocationCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiPaginationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.LocationVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ObservationUnitCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ObservationUnitCriteria.java
similarity index 85%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ObservationUnitCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ObservationUnitCriteria.java
index a8a9f3c5da88d1d85373bbd7ce0ad658830d5452..b8d32310f56954eb0db09e03ee224cd8bdbfa99e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ObservationUnitCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ObservationUnitCriteria.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.domain.criteria;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiObservationUnitCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationUnitVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.QueryType;
+package fr.inra.urgi.faidare.domain.criteria;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiObservationUnitCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationUnitVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.QueryType;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ObservationVariableCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ObservationVariableCriteria.java
similarity index 72%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ObservationVariableCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ObservationVariableCriteria.java
index 97ecf2b6c5c78a6c01593753e187f78bc38a027f..2544e91398b255a255d9cd435f41be5544ecca68 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ObservationVariableCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ObservationVariableCriteria.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.criteria;
+package fr.inra.urgi.faidare.domain.criteria;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiObservationVariableCriteria;
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiPaginationCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiObservationVariableCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiPaginationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ProgramCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ProgramCriteria.java
similarity index 74%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ProgramCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ProgramCriteria.java
index fbb7387345b87c4d084ec69426b90b788d915cbd..be3c809f8485bca83b6aeb63ea32dab2c65607d3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/ProgramCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/ProgramCriteria.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.domain.criteria;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiPaginationCriteria;
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiProgramCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.data.ProgramVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+package fr.inra.urgi.faidare.domain.criteria;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiPaginationCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiProgramCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.data.ProgramVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudyCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudyCriteria.java
new file mode 100644
index 0000000000000000000000000000000000000000..ccb1bfc17f2139b0833d1c1be1f0f119f7ff7b62
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudyCriteria.java
@@ -0,0 +1,9 @@
+package fr.inra.urgi.faidare.domain.criteria;
+
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
+
+/**
+ * @author gcornut
+ */
+public interface StudyCriteria extends PaginationCriteria {
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudyObservationUnitCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudyObservationUnitCriteria.java
similarity index 78%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudyObservationUnitCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudyObservationUnitCriteria.java
index 0d461e2fc6fe2693a05fe19fa6523dd3eca07504..8e670e74d0fd7a15834d91f94205651b764da7a3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudyObservationUnitCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudyObservationUnitCriteria.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.criteria;
+package fr.inra.urgi.faidare.domain.criteria;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiStudyObservationUnitCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiStudyObservationUnitCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudySearchCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudySearchCriteria.java
similarity index 65%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudySearchCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudySearchCriteria.java
index 21130ba85aee7560b48014d02ea04c95332f504e..d511f6316860b961c6219f9bd7f4407769627603 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudySearchCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudySearchCriteria.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.domain.criteria;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiPaginationCriteria;
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiSortCriteria;
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiStudySearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.SortCriteria;
-import fr.inra.urgi.gpds.domain.data.study.StudySummaryVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+package fr.inra.urgi.faidare.domain.criteria;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiPaginationCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiSortCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiStudySearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.SortCriteria;
+import fr.inra.urgi.faidare.domain.data.study.StudySummaryVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudySummaryCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudySummaryCriteria.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudySummaryCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudySummaryCriteria.java
index ab80b192ab0ec8292b6fd568ae0b2b3f9bb29ae1..9bd84d296fc292b879d3456a344f5234bd780fa5 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudySummaryCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/StudySummaryCriteria.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.domain.criteria;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiPaginationCriteria;
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiSortCriteria;
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiStudyCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.criteria.base.SortCriteria;
-import fr.inra.urgi.gpds.domain.data.study.StudySummaryVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.NoDocumentMapping;
+package fr.inra.urgi.faidare.domain.criteria;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiPaginationCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiSortCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiStudyCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.criteria.base.SortCriteria;
+import fr.inra.urgi.faidare.domain.data.study.StudySummaryVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.NoDocumentMapping;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/TrialCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/TrialCriteria.java
similarity index 69%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/TrialCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/TrialCriteria.java
index 01f20afcd9a277f8da9c08109c442a6d78445a09..608741955e313f9e518b1d2d22c748608d2343d1 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/TrialCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/TrialCriteria.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.domain.criteria;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiPaginationCriteria;
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiTrialCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.criteria.base.SortCriteria;
-import fr.inra.urgi.gpds.domain.data.TrialVO;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.NoDocumentMapping;
+package fr.inra.urgi.faidare.domain.criteria;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiPaginationCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiTrialCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.criteria.base.SortCriteria;
+import fr.inra.urgi.faidare.domain.data.TrialVO;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.NoDocumentMapping;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationCriteria.java
similarity index 57%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationCriteria.java
index 40f39b649d06e112970df141963cea7210208466..54f4655733ff51bbf173e1653eb48d33fb1374a1 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationCriteria.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.criteria.base;
+package fr.inra.urgi.faidare.domain.criteria.base;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiPaginationCriteria;
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiPaginationCriteria;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationCriteriaImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationCriteriaImpl.java
similarity index 92%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationCriteriaImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationCriteriaImpl.java
index fb321a4a5410fec229346734fda605775af8e1ab..939ddbd44336517104971c630230e21ebdfce725 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationCriteriaImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationCriteriaImpl.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.criteria.base;
+package fr.inra.urgi.faidare.domain.criteria.base;
 
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.NoDocumentMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.NoDocumentMapping;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationMaxResultValidator.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationMaxResultValidator.java
similarity index 96%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationMaxResultValidator.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationMaxResultValidator.java
index 5bb9cfe264353dab32703c1fe11d56393540f24a..1f7f00962825ff4b1296e32c16fdaf22bc4b6ef0 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationMaxResultValidator.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationMaxResultValidator.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.criteria.base;
+package fr.inra.urgi.faidare.domain.criteria.base;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/SortCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/SortCriteria.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6f77cc466a03e8c339176d4f4a7c37c8a6c021c
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/SortCriteria.java
@@ -0,0 +1,9 @@
+package fr.inra.urgi.faidare.domain.criteria.base;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.criteria.BrapiSortCriteria;
+
+/**
+ * @author gcornut
+ */
+public interface SortCriteria extends BrapiSortCriteria {
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/ValidPagination.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/ValidPagination.java
similarity index 93%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/ValidPagination.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/ValidPagination.java
index 4aa3535f619c5d28a5889125d8a32306500295cd..230976133a197d90849d192bdd2e344b465649a6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/ValidPagination.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/criteria/base/ValidPagination.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.criteria.base;
+package fr.inra.urgi.faidare.domain.criteria.base;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/CallVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/CallVO.java
similarity index 77%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/CallVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/CallVO.java
index 9fbb1a3ee162df076dcf74e80d66c7649dd73233..6fd6838f47fb5a948ceac5c3b2dfec743798dfc5 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/CallVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/CallVO.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.domain.data;
+package fr.inra.urgi.faidare.domain.data;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiCall;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiCall;
 
 import java.util.Set;
 
-import static fr.inra.urgi.gpds.api.brapi.v1.CallsController.DEFAULT_BRAPI_VERSIONS;
-import static fr.inra.urgi.gpds.api.brapi.v1.CallsController.DEFAULT_DATA_TYPES;
+import static fr.inra.urgi.faidare.api.brapi.v1.CallsController.DEFAULT_BRAPI_VERSIONS;
+import static fr.inra.urgi.faidare.api.brapi.v1.CallsController.DEFAULT_DATA_TYPES;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/ContactVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/ContactVO.java
similarity index 92%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/ContactVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/ContactVO.java
index ad42ef6d71bf41f4c2df5cd1b22176299bd258df..14a1c1ea4aa2920f8574fd5b69bca5074efd3955 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/ContactVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/ContactVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data;
+package fr.inra.urgi.faidare.domain.data;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiContact;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiContact;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/GnpISInternal.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/GnpISInternal.java
similarity index 85%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/GnpISInternal.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/GnpISInternal.java
index 1bdc77a9dc4e852c527f44e110692af73805b44a..ce877f5b7375b76b8d0df75f6c64cbd5820a653d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/GnpISInternal.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/GnpISInternal.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.data;
+package fr.inra.urgi.faidare.domain.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/LocationVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/LocationVO.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/LocationVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/LocationVO.java
index 010ebf16c32c9afeedb2f410945211732b624ecf..f8dea56d760b22a1da8f701eda6b91b8be562b5f 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/LocationVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/LocationVO.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.domain.data;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiAdditionalInfo;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiLocation;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURL;
-import fr.inra.urgi.gpds.domain.jsonld.data.IncludedInDataCatalog;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
+package fr.inra.urgi.faidare.domain.data;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiAdditionalInfo;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiLocation;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURL;
+import fr.inra.urgi.faidare.domain.jsonld.data.IncludedInDataCatalog;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/ProgramVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/ProgramVO.java
similarity index 86%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/ProgramVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/ProgramVO.java
index d96141e5b5306e57c9613a293499eb3efe69ff8e..07584931139e3f87e52379b05365392ce7bef048 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/ProgramVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/ProgramVO.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.domain.data;
+package fr.inra.urgi.faidare.domain.data;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiProgram;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURL;
-import fr.inra.urgi.gpds.domain.jsonld.data.IncludedInDataCatalog;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiProgram;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURL;
+import fr.inra.urgi.faidare.domain.jsonld.data.IncludedInDataCatalog;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialDatasetAuthorshipVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialDatasetAuthorshipVO.java
similarity index 86%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialDatasetAuthorshipVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialDatasetAuthorshipVO.java
index 1966c1b89fff67d8a67d7af01b0c7c681fcf80b2..a99c764c37e8105fd696aea312f1c2166411ed17 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialDatasetAuthorshipVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialDatasetAuthorshipVO.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.data;
+package fr.inra.urgi.faidare.domain.data;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiTrialDatasetAuthorship;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiTrialDatasetAuthorship;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialStudySummaryVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialStudySummaryVO.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialStudySummaryVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialStudySummaryVO.java
index 1250e326cea51922bb5fcc43594e6f1b6ae2cc3d..1bd7d5377d690d65d6e4e6fdb63974a29ed95388 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialStudySummaryVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialStudySummaryVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data;
+package fr.inra.urgi.faidare.domain.data;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiTrialStudy;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiTrialStudy;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialVO.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialVO.java
index b2b39d4cd72590d48231830735ba4aa441dd1ce6..71a150e390d569f3e840a47f878c24ebb8e7f32d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/TrialVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/TrialVO.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.domain.data;
+package fr.inra.urgi.faidare.domain.data;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.*;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURL;
-import fr.inra.urgi.gpds.domain.jsonld.data.IncludedInDataCatalog;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.*;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURL;
+import fr.inra.urgi.faidare.domain.jsonld.data.IncludedInDataCatalog;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
 
 import java.util.Date;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/CollPop.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/CollPop.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/CollPop.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/CollPop.java
index 463f4ce2b56aa63b4da2e22fee75c3356f226373..b9ab3e1b8f3ce3973eb74607a5d8869f9bcbfc63 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/CollPop.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/CollPop.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/CollPopVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/CollPopVO.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/CollPopVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/CollPopVO.java
index 9b87927dba76fa32e7f4ab5e7c6ceeb8fc7910f3..b26131fefef747a8aaeb46ea54640c3446850068 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/CollPopVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/CollPopVO.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/DonorVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/DonorVO.java
similarity index 92%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/DonorVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/DonorVO.java
index 8cd5d7cd7b6f63b68ceaabba0f867f545ccab398..8bab9ec7efae8ebfa64e178d299292dfc982a7b8 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/DonorVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/DonorVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasmDonor;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasmDonor;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ExtendedDonor.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ExtendedDonor.java
similarity index 67%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ExtendedDonor.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ExtendedDonor.java
index a18dd7e4ab56f9f38e0d72bfeca5535e3be4bae2..fd5164d5d6c2a789170707b2a5c492d851c567f4 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ExtendedDonor.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ExtendedDonor.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasmDonor;
+import fr.inra.urgi.faidare.domain.JSONView;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasmDonor;
 
 /**
  * Extends the BrAPI germplasm with GnpIS fields
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ExtendedGermplasm.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ExtendedGermplasm.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ExtendedGermplasm.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ExtendedGermplasm.java
index 254e0c333d87a67d87be9286a7dac189411321a4..4f2c156569e5653fa89831f85fda619d2ee4f641 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ExtendedGermplasm.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ExtendedGermplasm.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasm;
-import fr.inra.urgi.gpds.domain.data.GnpISInternal;
+import fr.inra.urgi.faidare.domain.JSONView;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasm;
+import fr.inra.urgi.faidare.domain.data.GnpISInternal;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Genealogy.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Genealogy.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Genealogy.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Genealogy.java
index 34c11b708ec2e0b1446b9fb163f6eb4aa3c08e7b..e9837d90c3e0e3cda986a162fb6f8fafd738c181 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Genealogy.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Genealogy.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GenealogyVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GenealogyVO.java
similarity index 98%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GenealogyVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GenealogyVO.java
index 492157c70a72b5c117c4e52ac2b150bdb520d3e7..ba0435e978b54836ef2497a87f75e65813382885 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GenealogyVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GenealogyVO.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmAttributeValueListVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmAttributeValueListVO.java
similarity index 75%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmAttributeValueListVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmAttributeValueListVO.java
index a4d153cbe4e3daa04ef34d1120eac0324454c75e..39b810782414faae48f17e861723180ab5724eed 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmAttributeValueListVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmAttributeValueListVO.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasmAttributeValue;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasmAttributeValueList;
-import fr.inra.urgi.gpds.domain.data.GnpISInternal;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Nested;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasmAttributeValue;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasmAttributeValueList;
+import fr.inra.urgi.faidare.domain.data.GnpISInternal;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Nested;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmAttributeValueVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmAttributeValueVO.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmAttributeValueVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmAttributeValueVO.java
index 54a35eb862ecc700e79e00a12f7a835ccd156cfa..66d125986c1c7e3598b92f968154a8fdd640aa43 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmAttributeValueVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmAttributeValueVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasmAttributeValue;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasmAttributeValue;
 
 import java.util.Date;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmInstitute.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmInstitute.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmInstitute.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmInstitute.java
index a90b324ab014c33344b3c8392fb9bc984eeb9919..692f62f7b58dd83e84ec830d7523da173490dfab 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmInstitute.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmInstitute.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmInstituteVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmInstituteVO.java
similarity index 97%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmInstituteVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmInstituteVO.java
index e8a9d5f80b48af014355acabb2d3c82ab22c09ba..e6da09ec204d813ef869e78620a7632c3cd19865 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmInstituteVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmInstituteVO.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmVO.java
similarity index 96%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmVO.java
index 10c8779f8b44f5991f645cbb79da8d36d8750a8d..6e3312fb5793b5f198f8671b74ba4f814c7fac08 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/GermplasmVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/GermplasmVO.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasm;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURL;
-import fr.inra.urgi.gpds.domain.jsonld.data.IncludedInDataCatalog;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasm;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURL;
+import fr.inra.urgi.faidare.domain.jsonld.data.IncludedInDataCatalog;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Institute.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Institute.java
similarity index 87%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Institute.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Institute.java
index 0dccd21f3994556d8ef78ae2aa46bc8075144e90..918211210a890847ec8c1e5f0e6cea7e1949b5f9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Institute.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Institute.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/InstituteVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/InstituteVO.java
similarity index 97%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/InstituteVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/InstituteVO.java
index b1e4f8fa23605b46cae8a8cda28e3e2ee70a8628..f29691bfbfb8f9a08908a40420aa18203e0035bf 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/InstituteVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/InstituteVO.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ParentProgenyVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ParentProgenyVO.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ParentProgenyVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ParentProgenyVO.java
index a2363c75b3dcdddd296fefa80a93dff49fea080c..e4a3df6560673c0ff5715c443761567af9ca42cb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ParentProgenyVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ParentProgenyVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiParentProgeny;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiParentProgeny;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PedigreeVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PedigreeVO.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PedigreeVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PedigreeVO.java
index ff6da96b06a262cadd7dd550029c887ff8b713d8..6c5914d00d7e2937f8b1edd8ac1849bf852f54dd 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PedigreeVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PedigreeVO.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiPedigree;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiSibling;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiPedigree;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiSibling;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Photo.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Photo.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Photo.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Photo.java
index 4f5c6327b9929c7e48da8fa9bfab7e6b1de3d8a7..928719b7f2704575a5e1944c63e26ff37b383398 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Photo.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Photo.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PhotoVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PhotoVO.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PhotoVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PhotoVO.java
index 748db321ec9d8f291070677db2d8ac7ab8e56cfd..c37cf60e2fd81699493d82b283d9e1bd8220a7c4 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PhotoVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PhotoVO.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ProgenyVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ProgenyVO.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ProgenyVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ProgenyVO.java
index 8357566c01d6103f48dc26e4910d152dcced0f05..88d8f908ef5031045085bfdbd0d73786727ee51b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/ProgenyVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/ProgenyVO.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiParentProgeny;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiProgeny;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiParentProgeny;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiProgeny;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PuiNameValue.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PuiNameValue.java
similarity index 75%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PuiNameValue.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PuiNameValue.java
index f7e747d806e365c1cb7c63ed65756e1dd95a0f4d..21611a08c3bddd1e53ff6d13a449e688b2e70ed7 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/PuiNameValue.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/PuiNameValue.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SiblingVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SiblingVO.java
similarity index 85%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SiblingVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SiblingVO.java
index b97825e820073bded48f9d2c1080868a3e3092b7..f26f0acdf078d8bc559758b42faafc2f1f0058c8 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SiblingVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SiblingVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiSibling;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiSibling;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SimpleVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SimpleVO.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SimpleVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SimpleVO.java
index 27006991db19639526bcfd31473cf7c649f8f2a4..6e9fcd028d30f099f27487bbce0ddf3932080af6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SimpleVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SimpleVO.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Site.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Site.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Site.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Site.java
index e23d19b3c962ee5c6f61decd8558e8c88beedf77..72479946d41e9a27c1ed62e2b8422edf5ad48f1b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/Site.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/Site.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SiteVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SiteVO.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SiteVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SiteVO.java
index 72db155a6bc50fb4090389083ce968e049596c3b..a62f5e2435f97aee59f79c782f317ec48aad1534 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/SiteVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/SiteVO.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/TaxonSourceVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/TaxonSourceVO.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/TaxonSourceVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/TaxonSourceVO.java
index 5f362461fed4b99d869bc639683156c5b5e4970c..13cb28018fbd4c7b6769430bfd437444f9aebef3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/germplasm/TaxonSourceVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/germplasm/TaxonSourceVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.germplasm;
+package fr.inra.urgi.faidare.domain.data.germplasm;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasmTaxonSource;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasmTaxonSource;
 
 import java.io.Serializable;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationUnitVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationUnitVO.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationUnitVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationUnitVO.java
index 88b4c7252d6ea88bd71cad2d9c3a07e702772c57..6ad0bb93e8d50c22f27f70d0b3d21715b5358dae 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationUnitVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationUnitVO.java
@@ -1,18 +1,18 @@
-package fr.inra.urgi.gpds.domain.data.phenotype;
+package fr.inra.urgi.faidare.domain.data.phenotype;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservation;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservationUnit;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservationUnitTreatment;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservationUnitXRef;
-import fr.inra.urgi.gpds.domain.data.GnpISInternal;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.IncludedInDataCatalog;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Nested;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservation;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservationUnit;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservationUnitTreatment;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservationUnitXRef;
+import fr.inra.urgi.faidare.domain.data.GnpISInternal;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.IncludedInDataCatalog;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Nested;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationUnitXRefVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationUnitXRefVO.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationUnitXRefVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationUnitXRefVO.java
index ccb0daa0a749a757823520acbee21d1151a4cf4a..08368c0ff47febaf9e33120f21205fa6b6859399 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationUnitXRefVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationUnitXRefVO.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.data.phenotype;
+package fr.inra.urgi.faidare.domain.data.phenotype;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservationUnitXRef;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservationUnitXRef;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationVO.java
similarity index 93%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationVO.java
index f3fb11b688a4300daa677c7bc0c8d60d0236ad31..c3b758862950fc7c66d16ac1f6f7e0b01daec715 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/ObservationVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/ObservationVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.phenotype;
+package fr.inra.urgi.faidare.domain.data.phenotype;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservation;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservation;
 
 import java.util.Date;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/TreatmentVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/TreatmentVO.java
similarity index 78%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/TreatmentVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/TreatmentVO.java
index 1267a0fb57732938acce13d687ae953190ca62c2..480d33359aea35411b5835d78787c70d6d3601b6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/phenotype/TreatmentVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/phenotype/TreatmentVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.phenotype;
+package fr.inra.urgi.faidare.domain.data.phenotype;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservationUnitTreatment;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservationUnitTreatment;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyDataLinkVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyDataLinkVO.java
similarity index 85%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyDataLinkVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyDataLinkVO.java
index fb96dc49ae2feab7a1eaf949a05e0afe01b50519..175be394962fff735e3e11b252c303188d8b89c4 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyDataLinkVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyDataLinkVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.study;
+package fr.inra.urgi.faidare.domain.data.study;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiStudyDataLink;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiStudyDataLink;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyDetailVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyDetailVO.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyDetailVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyDetailVO.java
index e61775edf7e28bf4b6da594d73c0f95f629b00b6..e34075b172ef63d98727970267e3af56864e8eba 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyDetailVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyDetailVO.java
@@ -1,17 +1,17 @@
-package fr.inra.urgi.gpds.domain.data.study;
+package fr.inra.urgi.faidare.domain.data.study;
 
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.JSONView;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.*;
-import fr.inra.urgi.gpds.domain.data.ContactVO;
-import fr.inra.urgi.gpds.domain.data.GnpISInternal;
-import fr.inra.urgi.gpds.domain.data.LocationVO;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURL;
-import fr.inra.urgi.gpds.domain.jsonld.data.IncludedInDataCatalog;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.domain.JSONView;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.*;
+import fr.inra.urgi.faidare.domain.data.ContactVO;
+import fr.inra.urgi.faidare.domain.data.GnpISInternal;
+import fr.inra.urgi.faidare.domain.data.LocationVO;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURL;
+import fr.inra.urgi.faidare.domain.jsonld.data.IncludedInDataCatalog;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
 
 import java.util.Date;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyLastUpdateVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyLastUpdateVO.java
similarity index 83%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyLastUpdateVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyLastUpdateVO.java
index 753e77927958ab37587b5611289d824b57485a64..9ded3ea343e831247205d2178d8df8381a71997a 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudyLastUpdateVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudyLastUpdateVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.study;
+package fr.inra.urgi.faidare.domain.data.study;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiStudyLastUpdate;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiStudyLastUpdate;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudySummaryVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudySummaryVO.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudySummaryVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudySummaryVO.java
index 328a695e83ea64b91a88fc458344082de39ac46c..d27d745dcd37d8fb05169e930d48d7c15b6f3010 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/study/StudySummaryVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/study/StudySummaryVO.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.domain.data.study;
+package fr.inra.urgi.faidare.domain.data.study;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiAdditionalInfo;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiStudySummary;
-import fr.inra.urgi.gpds.domain.data.GnpISInternal;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURL;
-import fr.inra.urgi.gpds.domain.jsonld.data.IncludedInDataCatalog;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiAdditionalInfo;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiStudySummary;
+import fr.inra.urgi.faidare.domain.data.GnpISInternal;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURL;
+import fr.inra.urgi.faidare.domain.jsonld.data.IncludedInDataCatalog;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
 
 import java.util.Date;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/MethodVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/MethodVO.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/MethodVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/MethodVO.java
index 1ec661aae04921d92936ca6d1c6561c843a97d5d..231b75641f6bb4c0aebe257eb60401fd4dd0bf38 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/MethodVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/MethodVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.variable;
+package fr.inra.urgi.faidare.domain.data.variable;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiMethod;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiMethod;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ObservationVariableVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ObservationVariableVO.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ObservationVariableVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ObservationVariableVO.java
index f620f6a45f22e859ec26b0513efd13680bfde930..e18964d7fbcc92d8755c76dd9ba2f75f875ebf88 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ObservationVariableVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ObservationVariableVO.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.domain.data.variable;
+package fr.inra.urgi.faidare.domain.data.variable;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiMethod;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiObservationVariable;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiScale;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiTrait;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURL;
-import fr.inra.urgi.gpds.domain.jsonld.data.IncludedInDataCatalog;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiMethod;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiObservationVariable;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiScale;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiTrait;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURL;
+import fr.inra.urgi.faidare.domain.jsonld.data.IncludedInDataCatalog;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/OntologyLinkVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/OntologyLinkVO.java
similarity index 80%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/OntologyLinkVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/OntologyLinkVO.java
index eb24c07ddf08ba97f4e2937b2cf32a67e9fae5c4..a8e5224e29f0e8423578df00f431a0f512fbebbb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/OntologyLinkVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/OntologyLinkVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.variable;
+package fr.inra.urgi.faidare.domain.data.variable;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiOntologyLink;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiOntologyLink;
 
 /**
  * Generic link reference inspired by HATEOS (used to list download links for the ontology)
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/OntologyVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/OntologyVO.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/OntologyVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/OntologyVO.java
index 0429c4c0f1696114332d13b751b3c873d053a4c5..f17c75e042d70871d3b14d6d83defb90061945a6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/OntologyVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/OntologyVO.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.domain.data.variable;
+package fr.inra.urgi.faidare.domain.data.variable;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiOntology;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiOntologyLink;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURI;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasURL;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiOntology;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiOntologyLink;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURI;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasURL;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ScaleVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ScaleVO.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ScaleVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ScaleVO.java
index 6629e99439d9b52899ce057b00417d24acdd0375..e20a0d0b9fe2e7c54b5831ac8915b50763527a88 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ScaleVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ScaleVO.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.data.variable;
+package fr.inra.urgi.faidare.domain.data.variable;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiScale;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiScaleValidValue;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiScale;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiScaleValidValue;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ScaleValidValueVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ScaleValidValueVO.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ScaleValidValueVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ScaleValidValueVO.java
index c773c48a0b0cbde0bd9f7ecd154109b20d5f83ed..a2c1c8d900642fdcc48b399a2cd5f69dc56ec702 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/ScaleValidValueVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/ScaleValidValueVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.variable;
+package fr.inra.urgi.faidare.domain.data.variable;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiScaleValidValue;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiScaleValidValue;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/TraitVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/TraitVO.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/TraitVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/TraitVO.java
index 8c68ef21c8bc3d4657940bc38f9771664d8bfd3e..063d61f40b9ec3bbec45d22ffadf2992d930b729 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/data/variable/TraitVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/data/variable/TraitVO.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.data.variable;
+package fr.inra.urgi.faidare.domain.data.variable;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiTrait;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiTrait;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/criteria/DataDiscoveryCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/criteria/DataDiscoveryCriteria.java
similarity index 73%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/criteria/DataDiscoveryCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/criteria/DataDiscoveryCriteria.java
index 6275029bf97dc159bbafe38ae23c94c108638944..5e4615a5e0705c162a9ee63adfa9ebef6b1ad42d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/criteria/DataDiscoveryCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/criteria/DataDiscoveryCriteria.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.criteria;
+package fr.inra.urgi.faidare.domain.datadiscovery.criteria;
 
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.SortCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.SortCriteria;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/criteria/DataDiscoveryCriteriaImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/criteria/DataDiscoveryCriteriaImpl.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/criteria/DataDiscoveryCriteriaImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/criteria/DataDiscoveryCriteriaImpl.java
index 5fc5f7fce03a59430f36fa7e53c6e8f98d366044..892f95d0cdee4ba14b4ae4ac4b4f767a319a9c12 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/criteria/DataDiscoveryCriteriaImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/criteria/DataDiscoveryCriteriaImpl.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.criteria;
-
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataDiscoveryDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.NoDocumentMapping;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.QueryType;
+package fr.inra.urgi.faidare.domain.datadiscovery.criteria;
+
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataDiscoveryDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.NoDocumentMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.QueryType;
 import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscovery.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscovery.java
similarity index 77%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscovery.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscovery.java
index f0c4bad01d479f6f700df7f5ca30c8d33bb3c83f..146a1a5c38444db265f17546531a4a564ce2d21e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscovery.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscovery.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
-import fr.inra.urgi.gpds.domain.jsonld.data.Dataset;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.domain.JSONView;
+import fr.inra.urgi.faidare.domain.jsonld.data.Dataset;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryDocument.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryDocument.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryDocument.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryDocument.java
index efd64d02d2616e4e0c13c417911c70dc2c925569..1901337d4433eb57020d1fdcec35e34c867eb304 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryDocument.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryDocument.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryViaGermplasm.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryViaGermplasm.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryViaGermplasm.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryViaGermplasm.java
index c7b272609bf3760c6c3fda55ece091f8fd46030d..b67faa7afdbf7e625ff2120441a69ea5f4df9b62 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryViaGermplasm.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryViaGermplasm.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryViaTrait.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryViaTrait.java
similarity index 80%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryViaTrait.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryViaTrait.java
index f69cc6482007c50a4ba0ccbbc95c329a7654db7e..fda94bdbc2c567a43fb8124122e71d3b042c2b5d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataDiscoveryViaTrait.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataDiscoveryViaTrait.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataSource.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataSource.java
similarity index 81%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataSource.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataSource.java
index 539063ae779f07ca28564aacd68052e1e2140428..64c74c07ffd5f2cce03cad312bf9797de0d559a9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataSource.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataSource.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
-import fr.inra.urgi.gpds.domain.jsonld.data.DataCatalog;
+import fr.inra.urgi.faidare.domain.JSONView;
+import fr.inra.urgi.faidare.domain.jsonld.data.DataCatalog;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataSourceImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataSourceImpl.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataSourceImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataSourceImpl.java
index 07d7f560d9a8d226948a89b3e85a178cf8f2430b..6ff2d40d4af25f177d9c0628c390d42e7bb8ae67 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/DataSourceImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/DataSourceImpl.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/Facet.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/Facet.java
similarity index 73%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/Facet.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/Facet.java
index 1fa62f2d7462b9664e98da62bc6ae2d7c2850221..90635032fd27023bc778f280e730b41d28ebbd52 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/Facet.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/Facet.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetImpl.java
similarity index 92%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetImpl.java
index ebb78f1b775dfe794859f64a781cae863081acbb..b07a667967e3ff410f64860f1fa8e25172edabdd 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetImpl.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetTerm.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetTerm.java
similarity index 70%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetTerm.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetTerm.java
index 241ef0fd1257cda883a70e164807f1af7b6f9470..84c7fa56dff66d5d54ea1233f463d28f406a0f21 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetTerm.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetTerm.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetTermImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetTermImpl.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetTermImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetTermImpl.java
index 9860d3e91cb0d5d2e4de6f1a366ed95ca0c3b8bb..33c1a0169c38d41c4ae6e23824bcb674a746a118 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/data/FacetTermImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/data/FacetTermImpl.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.data;
+package fr.inra.urgi.faidare.domain.datadiscovery.data;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/response/DataDiscoveryResponse.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/response/DataDiscoveryResponse.java
similarity index 51%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/response/DataDiscoveryResponse.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/response/DataDiscoveryResponse.java
index 6bbb3fbd5a9253dc441c9161a9c13747e59779a9..2e92bea47dd53dd934e762c5349c3b8175f5fcf0 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/datadiscovery/response/DataDiscoveryResponse.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/datadiscovery/response/DataDiscoveryResponse.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.domain.datadiscovery.response;
+package fr.inra.urgi.faidare.domain.datadiscovery.response;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiData;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiMetadata;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataDiscoveryDocument;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.Facet;
+import fr.inra.urgi.faidare.domain.JSONView;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiData;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiMetadata;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataDiscoveryDocument;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.Facet;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/Context.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/Context.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/Context.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/Context.java
index a41a6b77cebd1b05104629958b14b928fde1aff8..03a4374e2b960c6af8483faaa69c994eb850ee6e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/Context.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/Context.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/DataCatalog.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/DataCatalog.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/DataCatalog.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/DataCatalog.java
index edbecfc105f624b142250b6e1c1366b1c3b8a573..3adec866bedf437f6d0f72c94cd14c8a6c28f361 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/DataCatalog.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/DataCatalog.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * {@see http://schema.org/DataCatalog} as JSON-LD properties
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/Dataset.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/Dataset.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/Dataset.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/Dataset.java
index 41b87813961ad5c8d0129d04fa650809b01b8a36..363b5b1ab08f26bca38d1a081f019e2f421748c9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/Dataset.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/Dataset.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * {@see http://schema.org/Dataset} as JSON-LD properties
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasContext.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasContext.java
similarity index 73%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasContext.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasContext.java
index 8acc0c0a8ce3d6a9373bc77dffe8137337c17874..43e04ca2844868bacf8828686dc893ad7d34072e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasContext.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasContext.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasGraph.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasGraph.java
similarity index 76%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasGraph.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasGraph.java
index dab2f1162fca9fa6fddfc11eb7d233bf28edcaee..2c0583b2a14b91a410fe6a318a879990197e20ef 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasGraph.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasGraph.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasType.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasType.java
similarity index 77%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasType.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasType.java
index 01529ea6fd34975826589c36b35752853cd0e031..c8f29b7c242215e3d891e2bcc24f443a7c850803 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasType.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasType.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasURI.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasURI.java
similarity index 74%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasURI.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasURI.java
index 0d4baa04d4c85af75567821afa49bc825ddeaef5..80dcbe97920e248f75d2af31d14e7ca4abe9caf7 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasURI.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasURI.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasURL.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasURL.java
similarity index 75%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasURL.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasURL.java
index eebeec86fc64d92654e8e974f85489598510a890..964372b09e03aabd4eaa5af475f4c0e46ce1682b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/HasURL.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/HasURL.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/IncludedInDataCatalog.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/IncludedInDataCatalog.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/IncludedInDataCatalog.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/IncludedInDataCatalog.java
index 296f21984f44ef1a294be559e41ae9ff303e8a5a..b26fc198d6e832205f15e1409f8da8a4576295e6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/IncludedInDataCatalog.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/IncludedInDataCatalog.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
-import fr.inra.urgi.gpds.domain.JSONView;
+import fr.inra.urgi.faidare.domain.JSONView;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/JSONLD.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/JSONLD.java
similarity index 69%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/JSONLD.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/JSONLD.java
index ec83bc456bceaa6f888fe77aee79f18aff7adf0f..7aeca7dbf20277f0b5ea1dfbe7bb6176127b14fd 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/JSONLD.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/JSONLD.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
 
 /**
  * Base JSON-LD properties
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/package-info.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/package-info.java
similarity index 71%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/package-info.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/package-info.java
index 5592eabbbb63d6bf63ffe21e207b64374ba6b381..21ab6d9be67c4f7e3fde6ee512f5c023a7acdab5 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/jsonld/data/package-info.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/jsonld/data/package-info.java
@@ -3,4 +3,4 @@
  *
  * @author gcornut
  */
-package fr.inra.urgi.gpds.domain.jsonld.data;
+package fr.inra.urgi.faidare.domain.jsonld.data;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiListResponseImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiListResponseImpl.java
similarity index 75%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiListResponseImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiListResponseImpl.java
index c96fb872c5a0d90b8ef11d051a9ab9b108a2c5b9..c215a839000bb9b0410a70eb1f6ff892e8002546 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiListResponseImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiListResponseImpl.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiData;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiMetadata;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiData;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiMetadata;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiMetadataImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiMetadataImpl.java
similarity index 85%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiMetadataImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiMetadataImpl.java
index 696be2409d72fd5b5668ae98d3e5db4225b0fc70..185c0de0f312c7374a9ef3ea31ba40f9d766e3cb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiMetadataImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiMetadataImpl.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiMetadata;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiPagination;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiStatus;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiMetadata;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiPagination;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiStatus;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiResponseFactory.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiResponseFactory.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiResponseFactory.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiResponseFactory.java
index 1be9cb48630ccb077c31db20b49ed7988c0cc41e..a8a26095354ee309efb985b821163eef82890eff 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiResponseFactory.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiResponseFactory.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.api.brapi.v1.exception.BrapiPaginationException;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.*;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataDiscoveryDocument;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.FacetImpl;
-import fr.inra.urgi.gpds.domain.datadiscovery.response.DataDiscoveryResponse;
+import fr.inra.urgi.faidare.api.brapi.v1.exception.BrapiPaginationException;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.*;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataDiscoveryDocument;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.FacetImpl;
+import fr.inra.urgi.faidare.domain.datadiscovery.response.DataDiscoveryResponse;
 import org.springframework.http.HttpStatus;
 
 import java.util.ArrayList;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiResponseImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiResponseImpl.java
similarity index 76%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiResponseImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiResponseImpl.java
index dc62b4f6262d3268b073b55c6618a626579980a2..5be75cfccd9ee30c8afd9c4d8743ef2f58913e52 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiResponseImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiResponseImpl.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiMetadata;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiResponse;
-import fr.inra.urgi.gpds.domain.jsonld.data.Context;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasContext;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiMetadata;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiResponse;
+import fr.inra.urgi.faidare.domain.jsonld.data.Context;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasContext;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiStatusImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiStatusImpl.java
similarity index 78%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiStatusImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiStatusImpl.java
index 72166fd552f1077e999eb02efa1fbc2b0dc11e8e..d23fa1a2b3c5401c40e2c043815551519db4cceb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/ApiStatusImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/ApiStatusImpl.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiStatus;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiStatus;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/DataDiscoveryResponseImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/DataDiscoveryResponseImpl.java
similarity index 56%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/DataDiscoveryResponseImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/DataDiscoveryResponseImpl.java
index 254c483747a6b6c04be696ad2088e8ed6a6dedd5..695ad6dc6c5a2609c8b2249327997efac9b7c562 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/DataDiscoveryResponseImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/DataDiscoveryResponseImpl.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiMetadata;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataDiscoveryDocument;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.Facet;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.FacetImpl;
-import fr.inra.urgi.gpds.domain.datadiscovery.response.DataDiscoveryResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiMetadata;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataDiscoveryDocument;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.Facet;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.FacetImpl;
+import fr.inra.urgi.faidare.domain.datadiscovery.response.DataDiscoveryResponse;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/PaginatedList.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/PaginatedList.java
similarity index 96%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/PaginatedList.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/PaginatedList.java
index df558bae397655037518eb4aa65a552e3378b212..c05f459c8da0ec72927713a4ba0e3ee374cc52b8 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/PaginatedList.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/PaginatedList.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
 
 import java.util.*;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/Pagination.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/Pagination.java
similarity index 68%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/Pagination.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/Pagination.java
index 1ad3d3e35da1edc2da0225c5762eefc13bfbc5d1..8c52676948bf0f573bb8940599cfd3f1e37a691a 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/Pagination.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/Pagination.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiPagination;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiPagination;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/PaginationImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/PaginationImpl.java
similarity index 92%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/response/PaginationImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/response/PaginationImpl.java
index afa67be80cd43cca13829c6d256fffd996dd6106..01dc1e7b31ca7e95f368688aed78c2ea43aac818 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/response/PaginationImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/response/PaginationImpl.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
 
 /**
  * @author gcornut
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/xref/DocumentFields.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/xref/DocumentFields.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/xref/DocumentFields.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/xref/DocumentFields.java
index 40d4498fadd947730b03a083e2da5b0063ab360b..af7420a01082796fdd1d467fdec2cca8d3efdccf 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/xref/DocumentFields.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/xref/DocumentFields.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.xref;
+package fr.inra.urgi.faidare.domain.xref;
 
 /**
  * Imported and adapted from unified-interface legacy
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/xref/DocumentFieldsException.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/xref/DocumentFieldsException.java
similarity index 87%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/xref/DocumentFieldsException.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/xref/DocumentFieldsException.java
index e000652074bbb50c0ee708e2880f33fabf26d812..715f76e1c5441f226ed3908b11be09293e25da9f 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/xref/DocumentFieldsException.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/xref/DocumentFieldsException.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.xref;
+package fr.inra.urgi.faidare.domain.xref;
 
 
 /**
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/xref/XRefDocumentSearchCriteria.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/xref/XRefDocumentSearchCriteria.java
similarity index 72%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/xref/XRefDocumentSearchCriteria.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/xref/XRefDocumentSearchCriteria.java
index 7855ef9679266cf9bb8c23e6d5e2e181d59d07d1..7ca7b26afe0f212fa6c997315c92214409f74b88 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/xref/XRefDocumentSearchCriteria.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/xref/XRefDocumentSearchCriteria.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.domain.xref;
+package fr.inra.urgi.faidare.domain.xref;
 
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteriaImpl;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteriaImpl;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/xref/XRefDocumentVO.java b/backend/src/main/java/fr/inra/urgi/faidare/domain/xref/XRefDocumentVO.java
similarity index 98%
rename from backend/src/main/java/fr/inra/urgi/gpds/domain/xref/XRefDocumentVO.java
rename to backend/src/main/java/fr/inra/urgi/faidare/domain/xref/XRefDocumentVO.java
index 9ac92362ebab7ee76aadb52f754aa6fc408fcf3b..b6ae340faf0b51cffd5914df39958e687bd09ca5 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/xref/XRefDocumentVO.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/domain/xref/XRefDocumentVO.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.domain.xref;
+package fr.inra.urgi.faidare.domain.xref;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESRequestFactory.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactory.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESRequestFactory.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactory.java
index 3dd6169074359886fa6b289fed9d68f81e333d71..5017cacaafd65d5ec812471bc549eae251cfb1cd 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESRequestFactory.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactory.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.elasticsearch;
+package fr.inra.urgi.faidare.elasticsearch;
 
 import com.google.common.base.Joiner;
-import fr.inra.urgi.gpds.config.GPDSProperties;
-import fr.inra.urgi.gpds.repository.http.UserGroupsResourceClient;
+import fr.inra.urgi.faidare.config.FaidareProperties;
+import fr.inra.urgi.faidare.repository.http.UserGroupsResourceClient;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchScrollRequest;
@@ -24,13 +24,13 @@ public class ESRequestFactory {
     public static final int MAX_TERM_AGG_SIZE = Integer.MAX_VALUE;
 
     private UserGroupsResourceClient userGroupsResourceClient;
-    private GPDSProperties properties;
+    private FaidareProperties properties;
 
     private final IndicesOptions indicesOptions;
 
     public ESRequestFactory(
         UserGroupsResourceClient userGroupsResourceClient,
-        GPDSProperties properties
+        FaidareProperties properties
     ) {
         this.userGroupsResourceClient = userGroupsResourceClient;
         this.properties = properties;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESResponseParser.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESResponseParser.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESResponseParser.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESResponseParser.java
index 65741bcea6c95e6aa038637400910d774684a9c0..092892399f62f7820670f3c057665c55d11c7857 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESResponseParser.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESResponseParser.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.elasticsearch;
+package fr.inra.urgi.faidare.elasticsearch;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.google.common.base.Joiner;
-import fr.inra.urgi.gpds.domain.JSONView;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.FacetTermImpl;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.domain.JSONView;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.FacetTermImpl;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESScrollIterator.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESScrollIterator.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESScrollIterator.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESScrollIterator.java
index 8e2c69126dfbc02268e4f2e8d732e09b2a03ef7a..f106e9b7709dfc4d8e407322732e72ddd576835a 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/ESScrollIterator.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESScrollIterator.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.elasticsearch;
+package fr.inra.urgi.faidare.elasticsearch;
 
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchScrollRequest;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/AnnotatedCriteriaMapper.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/AnnotatedCriteriaMapper.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/AnnotatedCriteriaMapper.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/AnnotatedCriteriaMapper.java
index 7b6e0ba9f786e26809d881d4ac49697d896430b3..8a3b2484cc037a4bfeabe3edfd058eb10ea19de6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/AnnotatedCriteriaMapper.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/AnnotatedCriteriaMapper.java
@@ -1,17 +1,17 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria;
+package fr.inra.urgi.faidare.elasticsearch.criteria;
 
 import com.google.common.collect.ImmutableList;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.NoDocumentMapping;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMapping;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTree;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.impl.CriteriaMappingCriterionImpl;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.impl.CriteriaMappingImpl;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.impl.CriteriaMappingTreeNodeImpl;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.NoDocumentMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTree;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.impl.CriteriaMappingCriterionImpl;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.impl.CriteriaMappingImpl;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.impl.CriteriaMappingTreeNodeImpl;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
 import org.springframework.beans.BeanUtils;
 
 import java.beans.PropertyDescriptor;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/CriteriaForDocument.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/CriteriaForDocument.java
similarity index 83%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/CriteriaForDocument.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/CriteriaForDocument.java
index 159ec8e0c95acd1d16c18d96ea601634837ca36c..a831dcbafedb91b692938d91c87ffc2a6ce08b87 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/CriteriaForDocument.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/CriteriaForDocument.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.annotation;
+package fr.inra.urgi.faidare.elasticsearch.criteria.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/DocumentPath.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/DocumentPath.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/DocumentPath.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/DocumentPath.java
index c72823232ad4950515a1738831eca5c5462c60fe..3f006d964dc59d00bd1b4dad04e27fb7a85c462b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/DocumentPath.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/DocumentPath.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.annotation;
+package fr.inra.urgi.faidare.elasticsearch.criteria.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/NoDocumentMapping.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/NoDocumentMapping.java
similarity index 85%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/NoDocumentMapping.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/NoDocumentMapping.java
index a5846ccb6251593401a4c274403b8b7d63e8b1a7..0e6c55b4cecfe085f93f19a086ea3f0f39587e85 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/NoDocumentMapping.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/NoDocumentMapping.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.annotation;
+package fr.inra.urgi.faidare.elasticsearch.criteria.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/QueryType.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/QueryType.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/QueryType.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/QueryType.java
index 901f33882c2f20a672f6f11596b17d6ed5a2b237..282dabb2033412d14684fbb7938502df02cbc207 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/annotation/QueryType.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/annotation/QueryType.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.annotation;
+package fr.inra.urgi.faidare.elasticsearch.criteria.annotation;
 
 
 import org.elasticsearch.index.query.QueryBuilder;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMapping.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMapping.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMapping.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMapping.java
index 73d00d233a8731ae88eb1a7cc473e17bb5ad81b7..0ba7fb5aa8511f50bde74f253738c8ba12f9cd61 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMapping.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMapping.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.mapping;
+package fr.inra.urgi.faidare.elasticsearch.criteria.mapping;
 
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
 
 import java.util.List;
 import java.util.Map;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingCriterion.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingCriterion.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingCriterion.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingCriterion.java
index 8ffc8076d9da89dd283a248625298b139b3fdb35..c56c146b83c653cb334f6bac75989c5e330d205f 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingCriterion.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingCriterion.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.mapping;
+package fr.inra.urgi.faidare.elasticsearch.criteria.mapping;
 
 import org.elasticsearch.index.query.QueryBuilder;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingTree.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingTree.java
similarity index 87%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingTree.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingTree.java
index 87c4e050685effac57ef861cbf29be171ded182e..f6324bbcbad6b60a92aed3353d12cce327d5d181 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingTree.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingTree.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.mapping;
+package fr.inra.urgi.faidare.elasticsearch.criteria.mapping;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingTreeNode.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingTreeNode.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingTreeNode.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingTreeNode.java
index ff143ec7606f63081de1b8fb4010287b55f72f2d..05ad78364181ae5757b8ff4184095d9982e465f6 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/CriteriaMappingTreeNode.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/CriteriaMappingTreeNode.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.mapping;
+package fr.inra.urgi.faidare.elasticsearch.criteria.mapping;
 
 import java.util.List;
 import java.util.Map;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingCriterionImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingCriterionImpl.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingCriterionImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingCriterionImpl.java
index de2424fb9f31a6b6dc04e85ae30d0329b271ecfd..38ab2b603ca4f12a85cee97f9f17daa0db060488 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingCriterionImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingCriterionImpl.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.mapping.impl;
+package fr.inra.urgi.faidare.elasticsearch.criteria.mapping.impl;
 
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.QueryType;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.QueryType;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingImpl.java
similarity index 90%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingImpl.java
index d821051a691c83b88ffcaa49e30b4321d02e565c..5e97eefa10a7f66976913e90c6e8c80f5dc0460c 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingImpl.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.mapping.impl;
+package fr.inra.urgi.faidare.elasticsearch.criteria.mapping.impl;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMapping;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTree;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTree;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
 
 import java.util.*;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingTreeNodeImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingTreeNodeImpl.java
similarity index 86%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingTreeNodeImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingTreeNodeImpl.java
index ce60f33bcbab47f8affbed721ff4da78f3fb80a9..05d99d7511460473e14cc8ebc8f55f03fbe343cc 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/criteria/mapping/impl/CriteriaMappingTreeNodeImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/criteria/mapping/impl/CriteriaMappingTreeNodeImpl.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.mapping.impl;
+package fr.inra.urgi.faidare.elasticsearch.criteria.mapping.impl;
 
 import com.google.common.base.Joiner;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTree;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTree;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentAnnotationUtil.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentAnnotationUtil.java
similarity index 97%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentAnnotationUtil.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentAnnotationUtil.java
index 2187864307fce3c05a81de91093d3a0d174bf3f4..a521970d7baafc394c027314ae554af65fac1af2 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentAnnotationUtil.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentAnnotationUtil.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.elasticsearch.document;
+package fr.inra.urgi.faidare.elasticsearch.document;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.google.common.collect.ImmutableList;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Nested;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Nested;
 import org.springframework.beans.BeanUtils;
 
 import java.beans.PropertyDescriptor;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentMetadata.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentMetadata.java
similarity index 98%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentMetadata.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentMetadata.java
index d6210d30bc4a954f831e1cb0d72a2165a4a17dce..6bf7389bd43b46f6dc5cd72ef5883b932788f0a5 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentMetadata.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentMetadata.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.document;
+package fr.inra.urgi.faidare.elasticsearch.document;
 
 import com.google.common.collect.ImmutableList;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Document.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Document.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Document.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Document.java
index 31db10c34e902f3faadabeb3d66201765b60cdbd..df4af121fa9a0f84b8b90b6ec188f6f36b17bf23 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Document.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Document.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.document.annotation;
+package fr.inra.urgi.faidare.elasticsearch.document.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Id.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Id.java
similarity index 85%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Id.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Id.java
index 372717ac913073c1e1585257c34a44cb3268c73c..61586c06b49d2797f1fc8301447d2a6f4d7081e0 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Id.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Id.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.document.annotation;
+package fr.inra.urgi.faidare.elasticsearch.document.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Nested.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Nested.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Nested.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Nested.java
index 07d89c816948ad3e596144cfd7fcdf3c5f98fb9e..b0013750c9cd65251b84ce967bc9765d49f38a19 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/document/annotation/Nested.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/document/annotation/Nested.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.document.annotation;
+package fr.inra.urgi.faidare.elasticsearch.document.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/package-info.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/package-info.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/package-info.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/package-info.java
index b7f100bd652bf4d6098e4748632156421889dd52..5d1d1e807d6648d656bdad382492dba3197efadb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/package-info.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/package-info.java
@@ -14,4 +14,4 @@
  *
  * @author gcornut
  */
-package fr.inra.urgi.gpds.elasticsearch;
+package fr.inra.urgi.faidare.elasticsearch;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/query/ESQueryFactory.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/query/ESQueryFactory.java
similarity index 81%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/query/ESQueryFactory.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/query/ESQueryFactory.java
index 963fc94223cbb657fe4cbaf15c252c19e7336471..3b20638a3163b763b5c177970ccb2de290b8663b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/query/ESQueryFactory.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/query/ESQueryFactory.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.query;
+package fr.inra.urgi.faidare.elasticsearch.query;
 
 import org.elasticsearch.index.query.QueryBuilder;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/query/impl/ESGenericQueryFactory.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/query/impl/ESGenericQueryFactory.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/query/impl/ESGenericQueryFactory.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/query/impl/ESGenericQueryFactory.java
index 6d8b4a9ae6d103be7998d07ba918a633d03e3d3e..e6cbe313796803e7230f3167fbf5e73bd8db0225 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/query/impl/ESGenericQueryFactory.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/query/impl/ESGenericQueryFactory.java
@@ -1,15 +1,15 @@
-package fr.inra.urgi.gpds.elasticsearch.query.impl;
+package fr.inra.urgi.faidare.elasticsearch.query.impl;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
-import fr.inra.urgi.gpds.elasticsearch.criteria.AnnotatedCriteriaMapper;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMapping;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTree;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
-import fr.inra.urgi.gpds.elasticsearch.query.ESQueryFactory;
+import fr.inra.urgi.faidare.elasticsearch.criteria.AnnotatedCriteriaMapper;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTree;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.query.ESQueryFactory;
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.index.query.*;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESFindRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESFindRepository.java
similarity index 63%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESFindRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESFindRepository.java
index d7d6af0a40cf8f313075d933017cf6b21e7197e2..cf6ee6749314a1e98019d05824aae0b3d9026f05 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESFindRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESFindRepository.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.elasticsearch.repository;
+package fr.inra.urgi.faidare.elasticsearch.repository;
 
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
 
 /**
  * Interface representing an ElasticSearch repository providing a paginated
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESGetByIdRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESGetByIdRepository.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESGetByIdRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESGetByIdRepository.java
index 98d7da110fd4b59daae9992a190b4136dd6625ba..9b9a223edf254778ce691e776780dcf3511d7c72 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESGetByIdRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESGetByIdRepository.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.elasticsearch.repository;
+package fr.inra.urgi.faidare.elasticsearch.repository;
 
 /**
  * Interface representing an ElasticSearch repository providing a get document
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESSuggestRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESSuggestRepository.java
similarity index 75%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESSuggestRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESSuggestRepository.java
index 793277f6e466b39f0ca94694d383067e08d11510..fae7bb53a5226bfac8fafd9905852355a54a8707 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/ESSuggestRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/ESSuggestRepository.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.elasticsearch.repository;
+package fr.inra.urgi.faidare.elasticsearch.repository;
 
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
 
 import java.util.LinkedHashSet;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/BaseESRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/BaseESRepository.java
similarity index 69%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/BaseESRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/BaseESRepository.java
index f132d959299ba2ba8b5e13e1b006c142af38d29d..bce6728b9b4d902c29bb0fed2f5740fab06a2ff9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/BaseESRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/BaseESRepository.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.elasticsearch.repository.impl;
+package fr.inra.urgi.faidare.elasticsearch.repository.impl;
 
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESGetByIdRepository;
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESGetByIdRepository;
 import org.elasticsearch.client.RestHighLevelClient;
 
 /**
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericFindRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericFindRepository.java
similarity index 83%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericFindRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericFindRepository.java
index 67b2aae98d3d2a5c48c748fed87474ed80e3edd7..54e7b287e44db289e5a83771353fc4bca487741e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericFindRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericFindRepository.java
@@ -1,17 +1,17 @@
-package fr.inra.urgi.gpds.elasticsearch.repository.impl;
-
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
-import fr.inra.urgi.gpds.domain.criteria.base.SortCriteria;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.response.Pagination;
-import fr.inra.urgi.gpds.domain.response.PaginationImpl;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
-import fr.inra.urgi.gpds.elasticsearch.query.ESQueryFactory;
-import fr.inra.urgi.gpds.elasticsearch.query.impl.ESGenericQueryFactory;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
+package fr.inra.urgi.faidare.elasticsearch.repository.impl;
+
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.base.SortCriteria;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.response.Pagination;
+import fr.inra.urgi.faidare.domain.response.PaginationImpl;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.query.ESQueryFactory;
+import fr.inra.urgi.faidare.elasticsearch.query.impl.ESGenericQueryFactory;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericGetByIdRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericGetByIdRepository.java
similarity index 86%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericGetByIdRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericGetByIdRepository.java
index b2b08b9ed38c235d1924b54b66a637572d73944b..967fc51ff3403acf6eb6e19b895629be3b1ea021 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericGetByIdRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericGetByIdRepository.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.elasticsearch.repository.impl;
+package fr.inra.urgi.faidare.elasticsearch.repository.impl;
 
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESGetByIdRepository;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESGetByIdRepository;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericSuggestRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericSuggestRepository.java
similarity index 87%
rename from backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericSuggestRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericSuggestRepository.java
index 46b3278a9a36ec4f134b96bad71e44a1cf396438..b529a3908c70e630642f34fbee514ead6b9ae467 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/elasticsearch/repository/impl/ESGenericSuggestRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/repository/impl/ESGenericSuggestRepository.java
@@ -1,16 +1,16 @@
-package fr.inra.urgi.gpds.elasticsearch.repository.impl;
-
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.criteria.AnnotatedCriteriaMapper;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMapping;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
-import fr.inra.urgi.gpds.elasticsearch.query.ESQueryFactory;
-import fr.inra.urgi.gpds.elasticsearch.query.impl.ESGenericQueryFactory;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESSuggestRepository;
+package fr.inra.urgi.faidare.elasticsearch.repository.impl;
+
+import fr.inra.urgi.faidare.domain.criteria.base.PaginationCriteria;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.criteria.AnnotatedCriteriaMapper;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.query.ESQueryFactory;
+import fr.inra.urgi.faidare.elasticsearch.query.impl.ESGenericQueryFactory;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESSuggestRepository;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
 import org.elasticsearch.action.search.SearchRequest;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/filter/AngularRouteFilter.java b/backend/src/main/java/fr/inra/urgi/faidare/filter/AngularRouteFilter.java
similarity index 98%
rename from backend/src/main/java/fr/inra/urgi/gpds/filter/AngularRouteFilter.java
rename to backend/src/main/java/fr/inra/urgi/faidare/filter/AngularRouteFilter.java
index d307c542daba243ab2a806dbe16676d79ed0e17a..28f3a61083f2126b484c0247f3d27e69437b7ae9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/filter/AngularRouteFilter.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/filter/AngularRouteFilter.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.filter;
+package fr.inra.urgi.faidare.filter;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.ByteSource;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/filter/AuthenticationFilter.java b/backend/src/main/java/fr/inra/urgi/faidare/filter/AuthenticationFilter.java
similarity index 98%
rename from backend/src/main/java/fr/inra/urgi/gpds/filter/AuthenticationFilter.java
rename to backend/src/main/java/fr/inra/urgi/faidare/filter/AuthenticationFilter.java
index 9a6c62cbe143526ad77d75f3491a5e706b461c3d..30b384e7753a3d493ac480009e500ac7a34b3deb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/filter/AuthenticationFilter.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/filter/AuthenticationFilter.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.filter;
+package fr.inra.urgi.faidare.filter;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.BaseEncoding;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/filter/AuthenticationStore.java b/backend/src/main/java/fr/inra/urgi/faidare/filter/AuthenticationStore.java
similarity index 80%
rename from backend/src/main/java/fr/inra/urgi/gpds/filter/AuthenticationStore.java
rename to backend/src/main/java/fr/inra/urgi/faidare/filter/AuthenticationStore.java
index 4feecd775074503b77ea6e1c18464e3ceb51efa4..d2a08b081bf1814f761ff2f87ff6ff2da35bf7f3 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/filter/AuthenticationStore.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/filter/AuthenticationStore.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.filter;
+package fr.inra.urgi.faidare.filter;
 
-import fr.inra.urgi.gpds.repository.http.UserGroupsResourceClient;
+import fr.inra.urgi.faidare.repository.http.UserGroupsResourceClient;
 
 /**
  * Store user authentication (later use in {@link UserGroupsResourceClient})
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepository.java
similarity index 71%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepository.java
index de0f6ed015edf810874463d29167e401259dbcc2..6dd3738e219afa9cb7b5eabe2aca3a908ccf7efd 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepository.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.domain.datadiscovery.criteria.DataDiscoveryCriteria;
-import fr.inra.urgi.gpds.domain.datadiscovery.response.DataDiscoveryResponse;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESSuggestRepository;
+import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteria;
+import fr.inra.urgi.faidare.domain.datadiscovery.response.DataDiscoveryResponse;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESSuggestRepository;
 
 import java.util.LinkedHashSet;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryImpl.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryImpl.java
index e171ee28d4e5018f7818e7533186770cd7f9954a..87deea25d64f4319b61cb6553abbcc6c0725f0e1 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryImpl.java
@@ -1,25 +1,25 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.api.gnpis.v1.DataDiscoveryController;
-import fr.inra.urgi.gpds.domain.datadiscovery.criteria.DataDiscoveryCriteria;
-import fr.inra.urgi.gpds.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataDiscoveryDocument;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.FacetImpl;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.FacetTermImpl;
-import fr.inra.urgi.gpds.domain.datadiscovery.response.DataDiscoveryResponse;
-import fr.inra.urgi.gpds.domain.response.ApiResponseFactory;
-import fr.inra.urgi.gpds.domain.response.Pagination;
-import fr.inra.urgi.gpds.domain.response.PaginationImpl;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.criteria.AnnotatedCriteriaMapper;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMapping;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
-import fr.inra.urgi.gpds.elasticsearch.query.impl.ESGenericQueryFactory;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESSuggestRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.ESGenericFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.ESGenericSuggestRepository;
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.api.gnpis.v1.DataDiscoveryController;
+import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteria;
+import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataDiscoveryDocument;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.FacetImpl;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.FacetTermImpl;
+import fr.inra.urgi.faidare.domain.datadiscovery.response.DataDiscoveryResponse;
+import fr.inra.urgi.faidare.domain.response.ApiResponseFactory;
+import fr.inra.urgi.faidare.domain.response.Pagination;
+import fr.inra.urgi.faidare.domain.response.PaginationImpl;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.criteria.AnnotatedCriteriaMapper;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMapping;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.query.impl.ESGenericQueryFactory;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESSuggestRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.ESGenericFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.ESGenericSuggestRepository;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..9674bb34d6dd7df5ace8e5bcffaca22a8e02e495
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepository.java
@@ -0,0 +1,19 @@
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.domain.criteria.GermplasmAttributeCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmAttributeValueListVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+
+/**
+ * Breeding API germplasm attribute
+ *
+ * @author gcornut
+ */
+public interface GermplasmAttributeRepository
+    extends ESFindRepository<GermplasmAttributeCriteria, GermplasmAttributeValueListVO> {
+
+    @Override
+    PaginatedList<GermplasmAttributeValueListVO> find(GermplasmAttributeCriteria criteria);
+
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepositoryImpl.java
similarity index 64%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepositoryImpl.java
index af034811ba9f984fb200e8eb286ff71f048a4039..2fee54cd23b397abe7caae2e4d3377d5eef481bb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepositoryImpl.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.domain.criteria.GermplasmAttributeCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmAttributeValueListVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.ESGenericFindRepository;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmAttributeCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmAttributeValueListVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.ESGenericFindRepository;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmRepository.java
similarity index 63%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmRepository.java
index c1bf7b19ccf2ceef33fa3ab1df27d06672901057..d7652aab7bb15121499e67025a5d9b42d6f12906 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmRepository.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.domain.criteria.GermplasmSearchCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.PedigreeVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.ProgenyVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.PedigreeVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.ProgenyVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
 
 import java.util.Iterator;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmRepositoryImpl.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmRepositoryImpl.java
index 84108f48d1a4159f84bee3099453de921c5e693e..e89383e1706d94b7326085dc36e8aef075db6a62 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/GermplasmRepositoryImpl.java
@@ -1,19 +1,19 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmSearchCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.PedigreeVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.ProgenyVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.ESScrollIterator;
-import fr.inra.urgi.gpds.elasticsearch.query.impl.ESGenericQueryFactory;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESGetByIdRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.ESGenericFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.ESGenericGetByIdRepository;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.PedigreeVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.ProgenyVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.ESScrollIterator;
+import fr.inra.urgi.faidare.elasticsearch.query.impl.ESGenericQueryFactory;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESGetByIdRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.ESGenericFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.ESGenericGetByIdRepository;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/repository/es/LocationRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/LocationRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..707f51bcd649768f66fdcbf99b8fee51736b5395
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/LocationRepository.java
@@ -0,0 +1,24 @@
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.domain.criteria.LocationCriteria;
+import fr.inra.urgi.faidare.domain.data.LocationVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESGetByIdRepository;
+
+/**
+ * Breeding API location
+ *
+ * @author gcornut
+ */
+public interface LocationRepository
+    extends ESFindRepository<LocationCriteria, LocationVO>,
+    ESGetByIdRepository<LocationVO> {
+
+    @Override
+    LocationVO getById(String id);
+
+    @Override
+    PaginatedList<LocationVO> find(LocationCriteria criteria);
+
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/LocationRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/LocationRepositoryImpl.java
similarity index 62%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/LocationRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/LocationRepositoryImpl.java
index 5a66edee0ffd1feff59ad8de7dba6301b94f4c1c..af74a55c2e7f9cf7e788e3905186a2bef9a66182 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/LocationRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/LocationRepositoryImpl.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.domain.criteria.LocationCriteria;
-import fr.inra.urgi.gpds.domain.data.LocationVO;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.BaseESRepository;
+import fr.inra.urgi.faidare.domain.criteria.LocationCriteria;
+import fr.inra.urgi.faidare.domain.data.LocationVO;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.BaseESRepository;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..4595edfcc70542f547ef6310f164d13f5dd51f3b
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepository.java
@@ -0,0 +1,19 @@
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.domain.criteria.ObservationUnitCriteria;
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationUnitVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+
+/**
+ * Breeding API observation unit
+ *
+ * @author gcornut
+ */
+public interface ObservationUnitRepository
+    extends ESFindRepository<ObservationUnitCriteria, ObservationUnitVO> {
+
+    @Override
+    PaginatedList<ObservationUnitVO> find(ObservationUnitCriteria criteria);
+
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepositoryImpl.java
similarity index 62%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepositoryImpl.java
index 783baabfcc4c5f16094be814a674cf00f8a34478..90260aae3e60f87b6c2f5503ce1547b301227b88 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepositoryImpl.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.domain.criteria.ObservationUnitCriteria;
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationUnitVO;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.BaseESRepository;
+import fr.inra.urgi.faidare.domain.criteria.ObservationUnitCriteria;
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationUnitVO;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.BaseESRepository;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ProgramRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ProgramRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..093b014dcaffa26c68b8a3c77aed4bf526609f0f
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ProgramRepository.java
@@ -0,0 +1,24 @@
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.domain.criteria.ProgramCriteria;
+import fr.inra.urgi.faidare.domain.data.ProgramVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESGetByIdRepository;
+
+/**
+ * Breeding API programs
+ *
+ * @author gcornut
+ */
+public interface ProgramRepository
+    extends ESFindRepository<ProgramCriteria, ProgramVO>,
+    ESGetByIdRepository<ProgramVO> {
+
+    @Override
+    ProgramVO getById(String id);
+
+    @Override
+    PaginatedList<ProgramVO> find(ProgramCriteria criteria);
+
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ProgramRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ProgramRepositoryImpl.java
similarity index 61%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/ProgramRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/ProgramRepositoryImpl.java
index 95b30c2a7b24ccda072bc237de78e5543eed808e..aa7b91a5c036e8d720fee1665078b296bdbad9d5 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ProgramRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/ProgramRepositoryImpl.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.domain.criteria.ProgramCriteria;
-import fr.inra.urgi.gpds.domain.data.ProgramVO;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.BaseESRepository;
+import fr.inra.urgi.faidare.domain.criteria.ProgramCriteria;
+import fr.inra.urgi.faidare.domain.data.ProgramVO;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.BaseESRepository;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/StudyRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/StudyRepository.java
similarity index 52%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/StudyRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/StudyRepository.java
index 2434a21387de5b7edd4dfe6b15c629c94d1dd5bc..6ceeca9f655fea5b94548d3c32941906c976d625 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/StudyRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/StudyRepository.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.domain.criteria.StudyCriteria;
-import fr.inra.urgi.gpds.domain.data.study.StudyDetailVO;
-import fr.inra.urgi.gpds.domain.data.study.StudySummaryVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESGetByIdRepository;
+import fr.inra.urgi.faidare.domain.criteria.StudyCriteria;
+import fr.inra.urgi.faidare.domain.data.study.StudyDetailVO;
+import fr.inra.urgi.faidare.domain.data.study.StudySummaryVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESGetByIdRepository;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/StudyRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/StudyRepositoryImpl.java
similarity index 80%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/StudyRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/StudyRepositoryImpl.java
index 301960e6a4fdc1ef04dc984c5769be06d15b1c3c..d9410a871cb1c7c0f9ab3966594b523fe6d29b3b 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/StudyRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/StudyRepositoryImpl.java
@@ -1,20 +1,20 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiLocation;
-import fr.inra.urgi.gpds.domain.criteria.StudyCriteria;
-import fr.inra.urgi.gpds.domain.data.LocationVO;
-import fr.inra.urgi.gpds.domain.data.study.StudyDetailVO;
-import fr.inra.urgi.gpds.domain.data.study.StudySummaryVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentMetadata;
-import fr.inra.urgi.gpds.elasticsearch.query.impl.ESGenericQueryFactory;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESGetByIdRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.ESGenericFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.ESGenericGetByIdRepository;
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiLocation;
+import fr.inra.urgi.faidare.domain.criteria.StudyCriteria;
+import fr.inra.urgi.faidare.domain.data.LocationVO;
+import fr.inra.urgi.faidare.domain.data.study.StudyDetailVO;
+import fr.inra.urgi.faidare.domain.data.study.StudySummaryVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentMetadata;
+import fr.inra.urgi.faidare.elasticsearch.query.impl.ESGenericQueryFactory;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESGetByIdRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.ESGenericFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.ESGenericGetByIdRepository;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/repository/es/TrialRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/TrialRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..77b91b6cfb6cf21b234ab7a5448b3c1e2e6ccca7
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/TrialRepository.java
@@ -0,0 +1,24 @@
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.domain.criteria.TrialCriteria;
+import fr.inra.urgi.faidare.domain.data.TrialVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESGetByIdRepository;
+
+/**
+ * Breeding API trial
+ *
+ * @author gcornut
+ */
+public interface TrialRepository
+    extends ESFindRepository<TrialCriteria, TrialVO>,
+    ESGetByIdRepository<TrialVO> {
+
+    @Override
+    TrialVO getById(String id);
+
+    @Override
+    PaginatedList<TrialVO> find(TrialCriteria criteria);
+
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/TrialRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/TrialRepositoryImpl.java
similarity index 61%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/TrialRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/TrialRepositoryImpl.java
index d0fd507fa8be82f00cabf5be5753c9cd117e128c..fc0ecd21b6fea54c6f82c7a6f6b3446ed8a9a21d 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/TrialRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/TrialRepositoryImpl.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.domain.criteria.TrialCriteria;
-import fr.inra.urgi.gpds.domain.data.TrialVO;
-import fr.inra.urgi.gpds.elasticsearch.ESRequestFactory;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.repository.impl.BaseESRepository;
+import fr.inra.urgi.faidare.domain.criteria.TrialCriteria;
+import fr.inra.urgi.faidare.domain.data.TrialVO;
+import fr.inra.urgi.faidare.elasticsearch.ESRequestFactory;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.repository.impl.BaseESRepository;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..d5a1d0f605672b3e341e1171dc8c6302099adfa7
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepository.java
@@ -0,0 +1,11 @@
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentSearchCriteria;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentVO;
+import fr.inra.urgi.faidare.elasticsearch.repository.ESFindRepository;
+
+public interface XRefDocumentRepository extends ESFindRepository<XRefDocumentSearchCriteria, XRefDocumentVO> {
+    @Override
+    PaginatedList<XRefDocumentVO> find(XRefDocumentSearchCriteria criteria);
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepositoryImpl.java
similarity index 82%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepositoryImpl.java
index 72eddc190a12e7804573a6f3a1992605a17ce055..7406617ac841ec92aef091a567d8c1e88073fdcb 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepositoryImpl.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.config.GPDSProperties;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.response.Pagination;
-import fr.inra.urgi.gpds.domain.response.PaginationImpl;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentSearchCriteria;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentVO;
-import fr.inra.urgi.gpds.elasticsearch.ESResponseParser;
-import fr.inra.urgi.gpds.elasticsearch.query.impl.ESGenericQueryFactory;
-import fr.inra.urgi.gpds.repository.http.UserGroupsResourceClient;
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.config.FaidareProperties;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.response.Pagination;
+import fr.inra.urgi.faidare.domain.response.PaginationImpl;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentSearchCriteria;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentVO;
+import fr.inra.urgi.faidare.elasticsearch.ESResponseParser;
+import fr.inra.urgi.faidare.elasticsearch.query.impl.ESGenericQueryFactory;
+import fr.inra.urgi.faidare.repository.http.UserGroupsResourceClient;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -31,7 +31,7 @@ public class XRefDocumentRepositoryImpl implements XRefDocumentRepository {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(XRefDocumentRepositoryImpl.class);
 
-    private final GPDSProperties properties;
+    private final FaidareProperties properties;
     private final RestHighLevelClient client;
     private final ESResponseParser parser;
     private final UserGroupsResourceClient userGroupsResourceClient;
@@ -39,7 +39,7 @@ public class XRefDocumentRepositoryImpl implements XRefDocumentRepository {
 
     @Autowired
     public XRefDocumentRepositoryImpl(
-        GPDSProperties properties,
+        FaidareProperties properties,
         RestHighLevelClient client,
         ESResponseParser parser,
         UserGroupsResourceClient userGroupsResourceClient
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/file/CropOntologyRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/file/CropOntologyRepository.java
similarity index 79%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/file/CropOntologyRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/file/CropOntologyRepository.java
index 322c5beb56999ec993d3666076dc3e98703f1ed3..dd2514321070a863d41b3b919544926138f9d13e 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/file/CropOntologyRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/file/CropOntologyRepository.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.repository.file;
+package fr.inra.urgi.faidare.repository.file;
 
-import fr.inra.urgi.gpds.domain.data.variable.ObservationVariableVO;
-import fr.inra.urgi.gpds.domain.data.variable.OntologyVO;
+import fr.inra.urgi.faidare.domain.data.variable.ObservationVariableVO;
+import fr.inra.urgi.faidare.domain.data.variable.OntologyVO;
 
 import java.util.List;
 import java.util.Set;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/file/CropOntologyRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/file/CropOntologyRepositoryImpl.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/file/CropOntologyRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/file/CropOntologyRepositoryImpl.java
index fb0be144c912a63bcf8199758d5a0c59f3358a2b..c7175db985ec8820f7d913a29187f2b064be477f 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/file/CropOntologyRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/file/CropOntologyRepositoryImpl.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.repository.file;
+package fr.inra.urgi.faidare.repository.file;
 
 import com.google.common.base.Strings;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.Lists;
-import fr.inra.urgi.gpds.config.GPDSProperties;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiTrait;
-import fr.inra.urgi.gpds.domain.data.variable.ObservationVariableVO;
-import fr.inra.urgi.gpds.domain.data.variable.OntologyVO;
+import fr.inra.urgi.faidare.config.FaidareProperties;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiTrait;
+import fr.inra.urgi.faidare.domain.data.variable.ObservationVariableVO;
+import fr.inra.urgi.faidare.domain.data.variable.OntologyVO;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Repository;
 import org.springframework.web.client.RestTemplate;
@@ -36,14 +36,14 @@ public class CropOntologyRepositoryImpl implements CropOntologyRepository {
     private static final Integer CACHE_EXPIRATION_TIME = 1;
     private static final TimeUnit CACHE_EXPIRATION_TIME_UNIT = TimeUnit.HOURS;
 
-    private final GPDSProperties properties;
+    private final FaidareProperties properties;
     private final RestTemplate client;
 
     private final LoadingCache<String, OntologyVO[]> ontologyCache;
     private final LoadingCache<String, ObservationVariableVO[]> variablesByOntology;
 
     public CropOntologyRepositoryImpl(
-        GPDSProperties properties,
+        FaidareProperties properties,
         RestTemplate client
     ) {
         this.client = client;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/file/DataSourceRepository.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/file/DataSourceRepository.java
similarity index 61%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/file/DataSourceRepository.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/file/DataSourceRepository.java
index a837b724d57717fecb4b8e53d9e8da8a400d72f0..7836ede485c1e5ab21d49cddce30b63b03556b1f 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/file/DataSourceRepository.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/file/DataSourceRepository.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.repository.file;
+package fr.inra.urgi.faidare.repository.file;
 
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataSource;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataSource;
 
 import java.util.Collection;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/file/DataSourceRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/file/DataSourceRepositoryImpl.java
similarity index 92%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/file/DataSourceRepositoryImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/file/DataSourceRepositoryImpl.java
index ea51690759275edb87ab330548644412f7aec0a9..28944c5cd1ef1456c627c281189a1c155b8994de 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/file/DataSourceRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/file/DataSourceRepositoryImpl.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.repository.file;
+package fr.inra.urgi.faidare.repository.file;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataSource;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataSourceImpl;
-import fr.inra.urgi.gpds.domain.jsonld.data.HasGraph;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataSource;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataSourceImpl;
+import fr.inra.urgi.faidare.domain.jsonld.data.HasGraph;
 import org.apache.tomcat.util.codec.binary.Base64;
 import org.springframework.stereotype.Repository;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/http/UserGroupsResourceClient.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/http/UserGroupsResourceClient.java
similarity index 91%
rename from backend/src/main/java/fr/inra/urgi/gpds/repository/http/UserGroupsResourceClient.java
rename to backend/src/main/java/fr/inra/urgi/faidare/repository/http/UserGroupsResourceClient.java
index 45a981d05d46434b13e87fa444beda179321109d..0cc2dd7481f4d69976563446da2e70b7454793f9 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/http/UserGroupsResourceClient.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/http/UserGroupsResourceClient.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.repository.http;
+package fr.inra.urgi.faidare.repository.http;
 
 import com.google.common.base.Strings;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import fr.inra.urgi.gpds.config.GPDSProperties;
-import fr.inra.urgi.gpds.filter.AuthenticationStore;
+import fr.inra.urgi.faidare.config.FaidareProperties;
+import fr.inra.urgi.faidare.filter.AuthenticationStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,12 +36,12 @@ public class UserGroupsResourceClient {
 
     private static final List<Integer> PUBLIC_GROUPS = Collections.singletonList(0);
 
-    private final GPDSProperties properties;
+    private final FaidareProperties properties;
     private final RestTemplate client;
 
     @Autowired
     public UserGroupsResourceClient(
-        GPDSProperties properties,
+        FaidareProperties properties,
         RestTemplate client
     ) {
         this.client = client;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmService.java b/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmService.java
new file mode 100644
index 0000000000000000000000000000000000000000..97ac680e49c3b6f0f4aa53025fc045e393b88de2
--- /dev/null
+++ b/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmService.java
@@ -0,0 +1,24 @@
+package fr.inra.urgi.faidare.service.es;
+
+import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.PedigreeVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.ProgenyVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+
+import java.io.File;
+
+
+public interface GermplasmService {
+
+    GermplasmVO getById(String germplasmDbId);
+
+    PaginatedList<GermplasmVO> find(GermplasmSearchCriteria criteria);
+
+    File exportCSV(GermplasmSearchCriteria criteria);
+
+    PedigreeVO getPedigree(String germplasmDbId);
+
+    ProgenyVO getProgeny(String germplasmDbId);
+
+}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/service/es/GermplasmServiceImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmServiceImpl.java
similarity index 84%
rename from backend/src/main/java/fr/inra/urgi/gpds/service/es/GermplasmServiceImpl.java
rename to backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmServiceImpl.java
index d48999a901b3a8768b3509e96e91b3a5079c1476..2c851d636da5bff0c04491bf2e02bb61efc84e6a 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/service/es/GermplasmServiceImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmServiceImpl.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.service.es;
+package fr.inra.urgi.faidare.service.es;
 
 import com.opencsv.CSVWriter;
-import fr.inra.urgi.gpds.api.gnpis.v1.GnpISGermplasmController;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmSearchCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.PedigreeVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.ProgenyVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.GermplasmRepository;
+import fr.inra.urgi.faidare.api.gnpis.v1.GnpISGermplasmController;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.PedigreeVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.ProgenyVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.GermplasmRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/utils/StringFunctions.java b/backend/src/main/java/fr/inra/urgi/faidare/utils/StringFunctions.java
similarity index 92%
rename from backend/src/main/java/fr/inra/urgi/gpds/utils/StringFunctions.java
rename to backend/src/main/java/fr/inra/urgi/faidare/utils/StringFunctions.java
index 6ade272f5be5f63563bb184bb499952b6abf3082..bbe36507429ea6d856ec758751c2dba41f4bdf91 100644
--- a/backend/src/main/java/fr/inra/urgi/gpds/utils/StringFunctions.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/utils/StringFunctions.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.utils;
+package fr.inra.urgi.faidare.utils;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudyCriteria.java b/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudyCriteria.java
deleted file mode 100644
index 02aaf47ff3aae8b4e0d0237a088bd5ffaaf01bb2..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/StudyCriteria.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package fr.inra.urgi.gpds.domain.criteria;
-
-import fr.inra.urgi.gpds.domain.criteria.base.PaginationCriteria;
-
-/**
- * @author gcornut
- */
-public interface StudyCriteria extends PaginationCriteria {
-}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/SortCriteria.java b/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/SortCriteria.java
deleted file mode 100644
index c6a97dcdb8a8d0517cda754db7d04f0898b3be77..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/domain/criteria/base/SortCriteria.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package fr.inra.urgi.gpds.domain.criteria.base;
-
-import fr.inra.urgi.gpds.domain.brapi.v1.criteria.BrapiSortCriteria;
-
-/**
- * @author gcornut
- */
-public interface SortCriteria extends BrapiSortCriteria {
-}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepository.java b/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepository.java
deleted file mode 100644
index 321ea6fd61d3fd24d81e3570b090df499be27376..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepository.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.domain.criteria.GermplasmAttributeCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmAttributeValueListVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-
-/**
- * Breeding API germplasm attribute
- *
- * @author gcornut
- */
-public interface GermplasmAttributeRepository
-    extends ESFindRepository<GermplasmAttributeCriteria, GermplasmAttributeValueListVO> {
-
-    @Override
-    PaginatedList<GermplasmAttributeValueListVO> find(GermplasmAttributeCriteria criteria);
-
-}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/LocationRepository.java b/backend/src/main/java/fr/inra/urgi/gpds/repository/es/LocationRepository.java
deleted file mode 100644
index c1fb482e06667b3e57653cc87635ac794817c581..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/LocationRepository.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.domain.criteria.LocationCriteria;
-import fr.inra.urgi.gpds.domain.data.LocationVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESGetByIdRepository;
-
-/**
- * Breeding API location
- *
- * @author gcornut
- */
-public interface LocationRepository
-    extends ESFindRepository<LocationCriteria, LocationVO>,
-    ESGetByIdRepository<LocationVO> {
-
-    @Override
-    LocationVO getById(String id);
-
-    @Override
-    PaginatedList<LocationVO> find(LocationCriteria criteria);
-
-}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepository.java b/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepository.java
deleted file mode 100644
index 156e65d0843ae06405f2447d515a40362605132e..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepository.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.domain.criteria.ObservationUnitCriteria;
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationUnitVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-
-/**
- * Breeding API observation unit
- *
- * @author gcornut
- */
-public interface ObservationUnitRepository
-    extends ESFindRepository<ObservationUnitCriteria, ObservationUnitVO> {
-
-    @Override
-    PaginatedList<ObservationUnitVO> find(ObservationUnitCriteria criteria);
-
-}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ProgramRepository.java b/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ProgramRepository.java
deleted file mode 100644
index 6a65cee93d3cc563a4feab3577b3f7b0390c1410..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/ProgramRepository.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.domain.criteria.ProgramCriteria;
-import fr.inra.urgi.gpds.domain.data.ProgramVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESGetByIdRepository;
-
-/**
- * Breeding API programs
- *
- * @author gcornut
- */
-public interface ProgramRepository
-    extends ESFindRepository<ProgramCriteria, ProgramVO>,
-    ESGetByIdRepository<ProgramVO> {
-
-    @Override
-    ProgramVO getById(String id);
-
-    @Override
-    PaginatedList<ProgramVO> find(ProgramCriteria criteria);
-
-}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/TrialRepository.java b/backend/src/main/java/fr/inra/urgi/gpds/repository/es/TrialRepository.java
deleted file mode 100644
index 87cc11a3bc364e0088eef92c55f274e89ec7e3d3..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/TrialRepository.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.domain.criteria.TrialCriteria;
-import fr.inra.urgi.gpds.domain.data.TrialVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESGetByIdRepository;
-
-/**
- * Breeding API trial
- *
- * @author gcornut
- */
-public interface TrialRepository
-    extends ESFindRepository<TrialCriteria, TrialVO>,
-    ESGetByIdRepository<TrialVO> {
-
-    @Override
-    TrialVO getById(String id);
-
-    @Override
-    PaginatedList<TrialVO> find(TrialCriteria criteria);
-
-}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepository.java b/backend/src/main/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepository.java
deleted file mode 100644
index 727972913baeeb6d4924fecf9fbc8b88c7ce5dc6..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentSearchCriteria;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentVO;
-import fr.inra.urgi.gpds.elasticsearch.repository.ESFindRepository;
-
-public interface XRefDocumentRepository extends ESFindRepository<XRefDocumentSearchCriteria, XRefDocumentVO> {
-    @Override
-    PaginatedList<XRefDocumentVO> find(XRefDocumentSearchCriteria criteria);
-}
diff --git a/backend/src/main/java/fr/inra/urgi/gpds/service/es/GermplasmService.java b/backend/src/main/java/fr/inra/urgi/gpds/service/es/GermplasmService.java
deleted file mode 100644
index dc79a190d895bebbd1007560752c622988747753..0000000000000000000000000000000000000000
--- a/backend/src/main/java/fr/inra/urgi/gpds/service/es/GermplasmService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package fr.inra.urgi.gpds.service.es;
-
-import fr.inra.urgi.gpds.domain.criteria.GermplasmSearchCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.PedigreeVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.ProgenyVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-
-import java.io.File;
-
-
-public interface GermplasmService {
-
-    GermplasmVO getById(String germplasmDbId);
-
-    PaginatedList<GermplasmVO> find(GermplasmSearchCriteria criteria);
-
-    File exportCSV(GermplasmSearchCriteria criteria);
-
-    PedigreeVO getPedigree(String germplasmDbId);
-
-    ProgenyVO getProgeny(String germplasmDbId);
-
-}
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 72884e5f8dcdc90cd8520ba2071eeeab1762dec3..b8d467fdbcee5aa21c11e6734d428951f45ad81d 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -19,7 +19,7 @@ logging.level:
     web.client.RestTemplate: DEBUG
   fr.inra: DEBUG
 
-gpds:
+faidare:
   elasticsearch-alias-template:
     gnpis_{source}_{documentType}_5432_krusty-group{groupId}
 
@@ -43,5 +43,5 @@ server:
       - text/css
   port: 8380
   servlet:
-    context-path: /gpds-dev
+    context-path: /faidare-dev
 
diff --git a/backend/src/main/resources/bootstrap.yml b/backend/src/main/resources/bootstrap.yml
index 9e6ab0a5d38911eba268a9612fbeeaa3f4386135..c2bfdecd7d438b2c41be0663e17d758f487eaa0a 100644
--- a/backend/src/main/resources/bootstrap.yml
+++ b/backend/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 spring:
-  application.name: gpds
+  application.name: faidare
   cloud:
     config:
       uri: ${SPRING_CONFIG_URI:http://localhost:8888}
diff --git a/backend/src/main/resources/fr/inra/urgi/gpds/repository/file/datasources.jsonld b/backend/src/main/resources/fr/inra/urgi/faidare/repository/file/datasources.jsonld
similarity index 100%
rename from backend/src/main/resources/fr/inra/urgi/gpds/repository/file/datasources.jsonld
rename to backend/src/main/resources/fr/inra/urgi/faidare/repository/file/datasources.jsonld
diff --git a/backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/CIRAD.jpg b/backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/CIRAD.jpg
similarity index 100%
rename from backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/CIRAD.jpg
rename to backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/CIRAD.jpg
diff --git a/backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/EU-SOL_40h.png b/backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/EU-SOL_40h.png
similarity index 100%
rename from backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/EU-SOL_40h.png
rename to backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/EU-SOL_40h.png
diff --git a/backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/GnpIS.png b/backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/GnpIS.png
similarity index 100%
rename from backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/GnpIS.png
rename to backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/GnpIS.png
diff --git a/backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/NIB_40h.png b/backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/NIB_40h.png
similarity index 100%
rename from backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/NIB_40h.png
rename to backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/NIB_40h.png
diff --git a/backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/VIB_40h.png b/backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/VIB_40h.png
similarity index 100%
rename from backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/VIB_40h.png
rename to backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/VIB_40h.png
diff --git a/backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/biodata_40h.png b/backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/biodata_40h.png
similarity index 100%
rename from backend/src/main/resources/fr/inra/urgi/gpds/repository/file/logos/biodata_40h.png
rename to backend/src/main/resources/fr/inra/urgi/faidare/repository/file/logos/biodata_40h.png
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/ApplicationTest.java b/backend/src/test/java/fr/inra/urgi/faidare/ApplicationTest.java
similarity index 94%
rename from backend/src/test/java/fr/inra/urgi/gpds/ApplicationTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/ApplicationTest.java
index 6dd56395464d54328db360a9fce729625e8154a9..e1fbec0d8c8eb100cc7cd2e51056c64d834ad6dc 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/ApplicationTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/ApplicationTest.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds;
+package fr.inra.urgi.faidare;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiExceptionHandlerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiExceptionHandlerTest.java
similarity index 96%
rename from backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiExceptionHandlerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiExceptionHandlerTest.java
index ea5eba02bebe34e47ac30b147369c39dd29c00cd..5df9774e0152797ccb6373d204b7ce81e7ff5433 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/BrapiExceptionHandlerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/BrapiExceptionHandlerTest.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.repository.es.GermplasmAttributeRepository;
-import fr.inra.urgi.gpds.service.es.GermplasmService;
+import fr.inra.urgi.faidare.repository.es.GermplasmAttributeRepository;
+import fr.inra.urgi.faidare.service.es.GermplasmService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/CallsControllerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/CallsControllerTest.java
similarity index 99%
rename from backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/CallsControllerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/CallsControllerTest.java
index 9f7f1fc91ecd63b593afdc8cc6de530916242c65..9c709952eb71e69dc1965a6bd902dfb131c66417 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/CallsControllerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/CallsControllerTest.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/GermplasmControllerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/GermplasmControllerTest.java
similarity index 92%
rename from backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/GermplasmControllerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/GermplasmControllerTest.java
index a9db63472f5548805852e8a3b673b8cc7429d160..12fd243970bf52a90c9e0c9610b3280ffb5c8d1f 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/GermplasmControllerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/GermplasmControllerTest.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
-
-import fr.inra.urgi.gpds.domain.data.germplasm.CollPopVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.DonorVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.ProgenyVO;
-import fr.inra.urgi.gpds.repository.es.GermplasmAttributeRepository;
-import fr.inra.urgi.gpds.service.es.GermplasmService;
+package fr.inra.urgi.faidare.api.brapi.v1;
+
+import fr.inra.urgi.faidare.domain.data.germplasm.CollPopVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.DonorVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.ProgenyVO;
+import fr.inra.urgi.faidare.repository.es.GermplasmAttributeRepository;
+import fr.inra.urgi.faidare.service.es.GermplasmService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/LocationControllerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/LocationControllerTest.java
similarity index 95%
rename from backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/LocationControllerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/LocationControllerTest.java
index b35ebba399e76764fd35a489f0192910a841358d..256292d8c8d1d63b959b0b7c36fb8f838d739a3f 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/LocationControllerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/LocationControllerTest.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.domain.data.LocationVO;
-import fr.inra.urgi.gpds.repository.es.LocationRepository;
+import fr.inra.urgi.faidare.domain.data.LocationVO;
+import fr.inra.urgi.faidare.repository.es.LocationRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/ObservationVariableControllerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/ObservationVariableControllerTest.java
similarity index 94%
rename from backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/ObservationVariableControllerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/ObservationVariableControllerTest.java
index e2b6bab1b9bef4ed79d7bcfcdf16c028777da9db..bec00d617cb13a836d8a097e401300acf19f6f9c 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/ObservationVariableControllerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/ObservationVariableControllerTest.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.domain.data.variable.ObservationVariableVO;
-import fr.inra.urgi.gpds.repository.file.CropOntologyRepository;
+import fr.inra.urgi.faidare.domain.data.variable.ObservationVariableVO;
+import fr.inra.urgi.faidare.repository.file.CropOntologyRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/ProgramControllerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/ProgramControllerTest.java
similarity index 95%
rename from backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/ProgramControllerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/ProgramControllerTest.java
index 4042d1e7a9e001b9d6ccabe05e1054bd2ae25d5d..e609dc275e07f37db3a8748a3744a5f1f5b2924a 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/ProgramControllerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/ProgramControllerTest.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
+package fr.inra.urgi.faidare.api.brapi.v1;
 
-import fr.inra.urgi.gpds.domain.data.ProgramVO;
-import fr.inra.urgi.gpds.repository.es.ProgramRepository;
+import fr.inra.urgi.faidare.domain.data.ProgramVO;
+import fr.inra.urgi.faidare.repository.es.ProgramRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/StudyControllerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/StudyControllerTest.java
similarity index 87%
rename from backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/StudyControllerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/StudyControllerTest.java
index de2d6066455824295b1ca3f0e912c1cecb378a54..d6acb3df6e4a86f8ddff5c1bafdd840c262c6764 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/api/brapi/v1/StudyControllerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/brapi/v1/StudyControllerTest.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.api.brapi.v1;
-
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationUnitVO;
-import fr.inra.urgi.gpds.domain.data.study.StudyDetailVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.response.Pagination;
-import fr.inra.urgi.gpds.domain.response.PaginationImpl;
-import fr.inra.urgi.gpds.repository.es.GermplasmRepository;
-import fr.inra.urgi.gpds.repository.es.ObservationUnitRepository;
-import fr.inra.urgi.gpds.repository.es.StudyRepository;
-import fr.inra.urgi.gpds.repository.file.CropOntologyRepository;
+package fr.inra.urgi.faidare.api.brapi.v1;
+
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationUnitVO;
+import fr.inra.urgi.faidare.domain.data.study.StudyDetailVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.response.Pagination;
+import fr.inra.urgi.faidare.domain.response.PaginationImpl;
+import fr.inra.urgi.faidare.repository.es.GermplasmRepository;
+import fr.inra.urgi.faidare.repository.es.ObservationUnitRepository;
+import fr.inra.urgi.faidare.repository.es.StudyRepository;
+import fr.inra.urgi.faidare.repository.file.CropOntologyRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISGermplasmControllerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmControllerTest.java
similarity index 91%
rename from backend/src/test/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISGermplasmControllerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmControllerTest.java
index a446c818dd4c0ddbf0aab46772cf99a611ad31ee..521f6af3273b56dfb0d6fa1ef0c4efb0bfd41e68 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/api/gnpis/v1/GnpISGermplasmControllerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmControllerTest.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.api.gnpis.v1;
-
-import fr.inra.urgi.gpds.domain.criteria.GermplasmGETSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmSearchCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.CollPopVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.DonorVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.service.es.GermplasmService;
+package fr.inra.urgi.faidare.api.gnpis.v1;
+
+import fr.inra.urgi.faidare.domain.criteria.GermplasmGETSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.CollPopVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.DonorVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.service.es.GermplasmService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/domain/brapi/v1/BrapiMappingTest.java b/backend/src/test/java/fr/inra/urgi/faidare/domain/brapi/v1/BrapiMappingTest.java
similarity index 90%
rename from backend/src/test/java/fr/inra/urgi/gpds/domain/brapi/v1/BrapiMappingTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/domain/brapi/v1/BrapiMappingTest.java
index 2b2424ce68a89669d8f4aa6113b944caf3de0c2d..454a3bf75162dcfd43000da6efdef77e8aad2672 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/domain/brapi/v1/BrapiMappingTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/domain/brapi/v1/BrapiMappingTest.java
@@ -1,21 +1,21 @@
-package fr.inra.urgi.gpds.domain.brapi.v1;
+package fr.inra.urgi.faidare.domain.brapi.v1;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiAdditionalInfo;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiTrial;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiTrialStudy;
-import fr.inra.urgi.gpds.domain.criteria.ProgramCriteria;
-import fr.inra.urgi.gpds.domain.data.ProgramVO;
-import fr.inra.urgi.gpds.domain.data.TrialDatasetAuthorshipVO;
-import fr.inra.urgi.gpds.domain.data.TrialStudySummaryVO;
-import fr.inra.urgi.gpds.domain.data.TrialVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationUnitVO;
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationUnitXRefVO;
-import fr.inra.urgi.gpds.domain.data.variable.OntologyVO;
-import fr.inra.urgi.gpds.elasticsearch.query.impl.ESGenericQueryFactoryTest;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiAdditionalInfo;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiTrial;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiTrialStudy;
+import fr.inra.urgi.faidare.domain.criteria.ProgramCriteria;
+import fr.inra.urgi.faidare.domain.data.ProgramVO;
+import fr.inra.urgi.faidare.domain.data.TrialDatasetAuthorshipVO;
+import fr.inra.urgi.faidare.domain.data.TrialStudySummaryVO;
+import fr.inra.urgi.faidare.domain.data.TrialVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationUnitVO;
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationUnitXRefVO;
+import fr.inra.urgi.faidare.domain.data.variable.OntologyVO;
+import fr.inra.urgi.faidare.elasticsearch.query.impl.ESGenericQueryFactoryTest;
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationValidatorTest.java b/backend/src/test/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationValidatorTest.java
similarity index 98%
rename from backend/src/test/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationValidatorTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationValidatorTest.java
index a700394985b67a156dc8ac63a1d809a31c82504c..368e64ce6fecc837d9d6b0e53d3a408736dee789 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/domain/criteria/base/PaginationValidatorTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/domain/criteria/base/PaginationValidatorTest.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.gpds.domain.criteria.base;
+package fr.inra.urgi.faidare.domain.criteria.base;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/domain/response/ApiResponseTest.java b/backend/src/test/java/fr/inra/urgi/faidare/domain/response/ApiResponseTest.java
similarity index 94%
rename from backend/src/test/java/fr/inra/urgi/gpds/domain/response/ApiResponseTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/domain/response/ApiResponseTest.java
index ce91e520a3d69227aa4388713a45f043d2386828..be5a654b340bf44ea57ede0fb5b610bb524d4c4f 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/domain/response/ApiResponseTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/domain/response/ApiResponseTest.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.domain.response;
+package fr.inra.urgi.faidare.domain.response;
 
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.inra.urgi.gpds.api.brapi.v1.exception.BrapiPaginationException;
-import fr.inra.urgi.gpds.domain.JSONView;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiListResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiResponse;
-import fr.inra.urgi.gpds.domain.brapi.v1.response.BrapiStatus;
-import fr.inra.urgi.gpds.elasticsearch.query.impl.ESGenericQueryFactoryTest;
+import fr.inra.urgi.faidare.api.brapi.v1.exception.BrapiPaginationException;
+import fr.inra.urgi.faidare.domain.JSONView;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiResponse;
+import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiStatus;
+import fr.inra.urgi.faidare.elasticsearch.query.impl.ESGenericQueryFactoryTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/ESRequestFactoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactoryTest.java
similarity index 93%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/ESRequestFactoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactoryTest.java
index 942c470ee7fa014bfde9ced7735fd0f128c5696c..d7399f732cf054257135f5ac56156b29749656b0 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/ESRequestFactoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactoryTest.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.elasticsearch;
+package fr.inra.urgi.faidare.elasticsearch;
 
 import com.fasterxml.jackson.databind.util.ArrayIterator;
-import fr.inra.urgi.gpds.config.GPDSProperties;
-import fr.inra.urgi.gpds.repository.http.UserGroupsResourceClient;
+import fr.inra.urgi.faidare.config.FaidareProperties;
+import fr.inra.urgi.faidare.repository.http.UserGroupsResourceClient;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -26,7 +26,7 @@ class ESRequestFactoryTest {
     ESRequestFactory requestFactory;
 
     @Mock
-    GPDSProperties properties;
+    FaidareProperties properties;
 
     @Mock
     UserGroupsResourceClient userGroupsResourceClient;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/ESResponseParserTest.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/ESResponseParserTest.java
similarity index 98%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/ESResponseParserTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/ESResponseParserTest.java
index cf5b0edf862e80e49c85355a6c4eddc58f1146a2..ad44814021f823ad695e53feacf2a586860d9041 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/ESResponseParserTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/ESResponseParserTest.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.elasticsearch;
+package fr.inra.urgi.faidare.elasticsearch;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.inra.urgi.gpds.elasticsearch.fixture.DocumentObject;
+import fr.inra.urgi.faidare.elasticsearch.fixture.DocumentObject;
 import org.assertj.core.util.Lists;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.bytes.BytesReference;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/AnnotatedCriteriaMapperTest.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/AnnotatedCriteriaMapperTest.java
similarity index 91%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/AnnotatedCriteriaMapperTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/AnnotatedCriteriaMapperTest.java
index 7fdce6f23df24e55180bb79701a5a2c8f5a32651..6b12495222ac45fc7a418d53831b2c391ba636fb 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/AnnotatedCriteriaMapperTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/AnnotatedCriteriaMapperTest.java
@@ -1,14 +1,14 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria;
+package fr.inra.urgi.faidare.elasticsearch.criteria;
 
 import com.google.common.collect.ImmutableList;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.NoDocumentMapping;
-import fr.inra.urgi.gpds.elasticsearch.criteria.fixture.*;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMapping;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTree;
-import fr.inra.urgi.gpds.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.NoDocumentMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.fixture.*;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMapping;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingCriterion;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTree;
+import fr.inra.urgi.faidare.elasticsearch.criteria.mapping.CriteriaMappingTreeNode;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.junit.jupiter.api.Assertions;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/ComplexAnnotatedCriteria.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/ComplexAnnotatedCriteria.java
similarity index 82%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/ComplexAnnotatedCriteria.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/ComplexAnnotatedCriteria.java
index c9303c5ade09d7964b0041962730a9f32f8a1ad9..2f7e18d4eb075904bd07f93bb75c5f42b7d35d8b 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/ComplexAnnotatedCriteria.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/ComplexAnnotatedCriteria.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.fixture;
+package fr.inra.urgi.faidare.elasticsearch.criteria.fixture;
 
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.QueryType;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.QueryType;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 
 import java.util.List;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/DocumentObject.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/DocumentObject.java
similarity index 86%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/DocumentObject.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/DocumentObject.java
index 1e2964851d61b75dded24c8a4936c728a94c5b66..5e92b1373aea747a950b58b55f3aada464d36ff1 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/DocumentObject.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/DocumentObject.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.fixture;
+package fr.inra.urgi.faidare.elasticsearch.criteria.fixture;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Nested;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Nested;
 
 import java.util.List;
 
diff --git a/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectBeanPropertyCriteria.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectBeanPropertyCriteria.java
new file mode 100644
index 0000000000000000000000000000000000000000..70d888105018e909d9849f2f5c762ab8acf7ff9d
--- /dev/null
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectBeanPropertyCriteria.java
@@ -0,0 +1,16 @@
+package fr.inra.urgi.faidare.elasticsearch.criteria.fixture;
+
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+
+/**
+ * @author gcornut
+ */
+@CriteriaForDocument(DocumentObject.class)
+public class IncorrectBeanPropertyCriteria {
+
+    // Missing getter & setter here:
+    @DocumentPath("field1")
+    String criteria1;
+
+}
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectClassAnnotationCriteria.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectClassAnnotationCriteria.java
similarity index 61%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectClassAnnotationCriteria.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectClassAnnotationCriteria.java
index 0c5332780664230fd8018956a589a4f11ed6005f..af53f6b366e4d5a720ff9c7f91cef31580d63639 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectClassAnnotationCriteria.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectClassAnnotationCriteria.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.fixture;
+package fr.inra.urgi.faidare.elasticsearch.criteria.fixture;
 
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 /**
  * Criteria missing the {@link CriteriaForDocument} annotation
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectDocumentPathCriteria.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectDocumentPathCriteria.java
similarity index 64%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectDocumentPathCriteria.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectDocumentPathCriteria.java
index 01a3d9d67b81addcc9f3cc79359729aa9e7bd268..dea944e8cf449d631d41270e0db1291621c7e3ab 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectDocumentPathCriteria.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectDocumentPathCriteria.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.fixture;
+package fr.inra.urgi.faidare.elasticsearch.criteria.fixture;
 
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
 
 /**
  * @author gcornut
diff --git a/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectEmptyCriteria.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectEmptyCriteria.java
new file mode 100644
index 0000000000000000000000000000000000000000..e8a2a04ea81a5af9b6cfbe1e26843a14a4491718
--- /dev/null
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectEmptyCriteria.java
@@ -0,0 +1,15 @@
+package fr.inra.urgi.faidare.elasticsearch.criteria.fixture;
+
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.NoDocumentMapping;
+
+/**
+ * @author gcornut
+ */
+@CriteriaForDocument(DocumentObject.class)
+public class IncorrectEmptyCriteria {
+
+    @NoDocumentMapping
+    String hiddenCriteria;
+
+}
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectFieldAnnotationCriteria.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectFieldAnnotationCriteria.java
similarity index 70%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectFieldAnnotationCriteria.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectFieldAnnotationCriteria.java
index aad764ef4aecef9c68c17eda74bbeac13bc24474..9ea80291acdd667fa8fa985af33bac8a6b983a8e 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectFieldAnnotationCriteria.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/criteria/fixture/IncorrectFieldAnnotationCriteria.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.fixture;
+package fr.inra.urgi.faidare.elasticsearch.criteria.fixture;
 
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
 
 /**
  * @author gcornut
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentAnnotationUtilTest.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentAnnotationUtilTest.java
similarity index 92%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentAnnotationUtilTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentAnnotationUtilTest.java
index 9f8c04c8a5d9d2be13fbb68dabcc330aa16e9584..b8a86407533fef5f21831fd31f01f753e8524f29 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/DocumentAnnotationUtilTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/DocumentAnnotationUtilTest.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.elasticsearch.document;
+package fr.inra.urgi.faidare.elasticsearch.document;
 
 import com.google.common.collect.ImmutableList;
-import fr.inra.urgi.gpds.elasticsearch.document.fixture.ComplexDocument;
-import fr.inra.urgi.gpds.elasticsearch.document.fixture.IncorrectMissingAnnotationDocument;
-import fr.inra.urgi.gpds.elasticsearch.document.fixture.IncorrectNestedAnnotationDocument;
-import fr.inra.urgi.gpds.elasticsearch.document.fixture.SimpleDocument;
+import fr.inra.urgi.faidare.elasticsearch.document.fixture.ComplexDocument;
+import fr.inra.urgi.faidare.elasticsearch.document.fixture.IncorrectMissingAnnotationDocument;
+import fr.inra.urgi.faidare.elasticsearch.document.fixture.IncorrectNestedAnnotationDocument;
+import fr.inra.urgi.faidare.elasticsearch.document.fixture.SimpleDocument;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/ComplexDocument.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/ComplexDocument.java
similarity index 83%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/ComplexDocument.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/ComplexDocument.java
index ce4b0148e92d8b00a020d1306d16d31524f32f1d..dd9a2c789623a79ab4101136bdbd08e21fb82703 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/ComplexDocument.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/ComplexDocument.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.elasticsearch.document.fixture;
+package fr.inra.urgi.faidare.elasticsearch.document.fixture;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Nested;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Nested;
 
 import java.util.List;
 
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/IncorrectMissingAnnotationDocument.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/IncorrectMissingAnnotationDocument.java
similarity index 51%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/IncorrectMissingAnnotationDocument.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/IncorrectMissingAnnotationDocument.java
index d3e04360e0a1d70eeb37378bbfe45da78504c780..0397f46e7e313d7ae8817320171c4ce32dd145a8 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/IncorrectMissingAnnotationDocument.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/IncorrectMissingAnnotationDocument.java
@@ -1,6 +1,6 @@
-package fr.inra.urgi.gpds.elasticsearch.document.fixture;
+package fr.inra.urgi.faidare.elasticsearch.document.fixture;
 
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
 
 /**
  * Document class missing the {@link Document} annotation
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/IncorrectNestedAnnotationDocument.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/IncorrectNestedAnnotationDocument.java
similarity index 70%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/IncorrectNestedAnnotationDocument.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/IncorrectNestedAnnotationDocument.java
index abe9de75b3a711d7448f3e6c699ccf58e9289f90..9bac3333635196b9cc4597e53ff4fb1879e45678 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/IncorrectNestedAnnotationDocument.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/IncorrectNestedAnnotationDocument.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.elasticsearch.document.fixture;
+package fr.inra.urgi.faidare.elasticsearch.document.fixture;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Nested;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Nested;
 
 import java.util.List;
 
diff --git a/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/SimpleDocument.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/SimpleDocument.java
new file mode 100644
index 0000000000000000000000000000000000000000..febc945e54eedda7c6681ece22a0037871109866
--- /dev/null
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/document/fixture/SimpleDocument.java
@@ -0,0 +1,13 @@
+package fr.inra.urgi.faidare.elasticsearch.document.fixture;
+
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
+
+/**
+ * @author gcornut
+ */
+@Document(type = "dataObject3")
+public class SimpleDocument {
+    @Id
+    String id;
+}
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/fixture/DocumentObject.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/fixture/DocumentObject.java
similarity index 75%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/fixture/DocumentObject.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/fixture/DocumentObject.java
index eeb47d79d8bd9629fb32cc20b522b9e0096dd982..ca9df8961432c1257cc350a7043ee9dba6f3b527 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/fixture/DocumentObject.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/fixture/DocumentObject.java
@@ -1,8 +1,8 @@
-package fr.inra.urgi.gpds.elasticsearch.fixture;
+package fr.inra.urgi.faidare.elasticsearch.fixture;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Id;
 
 import java.util.List;
 
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/query/impl/ESGenericQueryFactoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/query/impl/ESGenericQueryFactoryTest.java
similarity index 93%
rename from backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/query/impl/ESGenericQueryFactoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/query/impl/ESGenericQueryFactoryTest.java
index 1f5df4edc74150fe7f18e98929d9a4b04aac22c0..304d2215bc94ac0555eb486386436f12eb51e882 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/query/impl/ESGenericQueryFactoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/elasticsearch/query/impl/ESGenericQueryFactoryTest.java
@@ -1,20 +1,20 @@
-package fr.inra.urgi.gpds.elasticsearch.query.impl;
+package fr.inra.urgi.faidare.elasticsearch.query.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
 import com.google.common.io.CharStreams;
-import fr.inra.urgi.gpds.domain.criteria.LocationCriteria;
-import fr.inra.urgi.gpds.domain.criteria.ObservationUnitCriteria;
-import fr.inra.urgi.gpds.domain.criteria.ProgramCriteria;
-import fr.inra.urgi.gpds.domain.criteria.StudySearchCriteria;
-import fr.inra.urgi.gpds.domain.datadiscovery.criteria.DataDiscoveryCriteria;
-import fr.inra.urgi.gpds.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.QueryType;
-import fr.inra.urgi.gpds.elasticsearch.criteria.fixture.ComplexAnnotatedCriteria;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
+import fr.inra.urgi.faidare.domain.criteria.LocationCriteria;
+import fr.inra.urgi.faidare.domain.criteria.ObservationUnitCriteria;
+import fr.inra.urgi.faidare.domain.criteria.ProgramCriteria;
+import fr.inra.urgi.faidare.domain.criteria.StudySearchCriteria;
+import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteria;
+import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.CriteriaForDocument;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.DocumentPath;
+import fr.inra.urgi.faidare.elasticsearch.criteria.annotation.QueryType;
+import fr.inra.urgi.faidare.elasticsearch.criteria.fixture.ComplexAnnotatedCriteria;
+import fr.inra.urgi.faidare.elasticsearch.document.annotation.Document;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.ScriptQueryBuilder;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/filter/AngularRouteFilterTest.java b/backend/src/test/java/fr/inra/urgi/faidare/filter/AngularRouteFilterTest.java
similarity index 93%
rename from backend/src/test/java/fr/inra/urgi/gpds/filter/AngularRouteFilterTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/filter/AngularRouteFilterTest.java
index 12043dc7ec5c08bf26baff6d1ae0113ee4c4e3cd..4042699284a9e2b28568572b0f5692bedb6481ca 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/filter/AngularRouteFilterTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/filter/AngularRouteFilterTest.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.filter;
+package fr.inra.urgi.faidare.filter;
 
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.config.SecurityConfig;
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.config.SecurityConfig;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -87,10 +87,10 @@ class AngularRouteFilterTest {
             "  <base href=\"./\">\n" +
             "</html>";
         String indexAfter = "<html>\n" +
-            "  <base href=\"/gnpis-test/gpds/\">\n" +
+            "  <base href=\"/gnpis-test/faidare/\">\n" +
             "</html>";
 
-        ReflectionTestUtils.setField(filter, "serverContextPath", "/gnpis-test/gpds");
+        ReflectionTestUtils.setField(filter, "serverContextPath", "/gnpis-test/faidare");
 
         Resource mockResource = mock(Resource.class);
         when(mockResource.getInputStream())
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryTest.java
similarity index 94%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryTest.java
index c91574bff41ac03a33a89ac8310770abb6f88e3d..5fc42ceb9a08d678300e98a727aed284104473c7 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/DataDiscoveryRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryTest.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.DataDiscoveryDocument;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.Facet;
-import fr.inra.urgi.gpds.domain.datadiscovery.data.FacetTerm;
-import fr.inra.urgi.gpds.domain.datadiscovery.response.DataDiscoveryResponse;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.DataDiscoveryDocument;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.Facet;
+import fr.inra.urgi.faidare.domain.datadiscovery.data.FacetTerm;
+import fr.inra.urgi.faidare.domain.datadiscovery.response.DataDiscoveryResponse;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.elasticsearch.search.sort.SortOrder;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepositoryTest.java
similarity index 89%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepositoryTest.java
index cc43da350a04289e1f9d980eba10ec76c8aff617..9a7929b1874167a3b4aedd5a240f04d10532228e 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/GermplasmAttributeRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/GermplasmAttributeRepositoryTest.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.repository.es;
-
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.brapi.v1.data.BrapiGermplasmAttributeValue;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmAttributeCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmAttributeValueListVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+package fr.inra.urgi.faidare.repository.es;
+
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.brapi.v1.data.BrapiGermplasmAttributeValue;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmAttributeCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmAttributeValueListVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/GermplasmRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/GermplasmRepositoryTest.java
similarity index 95%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/GermplasmRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/GermplasmRepositoryTest.java
index ae608d3137122445a5444d59769ed112f397531b..42190131c14ef1b9889611311d0e2812a3990be0 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/GermplasmRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/GermplasmRepositoryTest.java
@@ -1,17 +1,17 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmGETSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmPOSTSearchCriteria;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmSearchCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.PedigreeVO;
-import fr.inra.urgi.gpds.domain.data.germplasm.ProgenyVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.response.Pagination;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmGETSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmPOSTSearchCriteria;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.PedigreeVO;
+import fr.inra.urgi.faidare.domain.data.germplasm.ProgenyVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.response.Pagination;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/LocationRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/LocationRepositoryTest.java
similarity index 92%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/LocationRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/LocationRepositoryTest.java
index b45c4e968df13513eb59def78b2c0fe7170e44c3..879ce4105cbc950fe3e95783f4c3c070f85114a3 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/LocationRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/LocationRepositoryTest.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
 import com.google.common.collect.Sets;
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.criteria.LocationCriteria;
-import fr.inra.urgi.gpds.domain.data.LocationVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.criteria.LocationCriteria;
+import fr.inra.urgi.faidare.domain.data.LocationVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepositoryTest.java
similarity index 95%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepositoryTest.java
index 9c29177b269a389e6f7604fddab1a08a25bcb342..783b475780600f89a4821a4da74340f1735b07c6 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/ObservationUnitRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/ObservationUnitRepositoryTest.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
 import com.google.common.collect.Sets;
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.criteria.ObservationUnitCriteria;
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationUnitVO;
-import fr.inra.urgi.gpds.domain.data.phenotype.ObservationVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.criteria.ObservationUnitCriteria;
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationUnitVO;
+import fr.inra.urgi.faidare.domain.data.phenotype.ObservationVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.assertj.core.api.Condition;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/ProgramRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/ProgramRepositoryTest.java
similarity index 90%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/ProgramRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/ProgramRepositoryTest.java
index 1acecad51be07a593d81367d3b48a591425b7f32..ddc86daae6cc8c61751c854839880b7e4e48020a 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/ProgramRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/ProgramRepositoryTest.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.criteria.ProgramCriteria;
-import fr.inra.urgi.gpds.domain.data.ProgramVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.criteria.ProgramCriteria;
+import fr.inra.urgi.faidare.domain.data.ProgramVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/StudyRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/StudyRepositoryTest.java
similarity index 93%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/StudyRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/StudyRepositoryTest.java
index 1c330a614e1ce70e54bcc22c35faa74e8139212c..42b2328714b627b7b2fc2099b3614257f61c7b49 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/StudyRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/StudyRepositoryTest.java
@@ -1,13 +1,13 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
 import com.google.common.collect.Sets;
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.criteria.StudySearchCriteria;
-import fr.inra.urgi.gpds.domain.data.LocationVO;
-import fr.inra.urgi.gpds.domain.data.study.StudyDetailVO;
-import fr.inra.urgi.gpds.domain.data.study.StudySummaryVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.criteria.StudySearchCriteria;
+import fr.inra.urgi.faidare.domain.data.LocationVO;
+import fr.inra.urgi.faidare.domain.data.study.StudyDetailVO;
+import fr.inra.urgi.faidare.domain.data.study.StudySummaryVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/TrialRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/TrialRepositoryTest.java
similarity index 90%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/TrialRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/TrialRepositoryTest.java
index 69fcb4886908f55182c2fa52de3d2f0a8a269103..1c7416b8e867f8a06e799c11ec1b47560214f328 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/TrialRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/TrialRepositoryTest.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.criteria.TrialCriteria;
-import fr.inra.urgi.gpds.domain.data.TrialVO;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.criteria.TrialCriteria;
+import fr.inra.urgi.faidare.domain.data.TrialVO;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepositoryTest.java
similarity index 87%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepositoryTest.java
index c5ba17d2670206f3012bdf5394289c7cb15f78fd..8d488134985ba82d9197472b2b0a349873dd0343 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/XRefDocumentRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/XRefDocumentRepositoryTest.java
@@ -1,10 +1,10 @@
-package fr.inra.urgi.gpds.repository.es;
+package fr.inra.urgi.faidare.repository.es;
 
-import fr.inra.urgi.gpds.Application;
-import fr.inra.urgi.gpds.domain.response.PaginatedList;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentSearchCriteria;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentVO;
-import fr.inra.urgi.gpds.repository.es.setup.ESSetUp;
+import fr.inra.urgi.faidare.Application;
+import fr.inra.urgi.faidare.domain.response.PaginatedList;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentSearchCriteria;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentVO;
+import fr.inra.urgi.faidare.repository.es.setup.ESSetUp;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/setup/ESSetUp.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/setup/ESSetUp.java
similarity index 94%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/es/setup/ESSetUp.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/es/setup/ESSetUp.java
index 7f38d301ba6ca9714d75f879d66d7a3668a3e5fd..d5f40e75b9e32918f37875946b6f993d790182d7 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/es/setup/ESSetUp.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/es/setup/ESSetUp.java
@@ -1,12 +1,12 @@
-package fr.inra.urgi.gpds.repository.es.setup;
+package fr.inra.urgi.faidare.repository.es.setup;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.CharStreams;
-import fr.inra.urgi.gpds.config.GPDSProperties;
-import fr.inra.urgi.gpds.domain.xref.XRefDocumentVO;
-import fr.inra.urgi.gpds.elasticsearch.document.DocumentAnnotationUtil;
-import fr.inra.urgi.gpds.repository.es.XRefDocumentRepositoryImpl;
+import fr.inra.urgi.faidare.config.FaidareProperties;
+import fr.inra.urgi.faidare.domain.xref.XRefDocumentVO;
+import fr.inra.urgi.faidare.elasticsearch.document.DocumentAnnotationUtil;
+import fr.inra.urgi.faidare.repository.es.XRefDocumentRepositoryImpl;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
@@ -35,10 +35,10 @@ import java.util.Iterator;
 public class ESSetUp {
 
     private final RestHighLevelClient client;
-    private final GPDSProperties properties;
+    private final FaidareProperties properties;
 
     @Autowired
-    public ESSetUp(RestHighLevelClient client, GPDSProperties properties) {
+    public ESSetUp(RestHighLevelClient client, FaidareProperties properties) {
         this.client = client;
         this.properties = properties;
     }
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/http/UserGroupsResourceClientTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/http/UserGroupsResourceClientTest.java
similarity index 89%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/http/UserGroupsResourceClientTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/http/UserGroupsResourceClientTest.java
index 37fd07cd1070dfde579e5efd21d71ef456dde0b7..e557ebbeff9798ba938ebc7665c98c1573f9954d 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/http/UserGroupsResourceClientTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/http/UserGroupsResourceClientTest.java
@@ -1,7 +1,7 @@
-package fr.inra.urgi.gpds.repository.http;
+package fr.inra.urgi.faidare.repository.http;
 
-import fr.inra.urgi.gpds.config.GPDSProperties;
-import fr.inra.urgi.gpds.filter.AuthenticationStore;
+import fr.inra.urgi.faidare.config.FaidareProperties;
+import fr.inra.urgi.faidare.filter.AuthenticationStore;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -20,7 +20,7 @@ import static org.mockito.Mockito.when;
 class UserGroupsResourceClientTest {
 
     @Mock
-    GPDSProperties properties;
+    FaidareProperties properties;
 
     @Mock
     RestTemplate restClient;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/repository/ontology/CropOntologyRepositoryTest.java b/backend/src/test/java/fr/inra/urgi/faidare/repository/ontology/CropOntologyRepositoryTest.java
similarity index 94%
rename from backend/src/test/java/fr/inra/urgi/gpds/repository/ontology/CropOntologyRepositoryTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/repository/ontology/CropOntologyRepositoryTest.java
index d0e51fa92a520c4b9c5334b661756ae90ce27a29..d1bf30709551b515374feddb7942c3f9f93b4301 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/repository/ontology/CropOntologyRepositoryTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/repository/ontology/CropOntologyRepositoryTest.java
@@ -1,11 +1,11 @@
-package fr.inra.urgi.gpds.repository.ontology;
+package fr.inra.urgi.faidare.repository.ontology;
 
 import com.google.common.collect.Sets;
-import fr.inra.urgi.gpds.config.GPDSProperties;
-import fr.inra.urgi.gpds.domain.data.variable.ObservationVariableVO;
-import fr.inra.urgi.gpds.domain.data.variable.OntologyVO;
-import fr.inra.urgi.gpds.domain.data.variable.TraitVO;
-import fr.inra.urgi.gpds.repository.file.CropOntologyRepositoryImpl;
+import fr.inra.urgi.faidare.config.FaidareProperties;
+import fr.inra.urgi.faidare.domain.data.variable.ObservationVariableVO;
+import fr.inra.urgi.faidare.domain.data.variable.OntologyVO;
+import fr.inra.urgi.faidare.domain.data.variable.TraitVO;
+import fr.inra.urgi.faidare.repository.file.CropOntologyRepositoryImpl;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.when;
 class CropOntologyRepositoryTest {
 
     @Mock
-    GPDSProperties properties;
+    FaidareProperties properties;
 
     @Mock
     RestTemplate restClient;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/service/es/GermplasmServiceTest.java b/backend/src/test/java/fr/inra/urgi/faidare/service/es/GermplasmServiceTest.java
similarity index 86%
rename from backend/src/test/java/fr/inra/urgi/gpds/service/es/GermplasmServiceTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/service/es/GermplasmServiceTest.java
index aa446e840d0d6e7199b896210194e1c5bd133735..13e6e8e6385da0e074edeb1c3e6594c7ebb230e3 100644
--- a/backend/src/test/java/fr/inra/urgi/gpds/service/es/GermplasmServiceTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/service/es/GermplasmServiceTest.java
@@ -1,9 +1,9 @@
-package fr.inra.urgi.gpds.service.es;
+package fr.inra.urgi.faidare.service.es;
 
 import com.opencsv.CSVReader;
-import fr.inra.urgi.gpds.domain.criteria.GermplasmPOSTSearchCriteria;
-import fr.inra.urgi.gpds.domain.data.germplasm.GermplasmVO;
-import fr.inra.urgi.gpds.repository.es.GermplasmRepository;
+import fr.inra.urgi.faidare.domain.criteria.GermplasmPOSTSearchCriteria;
+import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
+import fr.inra.urgi.faidare.repository.es.GermplasmRepository;
 import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectBeanPropertyCriteria.java b/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectBeanPropertyCriteria.java
deleted file mode 100644
index 4edcf565617c312dc895c164f242562f2c0f6395..0000000000000000000000000000000000000000
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectBeanPropertyCriteria.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.fixture;
-
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.DocumentPath;
-
-/**
- * @author gcornut
- */
-@CriteriaForDocument(DocumentObject.class)
-public class IncorrectBeanPropertyCriteria {
-
-    // Missing getter & setter here:
-    @DocumentPath("field1")
-    String criteria1;
-
-}
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectEmptyCriteria.java b/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectEmptyCriteria.java
deleted file mode 100644
index 2321a013f06a112df7876af26524c845c34cb686..0000000000000000000000000000000000000000
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/criteria/fixture/IncorrectEmptyCriteria.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package fr.inra.urgi.gpds.elasticsearch.criteria.fixture;
-
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.CriteriaForDocument;
-import fr.inra.urgi.gpds.elasticsearch.criteria.annotation.NoDocumentMapping;
-
-/**
- * @author gcornut
- */
-@CriteriaForDocument(DocumentObject.class)
-public class IncorrectEmptyCriteria {
-
-    @NoDocumentMapping
-    String hiddenCriteria;
-
-}
diff --git a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/SimpleDocument.java b/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/SimpleDocument.java
deleted file mode 100644
index d4fc093f6c8e60e8a495cb9ce841b3d7cae6cfef..0000000000000000000000000000000000000000
--- a/backend/src/test/java/fr/inra/urgi/gpds/elasticsearch/document/fixture/SimpleDocument.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package fr.inra.urgi.gpds.elasticsearch.document.fixture;
-
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Document;
-import fr.inra.urgi.gpds.elasticsearch.document.annotation.Id;
-
-/**
- * @author gcornut
- */
-@Document(type = "dataObject3")
-public class SimpleDocument {
-    @Id
-    String id;
-}
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query1.json b/backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query1.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query1.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query1.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query2.json b/backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query2.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query2.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query2.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query3.json b/backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query3.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query3.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query3.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query4.json b/backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query4.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query4.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query4.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query5.json b/backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query5.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query5.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query5.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query6.json b/backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query6.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query6.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query6.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query7.json b/backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query7.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/elasticsearch/query/impl/expected/query7.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/elasticsearch/query/impl/expected/query7.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/datadiscovery0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/datadiscovery0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/datadiscovery0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/datadiscovery0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/germplasm0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/germplasm0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/germplasm0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/germplasm0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/germplasmAttribute0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/germplasmAttribute0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/germplasmAttribute0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/germplasmAttribute0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/germplasmPedigree0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/germplasmPedigree0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/germplasmPedigree0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/germplasmPedigree0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/germplasmProgeny0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/germplasmProgeny0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/germplasmProgeny0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/germplasmProgeny0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/location0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/location0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/location0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/location0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/observationUnit0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/observationUnit0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/observationUnit0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/observationUnit0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/program0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/program0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/program0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/program0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/study0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/study0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/study0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/study0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/trial0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/trial0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/trial0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/trial0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/urgi_xref_test-group0.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/urgi_xref_test-group0.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/fixture/urgi_xref_test-group0.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/fixture/urgi_xref_test-group0.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/README.md b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/README.md
similarity index 94%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/README.md
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/README.md
index 7821ee85ffd9f57ee14140228046f291c398e36c..f5a7b39f92e8a605b49b094ffd5eefaf71c05893 100644
--- a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/README.md
+++ b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/README.md
@@ -1,4 +1,4 @@
-This directory contains document mappings and index settings for GPDS Elasticsearch documents.
+This directory contains document mappings and index settings for FAIDARE Elasticsearch documents.
 
 This directory is a copy of the directory from the GnpIS `database` git repository with the path: `GnpIS/elasticsearch/template/gnpis`.
 
@@ -9,4 +9,4 @@ In the `settings.json` file, a custom analyzer is defined to index completion su
 
 The `index_suggester` is composed of a custom tokenizer named `special_tokenizer` and which uses a RegExp pattern to list all characters used to split tokens. The split characters includes: spaces, comas, dashes (low and high), parentheses (open and close), brackets (open and close) and curly brackets (open and close). The `index_suggester` is also composed of filters including the standard filter, the lowercase filter, the ascii folding filter and a NGram filter (with minimum of 1 and maximum of 20 characters starting on the front of a token).
 
-The `search_suggester` is the same as `index_suggester` but without the NGram filter.
\ No newline at end of file
+The `search_suggester` is the same as `index_suggester` but without the NGram filter.
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/datadiscovery_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/datadiscovery_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/datadiscovery_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/datadiscovery_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/germplasmAttribute_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmAttribute_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/germplasmAttribute_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmAttribute_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/germplasmPedigree_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmPedigree_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/germplasmPedigree_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmPedigree_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/germplasmProgeny_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmProgeny_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/germplasmProgeny_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasmProgeny_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/germplasm_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasm_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/germplasm_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/germplasm_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/location_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/location_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/location_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/location_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/observationUnit_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/observationUnit_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/observationUnit_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/observationUnit_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/program_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/program_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/program_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/program_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/settings.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/settings.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/settings.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/settings.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/study_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/study_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/study_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/study_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/transplant_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/transplant_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/transplant_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/transplant_mapping.json
diff --git a/backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/trial_mapping.json b/backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/trial_mapping.json
similarity index 100%
rename from backend/src/test/resources/fr/inra/urgi/gpds/repository/es/setup/index/trial_mapping.json
rename to backend/src/test/resources/fr/inra/urgi/faidare/repository/es/setup/index/trial_mapping.json
diff --git a/backend/src/test/resources/test.properties b/backend/src/test/resources/test.properties
index a093f5b00268166bd0b54a6c54407bf45575eb92..a82442ba931e528774043a0ed48bbb38de4efa70 100644
--- a/backend/src/test/resources/test.properties
+++ b/backend/src/test/resources/test.properties
@@ -1,5 +1,5 @@
 spring.data.elasticsearch.host=localhost
 spring.data.elasticsearch.port=9200
 
-gpds.elasticsearch-alias-template=gnpis_{source}_{documentType}-group{groupId}
-gpds.elasticsearch-xref-index-name=urgi_xref_test
+faidare.elasticsearch-alias-template=gnpis_{source}_{documentType}-group{groupId}
+faidare.elasticsearch-xref-index-name=urgi_xref_test
diff --git a/frontend/angular.json b/frontend/angular.json
index 76b5e5d48b2001587d029913b9dfb24a4e03f060..f0bf2b8d50f695756d667873572cccd19c49f8f3 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -7,7 +7,7 @@
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
-      "prefix": "gpds",
+      "prefix": "faidare",
       "schematics": {
         "@schematics/angular:component": {
           "styleext": "scss"
@@ -25,14 +25,14 @@
             "assets": [
               {
                 "glob": "**/*",
-                "input": "src/assets/gpds",
+                "input": "src/assets/faidare",
                 "output": "/assets"
               },
               "src/assets"
             ],
             "stylePreprocessorOptions": {
               "includePaths": [
-                "src/assets/gpds/"
+                "src/assets/faidare/"
               ]
             },
             "styles": [
@@ -42,7 +42,7 @@
               "node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css"
             ],
             "scripts": [],
-            "baseHref": "/gpds-dev/",
+            "baseHref": "/faidare-dev/",
             "es5BrowserSupport": true
           },
           "configurations": {
@@ -71,7 +71,7 @@
               ],
               "stylePreprocessorOptions": {
                 "includePaths": [
-                  "src/assets/gpds/"
+                  "src/assets/faidare/"
                 ]
               },
             "baseHref": "./"
@@ -101,14 +101,14 @@
             "assets": [
               {
                 "glob": "**/*",
-                "input": "src/assets/gpds",
+                "input": "src/assets/faidare",
                 "output": "/assets"
               },
               "src/assets"
             ],
             "stylePreprocessorOptions": {
               "includePaths": [
-                "src/assets/gpds/"
+                "src/assets/faidare/"
               ]
             },
             "styles": [
diff --git a/frontend/e2e/src/app.po.ts b/frontend/e2e/src/app.po.ts
index 5c89a45eedf153a07e5a438a57fe6a622e7ef4fc..59024fc9cfc2c8e71b0169f4f9594bf4b59fea4a 100644
--- a/frontend/e2e/src/app.po.ts
+++ b/frontend/e2e/src/app.po.ts
@@ -6,10 +6,10 @@ export class AppPage {
     }
 
     getTitleText() {
-        return element(by.css('gpds-root p')).getText();
+        return element(by.css('faidare-root p')).getText();
     }
 
     getLabel(id) {
-        return element(by.css('gpds-root label[for=' + id + ']')).getText();
+        return element(by.css('faidare-root label[for=' + id + ']')).getText();
     }
 }
diff --git a/frontend/proxy.conf.js b/frontend/proxy.conf.js
index 28c5f743c2de6a6f73c6d96706374b7e49f90165..68d1cb39ba00c6fb09cec8e61616f97cd7c6b774 100644
--- a/frontend/proxy.conf.js
+++ b/frontend/proxy.conf.js
@@ -1,8 +1,8 @@
 const PROXY_CONFIG = [
     {
         context: [
-            "/gpds-dev/brapi",
-            "/gpds-dev/gnpis",
+            "/faidare-dev/brapi",
+            "/faidare-dev/gnpis",
         ],
         target: "http://localhost:8380",
         secure: false
diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
index 1bdaa071a44e1fcc6bac0e097cdaccdbcd195b9d..6631a05f3fedee885595808de83c850fe874cb6f 100644
--- a/frontend/src/app/app.component.html
+++ b/frontend/src/app/app.component.html
@@ -1,9 +1,9 @@
-<gpds-navbar></gpds-navbar>
+<faidare-navbar></faidare-navbar>
 <div class="alert alert-warning text-center mb-4" role="alert">
 This is a <b>beta</b> application. Please <a href="mailto:urgi-contact@inra.fr" class="alert-link" style="text-decoration: underline">contact us</a> for any comments
 </div>
 <div class="container">
-  <gpds-error></gpds-error>
+  <faidare-error></faidare-error>
   <router-outlet></router-outlet>
 </div>
 
diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index 13ca22f31c3504e79539b0e36bf3f384205b67f4..222abac5daf61d27b04d52f1a7fecf0342de8acc 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-    selector: 'gpds-root',
+    selector: 'faidare-root',
     templateUrl: './app.component.html',
     styleUrls: ['./app.component.scss']
 })
diff --git a/frontend/src/app/card-row/card-row.component.spec.ts b/frontend/src/app/card-row/card-row.component.spec.ts
index 2c78f8ff82e7f1a8e0a48c573121e47086688eef..faf6f2b82d72f968a93bfb473d9c6fdf002f0b1b 100644
--- a/frontend/src/app/card-row/card-row.component.spec.ts
+++ b/frontend/src/app/card-row/card-row.component.spec.ts
@@ -24,16 +24,16 @@ class CardRowComponentTester extends ComponentTester<CardRowComponent> {
 
 
 /**
- * Test gpds-card-row with a provided `ng-template`
+ * Test faidare-card-row with a provided `ng-template`
  */
 @Component({
-    selector: 'gpds-test',
+    selector: 'faidare-test',
     template: `
-        <gpds-card-row>
+        <faidare-card-row>
             <ng-template>
                 <strong>Value HTML template</strong>
             </ng-template>
-        </gpds-card-row>`
+        </faidare-card-row>`
 })
 class CardRowWithTemplateComponent {
     @ViewChild(CardRowComponent) component: CardRowComponent;
diff --git a/frontend/src/app/card-row/card-row.component.ts b/frontend/src/app/card-row/card-row.component.ts
index 51e69d8b05b7ce7736f0805cd28c735d9d02906e..639a4defdcec9f96b951043da42cfbb971d4b3c4 100644
--- a/frontend/src/app/card-row/card-row.component.ts
+++ b/frontend/src/app/card-row/card-row.component.ts
@@ -1,7 +1,7 @@
 import { Component, ContentChild, Input, TemplateRef } from '@angular/core';
 
 @Component({
-    selector: 'gpds-card-row',
+    selector: 'faidare-card-row',
     templateUrl: './card-row.component.html',
     styleUrls: ['./card-row.component.scss']
 })
diff --git a/frontend/src/app/card-section/card-section.component.spec.ts b/frontend/src/app/card-section/card-section.component.spec.ts
index c756a49452350b7ffddcb86486178dd9881b7eb0..72933da510e874fec9e78f83434c3b8a16080e76 100644
--- a/frontend/src/app/card-section/card-section.component.spec.ts
+++ b/frontend/src/app/card-section/card-section.component.spec.ts
@@ -6,16 +6,16 @@ import { Component, ViewChild } from '@angular/core';
 
 
 /**
- * Test gpds-card-section with a provided `ng-template`
+ * Test faidare-card-section with a provided `ng-template`
  */
 @Component({
-    selector: 'gpds-test',
+    selector: 'faidare-test',
     template: `
-        <gpds-card-section>
+        <faidare-card-section>
             <ng-template>
                 <div class="test-body">Body HTML template</div>
             </ng-template>
-        </gpds-card-section>`
+        </faidare-card-section>`
 })
 class CardSectionTestWrapperComponent {
     @ViewChild(CardSectionComponent) component: CardSectionComponent;
diff --git a/frontend/src/app/card-section/card-section.component.ts b/frontend/src/app/card-section/card-section.component.ts
index bd014e2e38fe4019d4284108b0428b299ef47c24..b4388cd83467b1d892f6ddc4ebf235cf3f1d52d8 100644
--- a/frontend/src/app/card-section/card-section.component.ts
+++ b/frontend/src/app/card-section/card-section.component.ts
@@ -1,7 +1,7 @@
 import { Component, ContentChild, Input, TemplateRef } from '@angular/core';
 
 @Component({
-    selector: 'gpds-card-section',
+    selector: 'faidare-card-section',
     templateUrl: './card-section.component.html',
     styleUrls: ['./card-section.component.scss']
 })
diff --git a/frontend/src/app/card-table/card-table.component.spec.ts b/frontend/src/app/card-table/card-table.component.spec.ts
index da131453876bf0ceefdaafbf9bd6d1b854bdb290..74671515ea31da18d333c2423ea91aa59aaee9ac 100644
--- a/frontend/src/app/card-table/card-table.component.spec.ts
+++ b/frontend/src/app/card-table/card-table.component.spec.ts
@@ -4,12 +4,12 @@ import { CardTableComponent } from './card-table.component';
 import { Component, ViewChild } from '@angular/core';
 
 /**
- * Test gpds-card-table with a simple provided row `ng-template`
+ * Test faidare-card-table with a simple provided row `ng-template`
  */
 @Component({
-    selector: 'gpds-test',
+    selector: 'faidare-test',
     template: `
-        <gpds-card-table>
+        <faidare-card-table>
             <ng-template let-row>
                 <tr>
                     <td>{{ row[0] }}</td>
@@ -17,7 +17,7 @@ import { Component, ViewChild } from '@angular/core';
                     <td>{{ row[2] }}</td>
                 </tr>
             </ng-template>
-        </gpds-card-table>`
+        </faidare-card-table>`
 })
 class CardTableTestWrapperComponent {
     @ViewChild(CardTableComponent) component: CardTableComponent;
diff --git a/frontend/src/app/card-table/card-table.component.ts b/frontend/src/app/card-table/card-table.component.ts
index dd871e030080e7ff6679341f87f95ac4ec1254d6..7d079c135256a83c9c5f77017d1683b2444ea0cd 100644
--- a/frontend/src/app/card-table/card-table.component.ts
+++ b/frontend/src/app/card-table/card-table.component.ts
@@ -1,7 +1,7 @@
 import { Component, ContentChild, Input, TemplateRef } from '@angular/core';
 
 @Component({
-    selector: 'gpds-card-table',
+    selector: 'faidare-card-table',
     templateUrl: './card-table.component.html',
     styleUrls: ['./card-table.component.scss']
 })
diff --git a/frontend/src/app/error/error.component.ts b/frontend/src/app/error/error.component.ts
index c93c9790e02762bd58d706288c60db615729f448..66e6e4bdce437a5b034c80a5c5572d151883d0f1 100644
--- a/frontend/src/app/error/error.component.ts
+++ b/frontend/src/app/error/error.component.ts
@@ -6,7 +6,7 @@ import { filter, map } from 'rxjs/operators';
 import { Location } from '@angular/common';
 
 @Component({
-    selector: 'gpds-error',
+    selector: 'faidare-error',
     templateUrl: './error.component.html',
     styleUrls: ['./error.component.scss']
 })
diff --git a/frontend/src/app/form/form.component.html b/frontend/src/app/form/form.component.html
index 8afaa32eb25f3fd1322ecc6651f584edebdcc2c6..d699f8bc0279d3ade9b98a2113baaed42e7a4450 100644
--- a/frontend/src/app/form/form.component.html
+++ b/frontend/src/app/form/form.component.html
@@ -26,12 +26,12 @@
       </small>
     </label>
     <div class="col-sm-8">
-      <gpds-suggestion-field
+      <faidare-suggestion-field
         inputId="crops"
         criteriaField="crops"
         [criteria$]="criteria$"
         placeholder="Search crops">
-      </gpds-suggestion-field>
+      </faidare-suggestion-field>
     </div>
   </div>
   <!-- Input for the germplasmList field -->
@@ -43,12 +43,12 @@
       </small>
     </label>
     <div class="col-sm-8">
-      <gpds-suggestion-field
+      <faidare-suggestion-field
         inputId="germplasmList"
         criteriaField="germplasmLists"
         [criteria$]="criteria$"
         placeholder="Search germplasm lists">
-      </gpds-suggestion-field>
+      </faidare-suggestion-field>
     </div>
   </div>
   <!-- Input for the accessions field -->
@@ -60,20 +60,20 @@
       </small>
     </label>
     <div class="col-sm-8">
-      <gpds-suggestion-field
+      <faidare-suggestion-field
         inputId="accessions"
         criteriaField="accessions"
         [criteria$]="criteria$"
         placeholder="Search germplasm accession">
-      </gpds-suggestion-field>
+      </faidare-suggestion-field>
     </div>
   </div>
 </div>
 
 <!-- Trait tab -->
 <div class="trait {{ getTabClass(tabs.TRAIT) }}">
-  <gpds-trait-ontology-widget
+  <faidare-trait-ontology-widget
     [criteria$]="criteria$"
     (initialized)="traitWidgetInitialized.emit($event)">
-  </gpds-trait-ontology-widget>
+  </faidare-trait-ontology-widget>
 </div>
diff --git a/frontend/src/app/form/form.component.spec.ts b/frontend/src/app/form/form.component.spec.ts
index 64edc68383f9f1a955177b69a8db00d9962d41f5..c9f0ab8721ccec7b7ede8c16e74c7fc4887fa5d3 100644
--- a/frontend/src/app/form/form.component.spec.ts
+++ b/frontend/src/app/form/form.component.spec.ts
@@ -4,10 +4,10 @@ import { FormComponent } from './form.component';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 
 /**
- * Mock gpds-suggestion-field
+ * Mock faidare-suggestion-field
  */
 @Component({
-    selector: 'gpds-suggestion-field',
+    selector: 'faidare-suggestion-field',
     template: '<br/>'
 })
 class MockSuggestionFieldComponent {
@@ -15,10 +15,10 @@ class MockSuggestionFieldComponent {
 }
 
 /**
- * Mock gpds-trait-ontology-widget
+ * Mock faidare-trait-ontology-widget
  */
 @Component({
-    selector: 'gpds-trait-ontology-widget',
+    selector: 'faidare-trait-ontology-widget',
     template: '<br/>'
 })
 class MockTraitWidgetComponent {
diff --git a/frontend/src/app/form/form.component.ts b/frontend/src/app/form/form.component.ts
index c2d37198bea1f6cf5bf70dc923555cd94be995f2..fe09236ad2c431ba72886a527eb471f1a99cb02f 100644
--- a/frontend/src/app/form/form.component.ts
+++ b/frontend/src/app/form/form.component.ts
@@ -8,7 +8,7 @@ enum Tabs {
 }
 
 @Component({
-    selector: 'gpds-form',
+    selector: 'faidare-form',
     templateUrl: './form.component.html',
     styleUrls: ['./form.component.scss']
 })
diff --git a/frontend/src/app/form/suggestion-field/suggestion-field.component.ts b/frontend/src/app/form/suggestion-field/suggestion-field.component.ts
index 6505693e38a78cecfddab250afd61ecc709bfbb5..bbac52ab39b25cac5ee8dd7c59afcc839606187b 100644
--- a/frontend/src/app/form/suggestion-field/suggestion-field.component.ts
+++ b/frontend/src/app/form/suggestion-field/suggestion-field.component.ts
@@ -7,7 +7,7 @@ import { debounceTime, filter, map, switchMap } from 'rxjs/operators';
 import { DataDiscoveryCriteria } from '../../models/data-discovery.model';
 
 @Component({
-    selector: 'gpds-suggestion-field',
+    selector: 'faidare-suggestion-field',
     templateUrl: './suggestion-field.component.html',
     styleUrls: ['./suggestion-field.component.scss']
 })
diff --git a/frontend/src/app/form/trait-ontology-widget/trait-ontology-widget.component.ts b/frontend/src/app/form/trait-ontology-widget/trait-ontology-widget.component.ts
index b27eece17dd62178d011f70235a9f32b96c264b0..5960e5ef30205b48e3c7be5a6e638abcf5df4b7c 100644
--- a/frontend/src/app/form/trait-ontology-widget/trait-ontology-widget.component.ts
+++ b/frontend/src/app/form/trait-ontology-widget/trait-ontology-widget.component.ts
@@ -17,7 +17,7 @@ export class CropOntologyWidgetFactory {
 }
 
 @Component({
-    selector: 'gpds-trait-ontology-widget',
+    selector: 'faidare-trait-ontology-widget',
     templateUrl: './trait-ontology-widget.component.html',
     styleUrls: ['./trait-ontology-widget.component.scss'],
 
diff --git a/frontend/src/app/germplasm-card/germplasm-card.component.html b/frontend/src/app/germplasm-card/germplasm-card.component.html
index 45d8adb7825386544951ae4cbd2997dfa7120d7d..a7d4ccd84829671bcb3454d40c7d68fafe29a8d2 100644
--- a/frontend/src/app/germplasm-card/germplasm-card.component.html
+++ b/frontend/src/app/germplasm-card/germplasm-card.component.html
@@ -1,4 +1,4 @@
-<gpds-loading-spinner [loading]="loading" class="float-right"></gpds-loading-spinner>
+<faidare-loading-spinner [loading]="loading" class="float-right"></faidare-loading-spinner>
 
 <ng-container *ngIf="germplasmGnpis">
   <h3 class="mb-4">
@@ -9,54 +9,54 @@
   </h3>
 
   <!-- Display the map -->
-  <gpds-map [locations]="germplasmLocations"></gpds-map>
+  <faidare-map [locations]="germplasmLocations"></faidare-map>
 
   <div class="row align-items-center">
 
     <!--Templates for gerplasm card-->
 
     <ng-template #taxonTemplate>
-      <gpds-card-row
+      <faidare-card-row
         label="Genus"
         [test]="germplasmGnpis.genus">
         <ng-template>
           <i>{{ germplasmGnpis.genus }}</i>
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Species"
         [test]="germplasmGnpis.species">
         <ng-template>
           <i>{{ germplasmGnpis.species }}</i>
           {{ germplasmGnpis.speciesAuthority ? '(' + germplasmGnpis.speciesAuthority + ')' : '' }}
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Subtaxa"
         [test]="germplasmGnpis.subtaxa">
         <ng-template>
           <i>{{ germplasmGnpis.subtaxa }}</i>
           {{ germplasmGnpis.subtaxaAuthority ? '(' + germplasmGnpis.subtaxaAuthority + ')' : '' }}
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Authority"
         [test]="germplasmTaxonAuthor">
         <ng-template>
           {{ germplasmTaxonAuthor }}
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Taxon ID"
         [test]="taxonIdsWithURL && taxonIdsWithURL.length > 0">
         <ng-template>
           <ng-container *ngFor="let taxonRef of taxonIdsWithURL">
 
-            <gpds-card-row
+            <faidare-card-row
               [label]="taxonRef.sourceName"
               [test]="taxonRef.url">
               <ng-template>
@@ -64,29 +64,29 @@
                   {{ taxonRef.taxonId }}
                 </a>
               </ng-template>
-            </gpds-card-row>
+            </faidare-card-row>
 
-            <gpds-card-row
+            <faidare-card-row
               [label]="taxonRef.sourceName"
               [test]="!taxonRef.url">
               <ng-template>
                 {{ taxonRef.taxonId }}
               </ng-template>
-            </gpds-card-row>
+            </faidare-card-row>
 
           </ng-container>
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Comment"
         [test]="germplasmGnpis.taxonComment">
         <ng-template>
           {{ germplasmGnpis.taxonComment }}
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Taxon common names"
         [test]="germplasmGnpis.taxonCommonNames && germplasmGnpis.taxonCommonNames.length > 0">
         <ng-template>
@@ -94,9 +94,9 @@
             {{ germplasmGnpis.taxonCommonNames.join(', ') }}
           </div>
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Taxon synonyms"
         [test]="germplasmGnpis.taxonSynonyms && germplasmGnpis.taxonSynonyms.length > 0">
         <ng-template>
@@ -104,45 +104,45 @@
             <i>{{ germplasmGnpis.taxonSynonyms.join(', ') }}</i>
           </div>
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
     </ng-template>
 
     <ng-template #instituteTemplate let-logo="logo" let-code="instituteCode" let-acronym="acronym" let-organisation="organisation" let-type="instituteType" let-webSite="webSite" let-address="address">
-      <gpds-card-row
+      <faidare-card-row
         label=""
         [test]="logo">
         <ng-template>
           <img
             [src]="logo"/>
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Code"
         [value]="code">
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Acronym"
         [value]="acronym">
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Organisation"
         [value]="organisation">
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Type"
         [value]="type">
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Address"
         [value]="address">
-      </gpds-card-row>
+      </faidare-card-row>
 
-      <gpds-card-row
+      <faidare-card-row
         label="Website"
         [test]="webSite">
         <ng-template>
@@ -150,7 +150,7 @@
             {{ webSite }}
           </a>
         </ng-template>
-      </gpds-card-row>
+      </faidare-card-row>
     </ng-template>
 
     <ng-template #holdingInstituteTemplate>
@@ -189,53 +189,53 @@
                alt="" width="250px">
           <div class="card-body">
 
-            <gpds-card-row
+            <faidare-card-row
               label="Accession name"
               [value]="germplasmGnpis.germplasmName">
-            </gpds-card-row>
+            </faidare-card-row>
 
-            <gpds-card-row
+            <faidare-card-row
               label="Photo name"
               [value]="germplasmGnpis.photo.photoName">
-            </gpds-card-row>
+            </faidare-card-row>
 
-            <gpds-card-row
+            <faidare-card-row
               label="Description"
               [value]="germplasmGnpis.photo.description">
-            </gpds-card-row>
+            </faidare-card-row>
 
-            <gpds-card-row
+            <faidare-card-row
               label="Copyright"
               [value]="'© '+germplasmGnpis.photo.copyright">
-            </gpds-card-row>
+            </faidare-card-row>
           </div>
         </div>
       </ng-template>
     </div>
 
     <!--Section for the information about the identification of the germplasm-->
-    <gpds-card-section
+    <faidare-card-section
       class="col-12 col-lg"
       header="Identification">
       <ng-template>
         <div class="card-body card-section-body">
 
-          <gpds-card-row
+          <faidare-card-row
             label="Germplasm name"
             [value]="germplasmGnpis.germplasmName">
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Accession number"
             [value]="germplasmGnpis.accessionNumber">
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Permanent Unique Identifier"
             [value]="germplasmGnpis.germplasmPUI">
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Source"
             [test]="germplasmSource">
             <ng-template>
@@ -244,9 +244,9 @@
                 <img [src]="germplasmSource['schema:image']" alt="Germplasm source image"/>
               </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Data source"
             [test]="germplasmSource['schema:identifier'] && germplasmGnpis.documentationURL">
             <ng-template>
@@ -254,9 +254,9 @@
                 Link to this study on {{ germplasmSource['schema:identifier'] }}
               </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Accession synonyms"
             [test]="germplasmGnpis.synonyms && germplasmGnpis.synonyms.length > 0">
             <ng-template>
@@ -264,9 +264,9 @@
                 {{ germplasmGnpis.synonyms.join(', ') }}
               </div>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Taxon"
             [test]="germplasmTaxon">
             <ng-template>
@@ -279,34 +279,34 @@
                 {{ germplasmTaxonAuthor ? '(' + germplasmTaxonAuthor + ')' : '' }}
               </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Biological status"
             [value]="germplasmGnpis.biologicalStatusOfAccessionCode">
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Genetic nature"
             [value]="germplasmGnpis.geneticNature">
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Seed source"
             [value]="germplasmGnpis.seedSource">
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Pedigree"
             [value]="germplasmGnpis.pedigree">
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Comments"
             [value]="germplasmGnpis.comment">
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             label="Origin site"
             [test]="germplasmGnpis.originSite && germplasmGnpis.originSite.siteName">
             <ng-template>
@@ -314,21 +314,21 @@
                 {{ germplasmGnpis.originSite.siteName }}
               </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
         </div>
       </ng-template>
-    </gpds-card-section>
+    </faidare-card-section>
   </div>
 
   <!--Section for the information about the holding of the germplasm-->
-  <gpds-card-section
+  <faidare-card-section
     header="Holding"
     [test]="germplasmGnpis.holdingInstitute">
     <ng-template>
       <div class="card-body card-section-body">
 
-        <gpds-card-row
+        <faidare-card-row
           label="Institution">
           <ng-template>
             <a class="popover-underline" data-boundary="window" placement="auto"
@@ -338,9 +338,9 @@
                container="body">
               {{ germplasmGnpis.holdingInstitute.instituteName }}</a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
   
-        <gpds-card-row
+        <faidare-card-row
           label="Stock center name"
           [test]="germplasmGnpis.holdingGenbank.instituteName && germplasmGnpis.holdingGenbank.webSite">
           <ng-template>
@@ -348,33 +348,33 @@
               {{ germplasmGnpis.holdingGenbank.instituteName }}
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Stock center name"
           [test]="germplasmGnpis.holdingGenbank.instituteName && !germplasmGnpis.holdingGenbank.webSite">
           <ng-template>
             {{ germplasmGnpis.holdingGenbank.instituteName }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Presence status"
           [value]="germplasmGnpis.presenceStatus">
-        </gpds-card-row>
+        </faidare-card-row>
 
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--Section for the information about the collector of the germplasm-->
-  <gpds-card-section
+  <faidare-card-section
     header="Collecting"
     [test]="checkCollecting()">
     <ng-template>
       <div class="card-body card-section-body">
 
-        <gpds-card-row
+        <faidare-card-row
           label="Collecting site"
           [test]="germplasmGnpis.collectingSite && germplasmGnpis.collectingSite.siteName">
           <ng-template>
@@ -382,41 +382,41 @@
               {{ germplasmGnpis.collectingSite.siteName }}
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Material type"
           [test]="germplasmGnpis.collector && germplasmGnpis.collector.materialType">
           <ng-template>
             {{ germplasmGnpis.collector.materialType }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Collectors"
           [test]="germplasmGnpis.collector && germplasmGnpis.collector.collectors">
           <ng-template>
             {{ germplasmGnpis.collector.collectors }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Acquisition/Creation date"
           [test]="germplasmGnpis.collector.accessionCreationDate">
           <ng-template>
             {{ germplasmGnpis.collector.accessionCreationDate | amParse:'YYYYMMDD' | amDateFormat:'YYYY-MM-DD' }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Acquisition/Creation date"
           [test]="germplasmGnpis.acquisitionDate && !germplasmGnpis.collector.accessionCreationDate">
           <ng-template>
             {{ germplasmGnpis.acquisitionDate }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Institution"
           [test]="germplasmGnpis.collector.institute && germplasmGnpis.collector.institute.instituteName">
           <ng-template>
@@ -427,28 +427,28 @@
               {{ germplasmGnpis.collector.institute.instituteName }}
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Accession number"
           [test]="germplasmGnpis.collector && germplasmGnpis.collector.accessionNumber">
           <ng-template>
             {{ germplasmGnpis.collector.accessionNumber }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--Section for the information about the breeder of the germplasm-->
-  <gpds-card-section
+  <faidare-card-section
     header="Breeder"
     [test]="checkBreeder()">
     <ng-template>
       <div class="card-body card-section-body">
 
-        <gpds-card-row
+        <faidare-card-row
           label="Institute"
           [test]="germplasmGnpis.breeder.institute && germplasmGnpis.breeder.institute.instituteName">
           <ng-template>
@@ -459,39 +459,39 @@
               {{ germplasmGnpis.breeder.institute.instituteName }}
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Accession creation year"
           [value]="germplasmGnpis.breeder.accessionCreationDate ">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Accession number"
           [value]="germplasmGnpis.breeder.accessionNumber">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Catalog registration year"
           [value]="germplasmGnpis.breeder.registrationYear">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Catalog deregistration year"
           [value]="germplasmGnpis.breeder.deregistrationYear">
-        </gpds-card-row>
+        </faidare-card-row>
 
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--Section for the information about the donor of the germplasm-->
-  <gpds-card-section
+  <faidare-card-section
     header="Donor"
     [test]="germplasmGnpis.donors && germplasmGnpis.donors.length > 0">
     <ng-template>
 
-      <gpds-card-table
+      <faidare-card-table
         [headers]="[
                 'Institute name',
                 'Institute code',
@@ -521,19 +521,19 @@
             <td>{{ row.donorGermplasmPUI }}</td>
             </tr>
         </ng-template>
-      </gpds-card-table>
+      </faidare-card-table>
 
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--Section for the information about the distributor of the germplasm-->
-  <gpds-card-section
+  <faidare-card-section
     header="Distributor"
     [test]="germplasmGnpis.distributors && germplasmGnpis.distributors.length>0">
     <ng-template>
 
       <!--TODO : Add order column when ordering URL will be available-->
-      <gpds-card-table
+      <faidare-card-table
         [headers]="[
         'Institute',
         'Accession number',
@@ -559,66 +559,66 @@
             <td>{{ row.distributionStatus }}</td>
           </tr>
         </ng-template>
-      </gpds-card-table>
+      </faidare-card-table>
 
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--Section for the information about the primary descriptors of the germplasm-->
-  <gpds-card-section
+  <faidare-card-section
     header="Evaluation Data"
     [test]="germplasmAttributes && germplasmAttributes.length > 0">
     <ng-template>
       <div class="card-body card-section-body">
 
         <ng-container *ngFor="let descriptor of germplasmAttributes">
-          <gpds-card-row
+          <faidare-card-row
             [label]="descriptor.attributeName"
             [value]="descriptor.value">
-          </gpds-card-row>
+          </faidare-card-row>
         </ng-container>
 
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--Section for the information about the genealoggy of the germplasm-->
-  <gpds-card-section
+  <faidare-card-section
     header="Genealogy"
     [test]="checkPedigree() || checkProgeny()">
     <ng-template>
       <div class="card-body card-section-body">
 
-        <gpds-card-row
+        <faidare-card-row
           label="Crossing plan"
           [test]="germplasmPedigree && germplasmPedigree.crossingPlan">
           <ng-template>
             {{ germplasmPedigree.crossingPlan }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Crossing year"
           [test]="germplasmPedigree && germplasmPedigree.crossingYear">
           <ng-template>
             {{ germplasmPedigree.crossingYear }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Family code"
           [test]="germplasmPedigree && germplasmPedigree.familyCode">
           <ng-template>
             {{ germplasmPedigree.familyCode }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Parent accessions"
           [test]="germplasmPedigree && germplasmPedigree.parent1Name">
 
           <ng-template>
-            <gpds-card-row
+            <faidare-card-row
               [label]="germplasmPedigree.parent1Type"
               [test]="germplasmPedigree && germplasmPedigree.parent1DbId">
               <ng-template>
@@ -627,9 +627,9 @@
                   {{ germplasmPedigree.parent1Name }}
                 </a>
               </ng-template>
-            </gpds-card-row>
+            </faidare-card-row>
 
-            <gpds-card-row
+            <faidare-card-row
               [label]="germplasmPedigree.parent2Type"
               [test]="germplasmPedigree && germplasmPedigree.parent2DbId">
               <ng-template>
@@ -638,12 +638,12 @@
                   {{ germplasmPedigree.parent2Name }}
                 </a>
               </ng-template>
-            </gpds-card-row>
+            </faidare-card-row>
 
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Sibling accession"
           [test]="germplasmPedigree && (germplasmPedigree.siblings && germplasmPedigree.siblings.length > 0)">
           <ng-template>
@@ -657,17 +657,17 @@
             </div>
 
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Descendant"
           [test]="checkProgeny()">
-        </gpds-card-row>
+        </faidare-card-row>
 
         <div class="content-overflow-big">
           <ng-container *ngFor="let child of germplasmProgeny">
 
-            <gpds-card-row class="text"
+            <faidare-card-row class="text"
                            [label]="child.secondParentName ? 'child(ren) of ' + child.firstParentName + ' x ' + child.secondParentName : 'child(ren) of ' + child.firstParentName"
                            [test]="checkProgeny()">
               <ng-template>
@@ -679,23 +679,23 @@
                 </ng-container>
 
               </ng-template>
-            </gpds-card-row>
+            </faidare-card-row>
           </ng-container>
         </div>
 
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--Section for the information about the population, collection and panel of the germplasm-->
-  <gpds-card-section
+  <faidare-card-section
     header="Population"
     [test]="germplasmGnpis.population && germplasmGnpis.population.length > 0">
     <ng-template>
        <div class="card-body card-section-body card-section-body">
         <ng-container *ngFor="let population of germplasmGnpis.population">
 
-          <gpds-card-row
+          <faidare-card-row
             [label]="population.type ? population.name + ' (' + population.type + ')' : population.name"
             [test]="population.germplasmRef && population.germplasmRef.pui && population.germplasmRef.pui != germplasmGnpis.germplasmDbId">
             <ng-template>
@@ -708,9 +708,9 @@
               {{ population.germplasmCount }} accessions
             </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             [label]="population.type ? population.name + ' (' + population.type + ')' : population.name"
             [test]="population.germplasmRef && population.germplasmRef.pui && population.germplasmRef.pui == germplasmGnpis.germplasmDbId">
             <ng-template>
@@ -720,9 +720,9 @@
               {{ population.germplasmCount }} accessions
             </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
-          <gpds-card-row
+          <faidare-card-row
             [label]="population.type ? population.name + ' (' + population.type + ')' : population.name"
             [test]="population.germplasmRef && !population.germplasmRef.pui">
             <ng-template>
@@ -731,21 +731,21 @@
                 {{ population.germplasmCount }} accessions
               </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
         </ng-container>
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
-  <gpds-card-section
+  <faidare-card-section
     header="Collection"
     [test]="germplasmGnpis.collection && germplasmGnpis.collection.length > 0">
     <ng-template>
       <div class="card-body card-section-body">
         <ng-container *ngFor="let collection of germplasmGnpis.collection">
 
-          <gpds-card-row
+          <faidare-card-row
             [label]="collection.type ? collection.name + ' (' + collection.type + ')' : collection.name">
             <ng-template>
               <a [routerLink]="['/']"
@@ -753,21 +753,21 @@
                 {{ collection.germplasmCount }} accessions
               </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
         </ng-container>
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
-  <gpds-card-section
+  <faidare-card-section
     header="Panel"
     [test]="germplasmGnpis.panel && germplasmGnpis.panel.length > 0">
     <ng-template>
       <div class="card-body card-section-body">
         <ng-container *ngFor="let panel of germplasmGnpis.panel">
 
-          <gpds-card-row
+          <faidare-card-row
             [label]="panel.type ? panel.name + ' (' + panel.type + ')' : panel.name">
             <ng-template>
               <a [routerLink]="['/']"
@@ -775,14 +775,14 @@
                 {{ panel.germplasmCount }} accessions
               </a>
             </ng-template>
-          </gpds-card-row>
+          </faidare-card-row>
 
         </ng-container>
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!-- XRefs part -->
-  <gpds-xrefs [xrefId]="germplasmGnpis.germplasmPUI"></gpds-xrefs>
+  <faidare-xrefs [xrefId]="germplasmGnpis.germplasmPUI"></faidare-xrefs>
 </ng-container>
 
diff --git a/frontend/src/app/germplasm-card/germplasm-card.component.ts b/frontend/src/app/germplasm-card/germplasm-card.component.ts
index b1aaf9f658b29aae12832fdd3e0f33c57ceca47d..e02c0cdf59eec625a88f4fa33bb5ad10a82622df 100644
--- a/frontend/src/app/germplasm-card/germplasm-card.component.ts
+++ b/frontend/src/app/germplasm-card/germplasm-card.component.ts
@@ -7,7 +7,7 @@ import { Children, Germplasm, Site } from '../models/gnpis.model';
 import { DataDiscoverySource } from '../models/data-discovery.model';
 
 @Component({
-    selector: 'gpds-germplasm-card',
+    selector: 'faidare-germplasm-card',
     templateUrl: './germplasm-card.component.html',
     styleUrls: ['./germplasm-card.component.scss']
 })
diff --git a/frontend/src/app/loading-spinner/loading-spinner.component.ts b/frontend/src/app/loading-spinner/loading-spinner.component.ts
index b0c1cef49007451936613248e9f5f419f35e8b9a..c6852e4edfbea468f38cf64633acdb7a3481025f 100644
--- a/frontend/src/app/loading-spinner/loading-spinner.component.ts
+++ b/frontend/src/app/loading-spinner/loading-spinner.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { ErrorInterceptorService } from '../error-interceptor.service';
 
 @Component({
-    selector: 'gpds-loading-spinner',
+    selector: 'faidare-loading-spinner',
     template: `
         <div *ngIf="loading" class="loading">
           <i class="fa fa-spin fa-spinner" title="Loading..."></i>
diff --git a/frontend/src/app/map/map.component.html b/frontend/src/app/map/map.component.html
index 9285cb1a709ff23a3253d2e6357d8678d3ea0215..ea33a10ff63831a86e76a3de4f17c02f4fa5ec26 100644
--- a/frontend/src/app/map/map.component.html
+++ b/frontend/src/app/map/map.component.html
@@ -1,12 +1,12 @@
 <div id="map" class="rounded">
 </div>
 <div *ngIf="curatedLocationList.length > 0" id="maplegend">
-  <img src="assets/gpds/images/marker-icon-red.png" id="red"/>
+  <img src="assets/faidare/images/marker-icon-red.png" id="red"/>
   <label for="red">Origin site</label>
-  <img src="assets/gpds/images/marker-icon-blue.png" id="blue"/>
+  <img src="assets/faidare/images/marker-icon-blue.png" id="blue"/>
   <label for="blue">Collecting site</label>
-  <img src="assets/gpds/images/marker-icon-green.png" id="green"/>
+  <img src="assets/faidare/images/marker-icon-green.png" id="green"/>
   <label for="green">Evaluation site</label>
-  <img src="assets/gpds/images/marker-icon-purple.png" id="purple"/>
+  <img src="assets/faidare/images/marker-icon-purple.png" id="purple"/>
   <label for="purple">Multi-purpose site</label>
 </div>
diff --git a/frontend/src/app/map/map.component.ts b/frontend/src/app/map/map.component.ts
index bc566b84667bf0f2cf3e74d1ce99e832df0877e4..90ee33acfec4d95c26553e9bde5a6e0bf5962eec 100644
--- a/frontend/src/app/map/map.component.ts
+++ b/frontend/src/app/map/map.component.ts
@@ -4,7 +4,7 @@ import { MarkerClusterGroup } from 'leaflet.markercluster/src';
 import { BrapiLocation } from '../models/brapi.model';
 
 @Component({
-    selector: 'gpds-map',
+    selector: 'faidare-map',
     templateUrl: './map.component.html',
     styleUrls: ['./map.component.scss']
 })
@@ -60,15 +60,15 @@ export class MapComponent implements OnInit {
 
     getMarkerIconUrl(site: BrapiLocation): string {
         if (site.locationType === 'Origin site') {
-            return 'assets/gpds/images/marker-icon-red.png';
+            return 'assets/faidare/images/marker-icon-red.png';
         }
         if (site.locationType === 'Collecting site') {
-            return 'assets/gpds/images/marker-icon-blue.png';
+            return 'assets/faidare/images/marker-icon-blue.png';
         }
         if (site.locationType === 'Evaluation site') {
-            return 'assets/gpds/images/marker-icon-green.png';
+            return 'assets/faidare/images/marker-icon-green.png';
         }
-        return 'assets/gpds/images/marker-icon-purple.png';
+        return 'assets/faidare/images/marker-icon-purple.png';
     }
 
     removeEmptyLocations(locations: BrapiLocation[]) {
diff --git a/frontend/src/app/navbar/navbar.component.ts b/frontend/src/app/navbar/navbar.component.ts
index 0b8336a0749ae78381edb53284b529eb7d45f033..78d66a1c190eeed9e90bfa8b24203fa2df10ec5e 100644
--- a/frontend/src/app/navbar/navbar.component.ts
+++ b/frontend/src/app/navbar/navbar.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { environment } from '../../environments/environment';
 
 @Component({
-    selector: 'gpds-navbar',
+    selector: 'faidare-navbar',
     templateUrl: './navbar.component.html',
     styleUrls: ['./navbar.component.scss']
 })
diff --git a/frontend/src/app/result-page/document/document.component.ts b/frontend/src/app/result-page/document/document.component.ts
index 7d5f6b0e6974090ae6816d0567c611966d35b217..9a9281e3e5c64c042c624a0a3da1d272417e7fef 100644
--- a/frontend/src/app/result-page/document/document.component.ts
+++ b/frontend/src/app/result-page/document/document.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { DataDiscoveryDocument, DataDiscoveryType } from '../../models/data-discovery.model';
 
 @Component({
-    selector: 'gpds-document',
+    selector: 'faidare-document',
     templateUrl: './document.component.html',
     styleUrls: ['./document.component.scss']
 })
diff --git a/frontend/src/app/result-page/facets/facets.component.ts b/frontend/src/app/result-page/facets/facets.component.ts
index 4aa06655470ddb67e8ad5d3f3fe4cdcc022880dc..d78745ed208c44e7324567907ca11f863d8cacc9 100644
--- a/frontend/src/app/result-page/facets/facets.component.ts
+++ b/frontend/src/app/result-page/facets/facets.component.ts
@@ -5,7 +5,7 @@ import { BehaviorSubject } from 'rxjs';
 import { filter } from 'rxjs/operators';
 
 @Component({
-    selector: 'gpds-facets',
+    selector: 'faidare-facets',
     templateUrl: './facets.component.html',
     styleUrls: ['./facets.component.scss']
 })
diff --git a/frontend/src/app/result-page/result-page.component.html b/frontend/src/app/result-page/result-page.component.html
index b8bd5aad73bb7139335dcfd0e407aa1ddc2e9a01..f13586e7f3332d7be2ae1920c267e29ad7e11b95 100644
--- a/frontend/src/app/result-page/result-page.component.html
+++ b/frontend/src/app/result-page/result-page.component.html
@@ -10,21 +10,21 @@
     </div>
 
     <!-- Form -->
-    <gpds-form
+    <faidare-form
       #form
       [criteria$]="criteria$">
-    </gpds-form>
+    </faidare-form>
   </div>
 
   <!-- Column for facets -->
   <div class="col-lg-3 order-lg-first">
     <div class="row">
-      <gpds-facets
+      <faidare-facets
         class="col-12 col-lg-12 col-sm-6"
         *ngFor="let facet of facets"
         [criteria$]="criteria$"
         [facet]="facet">
-      </gpds-facets>
+      </faidare-facets>
     </div>
 
   </div>
@@ -33,7 +33,7 @@
   <div class="col-lg-9">
     <!-- Loading spinner-->
     <div class="text-center">
-      <gpds-loading-spinner [loading]="loading"></gpds-loading-spinner>
+      <faidare-loading-spinner [loading]="loading"></faidare-loading-spinner>
     </div>
 
     <!-- No criteria selected -->
@@ -74,10 +74,10 @@
       </div>
 
       <!-- Result document -->
-      <gpds-document
+      <faidare-document
         *ngFor="let document of documents"
         [document]="document">
-      </gpds-document>
+      </faidare-document>
 
       <!-- Pagination -->
       <!--Bottom page navigator-->
diff --git a/frontend/src/app/result-page/result-page.component.ts b/frontend/src/app/result-page/result-page.component.ts
index f8422b8fa546e85d850887fe44902fef7a706fdb..9a200f719d7d33ce3e80d3a0059623f02159a4f5 100644
--- a/frontend/src/app/result-page/result-page.component.ts
+++ b/frontend/src/app/result-page/result-page.component.ts
@@ -15,7 +15,7 @@ import { FormComponent } from '../form/form.component';
 
 
 @Component({
-    selector: 'gpds-result',
+    selector: 'faidare-result',
     templateUrl: './result-page.component.html',
     styleUrls: ['./result-page.component.scss'],
 })
diff --git a/frontend/src/app/site-card/site-card.component.html b/frontend/src/app/site-card/site-card.component.html
index ba9d335ec0745debd040e32df55016c3e8dfdde8..f2882f3f5bca340a3388ebce3647d68c1e3b8d12 100644
--- a/frontend/src/app/site-card/site-card.component.html
+++ b/frontend/src/app/site-card/site-card.component.html
@@ -1,4 +1,4 @@
-<gpds-loading-spinner [loading]="loading" class="float-right"></gpds-loading-spinner>
+<faidare-loading-spinner [loading]="loading" class="float-right"></faidare-loading-spinner>
 
 <ng-container *ngIf="location">
   <h3>
@@ -7,16 +7,16 @@
 
   </h3>
 
-  <gpds-map [locations]="[location]"></gpds-map>
+  <faidare-map [locations]="[location]"></faidare-map>
 
 
 
-  <gpds-card-section
+  <faidare-card-section
     header="Details">
     <ng-template>
       <div class="card-body card-section-body">
 
-        <gpds-card-row
+        <faidare-card-row
           label="Source"
           [test]="location">
           <ng-template>
@@ -25,9 +25,9 @@
               <img [src]="locationSource['schema:image']" alt="Location source image"/>
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Data source"
           [test]="location && location['schema:identifier'] && location.documentationURL">
           <ng-template>
@@ -35,158 +35,158 @@
               Link to this study on {{ location['schema:identifier'] }}
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Abbreviation"
           [value]="location.abbreviation">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Type"
           [value]="location.locationType">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Status"
           [test]="location.additionalInfo['Site status']">
           <ng-template>
             {{ location.additionalInfo['Site status'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Institution/Landowner"
           [value]="location.institutionName">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Institution address"
           [value]="location.institutionAddress">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Coordinates precision"
           [test]="location.additionalInfo['Coordinates precision']">
           <ng-template>
             {{ location.additionalInfo['Coordinates precision'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Latitude"
           [value]="formatCoordinates(location.latitude, 'latitude')">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Longitude"
           [value]="formatCoordinates(location.longitude, 'longitude')">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Geographical location"
           [test]="location.additionalInfo['Geographical location']">
           <ng-template>
             {{ location.additionalInfo['Geographical location'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Country name"
           [test]="location.countryName && !location.additionalInfo['Geographical location']">
           <ng-template>
             {{ location.countryName }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Country code"
           [test]="location.countryCode && !location.additionalInfo['Geographical location']">
           <ng-template>
             {{ location.countryCode }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Altitude"
           [value]="location.altitude">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Slope"
           [value]="location.additionalInfo['Slope']">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Exposure"
           [test]="location.additionalInfo['Exposure']">
           <ng-template>
             {{ location.additionalInfo['Exposure'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Topography"
           [test]="location.additionalInfo['Topography']">
           <ng-template>
             {{ location.additionalInfo['Topography'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Environment type"
           [test]="location.additionalInfo['Environment type']">
           <ng-template>
             {{ location.additionalInfo['Environment type'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Distance to city"
           [test]="location.additionalInfo['Distance to city']">
           <ng-template>
             {{ location.additionalInfo['Distance to city'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Direction from city"
           [test]="location.additionalInfo['Direction from city']">
           <ng-template>
             {{ location.additionalInfo['Direction from city'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Comment"
           [test]="location.additionalInfo['Comment']">
           <ng-template>
             {{ location.additionalInfo['Comment'] }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
-  <gpds-card-section
+  <faidare-card-section
     header="Additional information"
     [test]="additionalInfos && additionalInfos.length > 0">
     <ng-template>
       <div class="card-body card-section-body">
 
         <ng-container *ngFor="let additionalInfo of additionalInfos">
-          <gpds-card-row
+          <faidare-card-row
             [label]="additionalInfo.key"
             [value]="additionalInfo.value">
-          </gpds-card-row>
+          </faidare-card-row>
         </ng-container>
 
       </div>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--XRefs part -->
-  <gpds-xrefs [xrefId]="location.locationDbId"></gpds-xrefs>
+  <faidare-xrefs [xrefId]="location.locationDbId"></faidare-xrefs>
 
 </ng-container>
diff --git a/frontend/src/app/site-card/site-card.component.ts b/frontend/src/app/site-card/site-card.component.ts
index 67888dcf1284bad1c061ddd166bd168e73e4cdcf..a376c2e709fbae155a1409907c919d8ac6ec86f4 100644
--- a/frontend/src/app/site-card/site-card.component.ts
+++ b/frontend/src/app/site-card/site-card.component.ts
@@ -7,7 +7,7 @@ import { DataDiscoverySource } from '../models/data-discovery.model';
 import { GnpisService } from '../gnpis.service';
 
 @Component({
-    selector: 'gpds-site-card',
+    selector: 'faidare-site-card',
     templateUrl: './site-card.component.html',
     styleUrls: ['./site-card.component.scss']
 })
diff --git a/frontend/src/app/study-card/study-card.component.html b/frontend/src/app/study-card/study-card.component.html
index 4f02436ca99e4ecc359ab9e939c145134f9dc613..3218208f8a0266ec506d56ef6de30568ddd1be1d 100644
--- a/frontend/src/app/study-card/study-card.component.html
+++ b/frontend/src/app/study-card/study-card.component.html
@@ -1,4 +1,4 @@
-<gpds-loading-spinner [loading]="loading" class="float-right"></gpds-loading-spinner>
+<faidare-loading-spinner [loading]="loading" class="float-right"></faidare-loading-spinner>
 
 <ng-container *ngIf="study">
   <h3>
@@ -6,31 +6,31 @@
   </h3>
 
   <!-- Display the map -->
-  <gpds-map [locations]="[study.location]"></gpds-map>
+  <faidare-map [locations]="[study.location]"></faidare-map>
 
   <!-- Display the study's info -->
-  <gpds-card-section
+  <faidare-card-section
     header="Identification">
     <ng-template>
       <div class="card-body card-section-body">
 
-        <gpds-card-row
+        <faidare-card-row
           label="Name"
           [value]="study.studyName">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Identifier"
           [value]="study.studyDbId">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Permanent unique identifier"
           [test]="study['@id'] && isNotURN(study['@id'])"
           [value]="study['@id']">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Source"
           [test]="studySource">
           <ng-template>
@@ -39,9 +39,9 @@
               <img [src]="studySource['schema:image']" alt="Study source image"/>
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Data source"
           [test]="studySource && studySource['schema:identifier'] && study.documentationURL">
           <ng-template>
@@ -49,35 +49,35 @@
               Link to this study on {{ studySource["schema:identifier"] }}
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Project name"
           [value]="study.programName">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Description"
           [value]="study.studyDescription">
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Active"
           [test]="study.active != null">
           <ng-template>
             {{ study.active ? "Yes" : "No" }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Seasons"
           [test]="study.seasons && study.seasons.length != 0">
           <ng-template>
             {{ study.seasons.join(', ') }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Date"
           [test]="study.startDate">
           <ng-template>
@@ -85,9 +85,9 @@
             'From ' + study.startDate + ' to ' + study.endDate :
             'Started on ' + study.startDate }}
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Location name"
           [test]="study.location && study.location.locationDbId">
           <ng-template>
@@ -95,9 +95,9 @@
               {{ study.location.locationName }}
             </a>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
 
-        <gpds-card-row
+        <faidare-card-row
           label="Data files"
           [test]="study.dataLinks && study.dataLinks.length != 0">
           <ng-template>
@@ -107,18 +107,18 @@
               </a>
             </div>
           </ng-template>
-        </gpds-card-row>
+        </faidare-card-row>
       </div>
 
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
 
-  <gpds-card-section
+  <faidare-card-section
     header="Genotype"
     [test]="studyGermplasms && studyGermplasms.length != 0">
     <ng-template>
-      <gpds-card-table
+      <faidare-card-table
         [headers]="[
           'Accession number',
           'Name',
@@ -136,16 +136,16 @@
             <td>{{ row.genus }} {{ row.species }} {{ row.subtaxa }}</td>
           </tr>
         </ng-template>
-      </gpds-card-table>
+      </faidare-card-table>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
 
-  <gpds-card-section
+  <faidare-card-section
     header="Variables"
     [test]="studyObservationVariables && studyObservationVariables.length != 0">
     <ng-template>
-      <gpds-card-table
+      <faidare-card-table
         [headers]="[
           'Variable id',
           'Variable short name',
@@ -169,15 +169,15 @@
             <td>{{ row.trait.description }}</td>
           </tr>
         </ng-template>
-      </gpds-card-table>
+      </faidare-card-table>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
-  <gpds-card-section
+  <faidare-card-section
     header="Data Set"
     [test]="studyDataset && studyDataset.length != 0">
     <ng-template>
-      <gpds-card-table
+      <faidare-card-table
         [headers]="[
           'Name',
           'Type',
@@ -204,15 +204,15 @@
             </td>
           </tr>
         </ng-template>
-      </gpds-card-table>
+      </faidare-card-table>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
-  <gpds-card-section
+  <faidare-card-section
     header="Contact"
     [test]="study.contacts && study.contacts.length != 0">
     <ng-template>
-      <gpds-card-table
+      <faidare-card-table
         [headers]="[
           'Role',
           'Name',
@@ -228,15 +228,15 @@
             <td>{{ row.institutionName }}</td>
           </tr>
         </ng-template>
-      </gpds-card-table>
+      </faidare-card-table>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
-  <gpds-card-section
+  <faidare-card-section
     header="Additional information"
     [test]="additionalInfos && additionalInfos.length != 0">
     <ng-template>
-      <gpds-card-table
+      <faidare-card-table
         [rows]="additionalInfos">
         <ng-template let-row>
           <tr>
@@ -244,10 +244,10 @@
             <td>{{ row.value }}</td>
           </tr>
         </ng-template>
-      </gpds-card-table>
+      </faidare-card-table>
     </ng-template>
-  </gpds-card-section>
+  </faidare-card-section>
 
   <!--XRefs part -->
-  <gpds-xrefs [xrefId]="study.studyDbId"></gpds-xrefs>
+  <faidare-xrefs [xrefId]="study.studyDbId"></faidare-xrefs>
 </ng-container>
diff --git a/frontend/src/app/study-card/study-card.component.ts b/frontend/src/app/study-card/study-card.component.ts
index 8b85644152ceb9519f958973250b2bfaa322ac7f..2d45e2948a2615a57a96cd831ef948e9381e197f 100644
--- a/frontend/src/app/study-card/study-card.component.ts
+++ b/frontend/src/app/study-card/study-card.component.ts
@@ -8,7 +8,7 @@ import { DataDiscoverySource } from '../models/data-discovery.model';
 import { KeyValueObject, toKeyValueObjects } from '../utils';
 
 @Component({
-    selector: 'gpds-study-card',
+    selector: 'faidare-study-card',
     templateUrl: './study-card.component.html',
     styleUrls: ['./study-card.component.scss']
 })
diff --git a/frontend/src/app/xrefs/xrefs.component.html b/frontend/src/app/xrefs/xrefs.component.html
index 36d80e9b53d2d7183765359c9bcb343028b2a4e5..d4015a238069976f05e4830c7eca56511b8addd8 100644
--- a/frontend/src/app/xrefs/xrefs.component.html
+++ b/frontend/src/app/xrefs/xrefs.component.html
@@ -1,7 +1,7 @@
-<gpds-card-section *ngIf="xrefs.length > 0"
+<faidare-card-section *ngIf="xrefs.length > 0"
                    header="Cross References">
   <ng-template>
-    <gpds-card-table
+    <faidare-card-table
       [headers]="[
           'Name',
            'Source',
@@ -17,6 +17,6 @@
           <td>{{ crossRef.description | slice:0:120 }}...</td>
         </tr>
       </ng-template>
-    </gpds-card-table>
+    </faidare-card-table>
   </ng-template>
-</gpds-card-section>
+</faidare-card-section>
diff --git a/frontend/src/app/xrefs/xrefs.component.ts b/frontend/src/app/xrefs/xrefs.component.ts
index 3a7ff5c75aae044cfa2d294ca8d5f2214e5c90eb..fd97128c09209f4ea2f7ec26729b5669b5e18d6e 100644
--- a/frontend/src/app/xrefs/xrefs.component.ts
+++ b/frontend/src/app/xrefs/xrefs.component.ts
@@ -3,7 +3,7 @@ import { GnpisService } from '../gnpis.service';
 import { XrefModel } from '../models/xref.model';
 
 @Component({
-    selector: 'gpds-xrefs',
+    selector: 'faidare-xrefs',
     templateUrl: './xrefs.component.html',
     styleUrls: ['./xrefs.component.scss']
 })
diff --git a/frontend/src/assets/gpds/favicon.ico b/frontend/src/assets/faidare/favicon.ico
similarity index 100%
rename from frontend/src/assets/gpds/favicon.ico
rename to frontend/src/assets/faidare/favicon.ico
diff --git a/frontend/src/assets/gpds/images/marker-icon-blue.png b/frontend/src/assets/faidare/images/marker-icon-blue.png
similarity index 100%
rename from frontend/src/assets/gpds/images/marker-icon-blue.png
rename to frontend/src/assets/faidare/images/marker-icon-blue.png
diff --git a/frontend/src/assets/gpds/images/marker-icon-green.png b/frontend/src/assets/faidare/images/marker-icon-green.png
similarity index 100%
rename from frontend/src/assets/gpds/images/marker-icon-green.png
rename to frontend/src/assets/faidare/images/marker-icon-green.png
diff --git a/frontend/src/assets/gpds/images/marker-icon-purple.png b/frontend/src/assets/faidare/images/marker-icon-purple.png
similarity index 100%
rename from frontend/src/assets/gpds/images/marker-icon-purple.png
rename to frontend/src/assets/faidare/images/marker-icon-purple.png
diff --git a/frontend/src/assets/gpds/images/marker-icon-red.png b/frontend/src/assets/faidare/images/marker-icon-red.png
similarity index 100%
rename from frontend/src/assets/gpds/images/marker-icon-red.png
rename to frontend/src/assets/faidare/images/marker-icon-red.png
diff --git a/frontend/src/assets/gpds/logo.png b/frontend/src/assets/faidare/logo.png
similarity index 100%
rename from frontend/src/assets/gpds/logo.png
rename to frontend/src/assets/faidare/logo.png
diff --git a/frontend/src/assets/gpds/theme.scss b/frontend/src/assets/faidare/theme.scss
similarity index 100%
rename from frontend/src/assets/gpds/theme.scss
rename to frontend/src/assets/faidare/theme.scss
diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
index 2b34b7fd446b963a2f5af1aaf9f47f555570498a..5c875b419bbf487516f93bc5d709287e00af57b3 100644
--- a/frontend/src/environments/environment.prod.ts
+++ b/frontend/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@
 export const environment = {
     production: false,
     navbar: {
-        title: 'GnpIS Plant Data Search',
+        title: 'FAIDARE : FAIR Data-finder for Agronomic REsearch',
         links: [
             {
                 label: 'URGI',
diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts
index 081a6813fd51e32e8e0d9bb72186227c57adeb3f..45ed45631fbef8033422655a030635c6ffed0aad 100644
--- a/frontend/src/environments/environment.ts
+++ b/frontend/src/environments/environment.ts
@@ -5,7 +5,7 @@
 export const environment = {
     production: false,
     navbar: {
-        title: 'GnpIS Plant Data Search',
+        title: 'FAIDARE : FAIR Data-finder for Agronomic REsearch',
         links: [
             {
                 label: 'URGI',
diff --git a/frontend/src/index.html b/frontend/src/index.html
index 4bd324c508b00429a2f5083674209370f73b1903..9ff8eaa8140346f1909964e45cb0de8222fc5e72 100644
--- a/frontend/src/index.html
+++ b/frontend/src/index.html
@@ -9,6 +9,6 @@
     <link rel="icon" type="image/x-icon" href="favicon.ico">
   </head>
   <body>
-    <gpds-root></gpds-root>
+    <faidare-root></faidare-root>
   </body>
 </html>
diff --git a/frontend/src/tslint.json b/frontend/src/tslint.json
index 87a3bff4867cfc072c8a420d4b28b74563592090..97be2aaf26914218cc66d277eb23e054d01e66b9 100644
--- a/frontend/src/tslint.json
+++ b/frontend/src/tslint.json
@@ -4,13 +4,13 @@
     "directive-selector": [
       true,
       "attribute",
-      "gpds",
+      "faidare",
       "camelCase"
     ],
     "component-selector": [
       true,
       "element",
-      "gpds",
+      "faidare",
       "kebab-case"
     ],
     "template-cyclomatic-complexity": [
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 32a76ee4f7b1ea79a6cfe6cdb53432a48fb8995b..4bd5a482217fc2c6b3921cafc0bdb602ebd96641 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,2 +1,2 @@
-rootProject.name = "gpds"
+rootProject.name = "faidare"
 include("backend", "frontend")