diff --git a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl
index 6b0d7e9f9..7c05acae1 100644
--- a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl
+++ b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl
@@ -29,7 +29,7 @@ object type GenericOrganization extends ContentPage {
        String[0..1] description = ct_genericorganizations.description VARCHAR(2000);
 
        OrganizationRole[0..n] organizationroles = join ct_genericorganizations.organization_id to ct_organizationroles.owner_id;
-       OrganizationalUnit[0..n] subunits = join ct_genericorganizations.organization_id to ct_orga2orgaunits.orga2orgaunit_id;
+       Orga2OrgaUnit[0..n] subunits = join ct_genericorganizations.organization_id to ct_orga2orgaunits.owner_id;
 
        reference key (ct_genericorganizations.organization_id);
 }
\ No newline at end of file
diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java
index 9a3cc96a1..e27f5bc53 100644
--- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java
+++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationInitializer.java
@@ -47,10 +47,10 @@ public class GenericOrganizationInitializer extends ContentTypeInitializer {
      *
      * @return path of the traversal-adapter XML file.
      */
-    /*@Override
+    @Override
     public String getTraversalXML() {
         return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/GenericOrganization.xml";
-    }*/
+    }
 
     /**
      *
diff --git a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl
index 951851173..45d5c565b 100644
--- a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl
+++ b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl
@@ -27,7 +27,7 @@ object type OrganizationalUnit extends ContentPage {
        String[0..1] organizationalunitName = ct_organizationalunits.organizationalunit_name VARCHAR(512);
        String[0..1] organizationalunitDescription = ct_organizationalunits.organizationalunit_description VARCHAR(2048);
 
-       OrganizationalUnit subunits = join ct_organizationalunits.organizationalunit_id to ct_orgaunit2orgaunits.owner_id; 
+       OrgaUnit2OrgaUnit[0..n] subunits = join ct_organizationalunits.organizationalunit_id to ct_orgaunit2orgaunits.owner_id; 
        Membership[0..n] memberships = join ct_organizationalunits.organizationalunit_id to ct_memberships.owner_id;                   
 
        reference key (ct_organizationalunits.organizationalunit_id);