diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java
index c7b0ade84..3ad647b79 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java
@@ -121,10 +121,7 @@ public class GenericOrganizationalUnitPropertiesStep extends SimpleEditStep {
                             AuthoringKitWizard parent) {
         addStep(new GenericOrganizationalUnitContactPropertiesStep(itemModel,
                                                                    parent),
-                "cms.contenttypes.ui.orgaunit.contact");
-        addStep(new GenericOrganizationalUnitChildrenPropertiesStep(itemModel,
-                                                                    parent),
-                "cms.contenttypes.ui.orgaunit.child");
+                "cms.contenttypes.ui.orgaunit.contact");        
         addStep(new GenericOrganizationalUnitPersonPropertiesStep(itemModel,
                                                                   parent),
                 "cms.contenttypes.ui.orgaunit.persons");
diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml
index a195ba094..be4a9cba6 100644
--- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml
+++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml
@@ -5,7 +5,7 @@
                    xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
 
   <ctd:content-type
-      label="CollectedVolume"
+      label="SciPublications/CollectedVolume"
       description="Base type for collectedVolumes"
       objectType="com.arsdigita.cms.contenttypes.CollectedVolume"
       classname="com.arsdigita.cms.contenttypes.CollectedVolume">
diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Proceedings.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Proceedings.xml
index 99f219d0f..6c909e837 100644
--- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Proceedings.xml
+++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Proceedings.xml
@@ -5,7 +5,7 @@
                    xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
 
   <ctd:content-type
-      label="Proceedings"
+      label="SciPublications/Proceedings"
       description="Base type for collectedVolumes"
       objectType="com.arsdigita.cms.contenttypes.Proceedings"
       classname="com.arsdigita.cms.contenttypes.Proceedings">
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherPropertyForm.java
index 300feb5fe..c328aaa3b 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherPropertyForm.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherPropertyForm.java
@@ -17,6 +17,7 @@ import com.arsdigita.cms.contenttypes.PublicationWithPublisher;
 import com.arsdigita.cms.contenttypes.Publisher;
 import com.arsdigita.cms.ui.ItemSearchWidget;
 import org.apache.log4j.Logger;
