diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
new file mode 100644
index 000000000..21b6ad9b7
--- /dev/null
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/default/6.6.2-6.6.3/upd_system_tables.sql
@@ -0,0 +1,77 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: upd_system_tables.sql pboy $
+
+-- rename cm-ldn-navigation to ccm-navigation
+-- adjust various system tables to the new name of application
+
+alter table init_requirements drop constraint init_requirements_init_f_cmmdn ;
+alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ;
+
+update inits
+ set class_name='com.arsdigita.navigation.Initializer'
+ where class_name='com.arsdigita.london.navigation.Initializer' ;
+
+update init_requirements
+ set init='com.arsdigita.navigation.Initializer'
+ where init='com.arsdigita.london.navigation.Initializer' ;
+
+update init_requirements
+ set required_init='com.arsdigita.navigation.Initializer'
+ where required_init='com.arsdigita.london.navigation.Initializer' ;
+
+ALTER TABLE init_requirements
+ ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
+ REFERENCES inits (class_name) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION;
+ALTER TABLE init_requirements
+ ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
+ REFERENCES inits (class_name) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+
+update application_types
+ set object_type=replace(object_type,'london.navigation','navigation')
+ where object_type like '%london.navigation%' ;
+
+-- table applications doesn't require an update
+-- update applications
+-- set title='CCM Themes Administration',
+-- description='CCM themes administration'
+-- where primary_url='/admin/themes/' ;
+
+-- table apm_package_types doesn't require an update
+-- table apm_packages doesn't require an update either
+-- table site_nodes doesn't require an update either
+
+
+-- update application type in acs_objects
+-- update acs_objects
+-- set (object_type,display_name,default_domain_class) =
+-- ('com.arsdigita.themedirector.ThemeDirector' ,
+-- 'CCM Themes Administration',
+-- 'com.arsdigita.themedirector.ThemeDirector' )
+-- where default_domain_class like 'com.arsdigita.london.theme.ThemeApplication' ;
+
+-- update navigation in acs_objects
+update acs_objects
+ set (object_type,default_domain_class) =
+ (replace(object_type,'london.navigation', 'navigation') ,
+ replace(default_domain_class,'london.navigation', 'navigation') )
+ where object_type like '%london.navigation%' ;
+
diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.6.2-6.6.3.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.6.2-6.6.3.sql
new file mode 100644
index 000000000..21c714615
--- /dev/null
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.6.2-6.6.3.sql
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2011 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: oracle-se--6.6.2-6.6.3.sql $
+
+-- Navigation is renamed from ccm-ldn-navigation to ccm-navigation
+
+
+
+@@ default/6.6.2-6.6.3/upd_system_tables.sql
+-- no need to update navigation specific application tables
+-- @@ ../postgres/upgrade/6.6.2-6.6.3/upd_navigation_tables.sql
diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.2-6.6.3.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.2-6.6.3.sql
new file mode 100644
index 000000000..08894a558
--- /dev/null
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.2-6.6.3.sql
@@ -0,0 +1,29 @@
+--
+-- Copyright (C) 2011 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: postgres-6.6.2-6.6.3.sql $
+
+-- Navigation is renamed from ccm-ldn-navigation to ccm-navigation
+
+
+begin;
+
+\i default/6.6.2-6.6.3/upd_system_tables.sql
+-- no need to update navigation specific application tables
+-- \i ../postgres/upgrade/6.6.2-6.6.3/upd_navigation_tables.sql
+
+commit;
diff --git a/ccm-navigation/src/ccm-navigation.upgrade b/ccm-navigation/src/ccm-navigation.upgrade
index 4ae3b1689..ae12e7b7d 100755
--- a/ccm-navigation/src/ccm-navigation.upgrade
+++ b/ccm-navigation/src/ccm-navigation.upgrade
@@ -19,4 +19,7 @@
+
+
+
diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.6.0-6.6.1.sql
index 91c103a1e..748062b8a 100755
--- a/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.6.0-6.6.1.sql
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.6.0-6.6.1.sql
@@ -16,6 +16,7 @@
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--
-- $DateTime: 2010/11/10 23:15:09 $
+-- $Id: postgres-6.6.0-6.6.1.sql pboy $
\echo Red Hat Enterprise ccm-portalworkspace 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL)
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
index 3fa1ae34b..db5f1799e 100644
--- a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
@@ -20,6 +20,7 @@
-- adjust various system tables to the new name of application
alter table init_requirements drop constraint init_requirements_init_f_cmmdn ;
+alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ;
update inits
set class_name='com.arsdigita.themedirector.Initializer'
@@ -33,6 +34,10 @@ ALTER TABLE init_requirements
ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
REFERENCES inits (class_name) MATCH SIMPLE
ON UPDATE NO ACTION ON DELETE NO ACTION;
+ALTER TABLE init_requirements
+ ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
+ REFERENCES inits (class_name) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION;
update application_types