diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/history.xml
index c7ab962c986b2fc78f337562d6a520e38747ab9f..e2856b9771be8a11756ca9486fab923c74b842fe 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/metadata.xml
index 512c2ef0f2536110c83f48a3371fc3f82f299788..94e56f7335aa2a6aa038952ce39865039f100000 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/print.xml
index ba338fe1772a9dc29211e393694f130d8c167479..28fd457103b32cd0819968bcbf25d543c02352c4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/print_pdf.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/print_pdf.xml
index 477f99e8e95a73f5897ae32a849bc929586ef15b..c92cef8fde2aef8c68ed575d6d448ac06e44fb89 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/print_pdf.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/print_pdf.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/view.xml
index 56a8833b8d2288130a82f1befc21236925b890d9..0fd5df4c9b0de67d0eaf277fd381f6a7d59524d2 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Address/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/history.xml
index 6d3ce567f3363d90ee543c07bc7f484737edc43f..b6c47d25b0ce57314cbb483fb3d677fb5ade1a36 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/metadata.xml
index 089ff3d48882ad61a89229af311577ef4d5d5565..2aa4a6dcd43651422c6becc1fd7cb127e5076ae0 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/print.xml
index c8893a67146ab9710f890ae32873e3e4da41b7f7..7f2a3fa788cd8416177e703544dce4e46b43adbe 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
index 2063c5c1aec0651c4bcce027420f2ca457320547..58cb407b74625ca4c0a9eede9bf179485b650b96 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent%20Privilege/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/download.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/download.xml
index db4c8514dbc247191b111ff404dca6224150e471..d330836405afd00f820ee1b9f285fcb7907ede66 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/download.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/history.xml
index 9c68cab4cf41ca32a7da1d87227409f98afc9b95..2e6965f16789166a478e54992734f55e58425c46 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/metadata.xml
index a3cfb01ba00a090e9f3fea513a539be61c7330e3..65fccc750607dcfd4dbc95ae48ff9773f1228a3f 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/signature.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/signature.xml
index 4aa0917ba87821c13717854b46015b88c90c83b8..aca8e97d1f79a8bb21cd98aa7241c5708bf5d420 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/signature.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/signature.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/view.xml
index 861122ea963c5f76fd193e385ddd9ebca8a6059c..18814ae24c234ce0da299a5aaa97cffc70c2c764 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Agent/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/metadata.xml
index 20aa67da31ec72c6975071023bddc9e2f5a6105f..f6b4416badb6dded3f6e5e97897b276333fcff2e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/print.xml
index 0f36220e9c3e8d245af2235d060fa2bc73674095..84644d264cb2dec2e9eeec5d3ba31e2bcf22bf0b 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/view.xml
index c7b56e25ab91bac73a1495539eb9483af5969d44..c0639fa676a757f05a11587997f0600e7f84c916 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/metadata.xml
index 75bb0c06aa6dd202b43e8688f2d5857d188abb58..0105c089c88a02bc88320840908be28d2e782554 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/periodicity.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/periodicity.xml
index 1922558cc4f01360b4a2b20391db2a32d06253b4..3968c5114972a1b4f94f14ae03859e16eb788fec 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/periodicity.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/periodicity.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/print.xml
index 994b1dcf9525fd14ee5739d3bde5a4ff6ed19418..b6cea1556f77b062c3c43a88064abf2c46d7c933 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/print_pdf.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/print_pdf.xml
index 107d3030efe8808fb014cf6e7846d7a11c2aaa6c..6cd7bd733074ee48754fecc6862edcd88987cdf4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/print_pdf.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/print_pdf.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/view.xml
index 15ccd969f6f3b49e5c92b05213fc0a57d05a3a6e..762009d6c457f9e82b59923b235566fa863d58f2 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Alarm/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/list.xml
index d28102288fd97fe80378d7eabf39e736c21c8436..f47fb7b5c718f0a35f05dd2f2dffc8762e6d174d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/metadata.xml
index 512c2ef0f2536110c83f48a3371fc3f82f299788..94e56f7335aa2a6aa038952ce39865039f100000 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/print.xml
index 609b935d6782c84ad7df9bc38d1c2904b43fd8cf..b190b3c8bfad6e96095e2c9e5201e51d539d2697 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/print_pdf.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/print_pdf.xml
index 7d1abebde1dc787010d6668ec805ba06b29cccc3..4291f7d5f4901bed1f92564cc2cb1030d05e385c 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/print_pdf.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/print_pdf.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/translate.xml
index 5ac5cd85aa98a82eb6f014dce43522adc1f05b1a..9be4e782f4dbfc70e5d7f942c5482f6a070c4116 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/view.xml
index 03d5145d17861164c146f846369a6c5592b60079..1a9ac643625600ecb4b0634a3a2665f141fbc67d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Applied%20Rule/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/history.xml
index cfc824f01c59fddfed66f3c979700ccb324ea5b9..c8ba1cc1c5542973ca862555037e15f84bfabfdd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/metadata.xml
index 8d1810743a26e12cefee555bef7336bd4e248b69..8921c12faeff43db6e44818d83d82c4008f3abc6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/print_pdf.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/print_pdf.xml
index 6221c92e12e86548cb8640a8695f4dc55c1c3808..2464f8eb04e04f1887740a83949ca8f23ccf12a7 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/print_pdf.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/print_pdf.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/view.xml
index 72171f106aa9339e79c96f4c5fe0eec1dbdcb75d..2c57b228feba7dd9b028a1855650786285362dbd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Assignment/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/history.xml
index 78a1c04ac8bd1b04f2b215c5037fa0c546aff0ba..8a72e4e09d1fb5085e07f1680413a2c1cde7784a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/jump_active_accounting_pref.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/jump_active_accounting_pref.xml
index cebe117c6e1f2c11bb3cdb250bbde180b7277062..efe89b094a675b86f0ff42268b452119190922ca 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/jump_active_accounting_pref.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/jump_active_accounting_pref.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/metadata.xml
index 6e41be7e0785c1f91bd15bf94f27e492b1744dd5..db21efb9f145295ed9090bdad88dea59d4d2bb49 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/print_pdf.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/print_pdf.xml
index 5cebfdaeb5510ec4f1609adccbb00e1fe878aab4..49204d9eb5028ff9a804ddcfda82983369008c71 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/print_pdf.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/print_pdf.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/transactions.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/transactions.xml
index ed38d19f0d330efbad337b4c923d53c1077b9b16..adb2c0395d8286728f149b9eaa95d30da1e509a6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/transactions.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/transactions.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/view.xml
index f04f8cec0fac2707d961c485d8e650047aaa1a3b..b1be1189fe2e7fc2c669765e4c834e85ddb4c50e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Bank%20Account/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/list.xml
index e07e5b2f3bc970c6d72cbd51ff9343e72cfd5be2..8fc811418d057474c6b6bfd3815b92b35b7ce2f1 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/view.xml
index 61249c0026c001188e0bb197fa9303fac596c377..18f605b5aefc7bdd881ec6e06953628cdc7a85f5 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Base%20Category/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/export.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/export.xml
index f4d4e5cf24918e4b39d412de543b7b6f9eb55679..fa7c348aa7f550a052f7adee2ffbc19318ce9287 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/export.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml
index de6f667addec9279df78a49c0331ba0abfc01ef5..73f7e4008a8d55ac603bb196ac995fc73e11bda8 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml
index 5cc875f1f53a9ebf0ad4c680ab2dddfe72d812fb..36fd19ddf7ba3ddea36722daace25d335969b666 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/history.xml
index ad3f4270858724b2fc58f7b2e575b41a3dd3e19a..da92c01cd9b6cb6c3c4660d24f70f8964ef6aa5e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/metadata.xml
index 4764ce8c2aedee0354d9322f7663ee1b6a8f1fa7..d38a393f380a02ec9af38b7972b7325373140b83 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/save.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/save.xml
index 97039741ee1cb06d0a06a0e6d6a3a104489208d2..d87ef32320f0b75e9edfcdca238387999c6c8a68 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/save.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/save.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/unittest_run.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/unittest_run.xml
index 56ae1db75c2640bd7e9922af419dbaf3bae1cf39..9d274a9f42a1fae040aa20ce31be8b33a3db480a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/unittest_run.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/unittest_run.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view.xml
index 6bbdb021cb54e1c7a4b5bd60499232ce3349479c..ebe23bc0ede155b4d87fa386efbc4645906cac1c 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_catalog.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_catalog.xml
index 7f6b15693cc88526fa8076a5a00cda043c23e1f8..be6cfe6f988c4d588908bf177fca9c2704d4f576 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_catalog.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_catalog.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_detail.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_detail.xml
index cbb588a0ac27d1e039486e188d24792175440736..4d0ea26d73bd059a00484c7e1785445a2003245e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_detail.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_detail.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_portal_types.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_portal_types.xml
index 03379e0a5a73e1941230f40e1944a0aeb0658408..3390276c12dccbac585043b63ee8e718257117fb 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_portal_types.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/view_portal_types.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/history.xml
index 6d3ce567f3363d90ee543c07bc7f484737edc43f..b6c47d25b0ce57314cbb483fb3d677fb5ade1a36 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/metadata.xml
index 089ff3d48882ad61a89229af311577ef4d5d5565..2aa4a6dcd43651422c6becc1fd7cb127e5076ae0 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/print_pdf.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/print_pdf.xml
index 7d1abebde1dc787010d6668ec805ba06b29cccc3..4291f7d5f4901bed1f92564cc2cb1030d05e385c 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/print_pdf.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/print_pdf.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/view.xml
index a9f098e554694bc35623ee3df0ebc828361f470e..bff37325948b297ffeddfab1c2a60764184fe3d8 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Career/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/fast_input.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/fast_input.xml
index 1d820e28e140e3333170f55c24d4d52269006429..41e6aaed3344b55daea0b503ce31d90cea762ed9 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/fast_input.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/fast_input.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/list.xml
index e07e5b2f3bc970c6d72cbd51ff9343e72cfd5be2..8fc811418d057474c6b6bfd3815b92b35b7ce2f1 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/localroles.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/localroles.xml
index bf7b72b52f60219587fa0c09e11104dbe5eb8234..9dd926ae60f35a81722ef7e04888e2a1eb40be18 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/localroles.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/localroles.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/metadata.xml
index 59fc5c65b78f4344aae28b8d6771b5273d3df6f6..aa7230db6273ff699241f9b5627a5a9892f194b1 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/syndication.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/syndication.xml
index dfb15d73da9b842336f397eb2e9225aac1919a44..006d022527c66085f41c4244817d09cbc05a897e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/syndication.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/syndication.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/view.xml
index 4a153c971e6add377874c0bdcf973c6ed47111fc..7025c4c046bc5a261088f7492616ccb946c154e4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/list.xml
index e07011674a5382961a5bf155733db0e966db3e45..87d3400fb64c797804508d2eda9245da712415e6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/view.xml
index 552ece9f0f4c750a908edcec6e00f04988beb9fc..d1e8e89e13df6ac45b04b1767d0535602908fe81 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/history.xml
index cfc824f01c59fddfed66f3c979700ccb324ea5b9..c8ba1cc1c5542973ca862555037e15f84bfabfdd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/metadata.xml
index 8d1810743a26e12cefee555bef7336bd4e248b69..8921c12faeff43db6e44818d83d82c4008f3abc6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/print.xml
index 741c97a043f7dac47bfe6f7be19e4c608da90f58..75d89da833af8b7e539ec4b17730315b786ac34d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/translate.xml
index d4f281bed3d91c9854c8bcd338ac06d0f66ce099..217c0428ea4bb2c8489270dde46daed03a50aa89 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/view.xml
index bfd820be2f6e0734e79d752a2d86624640820c72..df967e6feefaacd6ff74d58e82a5b8eca689c74d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/ChatAddress/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/history.xml
index 089782cbc27aa35425db9e8aebafecfea70f0cf3..ee2038fea2860a2cf49ad26aa853d936bd8ff8bd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/metadata.xml
index 799ec8652d4dc4ee86cf5b6146d202d99b58f97c..b9b9087faf09033846349b8ecc8c7c5e4b4c6729 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/print_pdf.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/print_pdf.xml
index b63e6cdedd865adf2d26464e762fe721b7e67f7d..30690ef6fb229db2861ae113bd834d7d6b787c55 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/print_pdf.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/print_pdf.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/view.xml
index f191636f23bd755120e936eeb9cacbd19e05eace..9ac8b87d144530d94e60e01c22e1491f112c2b45 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Credit%20Card/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/history.xml
index 78a1c04ac8bd1b04f2b215c5037fa0c546aff0ba..8a72e4e09d1fb5085e07f1680413a2c1cde7784a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/metadata.xml
index 6e41be7e0785c1f91bd15bf94f27e492b1744dd5..db21efb9f145295ed9090bdad88dea59d4d2bb49 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
index 71ba0d0af5e9d26784367cc332715ddf095f2721..7a5ec5e611dc394a14679add19e208c2f1fe861c 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Exchange%20Line/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/Translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/Translate.xml
index f9527e264f4b571e83391c60ec2db2336bad882f..40b78bc4dcc2dc41a6c492bc58417644211f79e5 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/Translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/Translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/csv_export.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/csv_export.xml
index 88b3e2ef63c7bdb6346d7a7837458ba3fcb5e521..7b891294e9e07268f2bea2c5c5679754cde8d9fa 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/csv_export.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/csv_import.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/csv_import.xml
index 2fa3c7766a444206162be82cb978bd1bd65d3979..053f01c787fb0efe5166a94a7c3705aad8846349 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/csv_import.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/print.xml
index 741c97a043f7dac47bfe6f7be19e4c608da90f58..75d89da833af8b7e539ec4b17730315b786ac34d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/search.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/search.xml
index c75a84e14ef1c08786e06902a1d4948cbffbd833..f3b7e83aa673cd4b0169651e4fea4fc10db27f3d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/search.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/view.xml
index aae6b166eba6c70c9bf2fe2e202f8c467cda0374..eabad5f5e8c877ed4c6b98fe2b14bf0290d387ee 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/history.xml
index 78a1c04ac8bd1b04f2b215c5037fa0c546aff0ba..8a72e4e09d1fb5085e07f1680413a2c1cde7784a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/metadata.xml
index 6e41be7e0785c1f91bd15bf94f27e492b1744dd5..db21efb9f145295ed9090bdad88dea59d4d2bb49 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/view.xml
index 566ee331acd9560dc60cfa576a25d03843b1ae26..c984c92dad793888e76f7dbb4b3d3b313c3ef931 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Currency/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/history_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/history_view.xml
index 60020a2f5fc537da360b4862658d81e3b8cb5be6..4d1766a0017643282078cb3374f6116bdb0999a5 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/history_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/history_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/metadata.xml
index c65a63386c97d616d937278984d18cac5ad702f5..0a41e665cba6e4631c8aaaea56bff798cbcccd11 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/print.xml
index 7bb2a2a63f0954fd88a8ae0114cbbdc46e616f5d..6ceeba48231d2eb2c25891915d9cf6e62b3d208d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml
index 3af24e2cf718e65060963b53b5f47daa51810eb1..1434ba24fc76d108bfcb0ba32436ecbfefe7b574 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml
index 548b621b8dbada209266ec3650983aa0bc583bb4..6b4af6a02ba2ba72227f7d3a359dffc59de89018 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_predicate_group.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml
index 022ae823d7903fe32d0b183f7768dc4d88613618..bb52bdda6a1309bb7b9ff3a216cd1ac3c6863b1e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Builder/view_profile.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/csv_export.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/csv_export.xml
index 88b3e2ef63c7bdb6346d7a7837458ba3fcb5e521..7b891294e9e07268f2bea2c5c5679754cde8d9fa 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/csv_export.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/list_ui.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/list_ui.xml
index b75a2810f104d2772c11e3ab6acb73768ff6c1cd..87f104e31fd5bcdb1e0d2d67d0cfac6c064d63a0 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/list_ui.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/print.xml
index e7daf2209051402f1ec7c85a9daeef6f7f468769..08391c418478d3905efee2d9fd421c56af582a3f 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/sort_on.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/sort_on.xml
index 4205dac02e328b1a4dde8a6fc8bc9790bf02757a..21ad81cae8f8ee84c03a6d3b89d05c23a766557c 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/sort_on.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/view.xml
index 85d385409ca23bf1b77c35dadaec47c912773ff5..e82d3ca3b4dd5f832c36097cf82f80967cc08cf6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Delivery%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/history.xml
index cfc824f01c59fddfed66f3c979700ccb324ea5b9..c8ba1cc1c5542973ca862555037e15f84bfabfdd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/metadata.xml
index 8d1810743a26e12cefee555bef7336bd4e248b69..8921c12faeff43db6e44818d83d82c4008f3abc6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/print.xml
index 741c97a043f7dac47bfe6f7be19e4c608da90f58..75d89da833af8b7e539ec4b17730315b786ac34d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/translate.xml
index d4f281bed3d91c9854c8bcd338ac06d0f66ce099..217c0428ea4bb2c8489270dde46daed03a50aa89 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/view.xml
index 34e0e7883e6a9e78d7b4ae5abccc1df44972ef02..416089b40c4ce179a4ef01338f1f9367978f6227 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/history.xml
index 78a1c04ac8bd1b04f2b215c5037fa0c546aff0ba..8a72e4e09d1fb5085e07f1680413a2c1cde7784a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/metadata.xml
index 6e41be7e0785c1f91bd15bf94f27e492b1744dd5..db21efb9f145295ed9090bdad88dea59d4d2bb49 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/view.xml
index 4e85fac9c34ac3c1495deb262e561f03cb6fb555..6f5386c339aaeb79aeef44248111e47dca5afaf0 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Email/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/history.xml
index c651415bf1ec227c01ce527c0e69b680719f7a61..1678b5a345367a44552b86d0e61e7dc878e3e00f 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/metadata.xml
index 9db4d705d9f77b8984ac0a10010d3ed684e0e9da..b36551008812b369d554c0e3ce62189cb965e9d5 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/translate.xml
index 18af6d1d13b9c670c30966146359edcb54276367..0eed9507e17d4a5abfc775175685d2522f09fbd3 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/view.xml
index 901ff694087547113206f2240159d67ed380d252..90e4e60c1fe02f5778716fc59722647844dc5335 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Favorite/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/fax.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/fax.xml
index b5515835d6b42e5f388aecc1a836905d4c8d0f31..6e59f951a24ed9695dca6a396aa83763dd0632aa 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/fax.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/fax.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/history.xml
index ad3f4270858724b2fc58f7b2e575b41a3dd3e19a..da92c01cd9b6cb6c3c4660d24f70f8964ef6aa5e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/metadata.xml
index 4764ce8c2aedee0354d9322f7663ee1b6a8f1fa7..d38a393f380a02ec9af38b7972b7325373140b83 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/previous_call.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/previous_call.xml
index 4d7f231ff2573404c4633d1b4147f280d5a3cdfd..7b63378edc23f98d775f849097c9fc4b4f5f40e2 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/previous_call.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/previous_call.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/view.xml
index e534471762087f996e5422962d9b9198cfc815a9..c2976d53379b1cf9da6030ff8ce9603643b2717d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Fax/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/download.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/download.xml
index b668d13cc774086a7e25d9885e89e37cafc8d902..10443a04b1dc601a15778783d8c577e2d5677255 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/download.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/history.xml
index c7ab962c986b2fc78f337562d6a520e38747ab9f..e2856b9771be8a11756ca9486fab923c74b842fe 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/metadata.xml
index 512c2ef0f2536110c83f48a3371fc3f82f299788..94e56f7335aa2a6aa038952ce39865039f100000 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/view.xml
index 8e4dfb990ac5153475d079ae94a5a7314f2c2069..81ab387fa6f8bfd284b6ba4625c5ab5ea4587b5e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/File/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/edit.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/edit.xml
index 89cf0fdb80d9c9bfb4ba0fcefa653495deb85e49..c6f4a0f8141efd06dae90a592ad7651b8ab3b513 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/edit.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/edit.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/foldercontents.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/foldercontents.xml
index 65ec138e3e5c97a477878f3d774cf4c759dac28a..40bf5997d3ed8f16bc4424ec9f9dceb70889c752 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/foldercontents.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/foldercontents.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/localroles.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/localroles.xml
index e0d5e6a458a8bbf67d88e68d6935334c050247de..464bad9981187de3d7ac9c162a3c39e7dff334ef 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/localroles.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/localroles.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/syndication.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/syndication.xml
index 5f0a8f979b72cac84ded529eb88bd652aae2afd6..cf3d24a93c6702172a88ee8cb653acac6c6adeda 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/syndication.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/syndication.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/view.xml
index 82fa472817a9b5e90ad70154951244a1f74d52d5..1c0e6c101e0644183ff95792120a090366e40aca 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Folder/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/download.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/download.xml
index 9a673e6285f97df591e052fa4646282b645f9368..e0f0092a90babc3a667734824cb07199324b4f55 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/download.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/fullsize_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/fullsize_view.xml
index 057ebe1d053ddedfa808128a045f6c0b87708f87..2af2ecdb1a4dd5d33c414f0c6df89c1f77380a57 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/fullsize_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/fullsize_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/history.xml
index ad3f4270858724b2fc58f7b2e575b41a3dd3e19a..da92c01cd9b6cb6c3c4660d24f70f8964ef6aa5e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/metadata.xml
index 4764ce8c2aedee0354d9322f7663ee1b6a8f1fa7..d38a393f380a02ec9af38b7972b7325373140b83 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/print.xml
index 6bdd8a522ec4393a97fac673bba49af825f65c9d..21ff1c80053d5443d69b4a553a05d8b08dcbdade 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/translate.xml
index abad90e230c048a7c9cd9f21766e92a59f3d0103..78ae62232fe6b189cd3d734469836ab7172f29cc 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/view.xml
index 1d741a7ad1b782b1bd570e219bd5f64292b97314..aafc9c62c72d243f7e4678e98f88ff45763544bd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Image/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/history.xml
index c651415bf1ec227c01ce527c0e69b680719f7a61..1678b5a345367a44552b86d0e61e7dc878e3e00f 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/metadata.xml
index 9db4d705d9f77b8984ac0a10010d3ed684e0e9da..b36551008812b369d554c0e3ce62189cb965e9d5 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/translate.xml
index 18af6d1d13b9c670c30966146359edcb54276367..0eed9507e17d4a5abfc775175685d2522f09fbd3 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/view.xml
index dd8493c5c40af7fb67adf085076b67742c3acab0..dc5b39ce063cf2a46f1185db1bc0ddba89be33c9 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Link/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/history.xml
index cfc824f01c59fddfed66f3c979700ccb324ea5b9..c8ba1cc1c5542973ca862555037e15f84bfabfdd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/metadata.xml
index 8d1810743a26e12cefee555bef7336bd4e248b69..8921c12faeff43db6e44818d83d82c4008f3abc6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/print.xml
index 6c436b4004f448102f49079536c59c66031cf426..5c293bc09466dcba6474ab147c6c75e4b759abc7 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/translate.xml
index d4f281bed3d91c9854c8bcd338ac06d0f66ce099..217c0428ea4bb2c8489270dde46daed03a50aa89 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/view.xml
index c89e440687bd89d10d0db723a75faae5f0ebee58..a3a406ebcb9c7ecbab62fcef26e0aec8c5182bed 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Mapped%20Value/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/history.xml
index c651415bf1ec227c01ce527c0e69b680719f7a61..1678b5a345367a44552b86d0e61e7dc878e3e00f 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/metadata.xml
index 9db4d705d9f77b8984ac0a10010d3ed684e0e9da..b36551008812b369d554c0e3ce62189cb965e9d5 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/translate.xml
index 18af6d1d13b9c670c30966146359edcb54276367..0eed9507e17d4a5abfc775175685d2522f09fbd3 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/view.xml
index 781b17e188ce9613433c2d70b09043d88bef2daf..1555bc47a547149dc82c9fb474709f33cee96661 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/News%20Item/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/history_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/history_view.xml
index 61328cb26f55cb9f6884b9771da0847be2a1111d..8a082ddccba26a8126452ec2508fa3a4097e669a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/history_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/history_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/metadata.xml
index 512c2ef0f2536110c83f48a3371fc3f82f299788..94e56f7335aa2a6aa038952ce39865039f100000 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/print.xml
index 75772c427b8ed3f22c1780988129f078a0ff1bc6..1c37e227140fbe414426e5985b90fe3543ecaa28 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view.xml
index ea2fa4b7de023ab04e889faf921181f2f923dd20..7980f2f26acc80cdf46a020508583c5dc265a85c 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml
index 8257e5e28216fe33e279774adb459c9171612edd..834ba80a83817f9ab63a3a8c7cdd87a4d12cb8db 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_predicate_group.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml
index 415b4b3d282e6622e26f19a29cfcd460875188ac..89aeda5504ce5ca94e9489519fc013df7bd97029 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Builder/view_profile.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/csv_export.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/csv_export.xml
index 4b3ebc4f6b2366899531992bc984c368e199fc5d..00a535e66beba205d6c8e542c47a0617654c0fcf 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/csv_export.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/list_ui.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/list_ui.xml
index c440ab673531e1b1484d72b89f8940afa9a47aa7..841940982b41794fca5bddde85444d25bcc98311 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/list_ui.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/print.xml
index af7cb76a731e638c003f04b08c87ac3cfe7908d5..99a53add888fe60a3ac2f9b59804e8fff3438008 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/sort_on.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/sort_on.xml
index 86f46805c5d37b193a5eef2c8825dde400c97d03..e844fa54d39539506d0f80333a2477c2fb170e7c 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/sort_on.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/view.xml
index 4a153c971e6add377874c0bdcf973c6ed47111fc..7025c4c046bc5a261088f7492616ccb946c154e4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Order%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/csv_export.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/csv_export.xml
index 4a2e3ceda75cc99773c6c583222f499585512f82..171c2e1854688fd2e765849b3b9ca22dbfefe5a4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/csv_export.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/csv_import.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/csv_import.xml
index 52faa83b25c549b976f45aebdffd2bc2ab5c35ad..ebc1b4273f611a242a980a59e91268848bc02f86 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/csv_import.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/list_ui.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/list_ui.xml
index 74f0a65bc04d11f1f6ef82a423d039df8b5214cb..af4ea8ec04ea3aa18061d62a4bd4586a22dc385a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/list_ui.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/search.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/search.xml
index 1546401c1d4f076e1f0fe6918d0b1734efd6e6cd..4f26843741967b18cd85c0c61b6e8073df9a6189 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/search.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/sort_on.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/sort_on.xml
index 925f2783d84cb9f4b61e90a9c4d71840878bcf28..1782a95b62c77538a160e97c694a5221914246cf 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/sort_on.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/translate.xml
index 758a345176cc3123882121b681a290f8995487aa..86b375ffec4a914adc7bc7b305282ea8c1d80334 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
index 635056568d76028708a2484a11b893144d774092..87b49b60600baaa7d81140210f47bf6721c02978 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/coordinates.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/coordinates.xml
index 6d6e563668241270c28da9ecbb8b83c1d8055ea8..77099c56890a7091cc0f8a26e30ecd1913cdb4d6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/coordinates.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/coordinates.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/details.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/details.xml
index 07afc92a2f15466e64781eb2633905dbc8ec07d5..3a335b778d8d216e4712b57c2ea5c60522a44938 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/details.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/document_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/document_view.xml
index dfa5b88b6fc694dd188b5c889484daec03cd11f2..b0d7cd71697c09cfe3770134aac4266a7ef6550d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/document_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/document_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/financial_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/financial_view.xml
index b1c6cce49a34d9490001ba3250e61a3df7bc4e91..d81b862797afa4cb8a6c77c49a5f817ad0e11e00 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/financial_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/financial_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/history.xml
index 97dd5908d9bbe1ef05b424fbe9fbb12139f66e83..a7a14d50a762c0fb33786c8279f7abce96b29b3e 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_active_accounting_pref.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_active_accounting_pref.xml
index e842355496f34b530920e85c2574269d5972c6a1..6f47e5e3207ee46f219ff9b227f4568cbf5e17f9 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_active_accounting_pref.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_active_accounting_pref.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_accounting.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_accounting.xml
index 69acec8210cbd0efd3ac0bc7ed6f9527978eafb9..24191986e3e23507b6c26db6936b668fe337cb72 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_accounting.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_accounting.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
index 7b54c1884f3b250d05020b62be68bb5e8ba1bf6d..728244cbbd13d606b92c495eae0231a12dee3f50 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
index bacf7eea59698245ea34b58b732401087c516697..7ea02ecee139947fc84a2416a534fdda7fca1e3f 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
index 5b25368db60214d011079347b4b986c00e902f3d..22f531634999d5f0edfdb7f7e8d78c49be8e84b4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
index db1aeebf043a1edb99ec8176f3afd6f36f49906b..819b38765410d7797d337840ccc65b088cf7e3c9 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/list.xml
index c120d5654df6871fa6d036a6b8e229aa1b8addd5..46deb580ca9416c5d43ce8cc9e95a5bb231ee3fa 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/metadata.xml
index 2171f9da449edb88209e8f325c6a059a82cc48d8..a445465cbbd28e90ec00e9662dc6a17bdd51de92 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/transactions.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/transactions.xml
index 29489e84bb1c9cb38845ccf4ac07f1f5ad69cf42..ae7b5671172598b461e878f1bb2fbc3dd86d227c 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/transactions.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/transactions.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/view.xml
index c575ea01691f2fe1e8e346a00dc75ddcfd8d4f32..7ce9d664c3492f3fff2234a316b051b7e1186fcc 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Organisation/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/career_print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/career_print.xml
index e127970c4132c3e95eba22628c2047652cf8ea55..58c6bca86622ed6ff0ff7ca79df132385e2c6dff 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/career_print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/career_print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/csv_export.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/csv_export.xml
index ebc850c6f5f6015ab680cdda45e707d61754847d..918e4c6149797ca1f11a72b102ce08c332f1e8cd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/csv_export.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/csv_import.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/csv_import.xml
index 9e17df85784015b4f692348fd73600ab5d94a514..2fc7e90dee932ecda36f4a44c7b97b2e51a51465 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/csv_import.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/csv_import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/email_report.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/email_report.xml
index bcf84237d951022ea4728fc971c9f9e65575aca5..6a2c2728235bb0b33bae608825a53ee414134986 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/email_report.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/email_report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/exchange.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/exchange.xml
index b357506d7fc50dc4f2376b97a9901b744d3a3a51..819ce06f9712804af322fdf4859dd81472656b77 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/exchange.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/exchange.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/list_emails.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/list_emails.xml
index b76330cc4a8caf6f911da118db6437397117a7cf..d86f145433feca923a9b85647ee296e4f0010626 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/list_emails.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/list_emails.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/list_ui.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/list_ui.xml
index 3236cdb59b1d515654076ac0223329930742cbee..4dbc5c46c31b56cbc4ee442e0e1dc751178f7238 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/list_ui.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/list_ui.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/report.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/report.xml
index ccb440a5bfde289aa7f036be65b549620a8225f8..73324bd959732279ecbfce06ced4ee124e2b73eb 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/report.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/search.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/search.xml
index 4deceb1f42457a9877c6a65e8d9f1ad2a993cd13..4925b62f46bd7282e615d0b591022385326d94b1 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/search.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/search.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/search_phones.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/search_phones.xml
index 243d352c417df671823550391ac90306f92e6b48..136ee2b380241fdeed4a4b01571282116fa40f31 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/search_phones.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/search_phones.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/sort_on.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/sort_on.xml
index 96f15155759edb09340907fd509685f10895fe76..4082c2afae6e878520b2b32d97cbe82f24f5fc28 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/sort_on.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/sort_on.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/view.xml
index ec7c29ceee9864562dc794292b84a1a8ab244f4a..f8c57d2c0936000ad0a441d63b5f152c4c73705a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person%20Module/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/assignment.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/assignment.xml
index 5982c3e771fa99f5d7f52130c8ac35b64a24c358..cb2abd5926ed32d9052ed09351e2e360d064f214 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/assignment.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/assignment.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/career.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/career.xml
index 8d4510da69e77e84e9708a7af078ee30c0de80c8..89981cc1f5d3b82bdd37f15aa86e083293fc6d38 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/career.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/career.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/details.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/details.xml
index 5716ba2dbb231a8529734b89fa4c3f38a171e63f..45d63ca83cc69d7f705ad93f98e835e07f3f0a19 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/details.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/details.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/document_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/document_view.xml
index c173ace3caa4ee33461a6e472feeb13d22032a6d..1e253dbed55bcc3fef80f9a37322d2155cd6e9cc 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/document_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/document_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/exchange.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/exchange.xml
index 28608dd9e7aeb6db2cede3ef813c55d3d9012c08..9f616b61ed8713bdb09d32624b3076645f1b08fa 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/exchange.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/exchange.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/financial_view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/financial_view.xml
index 20099392000f9d45cc609c7684d195ee557e3d0f..ae5accae8be04dcfceb0eb12a4d2d20aedb2e77a 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/financial_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/financial_view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/history.xml
index 9ef4fd4888c53b26609ebeaaa0576d9c1cf90f7a..fc88662d7a4c129fad219f9484af20e07b335211 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_accounting.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_accounting.xml
index 7cf85c97c50eaaa835688606436148baccc3540c..8b183e2cfa91c03f53cb2443d4994ee35b80e509 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_accounting.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_accounting.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_opportunity.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_opportunity.xml
index 62ce8a92a85e2ccb63f8732d895dd1a6de6fee20..96119beb326e4bd17d85215f28d19876281cfdad 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_opportunity.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_opportunity.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_project.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_project.xml
index 7a549cadf4c24fb70a1d57f1279ac226da5fb61f..8724366ac61ad832c9d7e289abebfd4f44b0f364 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_project.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_project.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
index dfcc8eafb591bc30c2150ea3dc199795e5ca2e48..c7b91275094917c8d18b880c6fd5e42073171909 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
index e33e1e2eab21369b8391969bb013ba2a898cbc53..3d320bdaad1311b725faff7e34346788ba49432b 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
index 7e8e3ab4bf7c56b6f0b890f23afa0ced72f29327..c82ca25cfa47958b0fc4474f397298c6f04f4e14 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
index 2cab5eede0021e164faa937f2bb569ff0e1d6fb2..9755b1ae436af3be594221b74c533f5be61e4555 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_support_request.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_support_request.xml
index 27edfcb345644d4d2967bc3788fad0b4117e191d..eb710bcffee34e9cc794b80db3ac66981307dd47 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_support_request.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/jump_to_support_request.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/metadata.xml
index 30129852c1a7be265e97012c13202d5b48744f83..81a7a42e90f6351c7b6f78e527d1580f6787aeed 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/print.xml
index 5938b64928e1c1d00e4537c4a339a8fe8de8e217..c081e6af620b304ca0e65bb79e472a329dddb123 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/profile.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/profile.xml
index 23f012b928401ae1bef25e6996eae553f9865160..a6598611ff09dddf7eb52028d448c8129715fad6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/profile.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/profile.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/report.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/report.xml
index d47225a72e94c49b045325276d2576c311443c71..daae6947dc0438b15bc5c4d8f3bcbfc54af8ad25 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/report.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/report.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/terminate_career.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/terminate_career.xml
index 0e1c43676919a1e88037c5f089173f945fec2204..7f419e34be1751530ded84664f98eef2114b8d53 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/terminate_career.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/terminate_career.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/transactions.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/transactions.xml
index 2247d3de82960c84edd818dddeaed5090ddb4aed..9c7d7917d35cabd34be47588a56166a65e8f66fd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/transactions.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/transactions.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/translate.xml
index fac1f3ebe1819168f9e1b449b9dd44e8fae99a9a..5989b16bd25f04e1bd92d7c0239c1f9cfd99ed8f 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/view.xml
index 6601d48fe1f86c96259b17de12dcd53fce5c6d33..f5145c6b3e00a8978730c849724ef2451ef88e04 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Person/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/print_pdf.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/print_pdf.xml
index 6221c92e12e86548cb8640a8695f4dc55c1c3808..2464f8eb04e04f1887740a83949ca8f23ccf12a7 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/print_pdf.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/print_pdf.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/view.xml
index caf42dab91be5cd031f56be2e0490285444164c6..861eb207a527cfc1163d27c04a15d9d02f93f126 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Predicate/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/advanced.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/advanced.xml
index 694bb2a80f78320a258c319dc62fa7b69d71dd26..6c26f7beba0f4cd5cdf04ccf74a3367718ec3923 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/advanced.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/advanced.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/localroles.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/localroles.xml
index 2a07ea0a1a163f9c2d4b0b5fc54ea5d15aa20026..fbb788eba1a5ca876f1759c17b234a7a51adf226 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/localroles.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/localroles.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/metadata.xml
index d83f5c8e6cf5bb7aeaa4b526abe4c986f21b8b06..e306f55759a905d9e2d13e0ef3b1037b95ca8d59 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/syndication.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/syndication.xml
index 73c9ca31fe7780a95a44a46f982da4e0deceea90..1485545c6eba46d9e72f9302c58cfecbd72ea06b 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/syndication.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/syndication.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/view.xml
index fab4f2e9212f8ee0479f328a8eb1d41ff8ba19f0..81bc1f3e7101b930c744a178e2e40ad80c76c8a1 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/acconting_preferences.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/acconting_preferences.xml
index 0a2723cf3a4af865121cff57f0355f949870d816..450040fb354efffbac61403b08a58eef6148fd3b 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/acconting_preferences.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/acconting_preferences.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/history.xml
index c7ab962c986b2fc78f337562d6a520e38747ab9f..e2856b9771be8a11756ca9486fab923c74b842fe 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/metadata.xml
index 512c2ef0f2536110c83f48a3371fc3f82f299788..94e56f7335aa2a6aa038952ce39865039f100000 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/print.xml
index 6bdd8a522ec4393a97fac673bba49af825f65c9d..21ff1c80053d5443d69b4a553a05d8b08dcbdade 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/view.xml
index f107f1472f16ac1b8b4a6012219fc737c7231ba1..edc3dc207d092d211a8f951b55acf59fa8d8ef06 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Preference/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/list.xml
index e07011674a5382961a5bf155733db0e966db3e45..87d3400fb64c797804508d2eda9245da712415e6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/localroles.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/localroles.xml
index eb217acbb7cb96a7546900e0abb63a4dafc404b1..949e08fc36277b549531cb8540c9260e2122d341 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/localroles.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/localroles.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/metadata.xml
index df564cf9577f79d42a33a6963bf9135ca8da41a3..4db51ee66094a520fd1f3202b55f1c2f0f7e6bc3 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/syndication.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/syndication.xml
index edd8383cc975454019ec59ad66bddef2f8e4e623..7cede09bebfb5367ec72c8d5acdf9909a1eec07d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/syndication.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/syndication.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/view.xml
index 85d385409ca23bf1b77c35dadaec47c912773ff5..e82d3ca3b4dd5f832c36097cf82f80967cc08cf6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Route%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/list.xml
index e07011674a5382961a5bf155733db0e966db3e45..87d3400fb64c797804508d2eda9245da712415e6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/localroles.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/localroles.xml
index eb217acbb7cb96a7546900e0abb63a4dafc404b1..949e08fc36277b549531cb8540c9260e2122d341 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/localroles.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/localroles.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/metadata.xml
index df564cf9577f79d42a33a6963bf9135ca8da41a3..4db51ee66094a520fd1f3202b55f1c2f0f7e6bc3 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/syndication.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/syndication.xml
index edd8383cc975454019ec59ad66bddef2f8e4e623..7cede09bebfb5367ec72c8d5acdf9909a1eec07d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/syndication.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/syndication.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/view.xml
index 85d385409ca23bf1b77c35dadaec47c912773ff5..e82d3ca3b4dd5f832c36097cf82f80967cc08cf6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Rule%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/metadata.xml
index 089ff3d48882ad61a89229af311577ef4d5d5565..2aa4a6dcd43651422c6becc1fd7cb127e5076ae0 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/print.xml
index 33d4aa51322800e596de24d9439489fb4b76b614..6b036b38b4aefea68cd1caa24477036a8f2716d8 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/translate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/translate.xml
index 62f61704192d1416dd41fa967d54427f8637e8dd..0db084c2b21a233cdb3ae0354a2b3eb0fb843ecc 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/translate.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/translate.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/view.xml
index 03d5145d17861164c146f846369a6c5592b60079..1a9ac643625600ecb4b0634a3a2665f141fbc67d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Movement/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/csv_export.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/csv_export.xml
index 3c0e4d66d851a6bc265201bcf2bdc814b9655e18..6fdf20408c09d339d43426c134d830f07257e554 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/csv_export.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/csv_export.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/view.xml
index 4a153c971e6add377874c0bdcf973c6ed47111fc..7025c4c046bc5a261088f7492616ccb946c154e4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Simulation%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/call.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/call.xml
index 3e67bcadc329283f3a91583df796407a5cd039ab..9b10463d788074018fa27bfecaf26d65a17e2a77 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/call.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/call.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/history.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/history.xml
index cfc824f01c59fddfed66f3c979700ccb324ea5b9..c8ba1cc1c5542973ca862555037e15f84bfabfdd 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/history.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/history.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/metadata.xml
index 8d1810743a26e12cefee555bef7336bd4e248b69..8921c12faeff43db6e44818d83d82c4008f3abc6 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/previous_call.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/previous_call.xml
index e23d6d5a7d1e44fc5cd0317de89cb854196cc316..a2e98bbf1b240f0d1d88e0e62f28a6ebe37b0325 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/previous_call.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/previous_call.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/print.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/print.xml
index 741c97a043f7dac47bfe6f7be19e4c608da90f58..75d89da833af8b7e539ec4b17730315b786ac34d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/print.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/print.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/view.xml
index dbbc9771599a3906e589812ef9ab353bacdef95d..12d11dc59dd6b87e2d104a990eabb469087d7ede 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Telephone/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml
index 068f9bfedfe52144e3846a24f8bb6dbe7e314e36..8dedc2b5180f40135608c8f6e8eff545a11f8c84 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml
index 8a6442ce7e6c089c5d3aad6cbeb2831b544ce1e3..bacf8f918724873d07a2ed86cff1a14ba773508b 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml
index d714f75615c9737099ffcd2cdd64ffacb13504c4..abd95c0df6b90e1a35445ce54c083909e1cabe09 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/import.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/import.xml
index 6d4d19ff02e14ce4039cdf4d632cb0c27af8f3dd..a83ebbe3090f86daa6c239d28be4ab4676688298 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/import.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/import.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml
index f6f01fc1cc821b7ef6b504178cbefa30ecb8b8bf..408157d9dc5ba676ea9a5362d855ed309d80c5f8 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/jump_trash_bins.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/jump_trash_bins.xml
index 69047c6a326c83448323f301efbe2796e1fe4ebc..085b92c892c7c287a980b9fc6ea52fdfdca94ee8 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/jump_trash_bins.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/jump_trash_bins.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml
index 758216376d2e5d84d01e65a8277c6bec7ada06bc..858e8bb777dc096d81f156d23f0a810a6b56464f 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml
index b4dcfc9ee74dca8f1850efb2c5adfa9a91c09b7a..fe649db8afb6528a1b6624c0e835a8785fb90490 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/view.xml
index 73657fc0a955e9cf345a7fc2c93368117c7b4c23..2ebb75561d398ca11589705c597cf0bccf29a405 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/metadata.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/metadata.xml
index 66de7e09c0507e62bc79d70a52b650daa8440326..abf9a7fab734574c3a6a6ac762b62118d363785b 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/metadata.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/metadata.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/view.xml
index d63c5efbca31c8f5d3792d5719a9c73f80acddbd..6b9812a6fdcea4b6ff185e359147b5caa19ae7af 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Bin/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/list.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/list.xml
index 351aeae201145fe8a80f39657f51ee2ed7d54744..71a4eb4096fe95db5c9361da1b5c30cc7f0a8878 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/list.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/list.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/view.xml
index 4a153c971e6add377874c0bdcf973c6ed47111fc..7025c4c046bc5a261088f7492616ccb946c154e4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Folder/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Tool/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Tool/view.xml
index a7390332cc581bc8c11dfecd78a25356bb57b667..61cd35a38df1671e244262cb1ef4948794a847b4 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Tool/view.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Trash%20Tool/view.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/bt_tool.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/bt_tool.xml
index 6d4ef5acc536edebb353ff2893e136b2511d4fbf..5f06c9b2eec12bf0617a63ce85c8d0a34122411d 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/bt_tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/bt_tool.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/category_tool.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/category_tool.xml
index 95d6a7a5452bfac575c851b4e12d81a92438995f..fa33c62613e52f8ce3b99e2be8b8b8e47efc4e68 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/category_tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/category_tool.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/create_module.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/create_module.xml
index c458f4b848e6354ef1a7c35f766486b759a7151a..da9c940f2d4a650ba6f38cabca9a4f2165cee8d1 100755
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/create_module.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/create_module.xml
@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
         </tuple>
         <none/>
       </tuple>