diff --git a/lib/configuration.php b/lib/configuration.php
index 8c6c342d..86a4577a 100644
--- a/lib/configuration.php
+++ b/lib/configuration.php
@@ -82,7 +82,7 @@ class configuration
             'dir' => 'data',
         ),
         'model' => array(
-            'class' => 'privatebin_data',
+            'class' => 'PrivateBin\data\data',
         ),
         'model_options' => array(
             'dir' => 'data',
diff --git a/tst/configuration.php b/tst/configuration.php
index fa09a6e0..8ee44cb6 100644
--- a/tst/configuration.php
+++ b/tst/configuration.php
@@ -128,12 +128,12 @@ class configurationTest extends PHPUnit_Framework_TestCase
         $options['model']['class'] = 'zerobin_data';
         helper::createIniFile(CONF, $options);
         $conf = new configuration;
-        $this->assertEquals('privatebin_data', $conf->getKey('class', 'model'), 'old data class gets renamed');
+        $this->assertEquals('PrivateBin\data\data', $conf->getKey('class', 'model'), 'old data class gets renamed');
 
         $options['model']['class'] = 'zerobin_db';
         helper::createIniFile(CONF, $options);
         $conf = new configuration;
-        $this->assertEquals('privatebin_db', $conf->getKey('class', 'model'), 'old db class gets renamed');
+        $this->assertEquals('PrivateBin\data\db', $conf->getKey('class', 'model'), 'old db class gets renamed');
     }
 
 }