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 a27b781647..8612cb7aed 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
@@ -137,29 +137,31 @@
       <id name="id" column="id" type="long" >
          <generator class="native" />
       </id>
-      <!-- forward assoc to parent node -->
-      <many-to-one 
-            name="parent"
-            class="org.alfresco.repo.domain.hibernate.NodeImpl"
-            lazy="proxy"
-            fetch="select"
-            optimistic-lock="true"
-            not-null="true"
-            unique-key="UIDX_CHILD_NAME" >
-         <column name="parent_node_id" />
-      </many-to-one>
-      <!-- forward assoc to child node -->
-      <many-to-one
-            name="child" 
-            lazy="proxy"
-            fetch="select"
-            class="org.alfresco.repo.domain.hibernate.NodeImpl"
-            optimistic-lock="true"
-            not-null="true" >
-         <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 mutable="true">
+         <!-- forward assoc to parent node -->
+         <many-to-one 
+               name="parent"
+               class="org.alfresco.repo.domain.hibernate.NodeImpl"
+               lazy="proxy"
+               fetch="select"
+               optimistic-lock="true"
+               not-null="true"
+               unique-key="UIDX_CHILD_NAME" >
+            <column name="parent_node_id" />
+         </many-to-one>
+         <!-- forward assoc to child node -->
+         <many-to-one
+               name="child" 
+               lazy="proxy"
+               fetch="select"
+               class="org.alfresco.repo.domain.hibernate.NodeImpl"
+               optimistic-lock="true"
+               not-null="true" >
+            <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="isPrimary" column="is_primary" />
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 6ecccd65d1..c60b3a758b 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 uuid = childNode.getUuid();
+        String tempUuid = GUID.generate();
         
         ChildAssoc assoc = new ChildAssocImpl();
         assoc.setTypeQName(assocTypeQName);
-        assoc.setChildNodeName(getShortName(uuid));
-        assoc.setChildNodeNameCrc(getCrc(uuid));
+        assoc.setChildNodeName(getShortName(tempUuid));
+        assoc.setChildNodeNameCrc(getCrc(tempUuid));
         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.getChild().getUuid();
+            childNameNew = childAssoc.getId().toString();
         }
         else
         {