Index: etc/schema/phase2-schema.xml
===================================================================
--- etc/schema/phase2-schema.xml	(revision 518285)
+++ etc/schema/phase2-schema.xml	(working copy)
@@ -60,10 +60,10 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_METADATA_1" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_F_METADATA_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
-        <index name="IX_FOLDER_METADATA_1">
+        <index name="IX_F_METADATA_1">
             <index-column name="FOLDER_ID"/>
         </index>
         <unique name="UN_FOLDER_METADATA_1">
@@ -82,10 +82,10 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_CONSTRAINT_1" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_F_CONSTRAINT_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
-        <index name="IX_FOLDER_CONSTRAINT_1">
+        <index name="IX_F_CONSTRAINT_1">
             <index-column name="FOLDER_ID"/>
         </index>
     </table>
@@ -95,13 +95,13 @@
         <column name="FOLDER_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_CONSTRAINTS_REF_1" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER" name="FK_F_C_REF_1" onDelete="cascade">
             <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
         </foreign-key>
-        <index name="IX_FOLDER_CONSTRAINTS_REF_1">
+        <index name="IX_F_C_REF_1">
             <index-column name="FOLDER_ID"/>
         </index>
-        <unique name="UN_FOLDER_CONSTRAINTS_REF_1">
+        <unique name="UN_F_C_REF_1">
             <unique-column name="FOLDER_ID"/>
             <unique-column name="NAME"/>
         </unique>
@@ -163,13 +163,13 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="FOLDER_MENU" name="FK_FOLDER_MENU_METADATA_1" onDelete="cascade">
+        <foreign-key foreignTable="FOLDER_MENU" name="FK_F_M_METADATA_1" onDelete="cascade">
             <reference foreign="MENU_ID" local="MENU_ID"/>
         </foreign-key>
-        <index name="IX_FOLDER_MENU_METADATA_1">
+        <index name="IX_F_M_METADATA_1">
             <index-column name="MENU_ID"/>
         </index>
-        <unique name="UN_FOLDER_MENU_METADATA_1">
+        <unique name="UN_F_M_METADATA_1">
             <unique-column name="MENU_ID"/>
             <unique-column name="NAME"/>
             <unique-column name="LOCALE"/>
@@ -219,13 +219,13 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE" name="FK_PAGE_METADATA_1" onDelete="cascade">
+        <foreign-key foreignTable="PAGE" name="FK_P_METADATA_1" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_METADATA_1">
+        <index name="IX_P_METADATA_1">
             <index-column name="PAGE_ID"/>
         </index>
-        <unique name="UN_PAGE_METADATA_1">
+        <unique name="UN_P_METADATA_1">
             <unique-column name="PAGE_ID"/>
             <unique-column name="NAME"/>
             <unique-column name="LOCALE"/>
@@ -241,10 +241,10 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE" name="FK_PAGE_CONSTRAINT_1" onDelete="cascade">
+        <foreign-key foreignTable="PAGE" name="FK_P_CONSTRAINT_1" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_CONSTRAINT_1">
+        <index name="IX_P_CONSTRAINT_1">
             <index-column name="PAGE_ID"/>
         </index>
     </table>
@@ -254,13 +254,13 @@
         <column name="PAGE_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="PAGE" name="FK_PAGE_CONSTRAINTS_REF_1" onDelete="cascade">
+        <foreign-key foreignTable="PAGE" name="FK_P_C_REF_1" onDelete="cascade">
             <reference foreign="PAGE_ID" local="PAGE_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_CONSTRAINTS_REF_1">
+        <index name="IX_P_C_REF_1">
             <index-column name="PAGE_ID"/>
         </index>
-        <unique name="UN_PAGE_CONSTRAINTS_REF_1">
+        <unique name="UN_P_C_REF_1">
             <unique-column name="PAGE_ID"/>
             <unique-column name="NAME"/>
         </unique>
@@ -305,13 +305,13 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE_MENU" name="FK_PAGE_MENU_METADATA_1" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_MENU" name="FK_P_M_METADATA_1" onDelete="cascade">
             <reference foreign="MENU_ID" local="MENU_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_MENU_METADATA_1">
+        <index name="IX_P_M_METADATA_1">
             <index-column name="MENU_ID"/>
         </index>
-        <unique name="UN_PAGE_MENU_METADATA_1">
+        <unique name="UN_P_M_METADATA_1">
             <unique-column name="MENU_ID"/>
             <unique-column name="NAME"/>
             <unique-column name="LOCALE"/>
@@ -370,10 +370,10 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_CONSTRAINT_1" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT" name="FK_F_CONSTRAINT_1" onDelete="cascade">
             <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
         </foreign-key>
