diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql
index 980620166..9a1cdc244 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql
@@ -19,10 +19,10 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 
-@@ oracle-se/upgrade/5.0.0-5.1.0/versioning.sql
-@@ oracle-se/upgrade/5.0.0-5.1.0/categorization.sql
-@@ oracle-se/upgrade/5.0.0-5.1.0/permissioning.sql
-@@ oracle-se/upgrade/5.0.0-5.1.0/messaging.sql
-@@ oracle-se/upgrade/5.0.0-5.1.0/objects.sql
-@@ oracle-se/upgrade/5.0.0-5.1.0/create-fk-indices.sql
-@@ oracle-se/upgrade/5.0.0-5.1.0/drop-sec_session_properties.sql
+@@ oracle-se/5.0.0-5.1.0/versioning.sql
+@@ oracle-se/5.0.0-5.1.0/categorization.sql
+@@ oracle-se/5.0.0-5.1.0/permissioning.sql
+@@ oracle-se/5.0.0-5.1.0/messaging.sql
+@@ oracle-se/5.0.0-5.1.0/objects.sql
+@@ oracle-se/5.0.0-5.1.0/create-fk-indices.sql
+@@ oracle-se/5.0.0-5.1.0/drop-sec_session_properties.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql
index 0d24add52..a27725877 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql
@@ -19,4 +19,4 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 
-@@ oracle-se/upgrade/5.1.1-5.1.2/site-nodes-url.sql
+@@ oracle-se/5.1.1-5.1.2/site-nodes-url.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql
index 93746ebe2..12fd6e4c0 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql
@@ -19,31 +19,31 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 
-@@ oracle-se/upgrade/5.1.2-5.2.0/function-currentDate.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/function-last_attr_value.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/function-package_id_for_object_id.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/package-hierarchy_denormalization.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/package-parties_denormalization.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/package-permission_denormalization.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/package-search_indexing.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_parties.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_permissions.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/drop-category-map-id.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/trigger-cat_category_category_map.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/categorization.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/add-applications.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/add-search-test.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/add-portlets.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/add-portals.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/add-portlet-portals-constraints.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/add-bebop-object.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/add-forms.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/add-lucene-docs.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/drop-places.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/drop-us-addresses.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/drop-notes.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/drop-table-secret-tokens.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/misc.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/update-constraints.sql
-@@ oracle-se/upgrade/5.1.2-5.2.0/update-indexes.sql
+@@ oracle-se/5.1.2-5.2.0/function-currentDate.sql
+@@ oracle-se/5.1.2-5.2.0/function-last_attr_value.sql
+@@ oracle-se/5.1.2-5.2.0/function-package_id_for_object_id.sql
+@@ oracle-se/5.1.2-5.2.0/package-hierarchy_denormalization.sql
+@@ oracle-se/5.1.2-5.2.0/package-parties_denormalization.sql
+@@ oracle-se/5.1.2-5.2.0/package-permission_denormalization.sql
+@@ oracle-se/5.1.2-5.2.0/package-search_indexing.sql
+@@ oracle-se/5.1.2-5.2.0/trigger-acs_parties.sql
+@@ oracle-se/5.1.2-5.2.0/trigger-acs_permissions.sql
+@@ oracle-se/5.1.2-5.2.0/drop-category-map-id.sql
+@@ oracle-se/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql
+@@ oracle-se/5.1.2-5.2.0/trigger-cat_category_category_map.sql
+@@ oracle-se/5.1.2-5.2.0/categorization.sql
+@@ oracle-se/5.1.2-5.2.0/add-applications.sql
+@@ oracle-se/5.1.2-5.2.0/add-search-test.sql
+@@ oracle-se/5.1.2-5.2.0/add-portlets.sql
+@@ oracle-se/5.1.2-5.2.0/add-portals.sql
+@@ oracle-se/5.1.2-5.2.0/add-portlet-portals-constraints.sql
+@@ oracle-se/5.1.2-5.2.0/add-bebop-object.sql
+@@ oracle-se/5.1.2-5.2.0/add-forms.sql
+@@ oracle-se/5.1.2-5.2.0/add-lucene-docs.sql
+@@ oracle-se/5.1.2-5.2.0/drop-places.sql
+@@ oracle-se/5.1.2-5.2.0/drop-us-addresses.sql
+@@ oracle-se/5.1.2-5.2.0/drop-notes.sql
+@@ oracle-se/5.1.2-5.2.0/drop-table-secret-tokens.sql
+@@ oracle-se/5.1.2-5.2.0/misc.sql
+@@ oracle-se/5.1.2-5.2.0/update-constraints.sql
+@@ oracle-se/5.1.2-5.2.0/update-indexes.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql
index 03d9ad686..337065b09 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql
@@ -18,5 +18,5 @@
 -- $Id: oracle-se-5.2.0-5.2.1.sql 287 2005-02-22 00:29:02Z sskracic $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-@@ oracle-se/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
-@@ default/upgrade/5.2.0-5.2.1/alter-requests.sql
+@@ oracle-se/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
+@@ default/5.2.0-5.2.1/alter-requests.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql
index 905cbcdec..1c72f6b54 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql
@@ -20,26 +20,26 @@
 
 PROMPT Red Hat WAF 5.2.1 -> 6.0.0 Upgrade Script (Oracle)
 
-@@ default/upgrade/5.2.1-6.0.0/drop-search-test.sql
-@@ default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql
-@@ default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
-@@ default/upgrade/5.2.1-6.0.0/alter-categories.sql
-@@ default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/update-web-hosts.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/alter-lucene.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/mime-types.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/vcx_deferred.sql
-@@ default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql
-@@ default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql
-@@ default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/misc.sql
-@@ oracle-se/upgrade/5.2.1-6.0.0/auto-upgrade.sql
+@@ default/5.2.1-6.0.0/drop-search-test.sql
+@@ default/5.2.1-6.0.0/sequence-vcx_id_seq.sql
+@@ default/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
+@@ default/5.2.1-6.0.0/alter-categories.sql
+@@ default/5.2.1-6.0.0/table-web_hosts-auto.sql
+@@ oracle-se/5.2.1-6.0.0/update-web-hosts.sql
+@@ oracle-se/5.2.1-6.0.0/alter-lucene.sql
+@@ oracle-se/5.2.1-6.0.0/mime-types.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_event_types-auto.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_operations-auto.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_tags-auto.sql
+@@ oracle-se/5.2.1-6.0.0/table-vcx_txns-auto.sql
+@@ oracle-se/5.2.1-6.0.0/vcx_deferred.sql
+@@ default/5.2.1-6.0.0/insert-vcx_event_types.sql
+@@ default/5.2.1-6.0.0/insert-vcx_java_classes.sql
+@@ default/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
+@@ oracle-se/5.2.1-6.0.0/misc.sql
+@@ oracle-se/5.2.1-6.0.0/auto-upgrade.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql
index 41206edd4..44efd7830 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql
@@ -18,5 +18,5 @@
 -- $Id: oracle-se-6.0.0-6.0.1.sql 287 2005-02-22 00:29:02Z sskracic $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-@@ oracle-se/upgrade/6.0.0-6.0.1/function-convert_to_html.sql
+@@ oracle-se/6.0.0-6.0.1/function-convert_to_html.sql
 @@ default/kernel/package-parties_denormalization.sql
\ No newline at end of file
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql
index 0fd45cff3..a02ef97a3 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql
@@ -20,19 +20,19 @@
 
 PROMPT Red Hat WAF 6.0.1 -> 6.1.0 Upgrade Script (Oracle)
 
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql 
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-inits-auto.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-keystore-auto.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-webapps-auto.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/deferred.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/update-host-unique-index.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/update-applications.sql
+@@ oracle-se/6.0.1-6.1.0/table-admin_app-auto.sql
+@@ oracle-se/6.0.1-6.1.0/table-agentportlets-auto.sql
+@@ oracle-se/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql 
+@@ oracle-se/6.0.1-6.1.0/table-init_requirements-auto.sql
+@@ oracle-se/6.0.1-6.1.0/table-inits-auto.sql
+@@ oracle-se/6.0.1-6.1.0/table-keystore-auto.sql
+@@ oracle-se/6.0.1-6.1.0/table-lucene_ids-auto.sql
+@@ oracle-se/6.0.1-6.1.0/table-sitemap_app-auto.sql
+@@ oracle-se/6.0.1-6.1.0/table-webapps-auto.sql
+@@ oracle-se/6.0.1-6.1.0/deferred.sql
+@@ oracle-se/6.0.1-6.1.0/update-host-unique-index.sql
+@@ oracle-se/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
+@@ oracle-se/6.0.1-6.1.0/update-applications.sql
 
 alter table cms_mime_extensions modify (mime_type null);
 alter table cms_mime_extensions add constraint
