@@ -51,11 +51,11 @@
 - init
 {
 	self = [super init];
 
 	sock = INVALID_SOCKET;
-	saddr = NULL;
+	sockAddr = NULL;
 
 	return self;
 }
 
 - (void)connectToService: (OFString*)service
@@ -347,12 +347,12 @@
 		[newsock dealloc];
 		@throw [OFAcceptFailedException newWithClass: isa];
 	}
 
 	newsock->sock = s;
-	newsock->saddr = addr;
-	newsock->saddr_len = addrlen;
+	newsock->sockAddr = addr;
+	newsock->sockAddrLen = addrlen;
 
 	return newsock;
 }
 
 - (void)setKeepAlivesEnabled: (BOOL)enable
@@ -363,20 +363,20 @@
 		@throw [OFSetOptionFailedException newWithClass: isa];
 }
 
 - (OFString*)remoteAddress
 {
-	if (saddr == NULL || saddr_len == 0)
+	if (sockAddr == NULL || sockAddrLen == 0)
 		@throw [OFInvalidArgumentException newWithClass: isa
 						       selector: _cmd];
 
 #ifdef HAVE_THREADSAFE_GETADDRINFO
 	char *node = [self allocMemoryWithSize: NI_MAXHOST];
 
 	@try {
-		if (getnameinfo(saddr, saddr_len, node, NI_MAXHOST, NULL, 0,
-		    NI_NUMERICHOST))
+		if (getnameinfo(sockAddr, sockAddrLen, node, NI_MAXHOST, NULL,
+		    0, NI_NUMERICHOST))
 			@throw [OFAddressTranslationFailedException
 			    newWithClass: isa];
 
 		return [OFString stringWithCString: node];
 	} @finally {
@@ -388,11 +388,11 @@
 # ifdef OF_THREADS
 	[mutex lock];
 
 	@try {
 # endif
-		node = inet_ntoa(((struct sockaddr_in*)saddr)->sin_addr);
+		node = inet_ntoa(((struct sockaddr_in*)sockAddr)->sin_addr);
 
 		if (node == NULL)
 			@throw [OFAddressTranslationFailedException
 			    newWithClass: isa];
 
@@ -414,13 +414,13 @@
 		@throw [OFNotConnectedException newWithClass: isa];
 
 	close(sock);
 	sock = INVALID_SOCKET;
 
-	[self freeMemory: saddr];
-	saddr = NULL;
-	saddr_len = 0;
+	[self freeMemory: sockAddr];
+	sockAddr = NULL;
+	sockAddrLen = 0;
 }
 
 - (void)dealloc
 {
 	if (sock != INVALID_SOCKET)