diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 2f7a742afb..f749a2c558 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -3977,7 +3977,7 @@
         "operationId": "cluster-stats",
         "parameters": [
           {
-            "$ref": "#/components/parameters/cluster.stats#flat_settings"
+            "$ref": "#/components/parameters/cluster.stats#include_remotes"
           },
           {
             "$ref": "#/components/parameters/cluster.stats#timeout"
@@ -4004,7 +4004,7 @@
             "$ref": "#/components/parameters/cluster.stats#node_id"
           },
           {
-            "$ref": "#/components/parameters/cluster.stats#flat_settings"
+            "$ref": "#/components/parameters/cluster.stats#include_remotes"
           },
           {
             "$ref": "#/components/parameters/cluster.stats#timeout"
@@ -75439,7 +75439,7 @@
             "$ref": "#/components/schemas/_types:EpochTimeUnitMillis"
           },
           "state": {
-            "$ref": "#/components/schemas/ml._types:DeploymentState"
+            "$ref": "#/components/schemas/ml._types:DeploymentAssignmentState"
           },
           "threads_per_allocation": {
             "description": "The number of threads used be each allocation during inference.",
@@ -75595,12 +75595,13 @@
           "stopping"
         ]
       },
-      "ml._types:DeploymentState": {
+      "ml._types:DeploymentAssignmentState": {
         "type": "string",
         "enum": [
           "started",
           "starting",
-          "stopping"
+          "stopping",
+          "failed"
         ]
       },
       "ml._types:TrainedModelInferenceStats": {
@@ -76644,15 +76645,6 @@
           "task_parameters"
         ]
       },
-      "ml._types:DeploymentAssignmentState": {
-        "type": "string",
-        "enum": [
-          "starting",
-          "started",
-          "stopping",
-          "failed"
-        ]
-      },
       "ml._types:TrainedModelAssignmentTaskParameters": {
         "type": "object",
         "properties": {
@@ -93291,10 +93283,10 @@
         },
         "style": "simple"
       },
-      "cluster.stats#flat_settings": {
+      "cluster.stats#include_remotes": {
         "in": "query",
-        "name": "flat_settings",
-        "description": "If `true`, returns settings in flat format.",
+        "name": "include_remotes",
+        "description": "Include remote cluster data into the response",
         "deprecated": false,
         "schema": {
           "type": "boolean"
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index 2236d16dc6..cbb7943702 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -50923,7 +50923,7 @@
             "$ref": "#/components/schemas/_types:EpochTimeUnitMillis"
           },
           "state": {
-            "$ref": "#/components/schemas/ml._types:DeploymentState"
+            "$ref": "#/components/schemas/ml._types:DeploymentAssignmentState"
           },
           "threads_per_allocation": {
             "description": "The number of threads used be each allocation during inference.",
@@ -51075,12 +51075,13 @@
           "stopping"
         ]
       },
-      "ml._types:DeploymentState": {
+      "ml._types:DeploymentAssignmentState": {
         "type": "string",
         "enum": [
           "started",
           "starting",
-          "stopping"
+          "stopping",
+          "failed"
         ]
       },
       "ml._types:TrainedModelInferenceStats": {
@@ -52051,15 +52052,6 @@
           "task_parameters"
         ]
       },
-      "ml._types:DeploymentAssignmentState": {
-        "type": "string",
-        "enum": [
-          "starting",
-          "started",
-          "stopping",
-          "failed"
-        ]
-      },
       "ml._types:TrainedModelAssignmentTaskParameters": {
         "type": "object",
         "properties": {
diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json
index 0aa5a5a2b7..04797ffce9 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -94553,29 +94553,7 @@
         "name": "DeploymentAllocationState",
         "namespace": "ml._types"
       },
-      "specLocation": "ml/_types/TrainedModel.ts#L288-L301"
-    },
-    {
-      "kind": "enum",
-      "members": [
-        {
-          "name": "starting"
-        },
-        {
-          "name": "started"
-        },
-        {
-          "name": "stopping"
-        },
-        {
-          "name": "failed"
-        }
-      ],
-      "name": {
-        "name": "DeploymentAssignmentState",
-        "namespace": "ml._types"
-      },
-      "specLocation": "ml/_types/TrainedModel.ts#L303-L308"
+      "specLocation": "ml/_types/TrainedModel.ts#L273-L286"
     },
     {
       "kind": "enum",
@@ -94591,13 +94569,17 @@
         {
           "description": "The deployment is preparing to stop and deallocate the model from the relevant nodes.",
           "name": "stopping"
+        },
+        {
+          "description": "The deployment is on a failed state and must be re-deployed.",
+          "name": "failed"
         }
       ],
       "name": {
-        "name": "DeploymentState",
+        "name": "DeploymentAssignmentState",
         "namespace": "ml._types"
       },
-      "specLocation": "ml/_types/TrainedModel.ts#L273-L286"
+      "specLocation": "ml/_types/TrainedModel.ts#L288-L305"
     },
     {
       "kind": "enum",
@@ -94793,7 +94775,7 @@
         "name": "RoutingState",
         "namespace": "ml._types"
       },
