diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/92_flat_object_support_doc_values.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/92_flat_object_support_doc_values.yml
index 14fb8704635be..67c0a33496c42 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/92_flat_object_support_doc_values.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/92_flat_object_support_doc_values.yml
@@ -1,16 +1,16 @@
 ---
 # The test setup includes:
-# - Create flat_object mapping for flat_object_doc_value_test index
+# - Create flat_object mapping for flat_object_doc_values_test index
 # - Index 9 example documents
 # - Search tests about doc_values and index
 
 setup:
   - skip:
       version: " - 2.17.99"
-      reason: "doc_values in flat_object is used in 2.18 "
+      reason: "doc_values in flat_object is used in 2.18.0 "
   - do:
       indices.create:
-        index: flat_object_doc_value_test
+        index: flat_object_doc_values_test
         body:
           mappings:
             properties:
@@ -25,23 +25,23 @@ setup:
       bulk:
         refresh: true
         body: |
-          {"index":{"_index":"flat_object_doc_value_test","_id":"0"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"0"}}
           {"order":"order0","issue":{"labels":{"number":1,"name":"abc0","status":1}}}
-          {"index":{"_index":"flat_object_doc_value_test","_id":"1"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"1"}}
           {"order":"order1","issue":{"labels":{"number":2,"name":"abc1","status":1}}}
-          {"index":{"_index":"flat_object_doc_value_test","_id":"2"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"2"}}
           {"order":"order2","issue":{"labels":{"number":2,"name":"abc2","status":1}}}
-          {"index":{"_index":"flat_object_doc_value_test","_id":"3"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"3"}}
           {"order":"order3","issue":{"labels":{"number":3,"name":"abc3","status":1}}}
-          {"index":{"_index":"flat_object_doc_value_test","_id":"4"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"4"}}
           {"order":"order4","issue":{"labels":{"number":4,"name":"abc4","status":1}}}
-          {"index":{"_index":"flat_object_doc_value_test","_id":"5"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"5"}}
           {"order":"order5","issue":{"labels":{"number":5,"name":"abc5","status":1}}}
-          {"index":{"_index":"flat_object_doc_value_test","_id":"6"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"6"}}
           {"order":"order6","issue":{"labels":{"number":6,"name":"abc6","status":1}}}
-          {"index":{"_index":"flat_object_doc_value_test","_id":"7"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"7"}}
           {"order":"order7","issue":{"labels":{"number":7,"name":"abc7","status":1}}}
-          {"index":{"_index":"flat_object_doc_value_test","_id":"8"}}
+          {"index":{"_index":"flat_object_doc_values_test","_id":"8"}}
           {"order":"order8","issue":{"labels":{"number":8,"name":"abc8","status":1}}}
 
 ---
@@ -49,13 +49,13 @@ setup:
 teardown:
   - do:
       indices.delete:
-        index: flat_object_doc_value_test
+        index: flat_object_doc_values_test
 
 ---
 "Supported queries":
   - skip:
       version: " - 2.17.99"
-      reason: "doc_values in flat_object is used in 2.18 "
+      reason: "doc_values in flat_object is used in 2.18.0 "
 
   # Verify Document Count
   - do: