diff --git a/pom.xml b/pom.xml
index 5826f7c8cdf..912f4037add 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 		<module>spring-boot-maven-plugin</module>
 		<module>spring-boot-gradle-plugin</module>
 		<module>spring-boot-ops</module>
-		<module>spring-boot-ups</module>
+		<module>spring-boot-starters</module>
 		<module>spring-boot-cli</module>
 		<module>spring-boot-integration-tests</module>
 	</modules>
diff --git a/spring-boot-cli/samples/ops.groovy b/spring-boot-cli/samples/ops.groovy
index bb327e6579b..511b42c2e88 100644
--- a/spring-boot-cli/samples/ops.groovy
+++ b/spring-boot-cli/samples/ops.groovy
@@ -1,6 +1,6 @@
 package org.test
 
-@Grab("org.springframework.boot:spring-boot-up-ops:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.springframework.boot:spring-boot-starter-ops:0.5.0.BUILD-SNAPSHOT")
 
 @Controller
 class SampleController {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java
index 7deefee6cbc..b708b62cd0c 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java
@@ -39,7 +39,7 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies.ifAnyMissingClasses("org.springframework.boot.SpringApplication")
-				.add("org.springframework.boot", "spring-boot-up",
+				.add("org.springframework.boot", "spring-boot-starter",
 						dependencies.getProperty("spring.boot.version"));
 	}
 
diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml
index 1af6a8ca37d..075efd6f0d8 100644
--- a/spring-boot-integration-tests/pom.xml
+++ b/spring-boot-integration-tests/pom.xml
@@ -46,58 +46,58 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-batch</artifactId>
+			<artifactId>spring-boot-starter-batch</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-data-jpa</artifactId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-integration</artifactId>
+			<artifactId>spring-boot-starter-integration</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-jetty</artifactId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-logging</artifactId>
+			<artifactId>spring-boot-starter-logging</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-ops</artifactId>
+			<artifactId>spring-boot-starter-ops</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-parent</artifactId>
+			<artifactId>spring-boot-starter-parent</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-security</artifactId>
+			<artifactId>spring-boot-starter-security</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml b/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml
index 8ae6fca8913..b3cb2d180d8 100644
--- a/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml
+++ b/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-batch/pom.xml b/spring-boot-samples/spring-boot-sample-batch/pom.xml
index efd77ddcb49..c5db2cfd9aa 100644
--- a/spring-boot-samples/spring-boot-sample-batch/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-batch/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-batch</artifactId>
+			<artifactId>spring-boot-starter-batch</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
index 99c07548376..43c19d1f012 100644
--- a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-data-jpa</artifactId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-integration/pom.xml b/spring-boot-samples/spring-boot-sample-integration/pom.xml
index 10c31d6f624..c10e50f5275 100644
--- a/spring-boot-samples/spring-boot-sample-integration/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-integration/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-up-integration</artifactId>
+			<artifactId>spring-boot-starter-integration</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/spring-boot-samples/spring-boot-sample-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-jetty/pom.xml
index 84fe3a13c52..22a74ceb282 100644
--- a/spring-boot-samples/spring-boot-sample-jetty/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-jetty/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-jetty</artifactId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/pom.xml b/spring-boot-samples/spring-boot-sample-ops-ui/pom.xml
index c07ca1dc824..bf06ee42800 100644
--- a/spring-boot-samples/spring-boot-sample-ops-ui/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-ops-ui/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-ops</artifactId>
+			<artifactId>spring-boot-starter-ops</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-ops/pom.xml b/spring-boot-samples/spring-boot-sample-ops/pom.xml
index d456212f3be..f4bf006a625 100644
--- a/spring-boot-samples/spring-boot-sample-ops/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-ops/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-ops</artifactId>
+			<artifactId>spring-boot-starter-ops</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-up-logging</artifactId>
+					<artifactId>spring-boot-starter-logging</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
diff --git a/spring-boot-samples/spring-boot-sample-ops/start.groovy b/spring-boot-samples/spring-boot-sample-ops/start.groovy
index 9310af15acc..08614166257 100644
--- a/spring-boot-samples/spring-boot-sample-ops/start.groovy
+++ b/spring-boot-samples/spring-boot-sample-ops/start.groovy
@@ -1,5 +1,5 @@
-@Grab("org.springframework.boot:spring-boot-up-ops:0.5.0.BUILD-SNAPSHOT")
-@Grab("org.springframework.boot:spring-boot-up-web:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.springframework.boot:spring-boot-starter-ops:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.springframework.boot:spring-boot-starter-web:0.5.0.BUILD-SNAPSHOT")
 @ComponentScan("org.springframework.boot.sample.service")
 class Start {
 }
diff --git a/spring-boot-samples/spring-boot-sample-profile/pom.xml b/spring-boot-samples/spring-boot-sample-profile/pom.xml
index 450d611fb6a..e1cf213435e 100644
--- a/spring-boot-samples/spring-boot-sample-profile/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-profile/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-simple/pom.xml b/spring-boot-samples/spring-boot-sample-simple/pom.xml
index d988dd00732..65179e1c6dd 100644
--- a/spring-boot-samples/spring-boot-sample-simple/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-simple/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/spring-boot-samples/spring-boot-sample-tomcat/build.gradle b/spring-boot-samples/spring-boot-sample-tomcat/build.gradle
index 3b627e8d677..822e1bce1e6 100644
--- a/spring-boot-samples/spring-boot-sample-tomcat/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-tomcat/build.gradle
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-	compile("org.springframework.boot:spring-boot-up-web:0.5.0.BUILD-SNAPSHOT")
+	compile("org.springframework.boot:spring-boot-starter-web:0.5.0.BUILD-SNAPSHOT")
 	testCompile("junit:junit:4.11")
 }
 
