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 763ed6ffa..4c67586ac 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
@@ -5,7 +5,7 @@
 		   xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
 
   <ctd:content-type
-      label="Genericorganization"
+      label="GenericOrganization"
       description="A generic, GenericOrganization type"
       objectType="com.arsdigita.cms.contenttypes.GenericOrganization"
       classname="com.arsdigita.cms.contenttypes.GenericOrganization">
diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertyForm.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertyForm.java
index 96798361f..770d69441 100644
--- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertyForm.java
+++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertyForm.java
@@ -43,6 +43,7 @@ import com.arsdigita.cms.contenttypes.GenericOrganization;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
 import com.arsdigita.domain.DomainCollection;
 import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
 import com.arsdigita.cms.util.GlobalizationUtil;
 
 
@@ -75,9 +76,9 @@ public class GenericOrganizationPropertyForm extends BasicPageForm implements Fo
 	super.addWidgets();
 
 	add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.genericorganization.organizationname")));
-	ParameterModel nameParam = new StringParameter(ORGANIZATIONNAME);
-	TextField name = new TextField(nameParam);
-	add(name);	   		      
+	ParameterModel organizationNameParam = new StringParameter(ORGANIZATIONNAME);
+	TextField organizationName = new TextField(organizationNameParam);
+	add(organizationName);	   		      
     }
 
     public void init(FormSectionEvent fse) {
@@ -88,8 +89,11 @@ public class GenericOrganizationPropertyForm extends BasicPageForm implements Fo
     }
 
     public void submitted(FormSectionEvent fse) {
+	s_log.log (Level.DEBUG, "GenericOrganization submitted");
+
 	if (m_step != null 
 	    && getSaveCancelSection().getCancelButton().isSelected(fse.getPageState())) {
+	    s_log.log (Level.DEBUG, "GenericOrganization submit canceled");
 	    m_step.cancelStreamlinedCreation(fse.getPageState());
 	}
     }
@@ -101,7 +105,8 @@ public class GenericOrganizationPropertyForm extends BasicPageForm implements Fo
 
 	if (orga != null
 	    && getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) {
-	    orga.setName((String)data.get(ORGANIZATIONNAME));
+
+	    orga.setOrganizationName((String)data.get(ORGANIZATIONNAME));
 
 	    orga.save();
 	}
diff --git a/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/ui/PersonPropertiesStep.java b/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/ui/PersonPropertiesStep.java
index 9c0bd9dd2..2ce123ff0 100644
--- a/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/ui/PersonPropertiesStep.java
+++ b/ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/ui/PersonPropertiesStep.java
@@ -57,10 +57,10 @@ public class PersonPropertiesStep extends SimpleEditStep {
     public static Component getPersonPropertySheet(ItemSelectionModel itemModel) {
 	DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
 
-	sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), Person.SURNAME);
-	sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), Person.GIVENNAME);
-	sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), Person.TITLEPRE);
-	sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), Person.TITLEPOST);
+	sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.person.surname").localize(), Person.SURNAME);
+	sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.person.givenname").localize(), Person.GIVENNAME);
+	sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.person.titlepre").localize(), Person.TITLEPRE);
+	sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.person.titlepost").localize(), Person.TITLEPOST);
 	
 	if(!ContentSection.getConfig().getHideLaunchDate()) {
 	    sheet.add((String)PersonGlobalizationUtil.globalize("cms.ui.authoring.page_launch_date").localize(),