diff --git a/samples/echo/src/main/webapp/WEB-INF/springws-servlet.xml b/samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml
similarity index 88%
rename from samples/echo/src/main/webapp/WEB-INF/springws-servlet.xml
rename to samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml
index 021e9115..54a2ac6e 100755
--- a/samples/echo/src/main/webapp/WEB-INF/springws-servlet.xml
+++ b/samples/echo/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -5,7 +5,8 @@
           class="org.springframework.ws.transport.http.MessageEndpointHandlerAdapter">
         <description>
             This handler adapter makes sure that Spring's DispatcherServlet supports MessageEndpoint instances as
-            handlers. It uses a SAAJ to construct SoapMessageContexts (and SoapMessages).</description>
+            handlers. It uses a SAAJ to construct SoapMessageContexts (and SoapMessages).
+        </description>
         <property name="messageContextFactory">
             <bean class="org.springframework.ws.soap.saaj.SaajSoapMessageContextFactory"/>
         </property>
@@ -14,13 +15,15 @@
     <bean id="wsdlDefinitionHandlerAdapter" class="org.springframework.ws.transport.http.WsdlDefinitionHandlerAdapter">
         <description>
             This handler adapter adds support for WsdlDefinitions to Spring's DispatcherServlet. It transforms location
-            attributes in the original WSDL to reflect the URL of the incoming HTTP request.</description>
+            attributes in the original WSDL to reflect the URL of the incoming HTTP request.
+        </description>
         <property name="transformLocations" value="true"/>
     </bean>
 
     <bean id="handlerMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
         <description>
-            All incoming request are mapped to the messageDispatcher defined in applicationContext-ws.xml</description>
+            All incoming request are mapped to the messageDispatcher defined in applicationContext-ws.xml
+        </description>
         <property name="defaultHandler" ref="messageDispatcher"/>
         <property name="mappings">
             <props>
diff --git a/samples/echo/src/main/webapp/WEB-INF/web.xml b/samples/echo/src/main/webapp/WEB-INF/web.xml
index 151aab11..47987163 100755
--- a/samples/echo/src/main/webapp/WEB-INF/web.xml
+++ b/samples/echo/src/main/webapp/WEB-INF/web.xml
@@ -6,7 +6,8 @@
 
 <web-app>
     <display-name>
-        "Echo" WebService</display-name>
+        "Echo" WebService
+    </display-name>
     <description>Returns a given string(only A-Z and a-z chars allowed). See echo.xsd file.</description>
 
     <!--Location of the Log4J config file, for initialization and refresh checks.
@@ -34,18 +35,18 @@
 
     <!-- Starts the web service servlet. -->
     <servlet>
-        <servlet-name>springws</servlet-name>
+        <servlet-name>spring-ws</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
     </servlet>
 
     <!-- We map all service request to the springws servlet. -->
     <servlet-mapping>
-        <servlet-name>springws</servlet-name>
+        <servlet-name>spring-ws</servlet-name>
         <url-pattern>/services</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>springws</servlet-name>
+        <servlet-name>spring-ws</servlet-name>
         <url-pattern>*.wsdl</url-pattern>
     </servlet-mapping>