diff --git a/docs/src/test/java/com/example/mockmvc/CustomDefaultOperationPreprocessors.java b/docs/src/test/java/com/example/mockmvc/CustomDefaultOperationPreprocessors.java
index af890124..cb1871ed 100644
--- a/docs/src/test/java/com/example/mockmvc/CustomDefaultOperationPreprocessors.java
+++ b/docs/src/test/java/com/example/mockmvc/CustomDefaultOperationPreprocessors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 
 public class CustomDefaultOperationPreprocessors {
 
@@ -43,7 +43,7 @@ public class CustomDefaultOperationPreprocessors {
 		// tag::custom-default-operation-preprocessors[]
 		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context)
 				.apply(documentationConfiguration(this.restDocumentation).operationPreprocessors()
-						.withRequestDefaults(removeHeaders("Foo")) // <1>
+						.withRequestDefaults(modifyHeaders().remove("Foo")) // <1>
 						.withResponseDefaults(prettyPrint())) // <2>
 				.build();
 		// end::custom-default-operation-preprocessors[]
diff --git a/docs/src/test/java/com/example/mockmvc/EveryTestPreprocessing.java b/docs/src/test/java/com/example/mockmvc/EveryTestPreprocessing.java
index 09bd27bb..d29e4cbe 100644
--- a/docs/src/test/java/com/example/mockmvc/EveryTestPreprocessing.java
+++ b/docs/src/test/java/com/example/mockmvc/EveryTestPreprocessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.li
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 public class EveryTestPreprocessing {
@@ -47,7 +47,7 @@ public class EveryTestPreprocessing {
 	public void setup() {
 		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context)
 				.apply(documentationConfiguration(this.restDocumentation).operationPreprocessors()
-						.withRequestDefaults(removeHeaders("Foo")) // <1>
+						.withRequestDefaults(modifyHeaders().remove("Foo")) // <1>
 						.withResponseDefaults(prettyPrint())) // <2>
 				.build();
 	}
diff --git a/docs/src/test/java/com/example/mockmvc/PerTestPreprocessing.java b/docs/src/test/java/com/example/mockmvc/PerTestPreprocessing.java
index c39db4db..3db99fcb 100644
--- a/docs/src/test/java/com/example/mockmvc/PerTestPreprocessing.java
+++ b/docs/src/test/java/com/example/mockmvc/PerTestPreprocessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@ import org.springframework.test.web.servlet.MockMvc;
 
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 public class PerTestPreprocessing {
@@ -33,7 +33,7 @@ public class PerTestPreprocessing {
 	public void general() throws Exception {
 		// tag::preprocessing[]
 		this.mockMvc.perform(get("/")).andExpect(status().isOk())
-				.andDo(document("index", preprocessRequest(removeHeaders("Foo")), // <1>
+				.andDo(document("index", preprocessRequest(modifyHeaders().remove("Foo")), // <1>
 						preprocessResponse(prettyPrint()))); // <2>
 		// end::preprocessing[]
 	}
diff --git a/docs/src/test/java/com/example/restassured/CustomDefaultOperationPreprocessors.java b/docs/src/test/java/com/example/restassured/CustomDefaultOperationPreprocessors.java
index cb392c91..5776929f 100644
--- a/docs/src/test/java/com/example/restassured/CustomDefaultOperationPreprocessors.java
+++ b/docs/src/test/java/com/example/restassured/CustomDefaultOperationPreprocessors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import org.junit.Rule;
 
 import org.springframework.restdocs.JUnitRestDocumentation;
 
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class CustomDefaultOperationPreprocessors {
@@ -40,7 +40,7 @@ public class CustomDefaultOperationPreprocessors {
 		// tag::custom-default-operation-preprocessors[]
 		this.spec = new RequestSpecBuilder()
 				.addFilter(documentationConfiguration(this.restDocumentation).operationPreprocessors()
-						.withRequestDefaults(removeHeaders("Foo")) // <1>
+						.withRequestDefaults(modifyHeaders().remove("Foo")) // <1>
 						.withResponseDefaults(prettyPrint())) // <2>
 				.build();
 		// end::custom-default-operation-preprocessors[]
diff --git a/docs/src/test/java/com/example/restassured/EveryTestPreprocessing.java b/docs/src/test/java/com/example/restassured/EveryTestPreprocessing.java
index 6757da31..e34ba255 100644
--- a/docs/src/test/java/com/example/restassured/EveryTestPreprocessing.java
+++ b/docs/src/test/java/com/example/restassured/EveryTestPreprocessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import org.springframework.restdocs.JUnitRestDocumentation;
 import static org.hamcrest.CoreMatchers.is;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.linkWithRel;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.links;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
@@ -44,7 +44,7 @@ public class EveryTestPreprocessing {
 	public void setup() {
 		this.spec = new RequestSpecBuilder()
 				.addFilter(documentationConfiguration(this.restDocumentation).operationPreprocessors()
-						.withRequestDefaults(removeHeaders("Foo")) // <1>
+						.withRequestDefaults(modifyHeaders().remove("Foo")) // <1>
 						.withResponseDefaults(prettyPrint())) // <2>
 				.build();
 	}
diff --git a/docs/src/test/java/com/example/restassured/PerTestPreprocessing.java b/docs/src/test/java/com/example/restassured/PerTestPreprocessing.java
index 02974491..7e19d8be 100644
--- a/docs/src/test/java/com/example/restassured/PerTestPreprocessing.java
+++ b/docs/src/test/java/com/example/restassured/PerTestPreprocessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@ import io.restassured.RestAssured;
 import io.restassured.specification.RequestSpecification;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class PerTestPreprocessing {
@@ -32,7 +32,7 @@ public class PerTestPreprocessing {
 
 	public void general() throws Exception {
 		// tag::preprocessing[]
-		RestAssured.given(this.spec).filter(document("index", preprocessRequest(removeHeaders("Foo")), // <1>
+		RestAssured.given(this.spec).filter(document("index", preprocessRequest(modifyHeaders().remove("Foo")), // <1>
 				preprocessResponse(prettyPrint()))) // <2>
 				.when().get("/").then().assertThat().statusCode(is(200));
 		// end::preprocessing[]
diff --git a/docs/src/test/java/com/example/webtestclient/CustomDefaultOperationPreprocessors.java b/docs/src/test/java/com/example/webtestclient/CustomDefaultOperationPreprocessors.java
index d1688d53..cb6d6974 100644
--- a/docs/src/test/java/com/example/webtestclient/CustomDefaultOperationPreprocessors.java
+++ b/docs/src/test/java/com/example/webtestclient/CustomDefaultOperationPreprocessors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 
 public class CustomDefaultOperationPreprocessors {
@@ -46,7 +46,7 @@ public class CustomDefaultOperationPreprocessors {
 			.configureClient()
 			.filter(documentationConfiguration(this.restDocumentation)
 				.operationPreprocessors()
-					.withRequestDefaults(removeHeaders("Foo")) // <1>
+					.withRequestDefaults(modifyHeaders().remove("Foo")) // <1>
 					.withResponseDefaults(prettyPrint())) // <2>
 			.build();
 		// end::custom-default-operation-preprocessors[]
diff --git a/docs/src/test/java/com/example/webtestclient/EveryTestPreprocessing.java b/docs/src/test/java/com/example/webtestclient/EveryTestPreprocessing.java
index 4b08af95..9b6cc294 100644
--- a/docs/src/test/java/com/example/webtestclient/EveryTestPreprocessing.java
+++ b/docs/src/test/java/com/example/webtestclient/EveryTestPreprocessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.linkWithRel;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.links;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.document;
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 
@@ -48,7 +48,7 @@ public class EveryTestPreprocessing {
 			.configureClient()
 			.filter(documentationConfiguration(this.restDocumentation)
 				.operationPreprocessors()
-					.withRequestDefaults(removeHeaders("Foo")) // <1>
+					.withRequestDefaults(modifyHeaders().remove("Foo")) // <1>
 					.withResponseDefaults(prettyPrint())) // <2>
 			.build();
 	}
diff --git a/docs/src/test/java/com/example/webtestclient/PerTestPreprocessing.java b/docs/src/test/java/com/example/webtestclient/PerTestPreprocessing.java
index f6d45f18..cd1254ef 100644
--- a/docs/src/test/java/com/example/webtestclient/PerTestPreprocessing.java
+++ b/docs/src/test/java/com/example/webtestclient/PerTestPreprocessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@ package com.example.webtestclient;
 
 import org.springframework.test.web.reactive.server.WebTestClient;
 
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyHeaders;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.document;
 
 public class PerTestPreprocessing {
@@ -34,7 +34,7 @@ public class PerTestPreprocessing {
 		// tag::preprocessing[]
 		this.webTestClient.get().uri("/").exchange().expectStatus().isOk().expectBody()
 			.consumeWith(document("index",
-				preprocessRequest(removeHeaders("Foo")), // <1>
+				preprocessRequest(modifyHeaders().remove("Foo")), // <1>
 				preprocessResponse(prettyPrint()))); // <2>
 		// end::preprocessing[]
 	}