diff --git a/specification/security/query_api_keys/QueryApiKeysRequest.ts b/specification/security/query_api_keys/QueryApiKeysRequest.ts
index ace0a9a8dd..ee6c1eec9a 100644
--- a/specification/security/query_api_keys/QueryApiKeysRequest.ts
+++ b/specification/security/query_api_keys/QueryApiKeysRequest.ts
@@ -18,12 +18,11 @@
  */
 
 import { Dictionary } from '@spec_utils/Dictionary'
-import { APIKeyAggregationContainer } from 'APIKeyAggregationContainer'
+import { APIKeyAggregationContainer } from './types'
 import { RequestBase } from '@_types/Base'
 import { integer } from '@_types/Numeric'
 import { QueryContainer } from '@_types/query_dsl/abstractions'
 import { Sort, SortResults } from '@_types/sort'
-import { Sort, SortResults } from '@_types/sort'
 
 /**
  * Retrieves information for API keys in a paginated manner. You can optionally filter the results with a query.
@@ -35,7 +34,7 @@ import { Sort, SortResults } from '@_types/sort'
 export interface Request extends RequestBase {
   query_parameters: {
     /**
-     * Return the snapshot of the owner user's role descriptors associated with the API key. 
+     * Return the snapshot of the owner user's role descriptors associated with the API key.
      * An API key's actual permission is the intersection of its assigned role descriptors and the owner user's role descriptors.
      * @availability stack since=8.5.0
      * @availability serverless
diff --git a/specification/security/query_api_keys/QueryApiKeysResponse.ts b/specification/security/query_api_keys/QueryApiKeysResponse.ts
index 203d4c1b6a..7f1db59bdd 100644
--- a/specification/security/query_api_keys/QueryApiKeysResponse.ts
+++ b/specification/security/query_api_keys/QueryApiKeysResponse.ts
@@ -21,21 +21,7 @@ import { ApiKey } from '@security/_types/ApiKey'
 import { integer } from '@_types/Numeric'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { AggregateName } from '@_types/common'
-import {
-  CardinalityAggregate,
-  ValueCountAggregate,
-  StringTermsAggregate,
-  LongTermsAggregate,
-  DoubleTermsAggregate,
-  UnmappedTermsAggregate,
-  MultiTermsAggregate,
-  MissingAggregate,
-  FilterAggregate,
-  RangeAggregate,
-  DateRangeAggregate,
-  FiltersAggregate,
-  CompositeAggregate,
-} from '@_types/aggregations/Aggregate'
+import { APIKeyAggregate } from './types'
 
 export class Response {
   body: {
@@ -57,23 +43,3 @@ export class Response {
     aggregations?: Dictionary<AggregateName, APIKeyAggregate>
   }
 }
-
-/**
- * @variants external
- * @non_exhaustive
- */
-export type APIKeyAggregate =
-  | CardinalityAggregate
-  | ValueCountAggregate
-  | StringTermsAggregate
-  | LongTermsAggregate
-  | DoubleTermsAggregate
-  | UnmappedTermsAggregate
-  | MultiTermsAggregate
-  | MissingAggregate
-  | FilterAggregate
-  | FiltersAggregate
-  | RangeAggregate
-  | DateRangeAggregate
-  | CompositeAggregate
-
diff --git a/specification/security/query_api_keys/APIKeyAggregationContainer.ts b/specification/security/query_api_keys/types.ts
similarity index 82%
rename from specification/security/query_api_keys/APIKeyAggregationContainer.ts
rename to specification/security/query_api_keys/types.ts
index 46a10ee3d3..e0ed713d37 100644
--- a/specification/security/query_api_keys/APIKeyAggregationContainer.ts
+++ b/specification/security/query_api_keys/types.ts
@@ -32,6 +32,21 @@ import {
   CardinalityAggregation,
   ValueCountAggregation,
 } from '@_types/aggregations/metric'
+import {
+  CardinalityAggregate,
+  ValueCountAggregate,
+  StringTermsAggregate,
+  LongTermsAggregate,
+  DoubleTermsAggregate,
+  UnmappedTermsAggregate,
+  MultiTermsAggregate,
+  MissingAggregate,
+  FilterAggregate,
+  RangeAggregate,
+  DateRangeAggregate,
+  FiltersAggregate,
+  CompositeAggregate,
+} from '@_types/aggregations/Aggregate'
 
 /**
  * @variants container
@@ -91,3 +106,22 @@ export class APIKeyAggregationContainer {
    */
   value_count?: ValueCountAggregation
 }
+
+/**
+ * @variants external
+ * @non_exhaustive
+ */
+export type APIKeyAggregate =
+  | CardinalityAggregate
+  | ValueCountAggregate
+  | StringTermsAggregate
+  | LongTermsAggregate
+  | DoubleTermsAggregate
+  | UnmappedTermsAggregate
+  | MultiTermsAggregate
+  | MissingAggregate
+  | FilterAggregate
+  | FiltersAggregate
+  | RangeAggregate
+  | DateRangeAggregate
+  | CompositeAggregate