diff --git a/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/AbstractSampleTests.java b/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/AbstractLocalTests.java
similarity index 97%
rename from spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/AbstractSampleTests.java
rename to spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/AbstractLocalTests.java
index 9591019..13103f0 100644
--- a/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/AbstractSampleTests.java
+++ b/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/AbstractLocalTests.java
@@ -14,9 +14,9 @@ import static org.junit.Assert.fail;
 /**
  * @author Soby Chacko
  */
-public abstract class AbstractSampleTests {
+public abstract class AbstractLocalTests {
 
-	private static final Logger logger = LoggerFactory.getLogger(AbstractSampleTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(AbstractLocalTests.class);
 
 	protected boolean waitForLogEntryInFile(String app, File f, String... entries) {
 		logger.info("Looking for '" + StringUtils.arrayToCommaDelimitedString(entries) + "' in logfile for " + app);
diff --git a/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SampleAcceptanceTests.java b/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/LocalAcceptanceTests.java
similarity index 98%
rename from spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SampleAcceptanceTests.java
rename to spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/LocalAcceptanceTests.java
index 059bba2..80eb79f 100644
--- a/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SampleAcceptanceTests.java
+++ b/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/LocalAcceptanceTests.java
@@ -38,9 +38,9 @@ import static org.junit.Assert.fail;
  *
  * @author Soby Chacko
  */
-public class SampleAcceptanceTests extends AbstractSampleTests {
+public class LocalAcceptanceTests extends AbstractLocalTests {
 
-	private static final Logger logger = LoggerFactory.getLogger(SampleAcceptanceTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(LocalAcceptanceTests.class);
 
 	private Process process;
 
diff --git a/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/PartitioningAcceptanceTests.java b/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/PartitioningAcceptanceTests.java
index 659c189..b69e97d 100644
--- a/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/PartitioningAcceptanceTests.java
+++ b/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/PartitioningAcceptanceTests.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.fail;
 /**
  * @author Soby Chacko
  */
-public class PartitioningAcceptanceTests extends AbstractSampleTests {
+public class PartitioningAcceptanceTests extends AbstractLocalTests {
 
 	private static final Logger logger = LoggerFactory.getLogger(PartitioningAcceptanceTests.class);
 
diff --git a/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SchemaRegistryVanillaSampleTests.java b/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SchemaRegistryVanillaTests.java
similarity index 97%
rename from spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SchemaRegistryVanillaSampleTests.java
rename to spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SchemaRegistryVanillaTests.java
index d36ab5a..c17b4ea 100644
--- a/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SchemaRegistryVanillaSampleTests.java
+++ b/spring-cloud-stream-local-acceptance-tests/src/test/java/sample/acceptance/tests/SchemaRegistryVanillaTests.java
@@ -15,9 +15,9 @@ import static org.junit.Assert.fail;
 /**
  * @author Soby Chacko
  */
-public class SchemaRegistryVanillaSampleTests extends AbstractSampleTests {
+public class SchemaRegistryVanillaTests extends AbstractLocalTests {
 
-	private static final Logger logger = LoggerFactory.getLogger(SchemaRegistryVanillaSampleTests.class);
+	private static final Logger logger = LoggerFactory.getLogger(SchemaRegistryVanillaTests.class);
 
 	@Test
 	public void testSchemaRegistryVanillaKafka() throws Exception {