diff --git a/compiler/package-lock.json b/compiler/package-lock.json
index d55e85ec0c..56c687fd0d 100644
--- a/compiler/package-lock.json
+++ b/compiler/package-lock.json
@@ -24,6 +24,7 @@
         "c8": "^7.11.0",
         "minimist": "^1.2.6",
         "prettier": "2.5.1",
+        "prettier-plugin-organize-imports": "^4.0.0",
         "ts-node": "^10.4.0",
         "ts-standard": "^11.0.0",
         "typescript": "^4.5.5"
@@ -4218,6 +4219,27 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/prettier-plugin-organize-imports": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-4.0.0.tgz",
+      "integrity": "sha512-vnKSdgv9aOlqKeEFGhf9SCBsTyzDSyScy1k7E0R1Uo4L0cTcOV7c1XQaT7jfXIOc/p08WLBfN2QUQA9zDSZMxA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@vue/language-plugin-pug": "^2.0.24",
+        "prettier": ">=2.0",
+        "typescript": ">=2.9",
+        "vue-tsc": "^2.0.24"
+      },
+      "peerDependenciesMeta": {
+        "@vue/language-plugin-pug": {
+          "optional": true
+        },
+        "vue-tsc": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/pretty-ms": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
@@ -8387,6 +8409,13 @@
       "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
       "dev": true
     },
+    "prettier-plugin-organize-imports": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-4.0.0.tgz",
+      "integrity": "sha512-vnKSdgv9aOlqKeEFGhf9SCBsTyzDSyScy1k7E0R1Uo4L0cTcOV7c1XQaT7jfXIOc/p08WLBfN2QUQA9zDSZMxA==",
+      "dev": true,
+      "requires": {}
+    },
     "pretty-ms": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
diff --git a/compiler/package.json b/compiler/package.json
index 6f780b0018..069df9b440 100644
--- a/compiler/package.json
+++ b/compiler/package.json
@@ -28,6 +28,7 @@
     "c8": "^7.11.0",
     "minimist": "^1.2.6",
     "prettier": "2.5.1",
+    "prettier-plugin-organize-imports": "^4.0.0",
     "ts-node": "^10.4.0",
     "ts-standard": "^11.0.0",
     "typescript": "^4.5.5"
