diff --git a/README.ftl.md b/README.ftl.md
index 81c563becd..cdff554925 100644
--- a/README.ftl.md
+++ b/README.ftl.md
@@ -41,7 +41,7 @@ Next, you write a SQL script to create a table to store the data.
 
     <@snippet path="src/main/resources/schema-all.sql" prefix="initial"/>
 
-> **Note:** Spring Zero runs `schema-@@platform@@.sql` automatically during startup. `-all` is the default for all platforms.
+> **Note:** Spring Boot runs `schema-@@platform@@.sql` automatically during startup. `-all` is the default for all platforms.
 
 <a name="initial"></a>
 Create a business class
diff --git a/README.md b/README.md
index 2408eb5c7b..637e01d7df 100644
--- a/README.md
+++ b/README.md
@@ -62,14 +62,14 @@ In a project directory of your choosing, create the following subdirectory struc
 
     <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>
     </parent>
     
 	<dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-up-batch</artifactId>
+            <artifactId>spring-boot-starter-batch</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
@@ -99,7 +99,7 @@ In a project directory of your choosing, create the following subdirectory struc
 </project>
 ```
 
-TODO: mention that we're using Spring Boot's [_starter POMs_](../gs-bootstrap-starter) here.
+This guide is using [Spring Boot's starter POMs](/guides/gs/spring-boot/content).
 
 Note to experienced Maven users who are unaccustomed to using an external parent project: you can take it out later, it's just there to reduce the amount of code you have to write to get started.
 
@@ -133,7 +133,7 @@ CREATE TABLE people  (
 );
 ```
 
-> **Note:** Spring Zero runs `schema-@@platform@@.sql` automatically during startup. `-all` is the default for all platforms.
+> **Note:** Spring Boot runs `schema-@@platform@@.sql` automatically during startup. `-all` is the default for all platforms.
 
 <a name="initial"></a>
 Create a business class
diff --git a/complete/pom.xml b/complete/pom.xml
index 3eac007e24..57ba7a912c 100644
--- a/complete/pom.xml
+++ b/complete/pom.xml
@@ -9,14 +9,14 @@
 
     <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>
     </parent>
     
 	<dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-up-batch</artifactId>
+            <artifactId>spring-boot-starter-batch</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
diff --git a/initial/pom.xml b/initial/pom.xml
index 2d9ad9e721..906f58e2c0 100644
--- a/initial/pom.xml
+++ b/initial/pom.xml
@@ -9,14 +9,14 @@
 
     <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>
     </parent>
     
 	<dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-up-batch</artifactId>
+            <artifactId>spring-boot-starter-batch</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>