Index: uspace/app/hrctl/hrctl.c
===================================================================
--- uspace/app/hrctl/hrctl.c	(revision eabc094caca8261cbc9e882a5f640e39d81be02d)
+++ uspace/app/hrctl/hrctl.c	(revision 0fce1a6cea5ef49159e8731241be6a24121d8cc6)
@@ -638,5 +638,5 @@
 	    hr_get_metadata_type_str(info->meta_type));
 	printf("|           level: %s\n", hr_get_level_str(info->level));
-	if (info->layout != HR_RLQ_NONE)
+	if (info->layout != HR_LAYOUT_NONE)
 		printf("|          layout: %s\n",
 		    hr_get_layout_str(info->layout));
Index: uspace/lib/device/include/hr.h
===================================================================
--- uspace/lib/device/include/hr.h	(revision eabc094caca8261cbc9e882a5f640e39d81be02d)
+++ uspace/lib/device/include/hr.h	(revision 0fce1a6cea5ef49159e8731241be6a24121d8cc6)
@@ -56,10 +56,10 @@
 
 typedef enum hr_layout {
-	HR_RLQ_NONE = 0,
-	HR_RLQ_RAID4_0,	/* RAID-4 Non-Rotating Parity 0 */
-	HR_RLQ_RAID4_N,	/* RAID-4 Non-Rotating Parity N */
-	HR_RLQ_RAID5_0R, /* RAID-5 Rotating Parity 0 with Data Restart */
-	HR_RLQ_RAID5_NR, /* RAID-5 Rotating Parity N with Data Restart */
-	HR_RLQ_RAID5_NC  /* RAID-5 Rotating Parity N with Data Continuation */
+	HR_LAYOUT_NONE = 0,
+	HR_LAYOUT_RAID4_0, /* RAID-4 Non-Rotating Parity 0 */
+	HR_LAYOUT_RAID4_N, /* RAID-4 Non-Rotating Parity N */
+	HR_LAYOUT_RAID5_0R, /* RAID-5 Rotating Parity 0 with Data Restart */
+	HR_LAYOUT_RAID5_NR, /* RAID-5 Rotating Parity N with Data Restart */
+	HR_LAYOUT_RAID5_NC /* RAID-5 Rotating Parity N with Data Continuation */
 } hr_layout_t;
 
