diff --git a/account_banking_uk_hsbc/__init__.py b/account_banking_uk_hsbc/__init__.py
index b9c3e7a5e..4dd116675 100644
--- a/account_banking_uk_hsbc/__init__.py
+++ b/account_banking_uk_hsbc/__init__.py
@@ -22,4 +22,5 @@
 import account_banking_uk_hsbc
 import wizard
 import hsbc_mt940
+import payment_order_v5_fixes
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_banking_uk_hsbc/__openerp__.py b/account_banking_uk_hsbc/__terp__.py
similarity index 100%
rename from account_banking_uk_hsbc/__openerp__.py
rename to account_banking_uk_hsbc/__terp__.py
diff --git a/account_banking_uk_hsbc/data/banking_export_hsbc.xml b/account_banking_uk_hsbc/data/banking_export_hsbc.xml
index d6cc30e93..2db3483ac 100644
--- a/account_banking_uk_hsbc/data/banking_export_hsbc.xml
+++ b/account_banking_uk_hsbc/data/banking_export_hsbc.xml
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record model="payment.mode.type" id="export_acm_or_ezone">
+        <record model="payment.type" id="export_acm_or_ezone">
             <field name="name">ACH or EZONE</field>
-            <field name="code">not used</field>
+            <field name="code">UKACH</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base_iban.bank_iban'),ref('base.bank_normal'),])]" />
-            <field name="ir_model_id"
-                ref="account_banking_uk_hsbc.model_banking_export_hsbc_wizard"/>
         </record>
-        <record model="payment.mode.type" id="export_faster_payment">
+        <record model="payment.type" id="export_faster_payment">
             <field name="name">Faster Payment</field>
-            <field name="code">not used</field>
+            <field name="code">UKFP</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base.bank_normal'),])]" />
-            <field name="ir_model_id"
-                ref="account_banking_uk_hsbc.model_banking_export_hsbc_wizard"/>
         </record>
-        <record model="payment.mode.type" id="export_priority_payment">
+        <record model="payment.type" id="export_priority_payment">
             <field name="name">Priority Payment</field>
-            <field name="code">not used</field>
+            <field name="code">UKPP</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base_iban.bank_iban'),ref('base.bank_normal'),])]" />
-            <field name="ir_model_id"
-                ref="account_banking_uk_hsbc.model_banking_export_hsbc_wizard"/>
         </record>
     </data>
 </openerp>
diff --git a/account_banking_uk_hsbc/payment_order_v5_fixes.py b/account_banking_uk_hsbc/payment_order_v5_fixes.py
new file mode 100644
index 000000000..042043e21
--- /dev/null
+++ b/account_banking_uk_hsbc/payment_order_v5_fixes.py
@@ -0,0 +1,37 @@
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#    Copyright (C) 2012 credativ, Ltd (<http://www.credativ.co.uk>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from datetime import date
+from tools.translate import _
+
+class payment_order(osv.osv):
+    '''
+    Attach export_clieop wizard to payment order and allow traceability
+    '''
+    _inherit = 'payment.order'
+    def get_wizard(self, type):
+        if type in ['UKACH', 'UKFP', 'UKPP']:
+            return self._module, 'model_banking_export_hsbc_wizard'
+        return super(payment_order, self).get_wizard(type)
+payment_order()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: