diff --git a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_url_constraint.xml b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/link_url_string_constraint.xml
similarity index 97%
rename from bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_url_constraint.xml
rename to bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/link_url_string_constraint.xml
index 6a0e8157e9b5a4d53db99cf556ed775d58ffc70a..094e3039646a38ce3747e3fac184f7b538ae94f8 100644
--- a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_url_constraint.xml
+++ b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/link_url_string_constraint.xml
@@ -51,7 +51,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>payzen_url_constraint</string> </value>
+            <value> <string>link_url_string_constraint</string> </value>
         </item>
         <item>
             <key> <string>message_attribute_match</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_constraint.xml b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_constraint.xml
similarity index 87%
rename from bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_constraint.xml
rename to bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_constraint.xml
index 1b26189dfe67cc68a32904003a5c46e2a23b9ea4..d5edb6fb3ae52aa17ca1f03182f9f8a04565c8f2 100644
--- a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_constraint.xml
+++ b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_constraint.xml
@@ -39,7 +39,7 @@
             <key> <string>constraint_property</string> </key>
             <value>
               <tuple>
-                <string>payzen_ctx_mode</string>
+                <string>payzen_vads_ctx_mode</string>
               </tuple>
             </value>
         </item>
@@ -51,19 +51,19 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>payzen_ctx_mode_constraint</string> </value>
+            <value> <string>payzen_vads_ctx_mode_constraint</string> </value>
         </item>
         <item>
             <key> <string>message_attribute_match</string> </key>
-            <value> <string>vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
+            <value> <string>Payzen vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
         </item>
         <item>
             <key> <string>message_no_such_property</string> </key>
-            <value> <string>vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
+            <value> <string>Payzen vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
         </item>
         <item>
             <key> <string>message_property_not_set</string> </key>
-            <value> <string>vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
+            <value> <string>Payzen vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_property.xml b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_property.xml
similarity index 91%
rename from bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_property.xml
rename to bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_property.xml
index 416976e807183907520e958773d074a9ceafe34d..3288d6613c23aad0235885e92b56090b74ad1815 100644
--- a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_ctx_mode_property.xml
+++ b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_property.xml
@@ -22,7 +22,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>payzen_ctx_mode_property</string> </value>
+            <value> <string>payzen_vads_ctx_mode_property</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_site_id_constraint.xml b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/service_username_constraint.xml
similarity index 97%
rename from bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_site_id_constraint.xml
rename to bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/service_username_constraint.xml
index 8de26462879417acce9055e7caf0dc63718f6d32..4afe059fecbdf6ec5ab6ea9bec57cc99b8053a82 100644
--- a/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_site_id_constraint.xml
+++ b/bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/service_username_constraint.xml
@@ -51,7 +51,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>payzen_site_id_constraint</string> </value>
+            <value> <string>service_username_constraint</string> </value>
         </item>
         <item>
             <key> <string>message_attribute_match</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml b/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml
index 4b6572eaaa4a9027ce60efadcae0e2bcf4925cc7..099ac28bc2daeefb819ab71848a5833e7890000e 100644
--- a/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml
+++ b/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml
@@ -107,7 +107,7 @@
                         <string>my_link_url_string</string>
                         <string>my_service_username</string>
                         <string>my_service_password</string>
-                        <string>my_payzen_ctx_mode</string>
+                        <string>my_payzen_vads_ctx_mode</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_ctx_mode.xml b/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_vads_ctx_mode.xml
similarity index 98%
rename from bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_ctx_mode.xml
rename to bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_vads_ctx_mode.xml
index 735ee616a5e4c1544719e3fb82085fe253d3f2f0..bb9e6eb7e14aa0d9c7d7973f8e4096c6dd50dfe3 100644
--- a/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_ctx_mode.xml
+++ b/bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_payzen_vads_ctx_mode.xml
@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_payzen_ctx_mode</string> </value>
+            <value> <string>my_payzen_vads_ctx_mode</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -256,7 +256,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>vads_ctx_mode</string> </value>
+                    <value> <string>Payzen vads_ctx_mode</string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
diff --git a/bt5/erp5_payzen_secure_payment/bt/revision b/bt5/erp5_payzen_secure_payment/bt/revision
index 3cacc0b93c9c9c03a72da624ca28a09ba5c1336f..ca7bf83ac53a27a2a914bed25e1a07478dd8ef47 100644
--- a/bt5/erp5_payzen_secure_payment/bt/revision
+++ b/bt5/erp5_payzen_secure_payment/bt/revision
@@ -1 +1 @@
-12
\ No newline at end of file
+13
\ No newline at end of file