diff --git a/spring-boot-maven-plugin/src/it/jar/pom.xml b/spring-boot-maven-plugin/src/it/jar/pom.xml
index 11febdaedf..54b7891df0 100644
--- a/spring-boot-maven-plugin/src/it/jar/pom.xml
+++ b/spring-boot-maven-plugin/src/it/jar/pom.xml
@@ -15,7 +15,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>package</goal>
+							<goal>repackage</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/spring-boot-maven-plugin/src/it/war/pom.xml b/spring-boot-maven-plugin/src/it/war/pom.xml
index 07302df86d..640d2ade38 100644
--- a/spring-boot-maven-plugin/src/it/war/pom.xml
+++ b/spring-boot-maven-plugin/src/it/war/pom.xml
@@ -15,7 +15,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>package</goal>
+							<goal>repackage</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PackageMojo.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
similarity index 92%
rename from spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PackageMojo.java
rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
index 5927625c7f..54d5b1b643 100644
--- a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PackageMojo.java
+++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
@@ -39,8 +39,8 @@ import org.springframework.boot.launcher.tools.Repackager;
  * @author Phillip Webb
  * @author Dave Syer
  */
-@Mojo(name = "package", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
-public class PackageMojo extends AbstractMojo {
+@Mojo(name = "repackage", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
+public class RepackageMojo extends AbstractMojo {
 
 	/**
 	 * The Maven project.
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index fc32a0786a..1903786766 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -38,7 +38,7 @@
 					<executions>
 						<execution>
 							<goals>
-								<goal>package</goal>
+								<goal>repackage</goal>
 							</goals>
 						</execution>
 					</executions>
diff --git a/spring-boot-ups/spring-boot-up-parent/pom.xml b/spring-boot-ups/spring-boot-up-parent/pom.xml
index 23fd4a7291..2d8ee2c3be 100644
--- a/spring-boot-ups/spring-boot-up-parent/pom.xml
+++ b/spring-boot-ups/spring-boot-up-parent/pom.xml
@@ -283,7 +283,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 					<executions>
 						<execution>
 							<goals>
-								<goal>package</goal>
+								<goal>repackage</goal>
 							</goals>
 						</execution>
 					</executions>
@@ -300,7 +300,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 					<dependencies>
 						<dependency>
 							<groupId>org.springframework.boot</groupId>
-							<artifactId>spring-package-maven-plugin</artifactId>
+							<artifactId>spring-boot-maven-plugin</artifactId>
 							<version>${spring.boot.version}</version>
 						</dependency>
 					</dependencies>
diff --git a/spring-boot-ups/src/main/parent/pom.xml b/spring-boot-ups/src/main/parent/pom.xml
index 2f42fbe505..b21e77ff62 100644
--- a/spring-boot-ups/src/main/parent/pom.xml
+++ b/spring-boot-ups/src/main/parent/pom.xml
@@ -283,7 +283,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 					<executions>
 						<execution>
 							<goals>
-								<goal>package</goal>
+								<goal>repackage</goal>
 							</goals>
 						</execution>
 					</executions>
@@ -300,7 +300,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 					<dependencies>
 						<dependency>
 							<groupId>org.springframework.boot</groupId>
-							<artifactId>spring-package-maven-plugin</artifactId>
+							<artifactId>spring-boot-maven-plugin</artifactId>
 							<version>${spring.boot.version}</version>
 						</dependency>
 					</dependencies>