diff --git a/addons/payment_sips/__openerp__.py b/addons/payment_sips/__openerp__.py
index 08298fbfd3f..a8c608d8774 100644
--- a/addons/payment_sips/__openerp__.py
+++ b/addons/payment_sips/__openerp__.py
@@ -29,9 +29,9 @@ Works with Worldline keys version 2.0, contains implementation of
 payments acquirer using Worldline SIPS.""",
     'depends': ['payment'],
     'data': [
-        'views/sips.xml',
-        'views/payment_acquirer.xml',
-        'data/sips.xml',
+        'views/payment_views.xml',
+        'views/payment_sips_templates.xml',
+        'data/payment_acquirer_data.xml',
     ],
     'installable': True,
 }
diff --git a/addons/payment_sips/data/sips.xml b/addons/payment_sips/data/payment_acquirer_data.xml
similarity index 100%
rename from addons/payment_sips/data/sips.xml
rename to addons/payment_sips/data/payment_acquirer_data.xml
diff --git a/addons/payment_sips/models/__init__.py b/addons/payment_sips/models/__init__.py
index 365abd07d65..10b988e0c28 100644
--- a/addons/payment_sips/models/__init__.py
+++ b/addons/payment_sips/models/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-import sips
+import payment
diff --git a/addons/payment_sips/models/sips.py b/addons/payment_sips/models/payment.py
similarity index 100%
rename from addons/payment_sips/models/sips.py
rename to addons/payment_sips/models/payment.py
diff --git a/addons/payment_sips/views/sips.xml b/addons/payment_sips/views/payment_sips_templates.xml
similarity index 100%
rename from addons/payment_sips/views/sips.xml
rename to addons/payment_sips/views/payment_sips_templates.xml
diff --git a/addons/payment_sips/views/payment_acquirer.xml b/addons/payment_sips/views/payment_views.xml
similarity index 100%
rename from addons/payment_sips/views/payment_acquirer.xml
rename to addons/payment_sips/views/payment_views.xml