diff --git a/functional-samples/.mvn/wrapper/maven-wrapper.jar b/function-samples/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from functional-samples/.mvn/wrapper/maven-wrapper.jar
rename to function-samples/.mvn/wrapper/maven-wrapper.jar
diff --git a/functional-samples/.mvn/wrapper/maven-wrapper.properties b/function-samples/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from functional-samples/.mvn/wrapper/maven-wrapper.properties
rename to function-samples/.mvn/wrapper/maven-wrapper.properties
diff --git a/functional-samples/README.adoc b/function-samples/README.adoc
similarity index 100%
rename from functional-samples/README.adoc
rename to function-samples/README.adoc
diff --git a/functional-samples/http-ingest/.mvn/wrapper/maven-wrapper.jar b/function-samples/http-ingest/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from functional-samples/http-ingest/.mvn/wrapper/maven-wrapper.jar
rename to function-samples/http-ingest/.mvn/wrapper/maven-wrapper.jar
diff --git a/functional-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties b/function-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from functional-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties
rename to function-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties
diff --git a/functional-samples/http-ingest/README.adoc b/function-samples/http-ingest/README.adoc
similarity index 100%
rename from functional-samples/http-ingest/README.adoc
rename to function-samples/http-ingest/README.adoc
diff --git a/functional-samples/http-ingest/mvnw b/function-samples/http-ingest/mvnw
similarity index 100%
rename from functional-samples/http-ingest/mvnw
rename to function-samples/http-ingest/mvnw
diff --git a/functional-samples/http-ingest/mvnw.cmd b/function-samples/http-ingest/mvnw.cmd
similarity index 100%
rename from functional-samples/http-ingest/mvnw.cmd
rename to function-samples/http-ingest/mvnw.cmd
diff --git a/functional-samples/http-ingest/pom.xml b/function-samples/http-ingest/pom.xml
similarity index 100%
rename from functional-samples/http-ingest/pom.xml
rename to function-samples/http-ingest/pom.xml
diff --git a/functional-samples/http-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java b/function-samples/http-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
similarity index 100%
rename from functional-samples/http-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
rename to function-samples/http-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
diff --git a/functional-samples/http-ingest/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/function-samples/http-ingest/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
similarity index 100%
rename from functional-samples/http-ingest/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
rename to function-samples/http-ingest/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
diff --git a/functional-samples/http-ingest/src/main/resources/application.properties b/function-samples/http-ingest/src/main/resources/application.properties
similarity index 100%
rename from functional-samples/http-ingest/src/main/resources/application.properties
rename to function-samples/http-ingest/src/main/resources/application.properties
diff --git a/functional-samples/http-ingest/src/main/resources/application.yml b/function-samples/http-ingest/src/main/resources/application.yml
similarity index 100%
rename from functional-samples/http-ingest/src/main/resources/application.yml
rename to function-samples/http-ingest/src/main/resources/application.yml
diff --git a/functional-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.jar b/function-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from functional-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.jar
rename to function-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.jar
diff --git a/functional-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.properties b/function-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from functional-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.properties
rename to function-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.properties
diff --git a/functional-samples/http-region-ingest/README.adoc b/function-samples/http-region-ingest/README.adoc
similarity index 100%
rename from functional-samples/http-region-ingest/README.adoc
rename to function-samples/http-region-ingest/README.adoc
diff --git a/functional-samples/http-region-ingest/mvnw b/function-samples/http-region-ingest/mvnw
similarity index 100%
rename from functional-samples/http-region-ingest/mvnw
rename to function-samples/http-region-ingest/mvnw
diff --git a/functional-samples/http-region-ingest/mvnw.cmd b/function-samples/http-region-ingest/mvnw.cmd
similarity index 100%
rename from functional-samples/http-region-ingest/mvnw.cmd
rename to function-samples/http-region-ingest/mvnw.cmd
diff --git a/functional-samples/http-region-ingest/pom.xml b/function-samples/http-region-ingest/pom.xml
similarity index 100%
rename from functional-samples/http-region-ingest/pom.xml
rename to function-samples/http-region-ingest/pom.xml
diff --git a/functional-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java b/function-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
similarity index 100%
rename from functional-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
rename to function-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
diff --git a/functional-samples/http-region-ingest/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/function-samples/http-region-ingest/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
similarity index 100%
rename from functional-samples/http-region-ingest/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
rename to function-samples/http-region-ingest/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
diff --git a/functional-samples/http-region-ingest/src/main/resources/application.properties b/function-samples/http-region-ingest/src/main/resources/application.properties
similarity index 100%
rename from functional-samples/http-region-ingest/src/main/resources/application.properties
rename to function-samples/http-region-ingest/src/main/resources/application.properties
diff --git a/functional-samples/http-region-ingest/src/main/resources/application.yml b/function-samples/http-region-ingest/src/main/resources/application.yml
similarity index 100%
rename from functional-samples/http-region-ingest/src/main/resources/application.yml
rename to function-samples/http-region-ingest/src/main/resources/application.yml
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/.gitignore b/function-samples/kstreams-join-user-clicks-and-region/.gitignore
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/.gitignore
rename to function-samples/kstreams-join-user-clicks-and-region/.gitignore
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.jar b/function-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.jar
rename to function-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.jar
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties b/function-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties
rename to function-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/README.adoc b/function-samples/kstreams-join-user-clicks-and-region/README.adoc
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/README.adoc
rename to function-samples/kstreams-join-user-clicks-and-region/README.adoc
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/mvnw b/function-samples/kstreams-join-user-clicks-and-region/mvnw
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/mvnw
rename to function-samples/kstreams-join-user-clicks-and-region/mvnw
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/mvnw.cmd b/function-samples/kstreams-join-user-clicks-and-region/mvnw.cmd
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/mvnw.cmd
rename to function-samples/kstreams-join-user-clicks-and-region/mvnw.cmd
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/pom.xml b/function-samples/kstreams-join-user-clicks-and-region/pom.xml
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/pom.xml
rename to function-samples/kstreams-join-user-clicks-and-region/pom.xml
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java b/function-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java
rename to function-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/function-samples/kstreams-join-user-clicks-and-region/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
rename to function-samples/kstreams-join-user-clicks-and-region/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/src/main/resources/application.yml b/function-samples/kstreams-join-user-clicks-and-region/src/main/resources/application.yml
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/src/main/resources/application.yml
rename to function-samples/kstreams-join-user-clicks-and-region/src/main/resources/application.yml
diff --git a/functional-samples/kstreams-join-user-clicks-and-region/src/main/resources/logback.xml b/function-samples/kstreams-join-user-clicks-and-region/src/main/resources/logback.xml
similarity index 100%
rename from functional-samples/kstreams-join-user-clicks-and-region/src/main/resources/logback.xml
rename to function-samples/kstreams-join-user-clicks-and-region/src/main/resources/logback.xml
diff --git a/functional-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.jar b/function-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from functional-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.jar
rename to function-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.jar
diff --git a/functional-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties b/function-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from functional-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties
rename to function-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties
diff --git a/functional-samples/kstreams-log-user-clicks-per-region/README.adoc b/function-samples/kstreams-log-user-clicks-per-region/README.adoc
similarity index 100%
rename from functional-samples/kstreams-log-user-clicks-per-region/README.adoc
rename to function-samples/kstreams-log-user-clicks-per-region/README.adoc
diff --git a/functional-samples/kstreams-log-user-clicks-per-region/mvnw b/function-samples/kstreams-log-user-clicks-per-region/mvnw
similarity index 100%
rename from functional-samples/kstreams-log-user-clicks-per-region/mvnw
rename to function-samples/kstreams-log-user-clicks-per-region/mvnw
diff --git a/functional-samples/kstreams-log-user-clicks-per-region/mvnw.cmd b/function-samples/kstreams-log-user-clicks-per-region/mvnw.cmd
similarity index 100%
rename from functional-samples/kstreams-log-user-clicks-per-region/mvnw.cmd
rename to function-samples/kstreams-log-user-clicks-per-region/mvnw.cmd
diff --git a/functional-samples/kstreams-log-user-clicks-per-region/pom.xml b/function-samples/kstreams-log-user-clicks-per-region/pom.xml
similarity index 100%
rename from functional-samples/kstreams-log-user-clicks-per-region/pom.xml
rename to function-samples/kstreams-log-user-clicks-per-region/pom.xml
diff --git a/functional-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java b/function-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java
similarity index 100%
rename from functional-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java
rename to function-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java
diff --git a/functional-samples/kstreams-log-user-clicks-per-region/src/main/resources/application.yml b/function-samples/kstreams-log-user-clicks-per-region/src/main/resources/application.yml
similarity index 100%
rename from functional-samples/kstreams-log-user-clicks-per-region/src/main/resources/application.yml
rename to function-samples/kstreams-log-user-clicks-per-region/src/main/resources/application.yml
diff --git a/functional-samples/kstreams-word-count/.gitignore b/function-samples/kstreams-word-count/.gitignore
similarity index 100%
rename from functional-samples/kstreams-word-count/.gitignore
rename to function-samples/kstreams-word-count/.gitignore
diff --git a/functional-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.jar b/function-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from functional-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.jar
rename to function-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.jar
diff --git a/functional-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.properties b/function-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from functional-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.properties
rename to function-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.properties
diff --git a/functional-samples/kstreams-word-count/mvnw b/function-samples/kstreams-word-count/mvnw
similarity index 100%
rename from functional-samples/kstreams-word-count/mvnw
rename to function-samples/kstreams-word-count/mvnw
diff --git a/functional-samples/kstreams-word-count/mvnw.cmd b/function-samples/kstreams-word-count/mvnw.cmd
similarity index 100%
rename from functional-samples/kstreams-word-count/mvnw.cmd
rename to function-samples/kstreams-word-count/mvnw.cmd
diff --git a/functional-samples/kstreams-word-count/pom.xml b/function-samples/kstreams-word-count/pom.xml
similarity index 100%
rename from functional-samples/kstreams-word-count/pom.xml
rename to function-samples/kstreams-word-count/pom.xml
diff --git a/functional-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java b/function-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java
similarity index 100%
rename from functional-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java
rename to function-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java
diff --git a/functional-samples/kstreams-word-count/src/main/resources/application.yml b/function-samples/kstreams-word-count/src/main/resources/application.yml
similarity index 100%
rename from functional-samples/kstreams-word-count/src/main/resources/application.yml
rename to function-samples/kstreams-word-count/src/main/resources/application.yml
diff --git a/functional-samples/mvnw b/function-samples/mvnw
similarity index 100%
rename from functional-samples/mvnw
rename to function-samples/mvnw
diff --git a/functional-samples/mvnw.cmd b/function-samples/mvnw.cmd
similarity index 100%
rename from functional-samples/mvnw.cmd
rename to function-samples/mvnw.cmd
diff --git a/functional-samples/pom.xml b/function-samples/pom.xml
similarity index 93%
rename from functional-samples/pom.xml
rename to function-samples/pom.xml
index b9d3845..e170815 100644
--- a/functional-samples/pom.xml
+++ b/function-samples/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
-	<artifactId>functional-samples-parent</artifactId>
+	<artifactId>function-samples-parent</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/functional-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.jar b/function-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from functional-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.jar
rename to function-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.jar
diff --git a/functional-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.properties b/function-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from functional-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.properties
rename to function-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.properties
diff --git a/functional-samples/uppercase-processor/README.adoc b/function-samples/uppercase-processor/README.adoc
similarity index 100%
rename from functional-samples/uppercase-processor/README.adoc
rename to function-samples/uppercase-processor/README.adoc
diff --git a/functional-samples/uppercase-processor/mvnw b/function-samples/uppercase-processor/mvnw
similarity index 100%
rename from functional-samples/uppercase-processor/mvnw
rename to function-samples/uppercase-processor/mvnw
diff --git a/functional-samples/uppercase-processor/mvnw.cmd b/function-samples/uppercase-processor/mvnw.cmd
similarity index 100%
rename from functional-samples/uppercase-processor/mvnw.cmd
rename to function-samples/uppercase-processor/mvnw.cmd
diff --git a/functional-samples/uppercase-processor/pom.xml b/function-samples/uppercase-processor/pom.xml
similarity index 100%
rename from functional-samples/uppercase-processor/pom.xml
rename to function-samples/uppercase-processor/pom.xml
diff --git a/functional-samples/uppercase-processor/src/main/java/org/springframework/cloud/dataflow/samples/source/UppercaseProcessor.java b/function-samples/uppercase-processor/src/main/java/org/springframework/cloud/dataflow/samples/source/UppercaseProcessor.java
similarity index 100%
rename from functional-samples/uppercase-processor/src/main/java/org/springframework/cloud/dataflow/samples/source/UppercaseProcessor.java
rename to function-samples/uppercase-processor/src/main/java/org/springframework/cloud/dataflow/samples/source/UppercaseProcessor.java
diff --git a/functional-samples/uppercase-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/function-samples/uppercase-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
similarity index 100%
rename from functional-samples/uppercase-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
rename to function-samples/uppercase-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
diff --git a/functional-samples/uppercase-processor/src/main/resources/application.properties b/function-samples/uppercase-processor/src/main/resources/application.properties
similarity index 100%
rename from functional-samples/uppercase-processor/src/main/resources/application.properties
rename to function-samples/uppercase-processor/src/main/resources/application.properties
diff --git a/functional-samples/uppercase-processor/src/main/resources/application.yml b/function-samples/uppercase-processor/src/main/resources/application.yml
similarity index 100%
rename from functional-samples/uppercase-processor/src/main/resources/application.yml
rename to function-samples/uppercase-processor/src/main/resources/application.yml