Index: openacs-4/packages/acs-messaging/sql/oracle/acs-messaging-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/oracle/acs-messaging-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-messaging/sql/oracle/acs-messaging-create.sql	30 Aug 2006 14:42:44 -0000	1.4
+++ openacs-4/packages/acs-messaging/sql/oracle/acs-messaging-create.sql	26 Sep 2006 15:13:05 -0000	1.5
@@ -40,7 +40,7 @@
     message_id integer
         constraint acs_messages_message_id_fk
             references cr_items (item_id) on delete cascade
-        constraint acs_messages_pk
+        constraint acs_messages_message_id_pk
             primary key,
     -- we will need to find a way to make reply_to go to 0 instead of null
     -- to improve scalability
Index: openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-tables-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-tables-create.sql	10 Sep 2003 14:52:01 -0000	1.4
+++ openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-tables-create.sql	26 Sep 2006 15:17:06 -0000	1.5
@@ -49,7 +49,7 @@
 
 create table acs_sc_impls (
     impl_id		      integer
-			      constraint acs_sc_impl_impl_id_fk
+			      constraint acs_sc_impls_impl_id_fk
 			      references acs_objects(object_id)
 			      on delete cascade
 			      constraint acs_sc_impl_pk
@@ -75,7 +75,7 @@
 
 create table acs_sc_bindings (
     contract_id		      integer
-			      constraint acs_sc_binding_cid_fk
+			      constraint acs_sc_binding_contract_id_fk
 			      references acs_sc_contracts(contract_id)
 			      on delete cascade,
     impl_id		      integer
Index: openacs-4/packages/acs-subsite/sql/oracle/application-groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/application-groups-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/sql/oracle/application-groups-create.sql	30 Sep 2003 12:10:03 -0000	1.3
+++ openacs-4/packages/acs-subsite/sql/oracle/application-groups-create.sql	26 Sep 2006 15:19:56 -0000	1.4
@@ -27,13 +27,13 @@
 show errors
 
 create table application_groups (
-	group_id		constraint app_groups_group_id_fk
+	group_id		constraint application_groups_group_id_fk
 				references groups (group_id)
-				constraint app_groups_group_id_pk
+				constraint application_groups_group_id_pk
 				primary key,
-        package_id              constraint app_groups_package_id_fk
+        package_id              constraint application_groups_package_id_fk
                                 references apm_packages,
-                                constraint app_groups_package_id_un
+                                constraint application_groups_package_id_un
                                 unique (package_id)
 );
 
Index: openacs-4/packages/acs-subsite/sql/oracle/email-image.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/email-image.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/sql/oracle/email-image.sql	22 Jan 2005 17:57:35 -0000	1.1
+++ openacs-4/packages/acs-subsite/sql/oracle/email-image.sql	26 Sep 2006 15:19:56 -0000	1.2
@@ -4,9 +4,9 @@
 
 
 create table email_images (
-	user_id		constraint email_image_fk
+	user_id		constraint email_images_user_id_fk
 			references users
-			constraint email_image_pk
+			constraint email_images_user_id_pk
 			primary key
 );
 
Index: openacs-4/packages/acs-subsite/sql/oracle/portraits.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/portraits.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/sql/oracle/portraits.sql	5 Apr 2001 18:23:38 -0000	1.1
+++ openacs-4/packages/acs-subsite/sql/oracle/portraits.sql	26 Sep 2006 15:19:56 -0000	1.2
@@ -8,7 +8,7 @@
 create table user_portraits (
 	user_id		constraint user_portraits_user_id_fk
 			references users
-			constraint user_portraits_pk
+			constraint user_portraits_user_id_pk
 			primary key
 );
 
Index: openacs-4/packages/acs-templating/sql/oracle/demo-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/sql/oracle/demo-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/sql/oracle/demo-create.sql	10 Feb 2006 02:12:18 -0000	1.5
+++ openacs-4/packages/acs-templating/sql/oracle/demo-create.sql	26 Sep 2006 15:22:05 -0000	1.6
@@ -1,7 +1,8 @@
 create sequence ad_template_sample_users_seq start with 5 increment by 1;
 
 create table ad_template_sample_users (
-       user_id         integer primary key,
+       user_id         integer 
+                       constraint ad_template_sample_users_pk primary key,
        first_name      varchar2(20),
        last_name       varchar2(20),
        address1        varchar2(40),