@@ -46,50 +46,50 @@ create index AGENTPORT_SUPERPORT_ID_IDX on AGENTPORTLETS(SUPERPORTLET_ID);
 create index INIT_REQS_REQD_INIT_IDX on INIT_REQUIREMENTS(REQUIRED_INIT);
 
 -- insert mime type file extensions
-@@ default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql
+@@ default/6.0.1-6.1.0/insert-cms_mime_extensions.sql
 
 -- Upgrade script for new permission denormalization
 -- Privilege Hierarchy
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
+@@ oracle-se/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
+@@ oracle-se/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
+@@ oracle-se/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
 
 -- Privileges/permission denormalization
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_privileges.sql
+@@ oracle-se/6.0.1-6.1.0/comment-dnm_privileges.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
+@@ oracle-se/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
+@@ oracle-se/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_permissions.sql
+@@ oracle-se/6.0.1-6.1.0/comment-dnm_permissions.sql
+@@ oracle-se/6.0.1-6.1.0/index-dnm_permissions.sql
+@@ oracle-se/6.0.1-6.1.0/package-dnm_privileges.sql
 
-@@ oracle-se/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql
+@@ oracle-se/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
+@@ oracle-se/6.0.1-6.1.0/upgrade-dnm_privileges.sql
 
 -- Object context denormalization
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_context.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/package-dnm_context.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context-quick.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_object_grants.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_granted_context.sql
+@@ oracle-se/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
+@@ oracle-se/6.0.1-6.1.0/index-dnm_granted_context.sql
+@@ oracle-se/6.0.1-6.1.0/insert-dnm_context.sql
+@@ oracle-se/6.0.1-6.1.0/package-dnm_context.sql
+@@ oracle-se/6.0.1-6.1.0/upgrade-dnm_context-quick.sql
 
 -- Party denormalization
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/package-dnm_parties.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql
-@@ oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_group_membership.sql
+@@ oracle-se/6.0.1-6.1.0/index-dnm_group_membership.sql
+@@ oracle-se/6.0.1-6.1.0/table-dnm_party_grants.sql
+@@ oracle-se/6.0.1-6.1.0/package-dnm_parties.sql
+@@ oracle-se/6.0.1-6.1.0/insert-dnm_group_membership.sql
+@@ oracle-se/6.0.1-6.1.0/upgrade-dnm_parties.sql
+@@ oracle-se/6.0.1-6.1.0/triggers-dnm_privileges.sql
+@@ oracle-se/6.0.1-6.1.0/triggers-dnm_context.sql
+@@ oracle-se/6.0.1-6.1.0/triggers-dnm_parties.sql
 
 drop package permission_denormalization;
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql
index dc6c40f62..9e5cd6485 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql
@@ -20,8 +20,8 @@
 
 PROMPT Red Hat WAF 6.1.0 -> 6.1.1 Upgrade Script (Oracle)
 
-@@ oracle-se/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql
-@@ oracle-se/upgrade/6.1.0-6.1.1/upgrade-search_content.sql
+@@ oracle-se/6.1.0-6.1.1/upgrade-lucene_docs.sql
+@@ oracle-se/6.1.0-6.1.1/upgrade-search_content.sql
 
 @@ fixes/formbuilder/delete-bogus-form-widgets.sql
 @@ fixes/messaging/update-thread-replies.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
index cabf9a34c..9b2b13954 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
@@ -16,5 +16,5 @@
 -- $Id: oracle-se-6.1.1-6.1.2.sql 786 2005-09-12 15:00:31Z fabrice $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-@@ oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
-@@ oracle-se/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
+@@ oracle-se/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
+@@ oracle-se/6.1.1-6.1.2/add_column_ignore_parent_index.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql
index 806f31075..a7cdf7c33 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql
@@ -16,7 +16,7 @@
 -- $Id: oracle-se-6.1.1-6.1.2.sql 723 2005-08-23 16:56:33Z sskracic $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-@@ oracle-se/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql
