diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapter.java b/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java
similarity index 99%
rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapter.java
rename to core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java
index be537dbc..405fe3b2 100644
--- a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapter.java
+++ b/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java
@@ -56,7 +56,7 @@ import org.w3c.dom.NodeList;
  *
  * @author Arjen Poutsma
  */
-public class XPathParamMethodAnnotationEndpointAdapter extends AbstractMethodEndpointAdapter
+public class XPathParamAnnotationMethodEndpointAdapter extends AbstractMethodEndpointAdapter
         implements InitializingBean {
 
     private XPathFactory xpathFactory;
diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java b/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java
index 8f3a1b2f..27b535b6 100644
--- a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java
+++ b/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
  * org.w3c.dom.Node}</li> <li>{@link org.w3c.dom.NodeList}</li> </ul>
  *
  * @author Arjen Poutsma
- * @see org.springframework.ws.server.endpoint.adapter.XPathParamMethodAnnotationEndpointAdapter
+ * @see org.springframework.ws.server.endpoint.adapter.XPathParamAnnotationMethodEndpointAdapter
  */
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapterTest.java b/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java
similarity index 97%
rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapterTest.java
rename to core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java
index 464d7073..4b9d026b 100644
--- a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapterTest.java
+++ b/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java
@@ -31,18 +31,18 @@ import org.springframework.xml.transform.StringSource;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-public class XPathParamMethodAnnotationEndpointAdapterTest extends TestCase {
+public class XPathParamAnnotationMethodEndpointAdapterTest extends TestCase {
 
     private static final String CONTENTS = "<root><child><text>text</text><number>42.0</number></child></root>";
 
-    private XPathParamMethodAnnotationEndpointAdapter adapter;
+    private XPathParamAnnotationMethodEndpointAdapter adapter;
 
     private boolean supportedTypesInvoked = false;
 
     private boolean supportedSourceInvoked;
 
     protected void setUp() throws Exception {
-        adapter = new XPathParamMethodAnnotationEndpointAdapter();
+        adapter = new XPathParamAnnotationMethodEndpointAdapter();
         adapter.afterPropertiesSet();
     }