diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 7d5dc3a2ad..63d5e0c27c 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -34994,7 +34994,7 @@
                       "type": "number"
                     },
                     "coordinating_node": {
-                      "$ref": "#/components/schemas/snapshot.repository_analyze:NodeInfo"
+                      "$ref": "#/components/schemas/snapshot.repository_analyze:SnapshotNodeInfo"
                     },
                     "delete_elapsed": {
                       "$ref": "#/components/schemas/_types:Duration"
@@ -89479,7 +89479,7 @@
           "repository"
         ]
       },
-      "snapshot.repository_analyze:NodeInfo": {
+      "snapshot.repository_analyze:SnapshotNodeInfo": {
         "type": "object",
         "properties": {
           "id": {
@@ -89519,7 +89519,7 @@
             "$ref": "#/components/schemas/_types:DurationValueUnitNanos"
           },
           "writer_node": {
-            "$ref": "#/components/schemas/snapshot.repository_analyze:NodeInfo"
+            "$ref": "#/components/schemas/snapshot.repository_analyze:SnapshotNodeInfo"
           }
         },
         "required": [
@@ -89599,7 +89599,7 @@
             "type": "boolean"
           },
           "node": {
-            "$ref": "#/components/schemas/snapshot.repository_analyze:NodeInfo"
+            "$ref": "#/components/schemas/snapshot.repository_analyze:SnapshotNodeInfo"
           },
           "throttled": {
             "$ref": "#/components/schemas/_types:Duration"
diff --git a/output/schema/schema.json b/output/schema/schema.json
index e64c2857a4..35e95ade29 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -212792,7 +212792,7 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "NodeInfo",
+              "name": "SnapshotNodeInfo",
               "namespace": "snapshot.repository_analyze"
             }
           }
@@ -212800,38 +212800,6 @@
       ],
       "specLocation": "snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L286-L321"
     },
-    {
-      "kind": "interface",
-      "name": {
-        "name": "NodeInfo",
-        "namespace": "snapshot.repository_analyze"
-      },
-      "properties": [
-        {
-          "name": "id",
-          "required": true,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Id",
-              "namespace": "_types"
-            }
-          }
-        },
-        {
-          "name": "name",
-          "required": true,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Name",
-              "namespace": "_types"
-            }
-          }
-        }
-      ],
-      "specLocation": "snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L110-L113"
-    },
     {
       "kind": "interface",
       "name": {
@@ -212936,7 +212904,7 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "NodeInfo",
+              "name": "SnapshotNodeInfo",
               "namespace": "snapshot.repository_analyze"
             }
           }
@@ -213396,7 +213364,7 @@
             "type": {
               "kind": "instance_of",
               "type": {
-                "name": "NodeInfo",
+                "name": "SnapshotNodeInfo",
                 "namespace": "snapshot.repository_analyze"
               }
             }
@@ -213622,6 +213590,38 @@
       },
       "specLocation": "snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L24-L108"
     },
+    {
+      "kind": "interface",
+      "name": {
+        "name": "SnapshotNodeInfo",
+        "namespace": "snapshot.repository_analyze"
+      },
+      "properties": [
+        {
+          "name": "id",
+          "required": true,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Id",
+              "namespace": "_types"
+            }
+          }
+        },
+        {
+          "name": "name",
+          "required": true,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Name",
+              "namespace": "_types"
+            }
+          }
+        }
+      ],
+      "specLocation": "snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L110-L113"
+    },
     {
       "kind": "interface",
       "name": {
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 18d968c855..95f88d6827 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -19966,12 +19966,7 @@ export interface SnapshotRepositoryAnalyzeDetailsInfo {
   write_elapsed_nanos: DurationValue<UnitNanos>
   write_throttled: Duration
   write_throttled_nanos: DurationValue<UnitNanos>
-  writer_node: SnapshotRepositoryAnalyzeNodeInfo
-}
-
-export interface SnapshotRepositoryAnalyzeNodeInfo {
-  id: Id
-  name: Name
+  writer_node: SnapshotRepositoryAnalyzeSnapshotNodeInfo
 }
 
 export interface SnapshotRepositoryAnalyzeReadBlobDetails {
@@ -19981,7 +19976,7 @@ export interface SnapshotRepositoryAnalyzeReadBlobDetails {
   first_byte_time?: Duration
   first_byte_time_nanos: DurationValue<UnitNanos>
   found: boolean
-  node: SnapshotRepositoryAnalyzeNodeInfo
+  node: SnapshotRepositoryAnalyzeSnapshotNodeInfo
   throttled?: Duration
   throttled_nanos?: DurationValue<UnitNanos>
 }
@@ -20020,7 +20015,7 @@ export interface SnapshotRepositoryAnalyzeResponse {
   blob_count: integer
   blob_path: string
   concurrency: integer
-  coordinating_node: SnapshotRepositoryAnalyzeNodeInfo
+  coordinating_node: SnapshotRepositoryAnalyzeSnapshotNodeInfo
   delete_elapsed: Duration
   delete_elapsed_nanos: DurationValue<UnitNanos>
   details: SnapshotRepositoryAnalyzeDetailsInfo
@@ -20039,6 +20034,11 @@ export interface SnapshotRepositoryAnalyzeResponse {
   summary: SnapshotRepositoryAnalyzeSummaryInfo
 }
 
+export interface SnapshotRepositoryAnalyzeSnapshotNodeInfo {
+  id: Id
+  name: Name
+}
+
 export interface SnapshotRepositoryAnalyzeSummaryInfo {
   read: SnapshotRepositoryAnalyzeReadSummaryInfo
   write: SnapshotRepositoryAnalyzeWriteSummaryInfo
diff --git a/specification/snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts b/specification/snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts
index fe0cd07231..cb0feb979b 100644
--- a/specification/snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts
+++ b/specification/snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts
@@ -38,7 +38,7 @@ export class Response {
     /**
      * The node that coordinated the analysis and performed the final cleanup.
      */
-    coordinating_node: NodeInfo
+    coordinating_node: SnapshotNodeInfo
     /**
      * The time it took to delete all the blobs in the container.
      */
@@ -107,7 +107,7 @@ export class Response {
   }
 }
 
-export class NodeInfo {
+export class SnapshotNodeInfo {
   id: Id
   name: Name
 }
@@ -234,7 +234,7 @@ export class ReadBlobDetails {
   /**
    * The node that performed the read operation.
    */
-  node: NodeInfo
+  node: SnapshotNodeInfo
   /**
    * The length of time spent waiting due to the `max_restore_bytes_per_sec` or `indices.recovery.max_bytes_per_sec` throttles during the read of the blob.
    * If the blob was not found, this detail is omitted.
@@ -317,5 +317,5 @@ export class DetailsInfo {
   /**
    * The node which wrote the blob and coordinated the read operations.
    */
-  writer_node: NodeInfo
+  writer_node: SnapshotNodeInfo
 }