+import org.apache.lucene.analysis.LengthFilter;
 
 /**
  *
@@ -65,7 +66,7 @@ public class PublicationWithPublisherPropertyForm
                 "publications.ui.with_publisher.isbn").localize()));
         ParameterModel isbnParam = new StringParameter(
                 PublicationWithPublisher.ISBN);
-        TextField isbn = new TextField(isbnParam);
+        TextField isbn = new TextField(isbnParam);        
         add(isbn);
 
         add(new Label((String) PublicationGlobalizationUtil.globalize(
diff --git a/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciDepartment.pdl b/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciDepartment.pdl
index 12115e288..649fde97a 100644
--- a/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciDepartment.pdl
+++ b/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciDepartment.pdl
@@ -25,7 +25,7 @@ association {
 association {
 	    SciDepartment[0..1] department = join ct_scidepartments.department_id
 	    		  	               to ct_scidepartments_projects_map.department_id,
-				             join ct_scidepartments_projects_map.project_id,
+				             join ct_scidepartments_projects_map.project_id
 				       	       to ct_sciprojects.project_id;
 
 	    SciProject[0..n] projects = join ct_sciprojects.project_id
diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml
index dec512a5c..ebca06dad 100644
--- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml
+++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml
@@ -6,10 +6,9 @@
 
   <ctd:content-type
       label="SciDepartment"
-      description="Base type for publications"
+      description="Base type for departments of scientific organizations"
       objectType="com.arsdigita.cms.contenttypes.SciDepartment"
-      classname="com.arsdigita.cms.contenttypes.SciDepartment"
-      isInternal="yes">
+      classname="com.arsdigita.cms.contenttypes.SciDepartment">
 
     <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
       
diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.pdl b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml
similarity index 94%
rename from ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.pdl
rename to ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml
index 8a3fbcd53..bd9fafd66 100644
--- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.pdl
+++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml
@@ -6,10 +6,9 @@
 
   <ctd:content-type
       label="SciOrganization"
-      description="Base type for publications"
+      description="Base type for scientific orgnizations"
       objectType="com.arsdigita.cms.contenttypes.SciOrganization"
-      classname="com.arsdigita.cms.contenttypes.SciOrganization"
-      isInternal="yes">
+      classname="com.arsdigita.cms.contenttypes.SciOrganization">
 
     <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
       
diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
index 30b087337..ea22dc4c3 100644
--- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
+++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
@@ -6,10 +6,9 @@
 
   <ctd:content-type
       label="SciProject"
-      description="Base type for publications"
+      description="Projects of scientific organizations."
       objectType="com.arsdigita.cms.contenttypes.SciProject"
-      classname="com.arsdigita.cms.contenttypes.SciProject"
-      isInternal="yes">
+      classname="com.arsdigita.cms.contenttypes.SciProject">
 
     <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
       
diff --git a/ccm-sci-types-organization/src/ccm-sci-types-organization.load b/ccm-sci-types-organization/src/ccm-sci-types-organization.load
index 2e343b6de..1d1819ca5 100644
--- a/ccm-sci-types-organization/src/ccm-sci-types-organization.load
+++ b/ccm-sci-types-organization/src/ccm-sci-types-organization.load
@@ -6,15 +6,15 @@
     <initializer class="com.arsdigita.cms.Initializer"/>
   </requires>
   <provides>
-    <table name="ct_sciorganizatations"/>
+    <table name="ct_sciorganizations"/>
     <table name="ct_scidepartments"/>
     <table name="ct_sciprojects"/>    
-    <initializer name="com.arsdigita.cms.contenttypes.SciOrganizationInitializer"/>
-    <initializer name="com.arsdigita.cms.contenttypes.SciDepartmentInitializer"/>
-    <initializer name="com.arsdigita.cms.contenttypes.SciProjectInitializer"/>
+    <initializer class="com.arsdigita.cms.contenttypes.SciOrganizationInitializer"/>
+    <initializer class="com.arsdigita.cms.contenttypes.SciDepartmentInitializer"/>
+    <initializer class="com.arsdigita.cms.contenttypes.SciProjectInitializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-sci-types.organization"/>
+    <schema directory="ccm-sci-types-organization"/>
     <data class="com.arsdigita.cms.contenttypes.SciOrganizationLoader"/>
     <data class="com.arsdigita.cms.contenttypes.SciDepartmentLoader"/>
     <data class="com.arsdigita.cms.contenttypes.SciProjectLoader"/>
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationInitializer.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationInitializer.java
index f286354fa..a3ee525f0 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationInitializer.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationInitializer.java
@@ -12,7 +12,7 @@ public class SciOrganizationInitializer extends ContentTypeInitializer {
             SciOrganizationInitializer.class);
 
     public SciOrganizationInitializer() {
-        super("ccm-sci-types-organization.odl.mf",
+        super("ccm-sci-types-organization.pdl.mf",
               SciOrganization.BASE_DATA_OBJECT_TYPE);
     }
 
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationLoader.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationLoader.java
index 7660fad12..50a82498c 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationLoader.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganizationLoader.java
@@ -6,12 +6,11 @@ package com.arsdigita.cms.contenttypes;
  */
 public class SciOrganizationLoader extends AbstractContentTypeLoader {
 
-      private static final String[] TYPES = {
+    private static final String[] TYPES = {
         "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml"
     };
 
     public String[] getTypes() {
         return TYPES;
     }
-
 }
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciProjectSubProjectsCollection.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciProjectSubProjectsCollection.java
index 2dc6ef6ed..7711574e0 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciProjectSubProjectsCollection.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciProjectSubProjectsCollection.java
@@ -52,7 +52,7 @@ public class SciProjectSubProjectsCollection extends DomainCollection {
         link.set(ORDER, order);
     }
 
-    public void swapWithNext(SciSubProject subproject) {
+    public void swapWithNext(SciProject subproject) {
         int currentPosition = 0;
         int currentIndex = 0;
         int nextIndex = 0;
@@ -99,7 +99,7 @@ public class SciProjectSubProjectsCollection extends DomainCollection {
         this.rewind();
     }
 
-    public void swapWithPrevious(SciSubProject subproject) {
+    public void swapWithPrevious(SciProject subproject) {
         int previousPosition = 0;
         int previousIndex = 0;
         int currentPosition = 0;
@@ -148,7 +148,7 @@ public class SciProjectSubProjectsCollection extends DomainCollection {
         this.rewind();
     }
 
-    public SciSubProject getSubProject() {
+    public SciProject getSubProject() {
         return new SciProject(m_dataCollection.getDataObject());
     }
 }