diff --git a/core/src/main/java/org/springframework/ws/transport/SimpleTransportContext.java b/core/src/main/java/org/springframework/ws/transport/DefaultTransportContext.java
similarity index 75%
rename from core/src/main/java/org/springframework/ws/transport/SimpleTransportContext.java
rename to core/src/main/java/org/springframework/ws/transport/DefaultTransportContext.java
index 32ea9024..ac89c9ea 100644
--- a/core/src/main/java/org/springframework/ws/transport/SimpleTransportContext.java
+++ b/core/src/main/java/org/springframework/ws/transport/DefaultTransportContext.java
@@ -17,21 +17,21 @@
 package org.springframework.ws.transport;
 
 /**
- * Simple implementation of the <code>TransportContext</code> interface.
+ * Default implementation of the <code>TransportContext</code> interface.
  *
  * @author Arjen Poutsma
  */
-public class SimpleTransportContext implements TransportContext {
+public class DefaultTransportContext implements TransportContext {
 
     private final TransportInputStream transportInputStream;
 
     private final TransportOutputStream transportOutputStream;
 
     /**
-     * Creates a new <code>SimpleTransportContext</code> that exposes the given streams.
+     * Creates a new <code>DefaultTransportContext</code> that exposes the given streams.
      */
-    public SimpleTransportContext(TransportInputStream transportInputStream,
-                                  TransportOutputStream transportOutputStream) {
+    public DefaultTransportContext(TransportInputStream transportInputStream,
+                                   TransportOutputStream transportOutputStream) {
         this.transportInputStream = transportInputStream;
         this.transportOutputStream = transportOutputStream;
     }
diff --git a/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java b/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java
index 8bd23090..1a4f5f74 100644
--- a/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java
+++ b/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java
@@ -33,7 +33,7 @@ import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.endpoint.MessageEndpoint;
 import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.transport.SimpleTransportContext;
+import org.springframework.ws.transport.DefaultTransportContext;
 import org.springframework.ws.transport.TransportContext;
 import org.springframework.ws.transport.TransportContextHolder;
 import org.springframework.ws.transport.TransportInputStream;
@@ -94,7 +94,7 @@ public class MessageEndpointHandlerAdapter implements HandlerAdapter, Initializi
         TransportOutputStream tos = new HttpServletTransportOutputStream(httpServletResponse);
 
         TransportContext previousTransportContext = TransportContextHolder.getTransportContext();
-        TransportContextHolder.setTransportContext(new SimpleTransportContext(tis, tos));
+        TransportContextHolder.setTransportContext(new DefaultTransportContext(tis, tos));
 
         try {
             WebServiceMessage messageRequest = messageFactory.createWebServiceMessage(tis);
diff --git a/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMappingTest.java
index 16675d87..54aa73a9 100644
--- a/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMappingTest.java
+++ b/core/src/test/java/org/springframework/ws/soap/endpoint/mapping/SoapActionEndpointMappingTest.java
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
 import org.springframework.ws.MockWebServiceMessageFactory;
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
-import org.springframework.ws.transport.SimpleTransportContext;
+import org.springframework.ws.transport.DefaultTransportContext;
 import org.springframework.ws.transport.StubTransportInputStream;
 import org.springframework.ws.transport.StubTransportOutputStream;
 import org.springframework.ws.transport.TransportContext;
@@ -45,7 +45,7 @@ public class SoapActionEndpointMappingTest extends TestCase {
         headers = new HashMap();
         TransportInputStream tis = new StubTransportInputStream(new ByteArrayInputStream(new byte[0]), headers);
         TransportOutputStream tos = new StubTransportOutputStream(new ByteArrayOutputStream());
-        TransportContext transportContext = new SimpleTransportContext(tis, tos);
+        TransportContext transportContext = new DefaultTransportContext(tis, tos);
         TransportContextHolder.setTransportContext(transportContext);
         mapping = new SoapActionEndpointMapping();
         context = new DefaultMessageContext(new MockWebServiceMessageFactory());
diff --git a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportMessageListener.java b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportMessageListener.java
index 325c058d..43f989b8 100644
--- a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportMessageListener.java
+++ b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportMessageListener.java
@@ -32,7 +32,7 @@ import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.endpoint.MessageEndpoint;
-import org.springframework.ws.transport.SimpleTransportContext;
+import org.springframework.ws.transport.DefaultTransportContext;
 import org.springframework.ws.transport.TransportContext;
 import org.springframework.ws.transport.TransportContextHolder;
 import org.springframework.ws.transport.TransportInputStream;
@@ -82,7 +82,7 @@ public class JmsTransportMessageListener implements MessageListener, Initializin
         TransportOutputStream tos = new JmsTransportOutputStream(getSession());
 
         TransportContext previousTransportContext = TransportContextHolder.getTransportContext();
-        TransportContextHolder.setTransportContext(new SimpleTransportContext(tis, tos));
+        TransportContextHolder.setTransportContext(new DefaultTransportContext(tis, tos));
 
         try {
             WebServiceMessage messageRequest = messageFactory.createWebServiceMessage(tis);