@@ -24,19 +24,19 @@
 #ifndef OF_AMIGAOS4
 # include <clib/alib_protos.h>
 #endif
 
 int
-of_condition_new(of_condition_t *condition)
+OFPlainConditionNew(OFPlainCondition *condition)
 {
 	condition->waitingTasks = NULL;
 
 	return 0;
 }
 
 int
-of_condition_signal(of_condition_t *condition)
+OFPlainConditionSignal(OFPlainCondition *condition)
 {
 	Forbid();
 	@try {
 		if (condition->waitingTasks == NULL)
 			return 0;
@@ -51,11 +51,11 @@
 
 	return 0;
 }
 
 int
-of_condition_broadcast(of_condition_t *condition)
+OFPlainConditionBroadcast(OFPlainCondition *condition)
 {
 	Forbid();
 	@try {
 		if (condition->waitingTasks == NULL)
 			return 0;
@@ -72,22 +72,22 @@
 
 	return 0;
 }
 
 int
-of_condition_wait(of_condition_t *condition, OFPlainMutex *mutex)
+OFPlainConditionWait(OFPlainCondition *condition, OFPlainMutex *mutex)
 {
 	ULONG signalMask = 0;
 
-	return of_condition_wait_or_signal(condition, mutex, &signalMask);
+	return OFPlainConditionWaitOrExecSignal(condition, mutex, &signalMask);
 }
 
 int
-of_condition_wait_or_signal(of_condition_t *condition, OFPlainMutex *mutex,
-    ULONG *signalMask)
+OFPlainConditionWaitOrExecSignal(OFPlainCondition *condition,
+    OFPlainMutex *mutex, ULONG *signalMask)
 {
-	struct of_condition_waiting_task waitingTask = {
+	struct OFPlainConditionWaitingTask waitingTask = {
 		.task = FindTask(NULL),
 		.sigBit = AllocSignal(-1)
 	};
 	int error = 0;
 	ULONG mask;
@@ -121,24 +121,24 @@
 
 	return error;
 }
 
 int
-of_condition_timed_wait(of_condition_t *condition, OFPlainMutex *mutex,
+OFPlainConditionTimedWait(OFPlainCondition *condition, OFPlainMutex *mutex,
     OFTimeInterval timeout)
 {
 	ULONG signalMask = 0;
 
-	return of_condition_timed_wait_or_signal(condition, mutex, timeout,
+	return OFPlainConditionTimedWaitOrExecSignal(condition, mutex, timeout,
 	    &signalMask);
 }
 
 int
-of_condition_timed_wait_or_signal(of_condition_t *condition,
+OFPlainConditionTimedWaitOrExecSignal(OFPlainCondition *condition,
     OFPlainMutex *mutex, OFTimeInterval timeout, ULONG *signalMask)
 {
-	struct of_condition_waiting_task waitingTask = {
+	struct OFPlainConditionWaitingTask waitingTask = {
 		.task = FindTask(NULL),
 		.sigBit = AllocSignal(-1)
 	};
 	struct MsgPort port = {
 		.mp_Node = {
@@ -235,11 +235,11 @@
 
 	return error;
 }
 
 int
-of_condition_free(of_condition_t *condition)
+OFPlainConditionFree(OFPlainCondition *condition)
 {
 	Forbid();
 	@try {
 		if (condition->waitingTasks != NULL)
 			return EBUSY;