@@ -81,11 +81,11 @@
 SRCS_PLUGINS = OFPlugin.m
 SRCS_SOCKETS = OFHTTPClient.m		\
 	       OFHTTPRequest.m		\
 	       OFHTTPResponse.m		\
 	       OFHTTPServer.m		\
-	       OFStreamObserver.m	\
+	       OFKernelEventObserver.m	\
 	       OFStreamSocket.m		\
 	       OFTCPSocket.m		\
 	       OFUDPSocket.m		\
 	       resolver.m
 SRCS_THREADS = OFCondition.m		\
@@ -129,13 +129,13 @@
 	codepage_437.m			\
 	${FOUNDATION_COMPAT_M}		\
 	${INSTANCE_M}			\
 	iso_8859_15.m			\
 	windows_1252.m
-SRCS_SOCKETS += ${OFSTREAMOBSERVER_KQUEUE_M}	\
-		${OFSTREAMOBSERVER_POLL_M}	\
-		${OFSTREAMOBSERVER_SELECT_M}	\
+SRCS_SOCKETS += ${OFKERNELEVENTOBSERVER_KQUEUE_M}	\
+		${OFKERNELEVENTOBSERVER_POLL_M}		\
+		${OFKERNELEVENTOBSERVER_SELECT_M}	\
 		OFTCPSocket+SOCKS5.m
 
 OBJS_EXTRA = ${RUNTIME_RUNTIME_A}	\
 	     ${EXCEPTIONS_EXCEPTIONS_A} \
 	     ${FORWARDING_FORWARDING_A}