@@ -52,11 +52,11 @@
 #import "of_asprintf.h"
 
 #define MIN_READ_SIZE 512
 
 @implementation OFStream
-@synthesize OF_waitingForDelimiter = _waitingForDelimiter;
+@synthesize of_waitingForDelimiter = _waitingForDelimiter;
 
 #ifndef OF_WINDOWS
 + (void)initialize
 {
 	if (self == [OFStream class])
@@ -185,11 +185,11 @@
 - (void)asyncReadIntoBuffer: (void *)buffer
 		     length: (size_t)length
 		     target: (id)target
 		   selector: (SEL)selector
 {
-	[OFRunLoop OF_addAsyncReadForStream: self
+	[OFRunLoop of_addAsyncReadForStream: self
 				     buffer: buffer
 				     length: length
 				     target: target
 				   selector: selector];
 }
@@ -197,11 +197,11 @@
 - (void)asyncReadIntoBuffer: (void *)buffer
 		exactLength: (size_t)length
 		     target: (id)target
 		   selector: (SEL)selector
 {
-	[OFRunLoop OF_addAsyncReadForStream: self
+	[OFRunLoop of_addAsyncReadForStream: self
 				     buffer: buffer
 				exactLength: length
 				     target: target
 				   selector: selector];
 }
@@ -209,21 +209,21 @@
 # ifdef OF_HAVE_BLOCKS
 - (void)asyncReadIntoBuffer: (void *)buffer
 		     length: (size_t)length
 		      block: (of_stream_async_read_block_t)block
 {
-	[OFRunLoop OF_addAsyncReadForStream: self
+	[OFRunLoop of_addAsyncReadForStream: self
 				     buffer: buffer
 				     length: length
 				      block: block];
 }
 
 - (void)asyncReadIntoBuffer: (void *)buffer
 		exactLength: (size_t)length
 		      block: (of_stream_async_read_block_t)block
 {
-	[OFRunLoop OF_addAsyncReadForStream: self
+	[OFRunLoop of_addAsyncReadForStream: self
 				     buffer: buffer
 				exactLength: length
 				      block: block];
 }
 # endif
@@ -760,11 +760,11 @@
 
 - (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
 			   target: (id)target
 			 selector: (SEL)selector
 {
-	[OFRunLoop OF_addAsyncReadLineForStream: self
+	[OFRunLoop of_addAsyncReadLineForStream: self
 				       encoding: encoding
 					 target: target
 				       selector: selector];
 }
 
@@ -776,11 +776,11 @@
 }
 
 - (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
 			    block: (of_stream_async_read_line_block_t)block
 {
-	[OFRunLoop OF_addAsyncReadLineForStream: self
+	[OFRunLoop of_addAsyncReadLineForStream: self
 				       encoding: encoding
 					  block: block];
 }
 # endif
 #endif
@@ -1515,11 +1515,11 @@
 }
 
 #ifdef OF_HAVE_SOCKETS
 - (void)cancelAsyncRequests
 {
-	[OFRunLoop OF_cancelAsyncRequestsForObject: self];
+	[OFRunLoop of_cancelAsyncRequestsForObject: self];
 }
 #endif
 
 - (void)unreadFromBuffer: (const void *)buffer
 		  length: (size_t)length