@@ -72,19 +72,19 @@
 
 	return 0;
 }
 
 int
-of_condition_wait(of_condition_t *condition, of_mutex_t *mutex)
+of_condition_wait(of_condition_t *condition, OFPlainMutex *mutex)
 {
 	ULONG signalMask = 0;
 
 	return of_condition_wait_or_signal(condition, mutex, &signalMask);
 }
 
 int
-of_condition_wait_or_signal(of_condition_t *condition, of_mutex_t *mutex,
+of_condition_wait_or_signal(of_condition_t *condition, OFPlainMutex *mutex,
     ULONG *signalMask)
 {
 	struct of_condition_waiting_task waitingTask = {
 		.task = FindTask(NULL),
 		.sigBit = AllocSignal(-1)
@@ -95,21 +95,21 @@
 	if (waitingTask.sigBit == -1)
 		return EAGAIN;
 
 	Forbid();
 
-	if ((error = of_mutex_unlock(mutex)) != 0) {
+	if ((error = OFPlainMutexUnlock(mutex)) != 0) {
 		FreeSignal(waitingTask.sigBit);
 		return error;
 	}
 
 	waitingTask.next = condition->waitingTasks;
 	condition->waitingTasks = &waitingTask;
 
 	mask = Wait((1ul << waitingTask.sigBit) | *signalMask);
 	if (mask & (1ul << waitingTask.sigBit) || (*signalMask &= mask))
-		error = of_mutex_lock(mutex);
+		error = OFPlainMutexLock(mutex);
 	else
 		/*
 		 * This should not happen - it means something interrupted the
 		 * Wait(), so the best we can do is return EINTR.
 		 */
@@ -121,22 +121,22 @@
 
 	return error;
 }
 
 int
-of_condition_timed_wait(of_condition_t *condition, of_mutex_t *mutex,
+of_condition_timed_wait(of_condition_t *condition, OFPlainMutex *mutex,
     OFTimeInterval timeout)
 {
 	ULONG signalMask = 0;
 
 	return of_condition_timed_wait_or_signal(condition, mutex, timeout,
 	    &signalMask);
 }
 
 int
-of_condition_timed_wait_or_signal(of_condition_t *condition, of_mutex_t *mutex,
-    OFTimeInterval timeout, ULONG *signalMask)
+of_condition_timed_wait_or_signal(of_condition_t *condition,
+    OFPlainMutex *mutex, OFTimeInterval timeout, ULONG *signalMask)
 {
 	struct of_condition_waiting_task waitingTask = {
 		.task = FindTask(NULL),
 		.sigBit = AllocSignal(-1)
 	};
@@ -192,11 +192,11 @@
 		goto fail;
 	}
 
 	Forbid();
 
-	if ((error = of_mutex_unlock(mutex)) != 0) {
+	if ((error = OFPlainMutexUnlock(mutex)) != 0) {
 		Permit();
 		goto fail;
 	}
 
 	waitingTask.next = condition->waitingTasks;
@@ -205,11 +205,11 @@
 	SendIO((struct IORequest *)&request);
 
 	mask = Wait((1ul << waitingTask.sigBit) | (1ul << port.mp_SigBit) |
 	    *signalMask);
 	if (mask & (1ul << waitingTask.sigBit) || (*signalMask &= mask))
-		error = of_mutex_lock(mutex);
+		error = OFPlainMutexLock(mutex);
 	else if (mask & (1ul << port.mp_SigBit))
 		error = ETIMEDOUT;
 	else
 		/*
 		 * This should not happen - it means something interrupted the