-@@ oracle-se/upgrade/6.3.0-6.3.1/add_column_users_banned.sql
-@@ default/upgrade/6.3.0-6.3.1/preferred-categories.sql
-@@ default/upgrade/6.3.0-6.3.1/auto-categorization.sql
+@@ oracle-se/6.3.0-6.3.1/add_column_catpurpose_lang.sql
+@@ oracle-se/6.3.0-6.3.1/add_column_users_banned.sql
+@@ default/6.3.0-6.3.1/preferred-categories.sql
+@@ default/6.3.0-6.3.1/auto-categorization.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql
index ca0adf033..fefe3b700 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql
@@ -1,2 +1,2 @@
-@@ oracle-se/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
+@@ oracle-se/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.2-6.3.3.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.2-6.3.3.sql
index b6bcc7243..6a7ee4119 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.2-6.3.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.2-6.3.3.sql
@@ -15,4 +15,4 @@
 --
 -- $Id$
 
-@@ default/upgrade/6.3.2-6.3.3/sso-login.sql
+@@ default/6.3.2-6.3.3/sso-login.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.2-6.5.3.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.2-6.5.3.sql
index 9a25b83b3..9aeb19a54 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.2-6.5.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.2-6.5.3.sql
@@ -15,4 +15,4 @@
 --
 -- $Id$
 
-@@ oracle-se/upgrade/6.5.2-6.5.3/clob_message.sql
+@@ oracle-se/6.5.2-6.5.3/clob_message.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.3-6.5.4.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.3-6.5.4.sql
index 834b2ecfb..ffbbadc31 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.3-6.5.4.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.3-6.5.4.sql
@@ -18,5 +18,5 @@
 
 PROMPT Red Hat WAF 6.5.3 -> 6.5.4 Upgrade Script (Oracle)
 
-@@ default/upgrade/6.5.3-6.5.4/insert-application-container-group-columns.sql
+@@ default/6.5.3-6.5.4/insert-application-container-group-columns.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
index b57fd7196..8f94e1724 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
@@ -19,7 +19,7 @@
 PROMPT Red Hat WAF 6.5.4 -> 6.5.5 Upgrade Script (Oracle)
 
 @@ oracle-se/kernel/package-dnm_context.sql
-@@ oracle-se/upgrade/6.5.4-6.5.5/drop-triggers.sql
+@@ oracle-se/6.5.4-6.5.5/drop-triggers.sql
 @@ oracle-se/kernel/triggers-dnm_context.sql
-@@ default/upgrade/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql
+@@ default/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.5-6.5.6.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.5-6.5.6.sql
index f72ac6f26..3c18fecd4 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.5-6.5.6.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.5-6.5.6.sql
@@ -18,5 +18,5 @@
 
 PROMPT ccm-core   6.5.5 -> 6.5.6 Upgrade Script (Oracle)
 
-@@ oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
+@@ oracle-se/6.5.5-6.5.6/create-category_localizations-table.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
index 97e54b547..951e12940 100644
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
@@ -19,4 +19,4 @@
 
 PROMPT Red Hat Enterprise CORE 6.6.0 -> 6.6.1 Upgrade Script (Oracle)
 
-@@ default/upgrade/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
+@@ default/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql
index c3fbd8140..cbc9f6e18 100644
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql
@@ -21,4 +21,4 @@ PROMPT Red Hat Enterprise CORE 6.6.1 -> 6.6.2 Upgrade Script (Oracle)
 
 -- Just delete the table for web.WebApp which is unfinished work
 
-@@ default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql
+@@ default/6.6.1-6.6.2/drop_table_webapps.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.2-6.6.3.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.2-6.6.3.sql
index d250ccd60..4acea8b32 100644
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.2-6.6.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.2-6.6.3.sql
@@ -22,4 +22,4 @@ PROMPT Red Hat Enterprise CORE 6.6.1 -> 6.6.2 Upgrade Script (Oracle)
 -- delete core portals entry in apm_package_types
 -- there es no entry in acs_objects!
 
-@@ default/upgrade/6.6.2-6.6.3/remove_legacy_portal.sql
+@@ default/6.6.2-6.6.3/remove_legacy_portal.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql
index a115c762e..7174ca03e 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql
@@ -20,10 +20,10 @@
 
 
 begin;
