diff --git a/ccm-cms-types-organization/.svnignore b/ccm-ldn-types-organization/.svnignore
similarity index 100%
rename from ccm-cms-types-organization/.svnignore
rename to ccm-ldn-types-organization/.svnignore
diff --git a/ccm-cms-types-organization/application.xml b/ccm-ldn-types-organization/application.xml
similarity index 100%
rename from ccm-cms-types-organization/application.xml
rename to ccm-ldn-types-organization/application.xml
diff --git a/ccm-cms-types-organization/pdl/com/arsdigita/content-types/ldn/Organization.pdl b/ccm-ldn-types-organization/pdl/com/arsdigita/content-types/ldn/Organization.pdl
similarity index 100%
rename from ccm-cms-types-organization/pdl/com/arsdigita/content-types/ldn/Organization.pdl
rename to ccm-ldn-types-organization/pdl/com/arsdigita/content-types/ldn/Organization.pdl
diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/oracle-se-create.sql b/ccm-ldn-types-organization/sql/ccm-cms-types-organization/oracle-se-create.sql
similarity index 100%
rename from ccm-cms-types-organization/sql/ccm-cms-types-organization/oracle-se-create.sql
rename to ccm-ldn-types-organization/sql/ccm-cms-types-organization/oracle-se-create.sql
diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/postgres-create.sql b/ccm-ldn-types-organization/sql/ccm-cms-types-organization/postgres-create.sql
similarity index 100%
rename from ccm-cms-types-organization/sql/ccm-cms-types-organization/postgres-create.sql
rename to ccm-ldn-types-organization/sql/ccm-cms-types-organization/postgres-create.sql
diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql b/ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
similarity index 100%
rename from ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
rename to ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.0-6.6.1.sql
similarity index 100%
rename from ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.0-6.6.1.sql
rename to ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.0-6.6.1.sql
diff --git a/ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.0-6.6.1.sql
similarity index 100%
rename from ccm-cms-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.0-6.6.1.sql
rename to ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.0-6.6.1.sql
diff --git a/ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml b/ccm-ldn-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml
similarity index 100%
rename from ccm-cms-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml
rename to ccm-ldn-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml
diff --git a/ccm-cms-types-organization/src/ccm-ldn-types-organization.config b/ccm-ldn-types-organization/src/ccm-ldn-types-organization.config
similarity index 100%
rename from ccm-cms-types-organization/src/ccm-ldn-types-organization.config
rename to ccm-ldn-types-organization/src/ccm-ldn-types-organization.config
diff --git a/ccm-cms-types-organization/src/ccm-ldn-types-organization.load b/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load
similarity index 100%
rename from ccm-cms-types-organization/src/ccm-ldn-types-organization.load
rename to ccm-ldn-types-organization/src/ccm-ldn-types-organization.load
diff --git a/ccm-cms-types-organization/src/ccm-ldn-types-organization.upgrade b/ccm-ldn-types-organization/src/ccm-ldn-types-organization.upgrade
similarity index 100%
rename from ccm-cms-types-organization/src/ccm-ldn-types-organization.upgrade
rename to ccm-ldn-types-organization/src/ccm-ldn-types-organization.upgrade
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources.properties b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources.properties
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources.properties
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources.properties
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources_de.properties b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources_de.properties
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources_de.properties
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationResources_de.properties
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageForm.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageForm.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageForm.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageForm.java
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageStep.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageStep.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageStep.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationImageStep.java
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertiesStep.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertiesStep.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertiesStep.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertiesStep.java
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertyForm.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertyForm.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertyForm.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/OrganizationPropertyForm.java
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/authoring/OrganizationCreate.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/authoring/OrganizationCreate.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/authoring/OrganizationCreate.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/ui/authoring/OrganizationCreate.java
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
similarity index 100%
rename from ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
rename to ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
diff --git a/ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl b/ccm-ldn-types-organization/web/themes/heirloom/contenttypes/Organization.xsl
similarity index 100%
rename from ccm-cms-types-organization/web/themes/heirloom/contenttypes/Organization.xsl
rename to ccm-ldn-types-organization/web/themes/heirloom/contenttypes/Organization.xsl