diff --git a/specification/_global/bulk/BulkRequest.ts b/specification/_global/bulk/BulkRequest.ts
index fab1803066..6814dd46ff 100644
--- a/specification/_global/bulk/BulkRequest.ts
+++ b/specification/_global/bulk/BulkRequest.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import {
   Fields,
@@ -27,7 +28,6 @@ import {
 } from '@_types/common'
 import { Duration } from '@_types/Time'
 import { OperationContainer, UpdateAction } from './types'
-import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 
 /**
  * Bulk index or delete documents.
diff --git a/specification/_global/bulk/BulkResponse.ts b/specification/_global/bulk/BulkResponse.ts
index c5789fccc0..cd63b63c57 100644
--- a/specification/_global/bulk/BulkResponse.ts
+++ b/specification/_global/bulk/BulkResponse.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 import { long } from '@_types/Numeric'
 import { OperationType, ResponseItem } from './types'
-import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 
 export class Response {
   body: {
diff --git a/specification/_global/bulk/types.ts b/specification/_global/bulk/types.ts
index c1e427fe60..470f1dcfdd 100644
--- a/specification/_global/bulk/types.ts
+++ b/specification/_global/bulk/types.ts
@@ -17,12 +17,13 @@
  * under the License.
  */
 
-import { InlineGet } from '@_types/common'
+import { SourceConfig } from '@global/search/_types/SourceFilter'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import {
   Id,
   IndexName,
+  InlineGet,
   Routing,
   SequenceNumber,
   VersionNumber,
@@ -30,9 +31,8 @@ import {
 } from '@_types/common'
 import { ErrorCause } from '@_types/Errors'
 import { integer, long } from '@_types/Numeric'
-import { ShardStatistics } from '@_types/Stats'
 import { Script } from '@_types/Scripting'
-import { SourceConfig } from '@global/search/_types/SourceFilter'
+import { ShardStatistics } from '@_types/Stats'
 
 export class ResponseItem {
   /**
diff --git a/specification/_global/clear_scroll/ClearScrollRequest.ts b/specification/_global/clear_scroll/ClearScrollRequest.ts
index fd3a31f4ba..97c7d24735 100644
--- a/specification/_global/clear_scroll/ClearScrollRequest.ts
+++ b/specification/_global/clear_scroll/ClearScrollRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { Ids, ScrollIds } from '@_types/common'
+import { ScrollIds } from '@_types/common'
 
 /**
  * Clears the search context and results for a scrolling search.
diff --git a/specification/_global/delete_by_query/DeleteByQueryRequest.ts b/specification/_global/delete_by_query/DeleteByQueryRequest.ts
index 415b9baab8..d1691e6f19 100644
--- a/specification/_global/delete_by_query/DeleteByQueryRequest.ts
+++ b/specification/_global/delete_by_query/DeleteByQueryRequest.ts
@@ -29,9 +29,9 @@ import {
 } from '@_types/common'
 import { float, long } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
+import { Operator } from '@_types/query_dsl/Operator'
 import { SlicedScroll } from '@_types/SlicedScroll'
 import { Duration } from '@_types/Time'
-import { Operator } from '@_types/query_dsl/Operator'
 
 /**
  * Delete documents.
diff --git a/specification/_global/exists/DocumentExistsRequest.ts b/specification/_global/exists/DocumentExistsRequest.ts
index cce7aff33b..8908bb9fbd 100644
--- a/specification/_global/exists/DocumentExistsRequest.ts
+++ b/specification/_global/exists/DocumentExistsRequest.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import {
   Fields,
@@ -26,7 +27,6 @@ import {
   VersionNumber,
   VersionType
 } from '@_types/common'
-import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 
 /**
  * Check a document.
diff --git a/specification/_global/exists_source/SourceExistsRequest.ts b/specification/_global/exists_source/SourceExistsRequest.ts
index 95039f3396..41755a033b 100644
--- a/specification/_global/exists_source/SourceExistsRequest.ts
+++ b/specification/_global/exists_source/SourceExistsRequest.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import {
   Fields,
@@ -26,7 +27,6 @@ import {
   VersionNumber,
   VersionType
 } from '@_types/common'
-import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 
 /**
  * Check for a document source.
diff --git a/specification/_global/explain/ExplainRequest.ts b/specification/_global/explain/ExplainRequest.ts
index 3781ab9918..99874b0621 100644
--- a/specification/_global/explain/ExplainRequest.ts
+++ b/specification/_global/explain/ExplainRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import { Fields, Id, IndexName, Routing } from '@_types/common'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
-import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 import { Operator } from '@_types/query_dsl/Operator'
 
 /**
diff --git a/specification/_global/get/GetRequest.ts b/specification/_global/get/GetRequest.ts
index 6f5a7d94fc..51880fca0e 100644
--- a/specification/_global/get/GetRequest.ts
+++ b/specification/_global/get/GetRequest.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import {
   Fields,
@@ -26,7 +27,6 @@ import {
   VersionNumber,
   VersionType
 } from '@_types/common'
-import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 
 /**
  * Get a document by its ID.
diff --git a/specification/_global/get/types.ts b/specification/_global/get/types.ts
index 6010744cc7..46124f05c9 100644
--- a/specification/_global/get/types.ts
+++ b/specification/_global/get/types.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { Id, IndexName, SequenceNumber, VersionNumber } from '@_types/common'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { Id, IndexName, SequenceNumber, VersionNumber } from '@_types/common'
 import { long } from '@_types/Numeric'
 
 export class GetResult<TDocument> {
diff --git a/specification/_global/get_source/SourceRequest.ts b/specification/_global/get_source/SourceRequest.ts
index bd4b9b607e..13f10fc493 100644
--- a/specification/_global/get_source/SourceRequest.ts
+++ b/specification/_global/get_source/SourceRequest.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import {
   Fields,
@@ -26,7 +27,6 @@ import {
   VersionNumber,
   VersionType
 } from '@_types/common'
-import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 
 /**
  * Get a document's source.
diff --git a/specification/_global/health_report/Response.ts b/specification/_global/health_report/Response.ts
index d226c5d785..8d1a98b4ad 100644
--- a/specification/_global/health_report/Response.ts
+++ b/specification/_global/health_report/Response.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Indicators, IndicatorHealthStatus } from './types'
+import { IndicatorHealthStatus, Indicators } from './types'
 
 export class Response {
   body: {
diff --git a/specification/_global/health_report/types.ts b/specification/_global/health_report/types.ts
index ad1dcb4572..dd1de29637 100644
--- a/specification/_global/health_report/types.ts
+++ b/specification/_global/health_report/types.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { Dictionary } from '@spec_utils/Dictionary'
+import { IndexName, Indices } from '@_types/common'
 import { LifecycleOperationMode } from '@_types/Lifecycle'
 import { integer, long } from '@_types/Numeric'
-import { IndexName, Indices } from '@_types/common'
-import { Dictionary } from '@spec_utils/Dictionary'
 
 export enum IndicatorHealthStatus {
   green,
diff --git a/specification/_global/knn_search/KnnSearchRequest.ts b/specification/_global/knn_search/KnnSearchRequest.ts
index e97aa80a83..1fb3ee01c6 100644
--- a/specification/_global/knn_search/KnnSearchRequest.ts
+++ b/specification/_global/knn_search/KnnSearchRequest.ts
@@ -17,12 +17,11 @@
  * under the License.
  */
 
+import { SourceConfig } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import { Fields, Indices, Routing } from '@_types/common'
+import { FieldAndFormat, QueryContainer } from '@_types/query_dsl/abstractions'
 import { Query } from './_types/Knn'
-import { QueryContainer } from '@_types/query_dsl/abstractions'
-import { SourceConfig } from '@global/search/_types/SourceFilter'
-import { FieldAndFormat } from '@_types/query_dsl/abstractions'
 
 /**
  * @rest_spec_name knn_search
diff --git a/specification/_global/knn_search/KnnSearchResponse.ts b/specification/_global/knn_search/KnnSearchResponse.ts
index 5e1e36f93d..64dde26899 100644
--- a/specification/_global/knn_search/KnnSearchResponse.ts
+++ b/specification/_global/knn_search/KnnSearchResponse.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
+import { HitsMetadata } from '@global/search/_types/hits'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { double, long } from '@_types/Numeric'
 import { ShardStatistics } from '@_types/Stats'
-import { HitsMetadata } from '@global/search/_types/hits'
 
 export class Response<TDocument> {
   body: {
diff --git a/specification/_global/knn_search/_types/Knn.ts b/specification/_global/knn_search/_types/Knn.ts
index 568847e3e6..e16cff9d82 100644
--- a/specification/_global/knn_search/_types/Knn.ts
+++ b/specification/_global/knn_search/_types/Knn.ts
@@ -18,8 +18,8 @@
  */
 
 import { Field } from '@_types/common'
-import { integer } from '@_types/Numeric'
 import { QueryVector } from '@_types/Knn'
+import { integer } from '@_types/Numeric'
 
 export interface Query {
   /** The name of the vector field to search against */
diff --git a/specification/_global/mget/MultiGetRequest.ts b/specification/_global/mget/MultiGetRequest.ts
index daaa676f89..4b2271b3b4 100644
--- a/specification/_global/mget/MultiGetRequest.ts
+++ b/specification/_global/mget/MultiGetRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import { Fields, Ids, IndexName, Routing } from '@_types/common'
 import { Operation } from './types'
-import { SourceConfigParam } from '@global/search/_types/SourceFilter'
 
 /**
  * @rest_spec_name mget
diff --git a/specification/_global/mget/types.ts b/specification/_global/mget/types.ts
index 30aac69dfd..68ba312f11 100644
--- a/specification/_global/mget/types.ts
+++ b/specification/_global/mget/types.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { GetResult } from '@global/get/types'
 import { SourceConfig } from '@global/search/_types/SourceFilter'
 import {
   Fields,
@@ -27,7 +28,6 @@ import {
   VersionType
 } from '@_types/common'
 import { ErrorCause } from '@_types/Errors'
-import { GetResult } from '@global/get/types'
 
 export class Operation {
   /**
diff --git a/specification/_global/msearch/types.ts b/specification/_global/msearch/types.ts
index 7988457a11..bfc20059ac 100644
--- a/specification/_global/msearch/types.ts
+++ b/specification/_global/msearch/types.ts
@@ -17,10 +17,18 @@
  * under the License.
  */
 
+import { ResponseBody as SearchResponse } from '@global/search/SearchResponse'
+import { FieldCollapse } from '@global/search/_types/FieldCollapse'
+import { Highlight } from '@global/search/_types/highlighting'
+import { TrackHits } from '@global/search/_types/hits'
 import { PointInTimeReference } from '@global/search/_types/PointInTimeReference'
+import { Rescore } from '@global/search/_types/rescoring'
+import { SourceConfig } from '@global/search/_types/SourceFilter'
 import { Suggester } from '@global/search/_types/suggester'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
+import { ErrorResponseBase } from '@_types/Base'
 import {
   ExpandWildcards,
   Fields,
@@ -29,20 +37,12 @@ import {
   Routing,
   SearchType
 } from '@_types/common'
+import { KnnSearch } from '@_types/Knn'
+import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { double, integer, long } from '@_types/Numeric'
 import { FieldAndFormat, QueryContainer } from '@_types/query_dsl/abstractions'
-import { ResponseBody as SearchResponse } from '@global/search/SearchResponse'
-import { TrackHits } from '@global/search/_types/hits'
-import { ErrorResponseBase } from '@_types/Base'
-import { Sort, SortResults } from '@_types/sort'
-import { FieldCollapse } from '@global/search/_types/FieldCollapse'
-import { Highlight } from '@global/search/_types/highlighting'
-import { Rescore } from '@global/search/_types/rescoring'
-import { SourceConfig } from '@global/search/_types/SourceFilter'
-import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { ScriptField } from '@_types/Scripting'
-import { KnnSearch } from '@_types/Knn'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { Sort, SortResults } from '@_types/sort'
 
 /**
  * @codegen_names header, body
diff --git a/specification/_global/msearch_template/types.ts b/specification/_global/msearch_template/types.ts
index 88114b1e8e..9796548f80 100644
--- a/specification/_global/msearch_template/types.ts
+++ b/specification/_global/msearch_template/types.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { MultisearchHeader } from '@global/msearch/types'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Id } from '@_types/common'
-import { MultisearchHeader } from '@global/msearch/types'
 
 /** @codegen_names header, body */
 export type RequestItem = MultisearchHeader | TemplateConfig
diff --git a/specification/_global/reindex/types.ts b/specification/_global/reindex/types.ts
index 6f49c23cf1..678c40e338 100644
--- a/specification/_global/reindex/types.ts
+++ b/specification/_global/reindex/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Sort } from '@_types/sort'
+import { Dictionary } from '@spec_utils/Dictionary'
 import {
   Fields,
   IndexName,
@@ -33,8 +33,8 @@ import { Host } from '@_types/Networking'
 import { integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { SlicedScroll } from '@_types/SlicedScroll'
+import { Sort } from '@_types/sort'
 import { Duration } from '@_types/Time'
-import { Dictionary } from '@spec_utils/Dictionary'
 
 export class Destination {
   /**
diff --git a/specification/_global/search/SearchRequest.ts b/specification/_global/search/SearchRequest.ts
index b24f5a2a1a..4931658bff 100644
--- a/specification/_global/search/SearchRequest.ts
+++ b/specification/_global/search/SearchRequest.ts
@@ -17,7 +17,9 @@
  * under the License.
  */
 
+import { TrackHits } from '@global/search/_types/hits'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
 import { RequestBase } from '@_types/Base'
 import {
@@ -31,25 +33,23 @@ import {
   SuggestMode,
   VersionString
 } from '@_types/common'
+import { KnnSearch } from '@_types/Knn'
 import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { double, integer, long } from '@_types/Numeric'
 import { FieldAndFormat, QueryContainer } from '@_types/query_dsl/abstractions'
+import { Operator } from '@_types/query_dsl/Operator'
+import { RankContainer } from '@_types/Rank'
+import { RetrieverContainer } from '@_types/Retriever'
 import { ScriptField } from '@_types/Scripting'
 import { SlicedScroll } from '@_types/SlicedScroll'
+import { Sort, SortResults } from '@_types/sort'
 import { Duration } from '@_types/Time'
 import { FieldCollapse } from './_types/FieldCollapse'
 import { Highlight } from './_types/highlighting'
 import { PointInTimeReference } from './_types/PointInTimeReference'
 import { Rescore } from './_types/rescoring'
-import { SourceConfigParam, SourceConfig } from './_types/SourceFilter'
+import { SourceConfig, SourceConfigParam } from './_types/SourceFilter'
 import { Suggester } from './_types/suggester'
-import { TrackHits } from '@global/search/_types/hits'
-import { Operator } from '@_types/query_dsl/Operator'
-import { Sort, SortResults } from '@_types/sort'
-import { KnnSearch } from '@_types/Knn'
-import { RankContainer } from '@_types/Rank'
-import { RetrieverContainer } from '@_types/Retriever'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 /**
  * Returns search hits that match the query defined in the request.
diff --git a/specification/_global/search/_types/SourceFilter.ts b/specification/_global/search/_types/SourceFilter.ts
index 6b48c59f79..f45956b57c 100644
--- a/specification/_global/search/_types/SourceFilter.ts
+++ b/specification/_global/search/_types/SourceFilter.ts
@@ -18,7 +18,7 @@
  */
 // TODO: move singular names to aliases
 
-import { Field, Fields } from '@_types/common'
+import { Fields } from '@_types/common'
 
 /**
  * @shortcut_property includes
diff --git a/specification/_global/search/_types/highlighting.ts b/specification/_global/search/_types/highlighting.ts
index 9b7efcd353..fe50c6e69f 100644
--- a/specification/_global/search/_types/highlighting.ts
+++ b/specification/_global/search/_types/highlighting.ts
@@ -18,11 +18,10 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Field, Fields } from '@_types/common'
 import { integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
-import { Analyzer } from '@_types/analysis/analyzers'
 
 export enum BoundaryScanner {
   /**
diff --git a/specification/_global/search/_types/hits.ts b/specification/_global/search/_types/hits.ts
index fd24c26142..20bae0341e 100644
--- a/specification/_global/search/_types/hits.ts
+++ b/specification/_global/search/_types/hits.ts
@@ -30,12 +30,12 @@ import {
   VersionNumber
 } from '@_types/common'
 import { double, integer, long } from '@_types/Numeric'
+import { FieldAndFormat } from '@_types/query_dsl/abstractions'
 import { ScriptField } from '@_types/Scripting'
+import { Sort, SortResults } from '@_types/sort'
 import { FieldCollapse } from './FieldCollapse'
 import { Highlight } from './highlighting'
 import { SourceConfig } from './SourceFilter'
-import { FieldAndFormat } from '@_types/query_dsl/abstractions'
-import { Sort, SortResults } from '@_types/sort'
 
 export class Hit<TDocument> {
   _index: IndexName
diff --git a/specification/_global/search/_types/rescoring.ts b/specification/_global/search/_types/rescoring.ts
index ede27346ed..b7dec393ba 100644
--- a/specification/_global/search/_types/rescoring.ts
+++ b/specification/_global/search/_types/rescoring.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { double, integer } from '@_types/Numeric'
-import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { double, integer } from '@_types/Numeric'
+import { QueryContainer } from '@_types/query_dsl/abstractions'
 
 /**
  * @variants container
diff --git a/specification/_global/search/_types/suggester.ts b/specification/_global/search/_types/suggester.ts
index 28ef9ab0d1..80eba0280b 100644
--- a/specification/_global/search/_types/suggester.ts
+++ b/specification/_global/search/_types/suggester.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import {
@@ -29,7 +30,6 @@ import {
 } from '@_types/common'
 import { GeoHashPrecision, GeoLocation } from '@_types/Geo'
 import { double, float, integer, long } from '@_types/Numeric'
-import { AdditionalProperties } from '@spec_utils/behaviors'
 
 /**
  * @variants external
diff --git a/specification/_global/search_mvt/SearchMvtRequest.ts b/specification/_global/search_mvt/SearchMvtRequest.ts
index 275e2b5d46..432e428e9c 100644
--- a/specification/_global/search_mvt/SearchMvtRequest.ts
+++ b/specification/_global/search_mvt/SearchMvtRequest.ts
@@ -17,18 +17,18 @@
  * under the License.
  */
 
+import { TrackHits } from '@global/search/_types/hits'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
 import { RequestBase } from '@_types/Base'
 import { Field, Fields, Indices } from '@_types/common'
-import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
-import { GridAggregationType, GridType } from './_types/GridType'
-import { Coordinate } from './_types/Coordinate'
-import { Sort } from '@_types/sort'
-import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { integer } from '@_types/Numeric'
+import { QueryContainer } from '@_types/query_dsl/abstractions'
+import { Sort } from '@_types/sort'
+import { Coordinate } from './_types/Coordinate'
+import { GridAggregationType, GridType } from './_types/GridType'
 import { ZoomLevel } from './_types/ZoomLevel'
-import { TrackHits } from '@global/search/_types/hits'
 
 /**
  * Search a vector tile.
diff --git a/specification/_global/search_shards/SearchShardsResponse.ts b/specification/_global/search_shards/SearchShardsResponse.ts
index d39721f592..8c217de0ab 100644
--- a/specification/_global/search_shards/SearchShardsResponse.ts
+++ b/specification/_global/search_shards/SearchShardsResponse.ts
@@ -26,10 +26,10 @@ import {
   NodeName,
   VersionString
 } from '@_types/common'
-import { NodeRoles, NodeShard } from '@_types/Node'
-import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { TransportAddress } from '@_types/Networking'
+import { NodeRoles, NodeShard } from '@_types/Node'
 import { integer } from '@_types/Numeric'
+import { QueryContainer } from '@_types/query_dsl/abstractions'
 
 export class Response {
   body: {
diff --git a/specification/_global/search_template/SearchTemplateResponse.ts b/specification/_global/search_template/SearchTemplateResponse.ts
index 2bceac23d8..196c6b57aa 100644
--- a/specification/_global/search_template/SearchTemplateResponse.ts
+++ b/specification/_global/search_template/SearchTemplateResponse.ts
@@ -18,14 +18,14 @@
  */
 
 import { HitsMetadata } from '@global/search/_types/hits'
-import { double, integer, long } from '@_types/Numeric'
-import { ClusterStatistics, ShardStatistics } from '@_types/Stats'
-import { Dictionary } from '@spec_utils/Dictionary'
-import { AggregateName, Id, ScrollId, SuggestionName } from '@_types/common'
-import { Aggregate } from '@_types/aggregations/Aggregate'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Profile } from '@global/search/_types/profile'
 import { Suggest } from '@global/search/_types/suggester'
+import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { Aggregate } from '@_types/aggregations/Aggregate'
+import { AggregateName, Id, ScrollId, SuggestionName } from '@_types/common'
+import { double, long } from '@_types/Numeric'
+import { ClusterStatistics, ShardStatistics } from '@_types/Stats'
 
 export class Response<TDocument> {
   body: {
diff --git a/specification/_global/update/UpdateRequest.ts b/specification/_global/update/UpdateRequest.ts
index 1ff4fd69d1..b969edb1c0 100644
--- a/specification/_global/update/UpdateRequest.ts
+++ b/specification/_global/update/UpdateRequest.ts
@@ -18,8 +18,8 @@
  */
 
 import {
-  SourceConfigParam,
-  SourceConfig
+  SourceConfig,
+  SourceConfigParam
 } from '@global/search/_types/SourceFilter'
 import { RequestBase } from '@_types/Base'
 import {
diff --git a/specification/_global/update/UpdateResponse.ts b/specification/_global/update/UpdateResponse.ts
index 9f34eac8bc..9b5e4970d3 100644
--- a/specification/_global/update/UpdateResponse.ts
+++ b/specification/_global/update/UpdateResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { InlineGet } from '@_types/common'
 import { WriteResponseBase } from '@_types/Base'
+import { InlineGet } from '@_types/common'
 
 export class UpdateWriteResponseBase<TDocument> extends WriteResponseBase {
   get?: InlineGet<TDocument>
diff --git a/specification/_global/update_by_query/UpdateByQueryRequest.ts b/specification/_global/update_by_query/UpdateByQueryRequest.ts
index 1734459121..fca4277da3 100644
--- a/specification/_global/update_by_query/UpdateByQueryRequest.ts
+++ b/specification/_global/update_by_query/UpdateByQueryRequest.ts
@@ -29,10 +29,10 @@ import {
 } from '@_types/common'
 import { float, long } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
+import { Operator } from '@_types/query_dsl/Operator'
 import { Script } from '@_types/Scripting'
 import { SlicedScroll } from '@_types/SlicedScroll'
 import { Duration } from '@_types/Time'
-import { Operator } from '@_types/query_dsl/Operator'
 
 /**
  * Update documents.
diff --git a/specification/_global/update_by_query/UpdateByQueryResponse.ts b/specification/_global/update_by_query/UpdateByQueryResponse.ts
index 55aba5f63b..8ba972d9b8 100644
--- a/specification/_global/update_by_query/UpdateByQueryResponse.ts
+++ b/specification/_global/update_by_query/UpdateByQueryResponse.ts
@@ -19,7 +19,7 @@
 
 import { TaskId } from '@_types/common'
 import { BulkIndexByScrollFailure } from '@_types/Errors'
-import { float, long, ulong } from '@_types/Numeric'
+import { float, long } from '@_types/Numeric'
 import { Retries } from '@_types/Retries'
 import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 
diff --git a/specification/_global/update_by_query_rethrottle/UpdateByQueryRethrottleRequest.ts b/specification/_global/update_by_query_rethrottle/UpdateByQueryRethrottleRequest.ts
index 2f8feae01b..deddea2a59 100644
--- a/specification/_global/update_by_query_rethrottle/UpdateByQueryRethrottleRequest.ts
+++ b/specification/_global/update_by_query_rethrottle/UpdateByQueryRethrottleRequest.ts
@@ -19,7 +19,7 @@
 
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { float, long } from '@_types/Numeric'
+import { float } from '@_types/Numeric'
 
 /**
  * @rest_spec_name update_by_query_rethrottle
diff --git a/specification/_types/Errors.ts b/specification/_types/Errors.ts
index 5aee0838ab..ec5dd15215 100644
--- a/specification/_types/Errors.ts
+++ b/specification/_types/Errors.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { AdditionalProperties } from '@spec_utils/behaviors'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Id, IndexName, NodeId } from './common'
 import { integer, long } from './Numeric'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
-import { AdditionalProperties } from '@spec_utils/behaviors'
 
 /**
  * Cause and details about a request failure. This class defines the properties common to all error types.
diff --git a/specification/_types/Geo.ts b/specification/_types/Geo.ts
index 9a4e0f39ab..a3995dc248 100644
--- a/specification/_types/Geo.ts
+++ b/specification/_types/Geo.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { double } from './Numeric'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { double } from './Numeric'
 
 export class DistanceParsed {
   precision: double
diff --git a/specification/_types/Knn.ts b/specification/_types/Knn.ts
index cf9c71cfd7..82f9170ce8 100644
--- a/specification/_types/Knn.ts
+++ b/specification/_types/Knn.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { InnerHits } from '@global/search/_types/hits'
 import { Field } from '@_types/common'
 import { float, integer } from '@_types/Numeric'
 import { QueryBase, QueryContainer } from './query_dsl/abstractions'
-import { InnerHits } from '@global/search/_types/hits'
 
 export type QueryVector = float[]
 
diff --git a/specification/_types/Node.ts b/specification/_types/Node.ts
index adf1993618..3e50056d90 100644
--- a/specification/_types/Node.ts
+++ b/specification/_types/Node.ts
@@ -22,7 +22,7 @@ import { ShardRoutingState } from '@indices/stats/types'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { ErrorCause } from '@_types/Errors'
 import { integer } from '@_types/Numeric'
-import { Id, IndexName, NodeId, NodeName, VersionString } from './common'
+import { Id, IndexName, NodeId, NodeName } from './common'
 import { TransportAddress } from './Networking'
 
 /**
diff --git a/specification/_types/Retriever.ts b/specification/_types/Retriever.ts
index 088041ce45..5118033924 100644
--- a/specification/_types/Retriever.ts
+++ b/specification/_types/Retriever.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { float, integer } from '@_types/Numeric'
-import { QueryContainer } from './query_dsl/abstractions'
+import { FieldCollapse } from '@global/search/_types/FieldCollapse'
 import { QueryVector, QueryVectorBuilder } from '@_types/Knn'
+import { float, integer } from '@_types/Numeric'
 import { Sort, SortResults } from '@_types/sort'
-import { FieldCollapse } from '@global/search/_types/FieldCollapse'
+import { QueryContainer } from './query_dsl/abstractions'
 
 /**
  * @variants container
diff --git a/specification/_types/Stats.ts b/specification/_types/Stats.ts
index 8f5aa14a67..0d368edfb1 100644
--- a/specification/_types/Stats.ts
+++ b/specification/_types/Stats.ts
@@ -19,10 +19,10 @@
 
 import { ShardFileSizeInfo } from '@indices/stats/types'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 import { ByteSize, ClusterAlias, Field, Name, VersionString } from './common'
 import { ShardFailure } from './Errors'
 import { double, integer, long, uint } from './Numeric'
-import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 
 export class ClusterStatistics {
   skipped: integer
diff --git a/specification/_types/aggregations/Aggregate.ts b/specification/_types/aggregations/Aggregate.ts
index 2e6e724e59..60d6d54ea7 100644
--- a/specification/_types/aggregations/Aggregate.ts
+++ b/specification/_types/aggregations/Aggregate.ts
@@ -18,9 +18,11 @@
  */
 
 import { HitsMetadata } from '@global/search/_types/hits'
-import { AdditionalProperties, AdditionalProperty } from '@spec_utils/behaviors'
+import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { Void } from '@spec_utils/VoidValue'
+import { CompositeAggregateKey } from '@_types/aggregations/bucket'
 import { AggregateName, Field, FieldValue, Metadata } from '@_types/common'
 import {
   GeoBounds,
@@ -32,8 +34,6 @@ import {
 } from '@_types/Geo'
 import { double, integer, long } from '@_types/Numeric'
 import { DurationLarge, EpochTime, UnitMillis } from '@_types/Time'
-import { Void } from '@spec_utils/VoidValue'
-import { CompositeAggregateKey } from '@_types/aggregations/bucket'
 
 /**
  * @variants external
diff --git a/specification/_types/aggregations/AggregationContainer.ts b/specification/_types/aggregations/AggregationContainer.ts
index 7a0a1795f6..e95e734a61 100644
--- a/specification/_types/aggregations/AggregationContainer.ts
+++ b/specification/_types/aggregations/AggregationContainer.ts
@@ -19,7 +19,7 @@
 
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Metadata } from '@_types/common'
-import { integer, double } from '@_types/Numeric'
+import { double, integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
 import {
   AdjacencyMatrixAggregation,
@@ -31,12 +31,14 @@ import {
   DateRangeAggregation,
   DiversifiedSamplerAggregation,
   FiltersAggregation,
+  FrequentItemSetsAggregation,
   GeoDistanceAggregation,
   GeoHashGridAggregation,
-  GeoTileGridAggregation,
   GeohexGridAggregation,
+  GeoTileGridAggregation,
   GlobalAggregation,
   HistogramAggregation,
+  IpPrefixAggregation,
   IpRangeAggregation,
   MissingAggregation,
   MultiTermsAggregation,
@@ -49,9 +51,7 @@ import {
   SignificantTermsAggregation,
   SignificantTextAggregation,
   TermsAggregation,
-  VariableWidthHistogramAggregation,
-  IpPrefixAggregation,
-  FrequentItemSetsAggregation
+  VariableWidthHistogramAggregation
 } from './bucket'
 import { MatrixStatsAggregation } from './matrix'
 import {
@@ -73,13 +73,15 @@ import {
   StringStatsAggregation,
   SumAggregation,
   TopHitsAggregation,
-  TTestAggregation,
   TopMetricsAggregation,
+  TTestAggregation,
   ValueCountAggregation,
   WeightedAverageAggregation
 } from './metric'
 import {
   AverageBucketAggregation,
+  BucketCorrelationAggregation,
+  BucketKsAggregation,
   BucketScriptAggregation,
   BucketSelectorAggregation,
   BucketSortAggregation,
@@ -91,15 +93,13 @@ import {
   MaxBucketAggregation,
   MinBucketAggregation,
   MovingAverageAggregation,
-  MovingPercentilesAggregation,
   MovingFunctionAggregation,
+  MovingPercentilesAggregation,
   NormalizeAggregation,
   PercentilesBucketAggregation,
   SerialDifferencingAggregation,
   StatsBucketAggregation,
-  SumBucketAggregation,
-  BucketCorrelationAggregation,
-  BucketKsAggregation
+  SumBucketAggregation
 } from './pipeline'
 
 /**
diff --git a/specification/_types/aggregations/bucket.ts b/specification/_types/aggregations/bucket.ts
index c3343f096a..5ba59da1ce 100644
--- a/specification/_types/aggregations/bucket.ts
+++ b/specification/_types/aggregations/bucket.ts
@@ -17,33 +17,38 @@
  * under the License.
  */
 
-import { SortOrder } from '@_types/sort'
 import { Dictionary, SingleKeyDictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
-import { EmptyObject, FieldValue } from '@_types/common'
-import { Field, RelationName, Fields } from '@_types/common'
+import { ValueType } from '@_types/aggregations/metric'
+import {
+  EmptyObject,
+  Field,
+  Fields,
+  FieldValue,
+  RelationName
+} from '@_types/common'
 import {
-  GeoDistanceType,
   DistanceUnit,
+  GeoBounds,
+  GeoDistanceType,
   GeoHashPrecision,
-  GeoTilePrecision,
   GeoLocation,
-  GeoBounds
+  GeoTilePrecision
 } from '@_types/Geo'
-import { integer, long, double } from '@_types/Numeric'
+import { double, integer, long } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { Script } from '@_types/Scripting'
+import { SortOrder } from '@_types/sort'
 import {
+  DateMath,
   DateTime,
   Duration,
-  DateMath,
-  TimeZone,
-  DurationLarge
+  DurationLarge,
+  TimeZone
 } from '@_types/Time'
 import { Buckets } from './Aggregate'
 import { Aggregation } from './Aggregation'
 import { Missing, MissingOrder } from './AggregationContainer'
-import { ValueType } from '@_types/aggregations/metric'
 
 /**
  * Base type for bucket aggregations. These aggregations also accept sub-aggregations.
diff --git a/specification/_types/aggregations/matrix.ts b/specification/_types/aggregations/matrix.ts
index 24458103af..03e0840ef0 100644
--- a/specification/_types/aggregations/matrix.ts
+++ b/specification/_types/aggregations/matrix.ts
@@ -18,10 +18,10 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { Fields, Field } from '@_types/common'
+import { Field, Fields } from '@_types/common'
 import { double } from '@_types/Numeric'
-import { Aggregation } from './Aggregation'
 import { SortMode } from '@_types/sort'
+import { Aggregation } from './Aggregation'
 
 export class MatrixAggregation extends Aggregation {
   /**
diff --git a/specification/_types/aggregations/metric.ts b/specification/_types/aggregations/metric.ts
index 2b02431fdc..5b71de9118 100644
--- a/specification/_types/aggregations/metric.ts
+++ b/specification/_types/aggregations/metric.ts
@@ -18,18 +18,18 @@
  */
 
 import { Highlight } from '@global/search/_types/highlighting'
-import { SortOrder, Sort } from '@_types/sort'
 import { SourceConfig } from '@global/search/_types/SourceFilter'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Field, Fields } from '@_types/common'
+import { GeoLocation } from '@_types/Geo'
 import { double, integer, long } from '@_types/Numeric'
 import { FieldAndFormat, QueryContainer } from '@_types/query_dsl/abstractions'
 import { Script, ScriptField } from '@_types/Scripting'
+import { Sort, SortOrder } from '@_types/sort'
 import { Aggregation } from './Aggregation'
 import { Missing } from './AggregationContainer'
 import { CalendarInterval } from './bucket'
-import { GeoLocation } from '@_types/Geo'
 
 export class MetricAggregationBase {
   /**
diff --git a/specification/_types/aggregations/pipeline.ts b/specification/_types/aggregations/pipeline.ts
index 0131a5041c..acefaa2b43 100644
--- a/specification/_types/aggregations/pipeline.ts
+++ b/specification/_types/aggregations/pipeline.ts
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-import { Sort } from '@_types/sort'
+import {
+  ClassificationInferenceOptions,
+  RegressionInferenceOptions
+} from '@ml/_types/inference'
 import { Dictionary } from '@spec_utils/Dictionary'
-import { Name, Field, EmptyObject } from '@_types/common'
-import { integer, double, float } from '@_types/Numeric'
+import { EmptyObject, Name } from '@_types/common'
+import { double, float, integer } from '@_types/Numeric'
 import { Script } from '@_types/Scripting'
+import { Sort } from '@_types/sort'
 import { Aggregation } from './Aggregation'
-import {
-  RegressionInferenceOptions,
-  ClassificationInferenceOptions
-} from '@ml/_types/inference'
 
 export class BucketPathAggregation extends Aggregation {
   /**
diff --git a/specification/_types/analysis/analyzers.ts b/specification/_types/analysis/analyzers.ts
index 4766c7356b..38a51256ec 100644
--- a/specification/_types/analysis/analyzers.ts
+++ b/specification/_types/analysis/analyzers.ts
@@ -19,11 +19,11 @@
 
 import { VersionString } from '@_types/common'
 import { integer } from '@_types/Numeric'
+import { IcuAnalyzer } from './icu-plugin'
+import { KuromojiAnalyzer } from './kuromoji-plugin'
 import { Language, SnowballLanguage } from './languages'
 import { StopWords } from './StopWords'
 import { NoriDecompoundMode } from './tokenizers'
-import { IcuAnalyzer } from './icu-plugin'
-import { KuromojiAnalyzer } from './kuromoji-plugin'
 
 export class CustomAnalyzer {
   type: 'custom'
diff --git a/specification/_types/analysis/token_filters.ts b/specification/_types/analysis/token_filters.ts
index 8885c7a540..b812415666 100644
--- a/specification/_types/analysis/token_filters.ts
+++ b/specification/_types/analysis/token_filters.ts
@@ -17,25 +17,24 @@
  * under the License.
  */
 
+import { Stringified } from '@spec_utils/Stringified'
 import { VersionString } from '@_types/common'
 import { integer } from '@_types/Numeric'
 import { Script } from '@_types/Scripting'
-import { SnowballLanguage } from './languages'
-import { StopWords } from './StopWords'
-import {
-  KuromojiStemmerTokenFilter,
-  KuromojiReadingFormTokenFilter,
-  KuromojiPartOfSpeechTokenFilter
-} from './kuromoji-plugin'
 import {
   IcuCollationTokenFilter,
   IcuFoldingTokenFilter,
   IcuNormalizationTokenFilter,
-  IcuTokenizer,
   IcuTransformTokenFilter
 } from './icu-plugin'
+import {
+  KuromojiPartOfSpeechTokenFilter,
+  KuromojiReadingFormTokenFilter,
+  KuromojiStemmerTokenFilter
+} from './kuromoji-plugin'
+import { SnowballLanguage } from './languages'
 import { PhoneticTokenFilter } from './phonetic-plugin'
-import { Stringified } from '@spec_utils/Stringified'
+import { StopWords } from './StopWords'
 
 export class TokenFilterBase {
   version?: VersionString
diff --git a/specification/_types/analysis/tokenizers.ts b/specification/_types/analysis/tokenizers.ts
index 9972039711..322a0098a1 100644
--- a/specification/_types/analysis/tokenizers.ts
+++ b/specification/_types/analysis/tokenizers.ts
@@ -17,12 +17,11 @@
  * under the License.
  */
 
+import { Stringified } from '@spec_utils/Stringified'
 import { VersionString } from '@_types/common'
 import { integer } from '@_types/Numeric'
 import { IcuTokenizer } from './icu-plugin'
 import { KuromojiTokenizer } from './kuromoji-plugin'
-import { TokenFilterDefinition } from '@_types/analysis/token_filters'
-import { Stringified } from '@spec_utils/Stringified'
 
 export class TokenizerBase {
   version?: VersionString
diff --git a/specification/_types/common.ts b/specification/_types/common.ts
index 35e68674b4..4a8ad73fe1 100644
--- a/specification/_types/common.ts
+++ b/specification/_types/common.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { double, integer, long } from './Numeric'
-import { AdditionalProperties } from '@spec_utils/behaviors'
 
 /**
  * A field value.
diff --git a/specification/_types/mapping/Property.ts b/specification/_types/mapping/Property.ts
index 88fca89607..8cce8819a2 100644
--- a/specification/_types/mapping/Property.ts
+++ b/specification/_types/mapping/Property.ts
@@ -18,7 +18,21 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { Metadata, PropertyName } from '@_types/common'
+import { PropertyName } from '@_types/common'
+import {
+  GeoPointProperty,
+  GeoShapeProperty,
+  PointProperty,
+  ShapeProperty
+} from '@_types/mapping/geo'
+import {
+  DateRangeProperty,
+  DoubleRangeProperty,
+  FloatRangeProperty,
+  IntegerRangeProperty,
+  IpRangeProperty,
+  LongRangeProperty
+} from '@_types/mapping/range'
 import { integer } from '@_types/Numeric'
 import {
   AggregateMetricDoubleProperty,
@@ -47,8 +61,8 @@ import {
   RankFeaturesProperty,
   ScaledFloatNumberProperty,
   SearchAsYouTypeProperty,
-  ShortNumberProperty,
   SemanticTextProperty,
+  ShortNumberProperty,
   SparseVectorProperty,
   TextProperty,
   UnsignedLongNumberProperty,
@@ -66,20 +80,6 @@ import {
   Murmur3HashProperty,
   TokenCountProperty
 } from './specialized'
-import {
-  DateRangeProperty,
-  DoubleRangeProperty,
-  FloatRangeProperty,
-  IntegerRangeProperty,
-  IpRangeProperty,
-  LongRangeProperty
-} from '@_types/mapping/range'
-import {
-  GeoPointProperty,
-  GeoShapeProperty,
-  PointProperty,
-  ShapeProperty
-} from '@_types/mapping/geo'
 
 export class PropertyBase {
   /**
diff --git a/specification/_types/mapping/complex.ts b/specification/_types/mapping/complex.ts
index 3af6956075..d9b0c70bb3 100644
--- a/specification/_types/mapping/complex.ts
+++ b/specification/_types/mapping/complex.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
+import { TimeSeriesMetricType } from '@_types/mapping/TimeSeriesMetricType'
 import { double, integer } from '@_types/Numeric'
 import { CorePropertyBase, IndexOptions } from './core'
 import { DenseVectorIndexOptions } from './DenseVectorIndexOptions'
 import { PropertyBase } from './Property'
-import { TimeSeriesMetricType } from '@_types/mapping/TimeSeriesMetricType'
 
 export class FlattenedProperty extends PropertyBase {
   boost?: double
diff --git a/specification/_types/mapping/core.ts b/specification/_types/mapping/core.ts
index 6255b5fb6c..6653e212d3 100644
--- a/specification/_types/mapping/core.ts
+++ b/specification/_types/mapping/core.ts
@@ -36,10 +36,10 @@ import {
   short,
   ulong
 } from '@_types/Numeric'
+import { Script } from '@_types/Scripting'
 import { DateTime } from '@_types/Time'
 import { Property, PropertyBase } from './Property'
 import { TermVectorOption } from './TermVectorOption'
-import { Script } from '@_types/Scripting'
 import { TimeSeriesMetricType } from './TimeSeriesMetricType'
 
 export class CorePropertyBase extends PropertyBase {
diff --git a/specification/_types/mapping/geo.ts b/specification/_types/mapping/geo.ts
index dcc3e42b4b..d5498c4a7f 100644
--- a/specification/_types/mapping/geo.ts
+++ b/specification/_types/mapping/geo.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { DocValuesPropertyBase, OnScriptError } from './core'
 import { GeoLocation } from '@_types/Geo'
 import { Script } from '@_types/Scripting'
+import { DocValuesPropertyBase, OnScriptError } from './core'
 
 export class GeoPointProperty extends DocValuesPropertyBase {
   ignore_malformed?: boolean
diff --git a/specification/_types/mapping/meta-fields.ts b/specification/_types/mapping/meta-fields.ts
index 6fee1c9b2b..64f760f431 100644
--- a/specification/_types/mapping/meta-fields.ts
+++ b/specification/_types/mapping/meta-fields.ts
@@ -18,8 +18,8 @@
  */
 
 import { SingleKeyDictionary } from '@spec_utils/Dictionary'
-import { Property } from './Property'
 import { Field } from '@_types/common'
+import { Property } from './Property'
 
 export class FieldMapping {
   full_name: string
diff --git a/specification/_types/mapping/specialized.ts b/specification/_types/mapping/specialized.ts
index 77f952609a..f315850868 100644
--- a/specification/_types/mapping/specialized.ts
+++ b/specification/_types/mapping/specialized.ts
@@ -18,17 +18,17 @@
  */
 
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
-import { Field, Name } from '@_types/common'
-import { double, integer } from '@_types/Numeric'
-import { DocValuesPropertyBase, IndexOptions, OnScriptError } from './core'
-import { PropertyBase } from './Property'
-import { Script } from '@_types/Scripting'
 import {
   IcuCollationAlternate,
   IcuCollationCaseFirst,
   IcuCollationDecomposition,
   IcuCollationStrength
 } from '@_types/analysis/icu-plugin'
+import { Field, Name } from '@_types/common'
+import { double, integer } from '@_types/Numeric'
+import { Script } from '@_types/Scripting'
+import { DocValuesPropertyBase, IndexOptions, OnScriptError } from './core'
+import { PropertyBase } from './Property'
 
 export class CompletionProperty extends DocValuesPropertyBase {
   analyzer?: string
diff --git a/specification/_types/query_dsl/SparseVectorQuery.ts b/specification/_types/query_dsl/SparseVectorQuery.ts
index f4761008af..ea57fb6ccc 100644
--- a/specification/_types/query_dsl/SparseVectorQuery.ts
+++ b/specification/_types/query_dsl/SparseVectorQuery.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { Dictionary } from '@spec_utils/Dictionary'
 import { Field, Id } from '@_types/common'
-import { QueryBase } from './abstractions'
 import { float } from '@_types/Numeric'
-import { Dictionary } from '@spec_utils/Dictionary'
+import { QueryBase } from './abstractions'
 import { TokenPruningConfig } from './TokenPruningConfig'
 
 /**
diff --git a/specification/_types/query_dsl/TextExpansionQuery.ts b/specification/_types/query_dsl/TextExpansionQuery.ts
index c5de55bfcb..674ec9ba04 100644
--- a/specification/_types/query_dsl/TextExpansionQuery.ts
+++ b/specification/_types/query_dsl/TextExpansionQuery.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { TokenPruningConfig } from './TokenPruningConfig'
 import { QueryBase } from './abstractions'
+import { TokenPruningConfig } from './TokenPruningConfig'
 
 export class TextExpansionQuery extends QueryBase {
   /** The text expansion NLP model to use */
diff --git a/specification/_types/query_dsl/WeightedTokensQuery.ts b/specification/_types/query_dsl/WeightedTokensQuery.ts
index 31a073ad24..927780c6b3 100644
--- a/specification/_types/query_dsl/WeightedTokensQuery.ts
+++ b/specification/_types/query_dsl/WeightedTokensQuery.ts
@@ -17,12 +17,10 @@
  * under the License.
  */
 
-import { AdditionalProperty } from '@spec_utils/behaviors'
-import { TokenPruningConfig } from './TokenPruningConfig'
-import { QueryBase } from './abstractions'
-import { Field, FieldValue } from '@_types/common'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { float } from '@_types/Numeric'
+import { QueryBase } from './abstractions'
+import { TokenPruningConfig } from './TokenPruningConfig'
 
 export class WeightedTokensQuery extends QueryBase {
   /** The tokens representing this query */
diff --git a/specification/_types/query_dsl/abstractions.ts b/specification/_types/query_dsl/abstractions.ts
index 67f3b32122..713854c23b 100644
--- a/specification/_types/query_dsl/abstractions.ts
+++ b/specification/_types/query_dsl/abstractions.ts
@@ -25,6 +25,7 @@ import {
   MinimumShouldMatch,
   Routing
 } from '@_types/common'
+import { KnnQuery } from '@_types/Knn'
 import { float } from '@_types/Numeric'
 import {
   BoolQuery,
@@ -58,6 +59,7 @@ import {
 } from './joining'
 import { MatchAllQuery } from './MatchAllQuery'
 import { MatchNoneQuery } from './MatchNoneQuery'
+import { SemanticQuery } from './SemanticQuery'
 import {
   SpanContainingQuery,
   SpanFieldMaskingQuery,
@@ -69,6 +71,7 @@ import {
   SpanTermQuery,
   SpanWithinQuery
 } from './span'
+import { SparseVectorQuery } from './SparseVectorQuery'
 import {
   DistanceFeatureQuery,
   MoreLikeThisQuery,
@@ -95,9 +98,6 @@ import {
 } from './term'
 import { TextExpansionQuery } from './TextExpansionQuery'
 import { WeightedTokensQuery } from './WeightedTokensQuery'
-import { KnnQuery } from '@_types/Knn'
-import { SemanticQuery } from './SemanticQuery'
-import { SparseVectorQuery } from './SparseVectorQuery'
 
 /**
  * @variants container
diff --git a/specification/_types/query_dsl/compound.ts b/specification/_types/query_dsl/compound.ts
index 2bd27b9e81..9fcc8906aa 100644
--- a/specification/_types/query_dsl/compound.ts
+++ b/specification/_types/query_dsl/compound.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { AdditionalProperties, AdditionalProperty } from '@spec_utils/behaviors'
+import { AdditionalProperty } from '@spec_utils/behaviors'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Field, MinimumShouldMatch } from '@_types/common'
 import { Distance, GeoLocation } from '@_types/Geo'
-import { double, float, long } from '@_types/Numeric'
+import { double, long } from '@_types/Numeric'
 import { Script } from '@_types/Scripting'
 import { DateMath, Duration } from '@_types/Time'
 import { QueryBase, QueryContainer } from './abstractions'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 export class BoolQuery extends QueryBase {
   /**
diff --git a/specification/_types/query_dsl/fulltext.ts b/specification/_types/query_dsl/fulltext.ts
index 2bc86cb25b..eff60ea4c9 100644
--- a/specification/_types/query_dsl/fulltext.ts
+++ b/specification/_types/query_dsl/fulltext.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { PipeSeparatedFlags } from '@spec_utils/PipeSeparatedFlags'
 import {
   Field,
   Fields,
@@ -26,10 +27,9 @@ import {
 } from '@_types/common'
 import { double, float, integer } from '@_types/Numeric'
 import { Script } from '@_types/Scripting'
+import { TimeZone } from '@_types/Time'
 import { QueryBase } from './abstractions'
 import { Operator } from './Operator'
-import { TimeZone } from '@_types/Time'
-import { PipeSeparatedFlags } from '@spec_utils/PipeSeparatedFlags'
 
 /**
  * @shortcut_property query
diff --git a/specification/_types/query_dsl/geo.ts b/specification/_types/query_dsl/geo.ts
index 5adca586c4..941a48e0f9 100644
--- a/specification/_types/query_dsl/geo.ts
+++ b/specification/_types/query_dsl/geo.ts
@@ -18,6 +18,7 @@
  */
 
 import { AdditionalProperty } from '@spec_utils/behaviors'
+import { Field } from '@_types/common'
 import {
   Distance,
   GeoBounds,
@@ -27,7 +28,6 @@ import {
   GeoShapeRelation
 } from '@_types/Geo'
 import { FieldLookup, QueryBase } from './abstractions'
-import { Field } from '@_types/common'
 
 /**
  * @behavior_meta AdditionalProperty key=field value=bounding_box
diff --git a/specification/_types/query_dsl/span.ts b/specification/_types/query_dsl/span.ts
index 33349be8d8..38bc90dbbf 100644
--- a/specification/_types/query_dsl/span.ts
+++ b/specification/_types/query_dsl/span.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 import { Field } from '@_types/common'
 import { integer } from '@_types/Numeric'
 import { QueryBase, QueryContainer } from './abstractions'
-import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 
 export class SpanContainingQuery extends QueryBase {
   /**
diff --git a/specification/_types/query_dsl/specialized.ts b/specification/_types/query_dsl/specialized.ts
index 5d9997f5fd..8bcddda313 100644
--- a/specification/_types/query_dsl/specialized.ts
+++ b/specification/_types/query_dsl/specialized.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
+import { AdditionalProperty } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { StopWords } from '@_types/analysis/StopWords'
 import {
   Field,
-  Fields,
   Id,
   IndexName,
   MinimumShouldMatch,
@@ -31,11 +31,10 @@ import {
   VersionType
 } from '@_types/common'
 import { Distance, GeoLocation, GeoShape, GeoShapeRelation } from '@_types/Geo'
-import { double, float, integer, long } from '@_types/Numeric'
+import { double, float, integer } from '@_types/Numeric'
 import { Script } from '@_types/Scripting'
 import { DateMath, Duration } from '@_types/Time'
 import { FieldLookup, QueryBase, QueryContainer } from './abstractions'
-import { AdditionalProperty } from '@spec_utils/behaviors'
 
 export class DistanceFeatureQueryBase<TOrigin, TDistance> extends QueryBase {
   /**
diff --git a/specification/_types/query_dsl/term.ts b/specification/_types/query_dsl/term.ts
index 30367453c8..0860dda2f5 100644
--- a/specification/_types/query_dsl/term.ts
+++ b/specification/_types/query_dsl/term.ts
@@ -17,22 +17,22 @@
  * under the License.
  */
 
+import { AdditionalProperty } from '@spec_utils/behaviors'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import {
   Field,
+  FieldValue,
   Fuzziness,
   Id,
   Ids,
   IndexName,
   MultiTermQueryRewrite,
-  Routing,
-  FieldValue
+  Routing
 } from '@_types/common'
-import { double, float, integer, long } from '@_types/Numeric'
+import { double, integer } from '@_types/Numeric'
 import { Script } from '@_types/Scripting'
 import { DateFormat, DateMath, TimeZone } from '@_types/Time'
 import { QueryBase } from './abstractions'
-import { AdditionalProperty } from '@spec_utils/behaviors'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 export class ExistsQuery extends QueryBase {
   /**
diff --git a/specification/_types/sort.ts b/specification/_types/sort.ts
index 2cff4948a6..40e3f801aa 100644
--- a/specification/_types/sort.ts
+++ b/specification/_types/sort.ts
@@ -18,12 +18,11 @@
  */
 
 import { AdditionalProperty } from '@spec_utils/behaviors'
-import { Dictionary } from '@spec_utils/Dictionary'
 import { Missing } from '@_types/aggregations/AggregationContainer'
 import { Field, FieldValue } from '@_types/common'
 import { DistanceUnit, GeoDistanceType, GeoLocation } from '@_types/Geo'
 import { FieldType } from '@_types/mapping/Property'
-import { double, integer, long } from '@_types/Numeric'
+import { integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { Script } from '@_types/Scripting'
 
diff --git a/specification/async_search/submit/AsyncSearchSubmitRequest.ts b/specification/async_search/submit/AsyncSearchSubmitRequest.ts
index c8b6051fe0..c2a059fa4f 100644
--- a/specification/async_search/submit/AsyncSearchSubmitRequest.ts
+++ b/specification/async_search/submit/AsyncSearchSubmitRequest.ts
@@ -17,7 +17,18 @@
  * under the License.
  */
 
+import { FieldCollapse } from '@global/search/_types/FieldCollapse'
+import { Highlight } from '@global/search/_types/highlighting'
+import { TrackHits } from '@global/search/_types/hits'
+import { PointInTimeReference } from '@global/search/_types/PointInTimeReference'
+import { Rescore } from '@global/search/_types/rescoring'
+import {
+  SourceConfig,
+  SourceConfigParam
+} from '@global/search/_types/SourceFilter'
+import { Suggester } from '@global/search/_types/suggester'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
 import { RequestBase } from '@_types/Base'
 import {
@@ -31,26 +42,15 @@ import {
   SuggestMode,
   VersionString
 } from '@_types/common'
+import { KnnSearch } from '@_types/Knn'
 import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { double, integer, long } from '@_types/Numeric'
 import { FieldAndFormat, QueryContainer } from '@_types/query_dsl/abstractions'
+import { Operator } from '@_types/query_dsl/Operator'
 import { ScriptField } from '@_types/Scripting'
 import { SlicedScroll } from '@_types/SlicedScroll'
-import { Duration } from '@_types/Time'
-import { FieldCollapse } from '@global/search/_types/FieldCollapse'
-import { Highlight } from '@global/search/_types/highlighting'
-import { PointInTimeReference } from '@global/search/_types/PointInTimeReference'
-import { Rescore } from '@global/search/_types/rescoring'
 import { Sort, SortResults } from '@_types/sort'
-import {
-  SourceConfigParam,
-  SourceConfig
-} from '@global/search/_types/SourceFilter'
-import { Suggester } from '@global/search/_types/suggester'
-import { TrackHits } from '@global/search/_types/hits'
-import { Operator } from '@_types/query_dsl/Operator'
-import { KnnSearch } from '@_types/Knn'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { Duration } from '@_types/Time'
 
 /**
  * Runs a search request asynchronously.
diff --git a/specification/autoscaling/get_autoscaling_capacity/GetAutoscalingCapacityResponse.ts b/specification/autoscaling/get_autoscaling_capacity/GetAutoscalingCapacityResponse.ts
index e4a8b5034e..3fbf34f552 100644
--- a/specification/autoscaling/get_autoscaling_capacity/GetAutoscalingCapacityResponse.ts
+++ b/specification/autoscaling/get_autoscaling_capacity/GetAutoscalingCapacityResponse.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { integer } from '@_types/Numeric'
 import { Dictionary } from '@spec_utils/Dictionary'
-import { NodeName } from '@_types/common'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { NodeName } from '@_types/common'
+import { integer } from '@_types/Numeric'
 
 export class Response {
   body: {
diff --git a/specification/autoscaling/put_autoscaling_policy/PutAutoscalingPolicyRequest.ts b/specification/autoscaling/put_autoscaling_policy/PutAutoscalingPolicyRequest.ts
index 42686b69f7..6cfd9fe0cb 100644
--- a/specification/autoscaling/put_autoscaling_policy/PutAutoscalingPolicyRequest.ts
+++ b/specification/autoscaling/put_autoscaling_policy/PutAutoscalingPolicyRequest.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { RequestBase } from '@_types/Base'
 import { AutoscalingPolicy } from '@autoscaling/_types/AutoscalingPolicy'
+import { RequestBase } from '@_types/Base'
 import { Name } from '@_types/common'
 
 /**
diff --git a/specification/cat/count/types.ts b/specification/cat/count/types.ts
index 744273a079..6d281e2fa9 100644
--- a/specification/cat/count/types.ts
+++ b/specification/cat/count/types.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { DateTime, EpochTime, TimeOfDay, UnitSeconds } from '@_types/Time'
 import { Stringified } from '@spec_utils/Stringified'
+import { EpochTime, TimeOfDay, UnitSeconds } from '@_types/Time'
 
 export class CountRecord {
   /**
diff --git a/specification/cat/health/types.ts b/specification/cat/health/types.ts
index 7d867ea5e0..344f15c469 100644
--- a/specification/cat/health/types.ts
+++ b/specification/cat/health/types.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { EpochTime, TimeOfDay, UnitSeconds } from '@_types/Time'
 import { Stringified } from '@spec_utils/Stringified'
+import { EpochTime, TimeOfDay, UnitSeconds } from '@_types/Time'
 
 export class HealthRecord {
   /**
diff --git a/specification/cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts b/specification/cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts
index 2ac8d1bfcb..a9a3de63e4 100644
--- a/specification/cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts
+++ b/specification/cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { CatRequestBase, CatDfaColumns } from '@cat/_types/CatBase'
+import { CatDfaColumns, CatRequestBase } from '@cat/_types/CatBase'
 import { Bytes, Id } from '@_types/common'
 import { Duration } from '@_types/Time'
 
diff --git a/specification/cat/ml_datafeeds/CatDatafeedsRequest.ts b/specification/cat/ml_datafeeds/CatDatafeedsRequest.ts
index 738b6868cb..9527bac259 100644
--- a/specification/cat/ml_datafeeds/CatDatafeedsRequest.ts
+++ b/specification/cat/ml_datafeeds/CatDatafeedsRequest.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { CatRequestBase, CatDatafeedColumns } from '@cat/_types/CatBase'
+import { CatDatafeedColumns, CatRequestBase } from '@cat/_types/CatBase'
 import { Id } from '@_types/common'
 import { TimeUnit } from '@_types/Time'
 
diff --git a/specification/cat/ml_jobs/CatJobsRequest.ts b/specification/cat/ml_jobs/CatJobsRequest.ts
index 5d15571bbe..f18f5f9d02 100644
--- a/specification/cat/ml_jobs/CatJobsRequest.ts
+++ b/specification/cat/ml_jobs/CatJobsRequest.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { CatRequestBase, CatAnonalyDetectorColumns } from '@cat/_types/CatBase'
+import { CatAnonalyDetectorColumns, CatRequestBase } from '@cat/_types/CatBase'
 import { Bytes, Id } from '@_types/common'
 import { TimeUnit } from '@_types/Time'
 
diff --git a/specification/cat/recovery/types.ts b/specification/cat/recovery/types.ts
index 2d80ccb44e..cad87001ca 100644
--- a/specification/cat/recovery/types.ts
+++ b/specification/cat/recovery/types.ts
@@ -18,7 +18,7 @@
  */
 
 import { IndexName } from '@_types/common'
-import { long, Percentage } from '@_types/Numeric'
+import { Percentage } from '@_types/Numeric'
 import { DateTime, Duration, EpochTime, UnitMillis } from '@_types/Time'
 
 export class RecoveryRecord {
diff --git a/specification/cat/snapshots/types.ts b/specification/cat/snapshots/types.ts
index 9b2a6c3064..55a92c3f07 100644
--- a/specification/cat/snapshots/types.ts
+++ b/specification/cat/snapshots/types.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { TimeOfDay, Duration, UnitSeconds, EpochTime } from '@_types/Time'
-import { ScheduleTimeOfDay } from '@watcher/_types/Schedule'
 import { Stringified } from '@spec_utils/Stringified'
+import { ScheduleTimeOfDay } from '@watcher/_types/Schedule'
+import { Duration, EpochTime, TimeOfDay, UnitSeconds } from '@_types/Time'
 
 export class SnapshotsRecord {
   /**
diff --git a/specification/cat/tasks/CatTasksRequest.ts b/specification/cat/tasks/CatTasksRequest.ts
index 22a61bfdcf..e583d4029b 100644
--- a/specification/cat/tasks/CatTasksRequest.ts
+++ b/specification/cat/tasks/CatTasksRequest.ts
@@ -18,7 +18,6 @@
  */
 
 import { CatRequestBase } from '@cat/_types/CatBase'
-import { long } from '@_types/Numeric'
 
 /**
  * Returns information about tasks currently executing in the cluster.
diff --git a/specification/cat/transforms/CatTransformsRequest.ts b/specification/cat/transforms/CatTransformsRequest.ts
index 6cf7b80e5c..59927c8189 100644
--- a/specification/cat/transforms/CatTransformsRequest.ts
+++ b/specification/cat/transforms/CatTransformsRequest.ts
@@ -20,7 +20,7 @@
 import { CatRequestBase, CatTransformColumns } from '@cat/_types/CatBase'
 import { Id } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import { Duration, TimeUnit } from '@_types/Time'
+import { TimeUnit } from '@_types/Time'
 
 /**
  * Get transforms.
diff --git a/specification/ccr/_types/FollowIndexStats.ts b/specification/ccr/_types/FollowIndexStats.ts
index 0386eb8bc3..d923c23a84 100644
--- a/specification/ccr/_types/FollowIndexStats.ts
+++ b/specification/ccr/_types/FollowIndexStats.ts
@@ -19,9 +19,9 @@
 
 import {
   ByteSize,
+  IndexName,
   SequenceNumber,
-  VersionNumber,
-  IndexName
+  VersionNumber
 } from '@_types/common'
 import { ErrorCause } from '@_types/Errors'
 import { integer, long } from '@_types/Numeric'
diff --git a/specification/ccr/follow_info/types.ts b/specification/ccr/follow_info/types.ts
index 92fbe40f01..46b3824a0a 100644
--- a/specification/ccr/follow_info/types.ts
+++ b/specification/ccr/follow_info/types.ts
@@ -18,6 +18,8 @@
  */
 
 import { IndexName, Name } from '@_types/common'
+import { integer } from '@_types/Numeric'
+import { Duration } from '@_types/Time'
 
 export class FollowerIndex {
   follower_index: IndexName
@@ -32,9 +34,6 @@ export enum FollowerIndexStatus {
   paused
 }
 
-import { integer } from '@_types/Numeric'
-import { Duration } from '@_types/Time'
-
 export class FollowerIndexParameters {
   max_outstanding_read_requests: integer
   max_outstanding_write_requests: integer
diff --git a/specification/ccr/stats/types.ts.ts b/specification/ccr/stats/types.ts.ts
index a18e503ab9..9522232c4a 100644
--- a/specification/ccr/stats/types.ts.ts
+++ b/specification/ccr/stats/types.ts.ts
@@ -18,11 +18,10 @@
  */
 
 import { FollowIndexStats } from '@ccr/_types/FollowIndexStats'
+import { Name, VersionNumber } from '@_types/common'
 import { ErrorCause } from '@_types/Errors'
 import { long } from '@_types/Numeric'
-
-import { Name, VersionNumber } from '@_types/common'
-import { DateTime, DurationValue, UnitMillis } from '@_types/Time'
+import { DurationValue, UnitMillis } from '@_types/Time'
 
 export class AutoFollowedCluster {
   cluster_name: Name
diff --git a/specification/cluster/_types/ComponentTemplate.ts b/specification/cluster/_types/ComponentTemplate.ts
index 2370c4f1b1..0def797bc4 100644
--- a/specification/cluster/_types/ComponentTemplate.ts
+++ b/specification/cluster/_types/ComponentTemplate.ts
@@ -18,14 +18,11 @@
  */
 
 import { AliasDefinition } from '@indices/_types/AliasDefinition'
+import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
 import { IndexSettings } from '@indices/_types/IndexSettings'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { IndexName, Metadata, Name, VersionNumber } from '@_types/common'
 import { TypeMapping } from '@_types/mapping/TypeMapping'
-import {
-  DataStreamLifecycle,
-  DataStreamLifecycleWithRollover
-} from '@indices/_types/DataStreamLifecycle'
 
 export class ComponentTemplate {
   name: Name
diff --git a/specification/cluster/allocation_explain/ClusterAllocationExplainResponse.ts b/specification/cluster/allocation_explain/ClusterAllocationExplainResponse.ts
index f9ff0bc702..b8a01e4683 100644
--- a/specification/cluster/allocation_explain/ClusterAllocationExplainResponse.ts
+++ b/specification/cluster/allocation_explain/ClusterAllocationExplainResponse.ts
@@ -18,16 +18,16 @@
  */
 
 import { IndexName } from '@_types/common'
-import { integer, long } from '@_types/Numeric'
+import { integer } from '@_types/Numeric'
+import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 import {
-  Decision,
   AllocationDecision,
   ClusterInfo,
   CurrentNode,
+  Decision,
   NodeAllocationExplanation,
   UnassignedInformation
 } from './types'
-import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 
 export class Response {
   body: {
diff --git a/specification/cluster/allocation_explain/types.ts b/specification/cluster/allocation_explain/types.ts
index a0978da920..fd8ad8aca6 100644
--- a/specification/cluster/allocation_explain/types.ts
+++ b/specification/cluster/allocation_explain/types.ts
@@ -18,9 +18,9 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { Name, Id } from '@_types/common'
+import { Id, Name } from '@_types/common'
 import { TransportAddress } from '@_types/Networking'
-import { long, double, integer } from '@_types/Numeric'
+import { double, integer, long } from '@_types/Numeric'
 import { DateTime } from '@_types/Time'
 
 export class AllocationDecision {
diff --git a/specification/cluster/health/ClusterHealthResponse.ts b/specification/cluster/health/ClusterHealthResponse.ts
index 80de0b8eab..252898f39c 100644
--- a/specification/cluster/health/ClusterHealthResponse.ts
+++ b/specification/cluster/health/ClusterHealthResponse.ts
@@ -19,7 +19,7 @@
 
 import { Dictionary } from '@spec_utils/Dictionary'
 import { HealthStatus, IndexName, Name } from '@_types/common'
-import { double, integer, Percentage } from '@_types/Numeric'
+import { integer, Percentage } from '@_types/Numeric'
 import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 import { IndexHealthStats } from './types'
 
diff --git a/specification/cluster/info/ClusterInfoResponse.ts b/specification/cluster/info/ClusterInfoResponse.ts
index 357b763dd8..737947001a 100644
--- a/specification/cluster/info/ClusterInfoResponse.ts
+++ b/specification/cluster/info/ClusterInfoResponse.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { Name } from '@_types/common'
 import { Http, Ingest, Scripting, ThreadCount } from '@nodes/_types/Stats'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { Name } from '@_types/common'
 
 // The cluster info response can be filtered by target. Every property needs to
 // be optional to be compliant with the API behaviour
diff --git a/specification/cluster/pending_tasks/types.ts b/specification/cluster/pending_tasks/types.ts
index 2f103f3855..05ec06239e 100644
--- a/specification/cluster/pending_tasks/types.ts
+++ b/specification/cluster/pending_tasks/types.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { integer, long } from '@_types/Numeric'
-import { DateTime, Duration, DurationValue, UnitMillis } from '@_types/Time'
+import { integer } from '@_types/Numeric'
+import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 
 export class PendingTask {
   /** Indicates whether the pending tasks are currently executing or not. */
diff --git a/specification/cluster/remote_info/ClusterRemoteInfoRequest.ts b/specification/cluster/remote_info/ClusterRemoteInfoRequest.ts
index 749b0037b6..a81800ec0b 100644
--- a/specification/cluster/remote_info/ClusterRemoteInfoRequest.ts
+++ b/specification/cluster/remote_info/ClusterRemoteInfoRequest.ts
@@ -18,7 +18,6 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { Void } from '@spec_utils/VoidValue'
 
 /**
  * The cluster remote info API allows you to retrieve all of the configured
diff --git a/specification/cluster/stats/types.ts b/specification/cluster/stats/types.ts
index 18a14feb63..3e97a8e45f 100644
--- a/specification/cluster/stats/types.ts
+++ b/specification/cluster/stats/types.ts
@@ -24,10 +24,10 @@ import {
   CompletionStats,
   DocStats,
   FielddataStats,
+  PluginStats,
   QueryCacheStats,
   SegmentsStats,
-  StoreStats,
-  PluginStats
+  StoreStats
 } from '@_types/Stats'
 import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 
diff --git a/specification/connector/_types/Connector.ts b/specification/connector/_types/Connector.ts
index eb1702583a..6bc7cffa65 100644
--- a/specification/connector/_types/Connector.ts
+++ b/specification/connector/_types/Connector.ts
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Field, Id, IndexName, ScalarValue } from '@_types/common'
 import { double, integer, long } from '@_types/Numeric'
 import { DateTime } from '@_types/Time'
-import { Dictionary } from '@spec_utils/Dictionary'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 interface SelectOption {
   label: string
diff --git a/specification/connector/_types/SyncJob.ts b/specification/connector/_types/SyncJob.ts
index 2f8136e042..673823170f 100644
--- a/specification/connector/_types/SyncJob.ts
+++ b/specification/connector/_types/SyncJob.ts
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Id } from '@_types/common'
 import { long } from '@_types/Numeric'
 import { DateTime } from '@_types/Time'
-import { Dictionary } from '@spec_utils/Dictionary'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import {
   ConnectorConfiguration,
   FilteringRules,
diff --git a/specification/connector/last_sync/ConnectorUpdateLastSyncRequest.ts b/specification/connector/last_sync/ConnectorUpdateLastSyncRequest.ts
index 75a4a66d46..d243b5770e 100644
--- a/specification/connector/last_sync/ConnectorUpdateLastSyncRequest.ts
+++ b/specification/connector/last_sync/ConnectorUpdateLastSyncRequest.ts
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { long } from '@_types/Numeric'
 import { DateTime } from '@_types/Time'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { SyncStatus } from '../_types/Connector'
 
 /**
diff --git a/specification/connector/list/ConnectorListRequest.ts b/specification/connector/list/ConnectorListRequest.ts
index 8278198107..ea44fe6e11 100644
--- a/specification/connector/list/ConnectorListRequest.ts
+++ b/specification/connector/list/ConnectorListRequest.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { RequestBase } from '@_types/Base'
-import { Names, Indices } from '@_types/common'
+import { Indices, Names } from '@_types/common'
 import { integer } from '@_types/Numeric'
 
 /**
diff --git a/specification/connector/post/ConnectorPostResponse.ts b/specification/connector/post/ConnectorPostResponse.ts
index d21635c3b7..3e4e523bd4 100644
--- a/specification/connector/post/ConnectorPostResponse.ts
+++ b/specification/connector/post/ConnectorPostResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Result } from '@_types/Result'
 import { Id } from '@_types/common'
+import { Result } from '@_types/Result'
 
 export class Response {
   body: {
diff --git a/specification/connector/put/ConnectorPutResponse.ts b/specification/connector/put/ConnectorPutResponse.ts
index d21635c3b7..3e4e523bd4 100644
--- a/specification/connector/put/ConnectorPutResponse.ts
+++ b/specification/connector/put/ConnectorPutResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Result } from '@_types/Result'
 import { Id } from '@_types/common'
+import { Result } from '@_types/Result'
 
 export class Response {
   body: {
diff --git a/specification/connector/sync_job_list/SyncJobListRequest.ts b/specification/connector/sync_job_list/SyncJobListRequest.ts
index 33ec16cdc9..ab2637233e 100644
--- a/specification/connector/sync_job_list/SyncJobListRequest.ts
+++ b/specification/connector/sync_job_list/SyncJobListRequest.ts
@@ -19,8 +19,8 @@
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import { SyncJobType } from '../_types/SyncJob'
 import { SyncStatus } from '../_types/Connector'
+import { SyncJobType } from '../_types/SyncJob'
 
 /**
  * Lists connector sync jobs.
diff --git a/specification/connector/sync_job_post/SyncJobPostRequest.ts b/specification/connector/sync_job_post/SyncJobPostRequest.ts
index f0d6ee1b09..be386dbbb0 100644
--- a/specification/connector/sync_job_post/SyncJobPostRequest.ts
+++ b/specification/connector/sync_job_post/SyncJobPostRequest.ts
@@ -18,7 +18,7 @@
  */
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { SyncJobType, SyncJobTriggerMethod } from '../_types/SyncJob'
+import { SyncJobTriggerMethod, SyncJobType } from '../_types/SyncJob'
 
 /**
  * Creates a connector sync job.
diff --git a/specification/connector/update_configuration/ConnectorUpdateConfigurationRequest.ts b/specification/connector/update_configuration/ConnectorUpdateConfigurationRequest.ts
index fffc94f383..06a2febc8f 100644
--- a/specification/connector/update_configuration/ConnectorUpdateConfigurationRequest.ts
+++ b/specification/connector/update_configuration/ConnectorUpdateConfigurationRequest.ts
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { ConnectorConfiguration } from '../_types/Connector'
-import { Dictionary } from '@spec_utils/Dictionary'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 /**
  * Updates the configuration field in the connector document
diff --git a/specification/connector/update_error/ConnectorUpdateErrorRequest.ts b/specification/connector/update_error/ConnectorUpdateErrorRequest.ts
index 623a59cac9..a7b81e52ea 100644
--- a/specification/connector/update_error/ConnectorUpdateErrorRequest.ts
+++ b/specification/connector/update_error/ConnectorUpdateErrorRequest.ts
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { WithNullValue } from '@spec_utils/utils'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { WithNullValue } from '@spec_utils/utils'
 
 /**
  * Updates the filtering field in the connector document
diff --git a/specification/connector/update_index_name/ConnectorUpdateIndexNameRequest.ts b/specification/connector/update_index_name/ConnectorUpdateIndexNameRequest.ts
index 3eb69da312..74dc1ca0bf 100644
--- a/specification/connector/update_index_name/ConnectorUpdateIndexNameRequest.ts
+++ b/specification/connector/update_index_name/ConnectorUpdateIndexNameRequest.ts
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { WithNullValue } from '@spec_utils/utils'
 import { RequestBase } from '@_types/Base'
 import { Id, IndexName } from '@_types/common'
-import { WithNullValue } from '@spec_utils/utils'
 
 /**
  * Updates the index_name in the connector document
diff --git a/specification/enrich/_types/Policy.ts b/specification/enrich/_types/Policy.ts
index 7c41c7a907..abecff2412 100644
--- a/specification/enrich/_types/Policy.ts
+++ b/specification/enrich/_types/Policy.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 import { Field, Fields, Indices, Name } from '@_types/common'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
-import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 
 export class Summary {
   config: SingleKeyDictionary<PolicyType, Policy>
diff --git a/specification/enrich/stats/EnrichStatsResponse.ts b/specification/enrich/stats/EnrichStatsResponse.ts
index 3a37f33f47..ecf6ef04fb 100644
--- a/specification/enrich/stats/EnrichStatsResponse.ts
+++ b/specification/enrich/stats/EnrichStatsResponse.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ExecutingPolicy, CoordinatorStats, CacheStats } from './types'
+import { CacheStats, CoordinatorStats, ExecutingPolicy } from './types'
 
 export class Response {
   body: {
diff --git a/specification/eql/_types/EqlSearchResponseBase.ts b/specification/eql/_types/EqlSearchResponseBase.ts
index b28e603966..f296ffd6bf 100644
--- a/specification/eql/_types/EqlSearchResponseBase.ts
+++ b/specification/eql/_types/EqlSearchResponseBase.ts
@@ -18,9 +18,8 @@
  */
 
 import { Id } from '@_types/common'
-import { integer, long } from '@_types/Numeric'
-import { EqlHits } from './EqlHits'
 import { DurationValue, UnitMillis } from '@_types/Time'
+import { EqlHits } from './EqlHits'
 
 export class EqlSearchResponseBase<TEvent> {
   /**
diff --git a/specification/eql/search/EqlSearchRequest.ts b/specification/eql/search/EqlSearchRequest.ts
index c39b252a05..99d661d673 100644
--- a/specification/eql/search/EqlSearchRequest.ts
+++ b/specification/eql/search/EqlSearchRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { ExpandWildcards, Field, IndexName, Indices } from '@_types/common'
+import { ExpandWildcards, Field, Indices } from '@_types/common'
 import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { uint } from '@_types/Numeric'
 import { FieldAndFormat, QueryContainer } from '@_types/query_dsl/abstractions'
diff --git a/specification/esql/_types/Pragmas.ts b/specification/esql/_types/Pragmas.ts
index 6ddd71b047..9bd608297f 100644
--- a/specification/esql/_types/Pragmas.ts
+++ b/specification/esql/_types/Pragmas.ts
@@ -17,9 +17,6 @@
  * under the License.
  */
 
-import { integer } from '@_types/Numeric'
-import { Duration } from '@_types/Time'
-
 export enum DataPartitioning {
   SHARD,
   SEGMENT,
diff --git a/specification/esql/query/QueryRequest.ts b/specification/esql/query/QueryRequest.ts
index 8f73012632..9494fcfc09 100644
--- a/specification/esql/query/QueryRequest.ts
+++ b/specification/esql/query/QueryRequest.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
+import { TableValuesContainer } from '@esql/_types/TableValuesContainer'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { RequestBase } from '@_types/Base'
-import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { FieldValue } from '@_types/common'
-import { TableValuesContainer } from '@esql/_types/TableValuesContainer'
+import { QueryContainer } from '@_types/query_dsl/abstractions'
 
 /**
  * Executes an ES|QL request
diff --git a/specification/fleet/global_checkpoints/GlobalCheckpointsRequest.ts b/specification/fleet/global_checkpoints/GlobalCheckpointsRequest.ts
index 4683e98ce0..a2128b1892 100644
--- a/specification/fleet/global_checkpoints/GlobalCheckpointsRequest.ts
+++ b/specification/fleet/global_checkpoints/GlobalCheckpointsRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { IndexName, IndexAlias } from '@_types/common'
+import { IndexAlias, IndexName } from '@_types/common'
 import { Duration } from '@_types/Time'
 import { Checkpoint } from '../_types/Checkpoints'
 
diff --git a/specification/fleet/msearch/MultiSearchRequest.ts b/specification/fleet/msearch/MultiSearchRequest.ts
index 759da03855..188da0e43f 100644
--- a/specification/fleet/msearch/MultiSearchRequest.ts
+++ b/specification/fleet/msearch/MultiSearchRequest.ts
@@ -20,13 +20,12 @@
 import { RequestItem } from '@global/msearch/types'
 import { RequestBase } from '@_types/Base'
 import {
-  IndexName,
-  IndexAlias,
   ExpandWildcards,
+  IndexAlias,
+  IndexName,
   SearchType
 } from '@_types/common'
 import { long } from '@_types/Numeric'
-import { Duration } from '@_types/Time'
 import { Checkpoint } from '../_types/Checkpoints'
 
 /**
diff --git a/specification/fleet/search/SearchRequest.ts b/specification/fleet/search/SearchRequest.ts
index efb8ad0cac..cbdb4c3071 100644
--- a/specification/fleet/search/SearchRequest.ts
+++ b/specification/fleet/search/SearchRequest.ts
@@ -28,18 +28,19 @@ import {
 } from '@global/search/_types/SourceFilter'
 import { Suggester } from '@global/search/_types/suggester'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
 import { RequestBase } from '@_types/Base'
 import {
-  IndexName,
-  IndexAlias,
-  Fields,
   ExpandWildcards,
-  VersionString,
+  Field,
+  Fields,
+  IndexAlias,
+  IndexName,
   Routing,
   SearchType,
-  Field,
-  SuggestMode
+  SuggestMode,
+  VersionString
 } from '@_types/common'
 import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { double, integer, long } from '@_types/Numeric'
@@ -50,7 +51,6 @@ import { SlicedScroll } from '@_types/SlicedScroll'
 import { Sort, SortResults } from '@_types/sort'
 import { Duration } from '@_types/Time'
 import { Checkpoint } from '../_types/Checkpoints'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 /**
  * The purpose of the fleet search api is to provide a search api where the search will only be executed
diff --git a/specification/graph/explore/GraphExploreRequest.ts b/specification/graph/explore/GraphExploreRequest.ts
index 6971ab33f1..c3c4393c73 100644
--- a/specification/graph/explore/GraphExploreRequest.ts
+++ b/specification/graph/explore/GraphExploreRequest.ts
@@ -17,13 +17,13 @@
  * under the License.
  */
 
+import { VertexDefinition } from '@graph/_types/Vertex'
 import { RequestBase } from '@_types/Base'
 import { Indices, Routing } from '@_types/common'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { Duration } from '@_types/Time'
 import { ExploreControls } from '../_types/ExploreControls'
 import { Hop } from '../_types/Hop'
-import { VertexDefinition } from '@graph/_types/Vertex'
 
 /**
  * Extracts and summarizes information about the documents and terms in an Elasticsearch data stream or index.
diff --git a/specification/ilm/_types/Phase.ts b/specification/ilm/_types/Phase.ts
index 5de1676c69..397a64d24d 100644
--- a/specification/ilm/_types/Phase.ts
+++ b/specification/ilm/_types/Phase.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { Duration, DurationLarge } from '@_types/Time'
 import { RolloverConditions } from '@indices/rollover/types'
-import { integer, long } from '@_types/Numeric'
-import { ByteSize, EmptyObject } from '@_types/common'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { ByteSize, EmptyObject } from '@_types/common'
+import { integer, long } from '@_types/Numeric'
+import { Duration, DurationLarge } from '@_types/Time'
 
 export class Phase {
   actions?: Actions
diff --git a/specification/ilm/_types/Policy.ts b/specification/ilm/_types/Policy.ts
index c98d057860..b3a000fddb 100644
--- a/specification/ilm/_types/Policy.ts
+++ b/specification/ilm/_types/Policy.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Metadata, Name } from '@_types/common'
+import { Metadata } from '@_types/common'
 import { Phases } from './Phase'
 
 export class Policy {
diff --git a/specification/indices/_types/DataStream.ts b/specification/indices/_types/DataStream.ts
index a9ac73b964..73c47d95c6 100644
--- a/specification/indices/_types/DataStream.ts
+++ b/specification/indices/_types/DataStream.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
 import {
   DataStreamName,
   Field,
@@ -27,7 +28,6 @@ import {
   Uuid
 } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
 
 enum ManagedBy {
   ilm = 'Index Lifecycle Management',
diff --git a/specification/indices/_types/DataStreamLifecycle.ts b/specification/indices/_types/DataStreamLifecycle.ts
index c628b1fc17..0c2f9783a2 100644
--- a/specification/indices/_types/DataStreamLifecycle.ts
+++ b/specification/indices/_types/DataStreamLifecycle.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { Duration } from '@_types/Time'
-import { long } from '@_types/Numeric'
-import { ByteSize } from '@_types/common'
 import { DataStreamLifecycleDownsampling } from '@indices/_types/DataStreamLifecycleDownsampling'
+import { ByteSize } from '@_types/common'
+import { long } from '@_types/Numeric'
+import { Duration } from '@_types/Time'
 
 /**
  * Data stream lifecycle denotes that a data stream is managed by the data stream lifecycle and contains the configuration.
diff --git a/specification/indices/_types/DownsamplingRound.ts b/specification/indices/_types/DownsamplingRound.ts
index 71cb430c4d..a5b26d55c8 100644
--- a/specification/indices/_types/DownsamplingRound.ts
+++ b/specification/indices/_types/DownsamplingRound.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Duration } from '@_types/Time'
 import { DownsampleConfig } from '@indices/_types/Downsample'
+import { Duration } from '@_types/Time'
 
 export class DownsamplingRound {
   /**
diff --git a/specification/indices/_types/IndexSettings.ts b/specification/indices/_types/IndexSettings.ts
index 5cc0c2cfd6..136cf5a4f1 100644
--- a/specification/indices/_types/IndexSettings.ts
+++ b/specification/indices/_types/IndexSettings.ts
@@ -18,11 +18,15 @@
  */
 
 import { IndexRouting } from '@indices/_types/IndexRouting'
+import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { Stringified } from '@spec_utils/Stringified'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Analyzer } from '@_types/analysis/analyzers'
-import { TokenFilter } from '@_types/analysis/token_filters'
 import { CharFilter } from '@_types/analysis/char_filters'
 import { Normalizer } from '@_types/analysis/normalizers'
+import { Tokenizer } from '@_types/analysis/tokenizers'
+import { TokenFilter } from '@_types/analysis/token_filters'
 import {
   ByteSize,
   Name,
@@ -31,9 +35,7 @@ import {
   VersionString
 } from '@_types/common'
 import { double, integer, long } from '@_types/Numeric'
-import { DateTime, Duration, EpochTime, UnitMillis } from '@_types/Time'
-import { Tokenizer } from '@_types/analysis/tokenizers'
-import { IndexSegmentSort } from './IndexSegmentSort'
+import { Script } from '@_types/Scripting'
 import {
   DFIIndependenceMeasure,
   DFRAfterEffect,
@@ -42,10 +44,8 @@ import {
   IBLambda,
   Normalization
 } from '@_types/Similarity'
-import { Script } from '@_types/Scripting'
-import { Stringified } from '@spec_utils/Stringified'
-import { AdditionalProperties } from '@spec_utils/behaviors'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { DateTime, Duration, EpochTime, UnitMillis } from '@_types/Time'
+import { IndexSegmentSort } from './IndexSegmentSort'
 
 export class SoftDeletes {
   /**
diff --git a/specification/indices/_types/IndexState.ts b/specification/indices/_types/IndexState.ts
index 27b11a58e3..0bbd83f9b0 100644
--- a/specification/indices/_types/IndexState.ts
+++ b/specification/indices/_types/IndexState.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
+import { DataStreamLifecycle } from '@indices/_types/DataStreamLifecycle'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { DataStreamName, IndexName } from '@_types/common'
 import { TypeMapping } from '@_types/mapping/TypeMapping'
 import { Alias } from './Alias'
 import { IndexSettings } from './IndexSettings'
-import { DataStreamLifecycle } from '@indices/_types/DataStreamLifecycle'
 
 export class IndexState {
   aliases?: Dictionary<IndexName, Alias>
diff --git a/specification/indices/_types/IndexTemplate.ts b/specification/indices/_types/IndexTemplate.ts
index 314e2930c0..3d759530be 100644
--- a/specification/indices/_types/IndexTemplate.ts
+++ b/specification/indices/_types/IndexTemplate.ts
@@ -17,16 +17,13 @@
  * under the License.
  */
 
+import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { IndexName, Metadata, Name, Names, VersionNumber } from '@_types/common'
 import { TypeMapping } from '@_types/mapping/TypeMapping'
 import { long } from '@_types/Numeric'
 import { Alias } from './Alias'
 import { IndexSettings } from './IndexSettings'
-import {
-  DataStreamLifecycle,
-  DataStreamLifecycleWithRollover
-} from '@indices/_types/DataStreamLifecycle'
 
 export class IndexTemplate {
   /**
diff --git a/specification/indices/_types/IndicesRecoverySettings.ts b/specification/indices/_types/IndicesRecoverySettings.ts
index a81f8f8c4c..162466fdec 100644
--- a/specification/indices/_types/IndicesRecoverySettings.ts
+++ b/specification/indices/_types/IndicesRecoverySettings.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { integer } from '@_types/Numeric'
 import { ByteSize } from '@_types/common'
+import { integer } from '@_types/Numeric'
 
 export class IndicesRecoverySettings {
   compress: boolean
diff --git a/specification/indices/analyze/types.ts b/specification/indices/analyze/types.ts
index 842cdb2739..cf0efc1223 100644
--- a/specification/indices/analyze/types.ts
+++ b/specification/indices/analyze/types.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { long } from '@_types/Numeric'
 import { AdditionalProperties } from '@spec_utils/behaviors'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { long } from '@_types/Numeric'
 
 export class AnalyzeDetail {
   analyzer?: AnalyzerDetail
diff --git a/specification/indices/delete_data_lifecycle/IndicesDeleteDataLifecycleRequest.ts b/specification/indices/delete_data_lifecycle/IndicesDeleteDataLifecycleRequest.ts
index e0cd749755..5ad6922432 100644
--- a/specification/indices/delete_data_lifecycle/IndicesDeleteDataLifecycleRequest.ts
+++ b/specification/indices/delete_data_lifecycle/IndicesDeleteDataLifecycleRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { ExpandWildcards, DataStreamNames } from '@_types/common'
+import { DataStreamNames, ExpandWildcards } from '@_types/common'
 import { Duration } from '@_types/Time'
 
 /**
diff --git a/specification/indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts b/specification/indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts
index af4af1dd1d..aeaf579adc 100644
--- a/specification/indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts
+++ b/specification/indices/delete_data_stream/IndicesDeleteDataStreamRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { ExpandWildcards, DataStreamNames } from '@_types/common'
+import { DataStreamNames, ExpandWildcards } from '@_types/common'
 import { Duration } from '@_types/Time'
 
 /**
diff --git a/specification/indices/explain_data_lifecycle/IndicesExplainDataLifecycleResponse.ts b/specification/indices/explain_data_lifecycle/IndicesExplainDataLifecycleResponse.ts
index 3879cf6e85..16bcdca579 100644
--- a/specification/indices/explain_data_lifecycle/IndicesExplainDataLifecycleResponse.ts
+++ b/specification/indices/explain_data_lifecycle/IndicesExplainDataLifecycleResponse.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { IndexName } from '@_types/common'
 import { Duration, EpochTime, UnitMillis } from '@_types/Time'
-import { DataStreamLifecycleWithRollover } from '@indices/_types/DataStreamLifecycle'
 
 export class Response {
   body: {
diff --git a/specification/indices/get_data_lifecycle/IndicesGetDataLifecycleRequest.ts b/specification/indices/get_data_lifecycle/IndicesGetDataLifecycleRequest.ts
index 90707a0dfc..3ffef02fdf 100644
--- a/specification/indices/get_data_lifecycle/IndicesGetDataLifecycleRequest.ts
+++ b/specification/indices/get_data_lifecycle/IndicesGetDataLifecycleRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { ExpandWildcards, DataStreamNames } from '@_types/common'
+import { DataStreamNames, ExpandWildcards } from '@_types/common'
 import { Duration } from '@_types/Time'
 
 /**
diff --git a/specification/indices/get_data_lifecycle/IndicesGetDataLifecycleResponse.ts b/specification/indices/get_data_lifecycle/IndicesGetDataLifecycleResponse.ts
index 4a2f2b5f37..de939e559d 100644
--- a/specification/indices/get_data_lifecycle/IndicesGetDataLifecycleResponse.ts
+++ b/specification/indices/get_data_lifecycle/IndicesGetDataLifecycleResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { DataStreamName } from '@_types/common'
 import { DataStreamLifecycle } from '@indices/_types/DataStreamLifecycle'
+import { DataStreamName } from '@_types/common'
 
 export class Response {
   body: { data_streams: DataStreamWithLifecycle[] }
diff --git a/specification/indices/get_data_stream/IndicesGetDataStreamRequest.ts b/specification/indices/get_data_stream/IndicesGetDataStreamRequest.ts
index 81ee441515..1818f3d71e 100644
--- a/specification/indices/get_data_stream/IndicesGetDataStreamRequest.ts
+++ b/specification/indices/get_data_stream/IndicesGetDataStreamRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { ExpandWildcards, DataStreamNames } from '@_types/common'
+import { DataStreamNames, ExpandWildcards } from '@_types/common'
 import { Duration } from '@_types/Time'
 
 /**
diff --git a/specification/indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts b/specification/indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts
index 2b3fcef9f9..290d54f235 100644
--- a/specification/indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts
+++ b/specification/indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { DataStreamLifecycleDownsampling } from '@indices/_types/DataStreamLifecycleDownsampling'
 import { RequestBase } from '@_types/Base'
 import { DataStreamNames, ExpandWildcards } from '@_types/common'
 import { Duration } from '@_types/Time'
-import { DataStreamLifecycleDownsampling } from '@indices/_types/DataStreamLifecycleDownsampling'
 
 /**
  * Update data stream lifecycles.
diff --git a/specification/indices/put_index_template/IndicesPutIndexTemplateRequest.ts b/specification/indices/put_index_template/IndicesPutIndexTemplateRequest.ts
index 70462aa7c5..c09195cac6 100644
--- a/specification/indices/put_index_template/IndicesPutIndexTemplateRequest.ts
+++ b/specification/indices/put_index_template/IndicesPutIndexTemplateRequest.ts
@@ -19,6 +19,7 @@
 
 import { Alias } from '@indices/_types/Alias'
 import { DataStreamVisibility } from '@indices/_types/DataStream'
+import { DataStreamLifecycle } from '@indices/_types/DataStreamLifecycle'
 import { IndexSettings } from '@indices/_types/IndexSettings'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { RequestBase } from '@_types/Base'
@@ -31,7 +32,6 @@ import {
 } from '@_types/common'
 import { TypeMapping } from '@_types/mapping/TypeMapping'
 import { long } from '@_types/Numeric'
-import { DataStreamLifecycle } from '@indices/_types/DataStreamLifecycle'
 import { Duration } from '@_types/Time'
 
 /**
diff --git a/specification/indices/put_mapping/IndicesPutMappingRequest.ts b/specification/indices/put_mapping/IndicesPutMappingRequest.ts
index b99a32ed32..ee6ffa292e 100644
--- a/specification/indices/put_mapping/IndicesPutMappingRequest.ts
+++ b/specification/indices/put_mapping/IndicesPutMappingRequest.ts
@@ -18,7 +18,6 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { RequestBase } from '@_types/Base'
 import {
   ExpandWildcards,
diff --git a/specification/indices/put_template/IndicesPutTemplateRequest.ts b/specification/indices/put_template/IndicesPutTemplateRequest.ts
index 3e24111a97..e91c195497 100644
--- a/specification/indices/put_template/IndicesPutTemplateRequest.ts
+++ b/specification/indices/put_template/IndicesPutTemplateRequest.ts
@@ -18,13 +18,13 @@
  */
 
 import { Alias } from '@indices/_types/Alias'
+import { IndexSettings } from '@indices/_types/IndexSettings'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { RequestBase } from '@_types/Base'
 import { IndexName, Name, VersionNumber } from '@_types/common'
 import { TypeMapping } from '@_types/mapping/TypeMapping'
 import { integer } from '@_types/Numeric'
 import { Duration } from '@_types/Time'
-import { IndexSettings } from '@indices/_types/IndexSettings'
 
 /**
  * Create or update an index template.
diff --git a/specification/indices/recovery/types.ts b/specification/indices/recovery/types.ts
index 5d74fce262..d130bbb69b 100644
--- a/specification/indices/recovery/types.ts
+++ b/specification/indices/recovery/types.ts
@@ -25,14 +25,14 @@ import {
   Uuid,
   VersionString
 } from '@_types/common'
-import { Host, TransportAddress, Ip } from '@_types/Networking'
+import { Host, Ip, TransportAddress } from '@_types/Networking'
 import { long, Percentage } from '@_types/Numeric'
 import {
-  Duration,
   DateTime,
+  Duration,
   DurationValue,
-  UnitMillis,
-  EpochTime
+  EpochTime,
+  UnitMillis
 } from '@_types/Time'
 
 export class RecoveryBytes {
diff --git a/specification/indices/resolve_cluster/ResolveClusterResponse.ts b/specification/indices/resolve_cluster/ResolveClusterResponse.ts
index f56f769877..ce1e8cb1d2 100644
--- a/specification/indices/resolve_cluster/ResolveClusterResponse.ts
+++ b/specification/indices/resolve_cluster/ResolveClusterResponse.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { ClusterAlias } from '@_types/common'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { ElasticsearchVersionMinInfo } from '@_types/Base'
+import { ClusterAlias } from '@_types/common'
 
 export class Response {
   /** @codegen_name infos */
diff --git a/specification/indices/rollover/types.ts b/specification/indices/rollover/types.ts
index 7615232ff4..6d251cb9fb 100644
--- a/specification/indices/rollover/types.ts
+++ b/specification/indices/rollover/types.ts
@@ -19,7 +19,7 @@
 
 import { ByteSize } from '@_types/common'
 import { long } from '@_types/Numeric'
-import { Duration, DurationValue, EpochTime, UnitMillis } from '@_types/Time'
+import { Duration, DurationValue, UnitMillis } from '@_types/Time'
 
 export class RolloverConditions {
   min_age?: Duration
diff --git a/specification/indices/segments/types.ts b/specification/indices/segments/types.ts
index 2636de419d..f40a8a75b8 100644
--- a/specification/indices/segments/types.ts
+++ b/specification/indices/segments/types.ts
@@ -19,7 +19,7 @@
 
 import { Dictionary } from '@spec_utils/Dictionary'
 import { VersionString } from '@_types/common'
-import { long, integer, double } from '@_types/Numeric'
+import { double, integer, long } from '@_types/Numeric'
 
 export class IndexSegment {
   shards: Dictionary<string, ShardsSegment | Array<ShardsSegment>>
diff --git a/specification/indices/shard_stores/types.ts b/specification/indices/shard_stores/types.ts
index f5e115426c..9ee6065766 100644
--- a/specification/indices/shard_stores/types.ts
+++ b/specification/indices/shard_stores/types.ts
@@ -17,11 +17,10 @@
  * under the License.
  */
 
+import { AdditionalProperty } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
-import { Id, VersionNumber, Name, NodeId } from '@_types/common'
+import { Id, Name, NodeId } from '@_types/common'
 import { TransportAddress } from '@_types/Networking'
-import { AdditionalProperty } from '@spec_utils/behaviors'
 
 export class IndicesShardStores {
   shards: Dictionary<string, ShardStoreWrapper>
diff --git a/specification/indices/simulate_template/IndicesSimulateTemplateRequest.ts b/specification/indices/simulate_template/IndicesSimulateTemplateRequest.ts
index 274c203a45..a027d6e3b8 100644
--- a/specification/indices/simulate_template/IndicesSimulateTemplateRequest.ts
+++ b/specification/indices/simulate_template/IndicesSimulateTemplateRequest.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import { RequestBase } from '@_types/Base'
-import { Indices, Metadata, Name, VersionNumber } from '@_types/common'
-import { Duration } from '@_types/Time'
 import { IndexTemplateMapping } from '@indices/put_index_template/IndicesPutIndexTemplateRequest'
 import { DataStreamVisibility } from '@indices/_types/DataStream'
+import { RequestBase } from '@_types/Base'
+import { Indices, Metadata, Name, VersionNumber } from '@_types/common'
 import { long } from '@_types/Numeric'
+import { Duration } from '@_types/Time'
 
 /**
  * Simulate an index template.
diff --git a/specification/indices/stats/types.ts b/specification/indices/stats/types.ts
index 5fc609a3b6..d9049ebf0c 100644
--- a/specification/indices/stats/types.ts
+++ b/specification/indices/stats/types.ts
@@ -18,14 +18,15 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import {
-  Uuid,
-  Id,
-  SequenceNumber,
-  VersionNumber,
+  ByteSize,
   HealthStatus,
+  Id,
   IndexName,
-  ByteSize
+  SequenceNumber,
+  Uuid,
+  VersionNumber
 } from '@_types/common'
 import { integer, long } from '@_types/Numeric'
 import {
@@ -47,7 +48,6 @@ import {
   TranslogStats,
   WarmerStats
 } from '@_types/Stats'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 export class IndexStats {
   /** Contains statistics about completions across all shards assigned to the node. */
diff --git a/specification/indices/update_aliases/types.ts b/specification/indices/update_aliases/types.ts
index f284cfc3af..05c67c6329 100644
--- a/specification/indices/update_aliases/types.ts
+++ b/specification/indices/update_aliases/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Routing, IndexName, IndexAlias, Indices } from '@_types/common'
+import { IndexAlias, IndexName, Indices, Routing } from '@_types/common'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
 
 /** @variants container */
diff --git a/specification/inference/_types/Results.ts b/specification/inference/_types/Results.ts
index d6dc17d8d7..1a35289bab 100644
--- a/specification/inference/_types/Results.ts
+++ b/specification/inference/_types/Results.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { float, byte, integer } from '@_types/Numeric'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { AcknowledgedResponseBase } from '@_types/Base'
+import { byte, float, integer } from '@_types/Numeric'
 
 /**
  * Sparse Embedding tokens are represented as a dictionary
diff --git a/specification/inference/_types/Services.ts b/specification/inference/_types/Services.ts
index a0dfd137a2..827d542d80 100644
--- a/specification/inference/_types/Services.ts
+++ b/specification/inference/_types/Services.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { TaskType } from '../_types/TaskType'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { TaskType } from '../_types/TaskType'
 
 /**
  * Configuration options when storing the inference endpoint
diff --git a/specification/inference/delete/DeleteRequest.ts b/specification/inference/delete/DeleteRequest.ts
index f54045e5b4..e6ee9719e6 100644
--- a/specification/inference/delete/DeleteRequest.ts
+++ b/specification/inference/delete/DeleteRequest.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { TaskType } from '@inference/_types/TaskType'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { TaskType } from '@inference/_types/TaskType'
 
 /**
  * Delete an inference endpoint
diff --git a/specification/inference/get/GetRequest.ts b/specification/inference/get/GetRequest.ts
index a37c0a250e..b9d1d7b805 100644
--- a/specification/inference/get/GetRequest.ts
+++ b/specification/inference/get/GetRequest.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { TaskType } from '@inference/_types/TaskType'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { TaskType } from '@inference/_types/TaskType'
 
 /**
  * Get an inference endpoint
diff --git a/specification/inference/inference/InferenceRequest.ts b/specification/inference/inference/InferenceRequest.ts
index 1bca46a44a..297f419be5 100644
--- a/specification/inference/inference/InferenceRequest.ts
+++ b/specification/inference/inference/InferenceRequest.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { Duration } from '@_types/Time'
+import { TaskSettings } from '@inference/_types/Services'
+import { TaskType } from '@inference/_types/TaskType'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { TaskType } from '@inference/_types/TaskType'
-import { TaskSettings } from '@inference/_types/Services'
+import { Duration } from '@_types/Time'
 
 /**
  * Perform inference on the service
diff --git a/specification/inference/put/PutRequest.ts b/specification/inference/put/PutRequest.ts
index 6ca1ecc1b3..a3d23a93a1 100644
--- a/specification/inference/put/PutRequest.ts
+++ b/specification/inference/put/PutRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { RequestBase } from '@_types/Base'
-import { Id } from '@_types/common'
 import { InferenceEndpoint } from '@inference/_types/Services'
 import { TaskType } from '@inference/_types/TaskType'
+import { RequestBase } from '@_types/Base'
+import { Id } from '@_types/common'
 
 /**
  * Create an inference endpoint
diff --git a/specification/ingest/_types/Pipeline.ts b/specification/ingest/_types/Pipeline.ts
index 8eb1b252dd..f82aee8472 100644
--- a/specification/ingest/_types/Pipeline.ts
+++ b/specification/ingest/_types/Pipeline.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { VersionNumber, Metadata } from '@_types/common'
+import { Metadata, VersionNumber } from '@_types/common'
 import { ProcessorContainer } from './Processors'
 
 export class Pipeline {
diff --git a/specification/ingest/_types/Processors.ts b/specification/ingest/_types/Processors.ts
index 053a5deb31..479e934390 100644
--- a/specification/ingest/_types/Processors.ts
+++ b/specification/ingest/_types/Processors.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import { SortOrder } from '@_types/sort'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Field, Fields, Id, Name } from '@_types/common'
 import { GeoShapeRelation } from '@_types/Geo'
 import { double, integer, long } from '@_types/Numeric'
+import { SortOrder } from '@_types/sort'
 
 /**
  * @variants container
diff --git a/specification/ingest/geo_ip_stats/types.ts b/specification/ingest/geo_ip_stats/types.ts
index d089d85cdb..ce8dbc3516 100644
--- a/specification/ingest/geo_ip_stats/types.ts
+++ b/specification/ingest/geo_ip_stats/types.ts
@@ -18,7 +18,7 @@
  */
 
 import { Name } from '@_types/common'
-import { integer, long } from '@_types/Numeric'
+import { integer } from '@_types/Numeric'
 import { DurationValue, UnitMillis } from '@_types/Time'
 
 export class GeoIpDownloadStatistics {
diff --git a/specification/ingest/get_geoip_database/GetGeoipDatabaseResponse.ts b/specification/ingest/get_geoip_database/GetGeoipDatabaseResponse.ts
index 169e99d532..2b1f36be23 100644
--- a/specification/ingest/get_geoip_database/GetGeoipDatabaseResponse.ts
+++ b/specification/ingest/get_geoip_database/GetGeoipDatabaseResponse.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { DatabaseConfiguration } from '@ingest/_types/Database'
 import { Id } from '@_types/common'
 import { long } from '@_types/Numeric'
 import { EpochTime, UnitMillis } from '@_types/Time'
-import { DatabaseConfiguration } from '@ingest/_types/Database'
 
 export class Response {
   body: { databases: DatabaseConfigurationMetadata[] }
diff --git a/specification/ingest/put_geoip_database/PutGeoipDatabaseRequest.ts b/specification/ingest/put_geoip_database/PutGeoipDatabaseRequest.ts
index 918431b6d6..7cc987f98d 100644
--- a/specification/ingest/put_geoip_database/PutGeoipDatabaseRequest.ts
+++ b/specification/ingest/put_geoip_database/PutGeoipDatabaseRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { Maxmind } from '@ingest/_types/Database'
 import { RequestBase } from '@_types/Base'
 import { Id, Name } from '@_types/common'
 import { Duration } from '@_types/Time'
-import { Maxmind } from '@ingest/_types/Database'
 
 /**
  * Returns information about one or more geoip database configurations.
diff --git a/specification/ingest/put_pipeline/PutPipelineRequest.ts b/specification/ingest/put_pipeline/PutPipelineRequest.ts
index ba6bec0e97..5f066cd2c8 100644
--- a/specification/ingest/put_pipeline/PutPipelineRequest.ts
+++ b/specification/ingest/put_pipeline/PutPipelineRequest.ts
@@ -19,7 +19,7 @@
 
 import { ProcessorContainer } from '@ingest/_types/Processors'
 import { RequestBase } from '@_types/Base'
-import { Id, VersionNumber, Metadata } from '@_types/common'
+import { Id, Metadata, VersionNumber } from '@_types/common'
 import { Duration } from '@_types/Time'
 
 /**
diff --git a/specification/ingest/simulate/SimulatePipelineRequest.ts b/specification/ingest/simulate/SimulatePipelineRequest.ts
index 9cf13ac926..00709586ae 100644
--- a/specification/ingest/simulate/SimulatePipelineRequest.ts
+++ b/specification/ingest/simulate/SimulatePipelineRequest.ts
@@ -21,7 +21,6 @@ import { Pipeline } from '@ingest/_types/Pipeline'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { Document } from './types'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 /**
  * Executes an ingest pipeline against a set of provided documents.
diff --git a/specification/ingest/simulate/types.ts b/specification/ingest/simulate/types.ts
index 979a273f89..50b113ff08 100644
--- a/specification/ingest/simulate/types.ts
+++ b/specification/ingest/simulate/types.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
+import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { Stringified } from '@spec_utils/Stringified'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { ActionStatusOptions } from '@watcher/_types/Action'
 import { Id, IndexName, Name, VersionNumber, VersionType } from '@_types/common'
 import { ErrorCause } from '@_types/Errors'
 import { DateTime } from '@_types/Time'
-import { AdditionalProperties } from '@spec_utils/behaviors'
-import { Stringified } from '@spec_utils/Stringified'
 
 export class Ingest {
   timestamp: DateTime
diff --git a/specification/logstash/put_pipeline/LogstashPutPipelineRequest.ts b/specification/logstash/put_pipeline/LogstashPutPipelineRequest.ts
index 7b7637c2dc..4a41853425 100644
--- a/specification/logstash/put_pipeline/LogstashPutPipelineRequest.ts
+++ b/specification/logstash/put_pipeline/LogstashPutPipelineRequest.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { Pipeline } from '@logstash/_types/Pipeline'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { Pipeline } from '@logstash/_types/Pipeline'
 
 /** Creates or updates a pipeline used for Logstash Central Management.
  * @rest_spec_name logstash.put_pipeline
diff --git a/specification/migration/get_feature_upgrade_status/GetFeatureUpgradeStatusResponse.ts b/specification/migration/get_feature_upgrade_status/GetFeatureUpgradeStatusResponse.ts
index ae8310f4f8..5e9532d965 100644
--- a/specification/migration/get_feature_upgrade_status/GetFeatureUpgradeStatusResponse.ts
+++ b/specification/migration/get_feature_upgrade_status/GetFeatureUpgradeStatusResponse.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexName, Indices, VersionString } from '@_types/common'
+import { IndexName, VersionString } from '@_types/common'
 import { ErrorCause } from '@_types/Errors'
 
 export class Response {
diff --git a/specification/ml/_types/Analysis.ts b/specification/ml/_types/Analysis.ts
index 4022270390..d8474adc30 100644
--- a/specification/ml/_types/Analysis.ts
+++ b/specification/ml/_types/Analysis.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
+import { OverloadOf } from '@spec_utils/behaviors'
+import { CharFilter } from '@_types/analysis/char_filters'
+import { Tokenizer } from '@_types/analysis/tokenizers'
+import { TokenFilter } from '@_types/analysis/token_filters'
 import { Field } from '@_types/common'
 import { long } from '@_types/Numeric'
 import { Duration } from '@_types/Time'
 import { Detector, DetectorRead } from './Detector'
-import { CharFilter } from '@_types/analysis/char_filters'
-import { Tokenizer, TokenizerDefinition } from '@_types/analysis/tokenizers'
-import { TokenFilter } from '@_types/analysis/token_filters'
-import { OverloadOf } from '@spec_utils/behaviors'
 
 export class AnalysisConfig {
   /**
diff --git a/specification/ml/_types/Bucket.ts b/specification/ml/_types/Bucket.ts
index 57702c435f..cde8cd2836 100644
--- a/specification/ml/_types/Bucket.ts
+++ b/specification/ml/_types/Bucket.ts
@@ -21,11 +21,10 @@ import { Field, Id } from '@_types/common'
 import { double, long } from '@_types/Numeric'
 import {
   DateTime,
-  Duration,
   DurationValue,
-  UnitSeconds,
+  EpochTime,
   UnitMillis,
-  EpochTime
+  UnitSeconds
 } from '@_types/Time'
 
 export class BucketSummary {
diff --git a/specification/ml/_types/Datafeed.ts b/specification/ml/_types/Datafeed.ts
index f03b097ee6..5d66e38594 100644
--- a/specification/ml/_types/Datafeed.ts
+++ b/specification/ml/_types/Datafeed.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { DatafeedAuthorization } from '@ml/_types/Authorization'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
 import { Id, Indices, IndicesOptions } from '@_types/common'
@@ -27,11 +28,10 @@ import { ScriptField } from '@_types/Scripting'
 import {
   Duration,
   DurationValue,
-  UnitMillis,
-  UnitFloatMillis
+  UnitFloatMillis,
+  UnitMillis
 } from '@_types/Time'
 import { DiscoveryNode } from './DiscoveryNode'
-import { DatafeedAuthorization } from '@ml/_types/Authorization'
 
 export class Datafeed {
   /** @aliases aggs */
diff --git a/specification/ml/_types/DataframeAnalytics.ts b/specification/ml/_types/DataframeAnalytics.ts
index c7cb6b21dc..fbafef44ae 100644
--- a/specification/ml/_types/DataframeAnalytics.ts
+++ b/specification/ml/_types/DataframeAnalytics.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { DataframeAnalyticsAuthorization } from '@ml/_types/Authorization'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import {
-  ByteSize,
   Field,
   Id,
   IndexName,
@@ -32,9 +32,8 @@ import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { NodeAttributes } from '@_types/Node'
 import { double, integer, long, Percentage } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
-import { UnitMillis, DurationValue, EpochTime } from '@_types/Time'
+import { DurationValue, EpochTime, UnitMillis } from '@_types/Time'
 import { DataframeState } from './Dataframe'
-import { DataframeAnalyticsAuthorization } from '@ml/_types/Authorization'
 
 export class DataframeAnalyticsSource {
   /** Index or indices on which to perform the analysis. It can be a single index or index pattern as well as an array of indices or patterns. NOTE: If your source indices contain documents with the same IDs, only the document that is indexed last appears in the destination index.*/
diff --git a/specification/ml/_types/Influencer.ts b/specification/ml/_types/Influencer.ts
index 1d79ae7bc1..85f3d4f047 100644
--- a/specification/ml/_types/Influencer.ts
+++ b/specification/ml/_types/Influencer.ts
@@ -17,16 +17,9 @@
  * under the License.
  */
 
-import { double, integer, long } from '@_types/Numeric'
 import { Field, Id } from '@_types/common'
-import {
-  Duration,
-  DateTime,
-  DurationValue,
-  UnitSeconds,
-  UnitMillis,
-  EpochTime
-} from '@_types/Time'
+import { double } from '@_types/Numeric'
+import { DurationValue, EpochTime, UnitMillis, UnitSeconds } from '@_types/Time'
 
 export class Influencer {
   /**
diff --git a/specification/ml/_types/Job.ts b/specification/ml/_types/Job.ts
index 4d7376ccfc..b15656ac05 100644
--- a/specification/ml/_types/Job.ts
+++ b/specification/ml/_types/Job.ts
@@ -18,20 +18,20 @@
  */
 
 import { AnalysisConfig, AnalysisLimits } from '@ml/_types/Analysis'
+import { Datafeed, DatafeedConfig } from '@ml/_types/Datafeed'
 import { ModelPlotConfig } from '@ml/_types/ModelPlot'
-import { Dictionary } from '@spec_utils/Dictionary'
 import { CustomSettings } from '@ml/_types/Settings'
-import { Field, Id, TaskId, IndexName, VersionString } from '@_types/common'
+import { Dictionary } from '@spec_utils/Dictionary'
+import { Field, Id, IndexName, TaskId, VersionString } from '@_types/common'
 import { double, integer, long } from '@_types/Numeric'
 import {
-  Duration,
   DateTime,
+  Duration,
   DurationValue,
   UnitFloatMillis
 } from '@_types/Time'
 import { DiscoveryNode } from './DiscoveryNode'
 import { ModelSizeStats } from './Model'
-import { Datafeed, DatafeedConfig } from '@ml/_types/Datafeed'
 
 export enum JobState {
   /** The job close action is in progress and has not yet completed. A closing job cannot accept further data. */
diff --git a/specification/ml/_types/Model.ts b/specification/ml/_types/Model.ts
index 89ad329dcc..806d14faf2 100644
--- a/specification/ml/_types/Model.ts
+++ b/specification/ml/_types/Model.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { DiscoveryNode } from '@ml/_types/DiscoveryNode'
 import { ByteSize, Id, VersionString } from '@_types/common'
 import { integer, long } from '@_types/Numeric'
-import { Duration, DateTime } from '@_types/Time'
-import { DiscoveryNode } from '@ml/_types/DiscoveryNode'
+import { DateTime } from '@_types/Time'
 
 export class ModelSnapshot {
   /** An optional description of the job. */
diff --git a/specification/ml/_types/TrainedModel.ts b/specification/ml/_types/TrainedModel.ts
index d8b6249c69..e781e4a166 100644
--- a/specification/ml/_types/TrainedModel.ts
+++ b/specification/ml/_types/TrainedModel.ts
@@ -29,12 +29,11 @@ import {
 } from '@_types/common'
 import { double, integer, long } from '@_types/Numeric'
 import {
-  Duration,
   DateTime,
   DurationValue,
+  EpochTime,
   UnitFloatMillis,
-  UnitMillis,
-  EpochTime
+  UnitMillis
 } from '@_types/Time'
 import { DiscoveryNode } from './DiscoveryNode'
 import { InferenceConfigCreateContainer } from './inference'
diff --git a/specification/ml/clear_trained_model_deployment_cache/MlClearTrainedModelDeploymentCacheRequest.ts b/specification/ml/clear_trained_model_deployment_cache/MlClearTrainedModelDeploymentCacheRequest.ts
index 81448358e9..9791c59f1f 100644
--- a/specification/ml/clear_trained_model_deployment_cache/MlClearTrainedModelDeploymentCacheRequest.ts
+++ b/specification/ml/clear_trained_model_deployment_cache/MlClearTrainedModelDeploymentCacheRequest.ts
@@ -19,8 +19,6 @@
 
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { integer } from '@_types/Numeric'
-import { Include } from '@ml/_types/Include'
 
 /**
  * Clear trained model deployment cache.
diff --git a/specification/ml/explain_data_frame_analytics/MlExplainDataFrameAnalyticsRequest.ts b/specification/ml/explain_data_frame_analytics/MlExplainDataFrameAnalyticsRequest.ts
index 70e81b3393..26570afdde 100644
--- a/specification/ml/explain_data_frame_analytics/MlExplainDataFrameAnalyticsRequest.ts
+++ b/specification/ml/explain_data_frame_analytics/MlExplainDataFrameAnalyticsRequest.ts
@@ -24,7 +24,7 @@ import {
   DataframeAnalyticsSource
 } from '@ml/_types/DataframeAnalytics'
 import { RequestBase } from '@_types/Base'
-import { ByteSize, Id } from '@_types/common'
+import { Id } from '@_types/common'
 import { integer } from '@_types/Numeric'
 
 /**
diff --git a/specification/ml/get_data_frame_analytics_stats/MlGetDataFrameAnalyticsStatsResponse.ts b/specification/ml/get_data_frame_analytics_stats/MlGetDataFrameAnalyticsStatsResponse.ts
index e0fa56f7c3..91b20d7981 100644
--- a/specification/ml/get_data_frame_analytics_stats/MlGetDataFrameAnalyticsStatsResponse.ts
+++ b/specification/ml/get_data_frame_analytics_stats/MlGetDataFrameAnalyticsStatsResponse.ts
@@ -18,7 +18,6 @@
  */
 
 import { DataframeAnalytics } from '@ml/_types/DataframeAnalytics'
-import { DataframeState } from '@ml/_types/Dataframe'
 import { long } from '@_types/Numeric'
 
 export class Response {
diff --git a/specification/ml/get_model_snapshot_upgrade_stats/MlGetModelSnapshotUpgradeStatsResponse.ts b/specification/ml/get_model_snapshot_upgrade_stats/MlGetModelSnapshotUpgradeStatsResponse.ts
index 145c96b75b..264c08ef83 100644
--- a/specification/ml/get_model_snapshot_upgrade_stats/MlGetModelSnapshotUpgradeStatsResponse.ts
+++ b/specification/ml/get_model_snapshot_upgrade_stats/MlGetModelSnapshotUpgradeStatsResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { long } from '@_types/Numeric'
 import { ModelSnapshotUpgrade } from '@ml/_types/Model'
+import { long } from '@_types/Numeric'
 
 export class Response {
   body: {
diff --git a/specification/ml/get_model_snapshots/MlGetModelSnapshotsRequest.ts b/specification/ml/get_model_snapshots/MlGetModelSnapshotsRequest.ts
index bfc849a1b1..a6a2a8db1b 100644
--- a/specification/ml/get_model_snapshots/MlGetModelSnapshotsRequest.ts
+++ b/specification/ml/get_model_snapshots/MlGetModelSnapshotsRequest.ts
@@ -21,7 +21,7 @@ import { Page } from '@ml/_types/Page'
 import { RequestBase } from '@_types/Base'
 import { Field, Id } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import { Duration, DateTime } from '@_types/Time'
+import { DateTime } from '@_types/Time'
 
 /**
  * Get model snapshots info.
diff --git a/specification/ml/get_overall_buckets/MlGetOverallBucketsRequest.ts b/specification/ml/get_overall_buckets/MlGetOverallBucketsRequest.ts
index 65535c3f51..e5a21287fc 100644
--- a/specification/ml/get_overall_buckets/MlGetOverallBucketsRequest.ts
+++ b/specification/ml/get_overall_buckets/MlGetOverallBucketsRequest.ts
@@ -20,7 +20,7 @@
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { double, integer } from '@_types/Numeric'
-import { Duration, DateTime } from '@_types/Time'
+import { DateTime, Duration } from '@_types/Time'
 
 /**
  * Get overall bucket results.
diff --git a/specification/ml/get_trained_models/MlGetTrainedModelRequest.ts b/specification/ml/get_trained_models/MlGetTrainedModelRequest.ts
index 821c2083b9..232858925e 100644
--- a/specification/ml/get_trained_models/MlGetTrainedModelRequest.ts
+++ b/specification/ml/get_trained_models/MlGetTrainedModelRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { Include } from '@ml/_types/Include'
 import { RequestBase } from '@_types/Base'
 import { Ids } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import { Include } from '@ml/_types/Include'
 
 /**
  * Get trained model configuration info.
diff --git a/specification/ml/infer_trained_model/MlInferTrainedModelRequest.ts b/specification/ml/infer_trained_model/MlInferTrainedModelRequest.ts
index 1d56a85148..220eece706 100644
--- a/specification/ml/infer_trained_model/MlInferTrainedModelRequest.ts
+++ b/specification/ml/infer_trained_model/MlInferTrainedModelRequest.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
+import { InferenceConfigUpdateContainer } from '@ml/_types/inference'
+import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { Duration } from '@_types/Time'
-import { Dictionary } from '@spec_utils/Dictionary'
-import { InferenceConfigUpdateContainer } from '@ml/_types/inference'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 /**
  * Evaluate a trained model.
diff --git a/specification/ml/preview_datafeed/MlPreviewDatafeedRequest.ts b/specification/ml/preview_datafeed/MlPreviewDatafeedRequest.ts
index a1934d58df..de8696aed9 100644
--- a/specification/ml/preview_datafeed/MlPreviewDatafeedRequest.ts
+++ b/specification/ml/preview_datafeed/MlPreviewDatafeedRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { RequestBase } from '@_types/Base'
-import { Id } from '@_types/common'
 import { DatafeedConfig } from '@ml/_types/Datafeed'
 import { JobConfig } from '@ml/_types/Job'
+import { RequestBase } from '@_types/Base'
+import { Id } from '@_types/common'
 import { DateTime } from '@_types/Time'
 
 /**
diff --git a/specification/ml/put_data_frame_analytics/MlPutDataFrameAnalyticsResponse.ts b/specification/ml/put_data_frame_analytics/MlPutDataFrameAnalyticsResponse.ts
index 5bcdeba2e6..2a308e8eee 100644
--- a/specification/ml/put_data_frame_analytics/MlPutDataFrameAnalyticsResponse.ts
+++ b/specification/ml/put_data_frame_analytics/MlPutDataFrameAnalyticsResponse.ts
@@ -25,7 +25,7 @@ import {
   DataframeAnalyticsSource
 } from '@ml/_types/DataframeAnalytics'
 import { Id, VersionString } from '@_types/common'
-import { integer, long } from '@_types/Numeric'
+import { integer } from '@_types/Numeric'
 import { EpochTime, UnitMillis } from '@_types/Time'
 
 export class Response {
diff --git a/specification/ml/put_datafeed/MlPutDatafeedResponse.ts b/specification/ml/put_datafeed/MlPutDatafeedResponse.ts
index 1a3fa65594..e93186ade0 100644
--- a/specification/ml/put_datafeed/MlPutDatafeedResponse.ts
+++ b/specification/ml/put_datafeed/MlPutDatafeedResponse.ts
@@ -21,7 +21,7 @@ import { DatafeedAuthorization } from '@ml/_types/Authorization'
 import { ChunkingConfig, DelayedDataCheckConfig } from '@ml/_types/Datafeed'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
-import { Id, Indices, IndicesOptions } from '@_types/common'
+import { Id, IndicesOptions } from '@_types/common'
 import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
diff --git a/specification/ml/put_job/MlPutJobRequest.ts b/specification/ml/put_job/MlPutJobRequest.ts
index 24ac4b1ad2..0391075377 100644
--- a/specification/ml/put_job/MlPutJobRequest.ts
+++ b/specification/ml/put_job/MlPutJobRequest.ts
@@ -18,6 +18,7 @@
  */
 
 import { AnalysisConfig, AnalysisLimits } from '@ml/_types/Analysis'
+import { DatafeedConfig } from '@ml/_types/Datafeed'
 import { DataDescription } from '@ml/_types/Job'
 import { ModelPlotConfig } from '@ml/_types/ModelPlot'
 import { CustomSettings } from '@ml/_types/Settings'
@@ -25,7 +26,6 @@ import { RequestBase } from '@_types/Base'
 import { Id, IndexName } from '@_types/common'
 import { long } from '@_types/Numeric'
 import { Duration } from '@_types/Time'
-import { DatafeedConfig } from '@ml/_types/Datafeed'
 
 /**
  * Create an anomaly detection job.
diff --git a/specification/ml/put_job/MlPutJobResponse.ts b/specification/ml/put_job/MlPutJobResponse.ts
index 7f8cea45c6..c3772f69b0 100644
--- a/specification/ml/put_job/MlPutJobResponse.ts
+++ b/specification/ml/put_job/MlPutJobResponse.ts
@@ -18,13 +18,13 @@
  */
 
 import { AnalysisConfigRead, AnalysisLimits } from '@ml/_types/Analysis'
+import { Datafeed } from '@ml/_types/Datafeed'
 import { DataDescription } from '@ml/_types/Job'
 import { ModelPlotConfig } from '@ml/_types/ModelPlot'
 import { CustomSettings } from '@ml/_types/Settings'
 import { Id } from '@_types/common'
 import { long } from '@_types/Numeric'
 import { DateTime, Duration } from '@_types/Time'
-import { Datafeed } from '@ml/_types/Datafeed'
 
 export class Response {
   body: {
diff --git a/specification/ml/put_trained_model/MlPutTrainedModelRequest.ts b/specification/ml/put_trained_model/MlPutTrainedModelRequest.ts
index f1cef840e6..1488ac9bea 100644
--- a/specification/ml/put_trained_model/MlPutTrainedModelRequest.ts
+++ b/specification/ml/put_trained_model/MlPutTrainedModelRequest.ts
@@ -17,14 +17,16 @@
  * under the License.
  */
 
+import { InferenceConfigCreateContainer } from '@ml/_types/inference'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { long } from '@_types/Numeric'
+import {
+  TrainedModelPrefixStrings,
+  TrainedModelType
+} from '../_types/TrainedModel'
 import { Definition, Input } from './types'
-import { TrainedModelPrefixStrings } from '../_types/TrainedModel'
-import { TrainedModelType } from '../_types/TrainedModel'
-import { InferenceConfigCreateContainer } from '@ml/_types/inference'
 
 /**
  * Create a trained model.
diff --git a/specification/ml/put_trained_model_definition_part/MlPutTrainedModelDefinitionPartRequest.ts b/specification/ml/put_trained_model_definition_part/MlPutTrainedModelDefinitionPartRequest.ts
index c99622bbed..842ab4d282 100644
--- a/specification/ml/put_trained_model_definition_part/MlPutTrainedModelDefinitionPartRequest.ts
+++ b/specification/ml/put_trained_model_definition_part/MlPutTrainedModelDefinitionPartRequest.ts
@@ -18,8 +18,8 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { integer, long } from '@_types/Numeric'
 import { Id } from '@_types/common'
+import { integer, long } from '@_types/Numeric'
 
 /**
  * Create part of a trained model definition.
diff --git a/specification/ml/start_datafeed/MlStartDatafeedRequest.ts b/specification/ml/start_datafeed/MlStartDatafeedRequest.ts
index 7ec6501727..3f96f593a2 100644
--- a/specification/ml/start_datafeed/MlStartDatafeedRequest.ts
+++ b/specification/ml/start_datafeed/MlStartDatafeedRequest.ts
@@ -19,7 +19,7 @@
 
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
-import { Duration, DateTime } from '@_types/Time'
+import { DateTime, Duration } from '@_types/Time'
 
 /**
  * Start datafeeds.
diff --git a/specification/ml/update_datafeed/MlUpdateDatafeedRequest.ts b/specification/ml/update_datafeed/MlUpdateDatafeedRequest.ts
index c1f55f7994..dcc15c90cb 100644
--- a/specification/ml/update_datafeed/MlUpdateDatafeedRequest.ts
+++ b/specification/ml/update_datafeed/MlUpdateDatafeedRequest.ts
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-import { RequestBase } from '@_types/Base'
-import { ExpandWildcards, Id, IndicesOptions } from '@_types/common'
+import { ChunkingConfig, DelayedDataCheckConfig } from '@ml/_types/Datafeed'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
-import { ChunkingConfig, DelayedDataCheckConfig } from '@ml/_types/Datafeed'
-import { Duration } from '@_types/Time'
+import { RequestBase } from '@_types/Base'
+import { ExpandWildcards, Id, IndicesOptions } from '@_types/common'
+import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
-import { RuntimeFields } from '@_types/mapping/RuntimeFields'
 import { ScriptField } from '@_types/Scripting'
+import { Duration } from '@_types/Time'
 
 /**
  * Update a datafeed.
diff --git a/specification/ml/update_job/MlUpdateJobRequest.ts b/specification/ml/update_job/MlUpdateJobRequest.ts
index 0579eca84e..1644550f19 100644
--- a/specification/ml/update_job/MlUpdateJobRequest.ts
+++ b/specification/ml/update_job/MlUpdateJobRequest.ts
@@ -18,8 +18,8 @@
  */
 
 import {
-  PerPartitionCategorization,
-  AnalysisMemoryLimit
+  AnalysisMemoryLimit,
+  PerPartitionCategorization
 } from '@ml/_types/Analysis'
 import { Detector } from '@ml/_types/Detector'
 import { ModelPlotConfig } from '@ml/_types/ModelPlot'
diff --git a/specification/monitoring/bulk/BulkMonitoringRequest.ts b/specification/monitoring/bulk/BulkMonitoringRequest.ts
index 0aee558b84..b991d9010e 100644
--- a/specification/monitoring/bulk/BulkMonitoringRequest.ts
+++ b/specification/monitoring/bulk/BulkMonitoringRequest.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { OperationContainer, UpdateAction } from '@global/bulk/types'
 import { RequestBase } from '@_types/Base'
 import { Duration } from '@_types/Time'
-import { OperationContainer, UpdateAction } from '@global/bulk/types'
 
 /**
  * @rest_spec_name monitoring.bulk
diff --git a/specification/monitoring/bulk/BulkMonitoringResponse.ts b/specification/monitoring/bulk/BulkMonitoringResponse.ts
index f9a663c5ab..c0d945ae96 100644
--- a/specification/monitoring/bulk/BulkMonitoringResponse.ts
+++ b/specification/monitoring/bulk/BulkMonitoringResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { long } from '@_types/Numeric'
 import { ErrorCause } from '@_types/Errors'
+import { long } from '@_types/Numeric'
 
 export class Response {
   body: {
diff --git a/specification/nodes/_types/NodeReloadResult.ts b/specification/nodes/_types/NodeReloadResult.ts
index e5b912b08d..498b758d24 100644
--- a/specification/nodes/_types/NodeReloadResult.ts
+++ b/specification/nodes/_types/NodeReloadResult.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { Stats } from '@nodes/_types/Stats'
 import { Name } from '@_types/common'
 import { ErrorCause } from '@_types/Errors'
-import { Stats } from '@nodes/_types/Stats'
 
 export class NodeReloadError {
   name: Name
diff --git a/specification/nodes/info/types.ts b/specification/nodes/info/types.ts
index 5a7a8ab53d..ac103115f1 100644
--- a/specification/nodes/info/types.ts
+++ b/specification/nodes/info/types.ts
@@ -18,15 +18,15 @@
  */
 
 import { IndexRouting } from '@indices/_types/IndexRouting'
+import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { ByteSize, Name, VersionString } from '@_types/common'
 import { Host, Ip, TransportAddress } from '@_types/Networking'
+import { NodeRoles } from '@_types/Node'
 import { integer, long } from '@_types/Numeric'
 import { PluginStats } from '@_types/Stats'
-import { NodeRoles } from '@_types/Node'
 import { Duration, DurationValue, EpochTime, UnitMillis } from '@_types/Time'
-import { AdditionalProperties } from '@spec_utils/behaviors'
 
 export class NodeInfo {
   attributes: Dictionary<string, string>
diff --git a/specification/query_rules/_types/QueryRuleset.ts b/specification/query_rules/_types/QueryRuleset.ts
index fdd615e2ac..b995d0dafc 100644
--- a/specification/query_rules/_types/QueryRuleset.ts
+++ b/specification/query_rules/_types/QueryRuleset.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Id } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { PinnedDoc } from '../../_types/query_dsl/specialized'
 
 export class QueryRuleset {
diff --git a/specification/query_rules/list_rulesets/types.ts b/specification/query_rules/list_rulesets/types.ts
index 6aa550bc75..fd50af5c33 100644
--- a/specification/query_rules/list_rulesets/types.ts
+++ b/specification/query_rules/list_rulesets/types.ts
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { integer } from '@_types/Numeric'
-import { Id } from '@_types/common'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { Id } from '@_types/common'
+import { integer } from '@_types/Numeric'
 
 export class QueryRulesetListItem {
   /**
diff --git a/specification/query_rules/put_rule/QueryRulePutRequest.ts b/specification/query_rules/put_rule/QueryRulePutRequest.ts
index bafdd311ff..506f3b2b97 100644
--- a/specification/query_rules/put_rule/QueryRulePutRequest.ts
+++ b/specification/query_rules/put_rule/QueryRulePutRequest.ts
@@ -20,9 +20,9 @@ import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { integer } from '@_types/Numeric'
 import {
-  QueryRuleType,
+  QueryRuleActions,
   QueryRuleCriteria,
-  QueryRuleActions
+  QueryRuleType
 } from '../_types/QueryRuleset'
 
 /**
diff --git a/specification/rollup/delete_job/types.ts b/specification/rollup/delete_job/types.ts
index 24c744bb3a..9880b336e7 100644
--- a/specification/rollup/delete_job/types.ts
+++ b/specification/rollup/delete_job/types.ts
@@ -16,7 +16,3 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { Id } from '@_types/common'
-import { ErrorCause } from '@_types/Errors'
-import { long } from '@_types/Numeric'
diff --git a/specification/rollup/get_rollup_caps/types.ts b/specification/rollup/get_rollup_caps/types.ts
index 8e70162473..45a867207b 100644
--- a/specification/rollup/get_rollup_caps/types.ts
+++ b/specification/rollup/get_rollup_caps/types.ts
@@ -18,7 +18,6 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Field } from '@_types/common'
 import { Duration, TimeZone } from '@_types/Time'
 
diff --git a/specification/search_application/_types/AnalyticsEvent.ts b/specification/search_application/_types/AnalyticsEvent.ts
index ae79ceda8e..dee211c4e9 100644
--- a/specification/search_application/_types/AnalyticsEvent.ts
+++ b/specification/search_application/_types/AnalyticsEvent.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-import { IndexName, Name } from '@_types/common'
-
 export class AnalyticsEvent {}
 
 export enum EventType {
diff --git a/specification/search_application/_types/BehavioralAnalytics.ts b/specification/search_application/_types/BehavioralAnalytics.ts
index eb06ce9fee..c614f759ba 100644
--- a/specification/search_application/_types/BehavioralAnalytics.ts
+++ b/specification/search_application/_types/BehavioralAnalytics.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexName, Name } from '@_types/common'
+import { IndexName } from '@_types/common'
 
 export class AnalyticsCollection {
   /**
diff --git a/specification/search_application/_types/SearchApplication.ts b/specification/search_application/_types/SearchApplication.ts
index d40f01f4e9..20d468a130 100644
--- a/specification/search_application/_types/SearchApplication.ts
+++ b/specification/search_application/_types/SearchApplication.ts
@@ -18,8 +18,8 @@
  */
 
 import { IndexName, Name } from '@_types/common'
-import { EpochTime, UnitMillis } from '@_types/Time'
 import { Script } from '@_types/Scripting'
+import { EpochTime, UnitMillis } from '@_types/Time'
 
 export class SearchApplication {
   /**
diff --git a/specification/search_application/get_behavioral_analytics/BehavioralAnalyticsGetResponse.ts b/specification/search_application/get_behavioral_analytics/BehavioralAnalyticsGetResponse.ts
index 2e851cdae5..fc08dc4804 100644
--- a/specification/search_application/get_behavioral_analytics/BehavioralAnalyticsGetResponse.ts
+++ b/specification/search_application/get_behavioral_analytics/BehavioralAnalyticsGetResponse.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { AnalyticsCollection } from '../_types/BehavioralAnalytics'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Name } from '@_types/common'
+import { AnalyticsCollection } from '../_types/BehavioralAnalytics'
 
 export class Response {
   /** @codegen_name analytics */
diff --git a/specification/search_application/list/SearchApplicationsListResponse.ts b/specification/search_application/list/SearchApplicationsListResponse.ts
index ce716b50bd..49ebbedc6a 100644
--- a/specification/search_application/list/SearchApplicationsListResponse.ts
+++ b/specification/search_application/list/SearchApplicationsListResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { long } from '@_types/Numeric'
 import { IndexName, Name } from '@_types/common'
+import { long } from '@_types/Numeric'
 import { EpochTime, UnitMillis } from '@_types/Time'
 
 export class Response {
diff --git a/specification/search_application/put_behavioral_analytics/BehavioralAnalyticsPutResponse.ts b/specification/search_application/put_behavioral_analytics/BehavioralAnalyticsPutResponse.ts
index b347a29098..cfa80071fa 100644
--- a/specification/search_application/put_behavioral_analytics/BehavioralAnalyticsPutResponse.ts
+++ b/specification/search_application/put_behavioral_analytics/BehavioralAnalyticsPutResponse.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { Result } from '@_types/Result'
 import { AcknowledgedResponseBase } from '@_types/Base'
 import { Name } from '@_types/common'
 
diff --git a/specification/search_application/search/SearchApplicationsSearchRequest.ts b/specification/search_application/search/SearchApplicationsSearchRequest.ts
index d258bac5d2..ae0247b2c9 100644
--- a/specification/search_application/search/SearchApplicationsSearchRequest.ts
+++ b/specification/search_application/search/SearchApplicationsSearchRequest.ts
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { RequestBase } from '@_types/Base'
-import { Name } from '@_types/common'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { RequestBase } from '@_types/Base'
+import { Name } from '@_types/common'
 
 /**
  * Perform a search against a search application.
diff --git a/specification/search_application/search/SearchApplicationsSearchResponse.ts b/specification/search_application/search/SearchApplicationsSearchResponse.ts
index a505714e4c..ee5a08b7c9 100644
--- a/specification/search_application/search/SearchApplicationsSearchResponse.ts
+++ b/specification/search_application/search/SearchApplicationsSearchResponse.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { SearchApplication } from '../_types/SearchApplication'
 import { ResponseBody } from '@global/search/SearchResponse'
 
 export class Response<TDocument> {
diff --git a/specification/searchable_snapshots/cache_stats/Response.ts b/specification/searchable_snapshots/cache_stats/Response.ts
index 387b713784..9fda865249 100644
--- a/specification/searchable_snapshots/cache_stats/Response.ts
+++ b/specification/searchable_snapshots/cache_stats/Response.ts
@@ -18,8 +18,8 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { long, integer } from '@_types/Numeric'
 import { ByteSize } from '@_types/common'
+import { integer, long } from '@_types/Numeric'
 
 export class Response {
   body: {
diff --git a/specification/searchable_snapshots/stats/SearchableSnapshotsStatsRequest.ts b/specification/searchable_snapshots/stats/SearchableSnapshotsStatsRequest.ts
index c8d286c9ae..bdc4fdffa5 100644
--- a/specification/searchable_snapshots/stats/SearchableSnapshotsStatsRequest.ts
+++ b/specification/searchable_snapshots/stats/SearchableSnapshotsStatsRequest.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { StatsLevel } from '../_types/stats'
 import { RequestBase } from '@_types/Base'
 import { Indices } from '@_types/common'
+import { StatsLevel } from '../_types/stats'
 
 /**
  * @rest_spec_name searchable_snapshots.stats
diff --git a/specification/security/_types/ApiKey.ts b/specification/security/_types/ApiKey.ts
index 07eb5aaa69..9d7135c25b 100644
--- a/specification/security/_types/ApiKey.ts
+++ b/specification/security/_types/ApiKey.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { Role } from '@security/get_role/types'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Id, Metadata, Name, Username } from '@_types/common'
 import { long } from '@_types/Numeric'
diff --git a/specification/security/_types/Bulk.ts b/specification/security/_types/Bulk.ts
index bff4806526..33f5909907 100644
--- a/specification/security/_types/Bulk.ts
+++ b/specification/security/_types/Bulk.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { integer } from '@_types/Numeric'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { ErrorCause } from '@_types/Errors'
+import { integer } from '@_types/Numeric'
 
 export class BulkError {
   /**
diff --git a/specification/security/_types/Privileges.ts b/specification/security/_types/Privileges.ts
index 289615d6d1..137bf81105 100644
--- a/specification/security/_types/Privileges.ts
+++ b/specification/security/_types/Privileges.ts
@@ -18,11 +18,11 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Id, Indices } from '@_types/common'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
+import { ScriptLanguage } from '@_types/Scripting'
 import { FieldSecurity } from './FieldSecurity'
-import { ScriptLanguage, ScriptBase, Script } from '@_types/Scripting'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 export class ApplicationPrivileges {
   /**
diff --git a/specification/security/_types/RoleDescriptor.ts b/specification/security/_types/RoleDescriptor.ts
index b4fe70db0f..6c8130860b 100644
--- a/specification/security/_types/RoleDescriptor.ts
+++ b/specification/security/_types/RoleDescriptor.ts
@@ -17,13 +17,16 @@
  * under the License.
  */
 
-import { ClusterPrivilege, GlobalPrivilege } from './Privileges'
-import { IndicesPrivileges } from './Privileges'
-import { ApplicationPrivileges } from './Privileges'
-import { Metadata } from '@_types/common'
 import { OverloadOf } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { Metadata } from '@_types/common'
+import {
+  ApplicationPrivileges,
+  ClusterPrivilege,
+  GlobalPrivilege,
+  IndicesPrivileges
+} from './Privileges'
 
 export class RoleDescriptor {
   /**
diff --git a/specification/security/_types/RoleMappingRule.ts b/specification/security/_types/RoleMappingRule.ts
index 85b52882a8..236549b6d4 100644
--- a/specification/security/_types/RoleMappingRule.ts
+++ b/specification/security/_types/RoleMappingRule.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
-import { Name, Names } from '@_types/common'
+import { Names } from '@_types/common'
 
 /**
  * @variants container
diff --git a/specification/security/_types/UserProfile.ts b/specification/security/_types/UserProfile.ts
index b92fc0858b..bbdb996d38 100644
--- a/specification/security/_types/UserProfile.ts
+++ b/specification/security/_types/UserProfile.ts
@@ -19,9 +19,8 @@
 
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
-import { Username, Name } from '@_types/common'
+import { Name, SequenceNumber, Username } from '@_types/common'
 import { long } from '@_types/Numeric'
-import { SequenceNumber } from '@_types/common'
 
 export type UserProfileId = string
 
diff --git a/specification/security/activate_user_profile/Request.ts b/specification/security/activate_user_profile/Request.ts
index a54ea70156..b8d0243c32 100644
--- a/specification/security/activate_user_profile/Request.ts
+++ b/specification/security/activate_user_profile/Request.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { RequestBase } from '@_types/Base'
 import { GrantType } from '@security/_types/GrantType'
+import { RequestBase } from '@_types/Base'
 
 /**
  * Creates or updates a user profile on behalf of another user.
diff --git a/specification/security/bulk_delete_role/SecurityBulkDeleteRoleResponse.ts b/specification/security/bulk_delete_role/SecurityBulkDeleteRoleResponse.ts
index c0550e3112..7847667c00 100644
--- a/specification/security/bulk_delete_role/SecurityBulkDeleteRoleResponse.ts
+++ b/specification/security/bulk_delete_role/SecurityBulkDeleteRoleResponse.ts
@@ -17,9 +17,6 @@
  * under the License.
  */
 
-import { Dictionary } from '@spec_utils/Dictionary'
-import { ErrorCause } from '@_types/Errors'
-import { integer } from '@_types/Numeric'
 import { BulkError } from '@security/_types/Bulk'
 
 export class Response {
diff --git a/specification/security/bulk_put_role/SecurityBulkPutRoleRequest.ts b/specification/security/bulk_put_role/SecurityBulkPutRoleRequest.ts
index cd85fe3d3b..ebeab2dc36 100644
--- a/specification/security/bulk_put_role/SecurityBulkPutRoleRequest.ts
+++ b/specification/security/bulk_put_role/SecurityBulkPutRoleRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { RoleDescriptor } from '@security/_types/RoleDescriptor'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { RequestBase } from '@_types/Base'
 import { Refresh } from '@_types/common'
-import { RoleDescriptor } from '@security/_types/RoleDescriptor'
 
 /**
  * The role management APIs are generally the preferred way to manage roles, rather than using file-based role management.
diff --git a/specification/security/create_api_key/SecurityCreateApiKeyRequest.ts b/specification/security/create_api_key/SecurityCreateApiKeyRequest.ts
index 427538f874..e5f6f2bb89 100644
--- a/specification/security/create_api_key/SecurityCreateApiKeyRequest.ts
+++ b/specification/security/create_api_key/SecurityCreateApiKeyRequest.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
+import { RoleDescriptor } from '@security/_types/RoleDescriptor'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { RequestBase } from '@_types/Base'
 import { Metadata, Name, Refresh } from '@_types/common'
 import { Duration } from '@_types/Time'
-import { RoleDescriptor } from '@security/_types/RoleDescriptor'
 
 /**
  * Create an API key.
diff --git a/specification/security/create_service_token/CreateServiceTokenRequest.ts b/specification/security/create_service_token/CreateServiceTokenRequest.ts
index 2e822eb7ed..ce6ed1fda2 100644
--- a/specification/security/create_service_token/CreateServiceTokenRequest.ts
+++ b/specification/security/create_service_token/CreateServiceTokenRequest.ts
@@ -18,8 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { Name, Namespace, Service } from '@_types/common'
-import { Refresh } from '@_types/common'
+import { Name, Namespace, Refresh, Service } from '@_types/common'
 
 /**
  * Creates a service accounts token for access without requiring basic authentication.
diff --git a/specification/security/disable_user_profile/Request.ts b/specification/security/disable_user_profile/Request.ts
index 1b7787fd07..eb31d02362 100644
--- a/specification/security/disable_user_profile/Request.ts
+++ b/specification/security/disable_user_profile/Request.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { UserProfileId } from '@security/_types/UserProfile'
 import { RequestBase } from '@_types/Base'
 import { Refresh } from '@_types/common'
-import { UserProfileId } from '@security/_types/UserProfile'
 
 /**
  * Disables a user profile so it's not visible in user profile searches.
diff --git a/specification/security/enable_user_profile/Request.ts b/specification/security/enable_user_profile/Request.ts
index 1d1f1513c9..fd06852d3c 100644
--- a/specification/security/enable_user_profile/Request.ts
+++ b/specification/security/enable_user_profile/Request.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { UserProfileId } from '@security/_types/UserProfile'
 import { RequestBase } from '@_types/Base'
 import { Refresh } from '@_types/common'
-import { UserProfileId } from '@security/_types/UserProfile'
 
 /**
  * Enables a user profile so it's visible in user profile searches.
diff --git a/specification/security/get_role/types.ts b/specification/security/get_role/types.ts
index 03419be67e..1ba672b074 100644
--- a/specification/security/get_role/types.ts
+++ b/specification/security/get_role/types.ts
@@ -18,13 +18,13 @@
  */
 
 import {
-  IndicesPrivileges,
-  ApplicationPrivileges
+  ApplicationPrivileges,
+  IndicesPrivileges
 } from '@security/_types/Privileges'
-import { Dictionary } from '@spec_utils/Dictionary'
-import { Metadata } from '@_types/common'
 import { RoleTemplate } from '@security/_types/RoleTemplate'
+import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { Metadata } from '@_types/common'
 
 export class Role {
   cluster: string[]
diff --git a/specification/security/get_service_credentials/GetServiceCredentialsResponse.ts b/specification/security/get_service_credentials/GetServiceCredentialsResponse.ts
index 112d95593f..9c7025f164 100644
--- a/specification/security/get_service_credentials/GetServiceCredentialsResponse.ts
+++ b/specification/security/get_service_credentials/GetServiceCredentialsResponse.ts
@@ -18,7 +18,7 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { EmptyObject, Metadata, Name } from '@_types/common'
+import { Metadata } from '@_types/common'
 import { integer } from '@_types/Numeric'
 import { NodesCredentials } from './types'
 
diff --git a/specification/security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts b/specification/security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts
index 6d0b6cbebd..b9341ed6fe 100644
--- a/specification/security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts
+++ b/specification/security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts
@@ -18,9 +18,8 @@
  */
 
 import {
-  IndicesPrivileges,
-  GlobalPrivilege,
   ApplicationPrivileges,
+  GlobalPrivilege,
   UserIndicesPrivileges
 } from '@security/_types/Privileges'
 
diff --git a/specification/security/get_user_profile/Request.ts b/specification/security/get_user_profile/Request.ts
index 9ff920db8c..b65916328a 100644
--- a/specification/security/get_user_profile/Request.ts
+++ b/specification/security/get_user_profile/Request.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { RequestBase } from '@_types/Base'
 import { UserProfileId } from '@security/_types/UserProfile'
+import { RequestBase } from '@_types/Base'
 
 /**
  * Retrieves a user's profile using the unique profile ID.
diff --git a/specification/security/grant_api_key/SecurityGrantApiKeyRequest.ts b/specification/security/grant_api_key/SecurityGrantApiKeyRequest.ts
index df5f3eaf68..60690cc003 100644
--- a/specification/security/grant_api_key/SecurityGrantApiKeyRequest.ts
+++ b/specification/security/grant_api_key/SecurityGrantApiKeyRequest.ts
@@ -19,7 +19,7 @@
 
 import { RequestBase } from '@_types/Base'
 import { Password, Username } from '@_types/common'
-import { GrantApiKey, ApiKeyGrantType } from './types'
+import { ApiKeyGrantType, GrantApiKey } from './types'
 
 /**
  * Creates an API key on behalf of another user.
diff --git a/specification/security/has_privileges_user_profile/Request.ts b/specification/security/has_privileges_user_profile/Request.ts
index 5b8a9c541a..d8487d4c1c 100644
--- a/specification/security/has_privileges_user_profile/Request.ts
+++ b/specification/security/has_privileges_user_profile/Request.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { RequestBase } from '@_types/Base'
 import { UserProfileId } from '@security/_types/UserProfile'
+import { RequestBase } from '@_types/Base'
 import { PrivilegesCheck } from './types'
 
 /**
diff --git a/specification/security/put_role/SecurityPutRoleRequest.ts b/specification/security/put_role/SecurityPutRoleRequest.ts
index 7ab61f878c..af4e3d723b 100644
--- a/specification/security/put_role/SecurityPutRoleRequest.ts
+++ b/specification/security/put_role/SecurityPutRoleRequest.ts
@@ -18,9 +18,9 @@
  */
 
 import {
-  IndicesPrivileges,
+  ApplicationPrivileges,
   ClusterPrivilege,
-  ApplicationPrivileges
+  IndicesPrivileges
 } from '@security/_types/Privileges'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
diff --git a/specification/security/put_role_mapping/SecurityPutRoleMappingRequest.ts b/specification/security/put_role_mapping/SecurityPutRoleMappingRequest.ts
index d00c14682b..2ad9aba1e1 100644
--- a/specification/security/put_role_mapping/SecurityPutRoleMappingRequest.ts
+++ b/specification/security/put_role_mapping/SecurityPutRoleMappingRequest.ts
@@ -18,9 +18,9 @@
  */
 
 import { RoleMappingRule } from '@security/_types/RoleMappingRule'
+import { RoleTemplate } from '@security/_types/RoleTemplate'
 import { RequestBase } from '@_types/Base'
 import { Metadata, Name, Refresh } from '@_types/common'
-import { RoleTemplate } from '@security/_types/RoleTemplate'
 
 /**
  * @rest_spec_name security.put_role_mapping
diff --git a/specification/security/query_api_keys/QueryApiKeysRequest.ts b/specification/security/query_api_keys/QueryApiKeysRequest.ts
index 8e34409834..74ffb932be 100644
--- a/specification/security/query_api_keys/QueryApiKeysRequest.ts
+++ b/specification/security/query_api_keys/QueryApiKeysRequest.ts
@@ -18,10 +18,10 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { ApiKeyAggregationContainer, ApiKeyQueryContainer } from './types'
 import { RequestBase } from '@_types/Base'
 import { integer } from '@_types/Numeric'
 import { Sort, SortResults } from '@_types/sort'
+import { ApiKeyAggregationContainer, ApiKeyQueryContainer } from './types'
 
 /**
  * Query API keys.
diff --git a/specification/security/query_api_keys/QueryApiKeysResponse.ts b/specification/security/query_api_keys/QueryApiKeysResponse.ts
index fc5b7c7619..44a9fc05df 100644
--- a/specification/security/query_api_keys/QueryApiKeysResponse.ts
+++ b/specification/security/query_api_keys/QueryApiKeysResponse.ts
@@ -18,9 +18,9 @@
  */
 
 import { ApiKey } from '@security/_types/ApiKey'
-import { integer } from '@_types/Numeric'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { AggregateName } from '@_types/common'
+import { integer } from '@_types/Numeric'
 import { ApiKeyAggregate } from './types'
 
 export class Response {
diff --git a/specification/security/query_api_keys/types.ts b/specification/security/query_api_keys/types.ts
index a0ef7c96e4..695e71cdf3 100644
--- a/specification/security/query_api_keys/types.ts
+++ b/specification/security/query_api_keys/types.ts
@@ -17,21 +17,23 @@
  * under the License.
  */
 
-import { Dictionary } from '@spec_utils/Dictionary'
-import { SingleKeyDictionary } from '@spec_utils/Dictionary'
-import { Metadata, Field } from '@_types/common'
-import { BoolQuery } from '@_types/query_dsl/compound'
+import { Dictionary, SingleKeyDictionary } from '@spec_utils/Dictionary'
 import {
-  ExistsQuery,
-  IdsQuery,
-  PrefixQuery,
-  RangeQuery,
-  TermQuery,
-  TermsQuery,
-  WildcardQuery
-} from '@_types/query_dsl/term'
-import { MatchQuery, SimpleQueryStringQuery } from '@_types/query_dsl/fulltext'
-import { MatchAllQuery } from '@_types/query_dsl/MatchAllQuery'
+  Buckets,
+  CardinalityAggregate,
+  CompositeAggregate,
+  DateRangeAggregate,
+  DoubleTermsAggregate,
+  FilterAggregate,
+  FiltersAggregate,
+  LongTermsAggregate,
+  MissingAggregate,
+  MultiTermsAggregate,
+  RangeAggregate,
+  StringTermsAggregate,
+  UnmappedTermsAggregate,
+  ValueCountAggregate
+} from '@_types/aggregations/Aggregate'
 import {
   BucketAggregationBase,
   CompositeAggregation,
@@ -44,22 +46,19 @@ import {
   CardinalityAggregation,
   ValueCountAggregation
 } from '@_types/aggregations/metric'
+import { Field, Metadata } from '@_types/common'
+import { BoolQuery } from '@_types/query_dsl/compound'
+import { MatchQuery, SimpleQueryStringQuery } from '@_types/query_dsl/fulltext'
+import { MatchAllQuery } from '@_types/query_dsl/MatchAllQuery'
 import {
-  Buckets,
-  CardinalityAggregate,
-  ValueCountAggregate,
-  StringTermsAggregate,
-  LongTermsAggregate,
-  DoubleTermsAggregate,
-  UnmappedTermsAggregate,
-  MultiTermsAggregate,
-  MissingAggregate,
-  FilterAggregate,
-  RangeAggregate,
-  DateRangeAggregate,
-  FiltersAggregate,
-  CompositeAggregate
-} from '@_types/aggregations/Aggregate'
+  ExistsQuery,
+  IdsQuery,
+  PrefixQuery,
+  RangeQuery,
+  TermQuery,
+  TermsQuery,
+  WildcardQuery
+} from '@_types/query_dsl/term'
 
 /**
  * @variants container
diff --git a/specification/security/query_role/QueryRolesRequest.ts b/specification/security/query_role/QueryRolesRequest.ts
index f6ec334868..63fce15d68 100644
--- a/specification/security/query_role/QueryRolesRequest.ts
+++ b/specification/security/query_role/QueryRolesRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { RoleQueryContainer } from './types'
 import { RequestBase } from '@_types/Base'
 import { integer } from '@_types/Numeric'
 import { Sort, SortResults } from '@_types/sort'
+import { RoleQueryContainer } from './types'
 
 /**
  * Retrieves roles in a paginated manner. You can optionally filter the results with a query.
diff --git a/specification/security/query_role/types.ts b/specification/security/query_role/types.ts
index c1d2804620..d856db71d1 100644
--- a/specification/security/query_role/types.ts
+++ b/specification/security/query_role/types.ts
@@ -17,10 +17,12 @@
  * under the License.
  */
 
+import { RoleDescriptor } from '@security/_types/RoleDescriptor'
 import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 import { Field } from '@_types/common'
 import { BoolQuery } from '@_types/query_dsl/compound'
-import { SortResults } from '@_types/sort'
+import { MatchQuery, SimpleQueryStringQuery } from '@_types/query_dsl/fulltext'
+import { MatchAllQuery } from '@_types/query_dsl/MatchAllQuery'
 import {
   ExistsQuery,
   IdsQuery,
@@ -30,9 +32,7 @@ import {
   TermsQuery,
   WildcardQuery
 } from '@_types/query_dsl/term'
-import { MatchQuery, SimpleQueryStringQuery } from '@_types/query_dsl/fulltext'
-import { MatchAllQuery } from '@_types/query_dsl/MatchAllQuery'
-import { RoleDescriptor } from '@security/_types/RoleDescriptor'
+import { SortResults } from '@_types/sort'
 
 /**
  * @variants container
diff --git a/specification/security/query_user/SecurityQueryUserRequest.ts b/specification/security/query_user/SecurityQueryUserRequest.ts
index 977c7bdba2..e48823cdf3 100644
--- a/specification/security/query_user/SecurityQueryUserRequest.ts
+++ b/specification/security/query_user/SecurityQueryUserRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { UserQueryContainer } from './types'
 import { RequestBase } from '@_types/Base'
 import { integer } from '@_types/Numeric'
 import { Sort, SortResults } from '@_types/sort'
+import { UserQueryContainer } from './types'
 
 /**
  * Retrieves information for Users in a paginated manner. You can optionally filter the results with a query.
diff --git a/specification/security/query_user/SecurityQueryUserResponse.ts b/specification/security/query_user/SecurityQueryUserResponse.ts
index c37d6344c5..fa1f6511ef 100644
--- a/specification/security/query_user/SecurityQueryUserResponse.ts
+++ b/specification/security/query_user/SecurityQueryUserResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { integer } from '@_types/Numeric'
 import { QueryUser } from '@security/query_user/types'
+import { integer } from '@_types/Numeric'
 
 export class Response {
   body: {
diff --git a/specification/security/query_user/types.ts b/specification/security/query_user/types.ts
index e3c19f621a..fe45503460 100644
--- a/specification/security/query_user/types.ts
+++ b/specification/security/query_user/types.ts
@@ -17,10 +17,12 @@
  * under the License.
  */
 
+import { User } from '@security/_types/User'
 import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 import { Field } from '@_types/common'
 import { BoolQuery } from '@_types/query_dsl/compound'
-import { SortResults } from '@_types/sort'
+import { MatchQuery, SimpleQueryStringQuery } from '@_types/query_dsl/fulltext'
+import { MatchAllQuery } from '@_types/query_dsl/MatchAllQuery'
 import {
   ExistsQuery,
   IdsQuery,
@@ -30,9 +32,7 @@ import {
   TermsQuery,
   WildcardQuery
 } from '@_types/query_dsl/term'
-import { MatchQuery, SimpleQueryStringQuery } from '@_types/query_dsl/fulltext'
-import { MatchAllQuery } from '@_types/query_dsl/MatchAllQuery'
-import { User } from '@security/_types/User'
+import { SortResults } from '@_types/sort'
 
 /**
  * @variants container
diff --git a/specification/security/suggest_user_profiles/Response.ts b/specification/security/suggest_user_profiles/Response.ts
index c66e2da808..c72c7aec8d 100644
--- a/specification/security/suggest_user_profiles/Response.ts
+++ b/specification/security/suggest_user_profiles/Response.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { UserProfile } from '@security/_types/UserProfile'
 import { RelationName } from '@_types/common'
 import { long } from '@_types/Numeric'
-import { UserProfile } from '@security/_types/UserProfile'
 
 export class TotalUserProfiles {
   value: long
diff --git a/specification/security/update_api_key/Request.ts b/specification/security/update_api_key/Request.ts
index 7e14a5c740..117424c44f 100644
--- a/specification/security/update_api_key/Request.ts
+++ b/specification/security/update_api_key/Request.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { RoleDescriptor } from '@security/_types/RoleDescriptor'
+import { Dictionary } from '@spec_utils/Dictionary'
 import { RequestBase } from '@_types/Base'
 import { Id, Metadata } from '@_types/common'
-import { Dictionary } from '@spec_utils/Dictionary'
-import { RoleDescriptor } from '@security/_types/RoleDescriptor'
 import { Duration } from '@_types/Time'
 
 /**
diff --git a/specification/security/update_user_profile_data/Request.ts b/specification/security/update_user_profile_data/Request.ts
index d82ea2ecd0..ef6d3d83bb 100644
--- a/specification/security/update_user_profile_data/Request.ts
+++ b/specification/security/update_user_profile_data/Request.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
+import { UserProfileId } from '@security/_types/UserProfile'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { RequestBase } from '@_types/Base'
 import { Refresh, SequenceNumber } from '@_types/common'
 import { long } from '@_types/Numeric'
-import { UserProfileId } from '@security/_types/UserProfile'
 
 /**
  * Updates specific data for the user profile that's associated with the specified unique ID.
diff --git a/specification/slm/_types/SnapshotLifecycle.ts b/specification/slm/_types/SnapshotLifecycle.ts
index d0e1b0bcd3..9d46e2ca14 100644
--- a/specification/slm/_types/SnapshotLifecycle.ts
+++ b/specification/slm/_types/SnapshotLifecycle.ts
@@ -28,11 +28,11 @@ import {
 } from '@_types/common'
 import { integer, long } from '@_types/Numeric'
 import {
-  Duration,
   DateTime,
-  UnitMillis,
+  Duration,
+  DurationValue,
   EpochTime,
-  DurationValue
+  UnitMillis
 } from '@_types/Time'
 
 export class SnapshotLifecycle {
diff --git a/specification/snapshot/_types/SnapshotInfo.ts b/specification/snapshot/_types/SnapshotInfo.ts
index 71fa21aa40..0e564a013a 100644
--- a/specification/snapshot/_types/SnapshotInfo.ts
+++ b/specification/snapshot/_types/SnapshotInfo.ts
@@ -28,11 +28,11 @@ import {
 } from '@_types/common'
 import { ShardStatistics } from '@_types/Stats'
 import {
-  Duration,
   DateTime,
+  Duration,
   DurationValue,
-  UnitMillis,
-  EpochTime
+  EpochTime,
+  UnitMillis
 } from '@_types/Time'
 import { IndexDetails } from './SnapshotIndexDetails'
 import { InfoFeatureState } from './SnapshotInfoFeatureState'
diff --git a/specification/snapshot/_types/SnapshotShardsStatus.ts b/specification/snapshot/_types/SnapshotShardsStatus.ts
index 86700ab221..1c05bd6cf7 100644
--- a/specification/snapshot/_types/SnapshotShardsStatus.ts
+++ b/specification/snapshot/_types/SnapshotShardsStatus.ts
@@ -18,8 +18,8 @@
  */
 
 import { long } from '@_types/Numeric'
-import { ShardsStatsStage } from './SnapshotShardsStatsStage'
 import { Duration, DurationValue, EpochTime, UnitMillis } from '@_types/Time'
+import { ShardsStatsStage } from './SnapshotShardsStatsStage'
 
 export class SnapshotShardsStatus {
   stage: ShardsStatsStage
diff --git a/specification/snapshot/_types/SnapshotStats.ts b/specification/snapshot/_types/SnapshotStats.ts
index 812dccacb3..7ced0386a0 100644
--- a/specification/snapshot/_types/SnapshotStats.ts
+++ b/specification/snapshot/_types/SnapshotStats.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { FileCountSnapshotStats } from './FileCountSnapshotStats'
 import { Duration, DurationValue, EpochTime, UnitMillis } from '@_types/Time'
+import { FileCountSnapshotStats } from './FileCountSnapshotStats'
 
 export class SnapshotStats {
   incremental: FileCountSnapshotStats
diff --git a/specification/snapshot/get/SnapshotGetRequest.ts b/specification/snapshot/get/SnapshotGetRequest.ts
index 3ca67fe66f..0ecdcd1281 100644
--- a/specification/snapshot/get/SnapshotGetRequest.ts
+++ b/specification/snapshot/get/SnapshotGetRequest.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
+import { SnapshotSort } from '@snapshot/_types/SnapshotInfo'
 import { RequestBase } from '@_types/Base'
 import { Name, Names } from '@_types/common'
-import { Duration } from '@_types/Time'
-import { SnapshotSort } from '@snapshot/_types/SnapshotInfo'
 import { integer } from '@_types/Numeric'
 import { SortOrder } from '@_types/sort'
+import { Duration } from '@_types/Time'
 
 /**
  * @rest_spec_name snapshot.get
diff --git a/specification/sql/get_async/SqlGetAsyncRequest.ts b/specification/sql/get_async/SqlGetAsyncRequest.ts
index 524c92e74e..e4f0d12baf 100644
--- a/specification/sql/get_async/SqlGetAsyncRequest.ts
+++ b/specification/sql/get_async/SqlGetAsyncRequest.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { Duration } from '@_types/Time'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
+import { Duration } from '@_types/Time'
 
 /**
  * @rest_spec_name sql.get_async
diff --git a/specification/sql/get_async_status/SqlGetAsyncStatusRequest.ts b/specification/sql/get_async_status/SqlGetAsyncStatusRequest.ts
index 26a91afc4a..a66076b6d7 100644
--- a/specification/sql/get_async_status/SqlGetAsyncStatusRequest.ts
+++ b/specification/sql/get_async_status/SqlGetAsyncStatusRequest.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { Duration } from '@_types/Time'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 
diff --git a/specification/sql/translate/TranslateSqlResponse.ts b/specification/sql/translate/TranslateSqlResponse.ts
index 24f376c555..3fd2c6cc20 100644
--- a/specification/sql/translate/TranslateSqlResponse.ts
+++ b/specification/sql/translate/TranslateSqlResponse.ts
@@ -17,13 +17,12 @@
  * under the License.
  */
 
-import { Sort } from '@_types/sort'
 import { SourceConfig } from '@global/search/_types/SourceFilter'
 import { Dictionary } from '@spec_utils/Dictionary'
-import { Field, Fields } from '@_types/common'
+import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
 import { long } from '@_types/Numeric'
 import { FieldAndFormat, QueryContainer } from '@_types/query_dsl/abstractions'
-import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
+import { Sort } from '@_types/sort'
 
 export class Response {
   // This is a subset of SearchRequest's body (same data structure in the ES code)
diff --git a/specification/synonyms/_types/SynonymRule.ts b/specification/synonyms/_types/SynonymRule.ts
index 5c96b06107..9fa469233b 100644
--- a/specification/synonyms/_types/SynonymRule.ts
+++ b/specification/synonyms/_types/SynonymRule.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Id } from '@_types/common'
 import { OverloadOf } from '@spec_utils/behaviors'
+import { Id } from '@_types/common'
 
 export type SynonymString = string
 
diff --git a/specification/synonyms/_types/SynonymsUpdateResult.ts b/specification/synonyms/_types/SynonymsUpdateResult.ts
index 2d2e3722f6..ef65372897 100644
--- a/specification/synonyms/_types/SynonymsUpdateResult.ts
+++ b/specification/synonyms/_types/SynonymsUpdateResult.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Result } from '@_types/Result'
 import { ReloadResult } from '@indices/reload_search_analyzers/types'
+import { Result } from '@_types/Result'
 
 export class SynonymsUpdateResult {
   /**
diff --git a/specification/synonyms/get_synonyms_sets/SynonymsSetsGetResponse.ts b/specification/synonyms/get_synonyms_sets/SynonymsSetsGetResponse.ts
index f50b41d60d..13fc27fa8a 100644
--- a/specification/synonyms/get_synonyms_sets/SynonymsSetsGetResponse.ts
+++ b/specification/synonyms/get_synonyms_sets/SynonymsSetsGetResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { integer } from '@_types/Numeric'
 import { Id } from '@_types/common'
+import { integer } from '@_types/Numeric'
 
 export class Response {
   body: {
diff --git a/specification/synonyms/put_synonym/SynonymsPutResponse.ts b/specification/synonyms/put_synonym/SynonymsPutResponse.ts
index d8728f7f1d..26cce885f0 100644
--- a/specification/synonyms/put_synonym/SynonymsPutResponse.ts
+++ b/specification/synonyms/put_synonym/SynonymsPutResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Result } from '@_types/Result'
 import { ReloadResult } from '@indices/reload_search_analyzers/types'
+import { Result } from '@_types/Result'
 
 export class Response {
   body: {
diff --git a/specification/tasks/_types/TaskInfo.ts b/specification/tasks/_types/TaskInfo.ts
index bdeddff2dd..5752ad6c06 100644
--- a/specification/tasks/_types/TaskInfo.ts
+++ b/specification/tasks/_types/TaskInfo.ts
@@ -17,9 +17,10 @@
  * under the License.
  */
 
+import { Dictionary } from '@spec_utils/Dictionary'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { NodeId, TaskId } from '@_types/common'
 import { long } from '@_types/Numeric'
-import { Dictionary } from '@spec_utils/Dictionary'
 import {
   Duration,
   DurationValue,
@@ -27,7 +28,6 @@ import {
   UnitMillis,
   UnitNanos
 } from '@_types/Time'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 export class TaskInfo {
   action: string
diff --git a/specification/tasks/_types/TaskListResponseBase.ts b/specification/tasks/_types/TaskListResponseBase.ts
index a99be5e4d2..39cd2a7d3b 100644
--- a/specification/tasks/_types/TaskListResponseBase.ts
+++ b/specification/tasks/_types/TaskListResponseBase.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { ErrorCause, TaskFailure } from '@_types/Errors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { TaskInfo } from '@tasks/_types/TaskInfo'
 import { NodeId, TaskId } from '@_types/common'
+import { ErrorCause, TaskFailure } from '@_types/Errors'
 import { Host, Ip, TransportAddress } from '@_types/Networking'
 
 export class TaskListResponseBase {
diff --git a/specification/tasks/get/GetTaskResponse.ts b/specification/tasks/get/GetTaskResponse.ts
index 49000d9b00..d654ba51ff 100644
--- a/specification/tasks/get/GetTaskResponse.ts
+++ b/specification/tasks/get/GetTaskResponse.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { ErrorCause } from '@_types/Errors'
 import { TaskInfo } from '../_types/TaskInfo'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 export class Response {
   body: {
diff --git a/specification/tasks/list/ListTasksRequest.ts b/specification/tasks/list/ListTasksRequest.ts
index 6f97d7b628..c829cb4a2e 100644
--- a/specification/tasks/list/ListTasksRequest.ts
+++ b/specification/tasks/list/ListTasksRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { GroupBy } from '@tasks/_types/GroupBy'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
 import { Duration } from '@_types/Time'
-import { GroupBy } from '@tasks/_types/GroupBy'
 
 /**
  * The task management API returns information about tasks currently executing on one or more nodes in the cluster.
diff --git a/specification/text_structure/test_grok_pattern/types.ts b/specification/text_structure/test_grok_pattern/types.ts
index 0777987a66..ff6ba01b0f 100644
--- a/specification/text_structure/test_grok_pattern/types.ts
+++ b/specification/text_structure/test_grok_pattern/types.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { integer } from '@_types/Numeric'
 import { Dictionary } from '@spec_utils/Dictionary'
+import { integer } from '@_types/Numeric'
 
 export class MatchedField {
   match: string
diff --git a/specification/transform/get_transform/GetTransformRequest.ts b/specification/transform/get_transform/GetTransformRequest.ts
index 4b520519d0..b49a7b6ebd 100644
--- a/specification/transform/get_transform/GetTransformRequest.ts
+++ b/specification/transform/get_transform/GetTransformRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { Name, Names } from '@_types/common'
+import { Names } from '@_types/common'
 import { integer } from '@_types/Numeric'
 
 /**
diff --git a/specification/transform/get_transform/types.ts b/specification/transform/get_transform/types.ts
index 38b4cf9268..a97902bac1 100644
--- a/specification/transform/get_transform/types.ts
+++ b/specification/transform/get_transform/types.ts
@@ -18,6 +18,7 @@
  */
 
 import { Destination } from '@global/reindex/types'
+import { TransformAuthorization } from '@ml/_types/Authorization'
 import {
   Latest,
   Pivot,
@@ -26,7 +27,6 @@ import {
   Source,
   SyncContainer
 } from '@transform/_types/Transform'
-import { TransformAuthorization } from '@ml/_types/Authorization'
 import { Id, Metadata, VersionString } from '@_types/common'
 import { Duration, EpochTime, UnitMillis } from '@_types/Time'
 
diff --git a/specification/transform/get_transform_stats/types.ts b/specification/transform/get_transform_stats/types.ts
index bbafa45f2b..9e65cf5333 100644
--- a/specification/transform/get_transform_stats/types.ts
+++ b/specification/transform/get_transform_stats/types.ts
@@ -22,10 +22,10 @@ import { NodeAttributes } from '@_types/Node'
 import { double, long } from '@_types/Numeric'
 import {
   DateTime,
-  UnitMillis,
   DurationValue,
+  EpochTime,
   UnitFloatMillis,
-  EpochTime
+  UnitMillis
 } from '@_types/Time'
 
 export class TransformStats {
diff --git a/specification/transform/preview_transform/PreviewTransformRequest.ts b/specification/transform/preview_transform/PreviewTransformRequest.ts
index 6ff10ec678..8021bef3e6 100644
--- a/specification/transform/preview_transform/PreviewTransformRequest.ts
+++ b/specification/transform/preview_transform/PreviewTransformRequest.ts
@@ -23,8 +23,8 @@ import {
   Pivot,
   RetentionPolicyContainer,
   Settings,
-  SyncContainer,
-  Source
+  Source,
+  SyncContainer
 } from '@transform/_types/Transform'
 import { RequestBase } from '@_types/Base'
 import { Id } from '@_types/common'
diff --git a/specification/transform/put_transform/PutTransformRequest.ts b/specification/transform/put_transform/PutTransformRequest.ts
index ad447d63f2..0888e53d94 100644
--- a/specification/transform/put_transform/PutTransformRequest.ts
+++ b/specification/transform/put_transform/PutTransformRequest.ts
@@ -18,13 +18,13 @@
  */
 
 import {
+  Destination,
   Latest,
   Pivot,
   RetentionPolicyContainer,
   Settings,
-  SyncContainer,
-  Destination,
-  Source
+  Source,
+  SyncContainer
 } from '@transform/_types/Transform'
 import { RequestBase } from '@_types/Base'
 import { Id, Metadata } from '@_types/common'
diff --git a/specification/transform/update_transform/UpdateTransformRequest.ts b/specification/transform/update_transform/UpdateTransformRequest.ts
index 36af770aed..41be602972 100644
--- a/specification/transform/update_transform/UpdateTransformRequest.ts
+++ b/specification/transform/update_transform/UpdateTransformRequest.ts
@@ -18,11 +18,11 @@
  */
 
 import {
+  Destination,
   RetentionPolicyContainer,
   Settings,
-  SyncContainer,
-  Destination,
-  Source
+  Source,
+  SyncContainer
 } from '@transform/_types/Transform'
 import { RequestBase } from '@_types/Base'
 import { Id, Metadata } from '@_types/common'
diff --git a/specification/watcher/_types/Action.ts b/specification/watcher/_types/Action.ts
index 4b8357cf86..cb1796fd94 100644
--- a/specification/watcher/_types/Action.ts
+++ b/specification/watcher/_types/Action.ts
@@ -20,21 +20,15 @@
 import { Dictionary } from '@spec_utils/Dictionary'
 import { IndexName, Name } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import {
-  DateTime,
-  Duration,
-  DurationValue,
-  EpochTime,
-  UnitMillis
-} from '@_types/Time'
+import { DateTime, Duration, DurationValue, UnitMillis } from '@_types/Time'
 import { TransformContainer } from '@_types/Transform'
 import {
+  EmailAction,
   IndexAction,
   LoggingAction,
-  WebhookAction,
-  EmailAction,
   PagerDutyAction,
-  SlackAction
+  SlackAction,
+  WebhookAction
 } from './Actions'
 import { ConditionContainer } from './Conditions'
 
diff --git a/specification/watcher/_types/Actions.ts b/specification/watcher/_types/Actions.ts
index c61c650c19..20e3655620 100644
--- a/specification/watcher/_types/Actions.ts
+++ b/specification/watcher/_types/Actions.ts
@@ -32,7 +32,7 @@ import {
 import { Host } from '@_types/Networking'
 import { integer } from '@_types/Numeric'
 import { Result } from '@_types/Result'
-import { Duration, DateTime, EpochTime, UnitSeconds } from '@_types/Time'
+import { DateTime, Duration, EpochTime, UnitSeconds } from '@_types/Time'
 import { HttpInputRequestDefinition } from './Input'
 
 // PagerDuty ----------------------------- //
diff --git a/specification/watcher/_types/Conditions.ts b/specification/watcher/_types/Conditions.ts
index 9b459c8130..b94f2574ba 100644
--- a/specification/watcher/_types/Conditions.ts
+++ b/specification/watcher/_types/Conditions.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+import { AdditionalProperty } from '@spec_utils/behaviors'
 import { Dictionary, SingleKeyDictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { FieldValue } from '@_types/common'
-import { AdditionalProperty } from '@spec_utils/behaviors'
 
 export class AlwaysCondition {}
 
diff --git a/specification/watcher/_types/Execution.ts b/specification/watcher/_types/Execution.ts
index 83b1a47458..2a134ac7c4 100644
--- a/specification/watcher/_types/Execution.ts
+++ b/specification/watcher/_types/Execution.ts
@@ -21,7 +21,7 @@ import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Id } from '@_types/common'
 import { ErrorCause } from '@_types/Errors'
-import { integer, long } from '@_types/Numeric'
+import { long } from '@_types/Numeric'
 import { DateTime, DurationValue, UnitMillis } from '@_types/Time'
 import { ActionStatusOptions, ActionType } from './Action'
 import {
diff --git a/specification/watcher/_types/Watch.ts b/specification/watcher/_types/Watch.ts
index b97f04c389..e3f5bf97f2 100644
--- a/specification/watcher/_types/Watch.ts
+++ b/specification/watcher/_types/Watch.ts
@@ -25,7 +25,7 @@ import {
   SequenceNumber,
   VersionNumber
 } from '@_types/common'
-import { integer, long } from '@_types/Numeric'
+import { integer } from '@_types/Numeric'
 import { DateTime, Duration, DurationValue, UnitMillis } from '@_types/Time'
 import { TransformContainer } from '@_types/Transform'
 import { Action, Actions } from './Action'
diff --git a/specification/watcher/put_watch/WatcherPutWatchRequest.ts b/specification/watcher/put_watch/WatcherPutWatchRequest.ts
index 0443b1503b..49da8991e3 100644
--- a/specification/watcher/put_watch/WatcherPutWatchRequest.ts
+++ b/specification/watcher/put_watch/WatcherPutWatchRequest.ts
@@ -23,7 +23,7 @@ import { ConditionContainer } from '@watcher/_types/Conditions'
 import { InputContainer } from '@watcher/_types/Input'
 import { TriggerContainer } from '@watcher/_types/Trigger'
 import { RequestBase } from '@_types/Base'
-import { Id, Metadata, VersionNumber, SequenceNumber } from '@_types/common'
+import { Id, Metadata, SequenceNumber, VersionNumber } from '@_types/common'
 import { long } from '@_types/Numeric'
 import { TransformContainer } from '@_types/Transform'
 
diff --git a/specification/watcher/query_watches/WatcherQueryWatchesRequest.ts b/specification/watcher/query_watches/WatcherQueryWatchesRequest.ts
index 25127236ad..97618a19c5 100644
--- a/specification/watcher/query_watches/WatcherQueryWatchesRequest.ts
+++ b/specification/watcher/query_watches/WatcherQueryWatchesRequest.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { Sort, SortResults } from '@_types/sort'
 import { RequestBase } from '@_types/Base'
 import { integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
+import { Sort, SortResults } from '@_types/sort'
 
 /**
  * @rest_spec_name watcher.query_watches
diff --git a/specification/watcher/query_watches/WatcherQueryWatchesResponse.ts b/specification/watcher/query_watches/WatcherQueryWatchesResponse.ts
index 8f74eaa37e..228b7ae2c3 100644
--- a/specification/watcher/query_watches/WatcherQueryWatchesResponse.ts
+++ b/specification/watcher/query_watches/WatcherQueryWatchesResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { QueryWatch } from '../_types/Watch'
 import { integer } from '@_types/Numeric'
+import { QueryWatch } from '../_types/Watch'
 
 export class Response {
   body: {
diff --git a/specification/watcher/stats/WatcherStatsResponse.ts b/specification/watcher/stats/WatcherStatsResponse.ts
index 85dd1db1d1..881dcecce2 100644
--- a/specification/watcher/stats/WatcherStatsResponse.ts
+++ b/specification/watcher/stats/WatcherStatsResponse.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { NodeStatistics } from '@_types/Node'
 import { Name } from '@_types/common'
+import { NodeStatistics } from '@_types/Node'
 import { WatcherNodeStats } from './types'
 
 export class Response {
diff --git a/specification/xpack/usage/types.ts b/specification/xpack/usage/types.ts
index bfd43ee2c7..2e95bf7993 100644
--- a/specification/xpack/usage/types.ts
+++ b/specification/xpack/usage/types.ts
@@ -18,14 +18,12 @@
  */
 
 import { Phases } from '@ilm/_types/Phase'
+import { JobStatistics } from '@ml/_types/Job'
 import { Statistics } from '@slm/_types/SnapshotLifecycle'
-import { Dictionary, SingleKeyDictionary } from '@spec_utils/Dictionary'
-import { ByteSize, EmptyObject, Field, Name } from '@_types/common'
-import { Job, JobStatistics } from '@ml/_types/Job'
+import { Dictionary } from '@spec_utils/Dictionary'
+import { ByteSize, Field, Name } from '@_types/common'
 import { double, integer, long, uint, ulong } from '@_types/Numeric'
-import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Duration, DurationValue, UnitMillis } from '@_types/Time'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 export class Base {
   available: boolean