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 -r1.33.2.1 -r1.33.2.2
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	26 May 2004 18:12:54 -0000	1.33.2.1
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	26 May 2004 19:10:12 -0000	1.33.2.2
@@ -283,30 +283,30 @@
 create or replace function content_folder__edit_name (integer,varchar,varchar,varchar)
 returns integer as '
 declare
-  rename__folder_id              alias for $1;  
-  rename__name                   alias for $2;  -- default null  
-  rename__label                  alias for $3;  -- default null
-  rename__description            alias for $4;  -- default null
+  edit_name__folder_id              alias for $1;  
+  edit_name__name                   alias for $2;  -- default null  
+  edit_name__label                  alias for $3;  -- default null
+  edit_name__description            alias for $4;  -- default null
   v_name_already_exists_p        integer;
 begin
 
-  if rename__name is not null and rename__name != '''' then
-    PERFORM content_item__edit_name(rename__folder_id, rename__name);
+  if edit_name__name is not null and edit_name__name != '''' then
+    PERFORM content_item__edit_name(edit_name__folder_id, edit_name__name);
   end if;
 
-  if rename__label is not null and rename__label != '''' and 
-     rename__description is not null and rename__description != '''' then 
+  if edit_name__label is not null and edit_name__label != '''' and 
+     edit_name__description is not null and edit_name__description != '''' then 
 
     update cr_folders
-      set label = rename__label,
-      description = rename__description
-      where folder_id = rename__folder_id;
+      set label = edit_name__label,
+      description = edit_name__description
+      where folder_id = edit_name__folder_id;
 
-  else if(rename__label is not null and rename__label != '''') and 
-         (rename__description is null or rename__description = '''') then  
+  else if(edit_name__label is not null and edit_name__label != '''') and 
+         (edit_name__description is null or edit_name__description = '''') then  
     update cr_folders
-      set label = rename__label
-      where folder_id = rename__folder_id;
+      set label = edit_name__label
+      where folder_id = edit_name__folder_id;
 
   end if; end if;
 
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 -r1.50.2.2 -r1.50.2.3
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	26 May 2004 18:12:54 -0000	1.50.2.2
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	26 May 2004 19:10:12 -0000	1.50.2.3
@@ -1146,8 +1146,8 @@
 create or replace function content_item__edit_name (integer,varchar)
 returns integer as '
 declare
-  rename__item_id                alias for $1;  
-  rename__name                   alias for $2;  
+  edit_name__item_id                alias for $1;  
+  edit_name__name                   alias for $2;  
   exists_id                      integer;       
 begin
   select
@@ -1157,21 +1157,21 @@
   from 
     cr_items
   where
-    name = rename__name
+    name = edit_name__name
   and 
     parent_id = (select 
 	           parent_id
 		 from
 		   cr_items
 		 where
-		   item_id = rename__item_id);
+		   item_id = edit_name__item_id);
   if NOT FOUND then
     update cr_items
-      set name = rename__name
-      where item_id = rename__item_id;
+      set name = edit_name__name
+      where item_id = edit_name__item_id;
   else
-    if exists_id != rename__item_id then
-      raise EXCEPTION ''-20000: An item with the name % already exists in this directory.'', rename__name;
+    if exists_id != edit_name__item_id then
+      raise EXCEPTION ''-20000: An item with the name % already exists in this directory.'', edit_name__name;
     end if;
   end if;