@@ -161,11 +161,11 @@
 - (void)setDelegate: (id <OFStreamObserverDelegate>)delegate_
 {
 	OF_SETTER(delegate, delegate_, YES, NO)
 }
 
-- (void)addStreamToObserveForReading: (OFStream*)stream
+- (void)addStreamForReading: (OFStream*)stream
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFNumber *qi = [OFNumber numberWithInt: QUEUE_ADD | QUEUE_READ];
 
 	@synchronized (queue) {
@@ -181,11 +181,11 @@
 #endif
 
 	[pool release];
 }
 
-- (void)addStreamToObserveForWriting: (OFStream*)stream
+- (void)addStreamForWriting: (OFStream*)stream
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFNumber *qi = [OFNumber numberWithInt: QUEUE_ADD | QUEUE_WRITE];
 
 	@synchronized (queue) {
@@ -201,11 +201,11 @@
 #endif
 
 	[pool release];
 }
 
-- (void)removeStreamToObserveForReading: (OFStream*)stream
+- (void)removeStreamForReading: (OFStream*)stream
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFNumber *qi = [OFNumber numberWithInt: QUEUE_REMOVE | QUEUE_READ];
 
 	@synchronized (queue) {
@@ -221,11 +221,11 @@
 #endif
 
 	[pool release];
 }
 
-- (void)removeStreamToObserveForWriting: (OFStream*)stream
+- (void)removeStreamForWriting: (OFStream*)stream
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFNumber *qi = [OFNumber numberWithInt: QUEUE_REMOVE | QUEUE_WRITE];
 
 	@synchronized (queue) {
@@ -241,29 +241,29 @@
 #endif
 
 	[pool release];
 }
 
-- (void)_addStreamToObserveForReading: (OFStream*)strea;
+- (void)_addStreamForReading: (OFStream*)strea;
+{
+	@throw [OFNotImplementedException newWithClass: isa
+					      selector: _cmd];
+}
+
+- (void)_addStreamForWriting: (OFStream*)stream
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- (void)_addStreamToObserveForWriting: (OFStream*)stream
+- (void)_removeStreamForReading: (OFStream*)stream
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- (void)_removeStreamToObserveForReading: (OFStream*)stream
-{
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
-}
-
-- (void)_removeStreamToObserveForWriting: (OFStream*)stream
+- (void)_removeStreamForWriting: (OFStream*)stream
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
@@ -300,35 +300,31 @@
 
 			switch (action) {
 			case QUEUE_ADD | QUEUE_READ:
 				[readStreams addObject: queueCArray[i]];
 
-				[self _addStreamToObserveForReading:
-				    queueCArray[i]];
+				[self _addStreamForReading: queueCArray[i]];
 
 				break;
 			case QUEUE_ADD | QUEUE_WRITE:
 				[writeStreams addObject: queueCArray[i]];
 
-				[self _addStreamToObserveForWriting:
-				    queueCArray[i]];
+				[self _addStreamForWriting: queueCArray[i]];
 
 				break;
 			case QUEUE_REMOVE | QUEUE_READ:
 				[readStreams removeObjectIdenticalTo:
 				    queueCArray[i]];
 
-				[self _removeStreamToObserveForReading:
-				    queueCArray[i]];
+				[self _removeStreamForReading: queueCArray[i]];
 
 				break;
 			case QUEUE_REMOVE | QUEUE_WRITE:
 				[writeStreams removeObjectIdenticalTo:
 				    queueCArray[i]];
 
-				[self _removeStreamToObserveForWriting:
-				    queueCArray[i]];
+				[self _removeStreamForWriting: queueCArray[i]];
 
 				break;
 			default:
 				assert(0);
 			}
@@ -359,11 +355,11 @@
 
 	pool = [[OFAutoreleasePool alloc] init];
 
 	for (i = 0; i < count; i++) {
 		if ([cArray[i] pendingBytes] > 0) {
-			[delegate streamDidBecomeReadyForReading: cArray[i]];
+			[delegate streamIsReadyForReading: cArray[i]];
 			foundInCache = YES;
 			[pool releaseObjects];
 		}
 	}
 
@@ -379,17 +375,17 @@
 	return NO;
 }
 @end
 
 @implementation OFObject (OFStreamObserverDelegate)
-- (void)streamDidBecomeReadyForReading: (OFStream*)stream
+- (void)streamIsReadyForReading: (OFStream*)stream
 {
 }
 
-- (void)streamDidBecomeReadyForWriting: (OFStream*)stream
+- (void)streamIsReadyForWriting: (OFStream*)stream
 {
 }
 
 - (void)streamDidReceiveException: (OFStream*)stream
 {
 }
 @end