diff --git a/abi-versions/vNEXT/README.md b/abi-versions/vNEXT/README.md
index 92ba092..5c6e365 100644
--- a/abi-versions/vNEXT/README.md
+++ b/abi-versions/vNEXT/README.md
@@ -766,7 +766,7 @@ Returned `status` value is:
   and/or `value_size` point to invalid memory address.
 
 
-#### `proxy_replace_header_map_value`
+#### `proxy_set_header_map_value`
 
 * params:
   - `i32 (uint32_t) stream_context_id`
@@ -782,6 +782,9 @@ Adds or replaces key's (`key_data`, `key_value`) value with the provided
 value (`value_data`, `value_size`) in the map `map_id` of HTTP request
 `stream_context_id`.
 
+If the `value_data` is `0`, then the key (`key_data`, `key_size`) will be
+removed from the map `map_id`.
+
 Returned `status` value is:
 - `OK` on success.
 - `UNKNOWN_RESOURCE_ID` for unknown `stream_context_id`.
@@ -790,27 +793,6 @@ Returned `status` value is:
   and/or `value_size` point to invalid memory address.
 
 
-#### `proxy_remove_header_map_value`
-
-* params:
-  - `i32 (uint32_t) stream_context_id`
-  - `i32 (`[`proxy_map_type_t`]`) map_id`
-  - `i32 (const char *) key_data`
-  - `i32 (size_t) key_size`
-* returns:
-  - `i32 (`[`proxy_status_t`]`) status`
-
-Removes the key (`key_data`, `key_value`) from the map `map_id` of HTTP request
-`stream_context_id`.
-
-Returned `status` value is:
-- `OK` on success (including the case when the requested key didn't exist).
-- `UNKNOWN_RESOURCE_ID` for unknown `stream_context_id`.
-- `BAD_ARGUMENT` for unknown `map_id`.
-- `INVALID_MEMORY_ACCESS` when `key_data` and/or `key_size` point to
-  invalid memory address.
-
-
 ## Common HTTP and TCP stream operations
 
 ### Functions exposed by the host
@@ -1012,9 +994,8 @@ All `num_headers` headers can be retrieved and/or modified using
 with `map_id` set to `HTTP_REQUEST_HEADERS`.
 
 Individual HTTP request headers can be retrieved and/or modified using
-[`proxy_get_header_map_value`], [`proxy_replace_header_map_value`],
-[`proxy_add_header_map_value`] and/or [`proxy_remove_header_map_value`]
-with `map_id` set to `HTTP_REQUEST_HEADERS`.
+[`proxy_get_header_map_value`], [`proxy_set_header_map_value`] and/or
+[`proxy_add_header_map_value`] with `map_id` set to `HTTP_REQUEST_HEADERS`.
 
 Paused HTTP requests can be resumed using [`proxy_continue_stream`]
 or closed using [`proxy_close_stream`] with `stream_type` set to
@@ -1075,9 +1056,8 @@ All `num_trailers` trailers can be retrieved and/or modified using
 with `map_id` set to `HTTP_REQUEST_TRAILERS`.
 
 Individual HTTP request trailers can be retrieved and/or modified using
-[`proxy_get_header_map_value`], [`proxy_replace_header_map_value`],
-[`proxy_add_header_map_value`] and/or [`proxy_remove_header_map_value`]
-with `map_id` set to `HTTP_REQUEST_TRAILERS`.
+[`proxy_get_header_map_value`], [`proxy_set_header_map_value`] and/or
+[`proxy_add_header_map_value`] with `map_id` set to `HTTP_REQUEST_TRAILERS`.
 
 Paused HTTP requests can be resumed using [`proxy_continue_stream`]
 or closed using [`proxy_close_stream`] with `stream_type` set to
@@ -1107,9 +1087,8 @@ All `num_headers` headers can be retrieved and/or modified using
 with `map_id` set to `HTTP_RESPONSE_HEADERS`.
 
 Individual headers can be retrieved and/or modified using
-[`proxy_get_header_map_value`], [`proxy_replace_header_map_value`],
-[`proxy_add_header_map_value`] and/or [`proxy_remove_header_map_value`]
-with `map_id` set to `HTTP_RESPONSE_HEADERS`.
+[`proxy_get_header_map_value`], [`proxy_set_header_map_value`] and/or
+[`proxy_add_header_map_value`] with `map_id` set to `HTTP_RESPONSE_HEADERS`.
 
 Paused HTTP requests can be resumed using [`proxy_continue_stream`]
 or closed using [`proxy_close_stream`] with `stream_type` set to
@@ -1167,9 +1146,8 @@ All `num_trailers` trailers can be retrieved and/or modified using
 with `map_id` set to `HTTP_RESPONSE_TRAILERS`.
 
 Individual trailers can be retrieved and/or modified using
-[`proxy_get_header_map_value`], [`proxy_replace_header_map_value`],
-[`proxy_add_header_map_value`] and/or [`proxy_remove_header_map_value`]
-with `map_id` set to `HTTP_RESPONSE_TRAILERS`.
+[`proxy_get_header_map_value`], [`proxy_set_header_map_value`] and/or
+[`proxy_add_header_map_value`] with `map_id` set to `HTTP_RESPONSE_TRAILERS`.
 
 Paused HTTP requests can be resumed using [`proxy_continue_stream`]
 or closed using [`proxy_close_stream`] with `stream_type` set to
@@ -2234,9 +2212,8 @@ changes to unrelated connections/requests.
 [`proxy_get_header_map_pairs`]: #proxy_get_header_map_pairs
 [`proxy_set_header_map_pairs`]: #proxy_set_header_map_pairs
 [`proxy_get_header_map_value`]: #proxy_get_header_map_value
+[`proxy_set_header_map_value`]: #proxy_set_header_map_value
 [`proxy_add_header_map_value`]: #proxy_add_header_map_value
-[`proxy_replace_header_map_value`]: #proxy_replace_header_map_value
-[`proxy_remove_header_map_value`]: #proxy_remove_header_map_value
 [`proxy_continue_stream`]: #proxy_continue_stream
 [`proxy_close_stream`]: #proxy_close_stream
 [`proxy_on_new_connection`]: #proxy_on_new_connection