diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5eae1d6b38e9aef93e1447e373467f38d3627d5..e050a6ca7eaf470d3c150117367d7fb0dd1c3971 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ cache:
 
 stages:
   - docker-base
-  - docker-nemo
+  - docker-neos
   - build-lib
   - test
   - sonar
@@ -25,69 +25,69 @@ build-lib-master:
   stage: build-lib
   only:
     - master
-  image: registry.gitlab.inria.fr/memphis/nemo/base:latest
+  image: registry.gitlab.inria.fr/memphis/neos/base:latest
   extends: .build-lib
 
 build-lib:
   stage: build-lib
   except:
     - master
-  image: registry.gitlab.inria.fr/memphis/nemo/base:latest
-  #image: registry.gitlab.inria.fr/memphis/nemo/base/$CI_COMMIT_BRANCH:latest
+  image: registry.gitlab.inria.fr/memphis/neos/base:latest
+  #image: registry.gitlab.inria.fr/memphis/neos/base/$CI_COMMIT_BRANCH:latest
   extends: .build-lib
 
 .test:
   tags:
     - ci.inria.fr
   artifacts:
-    name: nemo_test
+    name: neos_test
     expire_in: 1 day
     paths:
-      - nemo-build.log
-      - nemo.lcov
-      - nemo-coverage.xml
-      - nemo-cppcheck.xml
-      - nemo-rats.xml
-      - nemo-vera.xml
+      - neos-build.log
+      - neos.lcov
+      - neos-coverage.xml
+      - neos-cppcheck.xml
+      - neos-rats.xml
+      - neos-vera.xml
       - build/analyzer_reports/
   script:
     - mkdir -p build && cd build && cmake .. -DBUILD_SHARED_LIBS=ON -DBUILD_CORE=ON -DBUILD_LAPLACIAN=ON -DBUILD_GEOMETRY=ON -DENABLE_MPI=ON -DBUILD_MATHS=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON -DCMAKE_VERBOSE_MAKEFILE=ON  -DCMAKE_CXX_FLAGS="-O0 -g -fPIC --coverage -Wall -fdiagnostics-show-option -fno-inline" -DCMAKE_EXE_LINKER_FLAGS="--coverage"
-    - scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make | tee ../nemo-build.log
+    - scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make | tee ../neos-build.log
     - ctest -V
     - ./examples/transport 0.1 2 2 3 0.1
     - cd ..
-    - lcov --directory . --capture --output-file nemo.lcov
-    - python -m lcov_cobertura nemo.lcov --output nemo-coverage.xml
+    - lcov --directory . --capture --output-file neos.lcov
+    - python -m lcov_cobertura neos.lcov --output neos-coverage.xml
     - gcovr -r .
     - export SOURCES_TO_ANALYZE="src tests examples"
-    - cppcheck -v -f --language=c++ --platform=unix64 --enable=all --xml --xml-version=2 --suppress=missingIncludeSystem ${SOURCES_TO_ANALYZE} 2> nemo-cppcheck.xml
-    - rats -w 3 --xml ${SOURCES_TO_ANALYZE} > nemo-rats.xml
-    - bash -c 'find ${SOURCES_TO_ANALYZE} -regex ".*\.cpp\|.*\.hpp" | vera++ - -showrules -nodup |& $HOME/sonar/sonar-cxx/cxx-sensors/src/tools/vera++Report2checkstyleReport.perl > nemo-vera.xml'
+    - cppcheck -v -f --language=c++ --platform=unix64 --enable=all --xml --xml-version=2 --suppress=missingIncludeSystem ${SOURCES_TO_ANALYZE} 2> neos-cppcheck.xml
+    - rats -w 3 --xml ${SOURCES_TO_ANALYZE} > neos-rats.xml
+    - bash -c 'find ${SOURCES_TO_ANALYZE} -regex ".*\.cpp\|.*\.hpp" | vera++ - -showrules -nodup |& $HOME/sonar/sonar-cxx/cxx-sensors/src/tools/vera++Report2checkstyleReport.perl > neos-vera.xml'
 
 test-master:
   stage: test
   only:
     - master
-  image: registry.gitlab.inria.fr/memphis/nemo/base:latest
+  image: registry.gitlab.inria.fr/memphis/neos/base:latest
   extends: .test
 
 test:
   stage: test
   except:
     - master
-  #image: registry.gitlab.inria.fr/memphis/nemo/base/$CI_COMMIT_BRANCH:latest
-  image: registry.gitlab.inria.fr/memphis/nemo/base:latest
+  #image: registry.gitlab.inria.fr/memphis/neos/base/$CI_COMMIT_BRANCH:latest
+  image: registry.gitlab.inria.fr/memphis/neos/base:latest
   extends: .test
 
 sonar:
-  image: registry.gitlab.inria.fr/memphis/nemo/base:latest
+  image: registry.gitlab.inria.fr/memphis/neos/base:latest
   tags:
     - ci.inria.fr
   stage: sonar
   dependencies:
   - test
   artifacts:
-    name: nemo_sonar
+    name: neos_sonar
     expire_in: 1 day
     paths:
       - sonar.log
@@ -129,28 +129,28 @@ docker-base:
     - docker push               $IMAGE:$CI_COMMIT_SHA
     - docker push               $IMAGE:latest
 
-docker-nemo-master:
-  stage: docker-nemo
+docker-neos-master:
+  stage: docker-neos
   when: manual
   variables:
     IMAGE: $CI_REGISTRY_IMAGE
     IMAGE_BASE: $CI_REGISTRY_IMAGE/base
   only:
     - master
-  extends: .docker-nemo
+  extends: .docker-neos
 
-docker-nemo:
-  stage: docker-nemo
+docker-neos:
+  stage: docker-neos
   when: manual
   variables:
     IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_BRANCH
     IMAGE_BASE: $CI_REGISTRY_IMAGE/base/$CI_COMMIT_BRANCH
   except:
     - master
-  extends: .docker-nemo
+  extends: .docker-neos
 
 
-.docker-nemo:
+.docker-neos:
   image: "buildah/buildah"
   variables:
     STORAGE_DRIVER: "vfs"