-        <index name="IX_FRAGMENT_CONSTRAINT_1">
+        <index name="IX_F_CONSTRAINT_1">
             <index-column name="FRAGMENT_ID"/>
         </index>
     </table>
@@ -383,13 +383,13 @@
         <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_CONSTRAINTS_REF_1" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT" name="FK_F_C_REF_1" onDelete="cascade">
             <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
         </foreign-key>
-        <index name="IX_FRAGMENT_CONSTRAINTS_REF_1">
+        <index name="IX_F_C_REF_1">
             <index-column name="FRAGMENT_ID"/>
         </index>
-        <unique name="UN_FRAGMENT_CONSTRAINTS_REF_1">
+        <unique name="UN_F_C_REF_1">
             <unique-column name="FRAGMENT_ID"/>
             <unique-column name="NAME"/>
         </unique>
@@ -400,13 +400,13 @@
         <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
         <column name="IS_READ_ONLY" required="true" type="BOOLEANINT"/>
-        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_PREF_1" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT" name="FK_F_PREF_1" onDelete="cascade">
             <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
         </foreign-key>
-        <index name="IX_FRAGMENT_PREF_1">
+        <index name="IX_F_PREF_1">
             <index-column name="FRAGMENT_ID"/>
         </index>
-        <unique name="UN_FRAGMENT_PREF_1">
+        <unique name="UN_F_PREF_1">
             <unique-column name="FRAGMENT_ID"/>
             <unique-column name="NAME"/>
         </unique>
@@ -417,10 +417,10 @@
         <column name="PREF_ID" type="INTEGER" required="true"/>
         <column name="VALUE_ORDER" type="INTEGER" required="true"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="FRAGMENT_PREF" name="FK_FRAGMENT_PREF_VALUE_1" onDelete="cascade">
+        <foreign-key foreignTable="FRAGMENT_PREF" name="FK_F_P_VALUE_1" onDelete="cascade">
             <reference foreign="PREF_ID" local="PREF_ID"/>
         </foreign-key>
-        <index name="IX_FRAGMENT_PREF_VALUE_1">
+        <index name="IX_F_P_VALUE_1">
             <index-column name="PREF_ID"/>
         </index>
     </table>
@@ -467,13 +467,13 @@
         <column name="NAME" required="true" size="15" type="VARCHAR"/>
         <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
         <column name="VALUE" required="true" size="100" type="VARCHAR"/>
-        <foreign-key foreignTable="LINK" name="FK_LINK_METADATA_1" onDelete="cascade">
+        <foreign-key foreignTable="LINK" name="FK_L_METADATA_1" onDelete="cascade">
             <reference foreign="LINK_ID" local="LINK_ID"/>
         </foreign-key>
-        <index name="IX_LINK_METADATA_1">
+        <index name="IX_L_METADATA_1">
             <index-column name="LINK_ID"/>
         </index>
-        <unique name="UN_LINK_METADATA_1">
+        <unique name="UN_L_METADATA_1">
             <unique-column name="LINK_ID"/>
             <unique-column name="NAME"/>
             <unique-column name="LOCALE"/>
@@ -489,10 +489,10 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="LINK" name="FK_LINK_CONSTRAINT_1" onDelete="cascade">
+        <foreign-key foreignTable="LINK" name="FK_L_CONSTRAINT_1" onDelete="cascade">
             <reference foreign="LINK_ID" local="LINK_ID"/>
         </foreign-key>
-        <index name="IX_LINK_CONSTRAINT_1">
+        <index name="IX_L_CONSTRAINT_1">
             <index-column name="LINK_ID"/>
         </index>
     </table>
@@ -502,13 +502,13 @@
         <column name="LINK_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="LINK" name="FK_LINK_CONSTRAINTS_REF_1" onDelete="cascade">
+        <foreign-key foreignTable="LINK" name="FK_L_C_REF_1" onDelete="cascade">
             <reference foreign="LINK_ID" local="LINK_ID"/>
         </foreign-key>
-        <index name="IX_LINK_CONSTRAINTS_REF_1">
+        <index name="IX_L_C_REF_1">
             <index-column name="LINK_ID"/>
         </index>
-        <unique name="UN_LINK_CONSTRAINTS_REF_1">
+        <unique name="UN_L_C_REF_1">
             <unique-column name="LINK_ID"/>
             <unique-column name="NAME"/>
         </unique>
@@ -547,13 +547,13 @@
         <column name="CONSTRAINTS_DEF_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PAGE_SECURITY_ID" type="INTEGER" required="true"/>
         <column name="NAME" required="true" size="40" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE_SECURITY" name="FK_PAGE_SEC_CONSTRAINTS_DEF_1" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_SECURITY" name="FK_P_S_CS_DEF_1" onDelete="cascade">
             <reference foreign="PAGE_SECURITY_ID" local="PAGE_SECURITY_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_SEC_CONSTRAINTS_DEF_1">
