@@ -31,14 +31,14 @@
 # import "OFTCPSocket.h"
 #endif
 #import "OFAutoreleasePool.h"
 
 #ifdef HAVE_POLL_H
-# import "OFStreamPollObserver.h"
+# import "OFStreamObserver_poll.h"
 #endif
 #if defined(HAVE_SYS_SELECT_H) || defined(_WIN32)
-# import "OFStreamSelectObserver.h"
+# import "OFStreamObserver_select.h"
 #endif
 
 #import "OFInitializationFailedException.h"
 #import "OFNotImplementedException.h"
 #import "OFOutOfRangeException.h"
@@ -60,19 +60,19 @@
 
 #if defined(HAVE_POLL_H)
 + alloc
 {
 	if (self == [OFStreamObserver class])
-		return [OFStreamPollObserver alloc];
+		return [OFStreamObserver_poll alloc];
 
 	return [super alloc];
 }
 #elif defined(HAVE_SYS_SELECT_H) || defined(_WIN32)
 + alloc
 {
 	if (self == [OFStreamObserver class])
-		return [OFStreamSelectObserver alloc];
+		return [OFStreamObserver_select alloc];
 
 	return [super alloc];
 }
 #endif