Index: src/OFSeekableStream.m
==================================================================
--- src/OFSeekableStream.m
+++ src/OFSeekableStream.m
@@ -31,11 +31,11 @@
 					      selector: _cmd];
 }
 
 - seekToOffset: (off_t)offset
 {
-	[self flushWriteCache];
+	[self flushWriteBuffer];
 	[self _seekToOffset: offset];
 
 	[self freeMemory: cache];
 	cache = NULL;
 	cache_len = 0;
@@ -45,11 +45,11 @@
 
 - (off_t)seekForwardWithOffset: (off_t)offset
 {
 	off_t ret;
 
-	[self flushWriteCache];
+	[self flushWriteBuffer];
 	ret = [self _seekForwardWithOffset: offset - cache_len];
 
 	[self freeMemory: cache];
 	cache = NULL;
 	cache_len = 0;
@@ -59,15 +59,15 @@
 
 - (off_t)seekToOffsetRelativeToEnd: (off_t)offset
 {
 	off_t ret;
 
-	[self flushWriteCache];
+	[self flushWriteBuffer];
 	ret = [self _seekToOffsetRelativeToEnd: offset];
 
 	[self freeMemory: cache];
 	cache = NULL;
 	cache_len = 0;
 
 	return ret;
 }
 @end

Index: src/OFStream.h
==================================================================
--- src/OFStream.h
+++ src/OFStream.h
@@ -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

Index: src/OFStream.m
==================================================================
--- src/OFStream.m
+++ src/OFStream.m
@@ -35,11 +35,11 @@
 	if (isa == [OFStream class])
 		@throw [OFNotImplementedException newWithClass: isa
 						      selector: _cmd];
 
 	cache = NULL;
-	wcache = NULL;
+	wbuffer = NULL;
 
 	return self;
 }
 
 - (BOOL)_atEndOfStream
@@ -495,44 +495,44 @@
 
 	/* Get rid of a warning, never reached anyway */
 	assert(0);
 }
 
-- cacheWrites
+- bufferWrites
 {
-	use_wcache = YES;
+	use_wbuffer = YES;
 
 	return self;
 }
 
-- flushWriteCache
+- flushWriteBuffer
 {
-	if (wcache == NULL)
+	if (wbuffer == NULL)
 		return self;
 
-	[self _writeNBytes: wcache_len
-		fromBuffer: wcache];
+	[self _writeNBytes: wbuffer_len
+		fromBuffer: wbuffer];
 
-	[self freeMemory: wcache];
-	wcache = NULL;
-	wcache_len = 0;
-	use_wcache = NO;
+	[self freeMemory: wbuffer];
+	wbuffer = NULL;
+	wbuffer_len = 0;
+	use_wbuffer = NO;
 
 	return self;
 }
 
 - (size_t)writeNBytes: (size_t)size
 	   fromBuffer: (const char*)buf
 {
-	if (!use_wcache)
+	if (!use_wbuffer)
 		return [self _writeNBytes: size
 			       fromBuffer: buf];
 	else {
-		wcache = [self resizeMemory: wcache
-				     toSize: wcache_len + size];
-		memcpy(wcache + wcache_len, buf, size);
-		wcache_len += size;
+		wbuffer = [self resizeMemory: wbuffer
+				      toSize: wbuffer_len + size];
+		memcpy(wbuffer + wbuffer_len, buf, size);
+		wbuffer_len += size;
 
 		return size;
 	}
 }