diff --git a/addons/report/__openerp__.py b/addons/report/__openerp__.py
index 844dedfa307..ba866256950 100644
--- a/addons/report/__openerp__.py
+++ b/addons/report/__openerp__.py
@@ -2,22 +2,20 @@
     'name': 'Report',
     'category': 'Base',
     'summary': 'Hidden',
-    'version': '1.0',
     'description': """
 Report
         """,
     'depends': ['base', 'web'],
     'data': [
-        'views/layouts.xml',
-        'views/views.xml',
-        'data/report_paperformat.xml',
+        'data/report_paperformat_data.xml',
         'security/ir.model.access.csv',
-        'views/report.xml',
-        'views/ir_actions.xml',
+        'views/layout_templates.xml',
+        'views/report_paperformat_views.xml',
+        'views/report_templates.xml',
+        'views/ir_actions_report_views.xml',
     ],
     'qweb' : [
         'static/src/xml/*.xml',
     ],
-    'installable': True,
     'auto_install': True,
 }
diff --git a/addons/report/data/report_paperformat.xml b/addons/report/data/report_paperformat_data.xml
similarity index 100%
rename from addons/report/data/report_paperformat.xml
rename to addons/report/data/report_paperformat_data.xml
diff --git a/addons/report/views/ir_actions.xml b/addons/report/views/ir_actions_report_views.xml
similarity index 100%
rename from addons/report/views/ir_actions.xml
rename to addons/report/views/ir_actions_report_views.xml
diff --git a/addons/report/views/layouts.xml b/addons/report/views/layout_templates.xml
similarity index 100%
rename from addons/report/views/layouts.xml
rename to addons/report/views/layout_templates.xml
diff --git a/addons/report/views/views.xml b/addons/report/views/report_paperformat_views.xml
similarity index 100%
rename from addons/report/views/views.xml
rename to addons/report/views/report_paperformat_views.xml
diff --git a/addons/report/views/report.xml b/addons/report/views/report_templates.xml
similarity index 100%
rename from addons/report/views/report.xml
rename to addons/report/views/report_templates.xml