Index: uspace/lib/device/src/hr.c
===================================================================
--- uspace/lib/device/src/hr.c	(revision eabc094caca8261cbc9e882a5f640e39d81be02d)
+++ uspace/lib/device/src/hr.c	(revision 0fce1a6cea5ef49159e8731241be6a24121d8cc6)
@@ -496,15 +496,15 @@
 {
 	switch (layout) {
-	case HR_RLQ_NONE:
+	case HR_LAYOUT_NONE:
 		return "RAID layout not set";
-	case HR_RLQ_RAID4_0:
+	case HR_LAYOUT_RAID4_0:
 		return "RAID-4 Non-Rotating Parity 0";
-	case HR_RLQ_RAID4_N:
+	case HR_LAYOUT_RAID4_N:
 		return "RAID-4 Non-Rotating Parity N";
-	case HR_RLQ_RAID5_0R:
+	case HR_LAYOUT_RAID5_0R:
 		return "RAID-5 Rotating Parity 0 with Data Restart";
-	case HR_RLQ_RAID5_NR:
+	case HR_LAYOUT_RAID5_NR:
 		return "RAID-5 Rotating Parity N with Data Restart";
-	case HR_RLQ_RAID5_NC:
+	case HR_LAYOUT_RAID5_NC:
 		return "RAID-5 Rotating Parity N with Data Continuation";
 	default:
Index: uspace/srv/bd/hr/metadata/foreign/geom/hr_g_mirror.c
===================================================================
--- uspace/srv/bd/hr/metadata/foreign/geom/hr_g_mirror.c	(revision eabc094caca8261cbc9e882a5f640e39d81be02d)
+++ uspace/srv/bd/hr/metadata/foreign/geom/hr_g_mirror.c	(revision 0fce1a6cea5ef49159e8731241be6a24121d8cc6)
@@ -142,5 +142,5 @@
 	vol->extent_no = main_meta->md_all;
 
-	vol->layout = HR_RLQ_NONE;
+	vol->layout = HR_LAYOUT_NONE;
 
 	vol->strip_size = 0;
Index: uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c
===================================================================
--- uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c	(revision eabc094caca8261cbc9e882a5f640e39d81be02d)
+++ uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c	(revision 0fce1a6cea5ef49159e8731241be6a24121d8cc6)
@@ -153,5 +153,5 @@
 	vol->strip_size = main_meta->md_stripesize;
 
-	vol->layout = HR_RLQ_NONE;
+	vol->layout = HR_LAYOUT_NONE;
 
 	memcpy(vol->in_mem_md, main_meta, sizeof(struct g_stripe_metadata));
Index: uspace/srv/bd/hr/metadata/foreign/softraid/hr_softraid.c
===================================================================
--- uspace/srv/bd/hr/metadata/foreign/softraid/hr_softraid.c	(revision eabc094caca8261cbc9e882a5f640e39d81be02d)
+++ uspace/srv/bd/hr/metadata/foreign/softraid/hr_softraid.c	(revision 0fce1a6cea5ef49159e8731241be6a24121d8cc6)
@@ -146,7 +146,7 @@
 
 	if (main_meta->ssdi.ssd_level == 5)
-		vol->layout = HR_RLQ_RAID5_NR;
+		vol->layout = HR_LAYOUT_RAID5_NR;
 	else
-		vol->layout = HR_RLQ_NONE;
+		vol->layout = HR_LAYOUT_NONE;
 
 	vol->strip_size = main_meta->ssdi.ssd_strip_size;
Index: uspace/srv/bd/hr/raid5.c
===================================================================
--- uspace/srv/bd/hr/raid5.c	(revision eabc094caca8261cbc9e882a5f640e39d81be02d)
+++ uspace/srv/bd/hr/raid5.c	(revision 0fce1a6cea5ef49159e8731241be6a24121d8cc6)
@@ -142,5 +142,5 @@
 	vol->strip_size = HR_STRIP_SIZE;
 
-	vol->layout = HR_RLQ_RAID5_NR;
+	vol->layout = HR_LAYOUT_RAID5_NR;
 
 	return EOK;
@@ -559,12 +559,12 @@
 	/* parity extent */
 	uint64_t p_extent;
-	if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_0) {
+	if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_0) {
 		p_extent = 0;
-	} else if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_N) {
+	} else if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_N) {
 		p_extent = vol->extent_no - 1;
-	} else if (level == HR_LVL_5 && layout == HR_RLQ_RAID5_0R) {
+	} else if (level == HR_LVL_5 && layout == HR_LAYOUT_RAID5_0R) {
 		p_extent = (stripe / (vol->extent_no - 1)) % vol->extent_no;
 	} else if (level == HR_LVL_5 &&
-	    (layout == HR_RLQ_RAID5_NR || layout == HR_RLQ_RAID5_NC)) {
+	    (layout == HR_LAYOUT_RAID5_NR || layout == HR_LAYOUT_RAID5_NC)) {
 		p_extent = (vol->extent_no - 1) -
 		    (stripe / (vol->extent_no - 1)) % vol->extent_no;
@@ -574,15 +574,15 @@
 
 	uint64_t extent;
-	if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_0) {
+	if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_0) {
 		extent = (stripe % (vol->extent_no - 1)) + 1;
-	} else if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_N) {
+	} else if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_N) {
 		extent = stripe % (vol->extent_no - 1);
 	} else if (level == HR_LVL_5 &&
-	    (layout == HR_RLQ_RAID5_0R || layout == HR_RLQ_RAID5_NR)) {
+	    (layout == HR_LAYOUT_RAID5_0R || layout == HR_LAYOUT_RAID5_NR)) {
 		if ((stripe % (vol->extent_no - 1)) < p_extent)
 			extent = stripe % (vol->extent_no - 1);
 		else
 			extent = (stripe % (vol->extent_no - 1)) + 1;
-	} else if (level == HR_LVL_5 && layout == HR_RLQ_RAID5_NC) {
+	} else if (level == HR_LVL_5 && layout == HR_LAYOUT_RAID5_NC) {
 		extent =
 		    ((stripe % (vol->extent_no - 1)) + p_extent + 1) %
@@ -675,24 +675,24 @@
 		ext_stripe = stripe / (vol->extent_no - 1); /* stripe level */
 
-		if (level == HR_LVL_5 && layout == HR_RLQ_RAID5_0R) {
+		if (level == HR_LVL_5 && layout == HR_LAYOUT_RAID5_0R) {
 			p_extent =
 			    (stripe / (vol->extent_no - 1)) % vol->extent_no;
 		} else if (level == HR_LVL_5 &&
-		    (layout == HR_RLQ_RAID5_NR || layout == HR_RLQ_RAID5_NC)) {
+		    (layout == HR_LAYOUT_RAID5_NR || layout == HR_LAYOUT_RAID5_NC)) {
 			p_extent = (vol->extent_no - 1) -
 			    (stripe / (vol->extent_no - 1)) % vol->extent_no;
 		}
 
-		if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_0) {
+		if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_0) {
 			extent = (stripe % (vol->extent_no - 1)) + 1;
-		} else if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_N) {
+		} else if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_N) {
 			extent = stripe % (vol->extent_no - 1);
 		} else if (level == HR_LVL_5 &&
-		    (layout == HR_RLQ_RAID5_0R || layout == HR_RLQ_RAID5_NR)) {
+		    (layout == HR_LAYOUT_RAID5_0R || layout == HR_LAYOUT_RAID5_NR)) {
 			if ((stripe % (vol->extent_no - 1)) < p_extent)
 				extent = stripe % (vol->extent_no - 1);
 			else
 				extent = (stripe % (vol->extent_no - 1)) + 1;
-		} else if (level == HR_LVL_5 && layout == HR_RLQ_RAID5_NC) {
+		} else if (level == HR_LVL_5 && layout == HR_LAYOUT_RAID5_NC) {
 			extent =
 			    ((stripe % (vol->extent_no - 1)) + p_extent + 1) %