diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java
index b9c443bea8..88bb07a6af 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java
@@ -22,7 +22,7 @@ import java.net.SocketTimeoutException;
 import org.springframework.core.serializer.Deserializer;
 import org.springframework.integration.Message;
 import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException;
-import org.springframework.integration.ip.util.SocketIoUtils;
+import org.springframework.integration.ip.util.SocketUtils;
 
 /**
  * A TcpConnection that uses and underlying {@link Socket}.
@@ -162,7 +162,7 @@ public class TcpNetConnection extends AbstractTcpConnection {
 
 	public String getConnectionId() {
 		if (this.connectionId == null) {
-			this.connectionId = SocketIoUtils.getSocketId(this.socket);
+			this.connectionId = SocketUtils.getSocketId(this.socket);
 		}
 		return this.connectionId;
 	}
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java
index e186557dfb..ccbd4dadd0 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.springframework.integration.Message;
 import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException;
-import org.springframework.integration.ip.util.SocketIoUtils;
+import org.springframework.integration.ip.util.SocketUtils;
 
 /**
  * A TcpConnection that uses and underlying {@link SocketChannel}.
@@ -340,7 +340,7 @@ public class TcpNioConnection extends AbstractTcpConnection {
 
 	public String getConnectionId() {
 		if (this.connectionId == null) {
-			this.connectionId = SocketIoUtils.getSocketId(this.socketChannel.socket());			
+			this.connectionId = SocketUtils.getSocketId(this.socketChannel.socket());			
 		}
 		return this.connectionId;
 	}
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketUtils.java
similarity index 96%
rename from spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java
rename to spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketUtils.java
index 8441417c29..780b2e7b49 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketUtils.java
@@ -23,7 +23,7 @@ import java.net.Socket;
  * @author Gary Russell
  * @since 2.0
  */
-public abstract class SocketIoUtils {
+public abstract class SocketUtils {
 
 	public static String getSocketId(Socket socket) {
 		InetAddress inetAddress = socket.getInetAddress();
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
index 4882381548..e739ba9dd6 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
@@ -9,7 +9,7 @@
 		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
+	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
 
 	<int:channel id="udpChannel" />
 	<int:channel id="tcpChannel" />
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests-context.xml
index 218aa59a44..9d68a4cdab 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests-context.xml
@@ -9,7 +9,7 @@
 
 	<int:message-history/>
 
-	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
+	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
 
 	<int-ip:tcp-connection-factory id="server"
 		type="server"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
index af04d0963a..1caf6ce167 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
+	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
 	
 	<bean id="serializer" class="org.springframework.core.serializer.DefaultSerializer" />
 
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
index 742a3d9349..36c04d0690 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
@@ -9,7 +9,7 @@
 
 	<int:message-history/>
 	
-	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
+	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
 	
 	<bean id="serializer" class="org.springframework.core.serializer.DefaultSerializer" />
 
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
index 9a8f5512d8..b12c88be2e 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
@@ -10,7 +10,7 @@
 			http://www.springframework.org/schema/integration/ip
 			http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd">
 
-	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
+	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
 
 	<bean id="crLfSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer" />
 	<bean id="stxEtxSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer" />