Index: classes/ezcontentobject.php
===================================================================
--- classes/ezcontentobject.php	(revision 20596)
+++ classes/ezcontentobject.php	(working copy)
@@ -2219,7 +2219,6 @@
             {
                 if ( $contentObjectAttribute->fetchInput( $http, $attributeDataBaseName ) )
                 {
-                    $dataMap[$contentObjectAttribute->attribute( 'contentclass_attribute_identifier' )] = $contentObjectAttribute;
                     $attributeInputMap[$contentObjectAttribute->attribute('id')] = true;
                 }
 
Index: content/attribute_edit.php
===================================================================
--- content/attribute_edit.php	(revision 20596)
+++ content/attribute_edit.php	(working copy)
@@ -302,7 +302,7 @@
 
     $db = eZDB::instance();
     $db->begin();
-    $object->setName( $class->contentObjectName( $object ), $version->attribute( 'version' ), $EditLanguage );
+    $object->setName( $class->contentObjectName( $object, $version->attribute( 'version' ), $EditLanguage ), $version->attribute( 'version' ), $EditLanguage );
     $db->commit();
 }
 elseif ( $storingAllowed )