@@ -48,15 +48,15 @@
  * To connect to a server, create a socket and connect it.
  * To create a server, create a socket, bind it and listen on it.
  */
 @interface OFTCPSocket: OFStreamSocket
 {
-	BOOL			listening;
-	struct sockaddr_storage	*sockAddr;
-	socklen_t		sockAddrLen;
-	OFString		*SOCKS5Host;
-	uint16_t		SOCKS5Port;
+	BOOL _listening;
+	struct sockaddr_storage *_sockAddr;
+	socklen_t _sockAddrLen;
+	OFString *_SOCKS5Host;
+	uint16_t _SOCKS5Port;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly, getter=isListening) BOOL listening;
 @property (copy) OFString *SOCKS5Host;
@@ -64,13 +64,14 @@
 #endif
 
 /*!
  * @brief Sets the global SOCKS5 proxy host to use when creating a new socket
  *
- * @param host The host to use as a SOCKS5 proxy when creating a new socket
+ * @param SOCKS5Host The host to use as a SOCKS5 proxy when creating a new
+ *		     socket
  */
-+ (void)setSOCKS5Host: (OFString*)host;
++ (void)setSOCKS5Host: (OFString*)SOCKS5Host;
 
 /*!
  * @brief Returns the host to use as a SOCKS5 proxy when creating a new socket
  *
  * @return The host to use as a SOCKS5 proxy when creating a new socket
@@ -78,13 +79,13 @@
 + (OFString*)SOCKS5Host;
 
 /*!
  * @brief Sets the global SOCKS5 proxy port to use when creating a new socket
  *
- * @param port The port to use as a SOCKS5 proxy when creating a new socket
+ * @param SOCKS5Port The port to use as a SOCKS5 proxy when creating a new socket
  */
-+ (void)setSOCKS5Port: (uint16_t)port;
++ (void)setSOCKS5Port: (uint16_t)SOCKS5Port;
 
 /*!
  * @brief Returns the port to use as a SOCKS5 proxy when creating a new socket
  *
  * @return The port to use as a SOCKS5 proxy when creating a new socket