@@ -43,18 +43,18 @@
 /**
  * \brief This callback is called when a stream did get ready for reading.
  *
  * \param stream The stream which did become ready for reading
  */
-- (void)streamDidBecomeReadyForReading: (OFStream*)stream;
+- (void)streamIsReadyForReading: (OFStream*)stream;
 
 /**
  * \brief This callback is called when a stream did get ready for writing.
  *
  * \param stream The stream which did become ready for writing
  */
-- (void)streamDidBecomeReadyForWriting: (OFStream*)stream;
+- (void)streamIsReadyForWriting: (OFStream*)stream;
 
 /**
  * \brief This callback is called when an exception occurred on the stream.
  *
  * \param stream The stream on which an exception occurred
@@ -117,11 +117,11 @@
  * If there is an -[observe] call blocking, it will be canceled. The reason for
  * this is to prevent blocking even though the new added stream is ready.
  *
  * \param stream The stream to observe for reading
  */
-- (void)addStreamToObserveForReading: (OFStream*)stream;
+- (void)addStreamForReading: (OFStream*)stream;
 
 /**
  * \brief Adds a stream to observe for writing.
  *
  * It is recommended that the stream you add is set to non-blocking mode.
@@ -129,31 +129,31 @@
  * If there is an -[observe] call blocking, it will be canceled. The reason for
  * this is to prevent blocking even though the new added stream is ready.
  *
  * \param stream The stream to observe for writing
  */
-- (void)addStreamToObserveForWriting: (OFStream*)stream;
+- (void)addStreamForWriting: (OFStream*)stream;
 
 /**
  * \brief Removes a stream to observe for reading.
  *
  * If there is an -[observe] call blocking, it will be canceled. The reason for
  * this is to prevent the removed stream from still being observed.
  *
  * \param stream The stream to remove from observing for reading
  */
-- (void)removeStreamToObserveForReading: (OFStream*)stream;
+- (void)removeStreamForReading: (OFStream*)stream;
 
 /**
  * \brief Removes a stream to observe for writing.
  *
  * If there is an -[observe] call blocking, it will be canceled. The reason for
  * this is to prevent the removed stream from still being observed.
  *
  * \param stream The stream to remove from observing for writing
  */
-- (void)removeStreamToObserveForWriting: (OFStream*)stream;
+- (void)removeStreamForWriting: (OFStream*)stream;
 
 /**
  * \brief Observes all streams and blocks until an event happens on a stream.
  */
 - (void)observe;