diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Mapping/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Mapped%20Property/view.xml
similarity index 100%
rename from bt5/erp5_base/ActionTemplateItem/portal_types/Property%20Mapping/view.xml
rename to bt5/erp5_base/ActionTemplateItem/portal_types/Mapped%20Property/view.xml
diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Mapping.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mapped%20Property.xml
similarity index 79%
rename from bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Mapping.xml
rename to bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mapped%20Property.xml
index 5b22993e04ea68ba3120087e6b6c792bd54652fc..cfee267e89dc7c8ba3e1d5acb70d0ae468965b04 100644
--- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Property%20Mapping.xml
+++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Mapped%20Property.xml
@@ -23,11 +23,11 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Property Mapping object describes how properties or categories are mapped from simulation movements to delivery documents, eg. use source as destination, use destination as source, use quantity as -quantity, etc.</string> </value>
+ <value> <string>Mapped Property object describes how properties or categories are mapped from simulation movements to delivery documents, eg. use source as destination, use destination as source, use quantity as -quantity, etc.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addPropertyMapping</string> </value>
+ <value> <string>addMappedProperty</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -41,7 +41,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Property Mapping</string> </value>
+ <value> <string>Mapped Property</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view.xml
similarity index 95%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view.xml
index f821232746d06683dab1baa97621cb2b8c9c4f3d..1aa59e13b290847f641819abff0ad3f632e4452d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view.xml
@@ -107,7 +107,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>PropertyMapping_view</string> </value>
+ <value> <string>MappedProperty_view</string> </value>
</item>
<item>
<key> <string>method</string> </key>
@@ -115,7 +115,7 @@
</item>
<item>
<key> <string>name</string> </key>
- <value> <string>PropertyMapping_view</string> </value>
+ <value> <string>MappedProperty_view</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
@@ -131,7 +131,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Property Mapping</string> </value>
+ <value> <string>Mapped Property</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view/my_description.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_description.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view/my_description.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_description.xml
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view/my_mapping_property_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_mapping_property_list.xml
similarity index 99%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view/my_mapping_property_list.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_mapping_property_list.xml
index 79d1204b885633e546cd6014270ffe823ece96de..9070eccdbe420b81606f4942f50dcce33cb7aa85 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view/my_mapping_property_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_mapping_property_list.xml
@@ -272,7 +272,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Property Mapping</string> </value>
+ <value> <string>Mapped Property</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_title.xml
similarity index 100%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMapping_view/my_title.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MappedProperty_view/my_title.xml
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 8a2602231b523baf9bcc6d35eb763d81015c25f4..6e1d38407b40a9a44c42f3098cc36be86e179627 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-686
\ No newline at end of file
+687
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_action_path_list b/bt5/erp5_base/bt/template_action_path_list
index 5c28c0557c0aa6e388b4a8a29724109d0f82da31..6493fce9f3001267468a359f9476739d0f5208bb 100644
--- a/bt5/erp5_base/bt/template_action_path_list
+++ b/bt5/erp5_base/bt/template_action_path_list
@@ -36,6 +36,7 @@ Image | download
Image | fullsize_view
Image | view
Link | view
+Mapped Property | view
Mirror Movement Group | view
Monthly Range Movement Group | view
Nested Line Movement Group | view
@@ -69,7 +70,6 @@ Person | view
Preference | base_preference
Property Assignment Movement Group | view
Property Divergence Tester | view
-Property Mapping | view
Property Movement Group | view
Quantity Divergence Tester | view
Quantity Sign Movement Group | view
diff --git a/bt5/erp5_base/bt/template_portal_type_id_list b/bt5/erp5_base/bt/template_portal_type_id_list
index 83d951ebce7c7d1e4c560ddbb7a12e796827f4a5..632b6a92bbba52f03397531da6a506ab9f7e26c4 100644
--- a/bt5/erp5_base/bt/template_portal_type_id_list
+++ b/bt5/erp5_base/bt/template_portal_type_id_list
@@ -24,6 +24,7 @@ Fax
File
Image
Link
+Mapped Property
Mirror Movement Group
Monthly Range Movement Group
Nested Line Movement Group
@@ -39,7 +40,6 @@ Person
Person Module
Property Assignment Movement Group
Property Divergence Tester
-Property Mapping
Property Movement Group
Quantity Divergence Tester
Quantity Sign Movement Group