diff --git a/src/SSLSocket.m b/src/SSLSocket.m
index 4f7d8ef..e7d17c2 100644
--- a/src/SSLSocket.m
+++ b/src/SSLSocket.m
@@ -241,8 +241,8 @@ ssl_locking_callback(int mode, int n, const char *file, int line)
 	[super close];
 }
 
-- (size_t)_readNBytes: (size_t)length
-	   intoBuffer: (void*)buffer
+- (size_t)_readIntoBuffer: (void*)buffer
+		   length: (size_t)length
 {
 	ssize_t ret;
 
@@ -279,8 +279,8 @@ ssl_locking_callback(int mode, int n, const char *file, int line)
 	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];
@@ -361,8 +361,8 @@ ssl_locking_callback(int mode, int n, const char *file, int line)
 	}
 
 	data = [OFDataArray dataArray];
-	[data addNItems: length
-	     fromCArray: buffer];
+	[data addItemsFromCArray: buffer
+			   count: length];
 
 	return data;
 }
diff --git a/src/X509Certificate.m b/src/X509Certificate.m
index 44bce9a..33129e4 100644
--- a/src/X509Certificate.m
+++ b/src/X509Certificate.m
@@ -400,7 +400,7 @@
 		    1)) > bufferLength) {
 			bufferLength = length;
 			buffer = [self resizeMemory: buffer
-					     toSize: bufferLength];
+					       size: bufferLength];
 		}
 
 		ret = [[[X509OID alloc]