diff --git a/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql b/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
index cb5288319..a6b92dc84 100644
--- a/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
+++ b/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
@@ -19,12 +19,12 @@
 ALTER TABLE init_requirements DROP CONSTRAINT init_requirements_init_f_cmmdn ;
 
 UPDATE inits
-   SET classname='com.arsdigita.cms.contenttypes.ldn.Organization'
- WHERE classname='com.arsdigita.cms.contenttypes.Organization'
+   SET classname='com.arsdigita.cms.contenttypes.ldn.OrganizationInitializer'
+ WHERE classname='com.arsdigita.cms.contenttypes.OrganizationInitializer'
 
 update init_requirements
-   set init='com.arsdigita.cms.contenttypes.ldn.SimpleAddressInitializer'
- where init='com.arsdigita.cms.contenttypes.AddressInitializer' ;
+   set init='com.arsdigita.cms.contenttypes.ldn.SimpleOrganiztionInitializer'
+ where init='com.arsdigita.cms.contenttypes.OrganizationInitializer' ;
 
 ALTER TABLE init_requirements
   ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 40ef34916..35a294482 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -9,7 +9,7 @@
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
                  version="2.3.0" 
-                 release="devel-SNAPSHOT-r2792" 
+                 release="devel-SNAPSHOT-r2815" 
                   webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="libreccm" 
@@ -133,10 +133,10 @@
         <ccm:application name="ccm-cms-types-job"/>
         <ccm:application name="ccm-cms-types-legalnotice"/>
         <ccm:application name="ccm-cms-types-minutes"/>
-        <ccm:application name="ccm-cms-types-organization"/>
+        <ccm:application name="ccm-ldn-types-organization"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-service"/>
-	<ccm:application name="ccm-cms-types-simpleorganization"/>
+	<ccm:application name="ccm-cms-types-organization"/>
         <ccm:application name="ccm-cms-types-siteproxy"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>