diff --git a/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
index a52e16a8a26..abfcf38b261 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
@@ -34,7 +34,7 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-starter-shell-crsh</artifactId>
+			<artifactId>spring-boot-starter-shell-remote</artifactId>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 31d622866ad..49eea2e2bdb 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -27,7 +27,7 @@
 		<module>spring-boot-starter-actuator</module>
 		<module>spring-boot-starter-parent</module>
 		<module>spring-boot-starter-security</module>
-		<module>spring-boot-starter-shell-crsh</module>
+		<module>spring-boot-starter-shell-remote</module>
 		<module>spring-boot-starter-test</module>
 		<module>spring-boot-starter-tomcat</module>
 		<module>spring-boot-starter-web</module>
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index 2b1cf530ea3..9b8bf334865 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -100,7 +100,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-shell-crsh</artifactId>
+				<artifactId>spring-boot-starter-shell-remote</artifactId>
 				<version>0.5.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
diff --git a/spring-boot-starters/spring-boot-starter-shell-crsh/pom.xml b/spring-boot-starters/spring-boot-starter-shell-remote/pom.xml
similarity index 97%
rename from spring-boot-starters/spring-boot-starter-shell-crsh/pom.xml
rename to spring-boot-starters/spring-boot-starter-shell-remote/pom.xml
index 2d159c569b2..04addb84cb0 100644
--- a/spring-boot-starters/spring-boot-starter-shell-crsh/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-shell-remote/pom.xml
@@ -7,7 +7,7 @@
 		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-starter-shell-crsh</artifactId>
+	<artifactId>spring-boot-starter-shell-remote</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
diff --git a/spring-boot-starters/spring-boot-starter-shell-crsh/src/main/resources/commands/crash/help.groovy b/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/help.groovy
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-crsh/src/main/resources/commands/crash/help.groovy
rename to spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/help.groovy
diff --git a/spring-boot-starters/spring-boot-starter-shell-crsh/src/main/resources/commands/crash/jmx.groovy b/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/jmx.groovy
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-crsh/src/main/resources/commands/crash/jmx.groovy
rename to spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/jmx.groovy
diff --git a/spring-boot-starters/spring-boot-starter-shell-crsh/src/main/resources/commands/crash/login.groovy b/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/login.groovy
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-crsh/src/main/resources/commands/crash/login.groovy
rename to spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/login.groovy
diff --git a/spring-boot-starters/spring-boot-starter-shell-crsh/src/main/resources/commands/crash/metrics.groovy b/spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/metrics.groovy
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-shell-crsh/src/main/resources/commands/crash/metrics.groovy
rename to spring-boot-starters/spring-boot-starter-shell-remote/src/main/resources/commands/crash/metrics.groovy