Index: openacs-4/contrib/packages/portal/sql/oracle/datasource-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/datasource-package-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/sql/oracle/datasource-package-create.sql	3 Jan 2004 01:42:57 -0000	1.2
+++ openacs-4/contrib/packages/portal/sql/oracle/datasource-package-create.sql	15 Jan 2004 02:58:52 -0000	1.3
@@ -33,7 +33,7 @@
         p_description               in portal_datasources.description%TYPE default null
     ) return portal_datasources.datasource_id%TYPE;
 
-    procedure delete (
+    procedure del (
         p_datasource_id             in portal_datasources.datasource_id%TYPE
     );
 
@@ -73,7 +73,7 @@
 
     end new;
 
-    procedure delete (
+    procedure del (
         p_datasource_id             in portal_datasources.datasource_id%TYPE
     )
     is
@@ -83,7 +83,7 @@
         from portal_datasources
         where datasource_id = p_datasource_id;
 
-    end delete;
+    end del;
 
     procedure set_def_param (
         p_datasource_id             in portal_datasource_parameters.datasource_id%TYPE,
Index: openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql	25 Sep 2003 02:12:15 -0000	1.2
+++ openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql	15 Jan 2004 02:58:52 -0000	1.3
@@ -44,7 +44,7 @@
         p_region                    in portal_layout_regions.region%TYPE
     );
 
-    procedure delete (
+    procedure del (
         p_layout_id                 in portal_layouts.layout_id%TYPE
     );
 
@@ -102,7 +102,7 @@
     end add_region;
 
 
-    procedure delete (
+    procedure del (
         p_layout_id                 in portal_layouts.layout_id%TYPE
     )
     is
@@ -112,9 +112,9 @@
         from portal_layouts
         where layout_id = p_layout_id;
 
-        acs_object.delete(p_layout_id);
+        acs_object.del(p_layout_id);
 
-    end delete;
+    end del;
 
 end portal_layout;
 /
Index: openacs-4/contrib/packages/portal/sql/oracle/page-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/page-package-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/sql/oracle/page-package-create.sql	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/sql/oracle/page-package-create.sql	15 Jan 2004 02:58:52 -0000	1.2
@@ -38,7 +38,7 @@
         p_context_id                in acs_objects.context_id%TYPE default null
     ) return portal_pages.page_id%TYPE;
 
-    procedure delete (
+    procedure del (
         p_page_id                   in portal_pages.page_id%TYPE
     );
 
@@ -97,7 +97,7 @@
 
     end new;
 
-    procedure delete (
+    procedure del (
         p_page_id                   in portal_pages.page_id%TYPE
     )
     is
@@ -141,9 +141,9 @@
 
         end loop;
 
-        acs_object.delete(page_id);
+        acs_object.del(page_id);
 
-    end delete;
+    end del;
 
 end portal_page;
 /
Index: openacs-4/contrib/packages/portal/sql/oracle/portal-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/portal-package-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/sql/oracle/portal-package-create.sql	3 Jan 2004 01:42:57 -0000	1.2
+++ openacs-4/contrib/packages/portal/sql/oracle/portal-package-create.sql	15 Jan 2004 02:58:52 -0000	1.3
@@ -39,7 +39,7 @@
         p_context_id                in acs_objects.context_id%TYPE default null
     ) return portals.portal_id%TYPE;
 
-    procedure delete (
+    procedure del (
         p_portal_id                 in portals.portal_id%TYPE
     );
 
@@ -172,7 +172,7 @@
 
     end new;
 
-    procedure delete (
+    procedure del (
         p_portal_id                 in portals.portal_id%TYPE
     )
     is
@@ -183,16 +183,16 @@
                        where portal_id = p_portal_id
                        order by sort_key desc)
         loop
-            portal_page.delete(v_page.page_id);
+            portal_page.del(v_page.page_id);
         end loop;
 
         delete
         from portals
         where portal_id = p_portal_id;
 
-        acs_object.delete(p_portal_id);
+        acs_object.del(p_portal_id);
 
-    end delete;
+    end del;
 
 end portal;
 /
Index: openacs-4/contrib/packages/portal/sql/oracle/theme-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/theme-package-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/sql/oracle/theme-package-create.sql	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/sql/oracle/theme-package-create.sql	15 Jan 2004 02:58:52 -0000	1.2
@@ -39,7 +39,7 @@
         p_context_id                in acs_objects.context_id%TYPE default null
     ) return portal_themes.theme_id%TYPE;
 
-    procedure delete (
+    procedure del (
         p_theme_id                  in portal_themes.theme_id%TYPE
     );
 
@@ -85,13 +85,13 @@
 
     end new;
 
-    procedure delete (
+    procedure del (
         p_theme_id                  in portal_themes.theme_id%TYPE
     )
     is
     begin
-        acs_object.delete(p_theme_id);
-    end delete;
+        acs_object.del(p_theme_id);
+    end del;
 
 end portal_theme;
 /
Index: openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql	3 Jan 2004 01:42:57 -0000	1.3
+++ openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql	15 Jan 2004 02:58:52 -0000	1.4
@@ -65,17 +65,17 @@
 
 end;' language 'plpgsql';
 
-select define_function_args('portal_datasource__delete', 'datasource_id');
+select define_function_args('portal_datasource__del', 'datasource_id');
 
-create or replace function portal_datasource__delete (integer)
+create or replace function portal_datasource__del (integer)
 returns integer as '
 declare
     p_datasource_id                 alias for $1;
 begin
 
     delete
     from portal_datasources
-    where datasource_id = :p_datasource_id;
+    where datasource_id = p_datasource_id;
 
     return 0;
 
Index: openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql	25 Sep 2003 02:12:16 -0000	1.2
+++ openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql	15 Jan 2004 02:58:52 -0000	1.3
@@ -81,9 +81,9 @@
 end;' language 'plpgsql';
 
 
-select define_function_args('portal_layout__delete', 'layout_id');
+select define_function_args('portal_layout__del', 'layout_id');
 
-create or replace function portal_layout__delete (integer)
+create or replace function portal_layout__del(integer)
 returns integer as '
 declare
     p_layout_id                     alias for $1;
Index: openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql	25 Sep 2003 02:12:16 -0000	1.2
+++ openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql	15 Jan 2004 02:58:52 -0000	1.3
@@ -74,9 +74,9 @@
 
 end;' language 'plpgsql';
 
-select define_function_args('portal_page__delete', 'page_id');
+select define_function_args('portal_page__del', 'page_id');
 
-create or replace function portal_page__delete(integer)
+create or replace function portal_page__del(integer)
 returns integer as '
 declare
     p_page_id                       alias for $1;
Index: openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql	3 Jan 2004 01:42:57 -0000	1.3
+++ openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql	15 Jan 2004 02:58:52 -0000	1.4
@@ -154,9 +154,9 @@
 
 end;' language 'plpgsql';
 
-select define_function_args('portal__delete', 'portal_id');
+select define_function_args('portal__del', 'portal_id');
 
-create or replace function portal__delete (integer)
+create or replace function portal__del(integer)
 returns integer as '
 declare
     p_portal_id                     alias for $1;
@@ -167,7 +167,7 @@
                   from portal_pages
                   where portal_id = p_portal_id
     loop
-        perform portal_page__delete(v_page.page_id);
+        perform portal_page__del(v_page.page_id);
     end loop;
 
     delete
Index: openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql	25 Sep 2003 02:12:16 -0000	1.2
+++ openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql	15 Jan 2004 02:58:52 -0000	1.3
@@ -88,9 +88,9 @@
 
 end;' language 'plpgsql';
 
-select define_function_args('portal_theme__delete', 'theme_id');
+select define_function_args('portal_theme__del', 'theme_id');
 
-create or replace function portal_theme__delete (integer)
+create or replace function portal_theme__del(integer)
 returns integer as '
     p_theme_id                      alias for $1;
 begin