diff --git a/README.rst b/README.rst
index cc17aded805aace2c9c129fa7c232500bc3b2b9e..434e9c5b2b6690fc7f3ec7eb610b5bf82f6c4188 100644
--- a/README.rst
+++ b/README.rst
@@ -1,20 +1,21 @@
 .. vim: set fileencoding=utf-8 :
 .. Tiago de Freitas Pereira <tiago.pereira@idiap.ch>
-.. Thu Sep  4 11:35:05 CEST 2014
+.. Thu Apr 16 16:39:01 CEST 2015
 
 
 =======================================================
- CASIA NIR-VIS 2.0 Face Database
+ CUHK Face Sketch Database (CUFS)
 =======================================================
 
-This package contains the access API and descriptions for the `CASIA NIR-VIS 2.0 database <http://www.cbsr.ia.ac.cn/english/NIR-VIS-2.0-Database.html>`. 
+This package contains the access API and descriptions for the `CUHK Face Sketch Database (CUFS) <http://mmlab.ie.cuhk.edu.hk/archive/facesketch.html>`. 
 The actual raw data for the database should be downloaded from the original URL. 
 This package only contains the Bob accessor methods to use the DB directly from python, with the original protocol of the database.
 
-CASIA NIR-VIS 2.0 database offers pairs of mugshot images and their correspondent NIR photos.
-Capured by CASIA (Chinese Academy of Sciences), the images of this database were collected in four recording sessions: 2007 spring, 2009 summer, 2009 fall and 2010 summer, in which the first session is identical to the `HFB database <http://www.cbsr.ia.ac.cn/english/HFB%20Databases.asp>`. 
-The CASIA NIR-VIS 2.0 database consists of 725 subjects in total. 
-There are 1-22 VIS and 5-50 NIR face images per subject.
+CUHK Face Sketch database (CUFS) is for research on face sketch synthesis and face sketch recognition.
+It includes 188 faces from the Chinese University of Hong Kong (CUHK) student database, 123 faces from the AR database, and 295 faces from the XM2VTS database.
+There are 606 faces in total.
+For each face, there is a sketch drawn by an artist based on a photo taken in a frontal pose, under normal lighting condition, and with a neutral expression.
+
 
 You would normally not install this package unless you are maintaining it. 
 What you would do instead is to tie it in at the package you need to **use** it.
@@ -35,7 +36,7 @@ The package is available in two different distribution formats:
 1. You can download it from `PyPI <http://pypi.python.org/pypi>`_, or
 
 2. You can download it in its source form from `its git repository
-   <https://github.com/bioidiap/bob.db.cbsr_nir_vis_2>`_.
+   <https://github.com/bioidiap/bob.db.cuhk>`_.
 
 You can mix and match points 1/2 and a/b above based on your requirements. Here
 are some examples:
@@ -50,11 +51,11 @@ script)::
 
     install_requires=[
       ...
-      "bob.db.cbsr_nir_vis_2",
+      "bob.db.cuhk",
     ],
 
 Proceed normally with your ``boostrap/buildout`` steps and you should be all
-set. That means you can now import the ``bob.db.cbsr_nir_vis_2`` namespace into your scripts.
+set. That means you can now import the ``bob.db.cuhk`` namespace into your scripts.
 
 Modify your buildout.cfg and download from git
 ==============================================
@@ -68,8 +69,8 @@ lines::
   ...
   extensions = mr.developer
   auto-checkout = *
-  eggs = bob.db.cbsr_nir_vis_2
+  eggs = bob.db.cuhk
 
   [sources]
-  bob.db.cbsr_nir_vis_2 = git https://github.com/bioidiap/bob.db.cbsr_nir_vis_2.git
+  bob.db.cuhk = git https://github.com/bioidiap/bob.db.cuhk.git
   ...
diff --git a/buildout.cfg b/buildout.cfg
index 89fd84536646dcc7158639d3acff57e2b01ff04a..b9e3387222f330025c67afe6019c226afcd63bb5 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -4,7 +4,7 @@
 
 [buildout]
 parts = scripts
-eggs = bob.db.cbsr_nir_vis_2
+eggs = bob.db.cuhk
 extensions = bob.buildout
              mr.developer
 auto-checkout = *
diff --git a/setup.py b/setup.py
index 0fb80d63ecb24f0890e1895ad8ccd58a785d91bf..ff8ce892716cf1c59c5f3f6c7865d20f5c764ac9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
-# Laurent El Shafey <Laurent.El-Shafey@idiap.ch>
-# Fri Aug 23 12:32:01 CEST 2013
+# Tiago de Freitas Pereira <tiago.pereira@idiap.ch>
+# Thu Apr 16 16:39:01 CEST 2015
 #
 # Copyright (C) 2011-2014 Idiap Research Institute, Martigny, Switzerland
 #
@@ -21,9 +21,9 @@ from setuptools import setup, find_packages
 
 setup(
 
-    name='bob.db.cbsr_nir_vis_2',
+    name='bob.db.cuhk',
     version='0.0.0a1',
-    description='CASIA NIR-VIS 2.0 Face Database protocol',
+    description='CUHK Face Sketch Database (CUFS)',
     url='',
     license='GPLv3',
     keywords = "",
@@ -48,7 +48,7 @@ setup(
     entry_points = {
       # declare database to bob
       'bob.db': [
-        'cbsr_nir_vis_2 = bob.db.cbsr_nir_vis_2.driver:Interface',
+        'cuhk = bob.db.cuhk.driver:Interface',
       ],
     },