diff --git a/.dockerignore b/.dockerignore
index 155f4c4ab..8317d4723 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/.dvc/.gitignore b/.dvc/.gitignore
index 204effdef..6f9cbbdb6 100644
--- a/.dvc/.gitignore
+++ b/.dvc/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/.dvcignore b/.dvcignore
index 81b41471f..4a1e0c0e3 100644
--- a/.dvcignore
+++ b/.dvcignore
@@ -2,7 +2,7 @@
 # the performance. Learn more at
 # https://dvc.org/doc/user-guide/dvcignore
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/.env.example b/.env.example
index 7243fc438..79c800830 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 4b38244fc..ec3add3ff 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -33,7 +33,7 @@ A clear and concise description of what you expected to happen.
 
 Please provide the following information.
 
- - Blue Brain Search version (use `python -c "import bbsearch; print(bbsearch.__version__)"`):
+ - Blue Brain Search version (use `python -c "import bluesearch; print(bluesearch.__version__)"`):
  - OS (e.g., Linux):
  - How you installed Blue Brain Search (source, pip, ...):
  - Installation command you used (if compiling from source):
diff --git a/.gitignore b/.gitignore
index fba53ad92..99a96e655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -27,7 +27,7 @@
 !.env*.example
 
 # Version file
-/src/bbsearch/version.py
+/src/bluesearch/version.py
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
diff --git a/.jenkins.sh b/.jenkins.sh
index 62760cb63..7f932f3d6 100755
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -56,7 +56,7 @@ tox -e docs
 tox -e py37 -- --color=yes
 
 if [ "$BUILD_DOCS" = true ]; then
-  .tox/docs/bin/python -c "import bbsearch; print('Installed version BBSearch: ', bbsearch.__version__)"
+  .tox/docs/bin/python -c "import bluesearch; print('Installed version Blue Brain Search: ', bluesearch.__version__)"
   cd docs || exit  # docs is already built by tox
   pip install -i https://bbpteam.epfl.ch/repository/devpi/simple docs-internal-upload
   docs-internal-upload --docs-path _build/html --metadata-path _build/html/metadata.md
diff --git a/.mypy.ini b/.mypy.ini
index fe0b637da..db0cd1e74 100644
--- a/.mypy.ini
+++ b/.mypy.ini
@@ -1,4 +1,4 @@
-;BBSearch is a text mining toolbox focused on scientific use cases.
+;Blue Brain Search is a text mining toolbox focused on scientific use cases.
 ;
 ;Copyright (C) 2020  Blue Brain Project, EPFL.
 ;
