@@ -20,11 +20,11 @@
 
 #import "OFRunLoop.h"
 #import "OFRunLoop+Private.h"
 #import "OFDictionary.h"
 #ifdef OF_HAVE_SOCKETS
-# import "OFStreamObserver.h"
+# import "OFKernelEventObserver.h"
 #endif
 #import "OFThread.h"
 #ifdef OF_HAVE_THREADS
 # import "OFMutex.h"
 # import "OFCondition.h"
@@ -175,11 +175,12 @@
 		[runLoop->_readQueues setObject: queue			\
 					 forKey: stream];		\
 	}								\
 									\
 	if ([queue count] == 0)						\
-		[runLoop->_streamObserver addStreamForReading: stream];	\
+		[runLoop->_kernelEventObserver				\
+		    addStreamForReading: stream];			\
 									\
 	queueItem = [[[type alloc] init] autorelease];			\
 	code								\
 	[queue appendObject: queueItem];				\
 									\
@@ -287,11 +288,11 @@
 	OFList *queue;
 
 	if ((queue = [runLoop->_readQueues objectForKey: stream]) != nil) {
 		assert([queue count] > 0);
 
-		[runLoop->_streamObserver removeStreamForReading: stream];
+		[runLoop->_kernelEventObserver removeStreamForReading: stream];
 		[runLoop->_readQueues removeObjectForKey: stream];
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
@@ -306,12 +307,12 @@
 #ifdef OF_HAVE_THREADS
 		_timersQueueLock = [[OFMutex alloc] init];
 #endif
 
 #if defined(OF_HAVE_SOCKETS)
-		_streamObserver = [[OFStreamObserver alloc] init];
-		[_streamObserver setDelegate: self];
+		_kernelEventObserver = [[OFKernelEventObserver alloc] init];
+		[_kernelEventObserver setDelegate: self];
 
 		_readQueues = [[OFMutableDictionary alloc] init];
 #elif defined(OF_HAVE_THREADS)
 		_condition = [[OFCondition alloc] init];
 #endif
@@ -328,11 +329,11 @@
 	[_timersQueue release];
 #ifdef OF_HAVE_THREADS
 	[_timersQueueLock release];
 #endif
 #if defined(OF_HAVE_SOCKETS)
-	[_streamObserver release];
+	[_kernelEventObserver release];
 	[_readQueues release];
 #elif defined(OF_HAVE_THREADS)
 	[_condition release];
 #endif
 
@@ -353,11 +354,11 @@
 #endif
 
 	[timer OF_setInRunLoop: self];
 
 #if defined(OF_HAVE_SOCKETS)
-	[_streamObserver cancel];
+	[_kernelEventObserver cancel];
 #elif defined(OF_HAVE_THREADS)
 	[_condition lock];
 	[_condition signal];
 	[_condition unlock];
 #endif
@@ -414,11 +415,11 @@
 			if (!queueItem->_block(stream, queueItem->_buffer,
 			    length, exception)) {
 				[queue removeListObject: listObject];
 
 				if ([queue count] == 0) {
-					[_streamObserver
+					[_kernelEventObserver
 					    removeStreamForReading: stream];
 					[_readQueues
 					    removeObjectForKey: stream];
 				}
 			}
@@ -433,11 +434,11 @@
 			if (!func(queueItem->_target, queueItem->_selector,
 			    stream, queueItem->_buffer, length, exception)) {
 				[queue removeListObject: listObject];
 
 				if ([queue count] == 0) {
-					[_streamObserver
+					[_kernelEventObserver
 					    removeStreamForReading: stream];
 					[_readQueues
 					    removeObjectForKey: stream];
 				}
 			}
@@ -472,11 +473,11 @@
 					queueItem->_readLength = 0;
 				else {
 					[queue removeListObject: listObject];
 
 					if ([queue count] == 0) {
-						[_streamObserver
+						[_kernelEventObserver
 						    removeStreamForReading:
 						    stream];
 						[_readQueues
 						    removeObjectForKey: stream];
 					}
@@ -496,11 +497,11 @@
 					queueItem->_readLength = 0;
 				else {
 					[queue removeListObject: listObject];
 
 					if ([queue count] == 0) {
-						[_streamObserver
+						[_kernelEventObserver
 						    removeStreamForReading:
 						    stream];
 						[_readQueues
 						    removeObjectForKey: stream];
 					}
@@ -530,11 +531,11 @@
 				if (!queueItem->_block(stream, line,
 				    exception)) {
 					[queue removeListObject: listObject];
 
 					if ([queue count] == 0) {
-						[_streamObserver
+						[_kernelEventObserver
 						    removeStreamForReading:
 						    stream];
 						[_readQueues
 						    removeObjectForKey: stream];
 					}
@@ -551,11 +552,11 @@
 				    queueItem->_selector, stream, line,
 				    exception)) {
 					[queue removeListObject: listObject];
 
 					if ([queue count] == 0) {
-						[_streamObserver
+						[_kernelEventObserver
 						    removeStreamForReading:
 						    stream];
 						[_readQueues
 						    removeObjectForKey: stream];
 					}
@@ -582,11 +583,11 @@
 			if (!queueItem->_block((OFTCPSocket*)stream,
 			    newSocket, exception)) {
 				[queue removeListObject: listObject];
 
 				if ([queue count] == 0) {
-					[_streamObserver
+					[_kernelEventObserver
 					    removeStreamForReading: stream];
 					[_readQueues
 					    removeObjectForKey: stream];
 				}
 			}
@@ -602,11 +603,11 @@
 			if (!func(queueItem->_target, queueItem->_selector,
 			    (OFTCPSocket*)stream, newSocket, exception)) {
 				[queue removeListObject: listObject];
 
 				if ([queue count] == 0) {
-					[_streamObserver
+					[_kernelEventObserver
 					    removeStreamForReading: stream];
 					[_readQueues
 					    removeObjectForKey: stream];
 				}
 			}
@@ -677,11 +678,11 @@
 			of_time_interval_t timeout =
 			    [nextTimer timeIntervalSinceNow];
 
 			if (timeout > 0) {
 #if defined(OF_HAVE_SOCKETS)
-				[_streamObserver
+				[_kernelEventObserver
 				    observeForTimeInterval: timeout];
 #elif defined(OF_HAVE_THREADS)
 				[_condition lock];
 				[_condition waitForTimeInterval: timeout];
 				[_condition unlock];
@@ -694,11 +695,11 @@
 			 * No more timers: Just watch for streams until we get
 			 * an event. If a timer is added by another thread, it
 			 * cancels the observe.
 			 */
 #if defined(OF_HAVE_SOCKETS)
-			[_streamObserver observe];
+			[_kernelEventObserver observe];
 #elif defined(OF_HAVE_THREADS)
 			[_condition lock];
 			[_condition wait];
 			[_condition unlock];
 #else
@@ -712,13 +713,13 @@
 
 - (void)stop
 {
 	_running = false;
 #if defined(OF_HAVE_SOCKETS)
-	[_streamObserver cancel];
+	[_kernelEventObserver cancel];
 #elif defined(OF_HAVE_THREADS)
 	[_condition lock];
 	[_condition signal];
 	[_condition unlock];
 #endif
 }
 @end