diff --git a/samples/airline/client/jax-ws/build.xml b/samples/airline/client/jaxws/build.xml
similarity index 99%
rename from samples/airline/client/jax-ws/build.xml
rename to samples/airline/client/jaxws/build.xml
index 7704d74b..5e8f5fec 100644
--- a/samples/airline/client/jax-ws/build.xml
+++ b/samples/airline/client/jaxws/build.xml
@@ -23,7 +23,7 @@
             </classpath>
         </taskdef>
         <wsimport wsdl="http://localhost:8080/airline/airline.wsdl" destdir="${bin.dir}" sourcedestdir="${src.dir}"
-                  package="org.springframework.ws.samples.airline.client.jws"/>
+                  package="org.springframework.ws.samples.airline.client.jaxws"/>
     </target>
 
     <target name="build" depends="init">
diff --git a/samples/airline/client/jax-ws/lib/activation.jar b/samples/airline/client/jaxws/lib/activation.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/activation.jar
rename to samples/airline/client/jaxws/lib/activation.jar
diff --git a/samples/airline/client/jax-ws/lib/jaxb-api.jar b/samples/airline/client/jaxws/lib/jaxb-api.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/jaxb-api.jar
rename to samples/airline/client/jaxws/lib/jaxb-api.jar
diff --git a/samples/airline/client/jax-ws/lib/jaxb-impl.jar b/samples/airline/client/jaxws/lib/jaxb-impl.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/jaxb-impl.jar
rename to samples/airline/client/jaxws/lib/jaxb-impl.jar
diff --git a/samples/airline/client/jax-ws/lib/jaxb-xjc.jar b/samples/airline/client/jaxws/lib/jaxb-xjc.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/jaxb-xjc.jar
rename to samples/airline/client/jaxws/lib/jaxb-xjc.jar
diff --git a/samples/airline/client/jax-ws/lib/jaxws-api.jar b/samples/airline/client/jaxws/lib/jaxws-api.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/jaxws-api.jar
rename to samples/airline/client/jaxws/lib/jaxws-api.jar
diff --git a/samples/airline/client/jax-ws/lib/jaxws-rt.jar b/samples/airline/client/jaxws/lib/jaxws-rt.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/jaxws-rt.jar
rename to samples/airline/client/jaxws/lib/jaxws-rt.jar
diff --git a/samples/airline/client/jax-ws/lib/jaxws-tools.jar b/samples/airline/client/jaxws/lib/jaxws-tools.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/jaxws-tools.jar
rename to samples/airline/client/jaxws/lib/jaxws-tools.jar
diff --git a/samples/airline/client/jax-ws/lib/jsr173_api.jar b/samples/airline/client/jaxws/lib/jsr173_api.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/jsr173_api.jar
rename to samples/airline/client/jaxws/lib/jsr173_api.jar
diff --git a/samples/airline/client/jax-ws/lib/jsr181-api.jar b/samples/airline/client/jaxws/lib/jsr181-api.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/jsr181-api.jar
rename to samples/airline/client/jaxws/lib/jsr181-api.jar
diff --git a/samples/airline/client/jax-ws/lib/resolver.jar b/samples/airline/client/jaxws/lib/resolver.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/resolver.jar
rename to samples/airline/client/jaxws/lib/resolver.jar
diff --git a/samples/airline/client/jax-ws/lib/saaj-api.jar b/samples/airline/client/jaxws/lib/saaj-api.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/saaj-api.jar
rename to samples/airline/client/jaxws/lib/saaj-api.jar
diff --git a/samples/airline/client/jax-ws/lib/saaj-impl.jar b/samples/airline/client/jaxws/lib/saaj-impl.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/saaj-impl.jar
rename to samples/airline/client/jaxws/lib/saaj-impl.jar
diff --git a/samples/airline/client/jax-ws/lib/sjsxp.jar b/samples/airline/client/jaxws/lib/sjsxp.jar
similarity index 100%
rename from samples/airline/client/jax-ws/lib/sjsxp.jar
rename to samples/airline/client/jaxws/lib/sjsxp.jar
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/AirlinePortType.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/AirlinePortType.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/AirlinePortType.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/AirlinePortType.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/AirlineService.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/AirlineService.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/AirlineService.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/AirlineService.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Airport.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Airport.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Airport.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Airport.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/BookFlightRequest.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/BookFlightRequest.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/BookFlightRequest.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/BookFlightRequest.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Flight.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Flight.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Flight.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Flight.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/GetFlightsRequest.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/GetFlightsRequest.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/GetFlightsRequest.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/GetFlightsRequest.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/GetFlightsResponse.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/GetFlightsResponse.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/GetFlightsResponse.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/GetFlightsResponse.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Main.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Main.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Main.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Main.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Name.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Name.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Name.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Name.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/ObjectFactory.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/ObjectFactory.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/ObjectFactory.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/ObjectFactory.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/ServiceClass.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/ServiceClass.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/ServiceClass.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/ServiceClass.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Ticket.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Ticket.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/Ticket.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/Ticket.java
diff --git a/samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/package-info.java b/samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/package-info.java
similarity index 100%
rename from samples/airline/client/jax-ws/src/org/springframework/ws/samples/airline/client/jws/package-info.java
rename to samples/airline/client/jaxws/src/org/springframework/ws/samples/airline/client/jws/package-info.java