diff --git a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml
index 8ae6fca8913..b3cb2d180d8 100644
--- a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-traditional/build.gradle b/spring-boot-samples/spring-boot-sample-traditional/build.gradle
index e3388d0eff4..09201ec6293 100644
--- a/spring-boot-samples/spring-boot-sample-traditional/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-traditional/build.gradle
@@ -17,9 +17,9 @@ repositories {
 }
 
 dependencies {
-	compile("org.springframework.boot:spring-boot-up:0.5.0.BUILD-SNAPSHOT")
+	compile("org.springframework.boot:spring-boot-starter:0.5.0.BUILD-SNAPSHOT")
 	compile("org.springframework:spring-webmvc:4.0.0.BUILD-SNAPSHOT")
-	providedRuntime("org.springframework.boot:spring-boot-up-tomcat:0.5.0.BUILD-SNAPSHOT")
+	providedRuntime("org.springframework.boot:spring-boot-starter-tomcat:0.5.0.BUILD-SNAPSHOT")
 	providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper:7.0.42")
 	testCompile("junit:junit:4.11")
 }
diff --git a/spring-boot-samples/spring-boot-sample-traditional/pom.xml b/spring-boot-samples/spring-boot-sample-traditional/pom.xml
index 7a2f197818e..7916f24370e 100644
--- a/spring-boot-samples/spring-boot-sample-traditional/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-traditional/pom.xml
@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -26,7 +26,7 @@
 		<!-- Provided (for embedded war support) -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-web-static/pom.xml b/spring-boot-samples/spring-boot-sample-web-static/pom.xml
index 965da4bbfa4..5402a3eb8cb 100644
--- a/spring-boot-samples/spring-boot-sample-web-static/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-static/pom.xml
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/pom.xml b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml
index 8d00afaa843..9d1394a3664 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-samples/spring-boot-sample-xml/pom.xml b/spring-boot-samples/spring-boot-sample-xml/pom.xml
index d66652fa6bd..d0deb823778 100644
--- a/spring-boot-samples/spring-boot-sample-xml/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-xml/pom.xml
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/spring-boot-ups/README.md b/spring-boot-starters/README.md
similarity index 100%
rename from spring-boot-ups/README.md
rename to spring-boot-starters/README.md
diff --git a/spring-boot-ups/pom.xml b/spring-boot-starters/pom.xml
similarity index 67%
rename from spring-boot-ups/pom.xml
rename to spring-boot-starters/pom.xml
index 5dd931767c7..f1ffd7bf08c 100644
--- a/spring-boot-ups/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -7,23 +7,23 @@
 		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-ups</artifactId>
+	<artifactId>spring-boot-starters</artifactId>
 	<packaging>pom</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
-		<module>spring-boot-up</module>
-		<module>spring-boot-up-batch</module>
-		<module>spring-boot-up-data-jpa</module>
-		<module>spring-boot-up-integration</module>
-		<module>spring-boot-up-jetty</module>
-		<module>spring-boot-up-logging</module>
-		<module>spring-boot-up-ops</module>
-		<module>spring-boot-up-parent</module>
-		<module>spring-boot-up-security</module>
-		<module>spring-boot-up-tomcat</module>
-		<module>spring-boot-up-web</module>
+		<module>spring-boot-starter</module>
+		<module>spring-boot-starter-batch</module>
+		<module>spring-boot-starter-data-jpa</module>
+		<module>spring-boot-starter-integration</module>
+		<module>spring-boot-starter-jetty</module>
+		<module>spring-boot-starter-logging</module>
+		<module>spring-boot-starter-ops</module>
+		<module>spring-boot-starter-parent</module>
+		<module>spring-boot-starter-security</module>
+		<module>spring-boot-starter-tomcat</module>
+		<module>spring-boot-starter-web</module>
 	</modules>
 	<build>
 		<plugins>
