Index: openacs-4/packages/acs-content-repository/tcl/content-folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-folder-procs.tcl,v
diff -u -r1.5.2.3 -r1.5.2.4
--- openacs-4/packages/acs-content-repository/tcl/content-folder-procs.tcl	14 Jan 2005 03:14:45 -0000	1.5.2.3
+++ openacs-4/packages/acs-content-repository/tcl/content-folder-procs.tcl	15 Feb 2005 17:12:13 -0000	1.5.2.4
@@ -93,7 +93,7 @@
 		-var_list [list \
 			       [list folder_id $folder_id ] \
 			       [list cascade_p $cascade_p] ] \
-		content_folder delete ]
+		content_folder del]
 }
 
 ad_proc -public ::content::folder::register_content_type {
Index: openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl,v
diff -u -r1.2.2.11 -r1.2.2.12
--- openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl	9 Feb 2005 16:14:52 -0000	1.2.2.11
+++ openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl	15 Feb 2005 17:12:13 -0000	1.2.2.12
@@ -122,19 +122,21 @@
             #########################################################
             # create a new content type
             #########################################################
-            set new_type_id [content::type::new \
-               -content_type "__test_type" \
-                -pretty_name "__test_type" \
-                -pretty_plural "__test_type" \
-                -table_name "__test_type" \
+
+	    catch {content::type::delete -content_type "test_type"} errmsg
+	    set new_type_id [content::type::new \
+               -content_type "test_type" \
+                -pretty_name "test_type" \
+                -pretty_plural "test_type" \
+                -table_name "test_type" \
                 -id_column "test_id"]
 
 
             #########################################################
             # create an attribute
             #########################################################
             content::type::attribute::new \
-                -content_type "__test_type" \
+                -content_type "test_type" \
                 -attribute_name "attribute_name" \
                 -datatype "text" \
                 -pretty_name "Attribute Name" \
@@ -151,14 +153,14 @@
 
             content::folder::register_content_type \
                 -folder_id $first_folder_id \
-                -content_type "__test_type"
+                -content_type "test_type"
             # create an item of that type
             set new_type_item_id [db_nextval  "acs_object_id_seq"]
             set returned_new_type_item_id [content::item::new \
                                             -name "test_item_${new_type_item_id}" \
                                             -item_id $new_type_item_id \
                                             -parent_id $first_folder_id \
-                                            -content_type  "__test_type" \
+                                            -content_type  "test_type" \
                                                -attributes [list [list title "Title"] [list attribute_name "attribute_value"]]]
 
             #########################################################