+        <index name="IX_P_S_CS_DEF_1">
             <index-column name="PAGE_SECURITY_ID"/>
         </index>
-        <unique name="UN_PAGE_SEC_CONSTRAINTS_DEF_1">
+        <unique name="UN_P_S_CS_DEF_1">
             <unique-column name="PAGE_SECURITY_ID"/>
             <unique-column name="NAME"/>
         </unique>
@@ -567,10 +567,10 @@
         <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
         <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
-        <foreign-key foreignTable="PAGE_SEC_CONSTRAINTS_DEF" name="FK_PAGE_SEC_CONSTRAINT_DEF_1" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_SEC_CONSTRAINTS_DEF" name="FK_P_S_C_DEF_1" onDelete="cascade">
             <reference foreign="CONSTRAINTS_DEF_ID" local="CONSTRAINTS_DEF_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_SEC_CONSTRAINT_DEF_1">
+        <index name="IX_P_S_C_DEF_1">
             <index-column name="CONSTRAINTS_DEF_ID"/>
         </index>
     </table>
@@ -580,13 +580,13 @@
         <column name="PAGE_SECURITY_ID" type="INTEGER" required="true"/>
         <column name="APPLY_ORDER" type="INTEGER" required="true"/>
         <column name="NAME" size="40" type="VARCHAR" required="true"/>
-        <foreign-key foreignTable="PAGE_SECURITY"  name="FK_PAGE_SEC_CONSTRAINTS_REF_1" onDelete="cascade">
+        <foreign-key foreignTable="PAGE_SECURITY"  name="FK_P_S_CS_REF_1" onDelete="cascade">
             <reference foreign="PAGE_SECURITY_ID" local="PAGE_SECURITY_ID"/>
         </foreign-key>
-        <index name="IX_PAGE_SEC_CONSTRAINTS_REF_1">
+        <index name="IX_P_S_CS_REF_1">
             <index-column name="PAGE_SECURITY_ID"/>
         </index>
-        <unique name="UN_PAGE_SEC_CONSTRAINTS_REF_1">
+        <unique name="UN_P_S_CS_REF_1">
             <unique-column name="PAGE_SECURITY_ID"/>
             <unique-column name="NAME"/>
         </unique>
@@ -616,7 +616,7 @@
             <index-column name="RULE_ID" />
             <index-column name="FALLBACK_ORDER" />
         </index>
-        <foreign-key foreignTable="PROFILING_RULE" name="FK_RULE_CRITERION_1" onDelete="cascade">
+        <foreign-key foreignTable="PROFILING_RULE" name="FK_R_CRITERION_1" onDelete="cascade">
             <reference foreign="RULE_ID" local="RULE_ID"/>
         </foreign-key>           
     </table>
Index: etc/schema/security-schema.xml
===================================================================
--- etc/schema/security-schema.xml	(revision 518285)
+++ etc/schema/security-schema.xml	(working copy)
@@ -60,10 +60,10 @@
     <table name="PRINCIPAL_PERMISSION">
         <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PERMISSION_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <foreign-key foreignTable="SECURITY_PERMISSION" name="FK_PRINCIPAL_PERMISSION_1" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PERMISSION" name="FK_PR_PE_1" onDelete="cascade">
             <reference foreign="PERMISSION_ID" local="PERMISSION_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_PRINCIPAL_PERMISSION_2" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_PR_PE_2" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -87,7 +87,7 @@
         <column name="PREV_AUTH_DATE" required="false" type="TIMESTAMP"/>
         <column name="LAST_AUTH_DATE" required="false" type="TIMESTAMP"/>
         <column name="EXPIRATION_DATE" required="false" type="DATE"/>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_CREDENTIAL_1" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SE_CR_1" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -137,10 +137,10 @@
     <table name="SSO_PRINCIPAL_TO_REMOTE">
     	<column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="REMOTE_PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
-         <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_PRINCIPAL_TO_REMOTE_1" onDelete="cascade">
+         <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_PR_RE_1" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_PRINCIPAL_TO_REMOTE_2" onDelete="cascade">
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_PR_RE_2" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -149,10 +149,10 @@
     	<column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
            
-         <foreign-key foreignTable="SSO_SITE"  name="FK_SSO_SITE_TO_REMOTE_1" onDelete="cascade">
+         <foreign-key foreignTable="SSO_SITE"  name="FK_SSO_SI_RE_1" onDelete="cascade">
             <reference foreign="SITE_ID" local="SITE_ID"/>
         </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_SITE_TO_REMOTE_2" onDelete="cascade">
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_SI_RE_2" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -161,10 +161,10 @@
     	<column name="COOKIE_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="REMOTE_PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
            
