diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
index 0752e4b7ed546..5a1c75357a4a5 100644
--- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
+++ b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
@@ -86,44 +86,44 @@
 public final class SearchSourceBuilder implements Writeable, ToXContentObject, Rewriteable<SearchSourceBuilder> {
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(SearchSourceBuilder.class);
 
-    public static final ParseField FROM_FIELD = new ParseField("from"); // override
-    public static final ParseField SIZE_FIELD = new ParseField("size"); // override
-    public static final ParseField TIMEOUT_FIELD = new ParseField("timeout"); // global
-    public static final ParseField TERMINATE_AFTER_FIELD = new ParseField("terminate_after"); // retriever
-    public static final ParseField QUERY_FIELD = new ParseField("query"); // retriever
-    public static final ParseField SUB_SEARCHES_FIELD = new ParseField("sub_searches"); // retriever
-    public static final ParseField POST_FILTER_FIELD = new ParseField("post_filter"); // override
-    public static final ParseField KNN_FIELD = new ParseField("knn"); // retriever
-    public static final ParseField RANK_FIELD = new ParseField("rank"); // retriever
-    public static final ParseField MIN_SCORE_FIELD = new ParseField("min_score"); // retriever
-    public static final ParseField VERSION_FIELD = new ParseField("version"); // global
-    public static final ParseField SEQ_NO_PRIMARY_TERM_FIELD = new ParseField("seq_no_primary_term"); // global
-    public static final ParseField EXPLAIN_FIELD = new ParseField("explain"); // global
-    public static final ParseField _SOURCE_FIELD = new ParseField("_source"); // global
-    public static final ParseField STORED_FIELDS_FIELD = new ParseField("stored_fields"); // global
-    public static final ParseField DOCVALUE_FIELDS_FIELD = new ParseField("docvalue_fields"); // global
-    public static final ParseField FETCH_FIELDS_FIELD = new ParseField("fields"); // global
-    public static final ParseField SCRIPT_FIELDS_FIELD = new ParseField("script_fields"); // global
-    public static final ParseField SCRIPT_FIELD = new ParseField("script"); // global
-    public static final ParseField IGNORE_FAILURE_FIELD = new ParseField("ignore_failure"); // global
-    public static final ParseField SORT_FIELD = new ParseField("sort"); // retriever
-    public static final ParseField TRACK_SCORES_FIELD = new ParseField("track_scores"); // global
-    public static final ParseField TRACK_TOTAL_HITS_FIELD = new ParseField("track_total_hits"); // global
-    public static final ParseField INDICES_BOOST_FIELD = new ParseField("indices_boost"); // global
-    public static final ParseField AGGREGATIONS_FIELD = new ParseField("aggregations"); // global
-    public static final ParseField AGGS_FIELD = new ParseField("aggs"); // global
-    public static final ParseField HIGHLIGHT_FIELD = new ParseField("highlight"); // global
-    public static final ParseField SUGGEST_FIELD = new ParseField("suggest"); // global
-    public static final ParseField RESCORE_FIELD = new ParseField("rescore"); // retriever
-    public static final ParseField STATS_FIELD = new ParseField("stats"); // global
-    public static final ParseField EXT_FIELD = new ParseField("ext"); // global
-    public static final ParseField PROFILE_FIELD = new ParseField("profile"); // global
-    public static final ParseField SEARCH_AFTER = new ParseField("search_after"); // retriever
-    public static final ParseField COLLAPSE = new ParseField("collapse"); // retriever
-    public static final ParseField SLICE = new ParseField("slice"); // global
-    public static final ParseField POINT_IN_TIME = new ParseField("pit"); // global
-    public static final ParseField RUNTIME_MAPPINGS_FIELD = new ParseField("runtime_mappings"); // global
-    public static final ParseField RETRIEVER = new ParseField("retriever"); // global
+    public static final ParseField FROM_FIELD = new ParseField("from");
+    public static final ParseField SIZE_FIELD = new ParseField("size");
+    public static final ParseField TIMEOUT_FIELD = new ParseField("timeout");
+    public static final ParseField TERMINATE_AFTER_FIELD = new ParseField("terminate_after");
+    public static final ParseField QUERY_FIELD = new ParseField("query");
+    public static final ParseField SUB_SEARCHES_FIELD = new ParseField("sub_searches");
+    public static final ParseField POST_FILTER_FIELD = new ParseField("post_filter");
+    public static final ParseField KNN_FIELD = new ParseField("knn");
+    public static final ParseField RANK_FIELD = new ParseField("rank");
+    public static final ParseField MIN_SCORE_FIELD = new ParseField("min_score");
+    public static final ParseField VERSION_FIELD = new ParseField("version");
+    public static final ParseField SEQ_NO_PRIMARY_TERM_FIELD = new ParseField("seq_no_primary_term");
+    public static final ParseField EXPLAIN_FIELD = new ParseField("explain");
+    public static final ParseField _SOURCE_FIELD = new ParseField("_source");
+    public static final ParseField STORED_FIELDS_FIELD = new ParseField("stored_fields");
+    public static final ParseField DOCVALUE_FIELDS_FIELD = new ParseField("docvalue_fields");
+    public static final ParseField FETCH_FIELDS_FIELD = new ParseField("fields");
+    public static final ParseField SCRIPT_FIELDS_FIELD = new ParseField("script_fields");
+    public static final ParseField SCRIPT_FIELD = new ParseField("script");
+    public static final ParseField IGNORE_FAILURE_FIELD = new ParseField("ignore_failure");
+    public static final ParseField SORT_FIELD = new ParseField("sort");
+    public static final ParseField TRACK_SCORES_FIELD = new ParseField("track_scores");
+    public static final ParseField TRACK_TOTAL_HITS_FIELD = new ParseField("track_total_hits");
+    public static final ParseField INDICES_BOOST_FIELD = new ParseField("indices_boost");
+    public static final ParseField AGGREGATIONS_FIELD = new ParseField("aggregations");
+    public static final ParseField AGGS_FIELD = new ParseField("aggs");
+    public static final ParseField HIGHLIGHT_FIELD = new ParseField("highlight");
+    public static final ParseField SUGGEST_FIELD = new ParseField("suggest");
+    public static final ParseField RESCORE_FIELD = new ParseField("rescore");
+    public static final ParseField STATS_FIELD = new ParseField("stats");
+    public static final ParseField EXT_FIELD = new ParseField("ext");
+    public static final ParseField PROFILE_FIELD = new ParseField("profile");
+    public static final ParseField SEARCH_AFTER = new ParseField("search_after");
+    public static final ParseField COLLAPSE = new ParseField("collapse");
+    public static final ParseField SLICE = new ParseField("slice");
+    public static final ParseField POINT_IN_TIME = new ParseField("pit");
+    public static final ParseField RUNTIME_MAPPINGS_FIELD = new ParseField("runtime_mappings");
+    public static final ParseField RETRIEVER = new ParseField("retriever");
 
     private static final boolean RANK_SUPPORTED = Booleans.parseBoolean(System.getProperty("es.search.rank_supported"), true);