diff --git a/develop.cfg b/develop.cfg
index ce6a1b19c5e6608bc8c09ff59722bd5c73007465..de0adab95f4cbf87733651db349a770607ed82e5 100644
--- a/develop.cfg
+++ b/develop.cfg
@@ -25,7 +25,6 @@ develop = src/bob.extension
           src/bob.learn.linear
           src/bob.learn.em
           src/bob.db.atnt
-          src/bob.bio.db
           .
 
 ; options for bob.buildout
@@ -47,7 +46,6 @@ bob.learn.activation = git git@gitlab.idiap.ch:bob/bob.learn.activation
 bob.learn.linear = git git@gitlab.idiap.ch:bob/bob.learn.linear
 bob.learn.em = git git@gitlab.idiap.ch:bob/bob.learn.em
 bob.db.atnt = git git@gitlab.idiap.ch:bob/bob.db.atnt
-bob.bio.db = git git@gitlab.idiap.ch:bob/bob.bio.db
 
 [scripts]
 recipe = bob.buildout:scripts
diff --git a/doc/implementation.rst b/doc/implementation.rst
index b7bdcf7d27b300e493fbc62c53b374205c4ebf45..0777226226cac24dea92cde04eb3663af261ec4f 100644
--- a/doc/implementation.rst
+++ b/doc/implementation.rst
@@ -218,13 +218,13 @@ Verification Database Interface
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For most of the data sets, we rely on the database interfaces from Bob_.
-Particularly, all databases that are derived from the :py:class:`bob.bio.db.BioDatabase` (click :ref:`here <verification_databases>` for a list of implemented databases) are supported by a special derivation of the databases from above.
+Particularly, all databases that are derived from the :py:class:`bob.bio.base.database.BioDatabase` (click :ref:`here <verification_databases>` for a list of implemented databases) are supported by a special derivation of the databases from above.
 For these databases, the special :py:class:`bob.bio.base.database.DatabaseBob` interface is provided, which takes the Bob_ database as parameter.
 Several such databases are defined in the according packages, i.e., :ref:`bob.bio.spear <bob.bio.spear>`, :ref:`bob.bio.face <bob.bio.face>` and :ref:`bob.bio.video <bob.bio.video>`.
 For Bob_'s ZT-norm databases, we provide the :py:class:`bob.bio.base.database.DatabaseBobZT` interface.
 
 Additionally, a generic database interface, which is derived from :py:class:`bob.bio.base.database.DatabaseBobZT`, is the :py:class:`bob.bio.base.database.DatabaseFileList`.
-This database interfaces with the :py:class:`bob.db.verification.filelist.Database`, which is a generic database based on file lists, implementing the :py:class:`bob.bio.db.BioDatabase` interface.
+This database interfaces with the :py:class:`bob.db.verification.filelist.Database`, which is a generic database based on file lists, implementing the :py:class:`bob.bio.base.database.BioDatabase` interface.
 
 Defining your own Database
 ~~~~~~~~~~~~~~~~~~~~~~~~~~