diff --git a/addons/payment_buckaroo/__openerp__.py b/addons/payment_buckaroo/__openerp__.py
index 4fd749fe9e7..3e56a451c52 100644
--- a/addons/payment_buckaroo/__openerp__.py
+++ b/addons/payment_buckaroo/__openerp__.py
@@ -8,9 +8,9 @@
     'description': """Buckaroo Payment Acquirer""",
     'depends': ['payment'],
     'data': [
-        'views/buckaroo.xml',
-        'views/payment_acquirer.xml',
-        'data/buckaroo.xml',
+        'views/payment_views.xml',
+        'views/payment_buckaroo_templates.xml',
+        'data/payment_acquirer_data.xml',
     ],
     'installable': True,
 }
diff --git a/addons/payment_buckaroo/data/buckaroo.xml b/addons/payment_buckaroo/data/payment_acquirer_data.xml
similarity index 100%
rename from addons/payment_buckaroo/data/buckaroo.xml
rename to addons/payment_buckaroo/data/payment_acquirer_data.xml
diff --git a/addons/payment_buckaroo/models/__init__.py b/addons/payment_buckaroo/models/__init__.py
index 7e1780a0059..10b988e0c28 100644
--- a/addons/payment_buckaroo/models/__init__.py
+++ b/addons/payment_buckaroo/models/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-import buckaroo
+import payment
diff --git a/addons/payment_buckaroo/models/buckaroo.py b/addons/payment_buckaroo/models/payment.py
similarity index 100%
rename from addons/payment_buckaroo/models/buckaroo.py
rename to addons/payment_buckaroo/models/payment.py
diff --git a/addons/payment_buckaroo/views/buckaroo.xml b/addons/payment_buckaroo/views/payment_buckaroo_templates.xml
similarity index 100%
rename from addons/payment_buckaroo/views/buckaroo.xml
rename to addons/payment_buckaroo/views/payment_buckaroo_templates.xml
diff --git a/addons/payment_buckaroo/views/payment_acquirer.xml b/addons/payment_buckaroo/views/payment_views.xml
similarity index 100%
rename from addons/payment_buckaroo/views/payment_acquirer.xml
rename to addons/payment_buckaroo/views/payment_views.xml