@@ -23,13 +23,13 @@
  * all the caching and other stuff. If you override these methods without the
  * _ prefix, you *WILL* break caching and get broken results!
  */
 @interface OFStream: OFObject
 {
-	char   *cache, *wcache;
-	size_t cache_len, wcache_len;
-	BOOL   use_wcache;
+	char   *cache, *wbuffer;
+	size_t cache_len, wbuffer_len;
+	BOOL   use_wbuffer;
 }
 
 /**
  * Returns a boolean whether the end of the stream has been reached.
  *
@@ -164,18 +164,18 @@
  */
 - (OFString*)readTillDelimiter: (OFString*)delimiter
 		  withEncoding: (enum of_string_encoding)encoding;
 
 /**
- * Caches all writes until flushWriteCache is called.
+ * Buffer all writes until flushWriteBuffer is called.
  */
-- cacheWrites;
+- bufferWrites;
 
 /**
  * Writes everything in the write cache to the stream.
  */
-- flushWriteCache;
+- flushWriteBuffer;
 
 /**
  * Writes from a buffer into the stream.
  *
  * \param buf The buffer from which the data is written to the stream