diff --git a/.travis.yml b/.travis.yml
index f6e628881..dee71a68f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4fc136e89..3c2ed088a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/README.md b/README.md
index fd3b6965c..d2efbb246 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
@@ -600,7 +600,7 @@ Before installation, please make sure you have a recent `pip` installed (`>=19.1
 pip install --upgrade pip
 ```
 
-To install `bbsearch` run
+To install `bluesearch` run
 
 ```bash
 pip install .
@@ -626,7 +626,7 @@ $ docker run -it --rm bbs
 
 ## Documentation
 We provide additional information on the package in the documentation. It can be
-generated by sphinx. Make sure to install the `bbsearch` package with `dev`
+generated by sphinx. Make sure to install the `bluesearch` package with `dev`
 extras to get the necessary dependencies.
 
 ```bash
diff --git a/benchmarks/conftest.py b/benchmarks/conftest.py
index 3acc5e457..7c9620ae8 100644
--- a/benchmarks/conftest.py
+++ b/benchmarks/conftest.py
@@ -1,6 +1,6 @@
 """Configuration of pytest benchmarks."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/benchmarks/test_benchmark_insert.py b/benchmarks/test_benchmark_insert.py
index 4a0e4bf56..c4c30906b 100644
--- a/benchmarks/test_benchmark_insert.py
+++ b/benchmarks/test_benchmark_insert.py
@@ -1,6 +1,6 @@
 """Benchmark INSERT operations through Pandas with and without transactions."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/benchmarks/test_benchmark_servers.py b/benchmarks/test_benchmark_servers.py
index 5c15c3149..9c7e25d1c 100644
--- a/benchmarks/test_benchmark_servers.py
+++ b/benchmarks/test_benchmark_servers.py
@@ -1,6 +1,6 @@
 """Benchmark server operations."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/annotations/README.md b/data_and_models/annotations/README.md
index 6078c6b66..832d4a23b 100644
--- a/data_and_models/annotations/README.md
+++ b/data_and_models/annotations/README.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/data_and_models/annotations/ner/.gitignore b/data_and_models/annotations/ner/.gitignore
index ae59f35f1..a04bed482 100644
--- a/data_and_models/annotations/ner/.gitignore
+++ b/data_and_models/annotations/ner/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/annotations/ner/README.md b/data_and_models/annotations/ner/README.md
index 6e66bdcc7..bc408340b 100644
--- a/data_and_models/annotations/ner/README.md
+++ b/data_and_models/annotations/ner/README.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/data_and_models/annotations/ner/patterns/.gitignore b/data_and_models/annotations/ner/patterns/.gitignore
index b8fa93543..616aff0db 100644
--- a/data_and_models/annotations/ner/patterns/.gitignore
+++ b/data_and_models/annotations/ner/patterns/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/annotations/ner/patterns/README.md b/data_and_models/annotations/ner/patterns/README.md
index fd852290f..b5c1bbd2b 100644
--- a/data_and_models/annotations/ner/patterns/README.md
+++ b/data_and_models/annotations/ner/patterns/README.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/data_and_models/annotations/sentence_embedding/.gitignore b/data_and_models/annotations/sentence_embedding/.gitignore
index 33aa4db9c..e371bce3d 100644
--- a/data_and_models/annotations/sentence_embedding/.gitignore
+++ b/data_and_models/annotations/sentence_embedding/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/annotations/sentence_embedding/README.md b/data_and_models/annotations/sentence_embedding/README.md
index 64a842732..cc5969cee 100644
--- a/data_and_models/annotations/sentence_embedding/README.md
+++ b/data_and_models/annotations/sentence_embedding/README.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/data_and_models/metrics/ner/.gitignore b/data_and_models/metrics/ner/.gitignore
index b39d742b8..ea510ef10 100644
--- a/data_and_models/metrics/ner/.gitignore
+++ b/data_and_models/metrics/ner/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/metrics/ner/interrater/.gitignore b/data_and_models/metrics/ner/interrater/.gitignore
index db43e10ef..4a4c66e5d 100644
--- a/data_and_models/metrics/ner/interrater/.gitignore
+++ b/data_and_models/metrics/ner/interrater/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/metrics/sentence_embedding/.gitignore b/data_and_models/metrics/sentence_embedding/.gitignore
index 70b4afe54..65caced7d 100644
--- a/data_and_models/metrics/sentence_embedding/.gitignore
+++ b/data_and_models/metrics/sentence_embedding/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/models/ner/.gitignore b/data_and_models/models/ner/.gitignore
index 942dc37d0..4c055d363 100644
--- a/data_and_models/models/ner/.gitignore
+++ b/data_and_models/models/ner/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/models/ner_er/.gitignore b/data_and_models/models/ner_er/.gitignore
index 942dc37d0..4c055d363 100644
--- a/data_and_models/models/ner_er/.gitignore
+++ b/data_and_models/models/ner_er/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/models/sentence_embedding/.gitignore b/data_and_models/models/sentence_embedding/.gitignore
index 3090a8179..e9265bce4 100644
--- a/data_and_models/models/sentence_embedding/.gitignore
+++ b/data_and_models/models/sentence_embedding/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/models/sentence_embedding/bsv/.gitignore b/data_and_models/models/sentence_embedding/bsv/.gitignore
index e57220e34..1dc52c0cd 100644
--- a/data_and_models/models/sentence_embedding/bsv/.gitignore
+++ b/data_and_models/models/sentence_embedding/bsv/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/pipelines/README.md b/data_and_models/pipelines/README.md
index 509d8eced..f232b0bce 100644
--- a/data_and_models/pipelines/README.md
+++ b/data_and_models/pipelines/README.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/data_and_models/pipelines/ner/Dockerfile b/data_and_models/pipelines/ner/Dockerfile
index d5458d25b..aa058aa50 100644
--- a/data_and_models/pipelines/ner/Dockerfile
+++ b/data_and_models/pipelines/ner/Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -40,7 +40,7 @@ COPY prodigy-1.10.4-cp36.cp37.cp38-cp36m.cp37m.cp38-linux_x86_64.whl /bbs/tmp
 RUN pip install /bbs/tmp/prodigy-1.10.4-cp36.cp37.cp38-cp36m.cp37m.cp38-linux_x86_64.whl
 
 # Instal BlueBrainSearach -- revision can be a branch, sha, or tag
-ARG BBS_REVISION=v0.0.9
+ARG BBS_REVISION=v0.0.10
 ADD . /src
 WORKDIR /src
 RUN pip install git+file://$PWD@$BBS_REVISION
diff --git a/data_and_models/pipelines/ner/add_er.py b/data_and_models/pipelines/ner/add_er.py
index 6c0deb284..196a365ad 100644
--- a/data_and_models/pipelines/ner/add_er.py
+++ b/data_and_models/pipelines/ner/add_er.py
@@ -1,6 +1,6 @@
 """Append an entity ruler to a spacy pipeline."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -23,8 +23,8 @@
 import spacy
 import yaml
 
-from bbsearch.mining import remap_entity_type
-from bbsearch.utils import JSONL
+from bluesearch.mining import remap_entity_type
+from bluesearch.utils import JSONL
 
 parser = ArgumentParser()
 parser.add_argument(
diff --git a/data_and_models/pipelines/ner/dvc.lock b/data_and_models/pipelines/ner/dvc.lock
index 580271034..08bf39511 100644
--- a/data_and_models/pipelines/ner/dvc.lock
+++ b/data_and_models/pipelines/ner/dvc.lock
@@ -6,11 +6,11 @@ train_model1:
     md5: 613308ed830d86284a1aee2747d911d0
     size: 324136
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: train.py
-    md5: a32b18b583d1b376aaa6d4812ae0efee
-    size: 2496
+    md5: 1ccae6b57456b9e5790a0f1232880f4b
+    size: 2505
   params:
     params.yaml:
       train.model1:
@@ -30,11 +30,11 @@ train_model2:
     md5: 2459e49418599ff96ab9db60a29b757b
     size: 953728
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: train.py
-    md5: a32b18b583d1b376aaa6d4812ae0efee
-    size: 2496
+    md5: 1ccae6b57456b9e5790a0f1232880f4b
+    size: 2505
   params:
     params.yaml:
       train.model2:
@@ -54,11 +54,11 @@ train_model3:
     md5: 4b6fff4b0091fa10ae7c88a4aeb42ae0
     size: 969928
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: train.py
-    md5: a32b18b583d1b376aaa6d4812ae0efee
-    size: 2496
+    md5: 1ccae6b57456b9e5790a0f1232880f4b
+    size: 2505
   params:
     params.yaml:
       train.model3:
@@ -78,11 +78,11 @@ train_model4:
     md5: ec5d6b86181b9e4cdefb2b2198d5ae4f
     size: 267307
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: train.py
-    md5: a32b18b583d1b376aaa6d4812ae0efee
-    size: 2496
+    md5: 1ccae6b57456b9e5790a0f1232880f4b
+    size: 2505
   params:
     params.yaml:
       train.model4:
@@ -102,11 +102,11 @@ train_model5:
     md5: ceb6ea77d2a6a69962b88218f4f5a663
     size: 394725
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: train.py
-    md5: a32b18b583d1b376aaa6d4812ae0efee
-    size: 2496
+    md5: 1ccae6b57456b9e5790a0f1232880f4b
+    size: 2505
   params:
     params.yaml:
       train.model5:
@@ -130,15 +130,15 @@ eval_disease:
     md5: 117da032ef2e2792429dff88c06c90b7
     size: 62653
   - path: ../../models/ner_er/model1
-    md5: a51a1dc7148255d3fb0e1f5b05079ec0.dir
+    md5: 5757d1ea583e2ac6aa7e642e11b56325.dir
     size: 100183520
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.DISEASE:
@@ -163,11 +163,11 @@ eval_cell_compartment:
     size: 100194437
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.CELL_COMPARTMENT:
@@ -192,11 +192,11 @@ eval_drug:
     size: 100194437
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.DRUG:
@@ -220,11 +220,11 @@ eval_organ:
     size: 100194437
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.ORGAN:
@@ -249,11 +249,11 @@ eval_chemical:
     size: 100228858
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.CHEMICAL:
@@ -277,11 +277,11 @@ eval_organism:
     size: 100228858
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.ORGANISM:
@@ -305,11 +305,11 @@ eval_cell_type:
     size: 100215798
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.CELL_TYPE:
@@ -334,11 +334,11 @@ eval_protein:
     size: 100215798
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.PROTEIN:
@@ -363,11 +363,11 @@ eval_pathway:
     size: 100224717
     nfiles: 18
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: eval.py
-    md5: db678f114f175ea0d693302963b6d2f9
-    size: 3421
+    md5: 3c9e86f7cbfaea90929e96a6443a16d4
+    size: 3391
   params:
     params.yaml:
       eval.PATHWAY:
@@ -387,18 +387,18 @@ add_er_1:
     size: 100181750
     nfiles: 16
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: add_er.py
-    md5: d4cd7b9aa165ad89d489f2fb86439d41
-    size: 2518
+    md5: aafbf109663670ded44f84025e4a37a3
+    size: 2531
   params:
     params.yaml:
       eval.DISEASE:
         etype_name: DISEASE
   outs:
   - path: ../../models/ner_er/model1
-    md5: a51a1dc7148255d3fb0e1f5b05079ec0.dir
+    md5: 5757d1ea583e2ac6aa7e642e11b56325.dir
     size: 100183520
     nfiles: 18
 add_er_2:
@@ -414,11 +414,11 @@ add_er_2:
     size: 100192674
     nfiles: 16
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: add_er.py
-    md5: d4cd7b9aa165ad89d489f2fb86439d41
-    size: 2518
+    md5: aafbf109663670ded44f84025e4a37a3
+    size: 2531
   params:
     params.yaml:
       eval.CELL_COMPARTMENT:
@@ -445,11 +445,11 @@ add_er_3:
     size: 100227109
     nfiles: 16
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: add_er.py
-    md5: d4cd7b9aa165ad89d489f2fb86439d41
-    size: 2518
+    md5: aafbf109663670ded44f84025e4a37a3
+    size: 2531
   params:
     params.yaml:
       eval.CHEMICAL:
@@ -474,11 +474,11 @@ add_er_4:
     size: 100214049
     nfiles: 16
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: add_er.py
-    md5: d4cd7b9aa165ad89d489f2fb86439d41
-    size: 2518
+    md5: aafbf109663670ded44f84025e4a37a3
+    size: 2531
   params:
     params.yaml:
       eval.CELL_TYPE:
@@ -502,11 +502,11 @@ add_er_5:
     size: 100222954
     nfiles: 16
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: add_er.py
-    md5: d4cd7b9aa165ad89d489f2fb86439d41
-    size: 2518
+    md5: aafbf109663670ded44f84025e4a37a3
+    size: 2531
   params:
     params.yaml:
       eval.PATHWAY:
@@ -534,11 +534,11 @@ interrater:
     md5: 6e248863604ce14861f38e7c9a8281bb
     size: 64285
   - path: Dockerfile
-    md5: 2a32fb5c185ede70a018e95d6be9ff21
-    size: 2163
+    md5: c7481f2f16107f71bbba5a4f08e6054e
+    size: 2173
   - path: interrater.py
-    md5: 637bc6304305c2a900c5ec7876526621
-    size: 2973
+    md5: dd9cabff57a4608753e0777838f9c746
+    size: 2984
   outs:
   - path: ../../metrics/ner/interrater/cell_compartment.json
     md5: 1c5c2f5fb7dc7f792f4a3a974fe753f8
diff --git a/data_and_models/pipelines/ner/eval.py b/data_and_models/pipelines/ner/eval.py
index 2e1a994e0..3a957660f 100644
--- a/data_and_models/pipelines/ner/eval.py
+++ b/data_and_models/pipelines/ner/eval.py
@@ -1,6 +1,6 @@
 """Evaluation script for NER models."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -26,7 +26,7 @@
 import spacy
 import yaml
 
-from bbsearch.mining.eval import (
+from bluesearch.mining.eval import (
     annotations2df,
     spacy2df,
     remove_punctuation,
diff --git a/data_and_models/pipelines/ner/interrater.py b/data_and_models/pipelines/ner/interrater.py
index 37524bc5f..c9747d6d7 100644
--- a/data_and_models/pipelines/ner/interrater.py
+++ b/data_and_models/pipelines/ner/interrater.py
@@ -1,6 +1,6 @@
 """Computation of inter-rater agreement for NER models."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -22,7 +22,7 @@
 import pathlib
 import json
 
-from bbsearch.mining.eval import (
+from bluesearch.mining.eval import (
     annotations2df,
     remove_punctuation,
     ner_report,
diff --git a/data_and_models/pipelines/ner/train.py b/data_and_models/pipelines/ner/train.py
index 32aed3f93..4f1886fed 100644
--- a/data_and_models/pipelines/ner/train.py
+++ b/data_and_models/pipelines/ner/train.py
@@ -1,6 +1,6 @@
 """Train NER models."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/pipelines/sentence_embedding/Dockerfile b/data_and_models/pipelines/sentence_embedding/Dockerfile
index 0da582231..16aeb9dd2 100644
--- a/data_and_models/pipelines/sentence_embedding/Dockerfile
+++ b/data_and_models/pipelines/sentence_embedding/Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -30,7 +30,7 @@ RUN true \
 RUN conda install -c carta mysqlclient
 
 # Instal BlueBrainSearach -- revision can be a branch, sha, or tag
-ARG BBS_REVISION=v0.0.9
+ARG BBS_REVISION=v0.0.10
 ADD . /src
 WORKDIR /src
 RUN pip install git+file://$PWD@$BBS_REVISION
diff --git a/data_and_models/pipelines/sentence_embedding/dvc.lock b/data_and_models/pipelines/sentence_embedding/dvc.lock
index c64f9f3dc..9f3a67b65 100644
--- a/data_and_models/pipelines/sentence_embedding/dvc.lock
+++ b/data_and_models/pipelines/sentence_embedding/dvc.lock
@@ -6,11 +6,11 @@ eval_biobert_nli_sts:
     md5: 92a4235ce8d292ff382ce008c31da45c
     size: 14587
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: eval.py
-    md5: d07c1e3afbf9986541ae740e6e14d583
-    size: 4517
+    md5: 344dab3249c0017493c02ef68facf4e8
+    size: 4557
   params:
     params.yaml:
       eval.biobert_nli_sts:
@@ -25,7 +25,7 @@ eval_biobert_nli_sts:
     md5: 6e18e609b7587e199060a8ced9763d98
     size: 104
   - path: ../../metrics/sentence_embedding/biobert_nli_sts.png
-    md5: a825e11f3b0765a6f65c216fc0600a37
+    md5: 86db1f66aaa757523aef3f04088cddfd
     size: 153514
 eval_bsv:
   cmd: python eval.py --annotation_files=../../annotations/sentence_embedding/sentence_similarity_cord19.csv
@@ -35,15 +35,15 @@ eval_bsv:
     md5: 92a4235ce8d292ff382ce008c31da45c
     size: 14587
   - path: ../../models/sentence_embedding/bsv
-    md5: 67f1b8b438d9f9604afc4fb55ab29638.dir
-    size: 22475737408
+    md5: d39250794b3a29ea011d8138633de48e.dir
+    size: 22475737417
     nfiles: 3
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: eval.py
-    md5: d07c1e3afbf9986541ae740e6e14d583
-    size: 4517
+    md5: 344dab3249c0017493c02ef68facf4e8
+    size: 4557
   params:
     params.yaml:
       eval.bsv:
@@ -55,10 +55,10 @@ eval_bsv:
     md5: 5849682de58ae1b1fc345c446ac60af3
     size: 1033
   - path: ../../metrics/sentence_embedding/bsv.json
-    md5: 7242047f910557c7ec3f3d0f3bd78b2e
+    md5: 59bedb32e03ede0369812c9b9fef0652
     size: 107
   - path: ../../metrics/sentence_embedding/bsv.png
-    md5: fe7ee124da06a5b654984afb47d41cfb
+    md5: 49f4a88d176f4f82524276b55f3ea99c
     size: 132449
 train_tf_idf:
   cmd: python train.py --sentences_file=../../annotations/sentence_embedding/cord19_v47_sentences_pre.txt
@@ -68,11 +68,11 @@ train_tf_idf:
     md5: d0c68b698738f714df81eb5fb29236fe
     size: 2202482311
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: train.py
-    md5: 7e64b52b1957ef359cd47cf87e8cfb1b
-    size: 3129
+    md5: 3a3955f5cbfe1e1bf53701b69e7f1857
+    size: 3138
   params:
     params.yaml:
       train.tf_idf:
@@ -95,11 +95,11 @@ eval_tf_idf:
     size: 88474206
     nfiles: 1
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: eval.py
-    md5: d07c1e3afbf9986541ae740e6e14d583
-    size: 4517
+    md5: 344dab3249c0017493c02ef68facf4e8
+    size: 4557
   params:
     params.yaml:
       eval.tf_idf:
@@ -114,7 +114,7 @@ eval_tf_idf:
     md5: 5d8beda62321460ed2221329b60d506a
     size: 106
   - path: ../../metrics/sentence_embedding/tf_idf.png
-    md5: 71198bf60d0c83cdaaedab70fecfc824
+    md5: 4f814f17e4d070a44fb1ac181f638654
     size: 86578
 train_count:
   cmd: python train.py --sentences_file=../../annotations/sentence_embedding/cord19_v47_sentences_pre.txt
@@ -124,11 +124,11 @@ train_count:
     md5: d0c68b698738f714df81eb5fb29236fe
     size: 2202482311
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: train.py
-    md5: 7e64b52b1957ef359cd47cf87e8cfb1b
-    size: 3129
+    md5: 3a3955f5cbfe1e1bf53701b69e7f1857
+    size: 3138
   params:
     params.yaml:
       train.count:
@@ -151,11 +151,11 @@ eval_count:
     size: 53618191
     nfiles: 1
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: eval.py
-    md5: d07c1e3afbf9986541ae740e6e14d583
-    size: 4517
+    md5: 344dab3249c0017493c02ef68facf4e8
+    size: 4557
   params:
     params.yaml:
       eval.count:
@@ -170,7 +170,7 @@ eval_count:
     md5: 90ca5beef27c502587f20bfcf6187283
     size: 105
   - path: ../../metrics/sentence_embedding/count.png
-    md5: 71198bf60d0c83cdaaedab70fecfc824
+    md5: 4f814f17e4d070a44fb1ac181f638654
     size: 86578
 eval_use:
   cmd: python eval.py --annotation_files=../../annotations/sentence_embedding/sentence_similarity_cord19.csv
@@ -180,11 +180,11 @@ eval_use:
     md5: 92a4235ce8d292ff382ce008c31da45c
     size: 14587
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: eval.py
-    md5: d07c1e3afbf9986541ae740e6e14d583
-    size: 4517
+    md5: 344dab3249c0017493c02ef68facf4e8
+    size: 4557
   params:
     params.yaml:
       eval.use:
@@ -193,13 +193,13 @@ eval_use:
           use_version: 5
   outs:
   - path: ../../metrics/sentence_embedding/use.csv
-    md5: e5e731dee1bba890d71f979b89c7ea9a
-    size: 1230
+    md5: 723bbaf41c68dd09305820057a604a6a
+    size: 1211
   - path: ../../metrics/sentence_embedding/use.json
-    md5: f953cf29bd2869f0ff4f4b1940e9e62e
+    md5: 4c72b969a56c9665b46a1fef13e48faa
     size: 104
   - path: ../../metrics/sentence_embedding/use.png
-    md5: 6544f0760e849828b3e1fb357f5c35df
+    md5: e458c413479c127a6eda30becc7538c0
     size: 162993
 eval_sbert:
   cmd: python eval.py --annotation_files=../../annotations/sentence_embedding/sentence_similarity_cord19.csv
@@ -209,11 +209,11 @@ eval_sbert:
     md5: 92a4235ce8d292ff382ce008c31da45c
     size: 14587
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: eval.py
-    md5: d07c1e3afbf9986541ae740e6e14d583
-    size: 4517
+    md5: 344dab3249c0017493c02ef68facf4e8
+    size: 4557
   params:
     params.yaml:
       eval.sbert:
@@ -228,7 +228,7 @@ eval_sbert:
     md5: f6e14fe75ee7969e42088e568a184a1d
     size: 106
   - path: ../../metrics/sentence_embedding/sbert.png
-    md5: bd2d24d5776d28a067612c571925312f
+    md5: 3a6f531fec2c30662ee4e523976ff048
     size: 156836
 eval_sbiobert:
   cmd: python eval.py --annotation_files=../../annotations/sentence_embedding/sentence_similarity_cord19.csv
@@ -238,11 +238,11 @@ eval_sbiobert:
     md5: 92a4235ce8d292ff382ce008c31da45c
     size: 14587
   - path: Dockerfile
-    md5: 39d7478e8564814c9d08e4c849cbccb7
-    size: 1535
+    md5: f31e8256ab2f74bda90e8b187333773a
+    size: 1545
   - path: eval.py
-    md5: d07c1e3afbf9986541ae740e6e14d583
-    size: 4517
+    md5: 344dab3249c0017493c02ef68facf4e8
+    size: 4557
   params:
     params.yaml:
       eval.sbiobert:
@@ -256,7 +256,7 @@ eval_sbiobert:
     md5: 6b705689ca7a3d0d3a7db843458518bf
     size: 105
   - path: ../../metrics/sentence_embedding/sbiobert.png
-    md5: 42e211add011ae67474a22667a06124f
+    md5: ddf8088966ccc676ca449eada9364c1a
     size: 155274
 eval_biobert_nli_sts_cord19_v1:
   cmd: python eval.py --annotation_files=../../annotations/sentence_embedding/sentence_similarity_cord19.csv
@@ -270,8 +270,8 @@ eval_biobert_nli_sts_cord19_v1:
     size: 433540587
     nfiles: 9
   - path: eval.py
-    md5: b1a79b87b1f94d1c8af6759c5bdcf2ae
-    size: 4546
+    md5: 344dab3249c0017493c02ef68facf4e8
+    size: 4557
   params:
     params.yaml:
       eval.biobert_nli_sts_cord19_v1:
@@ -280,11 +280,11 @@ eval_biobert_nli_sts_cord19_v1:
           model_name_or_path: ../../models/sentence_embedding/biobert_nli_sts_cord19_v1/
   outs:
   - path: ../../metrics/sentence_embedding/biobert_nli_sts_cord19_v1.csv
-    md5: 345d1776e4ece04b434cc8aac8c8e7d1
-    size: 1266
+    md5: f80bd92608012c65ede3417b10b0e731
+    size: 1264
   - path: ../../metrics/sentence_embedding/biobert_nli_sts_cord19_v1.json
-    md5: c4371ca281d5f224332115f5a31ce9cd
+    md5: c53426897361e4b4c66e58a78c85dad4
     size: 104
   - path: ../../metrics/sentence_embedding/biobert_nli_sts_cord19_v1.png
-    md5: 58bb0b33e11e3e84e16a30445987ea4d
+    md5: c310722f7dcac36cae1c25c382cfd89b
     size: 153802
diff --git a/data_and_models/pipelines/sentence_embedding/eval.py b/data_and_models/pipelines/sentence_embedding/eval.py
index d04dd57a1..e54837262 100644
--- a/data_and_models/pipelines/sentence_embedding/eval.py
+++ b/data_and_models/pipelines/sentence_embedding/eval.py
@@ -1,6 +1,6 @@
 """Evaluation of sentence embedding models."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -62,7 +62,7 @@ def main():
 
     print("Reading params.yaml...")
     params = yaml.safe_load(open("params.yaml"))["eval"][args.model]
-    module = importlib.import_module("bbsearch.embedding_models")
+    module = importlib.import_module("bluesearch.embedding_models")
     class_ = getattr(module, params["class"])
     model = class_(**params["init_kwargs"])
 
diff --git a/data_and_models/pipelines/sentence_embedding/scripts/.gitignore b/data_and_models/pipelines/sentence_embedding/scripts/.gitignore
index be23d4375..84166148b 100644
--- a/data_and_models/pipelines/sentence_embedding/scripts/.gitignore
+++ b/data_and_models/pipelines/sentence_embedding/scripts/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/pipelines/sentence_embedding/scripts/README.md b/data_and_models/pipelines/sentence_embedding/scripts/README.md
index 5210687f5..95b9f1ea1 100644
--- a/data_and_models/pipelines/sentence_embedding/scripts/README.md
+++ b/data_and_models/pipelines/sentence_embedding/scripts/README.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/data_and_models/pipelines/sentence_embedding/scripts/build.sh b/data_and_models/pipelines/sentence_embedding/scripts/build.sh
index 4fb22494e..8e2293433 100644
--- a/data_and_models/pipelines/sentence_embedding/scripts/build.sh
+++ b/data_and_models/pipelines/sentence_embedding/scripts/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/pipelines/sentence_embedding/train.py b/data_and_models/pipelines/sentence_embedding/train.py
index 81ab21329..2999f3b00 100644
--- a/data_and_models/pipelines/sentence_embedding/train.py
+++ b/data_and_models/pipelines/sentence_embedding/train.py
@@ -1,6 +1,6 @@
 """Training of sentence embedding models."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/raw_sentences/.gitignore b/data_and_models/raw_sentences/.gitignore
index babb5cc30..3ad573e9b 100644
--- a/data_and_models/raw_sentences/.gitignore
+++ b/data_and_models/raw_sentences/.gitignore
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/data_and_models/raw_sentences/README.md b/data_and_models/raw_sentences/README.md
index ea599769c..1ef91136c 100644
--- a/data_and_models/raw_sentences/README.md
+++ b/data_and_models/raw_sentences/README.md
@@ -1,5 +1,5 @@
 <!---
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 11621708a..399ac892a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index c4704a416..31f20dc40 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/bbs.Dockerfile b/docker/bbs.Dockerfile
index 39e20245d..6f381f894 100644
--- a/docker/bbs.Dockerfile
+++ b/docker/bbs.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/corenlp.Dockerfile b/docker/corenlp.Dockerfile
index 18cf83ee4..eb801e759 100644
--- a/docker/corenlp.Dockerfile
+++ b/docker/corenlp.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/embedding.Dockerfile b/docker/embedding.Dockerfile
index 4861c59a6..2a9134ae3 100644
--- a/docker/embedding.Dockerfile
+++ b/docker/embedding.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -43,4 +43,4 @@ ENTRYPOINT [\
 "--bind", "0.0.0.0:8080", \
 "--workers", "1", \
 "--timeout", "180", \
-"bbsearch.entrypoint:get_embedding_app()"]
+"bluesearch.entrypoint:get_embedding_app()"]
diff --git a/docker/grobid_quantities.Dockerfile b/docker/grobid_quantities.Dockerfile
index dbd9d600b..2d5121e17 100644
--- a/docker/grobid_quantities.Dockerfile
+++ b/docker/grobid_quantities.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/mining.Dockerfile b/docker/mining.Dockerfile
index cf0080f6e..71ecf1dd0 100644
--- a/docker/mining.Dockerfile
+++ b/docker/mining.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/mining.sh b/docker/mining.sh
index 37b8ca2a4..3ab6d4344 100755
--- a/docker/mining.sh
+++ b/docker/mining.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -22,4 +22,4 @@ ssh_check
 dvc_pull_models
 
 # Launch mining server
-gunicorn --bind 0.0.0.0:8080 --workers 1 --timeout 7200 'bbsearch.entrypoint:get_mining_app()'
+gunicorn --bind 0.0.0.0:8080 --workers 1 --timeout 7200 'bluesearch.entrypoint:get_mining_app()'
diff --git a/docker/mining_cache.Dockerfile b/docker/mining_cache.Dockerfile
index d650a160f..5c8f65d89 100644
--- a/docker/mining_cache.Dockerfile
+++ b/docker/mining_cache.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/mining_cache.sh b/docker/mining_cache.sh
index 365a9c513..6fab4c2a8 100755
--- a/docker/mining_cache.sh
+++ b/docker/mining_cache.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/mysql.Dockerfile b/docker/mysql.Dockerfile
index 2a77820ce..5ad3b7d8b 100644
--- a/docker/mysql.Dockerfile
+++ b/docker/mysql.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docker/search.Dockerfile b/docker/search.Dockerfile
index 208bc882e..f442c7cdc 100644
--- a/docker/search.Dockerfile
+++ b/docker/search.Dockerfile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -26,7 +26,7 @@ RUN pip install .
 
 # Set image version
 LABEL maintainer="BBP-EPFL Machine Learning team <bbp-ou-machinelearning@groupes.epfl.ch>"
-LABEL description="REST API Server for BBSearch"
+LABEL description="REST API Server for Blue Brain Search"
 
 # Add a user
 RUN useradd --create-home serveruser
@@ -46,4 +46,4 @@ ENTRYPOINT [\
 "--bind", "0.0.0.0:8080", \
 "--workers", "1", \
 "--timeout", "7200", \
-"bbsearch.entrypoint:get_search_app()"]
+"bluesearch.entrypoint:get_search_app()"]
diff --git a/docker/utils.sh b/docker/utils.sh
index 1608d17e7..6b79a3da3 100644
--- a/docker/utils.sh
+++ b/docker/utils.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docs/Makefile b/docs/Makefile
index d2d6638d1..b635afe26 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/docs/conf.py b/docs/conf.py
index 8c3abb80d..f4ab55c1e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
 # Configuration file for the Sphinx documentation builder.
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -20,7 +20,7 @@
 import os
 import sys
 
-import bbsearch
+import bluesearch
 
 sys.path.insert(0, os.path.abspath("."))
 
@@ -57,8 +57,8 @@
 #
 html_theme = "sphinx-bluebrain-theme"
 html_title = "Blue Brain Search"
-html_theme_options = {"metadata_distribution": "BBSearch"}
-version = bbsearch.__version__
+html_theme_options = {"metadata_distribution": "bluesearch"}
+version = bluesearch.__version__
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/index.rst b/docs/index.rst
index 432b7a1ca..000f5543e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,4 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
+.. Blue Brain Search is a text mining toolbox focused on scientific use cases.
    Copyright (C) 2020  Blue Brain Project, EPFL.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -29,7 +29,7 @@ Welcome to Blue Brain Search's documentation!
    :maxdepth: 2
    :caption: API:
 
-   source/api/bbsearch
+   source/api/bluesearch
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/source/_substitutions.rst b/docs/source/_substitutions.rst
index 2de27692d..ae868f8d2 100644
--- a/docs/source/_substitutions.rst
+++ b/docs/source/_substitutions.rst
@@ -1,4 +1,4 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
+.. Blue Brain Search is a text mining toolbox focused on scientific use cases.
    Copyright (C) 2020  Blue Brain Project, EPFL.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/docs/source/api/bbsearch.database.rst b/docs/source/api/bbsearch.database.rst
deleted file mode 100644
index 115f70292..000000000
--- a/docs/source/api/bbsearch.database.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.database module
-========================
-
-.. automodule:: bbsearch.database
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.embedding_models.rst b/docs/source/api/bbsearch.embedding_models.rst
deleted file mode 100644
index c06fee889..000000000
--- a/docs/source/api/bbsearch.embedding_models.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.embedding\_models module
-=================================
-
-.. automodule:: bbsearch.embedding_models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.mining.attribute.rst b/docs/source/api/bbsearch.mining.attribute.rst
deleted file mode 100644
index 824bf3d12..000000000
--- a/docs/source/api/bbsearch.mining.attribute.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.mining.attribute module
-=================================
-
-.. automodule:: bbsearch.mining.attribute
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.mining.entity.rst b/docs/source/api/bbsearch.mining.entity.rst
deleted file mode 100644
index 4996db1a3..000000000
--- a/docs/source/api/bbsearch.mining.entity.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.mining.entity module
-=============================
-
-.. automodule:: bbsearch.mining.entity
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
diff --git a/docs/source/api/bbsearch.mining.eval.rst b/docs/source/api/bbsearch.mining.eval.rst
deleted file mode 100644
index c57232ab8..000000000
--- a/docs/source/api/bbsearch.mining.eval.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.mining.eval module
-===========================
-
-.. automodule:: bbsearch.mining.eval
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.mining.pipeline.rst b/docs/source/api/bbsearch.mining.pipeline.rst
deleted file mode 100644
index 54cb87453..000000000
--- a/docs/source/api/bbsearch.mining.pipeline.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.mining.pipeline module
-===============================
-
-.. automodule:: bbsearch.mining.pipeline
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.mining.relation.rst b/docs/source/api/bbsearch.mining.relation.rst
deleted file mode 100644
index a11e58948..000000000
--- a/docs/source/api/bbsearch.mining.relation.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.mining.relation module
-===============================
-
-.. automodule:: bbsearch.mining.relation
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.mining.rst b/docs/source/api/bbsearch.mining.rst
deleted file mode 100644
index 9a138b38e..000000000
--- a/docs/source/api/bbsearch.mining.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.mining package
-=======================
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   bbsearch.mining.attribute
-   bbsearch.mining.entity
-   bbsearch.mining.eval
-   bbsearch.mining.pipeline
-   bbsearch.mining.relation
-
-Module contents
----------------
-
-.. automodule:: bbsearch.mining
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.rst b/docs/source/api/bbsearch.rst
deleted file mode 100644
index 561a20312..000000000
--- a/docs/source/api/bbsearch.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch package
-================
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   bbsearch.mining
-   bbsearch.server
-   bbsearch.widgets
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   bbsearch.database
-   bbsearch.embedding_models
-   bbsearch.search
-   bbsearch.sql
-   bbsearch.utils
-
-Module contents
----------------
-
-.. automodule:: bbsearch
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.search.rst b/docs/source/api/bbsearch.search.rst
deleted file mode 100644
index 6345168c2..000000000
--- a/docs/source/api/bbsearch.search.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.search module
-======================
-
-.. automodule:: bbsearch.search
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.server.embedding_server.rst b/docs/source/api/bbsearch.server.embedding_server.rst
deleted file mode 100644
index 921c01acb..000000000
--- a/docs/source/api/bbsearch.server.embedding_server.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.server.embedding\_server module
-========================================
-
-.. automodule:: bbsearch.server.embedding_server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.server.invalid_usage_exception.rst b/docs/source/api/bbsearch.server.invalid_usage_exception.rst
deleted file mode 100644
index 520f501f1..000000000
--- a/docs/source/api/bbsearch.server.invalid_usage_exception.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.server.invalid\_usage\_exception module
-================================================
-
-.. automodule:: bbsearch.server.invalid_usage_exception
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.server.mining_server.rst b/docs/source/api/bbsearch.server.mining_server.rst
deleted file mode 100644
index 6e10c198c..000000000
--- a/docs/source/api/bbsearch.server.mining_server.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.server.mining\_server module
-=====================================
-
-.. automodule:: bbsearch.server.mining_server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.server.rst b/docs/source/api/bbsearch.server.rst
deleted file mode 100644
index eb090d03d..000000000
--- a/docs/source/api/bbsearch.server.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.server package
-=======================
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   bbsearch.server.embedding_server
-   bbsearch.server.invalid_usage_exception
-   bbsearch.server.mining_server
-   bbsearch.server.search_server
-
-Module contents
----------------
-
-.. automodule:: bbsearch.server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.server.search_server.rst b/docs/source/api/bbsearch.server.search_server.rst
deleted file mode 100644
index 2be1deaa0..000000000
--- a/docs/source/api/bbsearch.server.search_server.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.server.search\_server module
-=====================================
-
-.. automodule:: bbsearch.server.search_server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.sql.rst b/docs/source/api/bbsearch.sql.rst
deleted file mode 100644
index 377a5e3d9..000000000
--- a/docs/source/api/bbsearch.sql.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.sql module
-===================
-
-.. automodule:: bbsearch.sql
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.utils.rst b/docs/source/api/bbsearch.utils.rst
deleted file mode 100644
index 735bac4b6..000000000
--- a/docs/source/api/bbsearch.utils.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.utils module
-=====================
-
-.. automodule:: bbsearch.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.widgets.article_saver.rst b/docs/source/api/bbsearch.widgets.article_saver.rst
deleted file mode 100644
index b85e61477..000000000
--- a/docs/source/api/bbsearch.widgets.article_saver.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.widgets.article\_saver module
-======================================
-
-.. automodule:: bbsearch.widgets.article_saver
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.widgets.mining_widget.rst b/docs/source/api/bbsearch.widgets.mining_widget.rst
deleted file mode 100644
index 8750b9399..000000000
--- a/docs/source/api/bbsearch.widgets.mining_widget.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.widgets.mining\_widget module
-======================================
-
-.. automodule:: bbsearch.widgets.mining_widget
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.widgets.rst b/docs/source/api/bbsearch.widgets.rst
deleted file mode 100644
index e0ba67c7e..000000000
--- a/docs/source/api/bbsearch.widgets.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.widgets package
-========================
-
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   bbsearch.widgets.article_saver
-   bbsearch.widgets.mining_widget
-   bbsearch.widgets.search_widget
-
-Module contents
----------------
-
-.. automodule:: bbsearch.widgets
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bbsearch.widgets.search_widget.rst b/docs/source/api/bbsearch.widgets.search_widget.rst
deleted file mode 100644
index da3d626bf..000000000
--- a/docs/source/api/bbsearch.widgets.search_widget.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
-   Copyright (C) 2020  Blue Brain Project, EPFL.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-bbsearch.widgets.search\_widget module
-======================================
-
-.. automodule:: bbsearch.widgets.search_widget
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/bluesearch.database.cord_19.rst b/docs/source/api/bluesearch.database.cord_19.rst
new file mode 100644
index 000000000..2a7e170a2
--- /dev/null
+++ b/docs/source/api/bluesearch.database.cord_19.rst
@@ -0,0 +1,7 @@
+bluesearch.database.cord\_19 module
+===================================
+
+.. automodule:: bluesearch.database.cord_19
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.database.mining_cache.rst b/docs/source/api/bluesearch.database.mining_cache.rst
new file mode 100644
index 000000000..a2b6faab1
--- /dev/null
+++ b/docs/source/api/bluesearch.database.mining_cache.rst
@@ -0,0 +1,7 @@
+bluesearch.database.mining\_cache module
+========================================
+
+.. automodule:: bluesearch.database.mining_cache
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.database.rst b/docs/source/api/bluesearch.database.rst
new file mode 100644
index 000000000..c92aa46a3
--- /dev/null
+++ b/docs/source/api/bluesearch.database.rst
@@ -0,0 +1,19 @@
+bluesearch.database package
+===========================
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   bluesearch.database.cord_19
+   bluesearch.database.mining_cache
+
+Module contents
+---------------
+
+.. automodule:: bluesearch.database
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.embedding_models.rst b/docs/source/api/bluesearch.embedding_models.rst
new file mode 100644
index 000000000..553ff49f9
--- /dev/null
+++ b/docs/source/api/bluesearch.embedding_models.rst
@@ -0,0 +1,7 @@
+bluesearch.embedding\_models module
+===================================
+
+.. automodule:: bluesearch.embedding_models
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.mining.attribute.rst b/docs/source/api/bluesearch.mining.attribute.rst
new file mode 100644
index 000000000..5ec267f0d
--- /dev/null
+++ b/docs/source/api/bluesearch.mining.attribute.rst
@@ -0,0 +1,7 @@
+bluesearch.mining.attribute module
+==================================
+
+.. automodule:: bluesearch.mining.attribute
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.mining.entity.rst b/docs/source/api/bluesearch.mining.entity.rst
new file mode 100644
index 000000000..4b0c0988c
--- /dev/null
+++ b/docs/source/api/bluesearch.mining.entity.rst
@@ -0,0 +1,7 @@
+bluesearch.mining.entity module
+===============================
+
+.. automodule:: bluesearch.mining.entity
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.mining.eval.rst b/docs/source/api/bluesearch.mining.eval.rst
new file mode 100644
index 000000000..f14317b9c
--- /dev/null
+++ b/docs/source/api/bluesearch.mining.eval.rst
@@ -0,0 +1,7 @@
+bluesearch.mining.eval module
+=============================
+
+.. automodule:: bluesearch.mining.eval
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.mining.pipeline.rst b/docs/source/api/bluesearch.mining.pipeline.rst
new file mode 100644
index 000000000..8b97ad904
--- /dev/null
+++ b/docs/source/api/bluesearch.mining.pipeline.rst
@@ -0,0 +1,7 @@
+bluesearch.mining.pipeline module
+=================================
+
+.. automodule:: bluesearch.mining.pipeline
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.mining.relation.rst b/docs/source/api/bluesearch.mining.relation.rst
new file mode 100644
index 000000000..c8c5b241e
--- /dev/null
+++ b/docs/source/api/bluesearch.mining.relation.rst
@@ -0,0 +1,7 @@
+bluesearch.mining.relation module
+=================================
+
+.. automodule:: bluesearch.mining.relation
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.mining.rst b/docs/source/api/bluesearch.mining.rst
new file mode 100644
index 000000000..74b6c343e
--- /dev/null
+++ b/docs/source/api/bluesearch.mining.rst
@@ -0,0 +1,22 @@
+bluesearch.mining package
+=========================
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   bluesearch.mining.attribute
+   bluesearch.mining.entity
+   bluesearch.mining.eval
+   bluesearch.mining.pipeline
+   bluesearch.mining.relation
+
+Module contents
+---------------
+
+.. automodule:: bluesearch.mining
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.rst b/docs/source/api/bluesearch.rst
new file mode 100644
index 000000000..bbd7decc0
--- /dev/null
+++ b/docs/source/api/bluesearch.rst
@@ -0,0 +1,33 @@
+bluesearch package
+==================
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   bluesearch.database
+   bluesearch.mining
+   bluesearch.server
+   bluesearch.widgets
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   bluesearch.embedding_models
+   bluesearch.search
+   bluesearch.sql
+   bluesearch.utils
+   bluesearch.version
+
+Module contents
+---------------
+
+.. automodule:: bluesearch
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.search.rst b/docs/source/api/bluesearch.search.rst
new file mode 100644
index 000000000..ce62d8079
--- /dev/null
+++ b/docs/source/api/bluesearch.search.rst
@@ -0,0 +1,7 @@
+bluesearch.search module
+========================
+
+.. automodule:: bluesearch.search
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.server.embedding_server.rst b/docs/source/api/bluesearch.server.embedding_server.rst
new file mode 100644
index 000000000..76e4c099e
--- /dev/null
+++ b/docs/source/api/bluesearch.server.embedding_server.rst
@@ -0,0 +1,7 @@
+bluesearch.server.embedding\_server module
+==========================================
+
+.. automodule:: bluesearch.server.embedding_server
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.server.invalid_usage_exception.rst b/docs/source/api/bluesearch.server.invalid_usage_exception.rst
new file mode 100644
index 000000000..f0465b8ff
--- /dev/null
+++ b/docs/source/api/bluesearch.server.invalid_usage_exception.rst
@@ -0,0 +1,7 @@
+bluesearch.server.invalid\_usage\_exception module
+==================================================
+
+.. automodule:: bluesearch.server.invalid_usage_exception
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.server.mining_server.rst b/docs/source/api/bluesearch.server.mining_server.rst
new file mode 100644
index 000000000..6b6002960
--- /dev/null
+++ b/docs/source/api/bluesearch.server.mining_server.rst
@@ -0,0 +1,7 @@
+bluesearch.server.mining\_server module
+=======================================
+
+.. automodule:: bluesearch.server.mining_server
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.server.rst b/docs/source/api/bluesearch.server.rst
new file mode 100644
index 000000000..92482f451
--- /dev/null
+++ b/docs/source/api/bluesearch.server.rst
@@ -0,0 +1,21 @@
+bluesearch.server package
+=========================
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   bluesearch.server.embedding_server
+   bluesearch.server.invalid_usage_exception
+   bluesearch.server.mining_server
+   bluesearch.server.search_server
+
+Module contents
+---------------
+
+.. automodule:: bluesearch.server
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.server.search_server.rst b/docs/source/api/bluesearch.server.search_server.rst
new file mode 100644
index 000000000..1b4d29dfa
--- /dev/null
+++ b/docs/source/api/bluesearch.server.search_server.rst
@@ -0,0 +1,7 @@
+bluesearch.server.search\_server module
+=======================================
+
+.. automodule:: bluesearch.server.search_server
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.sql.rst b/docs/source/api/bluesearch.sql.rst
new file mode 100644
index 000000000..48ec39d48
--- /dev/null
+++ b/docs/source/api/bluesearch.sql.rst
@@ -0,0 +1,7 @@
+bluesearch.sql module
+=====================
+
+.. automodule:: bluesearch.sql
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.utils.rst b/docs/source/api/bluesearch.utils.rst
new file mode 100644
index 000000000..cc9bc2bd8
--- /dev/null
+++ b/docs/source/api/bluesearch.utils.rst
@@ -0,0 +1,7 @@
+bluesearch.utils module
+=======================
+
+.. automodule:: bluesearch.utils
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.version.rst b/docs/source/api/bluesearch.version.rst
new file mode 100644
index 000000000..fc12c30e2
--- /dev/null
+++ b/docs/source/api/bluesearch.version.rst
@@ -0,0 +1,7 @@
+bluesearch.version module
+=========================
+
+.. automodule:: bluesearch.version
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.widgets.article_saver.rst b/docs/source/api/bluesearch.widgets.article_saver.rst
new file mode 100644
index 000000000..aeb9c4eef
--- /dev/null
+++ b/docs/source/api/bluesearch.widgets.article_saver.rst
@@ -0,0 +1,7 @@
+bluesearch.widgets.article\_saver module
+========================================
+
+.. automodule:: bluesearch.widgets.article_saver
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.widgets.mining_schema.rst b/docs/source/api/bluesearch.widgets.mining_schema.rst
new file mode 100644
index 000000000..053240e10
--- /dev/null
+++ b/docs/source/api/bluesearch.widgets.mining_schema.rst
@@ -0,0 +1,7 @@
+bluesearch.widgets.mining\_schema module
+========================================
+
+.. automodule:: bluesearch.widgets.mining_schema
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.widgets.mining_widget.rst b/docs/source/api/bluesearch.widgets.mining_widget.rst
new file mode 100644
index 000000000..108d5cacf
--- /dev/null
+++ b/docs/source/api/bluesearch.widgets.mining_widget.rst
@@ -0,0 +1,7 @@
+bluesearch.widgets.mining\_widget module
+========================================
+
+.. automodule:: bluesearch.widgets.mining_widget
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.widgets.rst b/docs/source/api/bluesearch.widgets.rst
new file mode 100644
index 000000000..5040d0c39
--- /dev/null
+++ b/docs/source/api/bluesearch.widgets.rst
@@ -0,0 +1,21 @@
+bluesearch.widgets package
+==========================
+
+Submodules
+----------
+
+.. toctree::
+   :maxdepth: 4
+
+   bluesearch.widgets.article_saver
+   bluesearch.widgets.mining_schema
+   bluesearch.widgets.mining_widget
+   bluesearch.widgets.search_widget
+
+Module contents
+---------------
+
+.. automodule:: bluesearch.widgets
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/bluesearch.widgets.search_widget.rst b/docs/source/api/bluesearch.widgets.search_widget.rst
new file mode 100644
index 000000000..44f9b2e30
--- /dev/null
+++ b/docs/source/api/bluesearch.widgets.search_widget.rst
@@ -0,0 +1,7 @@
+bluesearch.widgets.search\_widget module
+========================================
+
+.. automodule:: bluesearch.widgets.search_widget
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/entrypoint.rst b/docs/source/entrypoint.rst
index 13283c283..0efd931e1 100644
--- a/docs/source/entrypoint.rst
+++ b/docs/source/entrypoint.rst
@@ -1,4 +1,4 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
+.. Blue Brain Search is a text mining toolbox focused on scientific use cases.
    Copyright (C) 2020  Blue Brain Project, EPFL.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/docs/source/example.rst b/docs/source/example.rst
index ee01b1fa1..44e6eea62 100644
--- a/docs/source/example.rst
+++ b/docs/source/example.rst
@@ -1,4 +1,4 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
+.. Blue Brain Search is a text mining toolbox focused on scientific use cases.
    Copyright (C) 2020  Blue Brain Project, EPFL.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/docs/source/faq.rst b/docs/source/faq.rst
index c777412d0..dbc0f4721 100644
--- a/docs/source/faq.rst
+++ b/docs/source/faq.rst
@@ -1,4 +1,4 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
+.. Blue Brain Search is a text mining toolbox focused on scientific use cases.
    Copyright (C) 2020  Blue Brain Project, EPFL.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/docs/source/instructions.rst b/docs/source/instructions.rst
index 5b6555807..46d985776 100644
--- a/docs/source/instructions.rst
+++ b/docs/source/instructions.rst
@@ -1,4 +1,4 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
+.. Blue Brain Search is a text mining toolbox focused on scientific use cases.
    Copyright (C) 2020  Blue Brain Project, EPFL.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -22,7 +22,7 @@ Before installation, please make sure you have a recent :code:`pip` installed (:
 
     pip install --upgrade pip
 
-To install :code:`bbsearch` run
+To install :code:`bluesearch` run
 
 .. code-block:: bash
 
@@ -32,7 +32,7 @@ To install :code:`bbsearch` run
 Generating docs
 ---------------
 The documentation is generated by :code:`sphinx` and uses a custom BBP theme. Make sure to install
-the :code:`bbsearch` package with :code:`dev` extras to get the necessary dependencies.
+the :code:`bluesearch` package with :code:`dev` extras to get the necessary dependencies.
 
 .. code-block:: bash
 
@@ -43,7 +43,7 @@ To generate autodoc directives one can run
 .. code-block:: bash
 
     cd docs
-    sphinx-apidoc -o source/api/ -f -e ../src/bbsearch/ ../src/bbsearch/entrypoint/*
+    sphinx-apidoc -o source/api/ -f -e ../src/bluesearch/ ../src/bluesearch/entrypoint/*
 
 Note that it only needs to be rerun when there are new subpackages/modules.
 
diff --git a/docs/source/server.rst b/docs/source/server.rst
index c1d9a9b9f..c4ef72e93 100644
--- a/docs/source/server.rst
+++ b/docs/source/server.rst
@@ -1,4 +1,4 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
+.. Blue Brain Search is a text mining toolbox focused on scientific use cases.
    Copyright (C) 2020  Blue Brain Project, EPFL.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/docs/source/whatsnew.rst b/docs/source/whatsnew.rst
index 0934f5eb4..3a8d646c7 100644
--- a/docs/source/whatsnew.rst
+++ b/docs/source/whatsnew.rst
@@ -1,4 +1,4 @@
-.. BBSearch is a text mining toolbox focused on scientific use cases.
+.. Blue Brain Search is a text mining toolbox focused on scientific use cases.
    Copyright (C) 2020  Blue Brain Project, EPFL.
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -27,12 +27,13 @@ Legend
 - |Remove| denotes removed features.
 
 
-Version 0.0.10.dev
-==================
-**FIXME**
+Version 0.0.10
+==============
 
 Changes
 -------
+- |Change| :code:`bluesearch` is the new name of the Python package, replacing the former :code:`bbsearch`.
+- |Change| The code is now hosted on GitHub under :code:`BlueBrain/Search`, eliminating the redundancy of the former :code:`BlueBrain/BlueBrainSearch`.
 - |Add| in `README` the purpose of Blue Brain Search.
 - |Add| in `README` the common usage of the two widgets (search and mining).
 - |Add| in `README` a complete and step-by-step *Getting Started*.
@@ -54,7 +55,7 @@ Changes
 - |Add| security checks with :code:`bandit`.
 - |Fix| NER false positive for :code:`abstract`.
 - |Fix| refactoring issue in :code:`get_embedding_model`.
-- |Change| naming of and inside the :code:`bbsearch.entrypoints` module.
+- |Change| naming of and inside the :code:`bluesearch.entrypoints` module.
 - |Change| how the NER entry points retrieve models: now DVC is used.
 - |Change| warnings when generating the documentation into errors.
 - |Remove| :code:`scibert` from :code:`setup.py` and :code:`requirements.txt`.
@@ -104,7 +105,7 @@ Version 0.0.5
 
 Changes
 -------
-- |Change| `bbsearch.mining.eval.spacy2df` can now work with NER pipelines
+- |Change| `bluesearch.mining.eval.spacy2df` can now work with NER pipelines
   including entity rulers.
 
 
@@ -117,14 +118,14 @@ Changes
 - |Add| language detection with `langdetect`, allowing to filter out articles
   not in English or no useful content.
 - |Add| widgets inform the user on the CORD-19 version being used.
-- |Add| `bbsearch.utils.JSONL` for easy interaction with JSONL files.
-- |Add| `bbsearch.entity.PatternCreator` and other functionalities to perform
+- |Add| `bluesearch.utils.JSONL` for easy interaction with JSONL files.
+- |Add| `bluesearch.entity.PatternCreator` and other functionalities to perform
   rule-based named entity recognition.
 - |Change| module names
-- |Change| in `bbsearch.embedding_models`, `SBERT` class is now replaced by a
+- |Change| in `bluesearch.embedding_models`, `SBERT` class is now replaced by a
   more general-purpose `SentTransformer` which can wrap any object from
   `sentence_transformers.SentenceTransformer`.
-- |Add| `bbsearch.embedding_models.SklearnVectorizer` is a new class that can be used to wrap any `sklearn`
+- |Add| `bluesearch.embedding_models.SklearnVectorizer` is a new class that can be used to wrap any `sklearn`
   vectorizer object (`TfidfVectorizer`, `CountVectorizer`, `HashingVectorizer`).
 
 
diff --git a/notebooks/BBS_BBG_poc.ipynb b/notebooks/BBS_BBG_poc.ipynb
index 49c498685..67ba7c7dc 100644
--- a/notebooks/BBS_BBG_poc.ipynb
+++ b/notebooks/BBS_BBG_poc.ipynb
@@ -5,7 +5,7 @@
    "metadata": {},
    "source": [
     "<!---\n",
-    "BBSearch is a text mining toolbox focused on scientific use cases.\n",
+    "Blue Brain Search is a text mining toolbox focused on scientific use cases.\n",
     "\n",
     "Copyright (C) 2020  Blue Brain Project, EPFL.\n",
     "\n",
@@ -51,7 +51,7 @@
     "\n",
     "import jwt\n",
     "\n",
-    "from bbsearch.widgets import ArticleSaver, MiningSchema, MiningWidget, SearchWidget"
+    "from bluesearch.widgets import ArticleSaver, MiningSchema, MiningWidget, SearchWidget"
    ]
   },
   {
diff --git a/notebooks/NER_Evaluation.ipynb b/notebooks/NER_Evaluation.ipynb
index 034759105..5f0da3d62 100644
--- a/notebooks/NER_Evaluation.ipynb
+++ b/notebooks/NER_Evaluation.ipynb
@@ -5,7 +5,7 @@
    "metadata": {},
    "source": [
     "<!---\n",
-    "BBSearch is a text mining toolbox focused on scientific use cases.\n",
+    "Blue Brain Search is a text mining toolbox focused on scientific use cases.\n",
     "\n",
     "Copyright (C) 2020  Blue Brain Project, EPFL.\n",
     "\n",
@@ -55,7 +55,7 @@
     "import spacy\n",
     "\n",
     "\n",
-    "from bbsearch.mining.eval import (annotations2df, spacy2df, unique_etypes, plot_ner_confusion_matrix, \n",
+    "from bluesearch.mining.eval import (annotations2df, spacy2df, unique_etypes, plot_ner_confusion_matrix, \n",
     "                                  ner_report, ner_errors, remove_punctuation)\n",
     "\n",
     "import matplotlib.pyplot as plt\n",
diff --git a/notebooks/STS_evaluation.ipynb b/notebooks/STS_evaluation.ipynb
index e3c33148c..f23d075b4 100644
--- a/notebooks/STS_evaluation.ipynb
+++ b/notebooks/STS_evaluation.ipynb
@@ -5,7 +5,7 @@
    "metadata": {},
    "source": [
     "<!---\n",
-    "BBSearch is a text mining toolbox focused on scientific use cases.\n",
+    "Blue Brain Search is a text mining toolbox focused on scientific use cases.\n",
     "\n",
     "Copyright (C) 2020  Blue Brain Project, EPFL.\n",
     "\n",
@@ -119,7 +119,7 @@
     "import numpy as np\n",
     "import pandas as pd\n",
     "from tqdm.notebook import tqdm\n",
-    "from bbsearch.utils import H5"
+    "from bluesearch.utils import H5"
    ]
   },
   {
diff --git a/notebooks/demo_attribute_extraction.ipynb b/notebooks/demo_attribute_extraction.ipynb
index 8e549735f..ea99b640c 100644
--- a/notebooks/demo_attribute_extraction.ipynb
+++ b/notebooks/demo_attribute_extraction.ipynb
@@ -5,7 +5,7 @@
    "metadata": {},
    "source": [
     "<!---\n",
-    "BBSearch is a text mining toolbox focused on scientific use cases.\n",
+    "Blue Brain Search is a text mining toolbox focused on scientific use cases.\n",
     "\n",
     "Copyright (C) 2020  Blue Brain Project, EPFL.\n",
     "\n",
@@ -34,7 +34,7 @@
    "source": [
     "import spacy\n",
     "\n",
-    "from bbsearch.mining import AttributeExtractor, AttributeAnnotationTab, TextCollectionWidget"
+    "from bluesearch.mining import AttributeExtractor, AttributeAnnotationTab, TextCollectionWidget"
    ]
   },
   {
diff --git a/notebooks/demo_embedding_api.ipynb b/notebooks/demo_embedding_api.ipynb
index a0cf8c282..865dba102 100644
--- a/notebooks/demo_embedding_api.ipynb
+++ b/notebooks/demo_embedding_api.ipynb
@@ -5,7 +5,7 @@
    "metadata": {},
    "source": [
     "<!---\n",
-    "BBSearch is a text mining toolbox focused on scientific use cases.\n",
+    "Blue Brain Search is a text mining toolbox focused on scientific use cases.\n",
     "\n",
     "Copyright (C) 2020  Blue Brain Project, EPFL.\n",
     "\n",
diff --git a/pyproject.toml b/pyproject.toml
index c84e6789a..b4cedbfc4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/requirements.txt b/requirements.txt
index e50af38b6..b263e78d0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/setup.py b/setup.py
index 21b746453..863cad38c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -78,7 +78,7 @@
 }
 
 setup(
-    name="BBSearch",
+    name="bluesearch",
     description="Blue Brain Search",
     author="Blue Brain Project, EPFL",
     url="https://github.com/BlueBrain/BlueBrainSearch",
@@ -89,13 +89,13 @@
     },
     license="-",
     use_scm_version={
-        "write_to": "src/bbsearch/version.py",
+        "write_to": "src/bluesearch/version.py",
         "write_to_template": '"""The package version."""\n__version__ = "{version}"\n',
         # "local_scheme": "no-local-version",
     },
     package_dir={"": "src"},
     packages=find_packages("./src"),
-    package_data={"bbsearch": ["_css/stylesheet.css", "py.typed"]},
+    package_data={"bluesearch": ["_css/stylesheet.css", "py.typed"]},
     zip_safe=False,
     python_requires=">=3.6",
     setup_requires=["setuptools_scm"],
@@ -103,12 +103,12 @@
     extras_require=extras_require,
     entry_points={
         "console_scripts": [
-            "compute_embeddings = bbsearch.entrypoint:run_compute_embeddings",
-            "create_database = bbsearch.entrypoint:run_create_database",
-            "create_mining_cache = bbsearch.entrypoint:run_create_mining_cache",
-            "embedding_server = bbsearch.entrypoint:run_embedding_server",
-            "mining_server = bbsearch.entrypoint:run_mining_server",
-            "search_server = bbsearch.entrypoint:run_search_server",
+            "compute_embeddings = bluesearch.entrypoint:run_compute_embeddings",
+            "create_database = bluesearch.entrypoint:run_create_database",
+            "create_mining_cache = bluesearch.entrypoint:run_create_mining_cache",
+            "embedding_server = bluesearch.entrypoint:run_embedding_server",
+            "mining_server = bluesearch.entrypoint:run_mining_server",
+            "search_server = bluesearch.entrypoint:run_search_server",
         ]
     },
 )
diff --git a/src/bbsearch/__init__.py b/src/bluesearch/__init__.py
similarity index 91%
rename from src/bbsearch/__init__.py
rename to src/bluesearch/__init__.py
index da89e6c71..006ec23f5 100644
--- a/src/bbsearch/__init__.py
+++ b/src/bluesearch/__init__.py
@@ -1,6 +1,6 @@
 """Package for the BlueBrainSearch project."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/_css/__init__.py b/src/bluesearch/_css/__init__.py
similarity index 90%
rename from src/bbsearch/_css/__init__.py
rename to src/bluesearch/_css/__init__.py
index a68384433..e6b002dd0 100644
--- a/src/bbsearch/_css/__init__.py
+++ b/src/bluesearch/_css/__init__.py
@@ -1,6 +1,6 @@
 """CSS styling utilities."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/_css/style.py b/src/bluesearch/_css/style.py
similarity index 92%
rename from src/bbsearch/_css/style.py
rename to src/bluesearch/_css/style.py
index 81ae38d7a..00446bec4 100644
--- a/src/bbsearch/_css/style.py
+++ b/src/bluesearch/_css/style.py
@@ -1,6 +1,6 @@
 """CSS styling utilities."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/_css/stylesheet.css b/src/bluesearch/_css/stylesheet.css
similarity index 96%
rename from src/bbsearch/_css/stylesheet.css
rename to src/bluesearch/_css/stylesheet.css
index 15a043c8f..7ba8c4e0a 100644
--- a/src/bbsearch/_css/stylesheet.css
+++ b/src/bluesearch/_css/stylesheet.css
@@ -1,5 +1,5 @@
 /*
-BBSearch is a text mining toolbox focused on scientific use cases.
+Blue Brain Search is a text mining toolbox focused on scientific use cases.
 
 Copyright (C) 2020  Blue Brain Project, EPFL.
 
diff --git a/src/bbsearch/database/__init__.py b/src/bluesearch/database/__init__.py
similarity index 92%
rename from src/bbsearch/database/__init__.py
rename to src/bluesearch/database/__init__.py
index 2dcbb7562..253bc58d5 100644
--- a/src/bbsearch/database/__init__.py
+++ b/src/bluesearch/database/__init__.py
@@ -1,6 +1,6 @@
 """Embedding and Mining Databases."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/database/cord_19.py b/src/bluesearch/database/cord_19.py
similarity index 99%
rename from src/bbsearch/database/cord_19.py
rename to src/bluesearch/database/cord_19.py
index de7f4af8b..085dbac93 100644
--- a/src/bbsearch/database/cord_19.py
+++ b/src/bluesearch/database/cord_19.py
@@ -1,6 +1,6 @@
 """Module for the Database Creation."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/database/mining_cache.py b/src/bluesearch/database/mining_cache.py
similarity index 99%
rename from src/bbsearch/database/mining_cache.py
rename to src/bluesearch/database/mining_cache.py
index f8eba5030..993867708 100644
--- a/src/bbsearch/database/mining_cache.py
+++ b/src/bluesearch/database/mining_cache.py
@@ -1,6 +1,6 @@
 """Module for the Database Creation."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/embedding_models.py b/src/bluesearch/embedding_models.py
similarity index 99%
rename from src/bbsearch/embedding_models.py
rename to src/bluesearch/embedding_models.py
index 4d3329f85..9baccc58a 100644
--- a/src/bbsearch/embedding_models.py
+++ b/src/bluesearch/embedding_models.py
@@ -1,6 +1,6 @@
 """Model handling sentences embeddings."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -796,7 +796,7 @@ def get_embedding_model(model_name_or_class, checkpoint_path=None, device=None):
 
     Returns
     -------
-    bbsearch.embedding_models.EmbeddingModel
+    bluesearch.embedding_models.EmbeddingModel
         The sentence embedding model instance.
     """
     configs = {
diff --git a/src/bbsearch/entrypoint/__init__.py b/src/bluesearch/entrypoint/__init__.py
similarity index 94%
rename from src/bbsearch/entrypoint/__init__.py
rename to src/bluesearch/entrypoint/__init__.py
index adc4cebd9..846cd5bdb 100644
--- a/src/bbsearch/entrypoint/__init__.py
+++ b/src/bluesearch/entrypoint/__init__.py
@@ -1,6 +1,6 @@
 """Subpackage containing all the entry points."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/entrypoint/_helper.py b/src/bluesearch/entrypoint/_helper.py
similarity index 98%
rename from src/bbsearch/entrypoint/_helper.py
rename to src/bluesearch/entrypoint/_helper.py
index 0212c63e0..c3313384a 100644
--- a/src/bbsearch/entrypoint/_helper.py
+++ b/src/bluesearch/entrypoint/_helper.py
@@ -1,6 +1,6 @@
 """Helper functions for server entry points."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/entrypoint/compute_embeddings.py b/src/bluesearch/entrypoint/compute_embeddings.py
similarity index 98%
rename from src/bbsearch/entrypoint/compute_embeddings.py
rename to src/bluesearch/entrypoint/compute_embeddings.py
index fc32ee1cd..8846b4bf1 100644
--- a/src/bbsearch/entrypoint/compute_embeddings.py
+++ b/src/bluesearch/entrypoint/compute_embeddings.py
@@ -1,6 +1,6 @@
 """EntryPoint for the computation and saving of the embeddings."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/entrypoint/create_database.py b/src/bluesearch/entrypoint/create_database.py
similarity index 98%
rename from src/bbsearch/entrypoint/create_database.py
rename to src/bluesearch/entrypoint/create_database.py
index faf6e3276..0b30eface 100644
--- a/src/bbsearch/entrypoint/create_database.py
+++ b/src/bluesearch/entrypoint/create_database.py
@@ -1,6 +1,6 @@
 """EntryPoint for the creation of the database."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/entrypoint/create_mining_cache.py b/src/bluesearch/entrypoint/create_mining_cache.py
similarity index 98%
rename from src/bbsearch/entrypoint/create_mining_cache.py
rename to src/bluesearch/entrypoint/create_mining_cache.py
index d9ed14183..f453e03a7 100644
--- a/src/bbsearch/entrypoint/create_mining_cache.py
+++ b/src/bluesearch/entrypoint/create_mining_cache.py
@@ -1,6 +1,6 @@
 """EntryPoint for mining a database and saving of extracted items in a cache."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/entrypoint/embedding_server.py b/src/bluesearch/entrypoint/embedding_server.py
similarity index 96%
rename from src/bbsearch/entrypoint/embedding_server.py
rename to src/bluesearch/entrypoint/embedding_server.py
index e41059df1..ddb2c3220 100644
--- a/src/bbsearch/entrypoint/embedding_server.py
+++ b/src/bluesearch/entrypoint/embedding_server.py
@@ -1,6 +1,6 @@
 """Entrypoint for launching an embedding server."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/entrypoint/mining_server.py b/src/bluesearch/entrypoint/mining_server.py
similarity index 97%
rename from src/bbsearch/entrypoint/mining_server.py
rename to src/bluesearch/entrypoint/mining_server.py
index 6bbc9f7ff..f26103500 100644
--- a/src/bbsearch/entrypoint/mining_server.py
+++ b/src/bluesearch/entrypoint/mining_server.py
@@ -1,6 +1,6 @@
 """The entrypoint script for the mining server."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/entrypoint/search_server.py b/src/bluesearch/entrypoint/search_server.py
similarity index 96%
rename from src/bbsearch/entrypoint/search_server.py
rename to src/bluesearch/entrypoint/search_server.py
index e161e3855..11c218f78 100644
--- a/src/bbsearch/entrypoint/search_server.py
+++ b/src/bluesearch/entrypoint/search_server.py
@@ -1,6 +1,6 @@
 """The entrypoint script for the search server."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/mining/__init__.py b/src/bluesearch/mining/__init__.py
similarity index 94%
rename from src/bbsearch/mining/__init__.py
rename to src/bluesearch/mining/__init__.py
index 5ae2accc2..8899b21b1 100644
--- a/src/bbsearch/mining/__init__.py
+++ b/src/bluesearch/mining/__init__.py
@@ -1,6 +1,6 @@
 """Subpackage for text mining."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/mining/attribute.py b/src/bluesearch/mining/attribute.py
similarity index 99%
rename from src/bbsearch/mining/attribute.py
rename to src/bluesearch/mining/attribute.py
index a9ff624a7..768101d40 100644
--- a/src/bbsearch/mining/attribute.py
+++ b/src/bluesearch/mining/attribute.py
@@ -1,6 +1,6 @@
 """Classes and functions for attribute extraction."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/mining/entity.py b/src/bluesearch/mining/entity.py
similarity index 98%
rename from src/bbsearch/mining/entity.py
rename to src/bluesearch/mining/entity.py
index 45b755449..77dde01da 100644
--- a/src/bbsearch/mining/entity.py
+++ b/src/bluesearch/mining/entity.py
@@ -1,6 +1,6 @@
 """Classes and functions for entity extraction (aka named entity recognition)."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -25,7 +25,7 @@
 import pandas as pd
 import spacy
 
-from bbsearch.utils import JSONL
+from ..utils import JSONL
 
 
 class PatternCreator:
@@ -45,7 +45,7 @@ class PatternCreator:
 
     Examples
     --------
-    >>> from bbsearch.mining import PatternCreator
+    >>> from bluesearch.mining import PatternCreator
     >>>
     >>> pc = PatternCreator()
     >>> pc.add("FOOD", [{"LOWER": "oreo"}])
@@ -240,7 +240,7 @@ def from_jsonl(cls, path):
 
         Returns
         -------
-        pattern_creator : bbsearch.mining.PatternCreator
+        pattern_creator : bluesearch.mining.PatternCreator
             Instance of a ``PatternCreator``.
         """
         inst = cls()
diff --git a/src/bbsearch/mining/eval.py b/src/bluesearch/mining/eval.py
similarity index 99%
rename from src/bbsearch/mining/eval.py
rename to src/bluesearch/mining/eval.py
index 485f56f92..4b0799c80 100644
--- a/src/bbsearch/mining/eval.py
+++ b/src/bluesearch/mining/eval.py
@@ -1,6 +1,6 @@
 """Classes and functions for evaluating mining models predictions."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/mining/pipeline.py b/src/bluesearch/mining/pipeline.py
similarity index 98%
rename from src/bbsearch/mining/pipeline.py
rename to src/bluesearch/mining/pipeline.py
index 54b7688ed..3dd88860e 100644
--- a/src/bbsearch/mining/pipeline.py
+++ b/src/bluesearch/mining/pipeline.py
@@ -1,6 +1,6 @@
 """Complete pipeline to mine entities, relations, attributes from text."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/mining/relation.py b/src/bluesearch/mining/relation.py
similarity index 99%
rename from src/bbsearch/mining/relation.py
rename to src/bluesearch/mining/relation.py
index 67be4a46e..a97912351 100644
--- a/src/bbsearch/mining/relation.py
+++ b/src/bluesearch/mining/relation.py
@@ -1,6 +1,6 @@
 """Classes and functions for relation extraction."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/py.typed b/src/bluesearch/py.typed
similarity index 100%
rename from src/bbsearch/py.typed
rename to src/bluesearch/py.typed
diff --git a/src/bbsearch/search.py b/src/bluesearch/search.py
similarity index 99%
rename from src/bbsearch/search.py
rename to src/bluesearch/search.py
index 42427004a..a2d380d52 100644
--- a/src/bbsearch/search.py
+++ b/src/bluesearch/search.py
@@ -1,6 +1,6 @@
 """Collection of functions focused on searching."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -37,7 +37,7 @@ class SearchEngine:
     embeddings, and the SQL database to be loaded in memory.
 
     This is more or less a wrapper around `run_search`
-    from `bbsearch.search`.
+    from `bluesearch.search`.
 
     Parameters
     ----------
diff --git a/src/bbsearch/server/__init__.py b/src/bluesearch/server/__init__.py
similarity index 90%
rename from src/bbsearch/server/__init__.py
rename to src/bluesearch/server/__init__.py
index 36294da5c..5436297e9 100644
--- a/src/bbsearch/server/__init__.py
+++ b/src/bluesearch/server/__init__.py
@@ -1,6 +1,6 @@
 """Implementation of servers."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/server/embedding_server.py b/src/bluesearch/server/embedding_server.py
similarity index 96%
rename from src/bbsearch/server/embedding_server.py
rename to src/bluesearch/server/embedding_server.py
index e39fc9bc0..e4909bca7 100644
--- a/src/bbsearch/server/embedding_server.py
+++ b/src/bluesearch/server/embedding_server.py
@@ -1,6 +1,6 @@
 """Implementation of a server that computes sentence embeddings."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -23,7 +23,7 @@
 
 from flask import Flask, jsonify, make_response, request
 
-import bbsearch
+import bluesearch
 
 from .invalid_usage_exception import InvalidUsage
 
@@ -43,7 +43,7 @@ def __init__(self, embedding_models):
         super().__init__(import_name=package_name)
 
         self.server_name = "EmbeddingServer"
-        self.version = bbsearch.__version__
+        self.version = bluesearch.__version__
 
         self.logger.info("Initializing the server...")
         self.logger.info(f"Name: {self.server_name}")
@@ -63,7 +63,7 @@ def __init__(self, embedding_models):
         html_header = """
         <!DOCTYPE html>
         <head>
-        <title>BBSearch Embedding</title>
+        <title>Blue Brain Search Embedding</title>
         </head>
         """
         self.html_header = textwrap.dedent(html_header).strip() + "\n\n"
@@ -119,7 +119,7 @@ def request_welcome(self):
         """Generate a welcome page."""
         self.logger.info("Got query for welcome page on /")
         html = """
-        <h1>Welcome to the BBSearch Embedding REST API Server</h1>
+        <h1>Welcome to the Blue Brain Search Embedding REST API Server</h1>
         To receive a sentence embedding proceed as follows:
         <ul>
             <li>Wrap your query into a JSON file</li>
diff --git a/src/bbsearch/server/invalid_usage_exception.py b/src/bluesearch/server/invalid_usage_exception.py
similarity index 94%
rename from src/bbsearch/server/invalid_usage_exception.py
rename to src/bluesearch/server/invalid_usage_exception.py
index 129634d29..25abc5023 100644
--- a/src/bbsearch/server/invalid_usage_exception.py
+++ b/src/bluesearch/server/invalid_usage_exception.py
@@ -1,6 +1,6 @@
 """Custom exceptions."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/server/mining_server.py b/src/bluesearch/server/mining_server.py
similarity index 99%
rename from src/bbsearch/server/mining_server.py
rename to src/bluesearch/server/mining_server.py
index 5cf3cc610..8624e7442 100644
--- a/src/bbsearch/server/mining_server.py
+++ b/src/bluesearch/server/mining_server.py
@@ -1,6 +1,6 @@
 """The mining server."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -24,7 +24,7 @@
 import spacy
 from flask import Flask, jsonify, request
 
-import bbsearch
+import bluesearch
 
 from ..mining import SPECS, run_pipeline
 from ..sql import retrieve_articles, retrieve_mining_cache, retrieve_paragraph
@@ -55,7 +55,7 @@ def __init__(self, models_libs, connection):
         package_name, *_ = __name__.partition(".")
         super().__init__(import_name=package_name)
 
-        self.version = bbsearch.__version__
+        self.version = bluesearch.__version__
         self.server_name = "MiningServer"
 
         self.logger.info("Initializing the server")
diff --git a/src/bbsearch/server/search_server.py b/src/bluesearch/server/search_server.py
similarity index 97%
rename from src/bbsearch/server/search_server.py
rename to src/bluesearch/server/search_server.py
index 8157087cd..c571923ac 100644
--- a/src/bbsearch/server/search_server.py
+++ b/src/bluesearch/server/search_server.py
@@ -1,6 +1,6 @@
 """The search server."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -22,7 +22,7 @@
 import torch
 from flask import Flask, jsonify, request
 
-import bbsearch
+import bluesearch
 
 from ..embedding_models import BSV, USE, SBioBERT, Sent2VecModel, SentTransformer
 from ..search import SearchEngine
@@ -57,7 +57,7 @@ def __init__(
         package_name, *_ = __name__.partition(".")
         super().__init__(import_name=package_name)
 
-        self.version = bbsearch.__version__
+        self.version = bluesearch.__version__
         self.server_name = "SearchServer"
         self.connection = connection
 
@@ -120,7 +120,7 @@ def _get_model(self, model_name):
 
         Returns
         -------
-        bbsearch.embedding_models.EmbeddingModel
+        bluesearch.embedding_models.EmbeddingModel
             The embedding model class.
         """
         bsv_model_name = "BioSentVec_PubMed_MIMICIII-bigram_d700.bin"
diff --git a/src/bbsearch/sql.py b/src/bluesearch/sql.py
similarity index 99%
rename from src/bbsearch/sql.py
rename to src/bluesearch/sql.py
index b680bb187..c0bd59531 100644
--- a/src/bbsearch/sql.py
+++ b/src/bluesearch/sql.py
@@ -1,6 +1,6 @@
 """SQL Related functions."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/utils.py b/src/bluesearch/utils.py
similarity index 99%
rename from src/bbsearch/utils.py
rename to src/bluesearch/utils.py
index 3d277c1f5..2fe19c85d 100644
--- a/src/bbsearch/utils.py
+++ b/src/bluesearch/utils.py
@@ -1,6 +1,6 @@
 """Generic Utils."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -54,7 +54,7 @@ class Timer:
     Examples
     --------
     >>> import time
-    >>> from bbsearch.utils import Timer
+    >>> from bluesearch.utils import Timer
     >>>
     >>> timer = Timer(verbose=False)
     >>>
diff --git a/src/bbsearch/widgets/__init__.py b/src/bluesearch/widgets/__init__.py
similarity index 92%
rename from src/bbsearch/widgets/__init__.py
rename to src/bluesearch/widgets/__init__.py
index cc8263d57..3df971b3a 100644
--- a/src/bbsearch/widgets/__init__.py
+++ b/src/bluesearch/widgets/__init__.py
@@ -1,6 +1,6 @@
 """Various widgets related to the BBS."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/widgets/article_saver.py b/src/bluesearch/widgets/article_saver.py
similarity index 99%
rename from src/bbsearch/widgets/article_saver.py
rename to src/bluesearch/widgets/article_saver.py
index 975d7c2c8..d3aa69e5e 100644
--- a/src/bbsearch/widgets/article_saver.py
+++ b/src/bluesearch/widgets/article_saver.py
@@ -1,6 +1,6 @@
 """Module for the article_saver."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/widgets/mining_schema.py b/src/bluesearch/widgets/mining_schema.py
similarity index 98%
rename from src/bbsearch/widgets/mining_schema.py
rename to src/bluesearch/widgets/mining_schema.py
index 657d5deb2..5c9e93f8a 100644
--- a/src/bbsearch/widgets/mining_schema.py
+++ b/src/bluesearch/widgets/mining_schema.py
@@ -1,6 +1,6 @@
 """Implementation of the MiningSchma class."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/src/bbsearch/widgets/mining_widget.py b/src/bluesearch/widgets/mining_widget.py
similarity index 98%
rename from src/bbsearch/widgets/mining_widget.py
rename to src/bluesearch/widgets/mining_widget.py
index 573414861..8429ab56a 100644
--- a/src/bbsearch/widgets/mining_widget.py
+++ b/src/bluesearch/widgets/mining_widget.py
@@ -1,6 +1,6 @@
 """Module for the mining widget."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -53,9 +53,9 @@ class MiningWidget(widgets.VBox):
     ----------
     mining_server_url : str
         The URL of the mining server.
-    mining_schema : bbsearch.widgets.MiningSchema
+    mining_schema : bluesearch.widgets.MiningSchema
         The requested mining schema (entity, relation, attribute types).
-    article_saver : bbsearch.widgets.ArticleSaver
+    article_saver : bluesearch.widgets.ArticleSaver
         An instance of the article saver.
     default_text : string, optional
         The default text assign to the text area.
diff --git a/src/bbsearch/widgets/search_widget.py b/src/bluesearch/widgets/search_widget.py
similarity index 99%
rename from src/bbsearch/widgets/search_widget.py
rename to src/bluesearch/widgets/search_widget.py
index 5cf17df13..071ae9aaf 100644
--- a/src/bbsearch/widgets/search_widget.py
+++ b/src/bluesearch/widgets/search_widget.py
@@ -1,6 +1,6 @@
 """The Search widget."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -61,7 +61,7 @@ class SearchWidget(widgets.VBox):
         The URL of the bbs_search server.
     bbs_mysql_engine : sqlalchemy.engine.Engine
         Engine for connections to the bbs_mysql server.
-    article_saver : bbsearch.widgets.ArticleSaver, optional
+    article_saver : bluesearch.widgets.ArticleSaver, optional
         If specified, this article saver will keep all the article_id
         of interest for the user during the different queries.
     results_per_page : int, optional
diff --git a/tests/conftest.py b/tests/conftest.py
index 18bf7f983..c4a2c4fe8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,6 @@
 """Configuration of pytest."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/tests/test_database/test_cord_19.py b/tests/test_database/test_cord_19.py
index a1d0b2918..239f367e9 100644
--- a/tests/test_database/test_cord_19.py
+++ b/tests/test_database/test_cord_19.py
@@ -1,6 +1,6 @@
 """Tests covering the creation of the CORD-19 database."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -24,7 +24,7 @@
 import pytest
 import sqlalchemy
 
-from bbsearch.database import CORD19DatabaseCreation, mark_bad_sentences
+from bluesearch.database import CORD19DatabaseCreation, mark_bad_sentences
 
 
 @pytest.fixture()
@@ -35,7 +35,7 @@ def real_sqlalchemy_engine(
     fake_load = Mock()
     fake_load.return_value = model_entities
 
-    monkeypatch.setattr("bbsearch.database.cord_19.spacy.load", fake_load)
+    monkeypatch.setattr("bluesearch.database.cord_19.spacy.load", fake_load)
 
     version = "test"
     if fake_sqlalchemy_engine.url.drivername.startswith("mysql"):
@@ -200,7 +200,7 @@ def test_errors(self, tmpdir, jsons_path, monkeypatch, model_entities):
         fake_load = Mock()
         fake_load.return_value = model_entities
 
-        monkeypatch.setattr("bbsearch.database.cord_19.spacy.load", fake_load)
+        monkeypatch.setattr("bluesearch.database.cord_19.spacy.load", fake_load)
 
         fake_dir = Path(str(tmpdir)) / "fake"
         Path(f"{tmpdir}/cord19_test.db").touch()
diff --git a/tests/test_database/test_mining_cache.py b/tests/test_database/test_mining_cache.py
index 5f05dd993..6d424b771 100644
--- a/tests/test_database/test_mining_cache.py
+++ b/tests/test_database/test_mining_cache.py
@@ -1,6 +1,6 @@
 """Tests covering mining cache."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -26,8 +26,8 @@
 import pytest
 import sqlalchemy
 
-from bbsearch.database import CreateMiningCache
-from bbsearch.database.mining_cache import Miner
+from bluesearch.database import CreateMiningCache
+from bluesearch.database.mining_cache import Miner
 
 
 class TestMiner:
@@ -35,7 +35,7 @@ class TestMiner:
     def miner_env(self, fake_sqlalchemy_engine, monkeypatch, model_entities):
         # Re-use the "en_core_web_sm" model in the model_entities fixture
         monkeypatch.setattr(
-            "bbsearch.database.mining_cache.spacy.load",
+            "bluesearch.database.mining_cache.spacy.load",
             lambda model_path: model_entities,
         )
 
@@ -60,7 +60,7 @@ def test_create_and_mine(self, fake_sqlalchemy_engine, monkeypatch, model_entiti
 
         # Re-use the "en_core_web_sm" model in the model_entities fixture
         monkeypatch.setattr(
-            "bbsearch.database.mining_cache.spacy.load",
+            "bluesearch.database.mining_cache.spacy.load",
             lambda model_path: model_entities,
         )
 
@@ -105,7 +105,9 @@ def run_pipeline(*args, **kwargs):
             can_finish.set()
             return pd.DataFrame([fake_result])
 
-        monkeypatch.setattr("bbsearch.database.mining_cache.run_pipeline", run_pipeline)
+        monkeypatch.setattr(
+            "bluesearch.database.mining_cache.run_pipeline", run_pipeline
+        )
 
         # Work loop with queue with one article ID
         task_queue.put(article_id)
@@ -303,7 +305,7 @@ def test_do_mining(self, cache_creator, monkeypatch):
         cache_creator._schema_creation()
 
         monkeypatch.setattr(
-            "bbsearch.database.mining_cache.Miner.create_and_mine",
+            "bluesearch.database.mining_cache.Miner.create_and_mine",
             self.fake_queue_miner,
         )
         cache_creator.do_mining()
@@ -314,7 +316,7 @@ def test_do_mining(self, cache_creator, monkeypatch):
 
     def test_construct(self, cache_creator, monkeypatch):
         monkeypatch.setattr(
-            "bbsearch.database.mining_cache.Miner.create_and_mine",
+            "bluesearch.database.mining_cache.Miner.create_and_mine",
             self.fake_queue_miner,
         )
 
diff --git a/tests/test_embedding_models.py b/tests/test_embedding_models.py
index b02f5ca78..543d08b88 100644
--- a/tests/test_embedding_models.py
+++ b/tests/test_embedding_models.py
@@ -1,6 +1,6 @@
 """Tests covering embedding models."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -32,7 +32,7 @@
 import transformers
 from sentence_transformers import SentenceTransformer
 
-from bbsearch.embedding_models import (
+from bluesearch.embedding_models import (
     BSV,
     USE,
     EmbeddingModel,
@@ -81,8 +81,8 @@ def test_sbiobert_embedding(self, monkeypatch, n_sentences):
         auto_tokenizer = Mock()
         auto_tokenizer.from_pretrained.return_value = tokenizer
 
-        monkeypatch.setattr("bbsearch.embedding_models.AutoTokenizer", auto_tokenizer)
-        monkeypatch.setattr("bbsearch.embedding_models.AutoModel", auto_model)
+        monkeypatch.setattr("bluesearch.embedding_models.AutoTokenizer", auto_tokenizer)
+        monkeypatch.setattr("bluesearch.embedding_models.AutoModel", auto_model)
 
         sbiobert = SBioBERT()
 
@@ -114,7 +114,7 @@ def test_bsv_embedding(self, monkeypatch, tmpdir, n_sentences):
         bsv_model.embed_sentences.return_value = np.ones([n_sentences, 700])
         sent2vec_module.Sent2vecModel.return_value = bsv_model
 
-        monkeypatch.setattr("bbsearch.embedding_models.sent2vec", sent2vec_module)
+        monkeypatch.setattr("bluesearch.embedding_models.sent2vec", sent2vec_module)
 
         new_file_path = Path(str(tmpdir)) / "test.txt"
         new_file_path.touch()
@@ -160,7 +160,9 @@ def test_sent2vec_embedding(self, monkeypatch, tmpdir, n_sentences):
 
         fake_sent2vec_module = Mock()
         fake_sent2vec_module.Sent2vecModel.return_value = fake_sent2vec_model
-        monkeypatch.setattr("bbsearch.embedding_models.sent2vec", fake_sent2vec_module)
+        monkeypatch.setattr(
+            "bluesearch.embedding_models.sent2vec", fake_sent2vec_module
+        )
 
         # Test invalid checkpoint path
         with pytest.raises(FileNotFoundError):
@@ -209,7 +211,7 @@ def test_senttransf_embedding(self, monkeypatch, n_sentences):
         sentence_transormer_class.return_value = senttrans_model
 
         monkeypatch.setattr(
-            "bbsearch.embedding_models.sentence_transformers.SentenceTransformer",
+            "bluesearch.embedding_models.sentence_transformers.SentenceTransformer",
             sentence_transormer_class,
         )
         sbert = SentTransformer("bert-base-nli-mean-tokens")
@@ -243,7 +245,7 @@ def test_use_embedding(self, monkeypatch, n_sentences):
         hub_module.load.return_value = use_model
         use_model.return_value = tf.ones((n_sentences, 512))
 
-        monkeypatch.setattr("bbsearch.embedding_models.hub", hub_module)
+        monkeypatch.setattr("bluesearch.embedding_models.hub", hub_module)
         use = USE()
 
         # Preparations
@@ -392,7 +394,7 @@ def test_compute_database(
     new_file_path = Path(str(tmpdir)) / "test.txt"
     new_file_path.touch()
 
-    monkeypatch.setattr("bbsearch.embedding_models.sent2vec", sent2vec_module)
+    monkeypatch.setattr("bluesearch.embedding_models.sent2vec", sent2vec_module)
 
     bsv = BSV(Path(new_file_path))
 
@@ -431,7 +433,9 @@ def test_returns_instance(self, monkeypatch, name, underlying_class):
         fake_instance = Mock()
         fake_class = Mock(return_value=fake_instance)
 
-        monkeypatch.setattr(f"bbsearch.embedding_models.{underlying_class}", fake_class)
+        monkeypatch.setattr(
+            f"bluesearch.embedding_models.{underlying_class}", fake_class
+        )
 
         returned_instance = get_embedding_model(name)
 
@@ -461,7 +465,7 @@ def embed(self, *args):
         fake_get_embedding_model = Mock(return_value=Random(dim))
 
         monkeypatch.setattr(
-            "bbsearch.embedding_models.get_embedding_model", fake_get_embedding_model
+            "bluesearch.embedding_models.get_embedding_model", fake_get_embedding_model
         )
 
         MPEmbedder.run_embedding_worker(
@@ -527,8 +531,8 @@ def test_do_embedding(self, monkeypatch, n_processes):
 
         fake_multiprocessing = Mock()
         fake_h5 = Mock()
-        monkeypatch.setattr("bbsearch.embedding_models.mp", fake_multiprocessing)
-        monkeypatch.setattr("bbsearch.embedding_models.H5", fake_h5)
+        monkeypatch.setattr("bluesearch.embedding_models.mp", fake_multiprocessing)
+        monkeypatch.setattr("bluesearch.embedding_models.H5", fake_h5)
 
         mpe.do_embedding()
 
diff --git a/tests/test_entrypoint/__init__.py b/tests/test_entrypoint/__init__.py
index 247e65e5c..08878f50e 100644
--- a/tests/test_entrypoint/__init__.py
+++ b/tests/test_entrypoint/__init__.py
@@ -1,6 +1,6 @@
 """Collection of tests covering entrypoint functionalities."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/tests/test_entrypoint/test__helper.py b/tests/test_entrypoint/test__helper.py
index d7d8124dc..f3573ac02 100644
--- a/tests/test_entrypoint/test__helper.py
+++ b/tests/test_entrypoint/test__helper.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-from bbsearch.entrypoint._helper import parse_args_or_environment
+from bluesearch.entrypoint._helper import parse_args_or_environment
 
 
 def test_parse_args_or_environment(monkeypatch):
@@ -33,7 +33,7 @@ def test_parse_args_or_environment(monkeypatch):
     environ = {
         "ENV_ARG": env_value,
     }
-    monkeypatch.setattr("bbsearch.entrypoint._helper.os.environ", environ)
+    monkeypatch.setattr("bluesearch.entrypoint._helper.os.environ", environ)
     env_variable_names = {
         "env_arg": "ENV_ARG",
     }
@@ -47,7 +47,7 @@ def test_parse_args_or_environment(monkeypatch):
     environ = {
         "ENV_ARG": env_value,
     }
-    monkeypatch.setattr("bbsearch.entrypoint._helper.os.environ", environ)
+    monkeypatch.setattr("bluesearch.entrypoint._helper.os.environ", environ)
     env_variable_names = {
         "env_arg": "ENV_ARG",
     }
@@ -59,7 +59,7 @@ def test_parse_args_or_environment(monkeypatch):
     # Value not specified through the CLI, nor through environment
     argv = []
     environ = {}
-    monkeypatch.setattr("bbsearch.entrypoint._helper.os.environ", environ)
+    monkeypatch.setattr("bluesearch.entrypoint._helper.os.environ", environ)
     env_variable_names = {
         "env_arg": "ENV_ARG",
     }
diff --git a/tests/test_entrypoint/test_compute_embeddings.py b/tests/test_entrypoint/test_compute_embeddings.py
index 9b031642b..11931fce8 100644
--- a/tests/test_entrypoint/test_compute_embeddings.py
+++ b/tests/test_entrypoint/test_compute_embeddings.py
@@ -1,6 +1,6 @@
 """Collection of tests focusing on the compute_embeddings entrypoint."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -23,7 +23,7 @@
 import numpy as np
 import pytest
 
-from bbsearch.entrypoint import run_compute_embeddings
+from bluesearch.entrypoint import run_compute_embeddings
 
 
 @pytest.mark.parametrize(
@@ -62,9 +62,9 @@ def test_send_through(
     fake_mpe_class = Mock()
     fake_sqlalchemy = Mock()
 
-    monkeypatch.setattr("bbsearch.embedding_models.MPEmbedder", fake_mpe_class)
+    monkeypatch.setattr("bluesearch.embedding_models.MPEmbedder", fake_mpe_class)
     monkeypatch.setattr(
-        "bbsearch.entrypoint.compute_embeddings.sqlalchemy", fake_sqlalchemy
+        "bluesearch.entrypoint.compute_embeddings.sqlalchemy", fake_sqlalchemy
     )
 
     # Prepare CLI input
diff --git a/tests/test_entrypoint/test_create_database.py b/tests/test_entrypoint/test_create_database.py
index 9489cc1e0..6d9169b16 100644
--- a/tests/test_entrypoint/test_create_database.py
+++ b/tests/test_entrypoint/test_create_database.py
@@ -1,6 +1,6 @@
 """Testing the create_database entrypoint."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -22,7 +22,7 @@
 
 import pytest
 
-from bbsearch.entrypoint.create_database import run_create_database
+from bluesearch.entrypoint.create_database import run_create_database
 
 
 @pytest.mark.parametrize(
@@ -76,14 +76,16 @@ def test_send_through(
             db_url.touch()
 
     monkeypatch.setattr("builtins.input", Mock())
-    monkeypatch.setattr("bbsearch.entrypoint.create_database.getpass", fake_getpass)
+    monkeypatch.setattr("bluesearch.entrypoint.create_database.getpass", fake_getpass)
     monkeypatch.setattr(
-        "bbsearch.entrypoint.create_database.sqlalchemy", fake_sqlalchemy
+        "bluesearch.entrypoint.create_database.sqlalchemy", fake_sqlalchemy
     )
     monkeypatch.setattr(
-        "bbsearch.database.CORD19DatabaseCreation", fake_database_creation
+        "bluesearch.database.CORD19DatabaseCreation", fake_database_creation
+    )
+    monkeypatch.setattr(
+        "bluesearch.database.mark_bad_sentences", fake_mark_bad_sentences
     )
-    monkeypatch.setattr("bbsearch.database.mark_bad_sentences", fake_mark_bad_sentences)
 
     argv = [
         f"--cord-data-path={cord_data_path}",
diff --git a/tests/test_entrypoint/test_create_mining_cache.py b/tests/test_entrypoint/test_create_mining_cache.py
index 1f4e7f74b..2115c2daa 100644
--- a/tests/test_entrypoint/test_create_mining_cache.py
+++ b/tests/test_entrypoint/test_create_mining_cache.py
@@ -1,6 +1,6 @@
 """Tests covering the creation of the mining cache database."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -23,7 +23,7 @@
 import pandas as pd
 import pytest
 
-from bbsearch.entrypoint import run_create_mining_cache
+from bluesearch.entrypoint import run_create_mining_cache
 
 
 def test_help(capsys):
@@ -109,15 +109,20 @@ def test_send_through(
     fake_sqlalchemy = Mock()
     fake_create_mining_cache = Mock()
     monkeypatch.setattr(
-        "bbsearch.entrypoint.create_mining_cache.sqlalchemy", fake_sqlalchemy
+        "bluesearch.entrypoint.create_mining_cache.sqlalchemy", fake_sqlalchemy
     )
     monkeypatch.setattr(
-        "bbsearch.entrypoint.create_mining_cache.load_ee_models_library",
+        "bluesearch.entrypoint.create_mining_cache.load_ee_models_library",
         fake_load_ee_models_library,
     )
-    monkeypatch.setattr("bbsearch.database.CreateMiningCache", fake_create_mining_cache)
     monkeypatch.setattr(
-        "bbsearch.entrypoint.create_mining_cache.getpass.getpass",
+        "bluesearch.database.CreateMiningCache", fake_create_mining_cache
+    )
+    monkeypatch.setattr(
+        "bluesearch.database.CreateMiningCache", fake_create_mining_cache
+    )
+    monkeypatch.setattr(
+        "bluesearch.entrypoint.create_mining_cache.getpass.getpass",
         lambda _: "fake_password",
     )
 
diff --git a/tests/test_entrypoint/test_embedding_server.py b/tests/test_entrypoint/test_embedding_server.py
index 6e636eba4..029f53283 100644
--- a/tests/test_entrypoint/test_embedding_server.py
+++ b/tests/test_entrypoint/test_embedding_server.py
@@ -1,6 +1,6 @@
 """Collection of tests focusing on the `embedding_server` entrypoint."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -20,8 +20,8 @@
 import pathlib
 from unittest.mock import Mock
 
-from bbsearch.entrypoint import get_embedding_app
-from bbsearch.server.embedding_server import EmbeddingServer
+from bluesearch.entrypoint import get_embedding_app
+from bluesearch.server.embedding_server import EmbeddingServer
 
 
 def test_environment_reading(monkeypatch, tmpdir):
@@ -33,14 +33,15 @@ def test_environment_reading(monkeypatch, tmpdir):
     fake_embedding_server_class = Mock(return_value=fake_embedding_server_inst)
 
     monkeypatch.setattr(
-        "bbsearch.server.embedding_server.EmbeddingServer", fake_embedding_server_class
+        "bluesearch.server.embedding_server.EmbeddingServer",
+        fake_embedding_server_class,
     )
 
     # Mock all of our embedding models
     embedding_models = ["BSV", "SBioBERT", "Sent2VecModel", "SentTransformer", "USE"]
 
     for model in embedding_models:
-        monkeypatch.setattr(f"bbsearch.embedding_models.{model}", Mock())
+        monkeypatch.setattr(f"bluesearch.embedding_models.{model}", Mock())
 
     monkeypatch.setenv("BBS_EMBEDDING_LOG_FILE", str(logfile))
     monkeypatch.setenv("BBS_EMBEDDING_BSV_CHECKPOINT_PATH", str(tmpdir / "fake_1.ckp"))
diff --git a/tests/test_entrypoint/test_entrypoint_installation.py b/tests/test_entrypoint/test_entrypoint_installation.py
index 273c62452..abdc91e84 100644
--- a/tests/test_entrypoint/test_entrypoint_installation.py
+++ b/tests/test_entrypoint/test_entrypoint_installation.py
@@ -1,6 +1,6 @@
 """Tests covering entrypoint installation."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/tests/test_entrypoint/test_mining_server.py b/tests/test_entrypoint/test_mining_server.py
index d87728d1d..e8922e276 100644
--- a/tests/test_entrypoint/test_mining_server.py
+++ b/tests/test_entrypoint/test_mining_server.py
@@ -1,6 +1,6 @@
 """Collection of tests focused on the `mining_server`."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -23,7 +23,7 @@
 import pandas as pd
 import pytest
 
-from bbsearch.entrypoint import get_mining_app
+from bluesearch.entrypoint import get_mining_app
 
 
 @pytest.mark.parametrize(
@@ -60,11 +60,13 @@ def test_send_through(tmpdir, monkeypatch, db_type, sqlite_db_exists):
     fake_mining_server_class = Mock(return_value=fake_mining_server_inst)
 
     monkeypatch.setattr(
-        "bbsearch.server.mining_server.MiningServer", fake_mining_server_class
+        "bluesearch.server.mining_server.MiningServer", fake_mining_server_class
     )
-    monkeypatch.setattr("bbsearch.entrypoint.mining_server.sqlalchemy", fake_sqlalchemy)
     monkeypatch.setattr(
-        "bbsearch.entrypoint.mining_server.load_ee_models_library",
+        "bluesearch.entrypoint.mining_server.sqlalchemy", fake_sqlalchemy
+    )
+    monkeypatch.setattr(
+        "bluesearch.entrypoint.mining_server.load_ee_models_library",
         fake_load_ee_models_library,
     )
 
diff --git a/tests/test_entrypoint/test_search_sever.py b/tests/test_entrypoint/test_search_sever.py
index 36d7d410d..9db2b582d 100644
--- a/tests/test_entrypoint/test_search_sever.py
+++ b/tests/test_entrypoint/test_search_sever.py
@@ -1,6 +1,6 @@
 """Collection of tests focused on "search_server" entrypoint."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -23,8 +23,8 @@
 import numpy as np
 import pytest
 
-from bbsearch.entrypoint import get_search_app
-from bbsearch.server.search_server import SearchServer
+from bluesearch.entrypoint import get_search_app
+from bluesearch.server.search_server import SearchServer
 
 
 @pytest.mark.parametrize(
@@ -52,10 +52,12 @@ def test_send_through(tmpdir, monkeypatch, embeddings_path, models, models_path)
     fake_search_server_inst = Mock(spec=SearchServer)
     fake_search_server_class = Mock(return_value=fake_search_server_inst)
 
-    monkeypatch.setattr("bbsearch.entrypoint.search_server.sqlalchemy", fake_sqlalchemy)
-    monkeypatch.setattr("bbsearch.utils.H5", fake_H5)
     monkeypatch.setattr(
-        "bbsearch.server.search_server.SearchServer", fake_search_server_class
+        "bluesearch.entrypoint.search_server.sqlalchemy", fake_sqlalchemy
+    )
+    monkeypatch.setattr("bluesearch.utils.H5", fake_H5)
+    monkeypatch.setattr(
+        "bluesearch.server.search_server.SearchServer", fake_search_server_class
     )
 
     server_app = get_search_app()
diff --git a/tests/test_fixtures.py b/tests/test_fixtures.py
index 497af3d13..6820e69ec 100644
--- a/tests/test_fixtures.py
+++ b/tests/test_fixtures.py
@@ -7,7 +7,7 @@
 bookkeeping.
 """
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/tests/test_mining/test_attribute.py b/tests/test_mining/test_attribute.py
index 4d6e4a025..f6f85cd2d 100644
--- a/tests/test_mining/test_attribute.py
+++ b/tests/test_mining/test_attribute.py
@@ -1,6 +1,6 @@
 """Tests covering attribute extraction."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -26,7 +26,7 @@
 import spacy
 from IPython.display import HTML
 
-from bbsearch.mining import AttributeAnnotationTab, AttributeExtractor
+from bluesearch.mining import AttributeAnnotationTab, AttributeExtractor
 
 
 @pytest.fixture(scope="session")
@@ -909,7 +909,7 @@ def test_get_grobid_measurements(self, extractor: AttributeExtractor, monkeypatc
         response._content = json.dumps(response_json).encode("utf-8")
 
         fake_requests = Mock()
-        monkeypatch.setattr("bbsearch.mining.attribute.requests", fake_requests)
+        monkeypatch.setattr("bluesearch.mining.attribute.requests", fake_requests)
         fake_requests.post.return_value = response
 
         # Test 1
@@ -1156,7 +1156,7 @@ def test_get_core_nlp_analysis(self, extractor, example_results, monkeypatch):
         response._content = json.dumps(real_response_json).encode("utf-8")
 
         fake_requests = Mock()
-        monkeypatch.setattr("bbsearch.mining.attribute.requests", fake_requests)
+        monkeypatch.setattr("bluesearch.mining.attribute.requests", fake_requests)
         fake_requests.post.return_value = response
 
         response_json = extractor.get_core_nlp_analysis(text)
diff --git a/tests/test_mining/test_entity.py b/tests/test_mining/test_entity.py
index 02a28c6eb..9cea62952 100644
--- a/tests/test_mining/test_entity.py
+++ b/tests/test_mining/test_entity.py
@@ -1,6 +1,6 @@
 """Collections of tests covering the `entity.py` module."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -24,7 +24,7 @@
 import pytest
 import spacy
 
-from bbsearch.mining import (
+from bluesearch.mining import (
     PatternCreator,
     check_patterns_agree,
     global2model_patterns,
diff --git a/tests/test_mining/test_eval.py b/tests/test_mining/test_eval.py
index 7fdd92e94..5bbc7a97e 100644
--- a/tests/test_mining/test_eval.py
+++ b/tests/test_mining/test_eval.py
@@ -1,6 +1,6 @@
 """Tests covering functionalities for the evaluation of mining tools."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -26,8 +26,8 @@
 import pytest
 import spacy
 
-from bbsearch.mining import annotations2df, spacy2df
-from bbsearch.mining.eval import (
+from bluesearch.mining import annotations2df, spacy2df
+from bluesearch.mining.eval import (
     idx2text,
     iob2idx,
     ner_confusion_matrix,
diff --git a/tests/test_mining/test_pipeline.py b/tests/test_mining/test_pipeline.py
index 7e43d9ddb..504062225 100644
--- a/tests/test_mining/test_pipeline.py
+++ b/tests/test_mining/test_pipeline.py
@@ -1,6 +1,6 @@
-"""Collection of tests focused on the bbsearch.mining.pipeline module."""
+"""Collection of tests focused on the bluesearch.mining.pipeline module."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -24,7 +24,7 @@
 from spacy.language import Language
 from spacy.tokens import Doc, Span
 
-from bbsearch.mining import StartWithTheSameLetter, run_pipeline
+from bluesearch.mining import StartWithTheSameLetter, run_pipeline
 
 
 @pytest.mark.parametrize("n_paragraphs", [0, 1, 5])
diff --git a/tests/test_mining/test_relation.py b/tests/test_mining/test_relation.py
index 8c9b86c63..a90708279 100644
--- a/tests/test_mining/test_relation.py
+++ b/tests/test_mining/test_relation.py
@@ -1,6 +1,6 @@
-"""Collection of tests focused on the bbsearch.mining.relation module"""
+"""Collection of tests focused on the bluesearch.mining.relation module"""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -22,7 +22,7 @@
 import pytest
 from spacy.tokens import Doc, Span
 
-from bbsearch.mining import ChemProt, StartWithTheSameLetter, annotate
+from bluesearch.mining import ChemProt, StartWithTheSameLetter, annotate
 
 
 def test_annotate(model_entities):
diff --git a/tests/test_search.py b/tests/test_search.py
index 5269c27f3..e4bf44225 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -1,6 +1,6 @@
 """Tests covering search functionalities."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -23,8 +23,8 @@
 import pytest
 import torch
 
-from bbsearch.search import SearchEngine
-from bbsearch.utils import H5
+from bluesearch.search import SearchEngine
+from bluesearch.utils import H5
 
 
 class TestSearchEngine:
diff --git a/tests/test_server/__init__.py b/tests/test_server/__init__.py
index 69e9c8fbe..d89831dbc 100644
--- a/tests/test_server/__init__.py
+++ b/tests/test_server/__init__.py
@@ -1,6 +1,6 @@
 """Collection of tests covering server functionalities."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
diff --git a/tests/test_server/test_embedding_server.py b/tests/test_server/test_embedding_server.py
index 90386d2af..03767d6c6 100644
--- a/tests/test_server/test_embedding_server.py
+++ b/tests/test_server/test_embedding_server.py
@@ -1,6 +1,6 @@
 """Tests covering embedding server"""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -22,7 +22,7 @@
 import numpy as np
 import pytest
 
-from bbsearch.server.embedding_server import EmbeddingServer
+from bluesearch.server.embedding_server import EmbeddingServer
 
 
 @pytest.fixture(scope="session")
diff --git a/tests/test_server/test_mining_server.py b/tests/test_server/test_mining_server.py
index 32c9916e8..349378831 100644
--- a/tests/test_server/test_mining_server.py
+++ b/tests/test_server/test_mining_server.py
@@ -1,6 +1,6 @@
 """Test for the mining server."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -24,9 +24,9 @@
 import pandas as pd
 import pytest
 
-from bbsearch.mining import SPECS
-from bbsearch.server.mining_server import MiningServer
-from bbsearch.utils import load_ee_models_library
+from bluesearch.mining import SPECS
+from bluesearch.server.mining_server import MiningServer
+from bluesearch.utils import load_ee_models_library
 
 TESTS_PATH = Path(__file__).resolve().parent.parent  # path to tests directory
 
@@ -38,7 +38,7 @@ def mining_client(fake_sqlalchemy_engine, model_entities, monkeypatch, tmpdir):
     spacy_mock = Mock()
     spacy_mock.load.return_value = model_entities
 
-    monkeypatch.setattr("bbsearch.server.mining_server.spacy", spacy_mock)
+    monkeypatch.setattr("bluesearch.server.mining_server.spacy", spacy_mock)
 
     # This is the original CSV file with 3 columns:
     # entity_type, model, entity_type_name
@@ -163,9 +163,7 @@ def test_mining_server_database(self, mining_client, use_cache):
         )
 
     @pytest.mark.parametrize("debug", [True, False], ids=["debug", "specs"])
-    def test_mining_cache_detailed(
-        self, mining_client, test_parameters, entity_types, debug
-    ):
+    def test_mining_cache_detailed(self, mining_client, test_parameters, debug):
         """Test exact count of found entities.
 
         This test assumes that the requested entity types are a superset of
diff --git a/tests/test_server/test_search_server.py b/tests/test_server/test_search_server.py
index 8db772902..3dcc1953b 100644
--- a/tests/test_server/test_search_server.py
+++ b/tests/test_server/test_search_server.py
@@ -1,6 +1,6 @@
 """Tests covering the search server."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -22,8 +22,8 @@
 import numpy as np
 import pytest
 
-from bbsearch.server.search_server import SearchServer
-from bbsearch.utils import H5
+from bluesearch.server.search_server import SearchServer
+from bluesearch.utils import H5
 
 
 @pytest.fixture
@@ -46,8 +46,10 @@ def search_client(
         (test_parameters["embedding_size"],)
     )
 
-    monkeypatch.setattr("bbsearch.server.search_server.BSV", bsv_model_class)
-    monkeypatch.setattr("bbsearch.server.search_server.SBioBERT", sbiobert_model_class)
+    monkeypatch.setattr("bluesearch.server.search_server.BSV", bsv_model_class)
+    monkeypatch.setattr(
+        "bluesearch.server.search_server.SBioBERT", sbiobert_model_class
+    )
 
     indices = H5.find_populated_rows(embeddings_h5_path, "BSV")
 
diff --git a/tests/test_sql.py b/tests/test_sql.py
index 177830b78..df52fe816 100644
--- a/tests/test_sql.py
+++ b/tests/test_sql.py
@@ -1,6 +1,6 @@
 """Collection of tests regarding the Database creation. """
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -24,7 +24,7 @@
 import pandas as pd
 import pytest
 
-from bbsearch.sql import (
+from bluesearch.sql import (
     SentenceFilter,
     get_titles,
     retrieve_article_ids,
@@ -56,7 +56,7 @@ class TestNoSQL:
         ],
     )
     def test_sql_queries(self, module_name):
-        module = import_module(f"bbsearch.{module_name}")
+        module = import_module(f"bluesearch.{module_name}")
         source_code = inspect.getsource(module)
         assert "SELECT" not in source_code
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 96f5fdd07..ed07d7dd9 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,6 +1,6 @@
 """Collection of tests focused on the utils.py module."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -24,7 +24,7 @@
 import pandas as pd
 import pytest
 
-from bbsearch.utils import H5, JSONL, Timer, load_ee_models_library
+from bluesearch.utils import H5, JSONL, Timer, load_ee_models_library
 
 
 class TestTimer:
diff --git a/tests/test_widgets/test_article_saver.py b/tests/test_widgets/test_article_saver.py
index e2f5dc9b9..a076e7719 100644
--- a/tests/test_widgets/test_article_saver.py
+++ b/tests/test_widgets/test_article_saver.py
@@ -1,6 +1,6 @@
 """Tests covering ArticleSaver."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -20,7 +20,7 @@
 import numpy as np
 import pandas as pd
 
-from bbsearch.widgets import ArticleSaver
+from bluesearch.widgets import ArticleSaver
 
 
 class TestArticleSaver:
diff --git a/tests/test_widgets/test_mining_schema.py b/tests/test_widgets/test_mining_schema.py
index 9dee01e21..0f11f2135 100644
--- a/tests/test_widgets/test_mining_schema.py
+++ b/tests/test_widgets/test_mining_schema.py
@@ -1,6 +1,6 @@
 """Tests covering the MiningSchema class."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -19,7 +19,7 @@
 
 import pytest
 
-from bbsearch.widgets import MiningSchema
+from bluesearch.widgets import MiningSchema
 
 
 def test_add_entity():
diff --git a/tests/test_widgets/test_mining_widget.py b/tests/test_widgets/test_mining_widget.py
index d8eeb0476..4aab95894 100644
--- a/tests/test_widgets/test_mining_widget.py
+++ b/tests/test_widgets/test_mining_widget.py
@@ -1,6 +1,6 @@
 """Tests covering the mining widget."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -26,7 +26,7 @@
 import responses
 from IPython.display import HTML
 
-from bbsearch.widgets import ArticleSaver, MiningSchema, MiningWidget
+from bluesearch.widgets import ArticleSaver, MiningSchema, MiningWidget
 
 
 class MiningWidgetBot:
@@ -53,7 +53,7 @@ def __init__(self, mining_widget, capsys, monkeypatch):
         self._capsys = capsys
 
         monkeypatch.setattr(
-            "bbsearch.widgets.mining_widget.display",
+            "bluesearch.widgets.mining_widget.display",
             lambda x: self._display_cached.append(x),
         )
 
diff --git a/tests/test_widgets/test_search_widget.py b/tests/test_widgets/test_search_widget.py
index 3127da1bf..c0722af30 100644
--- a/tests/test_widgets/test_search_widget.py
+++ b/tests/test_widgets/test_search_widget.py
@@ -1,6 +1,6 @@
 """Tests covering the search widget."""
 
-# BBSearch is a text mining toolbox focused on scientific use cases.
+# Blue Brain Search is a text mining toolbox focused on scientific use cases.
 #
 # Copyright (C) 2020  Blue Brain Project, EPFL.
 #
@@ -34,9 +34,9 @@
 import torch
 from IPython.display import HTML
 
-from bbsearch.search import SearchEngine
-from bbsearch.widgets import ArticleSaver, SearchWidget
-from bbsearch.widgets.search_widget import _Save
+from bluesearch.search import SearchEngine
+from bluesearch.widgets import ArticleSaver, SearchWidget
+from bluesearch.widgets.search_widget import _Save
 
 
 class SearchWidgetBot:
@@ -74,7 +74,7 @@ def __init__(self, search_widget, capsys, monkeypatch, n_displays_per_result=4):
         self.n_displays_per_result = n_displays_per_result
 
         monkeypatch.setattr(
-            "bbsearch.widgets.search_widget.display",
+            "bluesearch.widgets.search_widget.display",
             lambda x: self._display_cached.append(x),
         )
 
diff --git a/tox.ini b/tox.ini
index ad923d38b..da258c5cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,4 @@
-;BBSearch is a text mining toolbox focused on scientific use cases.
+;Blue Brain Search is a text mining toolbox focused on scientific use cases.
 ;
 ;Copyright (C) 2020  Blue Brain Project, EPFL.
 ;
@@ -18,7 +18,7 @@
 [tox]
 minversion = 3.1.0
 requires = virtualenv >= 20.0.0
-source = src/bbsearch
+source = src/bluesearch
 envlist =
     lint
     py36
@@ -129,7 +129,7 @@ addopts =
     --last-failed-no-failures=all
 
 [coverage:run]
-source = bbsearch
+source = bluesearch
 branch = True
 
 [coverage:report]