Index: openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql	24 Jun 2006 07:04:20 -0000	1.31
+++ openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql	26 Sep 2006 14:58:56 -0000	1.32
@@ -15,29 +15,29 @@
 
 create table ad_locales (
   locale		varchar2(30)
-                        constraint ad_locale_abbrev_pk
+                        constraint ad_locales_locale_pk
                         primary key,
-  language		char(3) constraint ad_language_name_nil
+  language		char(3) constraint ad_locales_language_nn
 			not null,
-  country		char(2) constraint ad_country_name_nil
+  country		char(2) constraint ad_locales_country_nn
 			not null,
   variant		varchar2(30),
   label			varchar2(200)
-                        constraint ad_locale_name_nil
+                        constraint ad_locale_label_nn
 			not null
-                        constraint ad_locale_name_unq
+                        constraint ad_locales_label_un
                         unique,
   nls_language		varchar2(30)
-                        constraint ad_locale_nls_lang_nil
+                        constraint ad_locales_nls_lang_nn
 			not null,
   nls_territory		varchar2(30),
   nls_charset		varchar2(30),
   mime_charset		varchar2(30),
   -- is this the default locale for its language
   default_p             char(1) default 'f'
-                        constraint ad_locale_defp_tf check (default_p in ('t','f')),
+                        constraint ad_locale_defp_ck check (default_p in ('t','f')),
   enabled_p             char(1) default 't'
-                        constraint ad_locale_enp_tf check (enabled_p in ('t','f'))
+                        constraint ad_locale_enp_ck check (enabled_p in ('t','f'))
 );
 
 comment on table ad_locales is '
@@ -64,7 +64,7 @@
                         constraint lang_package_l_u_package_id_fk
                         references apm_packages(package_id) on delete cascade,
   locale                varchar(30) not null
-                        constraint trb_language_preference_lid_fk
+                        constraint ad_locale_user_prefs_locale_fk
                         references ad_locales (locale) on delete cascade
 );
 
Index: openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql	26 Feb 2004 15:28:43 -0000	1.13
+++ openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql	26 Sep 2006 14:58:56 -0000	1.14
@@ -81,7 +81,7 @@
                        constraint lang_messages_audit_p_key_nn
                        not null,
     locale             varchar2(30) 
-                       constraint lang_messages_audit_l_fk
+                       constraint lang_messages_audit_locale_fk
                        references ad_locales(locale)
                        constraint lang_messages_audit_l_nn
                        not null,
Index: openacs-4/packages/acs-mail/sql/oracle/acs-mail-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/acs-mail-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-mail/sql/oracle/acs-mail-create.sql	17 May 2003 09:51:08 -0000	1.3
+++ openacs-4/packages/acs-mail/sql/oracle/acs-mail-create.sql	26 Sep 2006 15:07:24 -0000	1.4
@@ -243,8 +243,8 @@
 
 create table acs_mail_links (
     mail_link_id integer
-        constraint acs_mail_links_ml_id_pk primary key
-        constraint acs_mail_links_ml_id_fk references acs_objects 
+        constraint acs_mail_links_mail_links_id_pk primary key
+        constraint acs_mail_links_mail_links_id_fk references acs_objects 
         on delete cascade,
     body_id integer
         constraint acs_mail_links_body_id_nn not null