diff --git a/README.rst b/README.rst
index a9344d9f38f4ec88979df366d5c51a3a295d82f6..a675a3c7e59129981a3887374ee4002c02654d67 100644
--- a/README.rst
+++ b/README.rst
@@ -2,9 +2,9 @@
 .. Andre Anjos <andre.anjos@idiap.ch>
 .. Thu 29 Aug 2013 16:07:57 CEST
 
-============================
- Python bindings for bob.db
-============================
+==================================
+ Python bindings for xbob.db.base
+==================================
 
 This package contains a set of Pythonic bindings for Bob's database packages
 and functionality.
@@ -31,7 +31,7 @@ Testing
 
 You can run a set of tests using the nose test runner::
 
-  $ nosetests -sv xbob.db
+  $ nosetests -sv xbob.db.base
 
 .. warning::
 
@@ -48,7 +48,7 @@ You can run our documentation tests using sphinx itself::
 
 You can test overall test coverage with::
 
-  $ nosetests --with-coverage --cover-package=xbob.db
+  $ nosetests --with-coverage --cover-package=xbob.db.base
 
 The ``coverage`` egg must be installed for this to work properly.
 
diff --git a/doc/conf.py b/doc/conf.py
index d395c50d97f0f31459a7dca47fb84250fa513026..1d9999d2c7ecccb168b26ac774aa967c1f648cfa 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -59,12 +59,12 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'xbob.db'
+project = u'xbob.db.base'
 import time
 copyright = u'%s, Idiap Research Institute' % time.strftime('%Y')
 
 # Grab the setup entry
-distribution = pkg_resources.require('xbob.db')[0]
+distribution = pkg_resources.require('xbob.db.base')[0]
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -130,7 +130,7 @@ if sphinx.__version__ >= "1.0":
 #html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = 'xbob_db'
+#html_short_title = 'xbob_db_base'
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -188,7 +188,7 @@ html_static_path = ['_static']
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'xbob_db_doc'
+htmlhelp_basename = 'xbob_db_base_doc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -202,7 +202,7 @@ latex_font_size = '10pt'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'xbob_db.tex', u'Bob Database Support Documentation', 
+  ('index', 'xbob_db_base.tex', u'Bob Database Support Documentation', 
    u'Biometrics Group, Idiap Research Institute', 'manual'),
 ]
 
@@ -239,7 +239,7 @@ rst_epilog = """
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'xbob_db', u'Bob Database Support Documentation', [u'Idiap Research Institute'], 1)
+    ('index', 'xbob_db_base', u'Bob Database Support Documentation', [u'Idiap Research Institute'], 1)
 ]
 
 # Default processing flags for sphinx