diff --git a/addons/payment_adyen/__openerp__.py b/addons/payment_adyen/__openerp__.py
index 331ce8d124d..1e26a8808ca 100644
--- a/addons/payment_adyen/__openerp__.py
+++ b/addons/payment_adyen/__openerp__.py
@@ -8,9 +8,9 @@
     'description': """Adyen Payment Acquirer""",
     'depends': ['payment'],
     'data': [
-        'views/adyen.xml',
-        'views/payment_acquirer.xml',
-        'data/adyen.xml',
+        'views/payment_views.xml',
+        'views/payment_adyen_templates.xml',
+        'data/payment_acquirer_data.xml',
     ],
     'installable': True,
 }
diff --git a/addons/payment_adyen/data/adyen.xml b/addons/payment_adyen/data/payment_acquirer_data.xml
similarity index 100%
rename from addons/payment_adyen/data/adyen.xml
rename to addons/payment_adyen/data/payment_acquirer_data.xml
diff --git a/addons/payment_adyen/models/__init__.py b/addons/payment_adyen/models/__init__.py
index fdc540ef04d..10b988e0c28 100644
--- a/addons/payment_adyen/models/__init__.py
+++ b/addons/payment_adyen/models/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-import adyen
+import payment
diff --git a/addons/payment_adyen/models/adyen.py b/addons/payment_adyen/models/payment.py
similarity index 100%
rename from addons/payment_adyen/models/adyen.py
rename to addons/payment_adyen/models/payment.py
diff --git a/addons/payment_adyen/views/adyen.xml b/addons/payment_adyen/views/payment_adyen_templates.xml
similarity index 100%
rename from addons/payment_adyen/views/adyen.xml
rename to addons/payment_adyen/views/payment_adyen_templates.xml
diff --git a/addons/payment_adyen/views/payment_acquirer.xml b/addons/payment_adyen/views/payment_views.xml
similarity index 100%
rename from addons/payment_adyen/views/payment_acquirer.xml
rename to addons/payment_adyen/views/payment_views.xml