diff --git a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_dmsdocinfo.catalog_keys.xml b/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_dmsdocinfo.catalog_keys.xml
deleted file mode 100644
index baf9e92bd9cb1bbddb85ec9c117a4081fc024068..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_dmsdocinfo.catalog_keys.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<catalog_method>
- <item key="sql_clear_catalog" type="int">
-  <value>1</value>
- </item>
-</catalog_method>
\ No newline at end of file
diff --git a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_dmsdocinfo.xml b/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_dmsdocinfo.xml
deleted file mode 100644
index 248530b4798ac0b6988817f4b215ba600a433b46..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_dmsdocinfo.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_arg</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_data</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>_keys</string> </key>
-                        <value>
-                          <list/>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z0_drop_dmsdocinfo</string> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string>DROP TABLE dmsdocinfo</string> </value>
-        </item>
-        <item>
-            <key> <string>template</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
-                </klass>
-                <none/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>__name__</string> </key>
-                        <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_vars</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>globals</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>raw</string> </key>
-                        <value> <string>DROP TABLE dmsdocinfo</string> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_dmsdocinfo.catalog_keys.xml b/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_dmsdocinfo.catalog_keys.xml
deleted file mode 100644
index d58ef064eaf30eb84114661b6ebbff0833f308b8..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_dmsdocinfo.catalog_keys.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<catalog_method>
- <item key="sql_uncatalog_object" type="int">
-  <value>1</value>
- </item>
-</catalog_method>
\ No newline at end of file
diff --git a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_dmsdocinfo.xml b/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_dmsdocinfo.xml
deleted file mode 100644
index 8ce8f8253c6e1d8b94f4d71c9e69d986c76c179f..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_dmsdocinfo.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_arg</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_data</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>uid</string> </key>
-                                <value>
-                                  <dictionary/>
-                                </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>_keys</string> </key>
-                        <value>
-                          <list>
-<string>uid</string>
-                          </list>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>uid</string> </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z0_uncatalog_dmsdocinfo</string> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM dmsdocinfo WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>template</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
-                </klass>
-                <none/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>__name__</string> </key>
-                        <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_vars</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>globals</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>raw</string> </key>
-                        <value> <string encoding="cdata"><![CDATA[
-
-DELETE FROM dmsdocinfo WHERE <dtml-sqltest uid op=eq type=int>
-
-]]></string> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_dmsdocinfo_list.catalog_keys.xml b/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_dmsdocinfo_list.catalog_keys.xml
deleted file mode 100644
index 93bd4a9bdf3e0907350b504fc8b280f14287e04b..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_dmsdocinfo_list.catalog_keys.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<catalog_method>
- <item key="sql_catalog_object_list" type="int">
-  <value>1</value>
- </item>
-</catalog_method>
\ No newline at end of file
diff --git a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_dmsdocinfo_list.xml b/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_dmsdocinfo_list.xml
deleted file mode 100644
index 5d5301cbcee9d1e884c914e5375b5b5c09ecca98..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_dmsdocinfo_list.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_arg</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_data</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>getOriginalFilename</string> </key>
-                                <value>
-                                  <dictionary/>
-                                </value>
-                            </item>
-                            <item>
-                                <key> <string>getPortalType</string> </key>
-                                <value>
-                                  <dictionary/>
-                                </value>
-                            </item>
-                            <item>
-                                <key> <string>uid</string> </key>
-                                <value>
-                                  <dictionary/>
-                                </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>_keys</string> </key>
-                        <value>
-                          <list>
-<string>uid</string>
-<string>getOriginalFilename</string>
-<string>getPortalType</string>
-                          </list>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>uid\r\n
-getOriginalFilename\r\n
-getPortalType</string> </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_catalog_dmsdocinfo_list</string> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let doc_list="[]">\n
-  <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-    <dtml-if expr="getPortalType[loop_item] in (\'Text\',\'Spreadsheet\',\'Presentation\',\'Graphic\',\'DMS File\',\'DMS Pdf File\')">\n
-      <dtml-call expr="doc_list.append(loop_item)">\n
-    </dtml-if>\n
-  </dtml-in>\n
-  <dtml-if expr="_.len(doc_list) > 0">\n
-    REPLACE INTO\n
-      dmsdocinfo\n
-    VALUES\n
-      <dtml-in prefix="loop" expr="doc_list">\n
-      (\n
-        <dtml-sqlvar expr="uid[loop_item]" type="int">,  \n
-        <dtml-sqlvar expr="getOriginalFilename[loop_item]" type="string" optional>\n
-      )\n
-      <dtml-if sequence-end><dtml-else>,</dtml-if>\n
-    </dtml-in>\n
-  </dtml-if>\n
-</dtml-let>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>template</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
-                </klass>
-                <none/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>__name__</string> </key>
-                        <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_vars</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>globals</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>raw</string> </key>
-                        <value> <string encoding="cdata"><![CDATA[
-
-<dtml-let doc_list="[]">\n
-  <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-    <dtml-if expr="getPortalType[loop_item] in (\'Text\',\'Spreadsheet\',\'Presentation\',\'Graphic\',\'DMS File\',\'DMS Pdf File\')">\n
-      <dtml-call expr="doc_list.append(loop_item)">\n
-    </dtml-if>\n
-  </dtml-in>\n
-  <dtml-if expr="_.len(doc_list) > 0">\n
-    REPLACE INTO\n
-      dmsdocinfo\n
-    VALUES\n
-      <dtml-in prefix="loop" expr="doc_list">\n
-      (\n
-        <dtml-sqlvar expr="uid[loop_item]" type="int">,  \n
-        <dtml-sqlvar expr="getOriginalFilename[loop_item]" type="string" optional>\n
-      )\n
-      <dtml-if sequence-end><dtml-else>,</dtml-if>\n
-    </dtml-in>\n
-  </dtml-if>\n
-</dtml-let>
-
-]]></string> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_dmsdocinfo.catalog_keys.xml b/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_dmsdocinfo.catalog_keys.xml
deleted file mode 100644
index baf9e92bd9cb1bbddb85ec9c117a4081fc024068..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_dmsdocinfo.catalog_keys.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<catalog_method>
- <item key="sql_clear_catalog" type="int">
-  <value>1</value>
- </item>
-</catalog_method>
\ No newline at end of file
diff --git a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_dmsdocinfo.xml b/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_dmsdocinfo.xml
deleted file mode 100644
index bfc8429e6136e28ce12c1101f6309d7000204f01..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_dmsdocinfo.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_arg</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_data</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>_keys</string> </key>
-                        <value>
-                          <list/>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_col</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_create_dmsdocinfo</string> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string>CREATE TABLE `dmsdocinfo` (\n
-  `uid` BIGINT UNSIGNED NOT NULL,\n
-  `original_filename` varchar(255),\n
-  PRIMARY KEY `uid` (`uid`),\n
-  KEY `original_filename` (`original_filename`)\n
-) TYPE = InnoDB;</string> </value>
-        </item>
-        <item>
-            <key> <string>template</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
-                </klass>
-                <none/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>__name__</string> </key>
-                        <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_vars</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>globals</string> </key>
-                        <value>
-                          <dictionary/>
-                        </value>
-                    </item>
-                    <item>
-                        <key> <string>raw</string> </key>
-                        <value> <string>CREATE TABLE `dmsdocinfo` (\n
-  `uid` BIGINT UNSIGNED NOT NULL,\n
-  `original_filename` varchar(255),\n
-  PRIMARY KEY `uid` (`uid`),\n
-  KEY `original_filename` (`original_filename`)\n
-) TYPE = InnoDB;</string> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_dms/ExtensionTemplateItem/searchUtils.py b/bt5/erp5_dms/ExtensionTemplateItem/searchUtils.py
index 188267a6d40cfb7153dab307dd41c9251f0bdc2d..e5dae40e3e14e29c9559310e106622933a0b8f9d 100644
--- a/bt5/erp5_dms/ExtensionTemplateItem/searchUtils.py
+++ b/bt5/erp5_dms/ExtensionTemplateItem/searchUtils.py
@@ -3,8 +3,8 @@ import re
 
 # parsing defined here
 r=re.compile('(\w+:"[^"]+"|\w+:[\w\-.]+)')
