diff --git a/ccm-cms-types-organization/application.xml b/ccm-cms-types-organization/application.xml
index 1699a7255..e1301c3cf 100644
--- a/ccm-cms-types-organization/application.xml
+++ b/ccm-cms-types-organization/application.xml
@@ -20,6 +20,9 @@ webapp="ROOT">
         <ccm:contact uri="mailto:info@scientificcms.org" type="support"/>
     </ccm:contacts>
     <ccm:description>
-      Exposed GenericOrganizationalUnit
+      The Organization Content Type makes organization information available by
+      exposing GenericOrganizationalUnit.
+      It replaces the Organization Content Type of version 1.0.4 (now named
+      ccm-ldn-types-organization).
     </ccm:description>
 </ccm:application>
\ No newline at end of file
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
index 32c5a1807..50d018520 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
@@ -11,7 +11,6 @@ import java.util.List;
 /**
  *
  * @author Jens Pelzetter 
- * @version $Id$
  */
 public class Organization extends GenericOrganizationalUnit {
     
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationBundle.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationBundle.java
index fadb6258b..309490ff6 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationBundle.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationBundle.java
@@ -10,7 +10,6 @@ import java.math.BigDecimal;
 /**
  *
  * @author Jens Pelzetter 
- * @version $Id$
  */
 public class OrganizationBundle extends GenericOrganizationalUnitBundle {
 
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java
index 48c941ec3..2d76ee8f7 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java
@@ -3,7 +3,6 @@ package com.arsdigita.cms.contenttypes;
 /**
  *
  * @author Jens Pelzetter 
- * @version $Id$
  */
 public class OrganizationInitializer extends ContentTypeInitializer {
 
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java
index cd21e7560..ffee3bf8c 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationLoader.java
@@ -3,7 +3,6 @@ package com.arsdigita.cms.contenttypes;
 /**
  *
  * @author Jens Pelzetter 
- * @version $Id$
  */
 public class OrganizationLoader extends AbstractContentTypeLoader {
     
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationCreate.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationCreate.java
index 3b01a74c0..48e71487b 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationCreate.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationCreate.java
@@ -9,7 +9,6 @@ import com.arsdigita.cms.ui.authoring.CreationSelector;
 /**
  *
  * @author Jens Pelzetter 
- * @version $Id$
  */
 public class OrganizationCreate extends GenericOrganizationalUnitCreate {
     
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationExtraXmlGenerator.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationExtraXmlGenerator.java
index 859e0ac4a..9f7764d1a 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationExtraXmlGenerator.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationExtraXmlGenerator.java
@@ -14,7 +14,6 @@ import com.arsdigita.xml.Element;
 /**
  *
  * @author Jens Pelzetter <jens@jp-digital.de>
- * @version $Id$
  */
 public class OrganizationExtraXmlGenerator implements ExtraXMLGenerator {
 
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java
index 1bbe07026..da95e9cc1 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java
@@ -9,7 +9,6 @@ import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
 /**
  *
  * @author Jens Pelzetter 
- * @version $Id$
  */
 public class OrganizationPropertiesStep extends GenericOrganizationalUnitPropertiesStep {