diff --git a/trytond/init.sql b/trytond/init.sql
index d4ec9612e2..32620b3d7c 100644
--- a/trytond/init.sql
+++ b/trytond/init.sql
@@ -21,10 +21,9 @@ CREATE TABLE ir_model (
   primary key(id)
 );
 
-CREATE TABLE ir_model_fields (
+CREATE TABLE ir_model_field (
   id serial,
-  model varchar(64) DEFAULT ''::varchar NOT NULL,
-  model_id int references ir_model on delete cascade,
+  model int references ir_model on delete cascade,
   name varchar(64) DEFAULT ''::varchar NOT NULL,
   relation varchar(64),
   field_description varchar(256),
diff --git a/trytond/ir/default.py b/trytond/ir/default.py
index 832d65cc43..0d93a14824 100644
--- a/trytond/ir/default.py
+++ b/trytond/ir/default.py
@@ -10,7 +10,7 @@ class Default(OSV):
     _columns = {
         'model': fields.Many2One('ir.model', 'Model', required=True,
             ondelete='cascade'),
-        'field': fields.Many2One('ir.model.fields', 'Field', required=True,
+        'field': fields.Many2One('ir.model.field', 'Field', required=True,
             ondelete='cascade'),
         'value': fields.Text('Value'),
         'clause': fields.Text('Clause'),
@@ -43,7 +43,7 @@ class Default(OSV):
     def set_default(self, cursor, user, model, field, clause, value,
             user_default, context=None):
         model_obj = self.pool.get('ir.model')
-        field_obj = self.pool.get('ir.model.fields')
+        field_obj = self.pool.get('ir.model.field')
         model_id = model_obj.search(cursor, user, [
             ('model', '=', model),
             ], context=context)[0]
diff --git a/trytond/ir/fr_FR.csv b/trytond/ir/fr_FR.csv
index 5dba00e62a..a2297183e8 100644
--- a/trytond/ir/fr_FR.csv
+++ b/trytond/ir/fr_FR.csv
@@ -79,18 +79,18 @@ field,"ir.model.data,fs_id",0,Identifier on File System,Identifiant sur le syst
 field,"ir.model.data,model",0,Model,Modèle,0
 field,"ir.model.data,module",0,Module,Module,0
 field,"ir.model.data,values",0,Values,Valeurs,0
-field,"ir.model,fields",0,Fields,Champs,0
-field,"ir.model.fields,field_description",0,Field Description,Champ de description,0
-field,"ir.model.fields,group_name",0,Group Name,Nom du groupe,0
-field,"ir.model.fields,groups",0,Groups,Groupes,0
-field,"ir.model.fields,help",0,Help,Aide,0
-field,"ir.model.fields,model",0,Model Name,Nom du modèle,0
-field,"ir.model.fields,model_id",0,Model id,Id de modèle,0
-field,"ir.model.fields,name",0,Name,Nom,0
-field,"ir.model.fields,relate",0,Click and Relate,Clicker et relier,0
-field,"ir.model.fields,relation",0,Model Relation,Relation du modèle,0
-field,"ir.model.fields,ttype",0,Field Type,Champ du type,0
-field,"ir.model.fields,view_load",0,View Auto-Load,Vue auto-chargée,0
+field,"ir.model,field",0,Fields,Champs,0
+field,"ir.model.field,field_description",0,Field Description,Champ de description,0
+field,"ir.model.field,group_name",0,Group Name,Nom du groupe,0
+field,"ir.model.field,groups",0,Groups,Groupes,0
+field,"ir.model.field,help",0,Help,Aide,0
+field,"ir.model.field,model",0,Model Name,Nom du modèle,0
+field,"ir.model.field,model_id",0,Model id,Id de modèle,0
+field,"ir.model.field,name",0,Name,Nom,0
+field,"ir.model.field,relate",0,Click and Relate,Clicker et relier,0
+field,"ir.model.field,relation",0,Model Relation,Relation du modèle,0
+field,"ir.model.field,ttype",0,Field Type,Champ du type,0
+field,"ir.model.field,view_load",0,View Auto-Load,Vue auto-chargée,0
 field,"ir.model,info",0,Information,Information,0
 field,"ir.model,model",0,Object name,Nom de l'objet,0
 field,"ir.model,name",0,Model name,Nom du modèle,0
@@ -410,7 +410,7 @@ view,ir.lang,0,Languages,Langues,0
 view,ir.model,0,Fields Description,Champs de description,0
 view,ir.model,0,Model Description,Description du modèle,0
 view,ir.model.access,0,Access controls,Contrôles d'accès,0
-view,ir.model.fields,0,Fields,Champs,0
+view,ir.model.field,0,Fields,Champs,0
 view,ir.module.category,0,Module Categories,Catégories de module,0
 view,ir.module.category,0,Module Category,Catégorie de module,0
 view,ir.module.module,0,Cancel Install,Annuler l'installation,0
diff --git a/trytond/ir/model.py b/trytond/ir/model.py
index c7fcd6d82f..17954c93cd 100644
--- a/trytond/ir/model.py
+++ b/trytond/ir/model.py
@@ -24,7 +24,7 @@ class Model(OSV):
         'name': fields.Char('Model name', size=64, translate=True),
         'model': fields.Char('Object name', size=64, required=True),
         'info': fields.Text('Information'),
-        'fields': fields.One2Many('ir.model.fields', 'model_id', 'Fields',
+        'fields': fields.One2Many('ir.model.field', 'model', 'Fields',
             required=True),
     }
     _defaults = {
@@ -33,25 +33,24 @@ class Model(OSV):
 
 Model()
 
-class ModelFields(OSV):
-    "Model fields"
-    _name = 'ir.model.fields'
+class ModelField(OSV):
+    "Model field"
+    _name = 'ir.model.field'
     _description = __doc__
     _columns = {
-        'name': fields.char('Name', size=64),
-        'model': fields.char('Model Name', size=64, required=True),
-        'relation': fields.char('Model Relation', size=64),
-        'model_id': fields.many2one('ir.model', 'Model id', required=True,
+        'name': fields.Char('Name', size=64),
+        'relation': fields.Char('Model Relation', size=64),
+        'model': fields.Many2One('ir.model', 'Model id', required=True,
             select=True, ondelete='cascade'),
-        'field_description': fields.char('Field Description', size=256,
+        'field_description': fields.Char('Field Description', size=256,
             translate=True),
-        'ttype': fields.char('Field Type', size=64),
-        'relate': fields.boolean('Click and Relate'),
+        'ttype': fields.Char('Field Type', size=64),
+        'relate': fields.Boolean('Click and Relate'),
 
-        'groups': fields.many2many('res.group', 'ir_model_fields_group_rel',
+        'groups': fields.Many2Many('res.group', 'ir_model_field_group_rel',
             'field_id', 'group_id', 'Groups'),
-        'group_name': fields.char('Group Name', size=128),
-        'view_load': fields.boolean('View Auto-Load'),
+        'group_name': fields.Char('Group Name', size=128),
+        'view_load': fields.Boolean('View Auto-Load'),
         'help': fields.Text('Help', translate=True),
     }
     _defaults = {
@@ -62,7 +61,7 @@ class ModelFields(OSV):
     }
     _order = "id"
 
-ModelFields()
+ModelField()
 
 
 class ModelAccess(OSV):
diff --git a/trytond/ir/model.xml b/trytond/ir/model.xml
index 009f8165e8..2dd55b01cf 100644
--- a/trytond/ir/model.xml
+++ b/trytond/ir/model.xml
@@ -65,7 +65,7 @@
         <menuitem parent_id="ir.menu_ir"
             action="act_model_form" id="menu_model_form"/>
         <record model="ir.ui.view" id="model_fields_view_form">
-            <field name="model">ir.model.fields</field>
+            <field name="model">ir.model.field</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <![CDATA[
@@ -87,7 +87,7 @@
             </field>
         </record>
         <record model="ir.ui.view" id="model_fields_view_tree">
-            <field name="model">ir.model.fields</field>
+            <field name="model">ir.model.field</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
               <![CDATA[
@@ -102,7 +102,7 @@
         </record>
         <record model="ir.action.act_window" id="act_model_fields_form">
             <field name="name">Fields</field>
-            <field name="res_model">ir.model.fields</field>
+            <field name="res_model">ir.model.field</field>
             <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view"
diff --git a/trytond/ir/property.py b/trytond/ir/property.py
index 74b8e32791..351d067081 100644
--- a/trytond/ir/property.py
+++ b/trytond/ir/property.py
@@ -11,7 +11,7 @@ class Property(OSV):
         'value': fields.reference('Value', selection='models_get2', size=128),
         'res_id': fields.reference('Resource', selection='models_get', size=128),
         #'company_id': fields.many2one('res.company', 'Company'),
-        'fields_id': fields.many2one('ir.model.fields', 'Fields',
+        'fields_id': fields.many2one('ir.model.field', 'Fields',
             ondelete='cascade', required=True)
     }
 
@@ -24,7 +24,7 @@ class Property(OSV):
             ]
 
     def models_get2(self, cursor, user, context=None):
-        model_fields_obj = self.pool.get('ir.model.fields')
+        model_fields_obj = self.pool.get('ir.model.field')
         ids = model_fields_obj.search(cursor, user, [('view_load', '=', 1)])
         res = []
         done = {}
@@ -36,7 +36,7 @@ class Property(OSV):
         return res
 
     def models_get(self, cursor, user, context=None):
-        model_fields_obj = self.pool.get('ir.model.fields')
+        model_fields_obj = self.pool.get('ir.model.field')
         ids = model_fields_obj.search(cursor, user, [('view_load', '=', 1)])
         res = []
         done = {}
@@ -50,7 +50,7 @@ class Property(OSV):
 
     def unlink(self, cursor, user, ids, context=None):
         if ids:
-            cursor.execute('DELETE FROM ir_model_fields ' \
+            cursor.execute('DELETE FROM ir_model_field ' \
                     'WHERE id IN (' \
                         'SELECT fields_id FROM ir_property ' \
                         'WHERE (fields_id IS NOT NULL) ' \
@@ -65,7 +65,7 @@ class Property(OSV):
         name: property name
         model: object name
         """
-        model_fields_obj = self.pool.get('ir.model.fields')
+        model_fields_obj = self.pool.get('ir.model.field')
         res = {}
 
         fields_id = model_fields_obj.search(cursor, user, [
@@ -104,7 +104,7 @@ class Property(OSV):
         """
         Set property value for res_id
         """
-        model_fields_obj = self.pool.get('ir.model.fields')
+        model_fields_obj = self.pool.get('ir.model.field')
         fields_id = model_fields_obj.search(cursor, user, [
             ('name', '=', name),
             ('model', '=', model),
diff --git a/trytond/ir/rule.py b/trytond/ir/rule.py
index 6f3894e237..d929b4e3b9 100644
--- a/trytond/ir/rule.py
+++ b/trytond/ir/rule.py
@@ -57,7 +57,7 @@ class Rule(OSV):
     _rec_name = 'field_id'
     _description = __doc__
     _columns = {
-        'field_id': fields.many2one('ir.model.fields', 'Field',
+        'field_id': fields.many2one('ir.model.field', 'Field',
             domain="[('model_id','=', parent.model_id)]", select=1,
             required=True),
         'operator':fields.selection([
diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py
index 10e1ed9972..4acb0bbccd 100644
--- a/trytond/ir/translation.py
+++ b/trytond/ir/translation.py
@@ -87,16 +87,16 @@ class Translation(OSV, Cacheable):
 
     def _get_ids(self, cursor, name, ttype, lang, ids):
         translations, to_fetch = {}, []
-        if name.split(',')[0] == 'ir.model.fields':
-            model_fields_obj = self.pool.get('ir.model.fields')
+        if name.split(',')[0] == 'ir.model.field':
+            model_fields_obj = self.pool.get('ir.model.field')
             field_name = name.split(',')[1]
             if field_name == 'field_description':
                 ttype = 'field'
             else:
                 ttype = 'help'
-            for field in model_fields_obj.read(cursor, 1, ids,
+            for field in model_fields_obj.read(cursor, 0, ids,
                     ['model', 'name']):
-                name = field['model'] + ',' + field['name']
+                name = field['model'][1] + ',' + field['name']
                 translations[field['id']] = self._get_source(cursor,
                         name, ttype, lang)
             return translations
@@ -125,8 +125,8 @@ class Translation(OSV, Cacheable):
         return translations
 
     def _set_ids(self, cursor, user, name, ttype, lang, ids, value):
-        if name.split(',')[0] == 'ir.model.fields':
-            model_fields_obj = self.pool.get('ir.model.fields')
+        if name.split(',')[0] == 'ir.model.field':
+            model_fields_obj = self.pool.get('ir.model.field')
             field_name = name.split(',')[1]
             if field_name == 'field_description':
                 ttype = 'field'
diff --git a/trytond/osv/orm.py b/trytond/osv/orm.py
index 2a9717d60a..2c3a9016d7 100644
--- a/trytond/osv/orm.py
+++ b/trytond/osv/orm.py
@@ -284,11 +284,14 @@ class ORM(object):
                     (self._name,))
         (model_id,) = cursor.fetchone()
 
-        cursor.execute('SELECT id, name, field_description, ttype, relation, ' \
-                    'group_name, view_load ' \
-                'FROM ir_model_fields ' \
-                'WHERE model = %s ' \
-                    'AND name in ' \
+        cursor.execute('SELECT f.id AS id, f.name AS name, ' \
+                    'f.field_description AS field_description, ' \
+                    'f.ttype AS ttype, f.relation AS relation, ' \
+                    'f.group_name AS group_name, f.view_load AS view_load ' \
+                'FROM ir_model_field AS f, ir_model AS m ' \
+                'WHERE f.model = m.id ' \
+                    'AND m.model = %s ' \
+                    'AND f.name in ' \
                         '(' + ','.join(['%s' for x in self._columns]) + ')',
                         (self._name,) + tuple(self._columns))
         columns = {}
@@ -316,12 +319,11 @@ class ORM(object):
         for k in self._columns:
             field = self._columns[k]
             if k not in columns:
-                cursor.execute("INSERT INTO ir_model_fields " \
-                        "(model_id, model, name, field_description, ttype, " \
+                cursor.execute("INSERT INTO ir_model_field " \
+                        "(model, name, field_description, ttype, " \
                             "relation, group_name, view_load, help) " \
-                        "VALUES (%d, %s, %s, %s, %s, %s, %s, %s, %s)",
-                        (model_id, self._name, k,
-                            field.string, field._type,
+                        "VALUES (%d, %s, %s, %s, %s, %s, %s, %s)",
+                        (model_id, k, field.string, field._type,
                             field._obj or 'NULL', field.group_name or '',
                             (field.view_load and 'True') or 'False',
                             field.help))
@@ -332,7 +334,7 @@ class ORM(object):
                     or columns[k]['view_load'] != \
                         ((field.view_load and 'True') or 'False') \
                     or columns[k]['help'] != field.help:
-                cursor.execute('UPDATE ir_model_fields ' \
+                cursor.execute('UPDATE ir_model_field ' \
                         'SET field_description = %s, ' \
                             'ttype = %s, ' \
                             'relation = %s, ' \
@@ -1718,10 +1720,12 @@ class ORM(object):
                 doc = node.ownerDocument
                 models = ["'" + x + "'" for x in  [self._name] + \
                         self._inherits.keys()]
-                cursor.execute('SELECT name, group_name ' \
-                        'FROM ir_model_fields ' \
-                        'WHERE model in (' + ','.join(models) + ') ' \
-                            'AND view_load ORDER BY group_name, id')
+                cursor.execute('SELECT f.name AS name, ' \
+                            'f.group_name AS group_name ' \
+                        'FROM ir_model_field AS f, ir_model AS m ' \
+                        'WHERE f.model = m.id ' \
+                            'AND m.model in (' + ','.join(models) + ') ' \
+                            'AND f.view_load ORDER BY f.group_name, f.id')
                 oldgroup = None
                 for fname, gname in cursor.fetchall():
                     if oldgroup != gname:
diff --git a/trytond/trytond.py b/trytond/trytond.py
index 27ef3fb5ac..b0f2b64857 100644
--- a/trytond/trytond.py
+++ b/trytond/trytond.py
@@ -87,7 +87,7 @@ class TrytonServer(object):
                     "WHERE relkind = 'r' AND relname in (" \
                     "'inherit', "
                     "'ir_model', "
-                    "'ir_model_fields', "
+                    "'ir_model_field', "
                     "'ir_ui_view', "
                     "'ir_ui_menu', "
                     "'res_user', "