diff --git a/README.adoc b/README.adoc
index 79912fe714..6cd679fc50 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1483,7 +1483,7 @@ for more details.
 
 If you have a Spring Boot application that uses Tomcat as an embedded server (which is
 the default with `spring-boot-starter-web`),  you can add
-`spring-cloud-contract-wiremock` to your classpath and add `@AutoConfigureWireMock` in
+`spring-cloud-starter-contract-stub-runner` to your classpath and add `@AutoConfigureWireMock` in
 order to be able to use Wiremock in your tests. Wiremock runs as a stub server and you
 can register stub behavior using a Java API or via static JSON declarations as part of
 your test. The following code shows an example:
@@ -1646,6 +1646,9 @@ errors. If you use the default `java.net` client, you do not need the annotation
 won't do any harm). There is no support currently for other clients, but it may be added
 in future releases.
 
+To disable the custom `RestTemplateBuilder`, set the `wiremock.rest-template-ssl-enabled`
+property to `false`.
+
 === WireMock and Spring MVC Mocks
 
 Spring Cloud Contract provides a convenience class that can load JSON WireMock stubs into
diff --git a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc
index 6891ae03a6..0cb52f37ba 100644
--- a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc
@@ -11,7 +11,7 @@ for more details.
 
 If you have a Spring Boot application that uses Tomcat as an embedded server (which is
 the default with `spring-boot-starter-web`),  you can add
-`spring-cloud-contract-wiremock` to your classpath and add `@AutoConfigureWireMock` in
+`spring-cloud-starter-contract-stub-runner` to your classpath and add `@AutoConfigureWireMock` in
 order to be able to use Wiremock in your tests. Wiremock runs as a stub server and you
 can register stub behavior using a Java API or via static JSON declarations as part of
 your test. The following code shows an example:
diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle
index 7e25104e70..03a9dcee7b 100644
--- a/samples/standalone/restdocs/http-server/build.gradle
+++ b/samples/standalone/restdocs/http-server/build.gradle
@@ -44,7 +44,7 @@ dependencies {
 
 	testCompile 'org.springframework.boot:spring-boot-starter-test'
 	testCompile 'org.springframework.restdocs:spring-restdocs-mockmvc'
-	testCompile 'org.springframework.cloud:spring-cloud-contract-wiremock'
+	testCompile 'org.springframework.cloud:spring-cloud-starter-contract-stub-runner'
 }
 
 test {
diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml
index 36dd63c1e1..9ba39d36fc 100644
--- a/samples/standalone/restdocs/http-server/pom.xml
+++ b/samples/standalone/restdocs/http-server/pom.xml
@@ -46,7 +46,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml
index 859ae35f21..bb1998560d 100644
--- a/samples/wiremock-jetty/pom.xml
+++ b/samples/wiremock-jetty/pom.xml
@@ -45,7 +45,7 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml
index e5e17232f2..b948f1c361 100644
--- a/samples/wiremock-tomcat/pom.xml
+++ b/samples/wiremock-tomcat/pom.xml
@@ -35,7 +35,7 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml
index 7ec851ea03..d01469a8a9 100644
--- a/samples/wiremock-undertow-ssl/pom.xml
+++ b/samples/wiremock-undertow-ssl/pom.xml
@@ -45,7 +45,7 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml
index ce2788f1a6..483ea7239e 100644
--- a/samples/wiremock-undertow/pom.xml
+++ b/samples/wiremock-undertow/pom.xml
@@ -45,7 +45,7 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>