@@ -40,11 +40,11 @@
 	wBuffer = NULL;
 
 	return self;
 }
 
-- (BOOL)_atEndOfStream
+- (BOOL)_isAtEndOfStream
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
@@ -60,16 +60,16 @@
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- (BOOL)atEndOfStream
+- (BOOL)isAtEndOfStream
 {
 	if (cache != NULL)
 		return NO;
 
-	return [self _atEndOfStream];
+	return [self _isAtEndOfStream];
 }
 
 - (size_t)readNBytes: (size_t)size
 	  intoBuffer: (char*)buf
 {
@@ -210,11 +210,11 @@
 
 	a = [OFDataArray dataArrayWithItemSize: 1];
 	buf = [self allocMemoryWithSize: of_pagesize];
 
 	@try {
-		while (![self atEndOfStream]) {
+		while (![self isAtEndOfStream]) {
 			size_t size;
 
 			size = [self readNBytes: of_pagesize
 				     intoBuffer: buf];
 			[a addNItems: size
@@ -270,11 +270,11 @@
 	/* Read until we get a newline or \0 */
 	tmp = [self allocMemoryWithSize: of_pagesize];
 
 	@try {
 		for (;;) {
-			if ([self _atEndOfStream]) {
+			if ([self _isAtEndOfStream]) {
 				if (cache == NULL)
 					return nil;
 
 				ret_len = cacheLen;
 
@@ -429,11 +429,11 @@
 	/* Read until we get the delimiter or \0 */
 	tmp = [self allocMemoryWithSize: of_pagesize];
 
 	@try {
 		for (;;) {
-			if ([self _atEndOfStream]) {
+			if ([self _isAtEndOfStream]) {
 				if (cache == NULL)
 					return nil;
 
 				ret = [OFString stringWithCString: cache
 							 encoding: encoding
@@ -513,18 +513,18 @@
 
 	/* Get rid of a warning, never reached anyway */
 	assert(0);
 }
 
-- (BOOL)bufferWrites
+- (BOOL)buffersWrites
 {
-	return bufferWrites;
+	return buffersWrites;
 }
 
-- (void)setBufferWrites: (BOOL)enable
+- (void)setBuffersWrites: (BOOL)enable
 {
-	bufferWrites = enable;
+	buffersWrites = enable;
 }
 
 - (void)flushWriteBuffer
 {
 	if (wBuffer == NULL)
@@ -539,11 +539,11 @@
 }
 
 - (size_t)writeNBytes: (size_t)size
 	   fromBuffer: (const char*)buf
 {
-	if (!bufferWrites)
+	if (!buffersWrites)
 		return [self _writeNBytes: size
 			       fromBuffer: buf];
 	else {
 		wBuffer = [self resizeMemory: wBuffer
 				      toSize: wBufferLen + size];