diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/src/main/java/org/test/SampleApplication.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/src/main/java/org/test/SampleApplication.java
index 7de46b88248..0a66abeecf1 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/src/main/java/org/test/SampleApplication.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/src/main/java/org/test/SampleApplication.java
@@ -31,7 +31,7 @@ public class SampleApplication {
 	public static void main(String[] args) throws Exception {
 		MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
 		ObjectName name = new ObjectName(
-				"org.springframework.boot:type=SpringApplicationAdmin,name=springApplicationAdmin");
+				"org.springframework.boot:type=Admin,name=SpringApplication");
 		SpringApplicationAdmin mbean = new SpringApplicationAdmin();
 		mbs.registerMBean(mbean, name);
 
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop/src/main/java/org/test/SampleApplication.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop/src/main/java/org/test/SampleApplication.java
index 87e921777ba..e8adba952cb 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop/src/main/java/org/test/SampleApplication.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop/src/main/java/org/test/SampleApplication.java
@@ -30,7 +30,7 @@ public class SampleApplication {
 	public static void main(String[] args) throws Exception {
 		MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
 		ObjectName name = new ObjectName(
-				"org.springframework.boot:type=SpringApplicationAdmin,name=springApplicationAdmin");
+				"org.springframework.boot:type=Admin,name=SpringApplication");
 		SpringApplicationAdmin mbean = new SpringApplicationAdmin();
 		mbs.registerMBean(mbean, name);
 
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/SpringApplicationAdminClient.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/SpringApplicationAdminClient.java
index c0018547cd2..170c8003bde 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/SpringApplicationAdminClient.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/SpringApplicationAdminClient.java
@@ -40,7 +40,7 @@ import org.apache.maven.plugin.MojoExecutionException;
 class SpringApplicationAdminClient {
 
 	// Note: see SpringApplicationAdminJmxAutoConfiguration
-	static final String DEFAULT_OBJECT_NAME = "org.springframework.boot:type=SpringApplicationAdmin,name=springApplicationAdmin";
+	static final String DEFAULT_OBJECT_NAME = "org.springframework.boot:type=Admin,name=SpringApplication";
 
 	private final MBeanServerConnection connection;