@@ -69,25 +69,25 @@
 	blocking = YES;
 
 	return self;
 }
 
-- (BOOL)_isAtEndOfStream
+- (BOOL)lowlevelIsAtEndOfStream
 {
 	@throw [OFNotImplementedException exceptionWithClass: [self class]
 						    selector: _cmd];
 }
 
-- (size_t)_readIntoBuffer: (void*)buffer
-		   length: (size_t)length
+- (size_t)lowlevelReadIntoBuffer: (void*)buffer
+			  length: (size_t)length
 {
 	@throw [OFNotImplementedException exceptionWithClass: [self class]
 						    selector: _cmd];
 }
 
-- (void)_writeBuffer: (const void*)buffer
-	      length: (size_t)length
+- (void)lowlevelWriteBuffer: (const void*)buffer
+		     length: (size_t)length
 {
 	@throw [OFNotImplementedException exceptionWithClass: [self class]
 						    selector: _cmd];
 }
 
@@ -99,19 +99,19 @@
 - (BOOL)isAtEndOfStream
 {
 	if (cache != NULL)
 		return NO;
 
-	return [self _isAtEndOfStream];
+	return [self lowlevelIsAtEndOfStream];
 }
 
 - (size_t)readIntoBuffer: (void*)buffer
 		  length: (size_t)length
 {
 	if (cache == NULL)
-		return [self _readIntoBuffer: buffer
-				      length: length];
+		return [self lowlevelReadIntoBuffer: buffer
+					     length: length];
 
 	if (length >= cacheLength) {
 		size_t ret = cacheLength;
 		memcpy(buffer, cache, cacheLength);
 
@@ -560,11 +560,11 @@
 
 	/* Read and see if we get a newline or \0 */
 	buffer = [self allocMemoryWithSize: of_pagesize];
 
 	@try {
-		if ([self _isAtEndOfStream]) {
+		if ([self lowlevelIsAtEndOfStream]) {
 			if (cache == NULL) {
 				waitingForDelimiter = NO;
 				return nil;
 			}
 
@@ -583,12 +583,12 @@
 
 			waitingForDelimiter = NO;
 			return ret;
 		}
 
-		bufferLength = [self _readIntoBuffer: buffer
-					      length: of_pagesize];
+		bufferLength = [self lowlevelReadIntoBuffer: buffer
+						     length: of_pagesize];
 
 		/* Look if there's a newline or \0 */
 		for (i = 0; i < bufferLength; i++) {
 			if OF_UNLIKELY (buffer[i] == '\n' ||
 			    buffer[i] == '\0') {
@@ -756,11 +756,11 @@
 
 	/* Read and see if we get a delimiter or \0 */
 	buffer = [self allocMemoryWithSize: of_pagesize];
 
 	@try {
-		if ([self _isAtEndOfStream]) {
+		if ([self lowlevelIsAtEndOfStream]) {
 			if (cache == NULL) {
 				waitingForDelimiter = NO;
 				return nil;
 			}
 
@@ -774,12 +774,12 @@
 
 			waitingForDelimiter = NO;
 			return ret;
 		}
 
-		bufferLength = [self _readIntoBuffer: buffer
-					      length: of_pagesize];
+		bufferLength = [self lowlevelReadIntoBuffer: buffer
+						     length: of_pagesize];
 
 		/* Look if there's a delimiter or \0 */
 		for (i = 0; i < bufferLength; i++) {
 			if (buffer[i] != delimiterUTF8String[j++])
 				j = 0;
@@ -889,12 +889,12 @@
 - (void)flushWriteBuffer
 {
 	if (writeBuffer == NULL)
 		return;
 
-	[self _writeBuffer: writeBuffer
-		    length: writeBufferLength];
+	[self lowlevelWriteBuffer: writeBuffer
+			   length: writeBufferLength];
 
 	[self freeMemory: writeBuffer];
 	writeBuffer = NULL;
 	writeBufferLength = 0;
 }
@@ -901,12 +901,12 @@
 
 - (void)writeBuffer: (const void*)buffer
 	     length: (size_t)length
 {
 	if (!writeBufferEnabled)
-		[self _writeBuffer: buffer
-			    length: length];
+		[self lowlevelWriteBuffer: buffer
+				   length: length];
 	else {
 		writeBuffer = [self resizeMemory: writeBuffer
 					    size: writeBufferLength + length];
 		memcpy(writeBuffer + writeBufferLength, buffer, length);
 		writeBufferLength += length;