diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml
index 288fd1f28..417b5a4f1 100644
--- a/spring-cloud-function-compiler/pom.xml
+++ b/spring-cloud-function-compiler/pom.xml
@@ -70,6 +70,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java
index 75683a581..dc59431fa 100644
--- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java
+++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java
@@ -55,16 +55,28 @@ public class FunctionProxyApplicationListener
 
 	private final ConsumerCompiler<?> consumerCompiler = new ConsumerCompiler<>();
 
-	private final Map<String, Object> toCompile = new HashMap<>();
+	/**
+	 * Configuration for function bodies, which will be compiled. The key in the map is
+	 * the function name and the value is a map containing a key "lambda" which is the
+	 * body to compile, and optionally a "type" (defaults to "function"). Can also contain
+	 * "inputType" and "outputType" in case it is ambiguous.
+	 */
+	private final Map<String, Object> compile = new HashMap<>();
 
-	private final Map<String, Object> toImport = new HashMap<>();
+	/**
+	 * Configuration for a set of files containing function bodies, which will be imported
+	 * and compiled. The key in the map is the function name and the value is another map,
+	 * containing a "location" of the file to compile and (optionally) a "type" (defaults
+	 * to "function").
+	 */
+	private final Map<String, Object> imports = new HashMap<>();
 
 	public Map<String, Object> getCompile() {
-		return toCompile;
+		return compile;
 	}
 
-	public Map<String, Object> getImport() {
-		return toImport;
+	public Map<String, Object> getImports() {
+		return imports;
 	}
 
 	@Override
@@ -73,7 +85,7 @@ public class FunctionProxyApplicationListener
 		DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) context
 				.getBeanFactory();
 		bind(context);
-		for (Map.Entry<String, Object> entry : toCompile.entrySet()) {
+		for (Map.Entry<String, Object> entry : compile.entrySet()) {
 			String name = entry.getKey();
 			@SuppressWarnings("unchecked")
 			Map<String, String> properties = (Map<String, String>) entry.getValue();
@@ -88,7 +100,7 @@ public class FunctionProxyApplicationListener
 			registerLambdaCompilingProxy(name, type, inputType, outputType, lambda,
 					beanFactory);
 		}
-		for (Map.Entry<String, Object> entry : toImport.entrySet()) {
+		for (Map.Entry<String, Object> entry : imports.entrySet()) {
 			String name = entry.getKey();
 			@SuppressWarnings("unchecked")
 			Map<String, String> properties = (Map<String, String>) entry.getValue();
diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java
index 2d50283e7..cab3c6adc 100644
--- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java
+++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfigurationTests.java
@@ -451,7 +451,7 @@ public class ContextFunctionCatalogAutoConfigurationTests {
 		FileSystemResource resource = new FileSystemResource("target/foos.fun");
 		StreamUtils.copy(compiled.getGeneratedClassBytes(), resource.getOutputStream());
 		create(EmptyConfiguration.class,
-				"spring.cloud.function.import.foos.location=file:./target/foos.fun");
+				"spring.cloud.function.imports.foos.location=file:./target/foos.fun");
 		assertThat(context.getBean("foos")).isInstanceOf(Function.class);
 		assertThat(catalog.<Function<?, ?>>lookup(Function.class, "foos"))
 				.isInstanceOf(Function.class);