diff --git a/jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/server/WSEndpointImpl.java b/jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/server/WSEndpointImpl.java
index c653bd5c2..fbe4fa627 100644
--- a/jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/server/WSEndpointImpl.java
+++ b/jaxws-ri/runtime/rt/src/main/java/com/sun/xml/ws/server/WSEndpointImpl.java
@@ -209,7 +209,7 @@ protected WSEndpointImpl(@NotNull QName serviceName, @NotNull QName portName, WS
 
   protected ServerTubeAssemblerContext createServerTubeAssemblerContext(
             EndpointAwareTube terminalTube, boolean isSynchronous) {
-    ServerTubeAssemblerContext ctx = new ServerTubeAssemblerContext(
+    ServerTubeAssemblerContext ctx = new ServerPipeAssemblerContext(
         seiModel, port, this, terminalTube, isSynchronous);
     return ctx;
   }
@@ -234,7 +234,7 @@ protected WSEndpointImpl(@NotNull QName serviceName, @NotNull QName portName, WS
         initManagedObjectManager();
 
         this.operationDispatcher = (port == null) ? null : new OperationDispatcher(port, binding, seiModel);
-            this.context = new ServerTubeAssemblerContext(
+            this.context = new ServerPipeAssemblerContext(
                 seiModel, port, this, null /* not known */, false);
 
                 tubePool = new TubePool(masterTubeline);