-         <foreign-key foreignTable="SSO_COOKIE" name="FK_SSO_COOKIE_TO_REMOTE_1" onDelete="cascade">
+         <foreign-key foreignTable="SSO_COOKIE" name="FK_SSO_CO_RE_1" onDelete="cascade">
             <reference foreign="COOKIE_ID" local="COOKIE_ID"/>
         </foreign-key>
-       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_COOKIE_TO_REMOTE_2" onDelete="cascade">
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_CO_RE_2" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
         </foreign-key>
     </table>
@@ -178,7 +178,7 @@
         <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_USER_ROLE_1" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="ROLE_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_USER_ROLE_2" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SE_US_ROLE_2" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="USER_ID"/>
         </foreign-key>
     </table>
@@ -189,10 +189,10 @@
     <table name="SECURITY_USER_GROUP">
         <column name="USER_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="GROUP_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_USER_GROUP_1" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SE_US_GR_1" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="GROUP_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_USER_GROUP_2" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SE_US_GR_2" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="USER_ID"/>
         </foreign-key>
     </table>
@@ -203,10 +203,10 @@
     <table name="SECURITY_GROUP_ROLE">
         <column name="GROUP_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="ROLE_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="FK_SECURITY_GROUP_ROLE_1" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="FK_SE_GR_RO_1" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="GROUP_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="FK_SECURITY_GROUP_ROLE_2" onDelete="cascade">
+        <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="FK_SE_GR_RO_2" onDelete="cascade">
             <reference foreign="PRINCIPAL_ID" local="ROLE_ID"/>
         </foreign-key>
     </table>
Index: etc/schema/registry-schema.xml
===================================================================
--- etc/schema/registry-schema.xml	(revision 518285)
+++ etc/schema/registry-schema.xml	(working copy)
@@ -74,7 +74,7 @@
         <column name="COLUMN_VALUE" required="true" type="LONGVARCHAR"/>
         <column name="NAME" required="true" size="100" type="VARCHAR"/>
         <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_PA_METADATA_FIELDS_1" onDelete="cascade">                        
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_PA_ME_FIELDS_1" onDelete="cascade">                        
             <reference foreign="APPLICATION_ID" local="OBJECT_ID"/>            
         </foreign-key>        
     </table>
@@ -88,7 +88,7 @@
         <column name="COLUMN_VALUE" required="true" type="LONGVARCHAR"/>
         <column name="NAME" required="true" size="100" type="VARCHAR"/>
         <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
-        <foreign-key foreignTable="PORTLET_DEFINITION" name="FK_PD_METADATA_FIELDS_1" onDelete="cascade">                        
+        <foreign-key foreignTable="PORTLET_DEFINITION" name="FK_PD_ME_FIELDS_1" onDelete="cascade">                        
             <reference foreign="ID" local="OBJECT_ID"/>            
         </foreign-key>                
     </table>
@@ -178,7 +178,7 @@
         <column name="APPLICATION_ID" required="true" type="INTEGER"/>
         <column name="NAME" size="150" type="VARCHAR"/>
         <column name="NAME_LINK" size="150" type="VARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_USER_ATTRIBUTE_REF_1" onDelete="cascade">
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_U_ATTR_REF_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>                
     </table>
@@ -191,7 +191,7 @@
         <column name="APPLICATION_ID" required="true" type="INTEGER"/>
         <column name="NAME" size="150" type="VARCHAR"/>
         <column name="DESCRIPTION" size="150" type="VARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_USER_ATTRIBUTE_1" onDelete="cascade">
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_U_ATTR_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
     </table>
@@ -237,7 +237,7 @@
         <column name="CUSTOM_NAME" required="true" size="150" type="VARCHAR"/>
         <column name="MAPPED_NAME" size="150" type="VARCHAR"/>
         <column name="DESCRIPTION" type="LONGVARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_CUSTOM_PORTLET_MODE_1" onDelete="cascade">
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_C_P_MODE_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
     </table>
@@ -251,7 +251,7 @@
         <column name="CUSTOM_NAME" required="true" size="150" type="VARCHAR"/>
         <column name="MAPPED_NAME" size="150" type="VARCHAR"/>
         <column name="DESCRIPTION" type="LONGVARCHAR"/>
-        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_CUSTOM_WINDOW_STATE_1" onDelete="cascade">
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_C_W_STATE_1" onDelete="cascade">
             <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
         </foreign-key>        
     </table>