diff --git a/setup.py b/setup.py
index f1fb8760caa56cc2e5af13f000e97adaeb3467f9..4513076e8567a61a54f96b7f800efd1613b66944 100644
--- a/setup.py
+++ b/setup.py
@@ -155,15 +155,15 @@ setup(
             "inception-resnetv2-casiawebface       = bob.bio.face.config.baseline.inception_resnetv2_casiawebface",
             "inception-resnetv2-msceleb            = bob.bio.face.config.baseline.inception_resnetv2_msceleb",
             "iresnet100                            = bob.bio.face.config.baseline.iresnet100",
-            "iresnet100-msceleb-idiap-20210623     = bob.bio.face.config.baseline.iresnet100_msceleb_arcface_20210623:pipeline",
+            "iresnet100-msceleb-idiap-20210623     = bob.bio.face.config.baseline.iresnet100_msceleb_arcface_20210623",
             "iresnet34                             = bob.bio.face.config.baseline.iresnet34",
             "iresnet50                             = bob.bio.face.config.baseline.iresnet50",
-            "iresnet50-msceleb-idiap-20210623      = bob.bio.face.config.baseline.iresnet50_msceleb_arcface_20210623:pipeline",
+            "iresnet50-msceleb-idiap-20210623      = bob.bio.face.config.baseline.iresnet50_msceleb_arcface_20210623",
             "lda                                   = bob.bio.face.config.baseline.lda",
             "lgbphs                                = bob.bio.face.config.baseline.lgbphs",
             "mobilenetv2-msceleb-arcface-2021      = bob.bio.face.config.baseline.mobilenetv2_msceleb_arcface_2021",
             "resnet50-msceleb-arcface-2021         = bob.bio.face.config.baseline.resnet50_msceleb_arcface_2021",
-            "resnet50-msceleb-arcface-20210521     = bob.bio.face.config.baseline.resnet50_msceleb_arcface_20210521:pipeline",
+            "resnet50-msceleb-arcface-20210521     = bob.bio.face.config.baseline.resnet50_msceleb_arcface_20210521",
             "resnet50-vgg2-arcface-2021            = bob.bio.face.config.baseline.resnet50_vgg2_arcface_2021",
             "vgg16-oxford                          = bob.bio.face.config.baseline.vgg16_oxford",
             # databases
@@ -181,9 +181,9 @@ setup(
             "morph                                 = bob.bio.face.config.database.morph",
             "multipie                              = bob.bio.face.config.database.multipie",
             "multipie-pose                         = bob.bio.face.config.database.multipie_pose",
-            "pola-thermal                          = bob.bio.face.config.database.pola_thermal:database",
+            "pola-thermal                          = bob.bio.face.config.database.pola_thermal",
             "replaymobile-img                      = bob.bio.face.config.database.replaymobile",
-            "rfw                                   = bob.bio.face.config.database.rfw:database",
+            "rfw                                   = bob.bio.face.config.database.rfw",
         ],
         "bob.bio.cli": [
             "display-face-annotations          = bob.bio.face.script.display_face_annotations:display_face_annotations",