diff --git a/composer.json b/composer.json
index 31739057b..04b020c18 100755
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         "php": ">=5.4",
         "ezyang/htmlpurifier": "dev-master",
         "ircmaxell/password-compat": "dev-master",
-        "propel/propel": "2.0.0-alpha1",
+        "propel/propel": "dev-master",
         "psr/log" : "1.0",
         "symfony/class-loader": "2.2.*",
         "symfony/config" : "2.2.*",
diff --git a/composer.lock b/composer.lock
index 22158aa3c..455d88ca9 100755
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "449a98ad751df49842394b9e47f3f447",
+    "hash": "af923b61425810eacdb86a41df529feb",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -202,30 +202,30 @@
         },
         {
             "name": "propel/propel",
-            "version": "2.0.0-alpha1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/propelorm/Propel2.git",
-                "reference": "2.0.0-alpha1"
+                "reference": "1781303780ee496eadebedcb8c4636e728b6ea65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/propelorm/Propel2/zipball/2.0.0-alpha1",
-                "reference": "2.0.0-alpha1",
+                "url": "https://api.github.com/repos/propelorm/Propel2/zipball/1781303780ee496eadebedcb8c4636e728b6ea65",
+                "reference": "1781303780ee496eadebedcb8c4636e728b6ea65",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4",
-                "psr/log": ">=1.0,<2.0",
-                "symfony/console": ">=2.2,<3.0",
-                "symfony/filesystem": ">=2.2,<3.0",
-                "symfony/finder": ">=2.2,<3.0",
-                "symfony/validator": ">=2.2,<3.0",
-                "symfony/yaml": ">=2.2,<3.0"
+                "psr/log": "~1.0",
+                "symfony/console": "~2.2",
+                "symfony/filesystem": "~2.2",
+                "symfony/finder": "~2.2",
+                "symfony/validator": "~2.2",
+                "symfony/yaml": "~2.2"
             },
             "require-dev": {
-                "behat/behat": ">=2.4,<3.0",
-                "monolog/monolog": ">=1.3,<2.0",
+                "behat/behat": "~2.4",
+                "monolog/monolog": "~1.3",
                 "phpunit/phpunit": "3.7.*"
             },
             "suggest": {
@@ -258,7 +258,7 @@
                 "orm",
                 "persistence"
             ],
