Index: openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql,v
diff -u -N -r1.8.2.3 -r1.8.2.4
--- openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql	30 Apr 2004 02:49:34 -0000	1.8.2.3
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql	26 May 2004 18:12:51 -0000	1.8.2.4
@@ -160,7 +160,7 @@
 begin
 
   if name is not null then
-    content_item.rename(folder_id, name);
+    content_item.edit_name(folder_id, name);
   end if;
 
   if label is not null and description is not null then 
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-test.sql,v
diff -u -N -r1.4 -r1.4.4.1
--- openacs-4/packages/acs-content-repository/sql/oracle/content-test.sql	30 Sep 2003 12:10:01 -0000	1.4
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-test.sql	26 May 2004 18:12:52 -0000	1.4.4.1
@@ -214,13 +214,13 @@
 --dbms_output.put_line('Path for ' || item_id || ' is ' || 
 --  content_item.get_path(item_id));
 --dbms_output.put_line('Renaming puppy to kitty...');
-content_item.rename(item_id, 'kitty');
+content_item.edit_name(item_id, 'kitty');
 --dbms_output.put_line('Renaming me to aunty...');
-content_folder.rename(sub_sub_folder_id, 'aunty');
+content_folder.edit_name(sub_sub_folder_id, 'aunty');
 --dbms_output.put_line('Path for ' || item_id || ' is ' || 
 --  content_item.get_path(item_id));
 --dbms_output.put_line('Renaming kitty to pa -- this should work');
---content_item.rename(item_id, 'pa');
+--content_item.edit_name(item_id, 'pa');
 --dbms_output.put_line('Path for ' || item_id || ' is ' || 
 --content_item.get_path(item_id));
 
Index: openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-4.7d6-5.0d1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-4.7d6-5.0d1.sql,v
diff -u -N -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-4.7d6-5.0d1.sql	8 Oct 2003 15:56:23 -0000	1.1
+++ openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-4.7d6-5.0d1.sql	26 May 2004 18:12:53 -0000	1.1.4.1
@@ -296,7 +296,7 @@
 begin
 
   if name is not null then
-    content_item.rename(folder_id, name);
+    content_item.edit_name(folder_id, name);
   end if;
 
   if label is not null and description is not null then 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql,v
diff -u -N -r1.33 -r1.33.2.1
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	4 Mar 2004 14:52:36 -0000	1.33
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	26 May 2004 18:12:54 -0000	1.33.2.1
@@ -280,7 +280,7 @@
 
 
 -- procedure rename
-create or replace function content_folder__rename (integer,varchar,varchar,varchar)
+create or replace function content_folder__edit_name (integer,varchar,varchar,varchar)
 returns integer as '
 declare
   rename__folder_id              alias for $1;  
@@ -291,7 +291,7 @@
 begin
 
   if rename__name is not null and rename__name != '''' then
-    PERFORM content_item__rename(rename__folder_id, rename__name);
+    PERFORM content_item__edit_name(rename__folder_id, rename__name);
   end if;
 
   if rename__label is not null and rename__label != '''' and 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v
diff -u -N -r1.50.2.1 -r1.50.2.2
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	6 May 2004 00:35:54 -0000	1.50.2.1
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	26 May 2004 18:12:54 -0000	1.50.2.2
@@ -1143,7 +1143,7 @@
 end;' language 'plpgsql';
 
 
-create or replace function content_item__rename (integer,varchar)
+create or replace function content_item__edit_name (integer,varchar)
 returns integer as '
 declare
   rename__item_id                alias for $1;  
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-test.sql,v
diff -u -N -r1.9 -r1.9.6.1
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-test.sql	29 Aug 2001 05:12:50 -0000	1.9
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-test.sql	26 May 2004 18:12:55 -0000	1.9.6.1
@@ -444,14 +444,14 @@
    --        );
 
    PERFORM content_test__put_line(''Renaming puppy to kitty...'');
-   PERFORM content_item__rename(item_id, ''kitty'');
+   PERFORM content_item__edit_name(item_id, ''kitty'');
    PERFORM content_test__put_line(''Renaming me to aunty...'');
