diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
index 173ef9349170e6fbb5d34e8a98fabbaeff20f376..6951fee7d6cf865527b7b9ccfaf984b692a54684 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
@@ -51,7 +51,9 @@
         <item>
             <key> <string>permissions</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+<string></string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -83,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/svn_cleanup</string> </value>
+            <value> <string>string:${object_url}/BusinessTemplate_doSvnCleanup</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_wc.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_wc.xml
index 8b9ce282b6462890f451c30ba5c1a9547c897798..70a397992d3581f7ac54536e6d153b6c176f909a 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_wc.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_wc.xml
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/svn_update</string> </value>
+            <value> <string>string:${object_url}/BusinessTemplate_doSvnUpdate</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
index 4025395e37a422ca2fb7187afda8b8347b83ba72..8c0eec757f468916aeff8b6ca02ae2d026624817 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
@@ -51,7 +51,9 @@
         <item>
             <key> <string>permissions</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+<string></string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -83,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/svn_info</string> </value>
+            <value> <string>string:${object_url}/BusinessTemplate_doSvnInfo</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/createJSDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptDiff.xml
similarity index 97%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/createJSDiff.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptDiff.xml
index 088e5a41ec0edad0776d65d842e62603029d34d0..1694626b9b23ca840ea489232dffad615228e810 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/createJSDiff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptDiff.xml
@@ -106,7 +106,7 @@ return \'\'\'<script>\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/createJSDiff</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptDiff</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -165,7 +165,7 @@ return \'\'\'<script>\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>createJSDiff</string> </value>
+            <value> <string>BusinessTemplate_doCreateJavaScriptDiff</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/createJSStatus.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml
similarity index 96%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/createJSStatus.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml
index 2a7acc73f10555113153a967938d77be89787eab..d390ad573e163d6963fad42a4e3a435eb1f6736d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/createJSStatus.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml
@@ -181,7 +181,7 @@ print \'\'\'<script>var tree = null;\n
           if (nbRemoved==0 && nbAdded==0 && nbModified==0) {\n
             alert(\'Nothing to commit !\');\n
           } else {\n
-            submitAction(form,\'%s/svn_commit\');\n
+            submitAction(form,\'%s/BusinessTemplate_doSvnCommit\');\n
           }\n
         }\n
 \n
@@ -337,23 +337,21 @@ document.onmousemove = getMouse;\n
           } else {\n
             if(confirm(\'Are you sure you want to revert changes?\')){\n
               form.files.value=to_revert;\n
-              submitAction(form,\'%s/svn_revert\');\n
-              //Revert changes\n
-              //open(\'/svn_revert?files=\'+escape(to_revert), \'_self\');\n
+              submitAction(form,\'%s/BusinessTemplate_doSvnRevert\');\n
             }\n
           }\n
         }\n
 \n
         function update(){\n
-          open(\'%s/svn_update\', \'_self\');\n
+          open(\'%s/BusinessTemplate_doSvnUpdate\', \'_self\');\n
         }\n
 \n
         function infos(){\n
-          open(\'%s/svn_info\', \'_self\');\n
+          open(\'%s/BusinessTemplate_doSvnInfo\', \'_self\');\n
         }\n
 \n
         function cleanup(){\n
-          open(\'%s/svn_cleanup\', \'_self\');\n
+          open(\'%s/BusinessTemplate_doSvnCleanup\', \'_self\');\n
         }\n
 \n
         function log(){\n
@@ -365,7 +363,7 @@ document.onmousemove = getMouse;\n
         function ls(){\n
           //hide popup\n
           document.getElementById(\'menudiv\').style.display = "none";\n
-          open(\'%s/svn_ls?file=\'+tree.getSelectedItemId(), \'_self\');\n
+          open(\'%s/BusinessTemplate_doSvnLs?file=\'+tree.getSelectedItemId(), \'_self\');\n
         }\n
 \n
 \'\'\'% (context.getId(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url())\n
@@ -395,7 +393,7 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/createJSStatus</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -449,7 +447,7 @@ return printed\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>createJSStatus</string> </value>
+            <value> <string>BusinessTemplate_doCreateJavaScriptStatus</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_cleanup.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
similarity index 97%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_cleanup.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
index 72efa55cd7e9ff50103726b54af8117aa0f4fc25..b1a346f4cb3e05ab175cd9cf31e4e7b67d591798 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_cleanup.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
@@ -80,7 +80,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_cleanup</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -129,7 +129,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_cleanup</string> </value>
+            <value> <string>BusinessTemplate_doSvnCleanup</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
similarity index 98%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
index bb20c123588e52e4bde95995d789ac443c86cca0..521da20601f59cfbbc49f85aa03f6c60387dcc3f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
@@ -129,7 +129,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_commit</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -201,7 +201,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_commit</string> </value>
+            <value> <string>BusinessTemplate_doSvnCommit</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_diff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
similarity index 98%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_diff.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
index 94a70220c99b10ff906078b767c7def7cce018b3..f6471eb7e12bc655d6fb92a11ce1180ed685e29b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_diff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
@@ -120,7 +120,7 @@ return printed\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_diff</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -180,7 +180,7 @@ return printed\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_diff</string> </value>
+            <value> <string>BusinessTemplate_doSvnDiff</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_info.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
similarity index 97%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_info.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
index a39e24c56d1b13d8cf404a5224b2e7d7698bf6a8..190c01f2d721ec5b2fd186c6dfdba35b578112b8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_info.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
@@ -88,7 +88,7 @@ return context.asContext(entry_dict=entry_dict).BusinessTemplate_viewSvnInfos()\
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_info</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -143,7 +143,7 @@ return context.asContext(entry_dict=entry_dict).BusinessTemplate_viewSvnInfos()\
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_info</string> </value>
+            <value> <string>BusinessTemplate_doSvnInfo</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
similarity index 98%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
index e8f1e96c25a47f7991cb719c42855919551e7297..ad63a10248eab9bcd86ae47a076394ec702f828a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
@@ -108,7 +108,7 @@ return object_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_log</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnLog</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -174,7 +174,7 @@ return object_list\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_log</string> </value>
+            <value> <string>BusinessTemplate_doSvnLog</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_login.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
similarity index 92%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_login.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
index 2cec261cbe46e0e00ff71eb02f9692966de9710b..82fab09a325b7ce7749151ea7c05bbcc5c0e2442 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_login.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
@@ -80,13 +80,13 @@ context.getPortalObject()["portal_subversion"].setLogin(svn_realm, svn_user, svn
 if caller == \'update\':\n
   return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_update\')\n
 elif caller == \'commit\':\n
-  return context.asContext(changelog=changelog).svn_commit(added=added,removed=removed,modified=modified)\n
+  return context.asContext(changelog=changelog).BusinessTemplate_doSvnCommit(added=added,removed=removed,modified=modified)\n
 elif caller == \'ls\':\n
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_ls?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
+  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLs?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
 elif caller == \'log\':\n
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_log?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
+  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLog?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
 elif caller == \'info\':\n
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_info\')\n
+  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnInfo\')\n
 else:\n
   return \'Error: Caller \'+caller+\' is unknown\'\n
 </string> </value>
@@ -99,7 +99,7 @@ else:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_login</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -157,7 +157,7 @@ else:\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_login</string> </value>
+            <value> <string>BusinessTemplate_doSvnLogin</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ls.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
similarity index 98%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ls.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
index 483e8e10605aea94c82909d63816c227543f8491..32fb60f7bd7068464acca6a9954a320ae1fecb7a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ls.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
@@ -96,7 +96,7 @@ else:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_ls</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnLs</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -154,7 +154,7 @@ else:\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_ls</string> </value>
+            <value> <string>BusinessTemplate_doSvnLs</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
similarity index 97%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
index bdb8ca1c44b0cd37b9c292333756bae7174144fd..a5bf7489eacda6411a6e4f6689e8b6849f9091f9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
@@ -93,7 +93,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_revert</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -149,7 +149,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_revert</string> </value>
+            <value> <string>BusinessTemplate_doSvnRevert</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ssl_trust.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
similarity index 92%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ssl_trust.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
index 3bef61dcd1cd5364af3f74676201fcb15e312e28..daeb0e9779b356cd0812868fe0972fafa97c82b2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ssl_trust.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
@@ -82,13 +82,13 @@ context.getPortalObject()["portal_subversion"].acceptSSLServer(trust_dict, True)
 if caller == \'update\':\n
   return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_update\')\n
 elif caller == \'commit\':\n
-  return context.asContext(changelog=changelog).svn_commit(added=added,removed=removed,modified=modified)\n
+  return context.asContext(changelog=changelog).BusinessTemplate_doSvnCommit(added=added,removed=removed,modified=modified)\n
 elif caller == \'ls\':\n
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_ls?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
+  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLs?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
 elif caller == \'log\':\n
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_log?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
+  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLog?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
 elif caller == \'info\':\n
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_info\')\n
+  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnInfo\')\n
 else:\n
   return \'Error: Caller \'+ caller + \'is unknown\'\n
 </string> </value>
@@ -101,7 +101,7 @@ else:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_ssl_trust</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -162,7 +162,7 @@ else:\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_ssl_trust</string> </value>
+            <value> <string>BusinessTemplate_doSvnSslTrust</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_update.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
similarity index 97%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_update.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
index 74ba03d1ad70c261b0a2984bd9f1a287d6426ed5..92539d90f5e237c063e564060f2986e77677fbc1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_update.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
@@ -96,7 +96,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_update</string> </value>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -151,7 +151,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>svn_update</string> </value>
+            <value> <string>BusinessTemplate_doSvnUpdate</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
index ed40f92e075e320b6aba1d08683aa24ea43f331d..e0409b151ecf4b2a3402cdec61d9513e76eac5a2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
@@ -47,7 +47,7 @@
         </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string>svn_commit</string> </value>
+            <value> <string>BusinessTemplate_doSvnCommit</string> </value>
         </item>
         <item>
             <key> <string>encoding</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml
index 71c7b4c845c935ebcaffe2c6ea4c1fe8fb50983c..d8b750628a21a780d94c2e63ecd5795cbdcd4452 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml
@@ -55,9 +55,9 @@
 <tal:block metal:use-macro="here/view_master/macros/master">\n
 <tal:block metal:fill-slot="main">\n
 <tal:js replace="structure \n
-here/createJSDiff">JavaScript here</tal:js>\n
+here/BusinessTemplate_doCreateJavaScriptDiff">JavaScript here</tal:js>\n
 <tal:py replace="structure \n
-here/svn_diff">diff here</tal:py>\n
+here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n
 </tal:block>\n
 </tal:block>\n
 
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml
index be509445b40351aecf9cd0dff5e9fdc36948f9bb..e3e34139a62450f1a6843be4d3f4f4ac8eb1dba1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml
@@ -561,7 +561,7 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>svn_log</string> </value>
+            <value> <string>BusinessTemplate_doSvnLog</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
index 0625b5b443f3ec03a3cae2bd45d9705f30b2fb0c..5be53402dc9e5f92e6ea1c597dc9ead679e3fa3a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
@@ -47,7 +47,7 @@
         </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string>svn_login</string> </value>
+            <value> <string>BusinessTemplate_doSvnLogin</string> </value>
         </item>
         <item>
             <key> <string>encoding</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
index f427c48e32d37c14fb542ba183640ca1762985c4..bf015db8f6d33b7161c051960fcb8aab0824b8eb 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
@@ -47,7 +47,7 @@
         </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string>svn_ssl_trust</string> </value>
+            <value> <string>BusinessTemplate_doSvnSslTrust</string> </value>
         </item>
         <item>
             <key> <string>encoding</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
index df962f22fed27998fd857ca821be269cf7da20d1..553de9096fec07202a52e597fea47e9740a3c04a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
@@ -90,7 +90,7 @@
 </div>\n
 \n
 <tal:js replace="structure \n
-here/createJSStatus">javascript here</tal:js>\n
+here/BusinessTemplate_doCreateJavaScriptStatus">javascript here</tal:js>\n
 \n
 <font color=\'black\'><h1><center>Subversion</center></h1></font><br>\n
 <button onclick="expandCollapse()" value="expand" name="Expand / Collapse" type="button">Expand / Collapse</button>\n