-            "time": "2013-06-05 06:46:14"
+            "time": "2013-07-05 09:02:18"
         },
         {
             "name": "psr/log",
@@ -1979,7 +1979,7 @@
     "stability-flags": {
         "ezyang/htmlpurifier": 20,
         "ircmaxell/password-compat": 20,
-        "propel/propel": 15,
+        "propel/propel": 20,
         "kriswallsmith/assetic": 20,
         "leafo/lessphp": 20,
         "ptachoire/cssembed": 20,
diff --git a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php
index 14fc79eeb..02a20540e 100755
--- a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php
@@ -151,7 +151,7 @@ class AttributeAvI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute_av', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php
index 138f0fa9c..0c5c2e1c9 100755
--- a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php
@@ -106,7 +106,7 @@ class AttributeAvTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php
index b60cae5b8..8471d3e26 100755
--- a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php
@@ -151,7 +151,7 @@ class AttributeI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/AttributeTableMap.php b/core/lib/Thelia/Model/Map/AttributeTableMap.php
index dca811cbc..773e13cab 100755
--- a/core/lib/Thelia/Model/Map/AttributeTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeTableMap.php
@@ -101,7 +101,7 @@ class AttributeTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php
index 1611b2ebf..8c52aa7b2 100755
--- a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php
@@ -151,7 +151,7 @@ class CategoryI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php
index 83010e4fa..a301a5efe 100755
--- a/core/lib/Thelia/Model/Map/CategoryTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php
@@ -131,7 +131,7 @@ class CategoryTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php
index a83f87b76..b953b0ac9 100755
--- a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php
@@ -151,7 +151,7 @@ class ConfigI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'config', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php
index 8bd68a964..ebd5d6edf 100755
--- a/core/lib/Thelia/Model/Map/ConfigTableMap.php
+++ b/core/lib/Thelia/Model/Map/ConfigTableMap.php
@@ -116,7 +116,7 @@ class ConfigTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php
index ee9122a6c..f718623b0 100755
--- a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php
@@ -151,7 +151,7 @@ class ContentI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php
index 60b04ae36..b794c7244 100755
--- a/core/lib/Thelia/Model/Map/ContentTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentTableMap.php
@@ -121,7 +121,7 @@ class ContentTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php
index cc60b09d2..272231464 100755
--- a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php
@@ -151,7 +151,7 @@ class CountryI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'country', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php
index c4b96c8bd..3060da70f 100755
--- a/core/lib/Thelia/Model/Map/CountryTableMap.php
+++ b/core/lib/Thelia/Model/Map/CountryTableMap.php
@@ -116,7 +116,7 @@ class CountryTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php
index d403756fa..5344099c5 100755
--- a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php
@@ -141,7 +141,7 @@ class CustomerTitleI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'customer_title', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('SHORT', 'Short', 'VARCHAR', false, 10, null);
         $this->addColumn('LONG', 'Long', 'VARCHAR', false, 45, null);
     } // initialize()
diff --git a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
index a392ee4dd..8e91631cf 100755
--- a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
+++ b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
@@ -106,7 +106,7 @@ class CustomerTitleTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/DocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/DocumentI18nTableMap.php
index d0356e8c6..70314ea02 100755
--- a/core/lib/Thelia/Model/Map/DocumentI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/DocumentI18nTableMap.php
@@ -151,7 +151,7 @@ class DocumentI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'document', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/DocumentTableMap.php b/core/lib/Thelia/Model/Map/DocumentTableMap.php
index 50bb37b95..d53263a06 100755
--- a/core/lib/Thelia/Model/Map/DocumentTableMap.php
+++ b/core/lib/Thelia/Model/Map/DocumentTableMap.php
@@ -126,7 +126,7 @@ class DocumentTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php
index b3114e7ba..ba592b4b0 100755
--- a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php
@@ -151,7 +151,7 @@ class FeatureAvI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature_av', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php
index f447f8dc5..972a25744 100755
--- a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php
+++ b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php
@@ -101,7 +101,7 @@ class FeatureAvTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php
index af0dfc263..dba05fb67 100755
--- a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php
@@ -151,7 +151,7 @@ class FeatureI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/FeatureTableMap.php b/core/lib/Thelia/Model/Map/FeatureTableMap.php
index 8d851559e..b1f309603 100755
--- a/core/lib/Thelia/Model/Map/FeatureTableMap.php
+++ b/core/lib/Thelia/Model/Map/FeatureTableMap.php
@@ -106,7 +106,7 @@ class FeatureTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php
index fc85b17ec..d10344811 100755
--- a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php
@@ -151,7 +151,7 @@ class FolderI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php
index 794e3691c..c26e23dc8 100755
--- a/core/lib/Thelia/Model/Map/FolderTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderTableMap.php
@@ -131,7 +131,7 @@ class FolderTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php
index 585127821..57788593a 100755
--- a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php
@@ -151,7 +151,7 @@ class GroupI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'group', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/GroupTableMap.php b/core/lib/Thelia/Model/Map/GroupTableMap.php
index a8c830005..881a2fa84 100755
--- a/core/lib/Thelia/Model/Map/GroupTableMap.php
+++ b/core/lib/Thelia/Model/Map/GroupTableMap.php
@@ -101,7 +101,7 @@ class GroupTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ImageI18nTableMap.php
index 4f3b197a6..a78e7667c 100755
--- a/core/lib/Thelia/Model/Map/ImageI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ImageI18nTableMap.php
@@ -151,7 +151,7 @@ class ImageI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'image', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ImageTableMap.php b/core/lib/Thelia/Model/Map/ImageTableMap.php
index 0f8d82b20..c49f24527 100755
--- a/core/lib/Thelia/Model/Map/ImageTableMap.php
+++ b/core/lib/Thelia/Model/Map/ImageTableMap.php
@@ -126,7 +126,7 @@ class ImageTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php
index f084515c0..bb9bfdd2e 100755
--- a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php
@@ -146,7 +146,7 @@ class MessageI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'message', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'LONGVARCHAR', false, null, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('DESCRIPTION_HTML', 'DescriptionHtml', 'CLOB', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/MessageTableMap.php b/core/lib/Thelia/Model/Map/MessageTableMap.php
index de2a205f9..392dac824 100755
--- a/core/lib/Thelia/Model/Map/MessageTableMap.php
+++ b/core/lib/Thelia/Model/Map/MessageTableMap.php
@@ -126,7 +126,7 @@ class MessageTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php
index 67b7a34ef..a8e680f1c 100755
--- a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php
@@ -151,7 +151,7 @@ class ModuleI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'module', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php
index 5370c1da1..cccaa890a 100755
--- a/core/lib/Thelia/Model/Map/ModuleTableMap.php
+++ b/core/lib/Thelia/Model/Map/ModuleTableMap.php
@@ -116,7 +116,7 @@ class ModuleTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php
index 5d78c474c..1b2052c2e 100755
--- a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php
@@ -151,7 +151,7 @@ class OrderStatusI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'order_status', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
index eecfe5a03..18406d9aa 100755
--- a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
@@ -101,7 +101,7 @@ class OrderStatusTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php
index 8da33f15d..79a01514a 100755
--- a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php
@@ -151,7 +151,7 @@ class ProductI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php
index b009a97af..40200ce10 100755
--- a/core/lib/Thelia/Model/Map/ProductTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductTableMap.php
@@ -166,7 +166,7 @@ class ProductTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php
index 8a8ce501a..ec22e2fd3 100755
--- a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php
@@ -151,7 +151,7 @@ class ResourceI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'resource', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
         $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ResourceTableMap.php b/core/lib/Thelia/Model/Map/ResourceTableMap.php
index e56960892..8d7708ddd 100755
--- a/core/lib/Thelia/Model/Map/ResourceTableMap.php
+++ b/core/lib/Thelia/Model/Map/ResourceTableMap.php
@@ -101,7 +101,7 @@ class ResourceTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
index 2c4c92f4f..a06230c37 100755
--- a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
@@ -141,7 +141,7 @@ class TaxI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
         $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
         $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
     } // initialize()
diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
index 689f30728..1f0ed1e96 100755
--- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
@@ -131,7 +131,7 @@ class TaxRuleI18nTableMap extends TableMap
         $this->setUseIdGenerator(false);
         // columns
         $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
     } // initialize()
 
     /**
diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php
index 9b862de99..cc5f628b9 100755
--- a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php
@@ -111,7 +111,7 @@ class TaxRuleTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php
index b941e7b52..6d43f20e9 100755
--- a/core/lib/Thelia/Model/Map/TaxTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxTableMap.php
@@ -101,7 +101,7 @@ class TaxTableMap extends TableMap
      *
      * @var string
      */