-filetyper=lambda s:('original_filename','%%.%s' % s)
-filestripper=lambda s: ('original_filename',s.replace('"',''))
+filetyper=lambda s:('source_reference','%%.%s' % s)
+filestripper=lambda s: ('source_reference',s.replace('"',''))
 paramsmap=dict(file=filestripper,type='portal_type',reference='reference',filetype=filetyper)
 
 def analyze(params):
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view.xml
index c3eb7a2ce41b9bd9b0bf01eddedd5b4e0fe22975..97623caebb41c372b229845ae10b8fdd8161fec4 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view.xml
@@ -108,7 +108,7 @@
                         <string>my_int_index</string>
                         <string>my_validation_state</string>
                         <string>my_file</string>
-                        <string>my_original_filename</string>
+                        <string>my_source_reference</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_original_filename.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_source_reference.xml
similarity index 99%
rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_original_filename.xml
rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_source_reference.xml
index 2e1bd3a3759a82c1f9291e8442e44dac5e6ce079..23ab6746013c8a9d5109df7da5f46dd3f73c252b 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_original_filename.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_source_reference.xml
@@ -14,7 +14,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_original_filename</string> </value>
+            <value> <string>my_source_reference</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromMail.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromMail.xml
index 3b8c816f46334def0b39f2f3b6f725133d232da6..ffe6f2d50d709f98c73b7508ddcb492aeacd4a1f 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromMail.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromMail.xml
@@ -78,7 +78,8 @@ if ctype is None:\n
 \n
 # create content\n
 ob=context.document_module.newContent(portal_type=ctype,file=data)\n
