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 -r1.8.2.4 -r1.8.2.5
--- openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql	26 May 2004 18:12:51 -0000	1.8.2.4
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql	26 May 2004 18:50:31 -0000	1.8.2.5
@@ -150,7 +150,7 @@
 end del;
 
 -- renames a folder, making sure the new name is not already in use
-procedure rename (
+procedure edit_name (
   folder_id	 in cr_folders.folder_id%TYPE,
   name	         in cr_items.name%TYPE default null,
   label	         in cr_folders.label%TYPE default null,
@@ -166,19 +166,19 @@
   if label is not null and description is not null then 
 
     update cr_folders
-       set cr_folders.label = content_folder.rename.label,
-       cr_folders.description = content_folder.rename.description
-       where cr_folders.folder_id = content_folder.rename.folder_id;
+       set cr_folders.label = content_folder.edit_name.label,
+       cr_folders.description = content_folder.edit_name.description
+       where cr_folders.folder_id = content_folder.edit_name.folder_id;
 
   elsif label is not null and description is null then 
 
     update cr_folders
-       set cr_folders.label = content_folder.rename.label
-       where cr_folders.folder_id = content_folder.rename.folder_id;
+       set cr_folders.label = content_folder.edit_name.label
+       where cr_folders.folder_id = content_folder.edit_name.folder_id;
 
   end if;
 
-end rename;
+end edit_name;
 
 
 -- 1) make sure we are not moving the folder to an invalid location:
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql,v
diff -u -r1.20.2.2 -r1.20.2.3
--- openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	23 Apr 2004 16:16:26 -0000	1.20.2.2
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	26 May 2004 18:50:31 -0000	1.20.2.3
@@ -604,7 +604,7 @@
 end del;
 
 
-procedure rename (
+procedure edit_name (
   item_id in cr_items.item_id%TYPE,
   name	  in cr_items.name%TYPE
 ) is
@@ -614,14 +614,14 @@
     from 
       cr_items
     where
-      cr_items.name = content_item.rename.name
+      cr_items.name = content_item.edit_name.name
     and 
       parent_id = (select 
 		     parent_id
 		   from
 		     cr_items
 		   where
-		     cr_items.item_id = content_item.rename.item_id);
+		     cr_items.item_id = content_item.edit_name.item_id);
 
   exists_id integer;
 begin
@@ -632,8 +632,8 @@
   if exists_cur%NOTFOUND then
     close exists_cur;
     update cr_items
-	set cr_items.name = content_item.rename.name
-       	where cr_items.item_id = content_item.rename.item_id;
+	set cr_items.name = content_item.edit_name.name
+       	where cr_items.item_id = content_item.edit_name.item_id;
   else
     close exists_cur;
     if exists_id <> item_id then
@@ -643,7 +643,7 @@
     end if;
   end if;
 
-end rename;
+end edit_name;
 
 function get_id (
   item_path      in varchar2,
Index: openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql	4 Mar 2004 14:52:35 -0000	1.17
+++ openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql	26 May 2004 18:50:31 -0000	1.17.2.1
@@ -433,7 +433,7 @@
   item_id	in cr_items.item_id%TYPE
 );
 
-procedure rename (
+procedure edit_name (
   --/** Renames the item. If an item with the specified name already exists 
   --    under this item's parent, an error is thrown
   --    @author Karl Goldstein
@@ -1204,7 +1204,7 @@
   cascade_p     in char default 'f' 
 );
 
-procedure rename (
+procedure edit_name (
   --/** Change the name, label and/or description of the folder
   --    @author Karl Goldstein
   --    @param folder_id    The id of the folder to modify
Index: openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.0-5.1.1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/upgrade/Attic/upgrade-5.1.0-5.1.1.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.0-5.1.1.sql	2 May 2004 19:13:06 -0000	1.1.2.1
+++ openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.0-5.1.1.sql	26 May 2004 18:50:31 -0000	1.1.2.2
@@ -5,6 +5,6 @@
 -- @cvs-id $Id$
 --
 
--- reload packages to get fixed version of content_folder.rename
+-- reload packages to get fixed version of content_folder.edit_name
 
 @@ ../packages-create.sql