diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java
similarity index 90%
rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleHealthIndicator.java
rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java
index 4c185c4a5b..181480c9ad 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleHealthIndicator.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleDataSourceHealthIndicator.java
@@ -35,7 +35,7 @@ import org.springframework.util.StringUtils;
  * 
  * @author Dave Syer
  */
-public class SimpleHealthIndicator implements HealthIndicator<Map<String, Object>> {
+public class SimpleDataSourceHealthIndicator implements HealthIndicator<Map<String, Object>> {
 
 	private DataSource dataSource;
 
@@ -55,16 +55,16 @@ public class SimpleHealthIndicator implements HealthIndicator<Map<String, Object
 	private String query = null;
 
 	/**
-	 * Create a new {@link SimpleHealthIndicator} instance.
+	 * Create a new {@link SimpleDataSourceHealthIndicator} instance.
 	 */
-	public SimpleHealthIndicator() {
+	public SimpleDataSourceHealthIndicator() {
 	}
 
 	/**
-	 * Create a new {@link SimpleHealthIndicator} using the specified datasource.
+	 * Create a new {@link SimpleDataSourceHealthIndicator} using the specified datasource.
 	 * @param dataSource the data source
 	 */
-	public SimpleHealthIndicator(DataSource dataSource) {
+	public SimpleDataSourceHealthIndicator(DataSource dataSource) {
 		this.dataSource = dataSource;
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
 	}