Index: uspace/srv/fs/fat/fat_idx.c
===================================================================
--- uspace/srv/fs/fat/fat_idx.c	(revision 375ab5e571cc53eeb2aa803a8e86052b51d7ad00)
+++ uspace/srv/fs/fat/fat_idx.c	(revision ace588af2b019d0ee6e00a5a4491a2c9bf35ae96)
@@ -116,5 +116,5 @@
 #define UPH_BUCKETS	(1 << UPH_BUCKETS_LOG)
 
-#define UPH_DH_KEY	0
+#define UPH_SID_KEY	0
 #define UPH_PFC_KEY	1
 #define UPH_PDI_KEY	2
@@ -122,5 +122,5 @@
 static hash_index_t pos_hash(unsigned long key[])
 {
-	service_id_t service_id = (service_id_t)key[UPH_DH_KEY];
+	service_id_t service_id = (service_id_t)key[UPH_SID_KEY];
 	fat_cluster_t pfc = (fat_cluster_t)key[UPH_PFC_KEY];
 	unsigned pdi = (unsigned)key[UPH_PDI_KEY];
@@ -150,5 +150,5 @@
 static int pos_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-	service_id_t service_id = (service_id_t)key[UPH_DH_KEY];
+	service_id_t service_id = (service_id_t)key[UPH_SID_KEY];
 	fat_cluster_t pfc;
 	unsigned pdi;
@@ -190,10 +190,10 @@
 #define UIH_BUCKETS	(1 << UIH_BUCKETS_LOG)
 
-#define UIH_DH_KEY	0
+#define UIH_SID_KEY	0
 #define UIH_INDEX_KEY	1
 
 static hash_index_t idx_hash(unsigned long key[])
 {
-	service_id_t service_id = (service_id_t)key[UIH_DH_KEY];
+	service_id_t service_id = (service_id_t)key[UIH_SID_KEY];
 	fs_index_t index = (fs_index_t)key[UIH_INDEX_KEY];
 
@@ -209,5 +209,5 @@
 static int idx_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-	service_id_t service_id = (service_id_t)key[UIH_DH_KEY];
+	service_id_t service_id = (service_id_t)key[UIH_SID_KEY];
 	fs_index_t index;
 	fat_idx_t *fidx = list_get_instance(item, fat_idx_t, uih_link);
@@ -402,5 +402,5 @@
 		
 	unsigned long ikey[] = {
-		[UIH_DH_KEY] = service_id,
+		[UIH_SID_KEY] = service_id,
 		[UIH_INDEX_KEY] = fidx->index,
 	};
@@ -420,5 +420,5 @@
 	link_t *l;
 	unsigned long pkey[] = {
-		[UPH_DH_KEY] = service_id,
+		[UPH_SID_KEY] = service_id,
 		[UPH_PFC_KEY] = pfc,
 		[UPH_PDI_KEY] = pdi,
@@ -439,5 +439,5 @@
 		
 		unsigned long ikey[] = {
-			[UIH_DH_KEY] = service_id,
+			[UIH_SID_KEY] = service_id,
 			[UIH_INDEX_KEY] = fidx->index,
 		};
@@ -458,5 +458,5 @@
 {
 	unsigned long pkey[] = {
-		[UPH_DH_KEY] = idx->service_id,
+		[UPH_SID_KEY] = idx->service_id,
 		[UPH_PFC_KEY] = idx->pfc,
 		[UPH_PDI_KEY] = idx->pdi,
@@ -471,5 +471,5 @@
 {
 	unsigned long pkey[] = {
-		[UPH_DH_KEY] = idx->service_id,
+		[UPH_SID_KEY] = idx->service_id,
 		[UPH_PFC_KEY] = idx->pfc,
 		[UPH_PDI_KEY] = idx->pdi,
@@ -487,5 +487,5 @@
 	link_t *l;
 	unsigned long ikey[] = {
-		[UIH_DH_KEY] = service_id,
+		[UIH_SID_KEY] = service_id,
 		[UIH_INDEX_KEY] = index,
 	};
@@ -509,5 +509,5 @@
 {
 	unsigned long ikey[] = {
-		[UIH_DH_KEY] = idx->service_id,
+		[UIH_SID_KEY] = idx->service_id,
 		[UIH_INDEX_KEY] = idx->index,
 	};
@@ -571,8 +571,8 @@
 {
 	unsigned long ikey[] = {
-		[UIH_DH_KEY] = service_id
+		[UIH_SID_KEY] = service_id
 	};
 	unsigned long pkey[] = {
-		[UPH_DH_KEY] = service_id
+		[UPH_SID_KEY] = service_id
 	};