diff --git a/spring-boot-cli/src/test/resources/repro-samples/crsh.groovy b/spring-boot-cli/src/test/resources/repro-samples/crsh.groovy
index 6c948c3e34..08de69663d 100644
--- a/spring-boot-cli/src/test/resources/repro-samples/crsh.groovy
+++ b/spring-boot-cli/src/test/resources/repro-samples/crsh.groovy
@@ -1,6 +1,6 @@
 package org.test
 
-@Grab("spring-boot-starter-shell-remote")
+@Grab("spring-boot-starter-shell")
 
 @RestController
 class SampleController {
diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
index 4fc2133ff6..ee32455687 100644
--- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -424,13 +424,13 @@ If you are using Jolokia but you don't want Spring Boot to configure it, simply
 == Monitoring and management using a remote shell
 Spring Boot supports an integrated Java shell called ``CRaSH''. You can use CRaSH to
 `ssh` or `telnet` into your running application. To enable remote shell support add a
-dependency to `spring-boot-starter-shell-remote`:
+dependency to `spring-boot-starter-shell`:
 
 [source,xml,indent=0]
 ----
 	<dependency>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-shell-remote</artifactId>
+		<artifactId>spring-boot-starter-shell</artifactId>
  	</dependency>
 ----
 
diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
index 79aad331e8..11b50518c7 100644
--- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
@@ -269,7 +269,7 @@ add '<<production-ready-features.adoc#production-ready, production ready>>' feat
 |`spring-boot-starter-actuator`
 |Adds production ready features such as metrics and monitoring.
 
-|`spring-boot-starter-shell-remote`
+|`spring-boot-starter-shell`
 |Adds remote `ssh` shell support.
 |===
 
diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml b/spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
index 934a88c78d..1906f994f5 100644
--- a/spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
@@ -19,7 +19,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-shell-remote</artifactId>
+			<artifactId>spring-boot-starter-shell</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
index fdfeb94a66..7297b012a2 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
@@ -39,7 +39,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-shell-remote</artifactId>
+			<artifactId>spring-boot-starter-shell</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 79e3adf0de..aa6f818c96 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -29,7 +29,7 @@
 		<module>spring-boot-starter-parent</module>
 		<module>spring-boot-starter-redis</module>
 		<module>spring-boot-starter-security</module>
-		<module>spring-boot-starter-shell-remote</module>
+		<module>spring-boot-starter-shell</module>
 		<module>spring-boot-starter-test</module>
 		<module>spring-boot-starter-thymeleaf</module>
 		<module>spring-boot-starter-tomcat</module>
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index a22f0070ee..57072b7665 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -122,7 +122,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-shell-remote</artifactId>
+				<artifactId>spring-boot-starter-shell</artifactId>
 				<version>${spring-boot.version}</version>
 			</dependency>
 			<dependency>
diff --git a/spring-boot-starters/spring-boot-starter-shell-remote/pom.xml b/spring-boot-starters/spring-boot-starter-shell/pom.xml
similarity index 97%
rename from spring-boot-starters/spring-boot-starter-shell-remote/pom.xml
rename to spring-boot-starters/spring-boot-starter-shell/pom.xml
index 89b3e3ef07..ebf2610f5c 100644
--- a/spring-boot-starters/spring-boot-starter-shell-remote/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-shell/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>spring-boot-starters</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-starter-shell-remote</artifactId>
+	<artifactId>spring-boot-starter-shell</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
diff --git a/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-shell/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/META-INF/spring.provides
rename to spring-boot-starters/spring-boot-starter-shell/src/main/resources/META-INF/spring.provides
diff --git a/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/autoconfig.groovy b/spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/autoconfig.groovy
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/autoconfig.groovy
rename to spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/autoconfig.groovy
diff --git a/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/beans.groovy b/spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/beans.groovy
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/beans.groovy
rename to spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/beans.groovy
diff --git a/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/login.groovy b/spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/login.groovy
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/login.groovy
rename to spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/login.groovy
diff --git a/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/metrics.groovy b/spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/metrics.groovy
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/metrics.groovy
rename to spring-boot-starters/spring-boot-starter-shell/src/main/resources/commands/crash/metrics.groovy