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 cb1b056f6..cc92f4807 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
@@ -22,7 +22,7 @@ model com.arsdigita.cms.contenttypes;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentPage;
 
-object type Person extends ContentPage {
+object type GenericOrganization extends ContentPage {
        String[0..1] organizationname = ct_genericorganizations.organizationname VARCHAR(512);
 
        reference key (ct_genericorganizations.organization_id);
diff --git a/ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml b/ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml
index 8352d0635..763ed6ffa 100644
--- a/ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml
+++ b/ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml
@@ -6,19 +6,19 @@
 
   <ctd:content-type
       label="Genericorganization"
-      description="A generic, Genericorganization type"
-      objectType="com.arsdigita.cms.contenttypes.Genericorganization"
-      classname="com.arsdigita.cms.contenttypes.Genericorganization">
+      description="A generic, GenericOrganization type"
+      objectType="com.arsdigita.cms.contenttypes.GenericOrganization"
+      classname="com.arsdigita.cms.contenttypes.GenericOrganization">
     
     <ctd:authoring-kit 
 	createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
      
       <ctd:authoring-step 
 	  labelKey="genericorganization.authoring.basic_properties.title" 
-	  labelBundle="com.arsdigita.cms.contenttypes.GenericorganizationResources"
+	  labelBundle="com.arsdigita.cms.contenttypes.GenericOrganizationResources"
 	  descriptionKey="genericorganization.authoring.basic_properties.description" 
-	  descriptionBundle="com.arsdigita.cms.contenttypes.GenericorganizationResources"
-	  component="com.arsdigita.cms.contenttypes.ui.GenericorganizationPropertiesStep" 
+	  descriptionBundle="com.arsdigita.cms.contenttypes.GenericOrganizationResources"
+	  component="com.arsdigita.cms.contenttypes.ui.GenericOrganizationPropertiesStep" 
 	  ordering="1"/>
       
       <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>
diff --git a/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.config b/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.config
new file mode 100644
index 000000000..63fabae52
--- /dev/null
+++ b/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+  <config class="com.arsdigita.cms.contenttypes.GenericOrganizationConfig"
+	  storage="ccm-cms-types-event/genericorganization.properties"/>
+</registry>
\ No newline at end of file
diff --git a/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.load b/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.load
new file mode 100644
index 000000000..e1a12d9a7
--- /dev/null
+++ b/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.load
@@ -0,0 +1,16 @@
+<load>
+	<requires>
+		<table name="inits" />
+		<table name="acs_objects" />
+		<table name="cms_items" />
+		<initializer class="com.arsdigita.cms.Initializer" />
+	</requires>
+	<provides>
+		<table name="ct_genericorganizations" />
+		<initializer class="com.arsdigita.cms.contenttypes.GenericOrganizationInitializer"/>		
+	</provides>
+	<scripts>
+		<schema directory="ccm-cms-types-genericorganization" />
+		<data class="com.arsdigita.cms.contenttypes.GenericOrganizationLoader" />
+	</scripts>
+</load>
\ No newline at end of file
diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationLoader.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationLoader.java
index 966f9d273..00e807fe2 100644
--- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationLoader.java
+++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/GenericOrganizationLoader.java
@@ -31,7 +31,7 @@ public class GenericOrganizationLoader extends AbstractContentTypeLoader {
    
     public static final Logger s_log = Logger.getLogger(GenericOrganizationLoader.class);
     private static final String[] TYPES = {
-	"/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Person.xml"
+	"/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml"
     };
 
     public String[] getTypes() {
diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertiesStep.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertiesStep.java
index 9bdc01a17..dd27b52c5 100644
--- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertiesStep.java
+++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertiesStep.java
@@ -52,10 +52,10 @@ public class GenericOrganizationPropertiesStep extends SimpleEditStep {
 	    new WorkflowLockedComponentAccess(editSheet, itemModel),
 	    editSheet.getSaveCancelSection().getCancelButton());
 
-	setDisplayComponent(getPersonPropertySheet(itemModel));	
+	setDisplayComponent(getGenericOrganizationPropertySheet(itemModel));	
     }
 
-    public static Component getPersonPropertySheet(ItemSelectionModel itemModel) {
+    public static Component getGenericOrganizationPropertySheet(ItemSelectionModel itemModel) {
 	DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
 
 	sheet.add((String)GlobalizationUtil.globalize("cms.contenttypes.ui.organizationname").localize(), GenericOrganization.ORGANIZATIONNAME);
diff --git a/ccm-cms-types-genericorganization/web/static/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xsl b/ccm-cms-types-genericorganization/web/static/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xsl
index 1055e46b9..83361cf5d 100644
--- a/ccm-cms-types-genericorganization/web/static/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xsl
+++ b/ccm-cms-types-genericorganization/web/static/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xsl
@@ -8,16 +8,16 @@
   version="1.0">
   
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericOrganization']"
-    mode="cms:CT_graphics"
-    name="cms:CT_graphics_com_arsdigita_cms_contenttypes_GenericOrganization">
+		mode="cms:CT_graphics"
+		name="cms:CT_graphics_com_arsdigita_cms_contenttypes_GenericOrganization">
     <p>
       <xsl:value-of select="./name"></xsl:value-of>
     </p>
   </xsl:template>
 
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GenericOrganization']"
-    mode="cms:CT_text"
-    name="cms:CT_text_com_arsdigita_cms_contenttypes_GenericOrganization">
+		mode="cms:CT_text"
+		name="cms:CT_text_com_arsdigita_cms_contenttypes_GenericOrganization">
     <p>
       <xsl:value-of select="./name"></xsl:value-of>
     </p>