Index: branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-remove.sm
===================================================================
--- branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-remove.sm	(revision 8418)
+++ branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-remove.sm	(revision 8480)
@@ -306,5 +306,5 @@
         sm_p->parent_ref.fs_id,
         sm_p->parent_ref.handle,
-        sm_p->getattr.attr.u.dir.dirent_handle[0],
+        sm_p->getattr.attr.u.dir.dirdata_handles[0],
         sm_p->u.remove.object_name,
         sm_p->hints);
@@ -373,6 +373,6 @@
 
     /* TODO: Need to find the correct dirent_handle */
-    gossip_debug(GOSSIP_CLIENT_DEBUG, "dirent_handle: %llu\n",
-        llu(attr->u.dir.dirent_handle[0]));
+    gossip_debug(GOSSIP_CLIENT_DEBUG, "dirdata_handle: %llu\n",
+        llu(attr->u.dir.dirdata_handles[0]));
  
     PINT_msgpair_init(&sm_p->msgarray_op);
@@ -385,5 +385,5 @@
         sm_p->object_ref.handle,
         sm_p->parent_ref.handle,
-        attr->u.dir.dirent_handle[0],
+        attr->u.dir.dirdata_handles[0],
         sm_p->parent_ref.fs_id,
         sm_p->hints);