-      "specLocation": "ml/_types/TrainedModel.ts#L350-L371"
+      "specLocation": "ml/_types/TrainedModel.ts#L347-L368"
     },
     {
       "kind": "enum",
@@ -94890,7 +94872,7 @@
         "name": "TrainingPriority",
         "namespace": "ml._types"
       },
-      "specLocation": "ml/_types/TrainedModel.ts#L310-L313"
+      "specLocation": "ml/_types/TrainedModel.ts#L307-L310"
     },
     {
       "codegenNames": [
@@ -132718,7 +132700,7 @@
           }
         }
       ],
-      "specLocation": "ml/_types/TrainedModel.ts#L419-L421"
+      "specLocation": "ml/_types/TrainedModel.ts#L416-L418"
     },
     {
       "kind": "interface",
@@ -132739,7 +132721,7 @@
           }
         }
       ],
-      "specLocation": "ml/_types/TrainedModel.ts#L423-L425"
+      "specLocation": "ml/_types/TrainedModel.ts#L420-L422"
     },
     {
       "kind": "interface",
@@ -132773,7 +132755,7 @@
           }
         }
       ],
-      "specLocation": "ml/_types/TrainedModel.ts#L427-L436"
+      "specLocation": "ml/_types/TrainedModel.ts#L424-L433"
     },
     {
       "kind": "interface",
@@ -133035,7 +133017,7 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "DeploymentState",
+              "name": "DeploymentAssignmentState",
               "namespace": "ml._types"
             }
           }
@@ -133111,7 +133093,7 @@
           }
         }
       ],
-      "specLocation": "ml/_types/TrainedModel.ts#L393-L400"
+      "specLocation": "ml/_types/TrainedModel.ts#L390-L397"
     },
     {
       "kind": "interface",
@@ -133329,7 +133311,7 @@
           }
         }
       ],
-      "specLocation": "ml/_types/TrainedModel.ts#L373-L391"
+      "specLocation": "ml/_types/TrainedModel.ts#L370-L388"
     },
     {
       "kind": "interface",
@@ -135862,7 +135844,7 @@
           }
         }
       ],
-      "specLocation": "ml/_types/TrainedModel.ts#L402-L417"
+      "specLocation": "ml/_types/TrainedModel.ts#L399-L414"
     },
     {
       "kind": "interface",
@@ -135973,7 +135955,7 @@
           }
         }
       ],
-      "specLocation": "ml/_types/TrainedModel.ts#L315-L348"
+      "specLocation": "ml/_types/TrainedModel.ts#L312-L345"
     },
     {
       "kind": "interface",
diff --git a/output/schema/schema.json b/output/schema/schema.json
index 3bc5c3d2bc..0077159974 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -110332,8 +110332,8 @@
       ],
       "query": [
         {
-          "description": "If `true`, returns settings in flat format.",
-          "name": "flat_settings",
+          "description": "Include remote cluster data into the response",
+          "name": "include_remotes",
           "required": false,
           "serverDefault": false,
           "type": {
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 4476e6b3ae..aa269a64af 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -9578,7 +9578,7 @@ export interface ClusterStatsOperatingSystemMemoryInfo {
 
 export interface ClusterStatsRequest extends RequestBase {
   node_id?: NodeIds
-  flat_settings?: boolean
+  include_remotes?: boolean
   timeout?: Duration
 }
 
diff --git a/specification/_json_spec/cluster.stats.json b/specification/_json_spec/cluster.stats.json
index 5ee14e2095..993cc16d20 100644
--- a/specification/_json_spec/cluster.stats.json
+++ b/specification/_json_spec/cluster.stats.json
@@ -28,9 +28,9 @@
       ]
     },
     "params": {
-      "flat_settings": {
+      "include_remotes": {
         "type": "boolean",
-        "description": "Return settings in flat format (default: false)"
+        "description": "Include remote cluster data into the response (default: false)"
       },
       "timeout": {
         "type": "time",
diff --git a/specification/cluster/stats/ClusterStatsRequest.ts b/specification/cluster/stats/ClusterStatsRequest.ts
index 171c78ee52..f4b35474ca 100644
--- a/specification/cluster/stats/ClusterStatsRequest.ts
+++ b/specification/cluster/stats/ClusterStatsRequest.ts
@@ -37,10 +37,10 @@ export interface Request extends RequestBase {
   }
   query_parameters: {
     /**
-     * If `true`, returns settings in flat format.
+     * Include remote cluster data into the response
      * @server_default false
      */
-    flat_settings?: boolean
+    include_remotes?: boolean
     /**
      * Period to wait for each node to respond.
      * If a node does not respond before its timeout expires, the response does not include its stats.