diff --git a/spring-cloud-contract.html b/spring-cloud-contract.html
index c3fb99f758..b1813cbf3d 100644
--- a/spring-cloud-contract.html
+++ b/spring-cloud-contract.html
@@ -1251,7 +1251,7 @@ for more information.</a> We highly recommend using the map notation!</p>
 <div class="content">
 <pre class="highlight"><code class="language-yaml" data-lang="yaml">stubrunner:
   work-offline: true
-  stubs.ids: 'com.example:http-server-dsl:+:stubs:8080'</code></pre>
+  ids: 'com.example:http-server-dsl:+:stubs:8080'</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1261,7 +1261,7 @@ for more information.</a> We highly recommend using the map notation!</p>
 <div class="content">
 <pre class="highlight"><code class="language-groovy" data-lang="groovy">@RunWith(SpringRunner.class)
 @SpringBootTest
-@AutoConfigureStubRunner
+@AutoConfigureStubRunner(ids = {"com.example:http-server-dsl:+:stubs:8080"}, workOffline = true)
 public class LoanApplicationServiceTests {</code></pre>
 </div>
 </div>
@@ -1483,7 +1483,7 @@ git merge --no-ff contract-change-pr</code></pre>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-yaml" data-lang="yaml">stubrunner.stubs:
+<pre class="highlight"><code class="language-yaml" data-lang="yaml">stubrunner:
   ids: 'com.example:http-server-dsl:+:stubs:8080'
   repositoryRoot: http://repo.spring.io/libs-snapshot</code></pre>
 </div>
@@ -3930,6 +3930,7 @@ its methods as presented below:</p>
 @IntegrationTest(["stubrunner.cloud.enabled=false", "stubrunner.camel.enabled=false"])
 @AutoConfigureStubRunner
 @DirtiesContext
+@ActiveProfiles("test")
 class StubRunnerConfigurationSpec extends Specification {
 
 	@Autowired StubFinder stubFinder
@@ -3937,8 +3938,8 @@ class StubRunnerConfigurationSpec extends Specification {
 	@BeforeClass
 	@AfterClass
 	void setupProps() {
-		System.clearProperty("stubrunner.stubs.repository.root");
-		System.clearProperty("stubrunner.stubs.classifier");
+		System.clearProperty("stubrunner.repository.root");
+		System.clearProperty("stubrunner.classifier");
 	}
 
 	def 'should start WireMock servers'() {
@@ -3967,15 +3968,10 @@ class StubRunnerConfigurationSpec extends Specification {
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-yml" data-lang="yml">stubrunner.stubs.repositoryRoot: classpath:m2repo/repository/
-stubrunner.stubs.ids:
-  - org.springframework.cloud.contract.verifier.stubs:loanIssuance
-  - org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer
-  - org.springframework.cloud.contract.verifier.stubs:bootService
-
-stubrunner.stubs.idsToServiceIds:
-  ivyNotation: someValueInsideYourCode
-  fraudDetectionServer: someNameThatShouldMapFraudDetectionServer</code></pre>
+<pre class="highlight"><code class="language-yml" data-lang="yml">stubrunner:
+  idsToServiceIds:
+    ivyNotation: someValueInsideYourCode
+    fraudDetectionServer: someNameThatShouldMapFraudDetectionServer</code></pre>
 </div>
 </div>
 </div>
@@ -4025,22 +4021,17 @@ or <code>DiscoveryClient</code> directly, to call those stubbed servers instead
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-yml" data-lang="yml">stubrunner.stubs.repositoryRoot: classpath:m2repo/repository/
-stubrunner.stubs.ids:
-  - org.springframework.cloud.contract.verifier.stubs:loanIssuance
-  - org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer
-  - org.springframework.cloud.contract.verifier.stubs:bootService
-
-stubrunner.stubs.idsToServiceIds:
-  ivyNotation: someValueInsideYourCode
-  fraudDetectionServer: someNameThatShouldMapFraudDetectionServer</code></pre>
+<pre class="highlight"><code class="language-yml" data-lang="yml">stubrunner:
+  idsToServiceIds:
+    ivyNotation: someValueInsideYourCode
+    fraudDetectionServer: someNameThatShouldMapFraudDetectionServer</code></pre>
 </div>
 </div>
 </div>
 <div class="sect3">
 <h4 id="_additional_configuration">Additional Configuration</h4>
 <div class="paragraph">
-<p>You can match the artifactId of the stub with the name of your app by using the <code>stubrunner.stubs.idsToServiceIds:</code> map.
+<p>You can match the artifactId of the stub with the name of your app by using the <code>stubrunner.idsToServiceIds:</code> map.
 You can disable Stub Runner Ribbon support by providing: <code>stubrunner.cloud.ribbon.enabled</code> equal to <code>false</code>
 You can disable Stub Runner support by providing: <code>stubrunner.cloud.enabled</code> equal to <code>false</code></p>
 </div>
@@ -4114,6 +4105,7 @@ trigger the messaging labels and to access started WireMock servers.</p>
 <div class="content">
 <pre class="highlight"><code class="language-groovy" data-lang="groovy">@ContextConfiguration(classes = StubRunnerBoot, loader = SpringBootContextLoader)
 @IntegrationTest("spring.cloud.zookeeper.enabled=false")
+@ActiveProfiles("test")
 class StubRunnerBootSpec extends Specification {
 
 	@Autowired StubRunning stubRunning
@@ -4229,12 +4221,12 @@ class StubRunnerBootSpec extends Specification {
 <td class="tableblock halign-left valign-top"><p class="tableblock">Minimal value of a port for a started WireMock with stubs</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">stubrunner.stubs.repositoryRoot</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">stubrunner.repositoryRoot</p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Maven repo url. If blank then will call the local maven repo</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">stubrunner.stubs.classifier</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">stubrunner.classifier</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">stubs</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default classifier for the stub artifacts</p></td>
 </tr>
@@ -4244,7 +4236,7 @@ class StubRunnerBootSpec extends Specification {
 <td class="tableblock halign-left valign-top"><p class="tableblock">If true then will not contact any remote repositories to download stubs</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">stubrunner.stubs.ids</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">stubrunner.ids</p></td>
 <td class="tableblock halign-left valign-top"></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Array of Ivy notation stubs to download</p></td>
 </tr>
@@ -4253,7 +4245,7 @@ class StubRunnerBootSpec extends Specification {
 <div class="sect4">
 <h5 id="_stub_runner_stubs_ids">Stub runner stubs ids</h5>
 <div class="paragraph">
-<p>You can provide the stubs to download via the <code>stubrunner.stubs.ids</code> system property. They follow the following pattern:</p>
+<p>You can provide the stubs to download via the <code>stubrunner.ids</code> system property. They follow the following pattern:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -4909,8 +4901,8 @@ Remember to annotate your test class with <code>@AutoConfigureMessageVerifier</c
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-yaml" data-lang="yaml">stubrunner.stubs.repositoryRoot: classpath:m2repo/repository/
-stubrunner.stubs.ids: org.springframework.cloud.contract.verifier.stubs:streamService:0.0.1-SNAPSHOT:stubs
+<pre class="highlight"><code class="language-yaml" data-lang="yaml">stubrunner.repositoryRoot: classpath:m2repo/repository/
+stubrunner.ids: org.springframework.cloud.contract.verifier.stubs:streamService:0.0.1-SNAPSHOT:stubs
 
 spring:
   cloud:
@@ -5344,7 +5336,7 @@ number of different ways, including as described above using
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-08-24 09:17:40 UTC
+Last updated 2016-08-23 21:20:57 UTC
 </div>
 </div>
 </body>