@@ -34,11 +34,11 @@
 
 - (instancetype)init
 {
 	self = [super init];
 
-	if (of_condition_new(&_condition) != 0) {
+	if (OFPlainConditionNew(&_condition) != 0) {
 		Class c = self.class;
 		[self release];
 		@throw [OFInitializationFailedException exceptionWithClass: c];
 	}
 
@@ -48,14 +48,14 @@
 }
 
 - (void)dealloc
 {
 	if (_conditionInitialized) {
-		int error = of_condition_free(&_condition);
+		int error = OFPlainConditionFree(&_condition);
 
 		if (error != 0) {
-			OF_ENSURE(error == EBUSY);
+			OFEnsure(error == EBUSY);
 
 			@throw [OFConditionStillWaitingException
 			    exceptionWithCondition: self];
 		}
 	}
@@ -63,11 +63,11 @@
 	[super dealloc];
 }
 
 - (void)wait
 {
-	int error = of_condition_wait(&_condition, &_mutex);
+	int error = OFPlainConditionWait(&_condition, &_mutex);
 
 	if (error != 0)
 		@throw [OFConditionWaitFailedException
 		    exceptionWithCondition: self
 				     errNo: error];
@@ -74,23 +74,24 @@
 }
 
 #ifdef OF_AMIGAOS
 - (void)waitForConditionOrExecSignal: (ULONG *)signalMask
 {
-	int error = of_condition_wait_or_signal(&_condition, &_mutex,
+	int error = OFPlainConditionWaitOrExecSignal(&_condition, &_mutex,
 	    signalMask);
 
 	if (error != 0)
 		@throw [OFConditionWaitFailedException
 		    exceptionWithCondition: self
 				     errNo: error];
 }
 #endif
 
-- (bool)waitForTimeInterval: (of_time_interval_t)timeInterval
+- (bool)waitForTimeInterval: (OFTimeInterval)timeInterval
 {
-	int error = of_condition_timed_wait(&_condition, &_mutex, timeInterval);
+	int error = OFPlainConditionTimedWait(&_condition, &_mutex,
+	    timeInterval);
 
 	if (error == ETIMEDOUT)
 		return false;
 
 	if (error != 0)
@@ -100,14 +101,14 @@
 
 	return true;
 }
 
 #ifdef OF_AMIGAOS
-- (bool)waitForTimeInterval: (of_time_interval_t)timeInterval
+- (bool)waitForTimeInterval: (OFTimeInterval)timeInterval
 	       orExecSignal: (ULONG *)signalMask
 {
-	int error = of_condition_timed_wait_or_signal(&_condition, &_mutex,
+	int error = OFPlainConditionTimedWaitOrExecSignal(&_condition, &_mutex,
 	    timeInterval, signalMask);
 
 	if (error == ETIMEDOUT)
 		return false;
 
@@ -124,33 +125,32 @@
 {
 	return [self waitForTimeInterval: date.timeIntervalSinceNow];
 }
 
 #ifdef OF_AMIGAOS
-- (bool)waitUntilDate: (OFDate *)date
-	 orExecSignal: (ULONG *)signalMask
+- (bool)waitUntilDate: (OFDate *)date orExecSignal: (ULONG *)signalMask
 {
 	return [self waitForTimeInterval: date.timeIntervalSinceNow
 			    orExecSignal: signalMask];
 }
 #endif
 
 - (void)signal
 {
-	int error = of_condition_signal(&_condition);
+	int error = OFPlainConditionSignal(&_condition);
 
 	if (error != 0)
 		@throw [OFConditionSignalFailedException
 		    exceptionWithCondition: self
 				     errNo: error];
 }
 
 - (void)broadcast
 {
-	int error = of_condition_broadcast(&_condition);
+	int error = OFPlainConditionBroadcast(&_condition);
 
 	if (error != 0)
 		@throw [OFConditionBroadcastFailedException
 		    exceptionWithCondition: self
 				     errNo: error];
 }
 @end