diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index b4e819f558e..d88cab40bd0 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -30,7 +30,7 @@
       </record>
 
       <record id="vehicle_1" model="fleet.vehicle">
-          <field name="registration">1-ACK-205</field>
+          <field name="license_plate">1-ACK-205</field>
           <field name="vin_sn">5454541</field>
           <field name="model_id" ref="model_astra"/>
           <field name="color">Black</field>
@@ -41,7 +41,7 @@
       </record>
 
       <record id="vehicle_2" model="fleet.vehicle">
-          <field name="registration">1-SYN-404</field>
+          <field name="license_plate">1-SYN-404</field>
           <field name="vin_sn">1337</field>
           <field name="model_id" ref="model_corsa"/>
           <field name="color">Red</field>
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 6c5f5ab27f8..bff36d6ac45 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -61,8 +61,8 @@ class fleet_vehicle(osv.Model):
         reads = self.browse(cr, uid, ids, context=context)
         res = []
         for record in reads:
-            if record.registration:
-                name = record.registration
+            if record.license_plate:
+                name = record.license_plate
             if record.model_id.modelname:
                 name = record.model_id.modelname + ' / ' + name
             if record.model_id.brand.name:
@@ -74,7 +74,6 @@ class fleet_vehicle(osv.Model):
         res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
-
     def act_show_log_services(self, cr, uid, ids, context=None):
         """ This opens log view to view and add new log for this vehicle
             @return: the service log view
@@ -97,13 +96,13 @@ class fleet_vehicle(osv.Model):
         res['domain']=[('vehicle_id','=', ids[0])]
         return res
 
-
     _name = 'fleet.vehicle'
     _description = 'Fleet Vehicle'
 
     _columns = {
         'name' : fields.function(_vehicle_name_get_fnc, type="char", string='Name', store=True),
-        'registration' : fields.char('Registration', size=32, required=True, help='Registration number of the vehicle (ie: plate number for a car)'),
+        'company_id': fields.many2one('res.company', 'Company'),
+        'license_plate' : fields.char('License plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'),
         'vin_sn' : fields.char('Chassis Number', size=32, required=False, help='Unique number written on the vehicle motor (VIN/SN number)'),
         'driver' : fields.many2one('hr.employee', 'Driver',required=False, help='Driver of the vehicle'),
         'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
@@ -128,6 +127,9 @@ class fleet_vehicle(osv.Model):
 
         'image': fields.related('model_id','image',type="binary",string="Logo",store=False)
     }
+    _defaults = {
+        'doors' : 5,
+    }
 
     def on_change_model(self, cr, uid, ids, model_id, context=None):
         # print "ids: %r" % (ids,)
@@ -156,7 +158,7 @@ class fleet_vehicle(osv.Model):
         vehicle_id = super(fleet_vehicle, self).create(cr, uid, data, context=context)
         try:
             vehicle = self.browse(cr, uid, vehicle_id, context=context)
-            self.message_post(cr, uid, [vehicle_id], body='Vehicle %s has been added to the fleet!' % (vehicle.registration), context=context)
+            self.message_post(cr, uid, [vehicle_id], body='Vehicle %s has been added to the fleet!' % (vehicle.license_plate), context=context)
         except:
             pass # group deleted: do not push a message
         return vehicle_id
@@ -166,7 +168,7 @@ class fleet_vehicle(osv.Model):
         try:
             changes = {}
             for key,value in vals.items():
-                if key == 'registration' or key == 'driver':
+                if key == 'license_plate' or key == 'driver':
                     changes[key] = value
             if len(changes) > 0:
                 self.message_post(cr, uid, [vehicle_id], body='Vehicle edited. Changes : '+ str(changes), context=context)
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 893ceff493d..8b473dd9051 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -83,7 +83,8 @@
                         <field name="image" widget='image'/>
                         <group>
                             <field name="model_id" />
-                            <field name="registration" />
+                            <field name="license_plate" />
+                            <field name="company_id" groups="base.group_multi_company"/>
                         </group>
 
                         <group col="2">
@@ -232,7 +233,7 @@
             <field name="model">fleet.vehicle</field>
             <field name="arch" type="xml">
                 <tree string="Vehicle" version="7.0">
-                    <field name="registration" />
+                    <field name="license_plate" />
                     <field name="model_id" />
                     <field name="driver" />
                     <field name="vin_sn" />