@@ -271,31 +271,31 @@
 #endif
 
 	[self cancel];
 }
 
-- (void)OF_addObjectForReading: (id <OFReadyForReadingObserving>)object
+- (void)of_addObjectForReading: (id <OFReadyForReadingObserving>)object
+{
+	OF_UNRECOGNIZED_SELECTOR
+}
+
+- (void)of_addObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)OF_addObjectForWriting: (id <OFReadyForWritingObserving>)object
+- (void)of_removeObjectForReading: (id <OFReadyForReadingObserving>)object
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)OF_removeObjectForReading: (id <OFReadyForReadingObserving>)object
+- (void)of_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)OF_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
-{
-	OF_UNRECOGNIZED_SELECTOR
-}
-
-- (void)OF_processQueue
+- (void)of_processQueue
 {
 	void *pool = objc_autoreleasePoolPush();
 
 #ifdef OF_HAVE_THREADS
 	[_mutex lock];
@@ -314,11 +314,11 @@
 			switch (action) {
 			case QUEUE_ADD | QUEUE_READ:
 				[_readObjects addObject: object];
 
 				@try {
-					[self OF_addObjectForReading: object];
+					[self of_addObjectForReading: object];
 				} @catch (id e) {
 					[_readObjects
 					    removeObjectIdenticalTo: object];
 
 					@throw e;
@@ -327,27 +327,27 @@
 				break;
 			case QUEUE_ADD | QUEUE_WRITE:
 				[_writeObjects addObject: object];
 
 				@try {
-					[self OF_addObjectForWriting: object];
+					[self of_addObjectForWriting: object];
 				} @catch (id e) {
 					[_writeObjects
 					    removeObjectIdenticalTo: object];
 
 					@throw e;
 				}
 
 				break;
 			case QUEUE_REMOVE | QUEUE_READ:
-				[self OF_removeObjectForReading: object];
+				[self of_removeObjectForReading: object];
 
 				[_readObjects removeObjectIdenticalTo: object];
 
 				break;
 			case QUEUE_REMOVE | QUEUE_WRITE:
-				[self OF_removeObjectForWriting: object];
+				[self of_removeObjectForWriting: object];
 
 				[_writeObjects removeObjectIdenticalTo: object];
 
 				break;
 			default:
@@ -364,20 +364,20 @@
 #endif
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (bool)OF_processReadBuffers
+- (bool)of_processReadBuffers
 {
 	bool foundInReadBuffer = false;
 
 	for (id object in _readObjects) {
 		void *pool = objc_autoreleasePoolPush();
 
 		if ([object isKindOfClass: [OFStream class]] &&
 		    [object hasDataInReadBuffer] &&
-		    ![object OF_isWaitingForDelimiter]) {
+		    ![object of_isWaitingForDelimiter]) {
 			if ([_delegate respondsToSelector:
 			    @selector(objectIsReadyForReading:)])
 				[_delegate objectIsReadyForReading: object];
 
 			foundInReadBuffer = true;