diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
index a7bb3b3b9..8140aacbc 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
@@ -44,8 +44,8 @@ import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.params.HttpParams;
 import org.apache.http.impl.SocketHttpClientConnection;
-import org.apache.http.io.HttpDataReceiver;
-import org.apache.http.io.HttpDataTransmitter;
+import org.apache.http.io.SessionInputBuffer;
+import org.apache.http.io.SessionOutputBuffer;
 
 import org.apache.http.conn.OperatedClientConnection;
 
@@ -136,33 +136,33 @@ public class DefaultClientConnection extends SocketHttpClientConnection
     }
 
 
-    protected HttpDataReceiver createHttpDataReceiver(
+    protected SessionInputBuffer createHttpDataReceiver(
             final Socket socket,
             int buffersize,
             final HttpParams params) throws IOException {
-        HttpDataReceiver receiver = super.createHttpDataReceiver(
+        SessionInputBuffer inbuffer = super.createSessionInputBuffer(
                 socket, 
                 buffersize,
                 params);
         if (WIRE_LOG.isDebugEnabled()) {
-            receiver = new LoggingHttpDataReceiverDecorator(receiver, new Wire(WIRE_LOG));
+            inbuffer = new LoggingSessionInputBuffer(inbuffer, new Wire(WIRE_LOG));
         }
-        return receiver;
+        return inbuffer;
     }
 
     
-    protected HttpDataTransmitter createHttpDataTransmitter(
+    protected SessionOutputBuffer createHttpDataTransmitter(
             final Socket socket,
             int buffersize,
             final HttpParams params) throws IOException {
-        HttpDataTransmitter transmitter = super.createHttpDataTransmitter(
+        SessionOutputBuffer outbuffer = super.createSessionOutputBuffer(
                 socket,
                 buffersize,
                 params);
         if (WIRE_LOG.isDebugEnabled()) {
-            transmitter = new LoggingHttpDataTransmitterDecorator(transmitter, new Wire(WIRE_LOG));
+            outbuffer = new LoggingSessionOutputBuffer(outbuffer, new Wire(WIRE_LOG));
         }
-        return transmitter;
+        return outbuffer;
     }
 
     
diff --git a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java b/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
similarity index 89%
rename from module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
rename to module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
index f8c965f66..5f36f0d14 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
@@ -32,8 +32,8 @@ package org.apache.http.impl.conn;
 
 import java.io.IOException;
 
-import org.apache.http.io.HttpDataReceiver;
 import org.apache.http.io.HttpTransportMetrics;
+import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -45,20 +45,20 @@ import org.apache.http.util.CharArrayBuffer;
  * 
  * @since 4.0
  */
-class LoggingHttpDataReceiverDecorator implements HttpDataReceiver {
+class LoggingSessionInputBuffer implements SessionInputBuffer {
      
-    /** Original data receiver. */
-    private final HttpDataReceiver in;
+    /** Original session input buffer. */
+    private final SessionInputBuffer in;
 
     /** The wire log to use for writing. */
     private final Wire wire;
     
     /**
-     * Create an instance that wraps the specified HTTP data receiver.
-     * @param in The input stream.
+     * Create an instance that wraps the specified session input buffer.
+     * @param in The session input buffer.
      * @param wire The wire log to use.
      */
-    public LoggingHttpDataReceiverDecorator(final HttpDataReceiver in, final Wire wire) {
+    public LoggingSessionInputBuffer(final SessionInputBuffer in, final Wire wire) {
         super();
         this.in = in;
         this.wire = wire;
diff --git a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java b/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
similarity index 88%
rename from module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
rename to module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
index 122022707..c4ee90e3e 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
@@ -32,8 +32,8 @@ package org.apache.http.impl.conn;
 
 import java.io.IOException;
 
-import org.apache.http.io.HttpDataTransmitter;
 import org.apache.http.io.HttpTransportMetrics;
+import org.apache.http.io.SessionOutputBuffer;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -43,20 +43,20 @@ import org.apache.http.util.CharArrayBuffer;
  * 
  * @since 4.0
  */
-class LoggingHttpDataTransmitterDecorator implements HttpDataTransmitter {
+class LoggingSessionOutputBuffer implements SessionOutputBuffer {
 
     /** Original data transmitter. */
-    private final HttpDataTransmitter out;
+    private final SessionOutputBuffer out;
     
     /** The wire log to use. */
     private final Wire wire;
 
     /**
-     * Create an instance that wraps the specified output stream.
-     * @param out The output stream.
+     * Create an instance that wraps the specified session output buffer.
+     * @param out The session output buffer.
      * @param wire The Wire log to use.
      */
-    public LoggingHttpDataTransmitterDecorator(final HttpDataTransmitter out, final Wire wire) {
+    public LoggingSessionOutputBuffer(final SessionOutputBuffer out, final Wire wire) {
         super();
         this.out = out;
         this.wire = wire;