Index: src/OFStream.h
==================================================================
--- src/OFStream.h
+++ src/OFStream.h
@@ -89,17 +89,17 @@
 #if !defined(OF_SEEKABLE_STREAM_M) && !defined(OF_TCP_SOCKET_M)
 @private
 #endif
 	char *_readBuffer, *_writeBuffer;
 	size_t _readBufferLength, _writeBufferLength;
-	bool _writeBufferEnabled, _waitingForDelimiter;
+	bool _writeBuffered, _waitingForDelimiter;
 @protected
 	bool _blocking;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (getter=isWriteBufferEnabled) bool writeBufferEnabled;
+@property (getter=isWriteBuffered) bool writeBuffered;
 @property (getter=isBlocking) bool blocking;
 @property (readonly, getter=isAtEndOfStream) bool atEndOfStream;
 #endif
 
 /*!
@@ -753,18 +753,18 @@
 /*!
  * @brief Returns a boolen whether writes are buffered.
  *
  * @return A boolean whether writes are buffered
  */
-- (bool)isWriteBufferEnabled;
+- (bool)isWriteBuffered;
 
 /*!
  * @brief Enables or disables the write buffer.
  *
  * @param enable Whether the write buffer should be enabled or disabled
  */
-- (void)setWriteBufferEnabled: (bool)enable;
+- (void)setWriteBuffered: (bool)enable;
 
 /*!
  * @brief Writes everythig in the write buffer to the stream.
  */
 - (void)flushWriteBuffer;

Index: src/OFStream.m
==================================================================
--- src/OFStream.m
+++ src/OFStream.m
@@ -946,18 +946,18 @@
 {
 	return [self tryReadTillDelimiter: delimiter
 				 encoding: OF_STRING_ENCODING_UTF_8];
 }
 
-- (bool)isWriteBufferEnabled
+- (bool)isWriteBuffered
 {
-	return _writeBufferEnabled;
+	return _writeBuffered;
 }
 
-- (void)setWriteBufferEnabled: (bool)enable
+- (void)setWriteBuffered: (bool)enable
 {
-	_writeBufferEnabled = enable;
+	_writeBuffered = enable;
 }
 
 - (void)flushWriteBuffer
 {
 	if (_writeBuffer == NULL)
@@ -972,11 +972,11 @@
 }
 
 - (void)writeBuffer: (const void*)buffer
 	     length: (size_t)length
 {
-	if (!_writeBufferEnabled)
+	if (!_writeBuffered)
 		[self lowlevelWriteBuffer: buffer
 				   length: length];
 	else {
 		_writeBuffer = [self resizeMemory: _writeBuffer
 					     size: _writeBufferLength + length];

Index: src/OFTCPSocket+SOCKS5.m
==================================================================
--- src/OFTCPSocket+SOCKS5.m
+++ src/OFTCPSocket+SOCKS5.m
@@ -27,11 +27,11 @@
 - (void)OF_SOCKS5ConnectToHost: (OFString*)host
 			  port: (uint16_t)port
 {
 	const char request[] = { 5, 1, 0, 3 };
 	char reply[256];
-	bool wasWriteBufferEnabled;
+	bool wasWriteBuffered;
 
 	/* 5 1 0 -> no authentication */
 	[self writeBuffer: request
 		   length: 3];
 
@@ -43,12 +43,12 @@
 		@throw [OFConnectionFailedException exceptionWithHost: host
 								 port: port
 							       socket: self];
 	}
 
-	wasWriteBufferEnabled = [self isWriteBufferEnabled];
-	[self setWriteBufferEnabled: true];
+	wasWriteBuffered = [self isWriteBuffered];
+	[self setWriteBuffered: true];
 
 	/* CONNECT request */
 	[self writeBuffer: request
 		   length: 4];
 	[self writeInt8: [host UTF8StringLength]];
@@ -55,11 +55,11 @@
 	[self writeBuffer: [host UTF8String]
 		   length: [host UTF8StringLength]];
 	[self writeBigEndianInt16: port];
 
 	[self flushWriteBuffer];
-	[self setWriteBufferEnabled: wasWriteBufferEnabled];
+	[self setWriteBuffered: wasWriteBuffered];
 
 	[self readIntoBuffer: reply
 		 exactLength: 4];
 
 	if (reply[0] != 5 || reply[1] != 0 || reply[2] != 0) {