Index: uspace/lib/device/include/hr.h
===================================================================
--- uspace/lib/device/include/hr.h	(revision d2da1be2df26d9abd2e8ef253d8ca5ce11175e9c)
+++ uspace/lib/device/include/hr.h	(revision e24c0644b4afaab34c774cd347337ef8bf224e8b)
@@ -68,15 +68,16 @@
 
 typedef enum hr_vol_status {
-	HR_VOL_INVALID,
-	HR_VOL_ONLINE,	/* OPTIMAL */
-	HR_VOL_FAULTY,
-	HR_VOL_DEGRADED, /* also used for partial, but usable mirror */
-	HR_VOL_REBUILD
+	HR_VOL_NONE = 0,	/* Unknown/None */
+	HR_VOL_ONLINE,		/* optimal */
+	HR_VOL_FAULTY,		/* unusable */
+	HR_VOL_DEGRADED,	/* not optimal */
+	HR_VOL_REBUILD		/* rebuild in progress */
 } hr_vol_status_t;
 
 typedef enum hr_ext_status {
-	HR_EXT_INVALID,
-	HR_EXT_ONLINE,	/* OK */
-	HR_EXT_MISSING,
+	HR_EXT_NONE = 0,	/* unknown/none status */
+	HR_EXT_INVALID,		/* working but not consistent */
+	HR_EXT_ONLINE,		/* ok */
+	HR_EXT_MISSING,		/* offline */
 	HR_EXT_FAILED,
 	HR_EXT_REBUILD,
Index: uspace/lib/device/src/hr.c
===================================================================
--- uspace/lib/device/src/hr.c	(revision d2da1be2df26d9abd2e8ef253d8ca5ce11175e9c)
+++ uspace/lib/device/src/hr.c	(revision e24c0644b4afaab34c774cd347337ef8bf224e8b)
@@ -321,6 +321,6 @@
 {
 	switch (status) {
-	case HR_VOL_INVALID:
-		return "INVALID";
+	case HR_VOL_NONE:
+		return "NONE/UNKNOWN";
 	case HR_VOL_ONLINE:
 		return "ONLINE";
@@ -332,5 +332,5 @@
 		return "REBUILD";
 	default:
-		return "UNKNOWN";
+		return "Invalid state value";
 	}
 }
@@ -339,4 +339,6 @@
 {
 	switch (status) {
+	case HR_EXT_NONE:
+		return "NONE/UNKNOWN";
 	case HR_EXT_INVALID:
 		return "INVALID";
@@ -352,5 +354,5 @@
 		return "HOTSPARE";
 	default:
-		return "UNKNOWN";
+		return "Invalid state value";
 	}
 }
@@ -366,5 +368,5 @@
 			return "RAID-4 Non-Rotating Parity N";
 		default:
-			return "RAID-4 INVALID";
+			return "Invalid RAID 4 layout";
 		}
 	case HR_LVL_5:
@@ -377,8 +379,8 @@
 			return "RAID-5 Rotating Parity N with Data Continuation";
 		default:
-			return "RAID-5 INVALID";
+			return "Invalid RAID 5 layout";
 		}
 	default:
-		return "INVALID";
+		return "Invalid RAID level";
 	}
 }
Index: uspace/srv/bd/hr/raid1.c
===================================================================
--- uspace/srv/bd/hr/raid1.c	(revision d2da1be2df26d9abd2e8ef253d8ca5ce11175e9c)
+++ uspace/srv/bd/hr/raid1.c	(revision e24c0644b4afaab34c774cd347337ef8bf224e8b)
@@ -111,5 +111,5 @@
 	hr_vol_status_t state = new_volume->status;
 	fibril_rwlock_read_unlock(&new_volume->states_lock);
-	if (state == HR_VOL_FAULTY || state == HR_VOL_INVALID)
+	if (state == HR_VOL_FAULTY || state == HR_VOL_NONE)
 		return EINVAL;
 
@@ -329,5 +329,5 @@
 	fibril_rwlock_read_unlock(&vol->states_lock);
 
-	if (vol_state == HR_VOL_FAULTY || vol_state == HR_VOL_INVALID)
+	if (vol_state == HR_VOL_FAULTY || vol_state == HR_VOL_NONE)
 		return EIO;
 
@@ -662,5 +662,5 @@
 
 	hr_update_hotspare_svc_id(vol, hs, 0);
-	hr_update_hotspare_status(vol, hs, HR_EXT_INVALID);
+	hr_update_hotspare_status(vol, hs, HR_EXT_MISSING);
 
 	vol->hotspare_no--;