diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java
index 1f155d6eca671..8979ed3be3e83 100644
--- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java
@@ -1130,7 +1130,7 @@ public void testRankEval() throws Exception {
             SearchSourceBuilder searchQuery = new SearchSourceBuilder();
             searchQuery.query(QueryBuilders.matchQuery("user", "foobar"));// <3>
             RatedRequest ratedRequest =                                   // <4>
-                    new RatedRequest("kimchy_query", ratedDocs, searchQuery);
+                    new RatedRequest("foobar_query", ratedDocs, searchQuery);
             List<RatedRequest> ratedRequests = Arrays.asList(ratedRequest);
             RankEvalSpec specification =
                     new RankEvalSpec(ratedRequests, metric);              // <5>
@@ -1148,8 +1148,8 @@ public void testRankEval() throws Exception {
             Map<String, EvalQueryQuality> partialResults =
                     response.getPartialResults();
             EvalQueryQuality evalQuality =
-                    partialResults.get("kimchy_query");                 // <2>
-            assertEquals("kimchy_query", evalQuality.getId());
+                    partialResults.get("foobar_query");                 // <2>
+            assertEquals("foobar_query", evalQuality.getId());
             double qualityLevel = evalQuality.metricScore();        // <3>
             assertEquals(1.0 / 3.0, qualityLevel, 0.0);
             List<RatedSearchHit> hitsAndRatings = evalQuality.getHitsAndRatings();
diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml
index 7c33f1b75b286..770f372c210a8 100644
--- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml
+++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml
@@ -29,7 +29,7 @@
         body:
           query:
             match:
-              user: otherkimchy
+              user: otherfoobar
   - match: { hits.total: 1 }
 
 ---
@@ -68,7 +68,7 @@
         body:
           query:
             match:
-              user: otherkimchy
+              user: otherfoobar
   - match: { hits.total: 1 }
 
   - do:
@@ -160,7 +160,7 @@
         body:
           query:
             match:
-              user: notkimchy
+              user: notfoobar
   - match: { hits.total: 1 }
 
   - do:
@@ -252,7 +252,7 @@
         body:
           query:
             match:
-              user: otherkimchy
+              user: otherfoobar
   - match: { hits.total: 1 }
 
 ---
@@ -291,7 +291,7 @@
         body:
           query:
             match:
-              user: otherkimchy
+              user: otherfoobar
   - match: { hits.total: 1 }
 
 ---
diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml
index a220356951217..a8de49d812677 100644
--- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml
+++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml
@@ -26,7 +26,7 @@
         body:
           query:
             match:
-              user: notkimchy
+              user: notfoobar
   - match: { hits.total: 1 }
 
 ---
@@ -54,7 +54,7 @@
         body:
           query:
             match:
-              user: notkimchy
+              user: notfoobar
   - match: { hits.total: 1 }
 
 ---
@@ -90,7 +90,7 @@
         body:
           query:
             match:
-              user: notkimchy
+              user: notfoobar
   - match: { hits.total: 1 }
 
   - do: