diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Request.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Request.java
index db1750c747..6972e5f428 100644
--- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Request.java
+++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Request.java
@@ -670,18 +670,18 @@ public class Request extends Common implements RegexCreatingProperty<ClientDslPr
 	 * Allows to configure HTTP headers.
 	 * @param consumer function to manipulate the headers
 	 */
-	public void headers(Consumer<Request.RequestHeaders> consumer) {
+	public void headers(Consumer<Headers> consumer) {
 		this.headers = new Request.RequestHeaders();
-		consumer.accept((RequestHeaders) this.headers);
+		consumer.accept(this.headers);
 	}
 
 	/**
 	 * Allows to configure HTTP cookies.
 	 * @param consumer function to manipulate the cookies
 	 */
-	public void cookies(Consumer<Request.RequestCookies> consumer) {
+	public void cookies(Consumer<Cookies> consumer) {
 		this.cookies = new Request.RequestCookies();
-		consumer.accept((RequestCookies) this.cookies);
+		consumer.accept(this.cookies);
 	}
 
 	/**
@@ -755,7 +755,7 @@ public class Request extends Common implements RegexCreatingProperty<ClientDslPr
 	 * Allows to configure HTTP headers.
 	 * @param consumer function to manipulate the headers
 	 */
-	public void headers(@DelegatesTo(Request.RequestHeaders.class) Closure consumer) {
+	public void headers(@DelegatesTo(Headers.class) Closure consumer) {
 		this.headers = new Request.RequestHeaders();
 		consumer.setDelegate(this.headers);
 		consumer.call();
@@ -765,7 +765,7 @@ public class Request extends Common implements RegexCreatingProperty<ClientDslPr
 	 * Allows to configure HTTP cookies.
 	 * @param consumer function to manipulate the cookies
 	 */
-	public void cookies(@DelegatesTo(Request.RequestCookies.class) Closure consumer) {
+	public void cookies(@DelegatesTo(Cookies.class) Closure consumer) {
 		this.cookies = new Request.RequestCookies();
 		consumer.setDelegate(this.cookies);
 		consumer.call();
diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Response.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Response.java
index 3506218865..4694036154 100644
--- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Response.java
+++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Response.java
@@ -733,18 +733,18 @@ public class Response extends Common implements RegexCreatingProperty<ServerDslP
 	 * Allows to configure HTTP headers.
 	 * @param consumer function to manipulate the URL
 	 */
-	public void headers(Consumer<ResponseHeaders> consumer) {
+	public void headers(Consumer<Headers> consumer) {
 		this.headers = new Response.ResponseHeaders();
-		consumer.accept((ResponseHeaders) this.headers);
+		consumer.accept(this.headers);
 	}
 
 	/**
 	 * Allows to configure HTTP cookies.
 	 * @param consumer function to manipulate the URL
 	 */
-	public void cookies(Consumer<Response.ResponseCookies> consumer) {
+	public void cookies(Consumer<Cookies> consumer) {
 		this.cookies = new Response.ResponseCookies();
-		consumer.accept((ResponseCookies) this.cookies);
+		consumer.accept(this.cookies);
 	}
 
 	/**
@@ -771,7 +771,7 @@ public class Response extends Common implements RegexCreatingProperty<ServerDslP
 	 * Allows to configure HTTP headers.
 	 * @param consumer function to manipulate the URL
 	 */
-	public void headers(@DelegatesTo(ResponseHeaders.class) Closure consumer) {
+	public void headers(@DelegatesTo(Headers.class) Closure consumer) {
 		this.headers = new Response.ResponseHeaders();
 		consumer.setDelegate(this.headers);
 		consumer.call();
@@ -781,7 +781,7 @@ public class Response extends Common implements RegexCreatingProperty<ServerDslP
 	 * Allows to configure HTTP cookies.
 	 * @param consumer function to manipulate the URL
 	 */
-	public void cookies(@DelegatesTo(Response.ResponseCookies.class) Closure consumer) {
+	public void cookies(@DelegatesTo(Cookies.class) Closure consumer) {
 		this.cookies = new Response.ResponseCookies();
 		consumer.setDelegate(this.cookies);
 		consumer.call();