-ob.setOriginalFilename(fname)\n
+ob.setSourceReference(fname)\n
+ob.setPropertiesFromFilename(fname)\n
 ob.guessMimeType(fname)\n
 code,msg=ob.convert()\n
 if code>0:\n
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewDocumentList/listbox.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewDocumentList/listbox.xml
index 6f7ebc3cf0bba9f9d64935187a283f0eb12b6669..db79fe5f6cb7d4fcc1b2440245817a7a77327fa1 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewDocumentList/listbox.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewDocumentList/listbox.xml
@@ -354,8 +354,8 @@
                           <string>State</string>
                         </tuple>
                         <tuple>
-                          <string>original_filename</string>
-                          <string>original_filename</string>
+                          <string>source_reference</string>
+                          <string>source_reference</string>
                         </tuple>
                       </list>
                     </value>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml
index 9f82e141bcbae91a541155a11c32038cd6457ad3..5f3e72c9107d45a3c1ca494e251f4bcdc1e82c18 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml
@@ -80,7 +80,6 @@
                         <string>my_description</string>
                         <string>my_keywords</string>
                         <string>my_subject</string>
-                        <string>my_original_filename</string>
                       </list>
                     </value>
                 </item>
@@ -109,6 +108,7 @@
                         <string>my_int_index</string>
                         <string>my_validation_state</string>
                         <string>my_file</string>
+                        <string>my_source_reference</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_original_filename.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_source_reference.xml
similarity index 97%
rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_original_filename.xml
rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_source_reference.xml
index 97fe7bcdb42a2db1c260980e32cc048fa2171fb3..fcf973eff49d6540db1d03fe76844cae7c8f5eea 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_original_filename.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_source_reference.xml
@@ -3,15 +3,18 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
+        <tuple>
+          <string>Products.Formulator.StandardFields</string>
+          <string>StringField</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_original_filename</string> </value>
+            <value> <string>my_source_reference</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/ooo_interaction_workflow/scripts/OOo_edit.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/ooo_interaction_workflow/scripts/OOo_edit.xml
index 9a4fe0fd33ee6f3368f5d564c488cfd756e68125..846359386726742a60ca0297b3a8af532cfc6945 100644
--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/ooo_interaction_workflow/scripts/OOo_edit.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/ooo_interaction_workflow/scripts/OOo_edit.xml
@@ -100,7 +100,7 @@ if f is not None and f:\n
     raise Exception(\'File type of \'+fname+\' is not registered\')\n
   if ctype!=ob.getPortalType():\n
     raise Exception(\'This file should be created as \'+ctype)\n
-  ob.setOriginalFilename(fname)\n
+  ob.setSourceReference(fname)\n
   ob.setTitle(fname)\n
   ob.setLastUploadTime(DateTime())\n
   ob.clearCache()\n