diff --git a/samples/standalone/dsl/http-client/settings.gradle b/samples/standalone/dsl/http-client/settings.gradle
index 8dc58d5ad1..882c555fec 100644
--- a/samples/standalone/dsl/http-client/settings.gradle
+++ b/samples/standalone/dsl/http-client/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'http-client'
+rootProject.name = 'http-client-dsl'
diff --git a/samples/standalone/dsl/http-client/src/test/java/com/example/loan/LoanApplicationServiceTests.java b/samples/standalone/dsl/http-client/src/test/java/com/example/loan/LoanApplicationServiceTests.java
index 9f45205d18..a425bfdbc1 100644
--- a/samples/standalone/dsl/http-client/src/test/java/com/example/loan/LoanApplicationServiceTests.java
+++ b/samples/standalone/dsl/http-client/src/test/java/com/example/loan/LoanApplicationServiceTests.java
@@ -22,7 +22,7 @@ public class LoanApplicationServiceTests {
 // end::autoconfigure_stubrunner[]
 
 	@Autowired
-	private LoanApplicationService sut;
+	private LoanApplicationService service;
 
 	@Test
 	public void shouldSuccessfullyApplyForLoan() {
@@ -30,7 +30,7 @@ public class LoanApplicationServiceTests {
 		LoanApplication application = new LoanApplication(new Client("1234567890"),
 				123.123);
 		// when:
-		LoanApplicationResult loanApplication = sut.loanApplication(application);
+		LoanApplicationResult loanApplication = service.loanApplication(application);
 		// then:
 		assertThat(loanApplication.getLoanApplicationStatus())
 				.isEqualTo(LoanApplicationStatus.LOAN_APPLIED);
@@ -44,7 +44,7 @@ public class LoanApplicationServiceTests {
 		LoanApplication application = new LoanApplication(new Client("1234567890"),
 				99999);
 		// when:
-		LoanApplicationResult loanApplication = sut.loanApplication(application);
+		LoanApplicationResult loanApplication = service.loanApplication(application);
 		// then:
 		assertThat(loanApplication.getLoanApplicationStatus())
 				.isEqualTo(LoanApplicationStatus.LOAN_APPLICATION_REJECTED);
diff --git a/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml b/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml
index 2ac488ce08..f35e838cbf 100644
--- a/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml
+++ b/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml
@@ -1,3 +1,3 @@
 stubrunner.stubs:
-  ids: 'com.example:http-server:+:stubs:8080'
+  ids: 'com.example:http-server-dsl:+:stubs:8080'
   repositoryRoot: http://repo.spring.io/libs-snapshot
diff --git a/samples/standalone/dsl/http-server/settings.gradle b/samples/standalone/dsl/http-server/settings.gradle
index b4f382e60c..74f9e986d4 100644
--- a/samples/standalone/dsl/http-server/settings.gradle
+++ b/samples/standalone/dsl/http-server/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'http-server'
+rootProject.name = 'http-server-dsl'
diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java
index 710ad15327..3e0ac60a2b 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java
@@ -29,7 +29,7 @@ public class BatchStubRunnerFactory {
 
 	private final StubRunnerOptions stubRunnerOptions;
 	private final StubDownloader stubDownloader;
-	private final MessageVerifier contractVerifierMessaging;
+	private final MessageVerifier<?> contractVerifierMessaging;
 
 	public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions) {
 		this(stubRunnerOptions, new AetherStubDownloader(stubRunnerOptions), new NoOpStubMessages());
@@ -39,7 +39,7 @@ public class BatchStubRunnerFactory {
 		this(stubRunnerOptions, stubDownloader, new NoOpStubMessages());
 	}
 
-	public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader, MessageVerifier 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/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java
index 0df24b8838..a5915347bb 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java
@@ -38,11 +38,10 @@ import com.netflix.loadbalancer.ServerList;
  *
  * @since 1.0.0
  */
-class StubRunnerRibbonServerList implements ServerList {
+class StubRunnerRibbonServerList implements ServerList<Server> {
 
-	private final ServerList<?> serverList;
+	private final ServerList<Server> serverList;
 
-	@SuppressWarnings("unchecked")
 	StubRunnerRibbonServerList(final StubFinder stubFinder,
 									  final StubMapperProperties stubMapperProperties,
 									  final IClientConfig clientConfig,
@@ -53,7 +52,7 @@ class StubRunnerRibbonServerList implements ServerList {
 				stubMapperProperties.fromServiceIdToIvyNotation(serviceName) : serviceName;
 		RunningStubs runningStubs = stubFinder.findAllRunningStubs();
 		final Map.Entry<StubConfiguration, Integer> entry = runningStubs.getEntry(mappedServiceName);
-		final Collection servers = new ArrayList<>();
+		final Collection<Server> servers = new ArrayList<>();
 		if (entry != null) {
 			servers.add(new Server("localhost", entry.getValue()) {
 				@Override
@@ -82,18 +81,18 @@ class StubRunnerRibbonServerList implements ServerList {
 				}
 			});
 		}
-		serverList = new ServerList() {
+		serverList = new ServerList<Server>() {
 			@Override
-			public List<?> getInitialListOfServers() {
-				List combinedList = new ArrayList<>();
+			public List<Server> getInitialListOfServers() {
+				List<Server> combinedList = new ArrayList<>();
 				combinedList.addAll(servers);
 				combinedList.addAll(delegate.getInitialListOfServers());
 				return combinedList;
 			}
 
 			@Override
-			public List<?> getUpdatedListOfServers() {
-				List combinedList = new ArrayList<>();
+			public List<Server> getUpdatedListOfServers() {
+				List<Server> combinedList = new ArrayList<>();
 				combinedList.addAll(servers);
 				combinedList.addAll(delegate.getUpdatedListOfServers());
 				return combinedList;
@@ -102,12 +101,12 @@ class StubRunnerRibbonServerList implements ServerList {
 	}
 
 	@Override
-	public List<?> getInitialListOfServers() {
+	public List<Server> getInitialListOfServers() {
 		return serverList.getInitialListOfServers();
 	}
 
 	@Override
-	public List<?> getUpdatedListOfServers() {
+	public List<Server> getUpdatedListOfServers() {
 		return serverList.getUpdatedListOfServers();
 	}
 }