@@ -104,11 +104,11 @@
 		return;
 	}
 
 	data = [OFData dataWithItems: "\x05\x01\x00" count: 3];
 
-	_SOCKS5State = OF_SOCKS5_STATE_SEND_AUTHENTICATION;
+	_SOCKS5State = OFSOCKS5StateSendAuthentication;
 	[_socket asyncWriteData: data
 		    runLoopMode: [OFRunLoop currentRunLoop].currentMode];
 }
 
 -      (bool)stream: (OFStream *)sock
@@ -129,11 +129,11 @@
 	}
 
 	runLoopMode = [OFRunLoop currentRunLoop].currentMode;
 
 	switch (_SOCKS5State) {
-	case OF_SOCKS5_STATE_READ_VERSION:
+	case OFSOCKS5StateReadVersion:
 		SOCKSVersion = buffer;
 
 		if (SOCKSVersion[0] != 5 || SOCKSVersion[1] != 0) {
 			_exception = [[OFConnectionFailedException alloc]
 			    initWithHost: _host
@@ -155,14 +155,14 @@
 
 		port[0] = _port >> 8;
 		port[1] = _port & 0xFF;
 		[_request addItems: port count: 2];
 
-		_SOCKS5State = OF_SOCKS5_STATE_SEND_REQUEST;
+		_SOCKS5State = OFSOCKS5StateSendRequest;
 		[_socket asyncWriteData: _request runLoopMode: runLoopMode];
 		return false;
-	case OF_SOCKS5_STATE_READ_RESPONSE:
+	case OFSOCKS5StateReadResponse:
 		response = buffer;
 
 		if (response[0] != 5 || response[2] != 0) {
 			_exception = [[OFConnectionFailedException alloc]
 			    initWithHost: _host
@@ -217,23 +217,23 @@
 		}
 
 		/* Skip the rest of the response */
 		switch (response[3]) {
 		case 1: /* IPv4 */
-			_SOCKS5State = OF_SOCKS5_STATE_READ_ADDRESS;
+			_SOCKS5State = OFSOCKS5StateReadAddress;
 			[_socket asyncReadIntoBuffer: _buffer
 					 exactLength: 4 + 2
 					 runLoopMode: runLoopMode];
 			return false;
 		case 3: /* Domain name */
-			_SOCKS5State = OF_SOCKS5_STATE_READ_ADDRESS_LENGTH;
+			_SOCKS5State = OFSOCKS5StateReadAddressLength;
 			[_socket asyncReadIntoBuffer: _buffer
 					 exactLength: 1
 					 runLoopMode: runLoopMode];
 			return false;
 		case 4: /* IPv6 */
-			_SOCKS5State = OF_SOCKS5_STATE_READ_ADDRESS;
+			_SOCKS5State = OFSOCKS5StateReadAddress;
 			[_socket asyncReadIntoBuffer: _buffer
 					 exactLength: 16 + 2
 					 runLoopMode: runLoopMode];
 			return false;
 		default:
@@ -245,17 +245,17 @@
 			[self didConnect];
 			return false;
 		}
 
 		return false;
-	case OF_SOCKS5_STATE_READ_ADDRESS:
+	case OFSOCKS5StateReadAddress:
 		[self didConnect];
 		return false;
-	case OF_SOCKS5_STATE_READ_ADDRESS_LENGTH:
+	case OFSOCKS5StateReadAddressLength:
 		addressLength = buffer;
 
-		_SOCKS5State = OF_SOCKS5_STATE_READ_ADDRESS;
+		_SOCKS5State = OFSOCKS5StateReadAddress;
 		[_socket asyncReadIntoBuffer: _buffer
 				 exactLength: addressLength[0] + 2
 				 runLoopMode: runLoopMode];
 		return false;
 	default:
@@ -278,21 +278,21 @@
 	}
 
 	runLoopMode = [OFRunLoop currentRunLoop].currentMode;
 
 	switch (_SOCKS5State) {
-	case OF_SOCKS5_STATE_SEND_AUTHENTICATION:
-		_SOCKS5State = OF_SOCKS5_STATE_READ_VERSION;
+	case OFSOCKS5StateSendAuthentication:
+		_SOCKS5State = OFSOCKS5StateReadVersion;
 		[_socket asyncReadIntoBuffer: _buffer
 				 exactLength: 2
 				 runLoopMode: runLoopMode];
 		return nil;
-	case OF_SOCKS5_STATE_SEND_REQUEST:
+	case OFSOCKS5StateSendRequest:
 		[_request release];
 		_request = nil;
 
-		_SOCKS5State = OF_SOCKS5_STATE_READ_RESPONSE;
+		_SOCKS5State = OFSOCKS5StateReadResponse;
 		[_socket asyncReadIntoBuffer: _buffer
 				 exactLength: 4
 				 runLoopMode: runLoopMode];
 		return nil;
 	default: