diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index e316441c808..8be5dbb6f03 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -30,12 +30,12 @@ Main Features
     ],
     'data' : [
         'fleet_view.xml',
-        'data.xml',
-        'board_fleet_view.xml',
+        'fleet_data.xml',
+        'fleet_board_view.xml',
     ],
     'update_xml' : ['security/ir.model.access.csv'],
 
-    'demo': ['cars.xml','demo.xml'],
+    'demo': ['fleet_cars.xml','fleet_demo.xml'],
 
     'installable' : True,
     'application' : True,
diff --git a/addons/fleet/board_fleet_view.xml b/addons/fleet/fleet_board_view.xml
similarity index 100%
rename from addons/fleet/board_fleet_view.xml
rename to addons/fleet/fleet_board_view.xml
diff --git a/addons/fleet/cars.xml b/addons/fleet/fleet_cars.xml
similarity index 100%
rename from addons/fleet/cars.xml
rename to addons/fleet/fleet_cars.xml
diff --git a/addons/fleet/data.xml b/addons/fleet/fleet_data.xml
similarity index 100%
rename from addons/fleet/data.xml
rename to addons/fleet/fleet_data.xml
diff --git a/addons/fleet/demo.xml b/addons/fleet/fleet_demo.xml
similarity index 100%
rename from addons/fleet/demo.xml
rename to addons/fleet/fleet_demo.xml