diff --git a/spring-boot-cli/src/main/content/bin/spring.bat b/spring-boot-cli/src/main/content/bin/spring.bat
index bff7df2db0..c9c0081c06 100644
--- a/spring-boot-cli/src/main/content/bin/spring.bat
+++ b/spring-boot-cli/src/main/content/bin/spring.bat
@@ -59,7 +59,7 @@ set CMD_LINE_ARGS=%$
 @rem Setup the command line
 
 set CLASSPATH=%SPRING_HOME%\lib\*
-"%JAVA_EXE%" %JAVA_OPTS% -cp "%CLASSPATH%" org.springframework.boot.cli.SpringCli %CMD_LINE_ARGS%
+"%JAVA_EXE%" %JAVA_OPTS% -cp "%CLASSPATH%" org.springframework.boot.loader.JarLauncher %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/spring-boot-cli/src/main/executablecontent/bin/spring b/spring-boot-cli/src/main/executablecontent/bin/spring
index 901faae35f..c9aec1e479 100755
--- a/spring-boot-cli/src/main/executablecontent/bin/spring
+++ b/spring-boot-cli/src/main/executablecontent/bin/spring
@@ -92,4 +92,4 @@ if $cygwin; then
 	CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 fi
 
-"${JAVA_HOME}/bin/java" ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.boot.cli.SpringCli $*
+"${JAVA_HOME}/bin/java" ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.boot.loader.JarLauncher $*