diff --git a/samples/standalone/kotlin/http-client/src/test/resources/contractsAtRuntime/goodbyeWorld.kts b/samples/standalone/kotlin/http-client/src/test/resources/contractsAtRuntime/goodbyeWorld.kts
index 41def4dc90..e7b56e99d0 100644
--- a/samples/standalone/kotlin/http-client/src/test/resources/contractsAtRuntime/goodbyeWorld.kts
+++ b/samples/standalone/kotlin/http-client/src/test/resources/contractsAtRuntime/goodbyeWorld.kts
@@ -21,10 +21,10 @@ import org.springframework.cloud.contract.spec.internal.HttpStatus
 contract {
 	request {
 		url = url("/goodbye")
-		method = method(HttpMethods.HttpMethod.GET)
+		method = GET
 	}
 	response {
-		status = code(HttpStatus.OK())
+		status = OK
 		body = body("Goodbye World!")
 	}
 }
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/binary/shouldWorkWithBinaryPayload.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/binary/shouldWorkWithBinaryPayload.kts
index 10239d4d0e..392b629838 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/binary/shouldWorkWithBinaryPayload.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/binary/shouldWorkWithBinaryPayload.kts
@@ -22,14 +22,14 @@ import org.springframework.cloud.contract.spec.internal.HttpMethods
 contract {
 	request {
 		url = url("/1")
-		method = method(HttpMethods.PUT())
+		method = PUT
 		headers {
 			contentType(applicationOctetStream())
 		}
 		body = bodyFromFileAsBytes("request.pdf")
 	}
 	response {
-		status = code(200)
+		status = OK
 		body = bodyFromFileAsBytes("response.pdf")
 		headers {
 			contentType(applicationOctetStream())
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.kts
index 766ca630d8..90888da8d4 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.kts
@@ -21,7 +21,7 @@ import org.springframework.cloud.contract.spec.internal.HttpStatus
 
 contract {
     request { // (1)
-        method = method("PUT") // (2)
+        method = PUT // (2)
         url = url("/fraudcheck") // (3)
         body = body(// (4)
                 "client.id" to value(regex("[0-9]{10}")),
@@ -31,7 +31,7 @@ contract {
         }
     }
     response { // (6)
-        status = code(HttpStatus.OK()) // (7)
+        status = OK // (7)
         body = body( // (8)
                 "fraudCheckStatus" to "FRAUD",
                 "rejection.reason" to "Amount too high")
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsNotFraud.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsNotFraud.kts
index f861e2ee6a..9b6b87ea19 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsNotFraud.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsNotFraud.kts
@@ -21,7 +21,7 @@ import org.springframework.cloud.contract.spec.internal.HttpStatus
 
 contract {
 	request {
-		method = method("PUT")
+		method = PUT
 		url = url("/fraudcheck")
 		body = body(
 				"client.id" to value(consumer(regex("[0-9]{10}")), producer("1234567890")),
@@ -31,7 +31,7 @@ contract {
 		}
 	}
 	response {
-		status = code(HttpStatus.OK())
+		status = OK
 		body = body(
 				"fraudCheckStatus" to "OK",
 				"rejection.reason" to value(consumer(null), producer(execute("assertThatRejectionReasonIsNull(\$it)")))
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldReturnFraudStats.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldReturnFraudStats.kts
index 70fe24c548..a083b3ae6d 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldReturnFraudStats.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraud/shouldReturnFraudStats.kts
@@ -24,11 +24,11 @@ listOf(
     contract {
         name = "should count all frauds"
         request {
-            method = method(HttpMethods.GET())
+            method = GET
             url = url("/frauds")
         }
         response {
-            status = code(HttpStatus.OK())
+            status = OK
             body = body(
                     "count" to value(regex("[2-9][0-9][0-9]"))
             )
@@ -39,11 +39,11 @@ listOf(
     },
     contract {
         request {
-            method = method(HttpMethods.GET())
+            method = GET
             url = url("/drunks")
         }
         response {
-            status = code(HttpStatus.OK())
+            status = OK
             body = body(
                     "count" to 100
             )
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnACookie.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnACookie.kts
index b4eb9e05db..308bd83607 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnACookie.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnACookie.kts
@@ -21,7 +21,7 @@ import org.springframework.cloud.contract.spec.internal.HttpMethods
 
 contract {
 	request {
-		method = method(HttpMethods.HttpMethod.GET)
+		method = GET
 		url = url("/frauds/name")
 		cookies {
 			cookie("name", "foo")
@@ -29,7 +29,7 @@ contract {
 		}
 	}
 	response {
-		status = code(200)
+		status = OK
 		body = body("foo bar")
 	}
 }
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnAFraudForTheName.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnAFraudForTheName.kts
index 47c964df65..a0b2459cbd 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnAFraudForTheName.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnAFraudForTheName.kts
@@ -24,7 +24,7 @@ contract {
 	// highest priority
 	priority = 1
 	request {
-		method = method(HttpMethods.HttpMethod.PUT)
+		method = PUT
 		url = url("/frauds/name")
 		body = body("name" to "fraud")
 		headers {
@@ -32,7 +32,7 @@ contract {
 		}
 	}
 	response {
-		status = code(HttpStatus.OK())
+		status = OK
 //		TODO
 //		body = body("result" to "Sorry ${fromRequest().body("$.name")} but you're a fraud")
 //		headers {
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnNonFraudForTheName.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnNonFraudForTheName.kts
index be0685c105..96412a4d3b 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnNonFraudForTheName.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/fraudname/shouldReturnNonFraudForTheName.kts
@@ -22,7 +22,7 @@ import org.springframework.cloud.contract.spec.internal.HttpStatus
 
 contract {
 	request {
-		method = method(HttpMethods.HttpMethod.PUT)
+		method = PUT
 		url = url("/frauds/name")
 		body = body("name" to `$`(anyAlphaUnicode()))
 		headers {
@@ -30,7 +30,7 @@ contract {
 		}
 	}
 	response {
-		status = code(HttpStatus.OK())
+		status = OK
 //		TODO
 //		body("result" to "Don't worry ${fromRequest().body("$.name")} you're not a fraud")
 //		headers {
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/multipart/shouldWorkForMultipartAsBytesWithContentType.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/multipart/shouldWorkForMultipartAsBytesWithContentType.kts
index fee7c5fb65..ff4f0e1360 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/multipart/shouldWorkForMultipartAsBytesWithContentType.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/multipart/shouldWorkForMultipartAsBytesWithContentType.kts
@@ -21,7 +21,7 @@ import org.springframework.cloud.contract.spec.internal.HttpMethods
 
 contract {
 	request {
-		method = method("POST")
+		method = POST
 		url = url("/tests")
 		multipart = multipart(mapOf(
 				"file1" to named(
@@ -40,7 +40,7 @@ contract {
 		}
 	}
 	response {
-		status = code(200)
+		status = OK
 		body = body("status" to "ok")
 		headers {
 			contentType("application/json")
diff --git a/samples/standalone/kotlin/http-server/src/test/resources/contracts/multipart/shouldWorkForMultipartWithContentType.kts b/samples/standalone/kotlin/http-server/src/test/resources/contracts/multipart/shouldWorkForMultipartWithContentType.kts
index d79620df84..e5623a0149 100644
--- a/samples/standalone/kotlin/http-server/src/test/resources/contracts/multipart/shouldWorkForMultipartWithContentType.kts
+++ b/samples/standalone/kotlin/http-server/src/test/resources/contracts/multipart/shouldWorkForMultipartWithContentType.kts
@@ -21,7 +21,7 @@ import org.springframework.cloud.contract.spec.internal.HttpMethods
 
 contract {
 	request {
-		method = method("POST")
+		method = POST
 		url = url("/tests")
 		multipart = multipart(mapOf(
 				"file1" to named(
@@ -40,7 +40,7 @@ contract {
 		}
 	}
 	response {
-		status = code(200)
+		status = OK
 		body = body("status" to "ok")
 		headers {
 			contentType("application/json")