@@ -68,12 +68,12 @@
 - (BOOL)_isAtEndOfStream
 {
 	return atEndOfStream;
 }
 
-- (size_t)_readNBytes: (size_t)length
-	   intoBuffer: (void*)buffer
+- (size_t)_readIntoBuffer: (void*)buffer
+		   length: (size_t)length
 {
 	ssize_t ret;
 
 	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException exceptionWithClass: isa
@@ -103,12 +103,12 @@
 		atEndOfStream = YES;
 
 	return ret;
 }
 
-- (void)_writeNBytes: (size_t)length
-	  fromBuffer: (const void*)buffer
+- (void)_writeBuffer: (const void*)buffer
+	      length: (size_t)length
 {
 	if (sock == INVALID_SOCKET)
 		@throw [OFNotConnectedException exceptionWithClass: isa
 							    socket: self];