-\i default/upgrade/5.2.0-5.2.1/alter-requests.sql
-\i postgres/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
-\i postgres/upgrade/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql
-\i postgres/upgrade/5.2.0-5.2.1/notification/index-nt_requests.sql
+\i default/5.2.0-5.2.1/alter-requests.sql
+\i postgres/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
+\i postgres/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql
+\i postgres/5.2.0-5.2.1/notification/index-nt_requests.sql
 
 commit;
 
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql b/ccm-core/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql
index c4c8493a2..4d9289662 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql
@@ -22,31 +22,31 @@
 
 begin;
 
-\i postgres/upgrade/5.2.1-6.0.0/drop-ri-triggers.sql
-\i postgres/upgrade/5.2.1-6.0.0/drop-unique-indexes.sql
-\i default/upgrade/5.2.1-6.0.0/drop-search-test.sql
-\i default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql
-\i default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
-\i default/upgrade/5.2.1-6.0.0/alter-categories.sql
-\i default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/add-permissions-rebuild.sql
-\i postgres/upgrade/5.2.1-6.0.0/update-web-hosts.sql
-\i postgres/upgrade/5.2.1-6.0.0/alter-lucene.sql
-\i postgres/upgrade/5.2.1-6.0.0/mime-types.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql
-\i postgres/upgrade/5.2.1-6.0.0/vcx_deferred.sql
-\i default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql
-\i default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql
-\i default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
-\i postgres/upgrade/5.2.1-6.0.0/misc.sql
-\i postgres/upgrade/5.2.1-6.0.0/auto-upgrade.sql
+\i postgres/5.2.1-6.0.0/drop-ri-triggers.sql
+\i postgres/5.2.1-6.0.0/drop-unique-indexes.sql
+\i default/5.2.1-6.0.0/drop-search-test.sql
+\i default/5.2.1-6.0.0/sequence-vcx_id_seq.sql
+\i default/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
+\i default/5.2.1-6.0.0/alter-categories.sql
+\i default/5.2.1-6.0.0/table-web_hosts-auto.sql
+\i postgres/5.2.1-6.0.0/add-permissions-rebuild.sql
+\i postgres/5.2.1-6.0.0/update-web-hosts.sql
+\i postgres/5.2.1-6.0.0/alter-lucene.sql
+\i postgres/5.2.1-6.0.0/mime-types.sql
+\i postgres/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
+\i postgres/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
+\i postgres/5.2.1-6.0.0/table-vcx_event_types-auto.sql
+\i postgres/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
+\i postgres/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
+\i postgres/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
+\i postgres/5.2.1-6.0.0/table-vcx_operations-auto.sql
+\i postgres/5.2.1-6.0.0/table-vcx_tags-auto.sql
+\i postgres/5.2.1-6.0.0/table-vcx_txns-auto.sql
+\i postgres/5.2.1-6.0.0/vcx_deferred.sql
+\i default/5.2.1-6.0.0/insert-vcx_event_types.sql
+\i default/5.2.1-6.0.0/insert-vcx_java_classes.sql
+\i default/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
+\i postgres/5.2.1-6.0.0/misc.sql
+\i postgres/5.2.1-6.0.0/auto-upgrade.sql
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql
index 7b3418442..84289593a 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql
@@ -22,19 +22,19 @@
 
 begin;
 
-\i postgres/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-inits-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-keystore-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-webapps-auto.sql
-\i postgres/upgrade/6.0.1-6.1.0/deferred.sql
-\i postgres/upgrade/6.0.1-6.1.0/update-host-unique-index.sql
-\i postgres/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
-\i postgres/upgrade/6.0.1-6.1.0/update-applications.sql
+\i postgres/6.0.1-6.1.0/table-admin_app-auto.sql
+\i postgres/6.0.1-6.1.0/table-agentportlets-auto.sql
+\i postgres/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
+\i postgres/6.0.1-6.1.0/table-init_requirements-auto.sql
+\i postgres/6.0.1-6.1.0/table-inits-auto.sql
+\i postgres/6.0.1-6.1.0/table-keystore-auto.sql
+\i postgres/6.0.1-6.1.0/table-lucene_ids-auto.sql
+\i postgres/6.0.1-6.1.0/table-sitemap_app-auto.sql
+\i postgres/6.0.1-6.1.0/table-webapps-auto.sql
+\i postgres/6.0.1-6.1.0/deferred.sql
+\i postgres/6.0.1-6.1.0/update-host-unique-index.sql
+\i postgres/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
+\i postgres/6.0.1-6.1.0/update-applications.sql
 
 update apm_package_types set package_uri = 'http://arsdigita.com/sitemap' where package_uri = 'http://arsdigita.com/admin/sitemap';
 
