@@ -20,11 +20,11 @@
 #import "condition.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,11 +31,11 @@
 
 	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;
@@ -46,11 +46,11 @@
 
 	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)) {
@@ -65,11 +65,11 @@
 
 	return 0;
 }
 
 int
-of_condition_wait(of_condition_t *condition, OFPlainMutex *mutex)
+OFPlainConditionWait(OFPlainCondition *condition, OFPlainMutex *mutex)
 {
 	int error;
 	DWORD status;
 
 	if ((error = OFPlainMutexUnlock(mutex)) != 0)
@@ -93,11 +93,11 @@
 		OF_ENSURE(0);
 	}
 }
 
 int
-of_condition_timed_wait(of_condition_t *condition, OFPlainMutex *mutex,
+OFPlainConditionTimedWait(OFPlainCondition *condition, OFPlainMutex *mutex,
     OFTimeInterval timeout)
 {
 	int error;
 	DWORD status;
 
@@ -124,12 +124,12 @@
 		OF_ENSURE(0);
 	}
 }
 
 int
-of_condition_free(of_condition_t *condition)
+OFPlainConditionFree(OFPlainCondition *condition)
 {
 	if (condition->count != 0)
 		return EBUSY;
 
 	return (CloseHandle(condition->event) ? 0 : EINVAL);
 }