diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/domain/Book.java b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/domain/Book.java
index 43432dbe..86e8e9a4 100644
--- a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/domain/Book.java
+++ b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/domain/Book.java
@@ -23,7 +23,7 @@ import org.springframework.data.cassandra.core.mapping.PrimaryKey;
 import org.springframework.data.cassandra.core.mapping.Table;
 
 /**
- * Test POJO
+ * Test POJO.
  *
  * @author David Webb
  * @author Artem Bilan
diff --git a/consumer/log-consumer/pom.xml b/consumer/log-consumer/pom.xml
index 8d9db827..64adaeb6 100644
--- a/consumer/log-consumer/pom.xml
+++ b/consumer/log-consumer/pom.xml
@@ -16,7 +16,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>io.pivotal.java.function</groupId>
+			<groupId>org.springframework.cloud.fn</groupId>
 			<artifactId>payload-converter-function</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/supplier/jdbc-supplier/pom.xml b/supplier/jdbc-supplier/pom.xml
index 3fdbb213..4ad4bc79 100644
--- a/supplier/jdbc-supplier/pom.xml
+++ b/supplier/jdbc-supplier/pom.xml
@@ -33,7 +33,7 @@
             <version>${spring-cloud-function.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.pivotal.java.function</groupId>
+            <groupId>org.springframework.cloud.fn</groupId>
             <artifactId>splitter-function</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierConfiguration.java b/supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierConfiguration.java
index a0d9fda0..79c281c9 100644
--- a/supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierConfiguration.java
+++ b/supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierConfiguration.java
@@ -22,11 +22,11 @@ import java.util.function.Supplier;
 
 import javax.sql.DataSource;
 
-import io.pivotal.java.function.splitter.function.SplitterFunctionConfiguration;
 import reactor.core.publisher.Flux;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.fn.splitter.SplitterFunctionConfiguration;
 import org.springframework.cloud.function.context.PollableBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;