diff --git a/pom.xml b/pom.xml
index bbc7a68fc6..f87ff35455 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	</prerequisites>
 	<modules>
 		<module>spring-bootstrap</module>
-		<module>spring-bootstrap-service</module>
+		<module>spring-bootstrap-actuator</module>
 		<module>spring-bootstrap-starters</module>
 		<module>spring-bootstrap-launcher</module>
 		<module>spring-bootstrap-samples</module>
diff --git a/spring-bootstrap-service/README.md b/spring-bootstrap-actuator/README.md
similarity index 100%
rename from spring-bootstrap-service/README.md
rename to spring-bootstrap-actuator/README.md
diff --git a/spring-bootstrap-service/pom.xml b/spring-bootstrap-actuator/pom.xml
similarity index 97%
rename from spring-bootstrap-service/pom.xml
rename to spring-bootstrap-actuator/pom.xml
index 45bf00b006..9cd992dc48 100644
--- a/spring-bootstrap-service/pom.xml
+++ b/spring-bootstrap-actuator/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-bootstrap-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-service</artifactId>
+	<artifactId>spring-bootstrap-actuator</artifactId>
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/AuditConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/AuditConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/AuditConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/AuditConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/HealthzConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/HealthzConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/HealthzConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/HealthzConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/InfoConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/InfoConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/InfoConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/InfoConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementServerConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementServerConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementServerConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementServerConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricFilterConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricFilterConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricFilterConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricFilterConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/SecurityConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/SecurityConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/SecurityConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/SecurityConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServerConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServerConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServerConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServerConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServiceAutoConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServiceAutoConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServiceAutoConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServiceAutoConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ShutdownConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ShutdownConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/ShutdownConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ShutdownConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/TraceConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/TraceConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/TraceConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/TraceConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/VarzConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/VarzConfiguration.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/autoconfigure/service/VarzConfiguration.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/VarzConfiguration.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/AuditEvent.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEvent.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/AuditEvent.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEvent.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/AuditEventRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEventRepository.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/AuditEventRepository.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEventRepository.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepository.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepository.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepository.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditApplicationEvent.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditApplicationEvent.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditApplicationEvent.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditApplicationEvent.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditListener.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditListener.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditListener.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditListener.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/error/ErrorEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/error/ErrorEndpoint.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/error/ErrorEndpoint.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/error/ErrorEndpoint.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/health/HealthIndicator.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthIndicator.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/health/HealthIndicator.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthIndicator.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/health/HealthzEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthzEndpoint.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/health/HealthzEndpoint.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthzEndpoint.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/health/VanillaHealthIndicator.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/VanillaHealthIndicator.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/health/VanillaHealthIndicator.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/VanillaHealthIndicator.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/info/InfoEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/info/InfoEndpoint.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/info/InfoEndpoint.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/info/InfoEndpoint.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/CounterService.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/CounterService.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/CounterService.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/CounterService.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/DefaultCounterService.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultCounterService.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/DefaultCounterService.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultCounterService.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/DefaultGaugeService.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultGaugeService.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/DefaultGaugeService.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultGaugeService.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/GaugeService.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/GaugeService.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/GaugeService.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/GaugeService.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/InMemoryMetricRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/InMemoryMetricRepository.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/InMemoryMetricRepository.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/InMemoryMetricRepository.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/Measurement.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Measurement.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/Measurement.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Measurement.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/Metric.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Metric.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/Metric.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Metric.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/MetricRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/MetricRepository.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/metrics/MetricRepository.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/MetricRepository.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/properties/EndpointsProperties.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/EndpointsProperties.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/properties/EndpointsProperties.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/EndpointsProperties.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/properties/ManagementServerProperties.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ManagementServerProperties.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/properties/ManagementServerProperties.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ManagementServerProperties.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/properties/SecurityProperties.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/SecurityProperties.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/properties/SecurityProperties.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/SecurityProperties.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/properties/ServerProperties.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ServerProperties.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/properties/ServerProperties.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ServerProperties.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/security/AuthenticationAuditListener.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthenticationAuditListener.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/security/AuthenticationAuditListener.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthenticationAuditListener.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/security/AuthorizationAuditListener.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthorizationAuditListener.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/security/AuthorizationAuditListener.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthorizationAuditListener.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessor.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessor.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessor.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessor.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/shutdown/ShutdownEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/shutdown/ShutdownEndpoint.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/shutdown/ShutdownEndpoint.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/shutdown/ShutdownEndpoint.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepository.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepository.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepository.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/trace/Trace.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/Trace.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/trace/Trace.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/Trace.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/trace/TraceEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceEndpoint.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/trace/TraceEndpoint.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceEndpoint.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/trace/TraceRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceRepository.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/trace/TraceRepository.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceRepository.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/varz/PublicMetrics.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/PublicMetrics.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/varz/PublicMetrics.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/PublicMetrics.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/varz/VanillaPublicMetrics.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VanillaPublicMetrics.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/varz/VanillaPublicMetrics.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VanillaPublicMetrics.java
diff --git a/spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/varz/VarzEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VarzEndpoint.java
similarity index 100%
rename from spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/varz/VarzEndpoint.java
rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VarzEndpoint.java
diff --git a/spring-bootstrap-service/src/main/resources/META-INF/spring.factories b/spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from spring-bootstrap-service/src/main/resources/META-INF/spring.factories
rename to spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories
diff --git a/spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/audit/AuditEventTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/AuditEventTests.java
similarity index 100%
rename from spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/audit/AuditEventTests.java
rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/AuditEventTests.java
diff --git a/spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepositoryTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepositoryTests.java
similarity index 100%
rename from spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepositoryTests.java
rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepositoryTests.java
diff --git a/spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/properties/EndpointsPropertiesTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/properties/EndpointsPropertiesTests.java
similarity index 100%
rename from spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/properties/EndpointsPropertiesTests.java
rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/properties/EndpointsPropertiesTests.java
diff --git a/spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessorTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessorTests.java
similarity index 100%
rename from spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessorTests.java
rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessorTests.java
diff --git a/spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepositoryTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepositoryTests.java
similarity index 100%
rename from spring-bootstrap-service/src/test/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepositoryTests.java
rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepositoryTests.java
diff --git a/spring-bootstrap-samples/pom.xml b/spring-bootstrap-samples/pom.xml
index 946fc8968b..e7a84c066d 100644
--- a/spring-bootstrap-samples/pom.xml
+++ b/spring-bootstrap-samples/pom.xml
@@ -16,7 +16,7 @@
 		<module>spring-bootstrap-simple-sample</module>
 		<module>spring-bootstrap-tomcat-sample</module>
 		<module>spring-bootstrap-profile-sample</module>
