diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index a41ebd2f13f..2094ab84c3b 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -38,7 +38,7 @@
     'update_xml': [
         'security/account_payment_security.xml',
         'security/ir.model.access.csv',
-        'wizard/wizard_pay_view.xml',
+        'wizard/account_payment_pay_view.xml',
         'payment_wizard.xml',
         'wizard/account_payment_create_order_view.xml',
         'payment_view.xml',
diff --git a/addons/account_payment/wizard/__init__.py b/addons/account_payment/wizard/__init__.py
index adf15cea884..0a2db6f8fd0 100644
--- a/addons/account_payment/wizard/__init__.py
+++ b/addons/account_payment/wizard/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import account_payment_order
-import wizard_pay
+import account_payment_pay
 import wizard_populate_statement
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/wizard/wizard_pay.py b/addons/account_payment/wizard/account_payment_pay.py
similarity index 100%
rename from addons/account_payment/wizard/wizard_pay.py
rename to addons/account_payment/wizard/account_payment_pay.py
diff --git a/addons/account_payment/wizard/wizard_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
similarity index 100%
rename from addons/account_payment/wizard/wizard_pay_view.xml
rename to addons/account_payment/wizard/account_payment_pay_view.xml