diff --git a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
index 8612cb7aed..79485306d3 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
@@ -160,10 +160,10 @@
             <column name="child_node_id" />
          </many-to-one>
          <property name="typeQName" column="type_qname" type="QName" length="255" not-null="true" unique-key="UIDX_CHILD_NAME" />
-         <property name="qname" column="qname" type="QName" length="255" not-null="true" />
       </natural-id>
       <property name="childNodeName" column="child_node_name" type="string" length="50" not-null="true" unique-key="UIDX_CHILD_NAME" />
       <property name="childNodeNameCrc" column="child_node_name_crc" type="long" not-null="true" unique-key="UIDX_CHILD_NAME" />
+      <property name="qname" column="qname" type="QName" length="255" not-null="true" />
       <property name="isPrimary" column="is_primary" />
       <property name="index" column="assoc_index" />
    </class>
diff --git a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
index c60b3a758b..6ecccd65d1 100644
--- a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
@@ -383,12 +383,12 @@ public class HibernateNodeDaoServiceImpl extends HibernateDaoSupport implements
          * if the association is recreated subsequently.
          */
         
-        String tempUuid = GUID.generate();
+        String uuid = childNode.getUuid();
         
         ChildAssoc assoc = new ChildAssocImpl();
         assoc.setTypeQName(assocTypeQName);
-        assoc.setChildNodeName(getShortName(tempUuid));
-        assoc.setChildNodeNameCrc(getCrc(tempUuid));
+        assoc.setChildNodeName(getShortName(uuid));
+        assoc.setChildNodeNameCrc(getCrc(uuid));
         assoc.setQname(qname);
         assoc.setIsPrimary(isPrimary);
         assoc.buildAssociation(parentNode, childNode);
@@ -424,7 +424,7 @@ public class HibernateNodeDaoServiceImpl extends HibernateDaoSupport implements
         String childNameNew = null;
         if (childName == null)
         {
-            childNameNew = childAssoc.getId().toString();
+            childNameNew = childAssoc.getChild().getUuid();
         }
         else
         {