diff --git a/src/Nest/DSL/Search/HighlightDescriptor.cs b/src/Nest/DSL/Search/HighlightDescriptor.cs
index 4400111a255..1039037c5a5 100644
--- a/src/Nest/DSL/Search/HighlightDescriptor.cs
+++ b/src/Nest/DSL/Search/HighlightDescriptor.cs
@@ -28,8 +28,8 @@ public interface IHighlightRequest
 		[JsonProperty("fragment_offset")]
 		int? FragmentOffset { get; set; }
 
-		[JsonProperty("boundary_max_size")]
-		int? BoundaryMaxSize { get; set; }
+		[JsonProperty("boundary_max_scan")]
+		int? BoundaryMaxScan { get; set; }
 
 		[JsonProperty("encoder")]
 		string Encoder { get; set; }
@@ -56,7 +56,7 @@ public class HighlightRequest : IHighlightRequest
 		public string TagsSchema { get; set; }
 		public int? NumberOfFragments { get; set; }
 		public int? FragmentOffset { get; set; }
-		public int? BoundaryMaxSize { get; set; }
+		public int? BoundaryMaxScan { get; set; }
 		public string Encoder { get; set; }
 		public string Order { get; set; }
 		public Dictionary<PropertyPathMarker, IHighlightField> Fields { get; set; }
@@ -81,7 +81,7 @@ public class HighlightDescriptor<T> : IHighlightRequest
 
 		int? IHighlightRequest.FragmentOffset { get; set; }
 
-		int? IHighlightRequest.BoundaryMaxSize { get; set; }
+		int? IHighlightRequest.BoundaryMaxScan { get; set; }
 
 		string IHighlightRequest.Encoder { get; set; }
 
@@ -177,9 +177,9 @@ public HighlightDescriptor<T> BoundaryCharacters(string boundaryCharacters)
 			Self.BoundaryChars = boundaryCharacters;
 			return this;
 		}
-		public HighlightDescriptor<T> BoundaryMaxSize(int boundaryMaxSize)
+		public HighlightDescriptor<T> BoundaryMaxScan(int boundaryMaxSize)
 		{
-			Self.BoundaryMaxSize = boundaryMaxSize;
+			Self.BoundaryMaxScan = boundaryMaxSize;
 			return this;
 		}
 	}
diff --git a/src/Tests/Nest.Tests.Unit/Search/Highlight/HighlightTests.cs b/src/Tests/Nest.Tests.Unit/Search/Highlight/HighlightTests.cs
index 4b0004fbf3b..9b92673e941 100644
--- a/src/Tests/Nest.Tests.Unit/Search/Highlight/HighlightTests.cs
+++ b/src/Tests/Nest.Tests.Unit/Search/Highlight/HighlightTests.cs
@@ -14,7 +14,7 @@ public void TestHighlight()
 				.Size(10)
 				.Highlight(h => h
 					.BoundaryCharacters(".,!? \t\n")
-					.BoundaryMaxSize(20)
+					.BoundaryMaxScan(20)
 					.Encoder("html")
 					.FragmentOffset(0)
 					.FragmentSize(3)