Rename field_masking_span to make it more consistent with other span …

docs/reference/query-dsl/span-field-masking-query.asciidoc

@@ -25,7 +25,7 @@ GET /_search
           }
         },
         {
-          "field_masking_span": {
+          "span_field_masking": {
             "query": {
               "span_term": {
                 "text.stems": "fox"

docs/reference/query-dsl/span-queries.asciidoc

@@ -18,7 +18,7 @@ The queries in this group are:
 <<query-dsl-span-containing-query,`span_containing` query>>::
 Accepts a list of span queries, but only returns those spans which also match a second span query.
 
-<<query-dsl-span-field-masking-query,`field_masking_span` query>>::
+<<query-dsl-span-field-masking-query,`span_field_masking` query>>::
 Allows queries like `span-near` or `span-or` across different fields.
 
 <<query-dsl-span-first-query,`span_first` query>>::

server/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java

@@ -35,7 +35,7 @@
 import java.util.Objects;
 
 public class FieldMaskingSpanQueryBuilder extends AbstractQueryBuilder<FieldMaskingSpanQueryBuilder> implements SpanQueryBuilder {
-    public static final String NAME = "field_masking_span";
+    public static final String NAME = "span_field_masking";
 
     private static final ParseField FIELD_FIELD = new ParseField("field");
     private static final ParseField QUERY_FIELD = new ParseField("query");
@@ -116,11 +116,11 @@ public static FieldMaskingSpanQueryBuilder fromXContent(XContentParser parser) t
                 if (QUERY_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                     QueryBuilder query = parseInnerQueryBuilder(parser);
                     if (query instanceof SpanQueryBuilder == false) {
-                        throw new ParsingException(parser.getTokenLocation(), "[field_masking_span] query must be of type span query");
+                        throw new ParsingException(parser.getTokenLocation(), "[span_field_masking] query must be of type span query");
                     }
                     inner = (SpanQueryBuilder) query;
                 } else {
-                    throw new ParsingException(parser.getTokenLocation(), "[field_masking_span] query does not support ["
+                    throw new ParsingException(parser.getTokenLocation(), "[span_field_masking] query does not support ["
                             + currentFieldName + "]");
                 }
             } else {
@@ -132,15 +132,15 @@ public static FieldMaskingSpanQueryBuilder fromXContent(XContentParser parser) t
                     queryName = parser.text();
                 } else {
                     throw new ParsingException(parser.getTokenLocation(),
-                            "[field_masking_span] query does not support [" + currentFieldName + "]");
+                            "[span_field_masking] query does not support [" + currentFieldName + "]");
                 }
             }
         }
         if (inner == null) {
-            throw new ParsingException(parser.getTokenLocation(), "field_masking_span must have [query] span query clause");
+            throw new ParsingException(parser.getTokenLocation(), "span_field_masking must have [query] span query clause");
         }
         if (field == null) {
-            throw new ParsingException(parser.getTokenLocation(), "field_masking_span must have [field] set for it");
+            throw new ParsingException(parser.getTokenLocation(), "span_field_masking must have [field] set for it");
         }
 
         FieldMaskingSpanQueryBuilder queryBuilder = new FieldMaskingSpanQueryBuilder(inner, field);

server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java

@@ -62,7 +62,7 @@ public void testIllegalArguments() {
     public void testFromJson() throws IOException {
         String json =
                 "{\n" +
-                "  \"field_masking_span\" : {\n" +
+                "  \"span_field_masking\" : {\n" +
                 "    \"query\" : {\n" +
                 "      \"span_term\" : {\n" +
                 "        \"value\" : {\n" +

server/src/test/java/org/elasticsearch/search/SearchModuleTests.java

@@ -312,7 +312,7 @@ public List<RescorerSpec<?>> getRescorers() {
             "constant_score",
             "dis_max",
             "exists",
-            "field_masking_span",
+            "span_field_masking",
             "function_score",
             "fuzzy",
             "geo_bounding_box",