diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
index 90e1bdda73..107d3a8419 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
@@ -19,7 +19,7 @@
 
 	<!-- The service activator receives from the 'fahrenheitChannel', invokes the
 	     Web Service for the given URI, and sends the reply Message to the 'celsiusChannel'. -->
-	<ws:ws-service-activator id="temperatureConverter"
+	<ws:service-activator id="temperatureConverter"
 				          input-channel="fahrenheitChannel" 
 				          output-channel="celsiusChannel"
 				          uri="http://www.w3schools.com/webservices/tempconvert.asmx"/>
diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java
index 103e940e57..667c628037 100644
--- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java
+++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WsNamespaceHandler.java
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 public class WsNamespaceHandler extends NamespaceHandlerSupport {
 
 	public void init() {
-		this.registerBeanDefinitionParser("ws-service-activator", new WebServiceHandlerParser());
+		this.registerBeanDefinitionParser("service-activator", new WebServiceHandlerParser());
 	}
 
 }
diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
index 6b448d67c7..7d046d8987 100644
--- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
+++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
@@ -16,7 +16,7 @@
 		]]></xsd:documentation>
 	</xsd:annotation>
 
-	<xsd:element name="ws-service-activator">
+	<xsd:element name="service-activator">
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
index 38a40ae3c3..cf02454815 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
@@ -12,35 +12,35 @@
 
 	<si:channel id="inputChannel"/>
 
-	<ws:ws-service-activator id="handlerWithAllInOneMarshaller"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         marshaller="marshallerAndUnmarshaller"/>
+	<ws:service-activator id="handlerWithAllInOneMarshaller"
+	                      input-channel="inputChannel"
+                          uri="http://example.org"
+	                      marshaller="marshallerAndUnmarshaller"/>
 
-	<ws:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshaller"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         marshaller="marshaller"
-	                         unmarshaller="unmarshaller"/>
+	<ws:service-activator id="handlerWithSeparateMarshallerAndUnmarshaller"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      marshaller="marshaller"
+	                      unmarshaller="unmarshaller"/>
 
-	<ws:ws-service-activator id="handlerWithCustomRequestCallback"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         marshaller="marshallerAndUnmarshaller"
-	                         request-callback="requestCallback"/>
+	<ws:service-activator id="handlerWithCustomRequestCallback"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      marshaller="marshallerAndUnmarshaller"
+	                      request-callback="requestCallback"/>
 
-	<ws:ws-service-activator id="handlerWithAllInOneMarshallerAndMessageFactory"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         marshaller="marshallerAndUnmarshaller"
-	                         message-factory="messageFactory"/>
+	<ws:service-activator id="handlerWithAllInOneMarshallerAndMessageFactory"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      marshaller="marshallerAndUnmarshaller"
+	                      message-factory="messageFactory"/>
 
-	<ws:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshallerAndMessageFactory"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         marshaller="marshaller"
-	                         unmarshaller="unmarshaller"
-	                         message-factory="messageFactory"/>
+	<ws:service-activator id="handlerWithSeparateMarshallerAndUnmarshallerAndMessageFactory"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      marshaller="marshaller"
+	                      unmarshaller="unmarshaller"
+	                      message-factory="messageFactory"/>
 
 	<bean id="marshallerAndUnmarshaller" class="org.springframework.integration.ws.config.StubMarshallerAndUnmarshaller"/>
 
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
index 3afe666a53..d4624c0d08 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
@@ -12,35 +12,35 @@
 
 	<si:channel id="inputChannel"/>
 
-	<ws:ws-service-activator id="handlerWithDefaultSourceExtractor"
-		                     input-channel="inputChannel"
-	                         uri="http://example.org"/>
+	<ws:service-activator id="handlerWithDefaultSourceExtractor"
+		                  input-channel="inputChannel"
+	                      uri="http://example.org"/>
 
-	<ws:ws-service-activator id="handlerWithCustomSourceExtractor"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         source-extractor="sourceExtractor"/>
+	<ws:service-activator id="handlerWithCustomSourceExtractor"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      source-extractor="sourceExtractor"/>
 
-	<ws:ws-service-activator id="handlerWithCustomRequestCallback"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         request-callback="requestCallback"/>
+	<ws:service-activator id="handlerWithCustomRequestCallback"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      request-callback="requestCallback"/>
 
-	<ws:ws-service-activator id="handlerWithCustomMessageFactory"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         message-factory="messageFactory"/>
+	<ws:service-activator id="handlerWithCustomMessageFactory"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      message-factory="messageFactory"/>
 
-	<ws:ws-service-activator id="handlerWithCustomSourceExtractorAndMessageFactory"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         source-extractor="sourceExtractor"
-	                         message-factory="messageFactory"/>
+	<ws:service-activator id="handlerWithCustomSourceExtractorAndMessageFactory"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      source-extractor="sourceExtractor"
+	                      message-factory="messageFactory"/>
 
-	<ws:ws-service-activator id="handlerWithCustomFaultMessageResolver"
-	                         input-channel="inputChannel"
-	                         uri="http://example.org"
-	                         fault-message-resolver="faultMessageResolver"/>
+	<ws:service-activator id="handlerWithCustomFaultMessageResolver"
+	                      input-channel="inputChannel"
+	                      uri="http://example.org"
+	                      fault-message-resolver="faultMessageResolver"/>
 
 	<bean id="sourceExtractor" class="org.springframework.integration.ws.config.StubSourceExtractor"/>