@@ -15,16 +15,16 @@
 
 #include "config.h"
 
 #include <errno.h>
 
-#import "condition.h"
+#import "OFPlainCondition.h"
 
 #include <windows.h>
 
 int
-of_condition_new(of_condition_t *condition)
+OFPlainConditionNew(OFPlainCondition *condition)
 {
 	condition->count = 0;
 
 	if ((condition->event = CreateEvent(NULL, FALSE, 0, NULL)) == NULL)
 		return EAGAIN;
@@ -31,105 +31,105 @@
 
 	return 0;
 }
 
 int
-of_condition_signal(of_condition_t *condition)
+OFPlainConditionSignal(OFPlainCondition *condition)
 {
 	if (!SetEvent(condition->event)) {
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE:
 			return EINVAL;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 	}
 
 	return 0;
 }
 
 int
-of_condition_broadcast(of_condition_t *condition)
+OFPlainConditionBroadcast(OFPlainCondition *condition)
 {
 	int count = condition->count;
 
 	for (int i = 0; i < count; i++) {
 		if (!SetEvent(condition->event)) {
 			switch (GetLastError()) {
 			case ERROR_INVALID_HANDLE:
 				return EINVAL;
 			default:
-				OF_ENSURE(0);
+				OFEnsure(0);
 			}
 		}
 	}
 
 	return 0;
 }
 
 int
-of_condition_wait(of_condition_t *condition, of_mutex_t *mutex)
+OFPlainConditionWait(OFPlainCondition *condition, OFPlainMutex *mutex)
 {
 	int error;
 	DWORD status;
 
-	if ((error = of_mutex_unlock(mutex)) != 0)
+	if ((error = OFPlainMutexUnlock(mutex)) != 0)
 		return error;
 
-	of_atomic_int_inc(&condition->count);
+	OFAtomicIntIncrease(&condition->count);
 	status = WaitForSingleObject(condition->event, INFINITE);
-	of_atomic_int_dec(&condition->count);
+	OFAtomicIntDecrease(&condition->count);
 
 	switch (status) {
 	case WAIT_OBJECT_0:
-		return of_mutex_lock(mutex);
+		return OFPlainMutexLock(mutex);
 	case WAIT_FAILED:
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE:
 			return EINVAL;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 	default:
-		OF_ENSURE(0);
+		OFEnsure(0);
 	}
 }
 
 int
-of_condition_timed_wait(of_condition_t *condition, of_mutex_t *mutex,
-    of_time_interval_t timeout)
+OFPlainConditionTimedWait(OFPlainCondition *condition, OFPlainMutex *mutex,
+    OFTimeInterval timeout)
 {
 	int error;
 	DWORD status;
 
-	if ((error = of_mutex_unlock(mutex)) != 0)
+	if ((error = OFPlainMutexUnlock(mutex)) != 0)
 		return error;
 
-	of_atomic_int_inc(&condition->count);
+	OFAtomicIntIncrease(&condition->count);
 	status = WaitForSingleObject(condition->event, timeout * 1000);
-	of_atomic_int_dec(&condition->count);
+	OFAtomicIntDecrease(&condition->count);
 
 	switch (status) {
 	case WAIT_OBJECT_0:
-		return of_mutex_lock(mutex);
+		return OFPlainMutexLock(mutex);
 	case WAIT_TIMEOUT:
 		return ETIMEDOUT;
 	case WAIT_FAILED:
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE:
 			return EINVAL;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 	default:
-		OF_ENSURE(0);
+		OFEnsure(0);
 	}
 }
 
 int
-of_condition_free(of_condition_t *condition)
+OFPlainConditionFree(OFPlainCondition *condition)
 {
 	if (condition->count != 0)
 		return EBUSY;
 
 	return (CloseHandle(condition->event) ? 0 : EINVAL);
 }