-		<module>spring-bootstrap-service-sample</module>
+		<module>spring-bootstrap-actuator-sample</module>
 		<module>spring-bootstrap-trad-sample</module>
 		<module>spring-bootstrap-xml-sample</module>
 	</modules>
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/dependency-reduced-pom.xml b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/dependency-reduced-pom.xml
similarity index 95%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/dependency-reduced-pom.xml
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/dependency-reduced-pom.xml
index fc9516c2db..5964fc71c1 100644
--- a/spring-bootstrap-samples/spring-bootstrap-service-sample/dependency-reduced-pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/dependency-reduced-pom.xml
@@ -6,7 +6,7 @@
     <version>0.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>spring-bootstrap-service-sample</artifactId>
+  <artifactId>spring-bootstrap-actuator-sample</artifactId>
   <build>
     <plugins>
       <plugin>
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml
similarity index 96%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/pom.xml
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml
index 4a0789f546..023deb9f5e 100644
--- a/spring-bootstrap-samples/spring-bootstrap-service-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-bootstrap-samples</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-bootstrap-service-sample</artifactId>
+	<artifactId>spring-bootstrap-actuator-sample</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<start-class>org.springframework.bootstrap.sample.service.ServiceBootstrapApplication</start-class>
@@ -89,7 +89,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-bootstrap-service</artifactId>
+			<artifactId>spring-bootstrap-actuator</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/ProductionDatabase.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ProductionDatabase.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/ProductionDatabase.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ProductionDatabase.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/resources/application.properties b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/application.properties
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/main/resources/application.properties
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/application.properties
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/EndpointsPropertiesServiceBootstrapApplicationTests.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/EndpointsPropertiesServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/EndpointsPropertiesServiceBootstrapApplicationTests.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/EndpointsPropertiesServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/NoVarzContextServiceBootstrapApplicationTests.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/NoVarzContextServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/NoVarzContextServiceBootstrapApplicationTests.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/NoVarzContextServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplicationTests.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplicationTests.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/ShutdownServiceBootstrapApplicationTests.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/ShutdownServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/ShutdownServiceBootstrapApplicationTests.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/ShutdownServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/VarzContextServiceBootstrapApplicationTests.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/VarzContextServiceBootstrapApplicationTests.java
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/src/test/java/org/springframework/bootstrap/sample/service/VarzContextServiceBootstrapApplicationTests.java
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/VarzContextServiceBootstrapApplicationTests.java
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/start.groovy b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy
similarity index 100%
rename from spring-bootstrap-samples/spring-bootstrap-service-sample/start.groovy
rename to spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy
diff --git a/spring-bootstrap-starters/pom.xml b/spring-bootstrap-starters/pom.xml
index f0e983358c..9073a0a492 100644
--- a/spring-bootstrap-starters/pom.xml
+++ b/spring-bootstrap-starters/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
           <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-service</artifactId>
+          <artifactId>spring-bootstrap-actuator</artifactId>
           <version>${spring.bootstrap.version}</version>
         </dependency>
         <dependency>