diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.6-6.6.7/rename_simpleorga_to_orga.sql b/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.6-6.6.7/rename_simpleorga_to_orga.sql
index 35076cc9e..07a7e5051 100644
--- a/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.6-6.6.7/rename_simpleorga_to_orga.sql
+++ b/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.6-6.6.7/rename_simpleorga_to_orga.sql
@@ -20,6 +20,7 @@
 
 -- Rename tables
 ALTER TABLE ct_simpleorganizations RENAME TO ct_organizations;
+ALTER TABLE ct_simpleorganization_bundles RENAME TO ct_organization_bundles;
 
 -- Update inits
 
@@ -56,6 +57,11 @@ UPDATE acs_objects
        default_domain_class = 'com.arsdigita.cms.contenttypes.Organization'
  WHERE default_domain_class = 'com.arsdigita.cms.contenttypes.SimpleOrganization';
 
+UPDATE acs_objects
+   SET object_type = 'com.arsdigita.cms.contenttypes.OrganizationBundle',
+       default_domain_class = 'com.arsdigita.cms.contenttypes.OrganizationBundle'
+ WHERE default_domain_class = 'com.arsdigita.cms.contenttypes.SimpleOrganizationBundle';
+
 --Adjust content type organization in contenttype directory table
 UPDATE content_types
    SET object_type = 'com.arsdigita.cms.contenttypes.Organization',