--- a/branches/smbnetfs-0.3/src/event_thread.c
+++ b/branches/smbnetfs-0.3/src/event_thread.c
@@ -206,7 +206,7 @@
 	    convert_buffer_size - strlen(group) - 2)) continue;
 	if (! smb2local(buf2 + 3, dirent->name,
 	    convert_buffer_size - 3)) continue;
-	mklink(buf1, buf2, AUTOPATH);
+	mklink(buf1, buf2, SAMBA_TREE);
     }
     libsmb_closedir(fh->smb->ctx, fh->fd);
     fh->fd = NULL;
@@ -244,7 +244,7 @@
 	if (strcmp(dirent->name, "..") == 0) continue;
 	if (dirent->smbc_type != SMBC_WORKGROUP) continue;
 	if (! smb2local(buf, dirent->name, convert_buffer_size)) continue;
-	mkgroup(buf, AUTOPATH);
+	mkgroup(buf, SAMBA_TREE);
     }
     libsmb_closedir(fh->smb->ctx, fh->fd);
     fh->fd = NULL;
@@ -254,7 +254,7 @@
     release_file_handle(fh);
     
   update_group:
-    getdir(&splice, "", AUTOPATH);
+    getdir(&splice, "", SAMBA_TREE);
     init_forward_splice_iterator(&splice, &it);
     while(is_valid_splice_iterator(&splice, &it)){
 	smbitem *item = *((smbitem**)splice_itdata_ptr(&splice, &it));
@@ -276,7 +276,7 @@
     pthread_mutex_unlock(&m_evthread);
 
     ReadSambaTree();
-    DeleteOldSmbItem(die_time, AUTOPATH);
+    DeleteOldSmbItem(die_time, SAMBA_TREE);
 }
 
 int ReadConfig(void){
@@ -290,7 +290,7 @@
     pthread_mutex_unlock(&m_evthread);
 
     result = (chdir(config_dir) == 0) ? ReadConfigFile(config_file) : 0;
-    DeleteOldSmbItem(threshold, USERPATH);
+    DeleteOldSmbItem(threshold, USER_TREE);
     DeleteOldSmbAuthData(threshold);
     return result;
 }