@@ -239,12 +239,12 @@
 		SSL_shutdown(ssl);
 
 	[super close];
 }
 
-- (size_t)_readNBytes: (size_t)length
-	   intoBuffer: (void*)buffer
+- (size_t)_readIntoBuffer: (void*)buffer
+		   length: (size_t)length
 {
 	ssize_t ret;
 
 	if (length > INT_MAX)
 		@throw [OFOutOfRangeException exceptionWithClass: isa];
@@ -277,12 +277,12 @@
 		atEndOfStream = YES;
 
 	return ret;
 }
 
-- (void)_writeNBytes: (size_t)length
-	  fromBuffer: (const void*)buffer
+- (void)_writeBuffer: (const void*)buffer
+	      length: (size_t)length
 {
 	if (length > INT_MAX)
 		@throw [OFOutOfRangeException exceptionWithClass: isa];
 
 	if (sock == INVALID_SOCKET)
@@ -359,12 +359,12 @@
 		/* peer sent the finished message */
 		length = SSL_get_peer_finished(ssl, buffer, 64);
 	}
 
 	data = [OFDataArray dataArray];
-	[data addNItems: length
-	     fromCArray: buffer];
+	[data addItemsFromCArray: buffer
+			   count: length];
 
 	return data;
 }
 
 - (X509Certificate*)peerCertificate