@@ -45,54 +45,54 @@ create index agentport_superport_id_idx on agentportlets(superportlet_id);
 create index init_reqs_reqd_init_idx on init_requirements(required_init);
 
 -- insert mime type file extensions
-\i default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql
+\i default/6.0.1-6.1.0/insert-cms_mime_extensions.sql
 
 -- Upgrade script for new permission denormalization
 -- Privilege Hierarchy
-\i postgres/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
-\i postgres/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
-\i postgres/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
+\i postgres/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
+\i postgres/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
+\i postgres/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
 
 -- Privileges/permission denormalization
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql
-\i postgres/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
-\i postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
-\i postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql
-\i postgres/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql
-\i postgres/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql
+\i postgres/6.0.1-6.1.0/table-dnm_privileges.sql
+\i postgres/6.0.1-6.1.0/comment-dnm_privileges.sql
+\i postgres/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
+\i postgres/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
+\i postgres/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
+\i postgres/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
+\i postgres/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
+\i postgres/6.0.1-6.1.0/table-dnm_permissions.sql
+\i postgres/6.0.1-6.1.0/comment-dnm_permissions.sql
+\i postgres/6.0.1-6.1.0/index-dnm_permissions.sql
 
-\i postgres/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql
-\i postgres/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
-\i postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql
+\i postgres/6.0.1-6.1.0/package-dnm_privileges.sql
+\i postgres/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
+\i postgres/6.0.1-6.1.0/upgrade-dnm_privileges.sql
 
 -- Object context denormalization
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql
-\i postgres/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
-\i postgres/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_ungranted_context.sql
-\i postgres/upgrade/6.0.1-6.1.0/index-dnm_ungranted_context.sql
+\i postgres/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
+\i postgres/6.0.1-6.1.0/table-dnm_object_grants.sql
+\i postgres/6.0.1-6.1.0/table-dnm_granted_context.sql
+\i postgres/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
+\i postgres/6.0.1-6.1.0/index-dnm_granted_context.sql
+\i postgres/6.0.1-6.1.0/table-dnm_ungranted_context.sql
+\i postgres/6.0.1-6.1.0/index-dnm_ungranted_context.sql
 
-\i postgres/upgrade/6.0.1-6.1.0/insert-dnm_context.sql
-\i postgres/upgrade/6.0.1-6.1.0/package-dnm_context.sql
-\i postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
+\i postgres/6.0.1-6.1.0/insert-dnm_context.sql
+\i postgres/6.0.1-6.1.0/package-dnm_context.sql
+\i postgres/6.0.1-6.1.0/upgrade-dnm_context.sql
 
 -- Party denormalization
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql
-\i postgres/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql
-\i postgres/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql
-\i postgres/upgrade/6.0.1-6.1.0/package-dnm_parties.sql
-\i postgres/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql
-\i postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql
+\i postgres/6.0.1-6.1.0/table-dnm_group_membership.sql
+\i postgres/6.0.1-6.1.0/index-dnm_group_membership.sql
+\i postgres/6.0.1-6.1.0/table-dnm_party_grants.sql
+\i postgres/6.0.1-6.1.0/package-dnm_parties.sql
+\i postgres/6.0.1-6.1.0/insert-dnm_group_membership.sql
+\i postgres/6.0.1-6.1.0/upgrade-dnm_parties.sql
 
-\i postgres/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql
-\i postgres/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql
-\i postgres/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql
+\i postgres/6.0.1-6.1.0/triggers-dnm_privileges.sql
+\i postgres/6.0.1-6.1.0/triggers-dnm_context.sql
+\i postgres/6.0.1-6.1.0/triggers-dnm_parties.sql
 
 create index dnm_group_membership_grp_idx on dnm_group_membership(pd_group_id);
 create index dnm_ungranted_context_obj_idx on dnm_ungranted_context(object_id);
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql
index 529d2ed9d..9d308fc57 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql
@@ -20,7 +20,7 @@
 
 \echo Red Hat WAF 6.1.0 -> 6.1.1 Upgrade Script (PostgreSQL)
 