-   PERFORM content_folder__rename(sub_sub_folder_id, ''aunty'',null,null);
+   PERFORM content_folder__edit_name(sub_sub_folder_id, ''aunty'',null,null);
    PERFORM content_test__put_line(''Path for '' || item_id || '' is '' || 
                                   content_item__get_path(item_id,null)
            );
    PERFORM content_test__put_line(''Renaming kitty to pa -- this should work'');
-   PERFORM content_item__rename(item_id, ''pa'');
+   PERFORM content_item__edit_name(item_id, ''pa'');
    PERFORM content_test__put_line(''Path for '' || item_id || '' is '' || 
                                   content_item__get_path(item_id,null)
            );
Index: openacs-4/packages/acs-content-repository/www/doc/api/folder.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/folder.html,v
diff -u -N -r1.1.1.1 -r1.1.1.1.6.1
--- openacs-4/packages/acs-content-repository/www/doc/api/folder.html	13 Mar 2001 22:59:26 -0000	1.1.1.1
+++ openacs-4/packages/acs-content-repository/www/doc/api/folder.html	26 May 2004 18:12:55 -0000	1.1.1.1.6.1
@@ -549,7 +549,7 @@
 <p>
 
   <p>&nbsp;</p>
-    <li><font size="+1">Procedure: </font>content_folder.rename
+    <li><font size="+1">Procedure: </font>content_folder.edit_name
 
     <p>Change the name, label and/or description of the folder
 </p>
Index: openacs-4/packages/acs-content-repository/www/doc/api/item.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/item.html,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-content-repository/www/doc/api/item.html	15 Feb 2003 12:11:41 -0000	1.2
+++ openacs-4/packages/acs-content-repository/www/doc/api/item.html	26 May 2004 18:12:56 -0000	1.2.2.1
@@ -1127,7 +1127,7 @@
 <p>
 
   <p>&nbsp;</p>
-    <li><font size="+1">Procedure: </font>content_item.rename
+    <li><font size="+1">Procedure: </font>content_item.edit_name
 
     <p>Renames the item. If an item with the specified name already exists
 under this item's parent, an error is thrown
Index: openacs-4/packages/cms/www/modules/items/rename-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/rename-oracle.xql,v
diff -u -N -r1.1 -r1.1.10.1
--- openacs-4/packages/cms/www/modules/items/rename-oracle.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/rename-oracle.xql	26 May 2004 18:12:57 -0000	1.1.10.1
@@ -7,7 +7,7 @@
       <querytext>
       
     begin 
