diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java
index e05f8e10f..0ddbd7521 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java
@@ -110,7 +110,7 @@ public class SpringFunctionInitializer implements Closeable {
 
 	private SpringApplication springApplication() {
 		Class<?> sourceClass = configurationClass;
-		SpringApplication application = new org.springframework.cloud.function.context.SpringApplication(
+		SpringApplication application = new org.springframework.cloud.function.context.FunctionalSpringApplication(
 				sourceClass);
 		application.setWebApplicationType(WebApplicationType.NONE);
 		return application;
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java
index c752171b2..759880698 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java
@@ -133,7 +133,7 @@ public class AzureSpringFunctionInitializer implements Closeable {
 
 	private SpringApplication springApplication() {
 		Class<?> sourceClass = configurationClass;
-		SpringApplication application = new org.springframework.cloud.function.context.SpringApplication(
+		SpringApplication application = new org.springframework.cloud.function.context.FunctionalSpringApplication(
 				sourceClass);
 		application.setWebApplicationType(WebApplicationType.NONE);
 		return application;
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/SpringApplication.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java
similarity index 95%
rename from spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/SpringApplication.java
rename to spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java
index e05d75298..334611dae 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/SpringApplication.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java
@@ -35,7 +35,7 @@ import org.springframework.core.env.MutablePropertySources;
  * @author Dave Syer
  *
  */
-public class SpringApplication extends org.springframework.boot.SpringApplication {
+public class FunctionalSpringApplication extends org.springframework.boot.SpringApplication {
 
 	/**
 	 * Name of default property source.
@@ -54,10 +54,10 @@ public class SpringApplication extends org.springframework.boot.SpringApplicatio
 
 	public static ConfigurableApplicationContext run(Class<?>[] primarySources,
 			String[] args) {
-		return new SpringApplication(primarySources).run(args);
+		return new FunctionalSpringApplication(primarySources).run(args);
 	}
 
-	public SpringApplication(Class<?>... primarySources) {
+	public FunctionalSpringApplication(Class<?>... primarySources) {
 		super(primarySources);
 		// Prefer non-web applications, even if a server is on the classpath
 		setWebApplicationType(WebApplicationType.NONE);
diff --git a/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
index 56b471d8d..4bb01bb7e 100644
--- a/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
+++ b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
@@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.function.context.FunctionRegistration;
 import org.springframework.cloud.function.context.FunctionType;
-import org.springframework.cloud.function.context.SpringApplication;
+import org.springframework.cloud.function.context.FunctionalSpringApplication;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.support.GenericApplicationContext;
@@ -47,7 +47,7 @@ public class Config implements ApplicationContextInitializer<GenericApplicationC
 	}
 
 	public static void main(String[] args) throws Exception {
-		SpringApplication.run(Config.class, args);
+		FunctionalSpringApplication.run(Config.class, args);
 	}
 
 	@Override