@@ -48,7 +48,7 @@
 									<filtering>true</filtering>
 								</resource>
 							</resources>
-							<outputDirectory>${basedir}/spring-boot-up-parent</outputDirectory>
+							<outputDirectory>${basedir}/spring-boot-starter-parent</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/spring-boot-ups/spring-boot-up-batch/pom.xml b/spring-boot-starters/spring-boot-starter-batch/pom.xml
similarity index 86%
rename from spring-boot-ups/spring-boot-up-batch/pom.xml
rename to spring-boot-starters/spring-boot-starter-batch/pom.xml
index 806a15386cd..b035d3054bf 100644
--- a/spring-boot-ups/spring-boot-up-batch/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-batch/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-batch</artifactId>
+	<artifactId>spring-boot-starter-batch</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-ups/spring-boot-up-data-jpa/pom.xml b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
similarity index 89%
rename from spring-boot-ups/spring-boot-up-data-jpa/pom.xml
rename to spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
index 891817a595d..2d154930aea 100644
--- a/spring-boot-ups/spring-boot-up-data-jpa/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-data-jpa</artifactId>
+	<artifactId>spring-boot-starter-data-jpa</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-ups/spring-boot-up-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml
similarity index 92%
rename from spring-boot-ups/spring-boot-up-integration/pom.xml
rename to spring-boot-starters/spring-boot-starter-integration/pom.xml
index 986386b435f..7182b9cfd5d 100644
--- a/spring-boot-ups/spring-boot-up-integration/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-integration/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-integration</artifactId>
+	<artifactId>spring-boot-starter-integration</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-ups/spring-boot-up-jetty/pom.xml b/spring-boot-starters/spring-boot-starter-jetty/pom.xml
similarity index 88%
rename from spring-boot-ups/spring-boot-up-jetty/pom.xml
rename to spring-boot-starters/spring-boot-starter-jetty/pom.xml
index c8c9a916591..606ebbdb056 100644
--- a/spring-boot-ups/spring-boot-up-jetty/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-jetty/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-jetty</artifactId>
+	<artifactId>spring-boot-starter-jetty</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
diff --git a/spring-boot-ups/spring-boot-up-logging/pom.xml b/spring-boot-starters/spring-boot-starter-logging/pom.xml
similarity index 89%
rename from spring-boot-ups/spring-boot-up-logging/pom.xml
rename to spring-boot-starters/spring-boot-starter-logging/pom.xml
index dc8e444daed..2c897d257f7 100644
--- a/spring-boot-ups/spring-boot-up-logging/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-logging/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-logging</artifactId>
+	<artifactId>spring-boot-starter-logging</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
diff --git a/spring-boot-ups/spring-boot-up-ops/pom.xml b/spring-boot-starters/spring-boot-starter-ops/pom.xml
similarity index 84%
rename from spring-boot-ups/spring-boot-up-ops/pom.xml
rename to spring-boot-starters/spring-boot-starter-ops/pom.xml
index a5901236c30..aa8273493bb 100644
--- a/spring-boot-ups/spring-boot-up-ops/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-ops/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-ops</artifactId>
+	<artifactId>spring-boot-starter-ops</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-ups/spring-boot-up-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
similarity index 94%
rename from spring-boot-ups/spring-boot-up-parent/pom.xml
rename to spring-boot-starters/spring-boot-starter-parent/pom.xml
index 2d8ee2c3bee..2140b06a2c5 100644
--- a/spring-boot-ups/spring-boot-up-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -6,7 +6,7 @@ This POM file that can be used as a parent for your own builds. It provides gene
 useful dependencies and plugins.
 
 NOTE: If you are editing a local checkout of this file, be sure to modify
-'spring-boot-ups/src/main/parent/pom.xml'.
+'spring-boot-starters/src/main/parent/pom.xml'.
 
 -->
 
@@ -18,7 +18,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 
 	<!-- Intentionally do not inherit from boot-parent -->
 	<groupId>org.springframework.boot</groupId>