-\i postgres/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql
+\i postgres/6.1.0-6.1.1/upgrade-lucene_docs.sql
 
 \i ../fixes/formbuilder/delete-bogus-form-widgets.sql
 \i ../fixes/messaging/update-thread-replies.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
index 8cd5208a6..e02e41e11 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
@@ -16,6 +16,6 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 begin;
-  \i postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
-  \i postgres/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
+  \i postgres/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
+  \i postgres/6.1.1-6.1.2/add_column_ignore_parent_index.sql
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql
index 27c163bf4..168f25822 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql
@@ -16,10 +16,10 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 begin;
-\i postgres/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql
-\i postgres/upgrade/6.3.0-6.3.1/add_column_users_banned.sql
-\i default/upgrade/6.3.0-6.3.1/preferred-categories.sql
-\i default/upgrade/6.3.0-6.3.1/auto-categorization.sql
+\i postgres/6.3.0-6.3.1/add_column_catpurpose_lang.sql
+\i postgres/6.3.0-6.3.1/add_column_users_banned.sql
+\i default/6.3.0-6.3.1/preferred-categories.sql
+\i default/6.3.0-6.3.1/auto-categorization.sql
 create or replace function last_day(date) returns date as 'select
 cast(date_trunc(''month'', $1) + ''1 month''::interval as date) - 1'
 language sql;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql
index d086940d0..1cb420cca 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql
@@ -1,3 +1,3 @@
 begin;
-\i postgres/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
+\i postgres/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.2-6.3.3.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.2-6.3.3.sql
index 32b664fbe..028ad3de1 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.2-6.3.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.2-6.3.3.sql
@@ -1,3 +1,3 @@
 begin;
-\i default/upgrade/6.3.2-6.3.3/sso-login.sql
+\i default/6.3.2-6.3.3/sso-login.sql
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.2-6.5.3.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.2-6.5.3.sql
index 649e0cfd6..fe2b6b04b 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.2-6.5.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.2-6.5.3.sql
@@ -14,5 +14,5 @@
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 --
 begin;
-\i postgres/upgrade/6.5.2-6.5.3/clob_message.sql
+\i postgres/6.5.2-6.5.3/clob_message.sql
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.3-6.5.4.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.3-6.5.4.sql
index 9497a2e00..824f272cd 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.3-6.5.4.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.3-6.5.4.sql
@@ -21,7 +21,7 @@
 begin;
 
 
-\i default/upgrade/6.5.3-6.5.4/insert-application-container-group-columns.sql
+\i default/6.5.3-6.5.4/insert-application-container-group-columns.sql
 
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.5-6.5.6.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.5-6.5.6.sql
index f93ff7a6b..d3c0e983f 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.5-6.5.6.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.5-6.5.6.sql
@@ -20,7 +20,7 @@
 begin;
 
 
-\i postgres/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
+\i postgres/6.5.5-6.5.6/create-category_localizations-table.sql
 
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.0-6.6.1.sql
index aa22f8a1b..73bed866e 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.0-6.6.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.0-6.6.1.sql
@@ -21,7 +21,7 @@
 
 begin;
 
-\i default/upgrade/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
-\i default/upgrade/6.6.0-6.6.1/recreate_users_index.sql
+\i default/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
+\i default/6.6.0-6.6.1/recreate_users_index.sql
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql
index 0e5b6958e..7abf6a297 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql
@@ -23,6 +23,6 @@
 
 begin;
 
-\i default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql
+\i default/6.6.1-6.6.2/drop_table_webapps.sql
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.2-6.6.3.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.2-6.6.3.sql
index 2762795f4..31f1b8afd 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.2-6.6.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.2-6.6.3.sql
@@ -24,6 +24,6 @@
 
 begin;
 
-\i default/upgrade/6.6.2-6.6.3/remove_legacy_portal.sql
+\i default/6.6.2-6.6.3/remove_legacy_portal.sql
 
 commit;