diff --git a/spring-integration-core/src/main/java/org/springframework/commons/serializer/InputStreamingConverter.java b/spring-integration-core/src/main/java/org/springframework/commons/serializer/InputStreamingConverter.java
index 4c9bbcf3af..8a47a14226 100644
--- a/spring-integration-core/src/main/java/org/springframework/commons/serializer/InputStreamingConverter.java
+++ b/spring-integration-core/src/main/java/org/springframework/commons/serializer/InputStreamingConverter.java
@@ -31,7 +31,7 @@ public interface InputStreamingConverter<T> {
 	
 	/**
 	 * Read (assemble an object of type T) from an InputStream.
-	 * @param is The InputStream.
+	 * @param inputStream The InputStream.
 	 * @return The object.
 	 * @throws IOException
 	 */
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java
index b498d3f50a..9db9edfdf2 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java
@@ -232,7 +232,7 @@ public abstract class AbstractConnectionFactory
 	 * Registers a TcpSender; for server sockets, used to 
 	 * provide connection information so a sender can be used
 	 * to reply to incoming messages.
-	 * @param tcpSendingMessageHandler
+	 * @param sender The sender
 	 */
 	public void registerSender(TcpSender sender) {
 		Assert.isNull(this.sender, this.getClass().getName() +
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java
index af1889ca60..3dba24ab1b 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java
@@ -79,14 +79,14 @@ public abstract class AbstractTcpConnection implements TcpConnection {
 	}
 
 	/**
-	 * @param converter the input converter to set
+	 * @param inputConverter the input converter to set
 	 */
 	public void setInputConverter(InputStreamingConverter<?> inputConverter) {
 		this.inputConverter = inputConverter;
 	}
 
 	/**
-	 * @param converter the output converter to set 
+	 * @param outputConverter the output converter to set 
 	 */
 	public void setOutputConverter(OutputStreamingConverter<?> outputConverter) {
 		this.outputConverter = outputConverter;
@@ -96,7 +96,7 @@ public abstract class AbstractTcpConnection implements TcpConnection {
 	}
 
 	/**
-	 * @param sender the listener to set
+	 * @param listener the listener to set
 	 */
 	public void registerListener(TcpListener listener) {
 		this.listener = listener;
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java
index d017af5b93..11fdb6e878 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java
@@ -55,7 +55,7 @@ public interface TcpConnection extends Runnable {
 	/**
 	 * Uses the input converter to obtain the message payload
 	 * from the connection's input stream.
-	 * @return
+	 * @return The payload
 	 * @throws Exception 
 	 */
 	public Object getPayload() throws Exception;
@@ -77,7 +77,7 @@ public interface TcpConnection extends Runnable {
 
 	/**
 	 * Sets the listener that will receive incoming Messages. 
-	 * @param listener
+	 * @param listener The listener
 	 */
 	public void registerListener(TcpListener listener);
 
@@ -96,7 +96,7 @@ public interface TcpConnection extends Runnable {
 	
 	/**
 	 * When true, the socket is used once and discarded.
-	 * @param singleUse
+	 * @param singleUse the singleUse
 	 */
 	public void setSingleUse(boolean singleUse);
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java
index 6a16f96f44..9b6df926b6 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java
@@ -37,7 +37,7 @@ public interface TcpListener {
 	/**
 	 * Return true if the connection factory is a server
 	 * and it is listening.
-	 * @return
+	 * @return true if listening
 	 */
 	public boolean isListening();
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java
index b10c056308..b304e7fd31 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java
@@ -21,7 +21,7 @@ import java.net.Socket;
 import javax.net.SocketFactory;
 
 /**
- * A client connection factory that creates {@link TcpNetConection}s. 
+ * A client connection factory that creates {@link TcpNetConnection}s. 
  * @author Gary Russell
  * @since 2.0
  *
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java
index 7d7b2e10f9..38c1c11269 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java
@@ -166,7 +166,7 @@ public class TcpNioClientConnectionFactory extends
 													e.getMessage());
 											connection.close();
 										} else {
-											logger.debug("Conection closed");
+											logger.debug("Connection closed");
 										}
 									}
 									if (key.channel().isOpen()) {
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
index 1bc75f32c6..3d4c0525d6 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
@@ -167,7 +167,7 @@ public class TcpNioServerConnectionFactory extends AbstractServerConnectionFacto
 										logger.error("Exception on read " + e.getMessage());
 										connection.close();
 									} else {
-										logger.debug("Conection closed");
+										logger.debug("Connection closed");
 									}
 								}
 								if (key.channel().isOpen()) {