-    content_item.rename (
+    content_item.edit_name (
         item_id => :item_id, 
         name    => :name 
     ); 
Index: openacs-4/packages/cms/www/modules/items/rename-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/rename-postgresql.xql,v
diff -u -N -r1.1 -r1.1.10.1
--- openacs-4/packages/cms/www/modules/items/rename-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/rename-postgresql.xql	26 May 2004 18:12:58 -0000	1.1.10.1
@@ -6,7 +6,7 @@
 <fullquery name="rename_item">      
       <querytext>
 
-        select content_item__rename (
+        select content_item__edit_name (
             :item_id, 
             :name 
          ); 
Index: openacs-4/packages/cms/www/modules/items/rename.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/rename.tcl,v
diff -u -N -r1.4 -r1.4.8.1
--- openacs-4/packages/cms/www/modules/items/rename.tcl	19 Aug 2002 03:30:59 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/rename.tcl	26 May 2004 18:12:58 -0000	1.4.8.1
@@ -44,7 +44,7 @@
   db_transaction {
       db_exec_plsql rename_item "
     begin 
-    content_item.rename (
+    content_item.edit_name (
         item_id => :item_id, 
         name    => :name 
     ); 
Index: openacs-4/packages/cms/www/modules/sitemap/rename-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/rename-oracle.xql,v
diff -u -N -r1.1 -r1.1.10.1
--- openacs-4/packages/cms/www/modules/sitemap/rename-oracle.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/rename-oracle.xql	26 May 2004 18:12:58 -0000	1.1.10.1
@@ -7,7 +7,7 @@
       <querytext>
       
     begin 
-    content_folder.rename (
+    content_folder.edit_name (
         folder_id   => :item_id, 
         name        => :name, 
         label       => :label, 
Index: openacs-4/packages/cms/www/modules/sitemap/rename-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/rename-postgresql.xql,v
diff -u -N -r1.1 -r1.1.10.1
--- openacs-4/packages/cms/www/modules/sitemap/rename-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/rename-postgresql.xql	26 May 2004 18:12:58 -0000	1.1.10.1
@@ -6,7 +6,7 @@
 <fullquery name="rename_folder">      
       <querytext>
 
-        select content_folder__rename (
+        select content_folder__edit_name (
         :item_id, 
         :name, 
         :label, 
Index: openacs-4/packages/cms/www/modules/sitemap/rename.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/rename.tcl,v
diff -u -N -r1.3 -r1.3.8.1
--- openacs-4/packages/cms/www/modules/sitemap/rename.tcl	19 Aug 2002 03:54:52 -0000	1.3
+++ openacs-4/packages/cms/www/modules/sitemap/rename.tcl	26 May 2004 18:12:58 -0000	1.3.8.1
@@ -62,7 +62,7 @@
 
       db_exec_plsql rename_folder "
     begin 
-    content_folder.rename (
+    content_folder.edit_name (
         folder_id   => :item_id, 
         name        => :name, 
         label       => :label, 
Index: openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql,v
diff -u -N -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql	10 May 2004 00:19:46 -0000	1.11.2.1
+++ openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql	26 May 2004 18:12:59 -0000	1.11.2.2
@@ -55,7 +55,7 @@
     procedure rename_file(
         --
         -- Rename a file and all
-        -- Wrapper to content_item__rename
+        -- Wrapper to content_item__edit_name
         --
         file_id in cr_items.item_id%TYPE,
         title in cr_items.name%TYPE
@@ -288,14 +288,14 @@
     procedure rename_file(
         --
         -- Rename a file and all
-        -- Wrapper to content_item__rename
+        -- Wrapper to content_item__edit_name
         --
         file_id in cr_items.item_id%TYPE,
         title in cr_items.name%TYPE
     )
     is
     begin
-        content_item.rename(
+        content_item.edit_name(
             item_id => file_storage.rename_file.file_id,
             name => file_storage.rename_file.title
         );
Index: openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.1-4.6.2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.1-4.6.2.sql,v
diff -u -N -r1.2 -r1.2.4.1
--- openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.1-4.6.2.sql	17 May 2003 10:37:36 -0000	1.2
+++ openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.1-4.6.2.sql	26 May 2004 18:13:00 -0000	1.2.4.1
@@ -169,7 +169,7 @@
     procedure rename_file(
         --
         -- Rename a file and all
-        -- Wrapper to content_item__rename
+        -- Wrapper to content_item__edit_name
         --
         file_id in cr_items.item_id%TYPE,
         title in cr_items.name%TYPE
@@ -439,14 +439,14 @@
     procedure rename_file(
         --
         -- Rename a file and all
-        -- Wrapper to content_item__rename
+        -- Wrapper to content_item__edit_name
         --
         file_id in cr_items.item_id%TYPE,
         title in cr_items.name%TYPE
     )
     is
     begin
-        content_item.rename(
+        content_item.edit_name(
             item_id => file_storage.rename_file.file_id,
             name => file_storage.rename_file.title
         );
Index: openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.2-4.6.3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.2-4.6.3.sql,v
diff -u -N -r1.2 -r1.2.4.1
--- openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.2-4.6.3.sql	28 Aug 2003 09:41:53 -0000	1.2
+++ openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.2-4.6.3.sql	26 May 2004 18:13:00 -0000	1.2.4.1
@@ -49,7 +49,7 @@
     procedure rename_file(
         --
         -- Rename a file and all
-        -- Wrapper to content_item__rename
+        -- Wrapper to content_item__edit_name
         --
         file_id in cr_items.item_id%TYPE,
         title in cr_items.name%TYPE
@@ -322,14 +322,14 @@
     procedure rename_file(
         --
         -- Rename a file and all
-        -- Wrapper to content_item__rename
+        -- Wrapper to content_item__edit_name
         --
         file_id in cr_items.item_id%TYPE,
         title in cr_items.name%TYPE
     )
     is
     begin
-        content_item.rename(
+        content_item.edit_name(
             item_id => file_storage.rename_file.file_id,
             name => file_storage.rename_file.title
         );
Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql,v
diff -u -N -r1.19.2.3 -r1.19.2.4
--- openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql	11 May 2004 01:06:42 -0000	1.19.2.3
+++ openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql	26 May 2004 18:13:01 -0000	1.19.2.4
@@ -239,7 +239,7 @@
 create or replace function file_storage__rename_file (
        --
        -- Rename a file and all
-       -- Wrapper to content_item__rename
+       -- Wrapper to content_item__edit_name
        --
        integer,         -- cr_items.item_id%TYPE,
        varchar          -- cr_items.name%TYPE
@@ -250,7 +250,7 @@
 
 begin
 
-        return content_item__rename(
+        return content_item__edit_name(
                rename_file__file_id,  -- item_id
                rename_file__name     -- name
                );
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.2-4.6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.2-4.6.sql,v
diff -u -N -r1.2 -r1.2.4.1
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.2-4.6.sql	30 Nov 2002 17:34:18 -0000	1.2
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.2-4.6.sql	26 May 2004 18:13:02 -0000	1.2.4.1
@@ -268,7 +268,7 @@
 create or replace function file_storage__rename_file (
        --
        -- Rename a file and all
-       -- Wrapper to content_item__rename
+       -- Wrapper to content_item__edit_name
        --
        integer,         -- cr_items.item_id%TYPE,
        varchar          -- cr_items.name%TYPE
@@ -279,7 +279,7 @@
 
 begin
 
-        return content_item__rename(
+        return content_item__edit_name(
                rename_file__file_id,  -- item_id
                rename_file__title     -- name
                );
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d1-5.1.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d1-5.1.0d2.sql,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d1-5.1.0d2.sql	7 May 2004 16:28:19 -0000	1.1.2.2
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0d1-5.1.0d2.sql	26 May 2004 18:13:02 -0000	1.1.2.3
@@ -168,7 +168,7 @@
 create or replace function file_storage__rename_file (
        --
        -- Rename a file and all
-       -- Wrapper to content_item__rename
+       -- Wrapper to content_item__edit_name
        --
        integer,         -- cr_items.item_id%TYPE,
        varchar          -- cr_items.name%TYPE
@@ -179,7 +179,7 @@
 
 begin
 
-        return content_item__rename(
+        return content_item__edit_name(
                rename_file__file_id,  -- item_id
                rename_file__name     -- name
                );
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v
diff -u -N -r1.25.2.3 -r1.25.2.4
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	26 May 2004 18:00:17 -0000	1.25.2.3
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	26 May 2004 18:13:02 -0000	1.25.2.4
@@ -43,7 +43,7 @@
     <fullquery name="fs::rename_folder.rename_folder">
         <querytext>
             begin
-                content_folder.rename(
+                content_folder.edit_name(
                     folder_id => :folder_id,
                     label => :name
                 );
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -N -r1.38 -r1.38.2.1
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	19 Feb 2004 16:44:45 -0000	1.38
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	26 May 2004 18:13:03 -0000	1.38.2.1
@@ -34,7 +34,7 @@
 
     <fullquery name="fs::rename_folder.rename_folder">
         <querytext>
-            select content_folder__rename(
+            select content_folder__edit_name(
                 :folder_id,
                 null,
                 :name,
Index: openacs-4/packages/file-storage/www/folder-edit-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-edit-2-oracle.xql,v
diff -u -N -r1.1 -r1.1.8.1
--- openacs-4/packages/file-storage/www/folder-edit-2-oracle.xql	17 Sep 2002 21:03:27 -0000	1.1
+++ openacs-4/packages/file-storage/www/folder-edit-2-oracle.xql	26 May 2004 18:13:03 -0000	1.1.8.1
@@ -6,7 +6,7 @@
 <fullquery name="folder_rename">
       <querytext>
       begin
-          content_folder.rename (
+          content_folder.edit_name (
                   folder_id => :folder_id,
                   label => :folder_name
           );
Index: openacs-4/packages/file-storage/www/folder-edit-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-edit-2-postgresql.xql,v
diff -u -N -r1.1 -r1.1.8.1
--- openacs-4/packages/file-storage/www/folder-edit-2-postgresql.xql	17 Sep 2002 21:03:27 -0000	1.1
+++ openacs-4/packages/file-storage/www/folder-edit-2-postgresql.xql	26 May 2004 18:13:03 -0000	1.1.8.1
@@ -5,7 +5,7 @@
 
 <fullquery name="folder_rename">
       <querytext>
-      select content_folder__rename (
+      select content_folder__edit_name (
                   :folder_id, 
                   null,    -- name
                   :folder_name, -- label
Index: openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql,v
diff -u -N -r1.3.2.6 -r1.3.2.7
--- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql	6 May 2004 03:30:03 -0000	1.3.2.6
+++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql	26 May 2004 18:13:04 -0000	1.3.2.7
@@ -147,7 +147,7 @@
   <fullquery name="oacs_dav::impl::content_folder::move.rename_folder">
     <querytext>
 	begin
-	      content_folder.rename (
+	      content_folder.edit_name (
 	              folder_id => :move_folder_id,
 	              name => :new_name,
 	              label => :new_name,
@@ -173,7 +173,7 @@
       name="oacs_dav::impl::content_revision::move.rename_item">
     <querytext>
 	begin
-	      content_item.rename (
+	      content_item.edit_name (
 	              item_id => :item_id,
 	              name => :new_name
 	      );
@@ -294,4 +294,4 @@
     </querytext>
   </fullquery>
 
-</queryset>
\ No newline at end of file
+</queryset>
Index: openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-postgresql.xql,v
diff -u -N -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-postgresql.xql	6 May 2004 03:30:03 -0000	1.1.1.1.2.2
+++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-postgresql.xql	26 May 2004 18:13:04 -0000	1.1.1.1.2.3
@@ -136,7 +136,7 @@
 
   <fullquery name="oacs_dav::impl::content_folder::move.rename_folder">
     <querytext>
-      select content_folder__rename (
+      select content_folder__edit_name (
       :move_folder_id,
       :new_name,
       :new_name,
@@ -158,7 +158,7 @@
   <fullquery
       name="oacs_dav::impl::content_revision::move.rename_item">
     <querytext>
-      select content_item__rename (
+      select content_item__edit_name (
       :item_id,
       :new_name
       )
Index: openacs-4/packages/photo-album/www/folder-edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-edit-oracle.xql,v
diff -u -N -r1.1 -r1.1.4.1
--- openacs-4/packages/photo-album/www/folder-edit-oracle.xql	10 Jun 2003 10:07:11 -0000	1.1
+++ openacs-4/packages/photo-album/www/folder-edit-oracle.xql	26 May 2004 18:13:05 -0000	1.1.4.1
@@ -7,7 +7,7 @@
       <querytext>
       
 	    begin
-	    content_folder.rename (
+	    content_folder.edit_name (
             folder_id  => :folder_id,
             label => :label,
             description  => :description
Index: openacs-4/packages/photo-album/www/folder-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-edit-postgresql.xql,v
diff -u -N -r1.1 -r1.1.4.1
--- openacs-4/packages/photo-album/www/folder-edit-postgresql.xql	10 Jun 2003 10:07:11 -0000	1.1
+++ openacs-4/packages/photo-album/www/folder-edit-postgresql.xql	26 May 2004 18:13:05 -0000	1.1.4.1
@@ -5,7 +5,7 @@
 
 <fullquery name="edit_folder">      
       <querytext>
-      select content_folder__rename (
+      select content_folder__edit_name (
             :folder_id, -- folder_id 
 	    null, -- name
             :label, -- label 
Index: openacs-4/packages/photo-album/www/folder-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-edit.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/photo-album/www/folder-edit.tcl	18 Nov 2003 22:59:03 -0000	1.4
+++ openacs-4/packages/photo-album/www/folder-edit.tcl	26 May 2004 18:13:05 -0000	1.4.2.1
@@ -55,7 +55,7 @@
 
 	db_exec_plsql edit_folder {
 	    begin
-	    content_folder.rename (
+	    content_folder.edit_name (
             folder_id  => :folder_id,
             label => :label,
             description  => :description