diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index e137bfb771..f0aeab85e8 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -160,7 +160,7 @@
 		<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>
 		<spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>
 		<spring-social-twitter.version>1.1.2.RELEASE</spring-social-twitter.version>
-		<spring-webservices.version>2.3.0.RELEASE</spring-webservices.version>
+		<spring-ws.version>2.3.0.RELEASE</spring-ws.version>
 		<sqlite-jdbc.version>3.8.11.2</sqlite-jdbc.version>
 		<statsd-client.version>3.1.0</statsd-client.version>
 		<sun-mail.version>${javax-mail.version}</sun-mail.version>
@@ -505,7 +505,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-webservices</artifactId>
+				<artifactId>spring-boot-starter-ws</artifactId>
 				<version>1.4.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
@@ -2179,7 +2179,7 @@
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
 				<artifactId>spring-ws-core</artifactId>
-				<version>${spring-webservices.version}</version>
+				<version>${spring-ws.version}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>commons-logging</groupId>
@@ -2190,7 +2190,7 @@
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
 				<artifactId>spring-ws-security</artifactId>
-				<version>${spring-webservices.version}</version>
+				<version>${spring-ws.version}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>commons-logging</groupId>
@@ -2201,7 +2201,7 @@
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
 				<artifactId>spring-ws-support</artifactId>
-				<version>${spring-webservices.version}</version>
+				<version>${spring-ws.version}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>commons-logging</groupId>
@@ -2212,7 +2212,7 @@
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
 				<artifactId>spring-ws-test</artifactId>
-				<version>${spring-webservices.version}</version>
+				<version>${spring-ws.version}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>commons-logging</groupId>
diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
index 99a5dba842..f0db87a0d7 100644
--- a/spring-boot-docs/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -843,7 +843,7 @@
 										<spring-boot-repo>${spring-boot-repo}</spring-boot-repo>
 										<spring-docs-version>${spring.version}</spring-docs-version>
 										<spring-security-docs-version>${spring-security.version}</spring-security-docs-version>
-										<spring-ws-docs-version>${spring-ws.version}</spring-ws-docs-version>
+										<spring-webservices-docs-version>${spring-ws.version}</spring-webservices-docs-version>
 										<github-tag>${github-tag}</github-tag>
 									</attributes>
 								</configuration>
diff --git a/spring-boot-samples/spring-boot-sample-webservices/pom.xml b/spring-boot-samples/spring-boot-sample-webservices/pom.xml
index ffca8e3ada..3725a9d014 100644
--- a/spring-boot-samples/spring-boot-sample-webservices/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-webservices/pom.xml
@@ -26,7 +26,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webservices</artifactId>
+			<artifactId>spring-boot-starter-ws</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>jaxen</groupId>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index a363e64c74..6c8b7917bf 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -69,7 +69,7 @@
 		<module>spring-boot-starter-velocity</module>
 		<module>spring-boot-starter-web</module>
 		<module>spring-boot-starter-websocket</module>
-		<module>spring-boot-starter-webservices</module>
+		<module>spring-boot-starter-ws</module>
 	</modules>
 
 	<build>
diff --git a/spring-boot-starters/spring-boot-starter-webservices/pom.xml b/spring-boot-starters/spring-boot-starter-ws/pom.xml
similarity index 95%
rename from spring-boot-starters/spring-boot-starter-webservices/pom.xml
rename to spring-boot-starters/spring-boot-starter-ws/pom.xml
index 84d9d97ed4..659d2a474a 100644
--- a/spring-boot-starters/spring-boot-starter-webservices/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-ws/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>spring-boot-starters</artifactId>
 		<version>1.4.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-starter-webservices</artifactId>
+	<artifactId>spring-boot-starter-ws</artifactId>
 	<name>Spring Boot Web Services Starter</name>
 	<description>Starter for using Spring Web Services</description>
 	<url>http://projects.spring.io/spring-boot/</url>
diff --git a/spring-boot-starters/spring-boot-starter-webservices/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-ws/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-webservices/src/main/resources/META-INF/spring.provides
rename to spring-boot-starters/spring-boot-starter-ws/src/main/resources/META-INF/spring.provides