diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
index 95227af1ed..ba07b5fe98 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
@@ -38,14 +38,14 @@ import org.springframework.context.annotation.Configuration;
 @EnableConfigurationProperties
 public class ManagementServerPropertiesAutoConfiguration {
 
-	@Bean(name = "org.springframework.actuate.properties.ManagementServerProperties")
+	@Bean
 	@ConditionalOnMissingBean
 	public ManagementServerProperties managementServerProperties() {
 		return new ManagementServerProperties();
 	}
 
 	// In case security auto configuration hasn't been included
-	@Bean(name = "org.springframework.autoconfigure.security.SecurityProperties")
+	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.security.config.annotation.web.configuration.EnableWebSecurity")
 	public SecurityProperties securityProperties() {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java
index 8feb7c4318..254ef2427e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java
@@ -37,7 +37,7 @@ import org.springframework.security.authentication.AuthenticationManager;
 		AuthenticationManagerConfiguration.class })
 public class SecurityAutoConfiguration {
 
-	@Bean(name = "org.springframework.autoconfigure.security.SecurityProperties")
+	@Bean
 	@ConditionalOnMissingBean
 	public SecurityProperties securityProperties() {
 		return new SecurityProperties();
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
index f84c200b29..60d2574ca7 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
@@ -46,7 +46,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar
 
 	private ApplicationContext applicationContext;
 
-	@Bean(name = "org.springframework.boot.autoconfigure.web.ServerProperties")
+	@Bean
 	@ConditionalOnMissingBean(search = SearchStrategy.CURRENT)
 	public ServerProperties serverProperties() {
 		return new ServerProperties();