-	<artifactId>spring-boot-up-parent</artifactId>
+	<artifactId>spring-boot-starter-parent</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
@@ -56,47 +56,47 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up</artifactId>
+				<artifactId>spring-boot-starter</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-ops</artifactId>
+				<artifactId>spring-boot-starter-ops</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-web</artifactId>
+				<artifactId>spring-boot-starter-web</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-tomcat</artifactId>
+				<artifactId>spring-boot-starter-tomcat</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-jetty</artifactId>
+				<artifactId>spring-boot-starter-jetty</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-data-jpa</artifactId>
+				<artifactId>spring-boot-starter-data-jpa</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-batch</artifactId>
+				<artifactId>spring-boot-starter-batch</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-integration</artifactId>
+				<artifactId>spring-boot-starter-integration</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-security</artifactId>
+				<artifactId>spring-boot-starter-security</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 		</dependencies>
diff --git a/spring-boot-ups/spring-boot-up-security/pom.xml b/spring-boot-starters/spring-boot-starter-security/pom.xml
similarity index 85%
rename from spring-boot-ups/spring-boot-up-security/pom.xml
rename to spring-boot-starters/spring-boot-starter-security/pom.xml
index 74099ce1f66..201bf3b3e7c 100644
--- a/spring-boot-ups/spring-boot-up-security/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-security/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-security</artifactId>
+	<artifactId>spring-boot-starter-security</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-ups/spring-boot-up-tomcat/pom.xml b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
similarity index 88%
rename from spring-boot-ups/spring-boot-up-tomcat/pom.xml
rename to spring-boot-starters/spring-boot-starter-tomcat/pom.xml
index bed99bc2e03..6113c306995 100644
--- a/spring-boot-ups/spring-boot-up-tomcat/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-tomcat</artifactId>
+	<artifactId>spring-boot-starter-tomcat</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
diff --git a/spring-boot-ups/spring-boot-up-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml
similarity index 83%
rename from spring-boot-ups/spring-boot-up-web/pom.xml
rename to spring-boot-starters/spring-boot-starter-web/pom.xml
index 78563f85c99..c1dd6be9de3 100644
--- a/spring-boot-ups/spring-boot-up-web/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-web/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-web</artifactId>
+	<artifactId>spring-boot-starter-web</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-ups/spring-boot-up/pom.xml b/spring-boot-starters/spring-boot-starter/pom.xml
similarity index 86%
rename from spring-boot-ups/spring-boot-up/pom.xml
rename to spring-boot-starters/spring-boot-starter/pom.xml
index ea9c60a05d3..28491768d9d 100644
--- a/spring-boot-ups/spring-boot-up/pom.xml
+++ b/spring-boot-starters/spring-boot-starter/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up</artifactId>
+	<artifactId>spring-boot-starter</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -25,7 +25,7 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-logging</artifactId>
+			<artifactId>spring-boot-starter-logging</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/spring-boot-ups/src/main/parent/pom.xml b/spring-boot-starters/src/main/parent/pom.xml
similarity index 94%
rename from spring-boot-ups/src/main/parent/pom.xml
rename to spring-boot-starters/src/main/parent/pom.xml
index b21e77ff62a..168facc36fb 100644
--- a/spring-boot-ups/src/main/parent/pom.xml
+++ b/spring-boot-starters/src/main/parent/pom.xml
@@ -6,7 +6,7 @@ This POM file that can be used as a parent for your own builds. It provides gene
 useful dependencies and plugins.
 
 NOTE: If you are editing a local checkout of this file, be sure to modify
-'spring-boot-ups/src/main/parent/pom.xml'.
+'spring-boot-starters/src/main/parent/pom.xml'.
 
 -->
 
@@ -18,7 +18,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 
 	<!-- Intentionally do not inherit from boot-parent -->
 	<groupId>org.springframework.boot</groupId>
-	<artifactId>spring-boot-up-parent</artifactId>
+	<artifactId>spring-boot-starter-parent</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
@@ -56,47 +56,47 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up</artifactId>
+				<artifactId>spring-boot-starter</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-ops</artifactId>
+				<artifactId>spring-boot-starter-ops</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-web</artifactId>
+				<artifactId>spring-boot-starter-web</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-tomcat</artifactId>
+				<artifactId>spring-boot-starter-tomcat</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-jetty</artifactId>
+				<artifactId>spring-boot-starter-jetty</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-data-jpa</artifactId>
+				<artifactId>spring-boot-starter-data-jpa</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-batch</artifactId>
+				<artifactId>spring-boot-starter-batch</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-integration</artifactId>
+				<artifactId>spring-boot-starter-integration</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-security</artifactId>
+				<artifactId>spring-boot-starter-security</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 		</dependencies>