diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java
index 8d322064578..4713f67bf63 100644
--- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java
+++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java
@@ -133,7 +133,7 @@ public class WatcherUtilsTests extends ESTestCase {
         assertThat(parser.nextToken(), equalTo(XContentParser.Token.START_OBJECT));
         IndicesQueriesRegistry registry = new IndicesQueriesRegistry();
         QueryParser<MatchAllQueryBuilder> queryParser = MatchAllQueryBuilder::fromXContent;
-        registry.register(queryParser, MatchAllQueryBuilder.QUERY_NAME_FIELD);
+        registry.register(queryParser, MatchAllQueryBuilder.NAME);
         QueryParseContext context = new QueryParseContext(registry, parser, ParseFieldMatcher.STRICT);
         WatcherSearchTemplateRequest result = WatcherSearchTemplateRequest.fromXContent(parser, DEFAULT_SEARCH_TYPE, context, null, null);
 
@@ -220,7 +220,7 @@ public class WatcherUtilsTests extends ESTestCase {
         assertThat(parser.nextToken(), equalTo(XContentParser.Token.START_OBJECT));
         IndicesQueriesRegistry registry = new IndicesQueriesRegistry();
         QueryParser<MatchAllQueryBuilder> queryParser = MatchAllQueryBuilder::fromXContent;
-        registry.register(queryParser, MatchAllQueryBuilder.QUERY_NAME_FIELD);
+        registry.register(queryParser, MatchAllQueryBuilder.NAME);
         QueryParseContext context = new QueryParseContext(registry, parser, ParseFieldMatcher.STRICT);
         WatcherSearchTemplateRequest result = WatcherSearchTemplateRequest.fromXContent(parser, DEFAULT_SEARCH_TYPE, context, null, null);
 
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java
index b917def8c68..e3bea2db3b3 100644
--- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java
+++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java
@@ -350,7 +350,7 @@ public class WatchTests extends ESTestCase {
             case SearchInput.TYPE:
                 IndicesQueriesRegistry queryRegistry = new IndicesQueriesRegistry();
                 QueryParser<MatchAllQueryBuilder> queryParser = MatchAllQueryBuilder::fromXContent;
-                queryRegistry.register(queryParser, MatchAllQueryBuilder.QUERY_NAME_FIELD);
+                queryRegistry.register(queryParser, MatchAllQueryBuilder.NAME);
                 parsers.put(SearchInput.TYPE, new SearchInputFactory(settings, client, queryRegistry, null, null, scriptService));
                 return new InputRegistry(Settings.EMPTY, parsers);
             default:
@@ -423,7 +423,7 @@ public class WatchTests extends ESTestCase {
     private TransformRegistry transformRegistry() {
         IndicesQueriesRegistry queryRegistry = new IndicesQueriesRegistry();
         QueryParser<MatchAllQueryBuilder> queryParser = MatchAllQueryBuilder::fromXContent;
-        queryRegistry.register(queryParser, MatchAllQueryBuilder.QUERY_NAME_FIELD);
+        queryRegistry.register(queryParser, MatchAllQueryBuilder.NAME);
         Map<String, TransformFactory> factories = new HashMap<>();
         factories.put(ScriptTransform.TYPE, new ScriptTransformFactory(settings, scriptService));
         factories.put(SearchTransform.TYPE, new SearchTransformFactory(settings, client, queryRegistry, null, null, scriptService));