Index: uspace/lib/device/include/hr.h
===================================================================
--- uspace/lib/device/include/hr.h	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
+++ uspace/lib/device/include/hr.h	(revision 263a2389bec7ca7beeb3ae5120941863de218291)
@@ -66,5 +66,5 @@
 typedef enum hr_vol_state {
 	HR_VOL_NONE = 0, /* Unknown/None */
-	HR_VOL_ONLINE, /* optimal */
+	HR_VOL_OPTIMAL, /* optimal */
 	HR_VOL_FAULTY, /* unusable */
 	HR_VOL_DEGRADED, /* not optimal */
Index: uspace/lib/device/src/hr.c
===================================================================
--- uspace/lib/device/src/hr.c	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
+++ uspace/lib/device/src/hr.c	(revision 263a2389bec7ca7beeb3ae5120941863de218291)
@@ -446,6 +446,6 @@
 	case HR_VOL_NONE:
 		return "NONE/UNKNOWN";
-	case HR_VOL_ONLINE:
-		return "ONLINE";
+	case HR_VOL_OPTIMAL:
+		return "OPTIMAL";
 	case HR_VOL_FAULTY:
 		return "FAULTY";
Index: uspace/srv/bd/hr/raid0.c
===================================================================
--- uspace/srv/bd/hr/raid0.c	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
+++ uspace/srv/bd/hr/raid0.c	(revision 263a2389bec7ca7beeb3ae5120941863de218291)
@@ -92,5 +92,5 @@
 
 	hr_raid0_vol_state_eval(new_volume);
-	if (new_volume->state != HR_VOL_ONLINE) {
+	if (new_volume->state != HR_VOL_OPTIMAL) {
 		HR_NOTE("\"%s\": unusable state, not creating\n",
 		    new_volume->devname);
@@ -155,7 +155,7 @@
 	fibril_rwlock_read_unlock(&vol->states_lock);
 
-	if (old_state != HR_VOL_ONLINE) {
+	if (old_state != HR_VOL_OPTIMAL) {
 		fibril_rwlock_write_lock(&vol->states_lock);
-		hr_update_vol_state(vol, HR_VOL_ONLINE);
+		hr_update_vol_state(vol, HR_VOL_OPTIMAL);
 		fibril_rwlock_write_unlock(&vol->states_lock);
 	}
@@ -257,5 +257,5 @@
 
 	fibril_rwlock_read_lock(&vol->states_lock);
-	if (vol->state != HR_VOL_ONLINE) {
+	if (vol->state != HR_VOL_OPTIMAL) {
 		fibril_rwlock_read_unlock(&vol->states_lock);
 		return EIO;
Index: uspace/srv/bd/hr/raid1.c
===================================================================
--- uspace/srv/bd/hr/raid1.c	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
+++ uspace/srv/bd/hr/raid1.c	(revision 263a2389bec7ca7beeb3ae5120941863de218291)
@@ -228,7 +228,7 @@
 		}
 	} else {
-		if (old_state != HR_VOL_ONLINE) {
+		if (old_state != HR_VOL_OPTIMAL) {
 			fibril_rwlock_write_lock(&vol->states_lock);
-			hr_update_vol_state(vol, HR_VOL_ONLINE);
+			hr_update_vol_state(vol, HR_VOL_OPTIMAL);
 			fibril_rwlock_write_unlock(&vol->states_lock);
 		}
@@ -526,5 +526,5 @@
 	 * state accordingly.
 	 */
-	hr_update_vol_state(vol, HR_VOL_ONLINE);
+	hr_update_vol_state(vol, HR_VOL_OPTIMAL);
 	hr_mark_vol_state_dirty(vol);
 
Index: uspace/srv/bd/hr/raid5.c
===================================================================
--- uspace/srv/bd/hr/raid5.c	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
+++ uspace/srv/bd/hr/raid5.c	(revision 263a2389bec7ca7beeb3ae5120941863de218291)
@@ -625,6 +625,6 @@
 	switch (bad) {
 	case 0:
-		if (state != HR_VOL_ONLINE)
-			hr_update_vol_state(vol, HR_VOL_ONLINE);
+		if (state != HR_VOL_OPTIMAL)
+			hr_update_vol_state(vol, HR_VOL_OPTIMAL);
 		break;
 	case 1: