diff --git a/.gitignore b/.gitignore
index 5973e98d12..2fc3bbef9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 #*
 *#
 .#*
+.factorypath
 .classpath
 .project
 .settings/
diff --git a/docs/src/main/asciidoc/verifier/messaging.adoc b/docs/src/main/asciidoc/verifier/messaging.adoc
index dc53aa4385..dfb6741c8a 100644
--- a/docs/src/main/asciidoc/verifier/messaging.adoc
+++ b/docs/src/main/asciidoc/verifier/messaging.adoc
@@ -39,17 +39,17 @@ You have to provide as a dependency the messaging module that matches your provi
 testCompile "org.springframework.cloud:spring-cloud-contract-verifier-integration"
 ----
 
-and then add `@AutoConfigureStubMessages` to your test, e.g.
+and then add `@AutoConfigureMessageVerifier` to your test, e.g.
 
 [source,java,indent=0]
 ----
 @RunWith(SpringTestRunner.class)
 @SpringBootTest
-@AutoConfigureStubMessages
+@AutoConfigureMessageVerifier
 public static class MessagingContractTests {
 
   @Autowired
-  private StubMessages exchange;
+  private MessageVerifier verifier;
   ...
 }
 ----
diff --git a/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy b/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
index 88fdb3eabb..d528ff8e4f 100644
--- a/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
@@ -24,8 +24,8 @@ import org.junit.BeforeClass
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
-import org.springframework.cloud.contract.verifier.messaging.StubMessages
-import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier
+import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper;
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ContextConfiguration
@@ -42,11 +42,11 @@ import com.toomuchcoding.jsonassert.JsonAssertion
 // Context configuration would end up in base class
 @ContextConfiguration(classes = [CamelMessagingApplication], loader = SpringBootContextLoader)
 @DirtiesContext
-@AutoConfigureStubMessages
+@AutoConfigureMessageVerifier
 public class CamelMessagingApplicationSpec extends Specification {
 
 	// ALL CASES
-	@Inject StubMessages<Message> contractVerifierMessaging
+	@Inject MessageVerifier<Message> contractVerifierMessaging
 	ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()
 	
 	@BeforeClass
diff --git a/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy b/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
index 4769814661..e1cd234d5c 100644
--- a/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
@@ -21,8 +21,8 @@ import javax.inject.Inject
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
-import org.springframework.cloud.contract.verifier.messaging.StubMessages
-import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier
+import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper;
 import org.springframework.messaging.Message
 import org.springframework.test.annotation.DirtiesContext
@@ -36,11 +36,11 @@ import com.toomuchcoding.jsonassert.JsonAssertion
 // Context configuration would end up in base class
 @ContextConfiguration(classes = [IntegrationMessagingApplication], loader = SpringBootContextLoader)
 @DirtiesContext
-@AutoConfigureStubMessages
+@AutoConfigureMessageVerifier
 public class IntegrationMessagingApplicationSpec extends Specification {
 
 	// ALL CASES
-	@Inject StubMessages<Message<?>> contractVerifierMessaging
+	@Inject MessageVerifier<Message<?>> contractVerifierMessaging
 	ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()
 
 	def "should work for triggered based messaging"() {
diff --git a/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
index 1543be8826..b3524e7511 100644
--- a/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
+++ b/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
@@ -22,8 +22,8 @@ import org.junit.BeforeClass
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
-import org.springframework.cloud.contract.verifier.messaging.StubMessages
-import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier
+import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper;
 import org.springframework.messaging.Message;
 import org.springframework.test.annotation.DirtiesContext
@@ -41,11 +41,11 @@ import com.toomuchcoding.jsonassert.JsonAssertion
 // Context configuration would end up in base class
 @ContextConfiguration(classes = [SpringMessagingApplication], loader = SpringBootContextLoader)
 @DirtiesContext
-@AutoConfigureStubMessages
+@AutoConfigureMessageVerifier
 public class SpringApplicationSpec extends Specification {
 
 	// ALL CASES
-	@Inject StubMessages<Message<?>> contractVerifierMessaging
+	@Inject MessageVerifier<Message<?>> contractVerifierMessaging
 	ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()
 
 	@BeforeClass
diff --git a/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy b/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
index 9abf9335d2..ecd35ba885 100644
--- a/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
@@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.IntegrationTest
 import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
-import org.springframework.cloud.contract.verifier.messaging.StubMessages
-import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier
+import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper;
 import org.springframework.messaging.Message;
 import org.springframework.test.annotation.DirtiesContext
@@ -41,11 +41,11 @@ import com.toomuchcoding.jsonassert.JsonAssertion
 @ContextConfiguration(classes = [StreamMessagingApplication], loader = SpringBootContextLoader)
 @DirtiesContext
 @IntegrationTest("debug=true")
-@AutoConfigureStubMessages
+@AutoConfigureMessageVerifier
 public class StreamMessagingApplicationSpec extends Specification {
 
 	// ALL CASES
-	@Inject StubMessages<Message<?>> contractVerifierMessaging
+	@Inject MessageVerifier<Message<?>> contractVerifierMessaging
 	ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()
 
 	def "should work for triggered based messaging"() {
diff --git a/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java b/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
index ad87d741d8..fb775bbf83 100644
--- a/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
+++ b/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
@@ -19,7 +19,7 @@ package com.example.source;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages;
+import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
@@ -31,7 +31,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = ContractVerifierSampleStreamSourceApplication.class, properties="spring.cloud.stream.bindings.output.destination=sensor-data")
-@AutoConfigureStubMessages
+@AutoConfigureMessageVerifier
 public abstract class SensorSourceTestBase {
 
 	@Autowired
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy
index 55abe810fd..28564fa7be 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy
@@ -28,8 +28,8 @@ import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.stubrunner.StubFinder
 import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner
-import org.springframework.cloud.contract.verifier.messaging.StubMessages
-import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier
+import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
 import org.springframework.cloud.stream.annotation.EnableBinding
 import org.springframework.cloud.stream.messaging.Sink
 import org.springframework.cloud.stream.messaging.Source
@@ -46,11 +46,11 @@ import spock.lang.Specification
 @ContextConfiguration(classes = Config, loader = SpringBootContextLoader)
 @IntegrationTest("debug=true")
 @AutoConfigureStubRunner
-@AutoConfigureStubMessages
+@AutoConfigureMessageVerifier
 class StreamStubRunnerSpec extends Specification {
 
 	@Autowired StubFinder stubFinder
-	@Autowired StubMessages<Message<?>> messaging
+	@Autowired MessageVerifier<Message<?>> messaging
 
 	def setup() {
 		// ensure that message were taken from the queue
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java
index 9e0d0e6844..5babddd107 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java
@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.contract.stubrunner;
 
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages;
 
 /**
@@ -29,13 +29,13 @@ public class BatchStubRunnerFactory {
 
 	private final StubRunnerOptions stubRunnerOptions;
 	private final StubDownloader stubDownloader;
-	private final StubMessages contractVerifierMessaging;
+	private final MessageVerifier contractVerifierMessaging;
 
 	public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions) {
 		this(stubRunnerOptions, new AetherStubDownloader(stubRunnerOptions), new NoOpStubMessages());
 	}
 
-	public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubMessages contractVerifierMessaging) {
+	public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, MessageVerifier contractVerifierMessaging) {
 		this(stubRunnerOptions, new AetherStubDownloader(stubRunnerOptions), contractVerifierMessaging);
 	}
 
@@ -43,7 +43,7 @@ public class BatchStubRunnerFactory {
 		this(stubRunnerOptions, stubDownloader, new NoOpStubMessages());
 	}
 
-	public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader, StubMessages contractVerifierMessaging) {
+	public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader, MessageVerifier contractVerifierMessaging) {
 		this.stubRunnerOptions = stubRunnerOptions;
 		this.stubDownloader = stubDownloader;
 		this.contractVerifierMessaging = contractVerifierMessaging;
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java
index 99f7fcfb0a..39fbedb313 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java
@@ -23,7 +23,7 @@ import java.util.Collection;
 import java.util.Map;
 
 import org.springframework.cloud.contract.spec.Contract;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages;
 
 /**
@@ -52,7 +52,7 @@ public class StubRunner implements StubRunning {
 
 	public StubRunner(StubRunnerOptions stubRunnerOptions, String repositoryPath,
 			StubConfiguration stubsConfiguration,
-			StubMessages<?> contractVerifierMessaging) {
+			MessageVerifier<?> contractVerifierMessaging) {
 		this.stubsConfiguration = stubsConfiguration;
 		this.stubRunnerOptions = stubRunnerOptions;
 		this.stubRepository = new StubRepository(new File(repositoryPath));
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java
index ce5bd424f5..3e75a90069 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java
@@ -32,7 +32,7 @@ import org.springframework.cloud.contract.spec.internal.DslProperty;
 import org.springframework.cloud.contract.spec.internal.Headers;
 import org.springframework.cloud.contract.spec.internal.OutputMessage;
 import org.springframework.cloud.contract.stubrunner.AvailablePortScanner.PortCallback;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages;
 import org.springframework.cloud.contract.verifier.util.BodyExtractor;
 
@@ -45,11 +45,11 @@ public class StubRunnerExecutor implements StubFinder {
 
 	private static final Logger log = LoggerFactory.getLogger(StubRunnerExecutor.class);
 	private final AvailablePortScanner portScanner;
-	private final StubMessages<?> contractVerifierMessaging;
+	private final MessageVerifier<?> contractVerifierMessaging;
 	private StubServer stubServer;
 
 	public StubRunnerExecutor(AvailablePortScanner portScanner,
-			StubMessages<?> contractVerifierMessaging) {
+			MessageVerifier<?> contractVerifierMessaging) {
 		this.portScanner = portScanner;
 		this.contractVerifierMessaging = contractVerifierMessaging;
 	}
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java
index f775420b5e..6c5ae76f01 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 
 /**
  * Factory of StubRunners. Basing on the options and passed collaborators downloads the
@@ -31,11 +31,11 @@ public class StubRunnerFactory {
 
 	private final StubRunnerOptions stubRunnerOptions;
 	private final StubDownloader stubDownloader;
-	private final StubMessages<?> contractVerifierMessaging;
+	private final MessageVerifier<?> contractVerifierMessaging;
 
 	public StubRunnerFactory(StubRunnerOptions stubRunnerOptions,
 			StubDownloader stubDownloader,
-			StubMessages<?> contractVerifierMessaging) {
+			MessageVerifier<?> contractVerifierMessaging) {
 		this.stubRunnerOptions = stubRunnerOptions;
 		this.stubDownloader = stubDownloader;
 		this.contractVerifierMessaging = contractVerifierMessaging;
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java
index bc7e4bc014..a7c0c5fc90 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java
@@ -17,7 +17,7 @@
 package org.springframework.cloud.contract.stubrunner.server;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages;
 import org.springframework.context.annotation.Bean;
@@ -31,13 +31,13 @@ public class StubRunnerBackupAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public StubMessages<?> contractVerifierMessageExchange() {
+	public MessageVerifier<?> contractVerifierMessageExchange() {
 		return new NoOpStubMessages();
 	}
 
 	@Bean
 	public ContractVerifierMessaging<Object> contractVerifierMessaging(
-			StubMessages<Object> exchange) {
+			MessageVerifier<Object> exchange) {
 		return new ContractVerifierMessaging<Object>(exchange);
 	}
 
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java
index 0b35faa477..d61112beb0 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages;
+import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
 
 /**
  * @author Dave Syer
@@ -33,7 +33,7 @@ import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureS
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @ImportAutoConfiguration
-@AutoConfigureStubMessages
+@AutoConfigureMessageVerifier
 public @interface AutoConfigureStubRunner {
 
 }
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java
index 2976d26cc9..1b309881d6 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java
@@ -28,7 +28,7 @@ import org.springframework.cloud.contract.stubrunner.StubDownloader;
 import org.springframework.cloud.contract.stubrunner.StubRunner;
 import org.springframework.cloud.contract.stubrunner.StubRunnerOptions;
 import org.springframework.cloud.contract.stubrunner.StubRunnerOptionsBuilder;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -44,7 +44,7 @@ import org.springframework.core.io.Resource;
 public class StubRunnerConfiguration {
 
 	@Autowired(required = false)
-	private StubMessages<?> contractVerifierMessaging;
+	private MessageVerifier<?> contractVerifierMessaging;
 	@Autowired(required = false)
 	private StubDownloader stubDownloader;
 	@Autowired
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy
index 442b689ee5..68a1b7b3ac 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy
@@ -21,7 +21,7 @@ import groovy.json.JsonOutput
 import java.util.concurrent.TimeUnit
 
 import org.springframework.cloud.contract.stubrunner.util.StubsParser
-import org.springframework.cloud.contract.verifier.messaging.StubMessages
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier
 
 import spock.lang.Specification
 
@@ -99,7 +99,7 @@ class StubRunnerExecutorSpec extends Specification {
 		}
 	}
 
-	private class AssertingStubMessages implements StubMessages<Object> {
+	private class AssertingStubMessages implements MessageVerifier<Object> {
 		
 		@Override
 		public void send(Object message, String destination) {
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java
index 1a2f47edfc..332a5636ca 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java
@@ -28,7 +28,7 @@ import org.apache.camel.impl.DefaultExchange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.stereotype.Component;
 
 /**
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class CamelStubMessages implements
-		StubMessages<Message> {
+		MessageVerifier<Message> {
 
 	private static final Logger log = LoggerFactory.getLogger(
 			CamelStubMessages.class);
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java
index 313e2a71b3..f06ce85eed 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java
@@ -19,7 +19,7 @@ package org.springframework.cloud.contract.verifier.messaging.camel;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Message;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage;
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration;
@@ -34,14 +34,14 @@ import org.springframework.context.annotation.Configuration;
 public class ContractVerifierCamelConfiguration {
 
 	@Bean
-	StubMessages<Message> contractVerifierMessageExchange(
+	MessageVerifier<Message> contractVerifierMessageExchange(
 			CamelContext context) {
 		return new CamelStubMessages(context);
 	}
 
 	@Bean
 	public ContractVerifierMessaging<Message> contractVerifierMessaging(
-			StubMessages<Message> exchange) {
+			MessageVerifier<Message> exchange) {
 		return new ContractVerifierCamelHelper(exchange);
 	}
 }
@@ -49,7 +49,7 @@ public class ContractVerifierCamelConfiguration {
 class ContractVerifierCamelHelper extends ContractVerifierMessaging<Message> {
 
 	public ContractVerifierCamelHelper(
-			StubMessages<Message> exchange) {
+			MessageVerifier<Message> exchange) {
 		super(exchange);
 	}
 
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories
index fe3b7e036a..d382f16298 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
 # Auto Configuration
-org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages=\
+org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier=\
 org.springframework.cloud.contract.verifier.messaging.camel.ContractVerifierCamelConfiguration
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java
index 3d225fc743..358f39d970 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java
@@ -17,7 +17,7 @@
 package org.springframework.cloud.contract.verifier.messaging.integration;
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage;
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration;
@@ -34,21 +34,21 @@ import org.springframework.messaging.Message;
 public class ContractVerifierIntegrationConfiguration<T> {
 
 	@Bean
-	public StubMessages<Message<?>> contractVerifierMessageExchange(
+	public MessageVerifier<Message<?>> contractVerifierMessageExchange(
 			ApplicationContext applicationContext) {
 		return new SpringIntegrationStubMessages(applicationContext);
 	}
 
 	@Bean
 	public ContractVerifierMessaging<Message<?>> contractVerifierMessaging(
-			StubMessages<Message<?>> exchange) {
+			MessageVerifier<Message<?>> exchange) {
 		return new ContractVerifierHelper(exchange);
 	}
 }
 
 class ContractVerifierHelper extends ContractVerifierMessaging<Message<?>> {
 
-	public ContractVerifierHelper(StubMessages<Message<?>> exchange) {
+	public ContractVerifierHelper(MessageVerifier<Message<?>> exchange) {
 		super(exchange);
 	}
 
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java
index f7cf7ed8d1..53d7a16c67 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.context.ApplicationContext;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SpringIntegrationStubMessages implements
-		StubMessages<Message<?>> {
+		MessageVerifier<Message<?>> {
 
 	private static final Logger log = LoggerFactory.getLogger(
 			SpringIntegrationStubMessages.class);
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories
index a47c11428b..6f0a431831 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
 # Auto Configuration
-org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages=\
+org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier=\
 org.springframework.cloud.contract.verifier.messaging.integration.ContractVerifierIntegrationConfiguration
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/StubMessages.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/MessageVerifier.java
similarity index 97%
rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/StubMessages.java
rename to spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/MessageVerifier.java
index fb45d9689b..6fdfc414e1 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/StubMessages.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/MessageVerifier.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author Marcin Grzejszczak
  */
-public interface StubMessages<M> {
+public interface MessageVerifier<M> {
 	/**
 	 * Sends the {@link ContractVerifierMessage} to the given destination.
 	 */
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureStubMessages.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureMessageVerifier.java
similarity index 95%
rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureStubMessages.java
rename to spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureMessageVerifier.java
index 634262ffdd..4acc87695a 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureStubMessages.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureMessageVerifier.java
@@ -32,6 +32,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @ImportAutoConfiguration
-public @interface AutoConfigureStubMessages {
+public @interface AutoConfigureMessageVerifier {
 
 }
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java
index c9722d1421..36c52fed64 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java
@@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.messaging.internal;
 
 import java.util.Map;
 
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 
 /**
  * @author Dave Syer
@@ -26,9 +26,9 @@ import org.springframework.cloud.contract.verifier.messaging.StubMessages;
  */
 public class ContractVerifierMessaging<M> {
 	
-	private StubMessages<M> exchange;
+	private MessageVerifier<M> exchange;
 	
-	public ContractVerifierMessaging(StubMessages<M> exchange) {
+	public ContractVerifierMessaging(MessageVerifier<M> exchange) {
 		this.exchange = exchange;
 	}
 
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java
index 428e755b02..f6451840d3 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java
@@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.messaging.noop;
 
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,14 +33,14 @@ public class NoOpContractVerifierAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public StubMessages<?> contractVerifierMessageExchange() {
+	public MessageVerifier<?> contractVerifierMessageExchange() {
 		return new NoOpStubMessages();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	public ContractVerifierMessaging<?> contractVerifierMessaging(
-			StubMessages<Object> exchange) {
+			MessageVerifier<Object> exchange) {
 		return new ContractVerifierMessaging<Object>(exchange);
 	}
 
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java
index 97295aee84..8f58cd71a0 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java
@@ -19,12 +19,12 @@ package org.springframework.cloud.contract.verifier.messaging.noop;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 
 /**
  * @author Marcin Grzejszczak
  */
-public class NoOpStubMessages implements StubMessages<Object> {
+public class NoOpStubMessages implements MessageVerifier<Object> {
 	@Override
 	public void send(Object message, String destination) {
 	}
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java
index a53db37396..31a883118b 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java
@@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.messaging.stream;
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage;
 import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging;
 import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration;
@@ -36,14 +36,14 @@ import org.springframework.messaging.Message;
 public class ContractVerifierStreamAutoConfiguration {
 
 	@Bean
-	StubMessages<Message<?>> contractVerifierMessageExchange(
+	MessageVerifier<Message<?>> contractVerifierMessageExchange(
 			ApplicationContext applicationContext) {
 		return new StreamStubMessages(applicationContext);
 	}
 
 	@Bean
 	public ContractVerifierMessaging<?> contractVerifierMessagingConverter(
-			StubMessages<Message<?>> exchange) {
+			MessageVerifier<Message<?>> exchange) {
 		return new ContractVerifierHelper(exchange);
 	}
 }
@@ -51,7 +51,7 @@ public class ContractVerifierStreamAutoConfiguration {
 class ContractVerifierHelper extends ContractVerifierMessaging<Message<?>> {
 
 	public ContractVerifierHelper(
-			StubMessages<Message<?>> exchange) {
+			MessageVerifier<Message<?>> exchange) {
 		super(exchange);
 	}
 
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java
index 6a78e023dd..0efea8b9e3 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.contract.verifier.messaging.StubMessages;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
 import org.springframework.cloud.stream.config.BindingProperties;
 import org.springframework.cloud.stream.config.ChannelBindingServiceProperties;
 import org.springframework.cloud.stream.test.binder.MessageCollector;
@@ -33,7 +33,7 @@ import org.springframework.messaging.MessageChannel;
 /**
  * @author Marcin Grzejszczak
  */
-public class StreamStubMessages implements StubMessages<Message<?>> {
+public class StreamStubMessages implements MessageVerifier<Message<?>> {
 
 	private static final Logger log = LoggerFactory.getLogger(StreamStubMessages.class);
 
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories
index b23a58d146..f16cb4089f 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
 # Auto Configuration
-org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages=\
+org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier=\
 org.springframework.cloud.contract.verifier.messaging.stream.ContractVerifierStreamAutoConfiguration