diff --git a/src/docbkx/server.xml b/src/docbkx/server.xml
index fdea778e..b42d01ac 100644
--- a/src/docbkx/server.xml
+++ b/src/docbkx/server.xml
@@ -439,7 +439,7 @@
     <bean id="messageDispatcher" class="org.springframework.ws.soap.server.SoapMessageDispatcher">
         <property name="endpointMappings">
             <bean
-              class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">
+              class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping">
                 <property name="defaultEndpoint">
                     <bean class="com.example.MyEndpoint"/>
                 </property>
@@ -493,8 +493,8 @@
         <property name="endpointMappings" ref="endpointMapping"/>
     </bean>
 
-    <bean id="endpointMapping" class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">
-        <property name="defaultEndpoint" ref="stockEndpoint"
+    <bean id="endpointMapping" class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping">
+        <property name="defaultEndpoint" ref="stockEndpoint"/>
     </bean>
     
     <bean id="httpServer" class="org.springframework.remoting.support.SimpleHttpServerFactoryBean">
@@ -554,7 +554,7 @@
     <bean id="messageDispatcher" class="org.springframework.ws.soap.server.SoapMessageDispatcher">
         <property name="endpointMappings">
             <bean
-              class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">
+              class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping">
                 <property name="defaultEndpoint">
                     <bean class="com.example.MyEndpoint"/>
                 </property>