diff --git a/addons/payment_paypal/__openerp__.py b/addons/payment_paypal/__openerp__.py
index 2e53042ccc6..80274a5b64e 100644
--- a/addons/payment_paypal/__openerp__.py
+++ b/addons/payment_paypal/__openerp__.py
@@ -8,10 +8,10 @@
     'description': """Paypal Payment Acquirer""",
     'depends': ['payment'],
     'data': [
-        'views/paypal.xml',
-        'views/payment_acquirer.xml',
-        'views/res_config_view.xml',
-        'data/paypal.xml',
+        'views/payment_views.xml',
+        'views/payment_paypal_templates.xml',
+        'views/account_config_settings_views.xml',
+        'data/payment_acquirer_data.xml',
     ],
     'installable': True,
 }
diff --git a/addons/payment_paypal/data/paypal.xml b/addons/payment_paypal/data/payment_acquirer_data.xml
similarity index 100%
rename from addons/payment_paypal/data/paypal.xml
rename to addons/payment_paypal/data/payment_acquirer_data.xml
diff --git a/addons/payment_paypal/models/__init__.py b/addons/payment_paypal/models/__init__.py
index a1fe670f56f..10b988e0c28 100644
--- a/addons/payment_paypal/models/__init__.py
+++ b/addons/payment_paypal/models/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-import paypal
+import payment
diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/payment.py
similarity index 100%
rename from addons/payment_paypal/models/paypal.py
rename to addons/payment_paypal/models/payment.py
diff --git a/addons/payment_paypal/views/res_config_view.xml b/addons/payment_paypal/views/account_config_settings_views.xml
similarity index 100%
rename from addons/payment_paypal/views/res_config_view.xml
rename to addons/payment_paypal/views/account_config_settings_views.xml
diff --git a/addons/payment_paypal/views/paypal.xml b/addons/payment_paypal/views/payment_paypal_templates.xml
similarity index 100%
rename from addons/payment_paypal/views/paypal.xml
rename to addons/payment_paypal/views/payment_paypal_templates.xml
diff --git a/addons/payment_paypal/views/payment_acquirer.xml b/addons/payment_paypal/views/payment_views.xml
similarity index 100%
rename from addons/payment_paypal/views/payment_acquirer.xml
rename to addons/payment_paypal/views/payment_views.xml