-    const DEFAULT_LOCALE = 'en_EN';
+    const DEFAULT_LOCALE = 'en_US';
 
     /**
      * holds an array of fieldnames
diff --git a/local/config/schema.xml b/local/config/schema.xml
index 8b97f4e8c..cae47a184 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<database defaultIdMethod="native" name="thelia" namespace="Thelia\Model">
-  <table name="category">
+<database defaultIdMethod="native" name="thelia">
+  <table name="category" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="parent" type="INTEGER" />
     <column name="link" size="255" type="VARCHAR" />
@@ -19,7 +19,7 @@
       <parameter name="log_created_by" value="true" />
     </behavior>
   </table>
-  <table name="product">
+  <table name="product" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="tax_rule_id" type="INTEGER" />
     <column name="ref" required="true" size="255" type="VARCHAR" />
@@ -54,7 +54,7 @@
       <parameter name="log_created_by" value="true" />
     </behavior>
   </table>
-  <table isCrossRef="true" name="product_category">
+  <table isCrossRef="true" name="product_category" namespace="Thelia\Model">
     <column name="product_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="category_id" primaryKey="true" required="true" type="INTEGER" />
     <foreign-key foreignTable="product" name="fk_product_has_category_product1" onDelete="CASCADE" onUpdate="RESTRICT">
@@ -71,7 +71,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="country">
+  <table name="country" namespace="Thelia\Model">
     <column name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="area_id" type="INTEGER" />
     <column name="isocode" required="true" size="4" type="VARCHAR" />
@@ -92,7 +92,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="tax">
+  <table name="tax" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="rate" required="true" type="FLOAT" />
     <column name="title" size="255" type="VARCHAR" />
@@ -102,7 +102,7 @@
       <parameter name="i18n_columns" value="title, description" />
     </behavior>
   </table>
-  <table name="tax_rule">
+  <table name="tax_rule" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" size="45" type="VARCHAR" />
     <column name="title" size="255" type="VARCHAR" />
@@ -110,7 +110,7 @@
     <behavior name="timestampable" />
     <behavior name="i18n" />
   </table>
-  <table name="tax_rule_country">
+  <table name="tax_rule_country" namespace="Thelia\Model">
     <column name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="tax_rule_id" type="INTEGER" />
     <column name="country_id" type="INTEGER" />
@@ -136,7 +136,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="feature">
+  <table name="feature" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column defaultValue="0" name="visible" type="INTEGER" />
     <column name="position" required="true" type="INTEGER" />
@@ -149,7 +149,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="feature_av">
+  <table name="feature_av" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="feature_id" required="true" type="INTEGER" />
     <column name="title" size="255" type="VARCHAR" />
@@ -167,7 +167,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="feature_prod">
+  <table name="feature_prod" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="product_id" required="true" type="INTEGER" />
     <column name="feature_id" required="true" type="INTEGER" />
@@ -194,7 +194,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table isCrossRef="true" name="feature_category">
+  <table isCrossRef="true" name="feature_category" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="feature_id" required="true" type="INTEGER" />
     <column name="category_id" required="true" type="INTEGER" />
@@ -212,7 +212,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="attribute">
+  <table name="attribute" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="position" type="INTEGER" />
     <column name="title" size="255" type="VARCHAR" />
@@ -224,7 +224,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="attribute_av">
+  <table name="attribute_av" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="attribute_id" required="true" type="INTEGER" />
     <column name="position" required="true" type="INTEGER" />
@@ -243,12 +243,12 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="combination">
+  <table name="combination" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="ref" size="255" type="VARCHAR" />
     <behavior name="timestampable" />
   </table>
-  <table name="attribute_combination">
+  <table name="attribute_combination" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="attribute_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="combination_id" primaryKey="true" required="true" type="INTEGER" />
@@ -273,7 +273,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="stock">
+  <table name="stock" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="combination_id" type="INTEGER" />
     <column name="product_id" required="true" type="INTEGER" />
@@ -293,7 +293,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table isCrossRef="true" name="attribute_category">
+  <table isCrossRef="true" name="attribute_category" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="category_id" required="true" type="INTEGER" />
     <column name="attribute_id" required="true" type="INTEGER" />
@@ -311,7 +311,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="config">
+  <table name="config" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="name" required="true" size="255" type="VARCHAR" />
     <column name="value" required="true" size="255" type="VARCHAR" />
@@ -326,7 +326,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="customer">
+  <table name="customer" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="ref" required="true" size="50" type="VARCHAR" />
     <column name="customer_title_id" type="INTEGER" />
@@ -360,7 +360,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="address">
+  <table name="address" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="title" size="255" type="VARCHAR" />
     <column name="customer_id" required="true" type="INTEGER" />
@@ -389,7 +389,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="customer_title">
+  <table name="customer_title" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column defaultValue="0" name="by_default" required="true" type="INTEGER" />
     <column name="position" required="true" size="45" type="VARCHAR" />
@@ -400,7 +400,7 @@
       <parameter name="i18n_columns" value="short, long" />
     </behavior>
   </table>
-  <table name="lang">
+  <table name="lang" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="title" size="100" type="VARCHAR" />
     <column name="code" size="10" type="VARCHAR" />
@@ -409,7 +409,7 @@
     <column name="by_default" type="TINYINT" />
     <behavior name="timestampable" />
   </table>
-  <table name="folder">
+  <table name="folder" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="parent" required="true" type="INTEGER" />
     <column name="link" size="255" type="VARCHAR" />
@@ -428,7 +428,7 @@
       <parameter name="log_created_by" value="true" />
     </behavior>
   </table>
-  <table name="content">
+  <table name="content" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="visible" type="TINYINT" />
     <column name="position" type="INTEGER" />
@@ -445,7 +445,7 @@
       <parameter name="log_created_by" value="true" />
     </behavior>
   </table>
-  <table name="content_assoc">
+  <table name="content_assoc" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="category_id" type="INTEGER" />
     <column name="product_id" type="INTEGER" />
@@ -471,7 +471,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="image">
+  <table name="image" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="product_id" type="INTEGER" />
     <column name="category_id" type="INTEGER" />
@@ -512,7 +512,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="document">
+  <table name="document" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="product_id" type="INTEGER" />
     <column name="category_id" type="INTEGER" />
@@ -553,7 +553,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="order">
+  <table name="order" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="ref" size="45" type="VARCHAR" />
     <column name="customer_id" required="true" type="INTEGER" />
@@ -602,7 +602,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="currency">
+  <table name="currency" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="name" size="45" type="VARCHAR" />
     <column name="code" size="45" type="VARCHAR" />
@@ -611,7 +611,7 @@
     <column name="by_default" type="TINYINT" />
     <behavior name="timestampable" />
   </table>
-  <table name="order_address">
+  <table name="order_address" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="customer_title_id" type="INTEGER" />
     <column name="company" size="255" type="VARCHAR" />
@@ -626,7 +626,7 @@
     <column name="country_id" required="true" type="INTEGER" />
     <behavior name="timestampable" />
   </table>
-  <table name="order_product">
+  <table name="order_product" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="order_id" required="true" type="INTEGER" />
     <column name="product_ref" size="255" type="VARCHAR" />
@@ -645,7 +645,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="order_status">
+  <table name="order_status" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" size="45" type="VARCHAR" />
     <column name="title" size="255" type="VARCHAR" />
@@ -657,7 +657,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="order_feature">
+  <table name="order_feature" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="order_product_id" required="true" type="INTEGER" />
     <column name="feature_desc" size="255" type="VARCHAR" />
@@ -670,7 +670,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="module">
+  <table name="module" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" required="true" size="55" type="VARCHAR" />
     <column name="type" required="true" type="TINYINT" />
@@ -688,7 +688,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table isCrossRef="true" name="accessory">
+  <table isCrossRef="true" name="accessory" namespace="Thelia\Model">
     <column name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="product_id" required="true" type="INTEGER" />
     <column name="accessory" required="true" type="INTEGER" />
@@ -707,13 +707,13 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="area">
+  <table name="area" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="name" required="true" size="100" type="VARCHAR" />
     <column name="unit" type="FLOAT" />
     <behavior name="timestampable" />
   </table>
-  <table name="delivzone">
+  <table name="delivzone" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="area_id" type="INTEGER" />
     <column name="delivery" required="true" size="45" type="VARCHAR" />
@@ -725,7 +725,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="group">
+  <table name="group" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" required="true" size="30" type="VARCHAR" />
     <column name="title" size="255" type="VARCHAR" />
@@ -740,7 +740,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="resource">
+  <table name="resource" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" required="true" size="30" type="VARCHAR" />
     <column name="title" size="255" type="VARCHAR" />
@@ -755,7 +755,7 @@
       <parameter name="i18n_columns" value="title, description, chapo, postscriptum" />
     </behavior>
   </table>
-  <table name="admin">
+  <table name="admin" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="firstname" required="true" size="100" type="VARCHAR" />
     <column name="lastname" required="true" size="100" type="VARCHAR" />
@@ -765,7 +765,7 @@
     <column name="salt" size="128" type="VARCHAR" />
     <behavior name="timestampable" />
   </table>
-  <table isCrossRef="true" name="admin_group">
+  <table isCrossRef="true" name="admin_group" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="group_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="admin_id" primaryKey="true" required="true" type="INTEGER" />
@@ -783,7 +783,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table isCrossRef="true" name="group_resource">
+  <table isCrossRef="true" name="group_resource" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="group_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="resource_id" primaryKey="true" required="true" type="INTEGER" />
@@ -803,7 +803,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="group_module">
+  <table name="group_module" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="group_id" required="true" type="INTEGER" />
     <column name="module_id" type="INTEGER" />
@@ -822,7 +822,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="message">
+  <table name="message" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" required="true" size="45" type="VARCHAR" />
     <column name="secured" type="TINYINT" />
@@ -839,7 +839,7 @@
       <parameter name="log_created_by" value="true" />
     </behavior>
   </table>
-  <table name="rewriting">
+  <table name="rewriting" namespace="Thelia\Model">
     <column name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="url" required="true" size="255" type="VARCHAR" />
     <column name="product_id" type="INTEGER" />
@@ -872,7 +872,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="coupon">
+  <table name="coupon" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" required="true" size="45" type="VARCHAR" />
     <column name="action" required="true" size="255" type="VARCHAR" />
@@ -886,7 +886,7 @@
     </unique>
     <behavior name="timestampable" />
   </table>
-  <table name="coupon_rule">
+  <table name="coupon_rule" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="coupon_id" required="true" type="INTEGER" />
     <column name="controller" size="255" type="VARCHAR" />
@@ -900,7 +900,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="coupon_order">
+  <table name="coupon_order" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="order_id" required="true" type="INTEGER" />
     <column name="code" required="true" size="45" type="VARCHAR" />
@@ -913,7 +913,7 @@
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="admin_log">
+  <table name="admin_log" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="admin_login" size="255" type="VARCHAR" />
     <column name="admin_firstname" size="255" type="VARCHAR" />
@@ -922,7 +922,7 @@
     <column name="request" type="LONGVARCHAR" />
     <behavior name="timestampable" />
   </table>
-  <table isCrossRef="true" name="content_folder">
+  <table isCrossRef="true" name="content_folder" namespace="Thelia\Model">
     <column name="content_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="folder_id" primaryKey="true" required="true" type="INTEGER" />
     <foreign-key foreignTable="content" name="fk_content_folder_content_id" onDelete="CASCADE" onUpdate="RESTRICT">