diff --git a/addons/payment/__openerp__.py b/addons/payment/__openerp__.py
index d5409ca301f..a9b40aa8534 100644
--- a/addons/payment/__openerp__.py
+++ b/addons/payment/__openerp__.py
@@ -8,13 +8,13 @@
     'description': """Payment Acquirer Base Module""",
     'depends': ['account'],
     'data': [
-        'data/payment_acquirer.xml',
-        'data/account.xml',
-        'views/payment_acquirer.xml',
-        'views/assets.xml',
-        'views/res_config_view.xml',
-        'views/res_partner_view.xml',
-        'views/account_payment.xml',
+        'data/account_data.xml',
+        'data/payment_acquirer_data.xml',
+        'views/payment_views.xml',
+        'views/account_config_settings_views.xml',
+        'views/account_payment_views.xml',
+        'views/payment_templates.xml',
+        'views/res_partner_views.xml',
         'security/ir.model.access.csv',
         'security/payment_security.xml',
     ],
diff --git a/addons/payment/data/account.xml b/addons/payment/data/account_data.xml
similarity index 100%
rename from addons/payment/data/account.xml
rename to addons/payment/data/account_data.xml
diff --git a/addons/payment/data/payment_acquirer.xml b/addons/payment/data/payment_acquirer_data.xml
similarity index 100%
rename from addons/payment/data/payment_acquirer.xml
rename to addons/payment/data/payment_acquirer_data.xml
diff --git a/addons/payment/views/res_config_view.xml b/addons/payment/views/account_config_settings_views.xml
similarity index 100%
rename from addons/payment/views/res_config_view.xml
rename to addons/payment/views/account_config_settings_views.xml
diff --git a/addons/payment/views/account_payment.xml b/addons/payment/views/account_payment_views.xml
similarity index 100%
rename from addons/payment/views/account_payment.xml
rename to addons/payment/views/account_payment_views.xml
diff --git a/addons/payment/views/assets.xml b/addons/payment/views/payment_templates.xml
similarity index 100%
rename from addons/payment/views/assets.xml
rename to addons/payment/views/payment_templates.xml
diff --git a/addons/payment/views/payment_acquirer.xml b/addons/payment/views/payment_views.xml
similarity index 100%
rename from addons/payment/views/payment_acquirer.xml
rename to addons/payment/views/payment_views.xml
diff --git a/addons/payment/views/res_partner_view.xml b/addons/payment/views/res_partner_views.xml
similarity index 100%
rename from addons/payment/views/res_partner_view.xml
rename to addons/payment/views/res_partner_views.xml