diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/JoinFieldConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/JoinFieldConverter.cs
index 10b10c8de8c..86f0aba89f7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/JoinFieldConverter.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/JoinFieldConverter.cs
@@ -12,8 +12,8 @@ namespace Elastic.Clients.Elasticsearch.Json;
 
 public sealed class JoinFieldConverter : JsonConverter<JoinField>
 {
-	private static readonly JsonEncodedText PropName = JsonEncodedText.Encode("name");
-	private static readonly JsonEncodedText PropParent = JsonEncodedText.Encode("parent");
+	private static readonly JsonEncodedText PropName = JsonEncodedText.Encode("name"u8);
+	private static readonly JsonEncodedText PropParent = JsonEncodedText.Encode("parent"u8);
 
 	public override JoinField? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 	{
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkCreateOperation.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkCreateOperation.cs
index ea6cf818d71..45ed5622903 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkCreateOperation.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkCreateOperation.cs
@@ -20,16 +20,16 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk;
 [JsonConverter(typeof(JsonIncompatibleConverter))]
 public sealed class BulkCreateOperation<T> : BulkOperation
 {
-	private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates");
-	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
-	private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term");
-	private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no");
-	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
-	private static readonly System.Text.Json.JsonEncodedText PropPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline");
-	private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias");
-	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
-	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
-	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type"u8);
 
 	/// <summary>
 	/// Creates an instance of <see cref="BulkCreateOperation{T}"/> with the provided <typeparamref name="T"/> document serialized
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkDeleteOperation.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkDeleteOperation.cs
index dcf2e7f92e6..1ec0908821a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkDeleteOperation.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkDeleteOperation.cs
@@ -16,13 +16,13 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk;
 public class BulkDeleteOperation :
 	BulkOperation
 {
-	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
-	private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term");
-	private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no");
-	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
-	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
-	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
-	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type"u8);
 
 	public BulkDeleteOperation(Id id) => Id = id;
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkIndexOperation.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkIndexOperation.cs
index 2a5e665a2d5..5f81003f86f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkIndexOperation.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkIndexOperation.cs
@@ -17,16 +17,16 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk;
 [JsonConverter(typeof(JsonIncompatibleConverter))]
 public sealed class BulkIndexOperation<T> : BulkOperation
 {
-	private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates");
-	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
-	private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term");
-	private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no");
-	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
-	private static readonly System.Text.Json.JsonEncodedText PropPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline");
-	private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias");
-	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
-	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
-	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+	private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type"u8);
 
 	/// <summary>
 	/// Creates an instance of <see cref="BulkIndexOperation{T}"/> with the provided <typeparamref name="T"/> document serialized
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkResponseItemConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkResponseItemConverter.cs
index 234753b4eca..f48199b4cf0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkResponseItemConverter.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkResponseItemConverter.cs
@@ -12,17 +12,17 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk.Json;
 
 public sealed class BulkResponseItemConverter : JsonConverter<ResponseItem>
 {
-	private static readonly JsonEncodedText PropError = JsonEncodedText.Encode("error");
-	private static readonly JsonEncodedText PropForcedRefresh = JsonEncodedText.Encode("forced_refresh");
-	private static readonly JsonEncodedText PropGet = JsonEncodedText.Encode("get");
-	private static readonly JsonEncodedText PropId = JsonEncodedText.Encode("_id");
-	private static readonly JsonEncodedText PropIndex = JsonEncodedText.Encode("_index");
-	private static readonly JsonEncodedText PropPrimaryTerm = JsonEncodedText.Encode("_primary_term");
-	private static readonly JsonEncodedText PropResult = JsonEncodedText.Encode("result");
-	private static readonly JsonEncodedText PropSeqNo = JsonEncodedText.Encode("_seq_no");
-	private static readonly JsonEncodedText PropShards = JsonEncodedText.Encode("_shards");
-	private static readonly JsonEncodedText PropStatus = JsonEncodedText.Encode("status");
-	private static readonly JsonEncodedText PropVersion = JsonEncodedText.Encode("_version");
+	private static readonly JsonEncodedText PropError = JsonEncodedText.Encode("error"u8);
+	private static readonly JsonEncodedText PropForcedRefresh = JsonEncodedText.Encode("forced_refresh"u8);
+	private static readonly JsonEncodedText PropGet = JsonEncodedText.Encode("get"u8);
+	private static readonly JsonEncodedText PropId = JsonEncodedText.Encode("_id"u8);
+	private static readonly JsonEncodedText PropIndex = JsonEncodedText.Encode("_index"u8);
+	private static readonly JsonEncodedText PropPrimaryTerm = JsonEncodedText.Encode("_primary_term"u8);
+	private static readonly JsonEncodedText PropResult = JsonEncodedText.Encode("result"u8);
+	private static readonly JsonEncodedText PropSeqNo = JsonEncodedText.Encode("_seq_no"u8);
+	private static readonly JsonEncodedText PropShards = JsonEncodedText.Encode("_shards"u8);
+	private static readonly JsonEncodedText PropStatus = JsonEncodedText.Encode("status"u8);
+	private static readonly JsonEncodedText PropVersion = JsonEncodedText.Encode("_version"u8);
 
 	public override ResponseItem Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 	{
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkUpdateOperation.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkUpdateOperation.cs
index f8bb93c6627..a7cf822f47b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkUpdateOperation.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkUpdateOperation.cs
@@ -17,15 +17,15 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk;
 public abstract class BulkUpdateOperation :
 	BulkOperation
 {
-	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
-	private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term");
-	private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no");
-	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
-	private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias");
-	private static readonly System.Text.Json.JsonEncodedText PropRetryOnConflict = System.Text.Json.JsonEncodedText.Encode("retry_on_conflict");
-	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
-	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
-	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
+	private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropRetryOnConflict = System.Text.Json.JsonEncodedText.Encode("retry_on_conflict"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version"u8);
+	private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type"u8);
 
 	protected internal BulkUpdateOperation() : base()
 	{
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoBoundsConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoBoundsConverter.cs
index 6d8658a584f..01510c2dedb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoBoundsConverter.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoBoundsConverter.cs
@@ -16,24 +16,24 @@ public sealed class GeoBoundsConverter :
 {
 	// Coordinates.
 
-	private static readonly JsonEncodedText PropBottom = JsonEncodedText.Encode("bottom");
-	private static readonly JsonEncodedText PropLeft = JsonEncodedText.Encode("left");
-	private static readonly JsonEncodedText PropRight = JsonEncodedText.Encode("right");
-	private static readonly JsonEncodedText PropTop = JsonEncodedText.Encode("top");
+	private static readonly JsonEncodedText PropBottom = JsonEncodedText.Encode("bottom"u8);
+	private static readonly JsonEncodedText PropLeft = JsonEncodedText.Encode("left"u8);
+	private static readonly JsonEncodedText PropRight = JsonEncodedText.Encode("right"u8);
+	private static readonly JsonEncodedText PropTop = JsonEncodedText.Encode("top"u8);
 
 	// TopLeftBottomRight.
 
-	private static readonly JsonEncodedText PropBottomRight = JsonEncodedText.Encode("bottom_right");
-	private static readonly JsonEncodedText PropTopLeft = JsonEncodedText.Encode("top_left");
+	private static readonly JsonEncodedText PropBottomRight = JsonEncodedText.Encode("bottom_right"u8);
+	private static readonly JsonEncodedText PropTopLeft = JsonEncodedText.Encode("top_left"u8);
 
 	// TopRightBottomLeft.
 
-	private static readonly JsonEncodedText PropBottomLeft = JsonEncodedText.Encode("bottom_left");
-	private static readonly JsonEncodedText PropTopRight = JsonEncodedText.Encode("top_right");
+	private static readonly JsonEncodedText PropBottomLeft = JsonEncodedText.Encode("bottom_left"u8);
+	private static readonly JsonEncodedText PropTopRight = JsonEncodedText.Encode("top_right"u8);
 
 	// WKT.
 
-	private static readonly JsonEncodedText PropWkt = JsonEncodedText.Encode("wkt");
+	private static readonly JsonEncodedText PropWkt = JsonEncodedText.Encode("wkt"u8);
 
 	public override GeoBounds? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 	{
diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoLocationConverter.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoLocationConverter.cs
index 91b3aa66089..74a03716f21 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoLocationConverter.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoLocationConverter.cs
@@ -15,12 +15,12 @@ public sealed class GeoLocationConverter :
 {
 	// LatitudeLongitude.
 
-	private static readonly JsonEncodedText PropLat = JsonEncodedText.Encode("lat");
-	private static readonly JsonEncodedText PropLon = JsonEncodedText.Encode("lon");
+	private static readonly JsonEncodedText PropLat = JsonEncodedText.Encode("lat"u8);
+	private static readonly JsonEncodedText PropLon = JsonEncodedText.Encode("lon"u8);
 
 	// GeoHash.
 
-	private static readonly JsonEncodedText PropGeoHash = JsonEncodedText.Encode("geohash");
+	private static readonly JsonEncodedText PropGeoHash = JsonEncodedText.Encode("geohash"u8);
 
 	public override GeoLocation? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 	{