@@ -311,11 +311,11 @@
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG;
 	snprintf(portCString, 7, "%" PRIu16, port);
 
-	if (getaddrinfo([host cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
+	if (getaddrinfo([host cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
 	    portCString, &hints, &res0))
 		@throw [OFAddressTranslationFailedException
 		    exceptionWithClass: [self class]
 				socket: self
 				  host: host];
@@ -345,11 +345,11 @@
 
 	addrlist = [[OFDataArray alloc] initWithItemSize: sizeof(char**)];
 	[mutex lock];
 # endif
 
-	if ((he = gethostbyname([host cStringUsingEncoding:
+	if ((he = gethostbyname([host cStringWithEncoding:
 	    OF_STRING_ENCODING_NATIVE])) == NULL) {
 # ifdef OF_THREADS
 		[addrlist release];
 		[mutex unlock];
 # endif
@@ -490,11 +490,11 @@
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG | AI_PASSIVE;
 	snprintf(portCString, 7, "%" PRIu16, port);
 
-	if (getaddrinfo([host cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
+	if (getaddrinfo([host cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
 	    portCString, &hints, &res))
 		@throw [OFAddressTranslationFailedException
 		    exceptionWithClass: [self class]
 				socket: self
 				  host: host];
@@ -527,11 +527,11 @@
 
 # ifdef OF_THREADS
 	[mutex lock];
 # endif
 
-	if ((he = gethostbyname([host cStringUsingEncoding:
+	if ((he = gethostbyname([host cStringWithEncoding:
 	    OF_STRING_ENCODING_NATIVE])) == NULL) {
 # ifdef OF_THREADS
 		[mutex unlock];
 # endif
 		@throw [OFAddressTranslationFailedException