diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
index cc4f559717..3b81cb50b8 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
@@ -100,11 +100,11 @@ import org.springframework.mail.javamail.JavaMailSenderImpl;
 		RabbitAutoConfiguration.class, SolrAutoConfiguration.class,
 		MailSenderAutoConfiguration.class, JmsAutoConfiguration.class,
 		ElasticsearchAutoConfiguration.class })
-@EnableConfigurationProperties({ HealthIndicatorAutoConfigurationProperties.class })
+@EnableConfigurationProperties({ HealthIndicatorProperties.class })
 public class HealthIndicatorAutoConfiguration {
 
 	@Autowired
-	private HealthIndicatorAutoConfigurationProperties configurationProperties = new HealthIndicatorAutoConfigurationProperties();
+	private HealthIndicatorProperties configurationProperties = new HealthIndicatorProperties();
 
 	@Bean
 	@ConditionalOnMissingBean(HealthAggregator.class)
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java
similarity index 95%
rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationProperties.java
rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java
index 03c31c400f..af6178f426 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java
@@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @since 1.2.0
  */
 @ConfigurationProperties("management.health.status")
-public class HealthIndicatorAutoConfigurationProperties {
+public class HealthIndicatorProperties {
 
 	/**
 	 * Comma-separated list of health statuses in order of severity.