diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationEndpointAdapter.java b/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapter.java
similarity index 98%
rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationEndpointAdapter.java
rename to core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapter.java
index ed940bfb..be537dbc 100644
--- a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationEndpointAdapter.java
+++ b/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapter.java
@@ -56,7 +56,8 @@ import org.w3c.dom.NodeList;
  *
  * @author Arjen Poutsma
  */
-public class XPathParamAnnotationEndpointAdapter extends AbstractMethodEndpointAdapter implements InitializingBean {
+public class XPathParamMethodAnnotationEndpointAdapter 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 c2acc9e4..8f3a1b2f 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.XPathParamAnnotationEndpointAdapter
+ * @see org.springframework.ws.server.endpoint.adapter.XPathParamMethodAnnotationEndpointAdapter
  */
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationEndpointAdapterTest.java b/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapterTest.java
similarity index 97%
rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationEndpointAdapterTest.java
rename to core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapterTest.java
index 1802ead6..464d7073 100644
--- a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationEndpointAdapterTest.java
+++ b/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamMethodAnnotationEndpointAdapterTest.java
@@ -31,18 +31,18 @@ import org.springframework.xml.transform.StringSource;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-public class XPathParamAnnotationEndpointAdapterTest extends TestCase {
+public class XPathParamMethodAnnotationEndpointAdapterTest extends TestCase {
 
     private static final String CONTENTS = "<root><child><text>text</text><number>42.0</number></child></root>";
 
-    private XPathParamAnnotationEndpointAdapter adapter;
+    private XPathParamMethodAnnotationEndpointAdapter adapter;
 
     private boolean supportedTypesInvoked = false;
 
     private boolean supportedSourceInvoked;
 
     protected void setUp() throws Exception {
-        adapter = new XPathParamAnnotationEndpointAdapter();
+        adapter = new XPathParamMethodAnnotationEndpointAdapter();
         adapter.afterPropertiesSet();
     }