diff --git a/.apigentools-info b/.apigentools-info
index 0a69276f0077..64ffe70c790f 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2021-02-23 19:10:45.630708",
-            "spec_repo_commit": "0e18234"
+            "regenerated": "2021-02-24 15:04:08.292814",
+            "spec_repo_commit": "960dc55"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2021-02-23 19:10:58.372783",
-            "spec_repo_commit": "0e18234"
+            "regenerated": "2021-02-24 15:04:21.617362",
+            "spec_repo_commit": "960dc55"
         }
     }
 }
\ No newline at end of file
diff --git a/data/v1/openapi.yaml b/data/v1/openapi.yaml
index e2d0a1cf352e..4bdf4205514a 100644
--- a/data/v1/openapi.yaml
+++ b/data/v1/openapi.yaml
@@ -1598,6 +1598,91 @@ components:
       - MIN
       - MAX
       - AVG
+    FormulaAndFunctionEventQueryDefinition:
+      description: A formula and functions events query.
+      properties:
+        compute:
+          description: Compute options.
+          properties:
+            aggregation:
+              $ref: '#/components/schemas/FormulaAndFunctionEventAggregation'
+            interval:
+              description: A time interval in milliseconds.
+              example: 60000
+              format: int64
+              type: integer
+            metric:
+              description: Measurable attribute to compute.
+              example: '@duration'
+              type: string
+          required:
+          - aggregation
+          type: object
+        data_source:
+          $ref: '#/components/schemas/FormulaAndFunctionEventsDataSource'
+        group_by:
+          description: Group by options.
+          items:
+            $ref: '#/components/schemas/FormulaAndFunctionEventQueryGroupBy'
+          type: array
+        indexes:
+          description: An array of index names to query in the stream. Omit or use
+            `[]` to query all indexes at once.
+          example:
+          - days-3
+          - days-7
+          items:
+            description: A log index set up for your organization. For additional
+              indexes, see the [multiple indexes](https://docs.datadoghq.com/logs/indexes/#multiple-indexes)
+              documentation.
+            type: string
+          type: array
+        name:
+          description: Name of the query for use in formulas.
+          example: query_errors
+          type: string
+        search:
+          description: Search options.
+          properties:
+            query:
+              description: Events search string.
+              example: service:query
+              type: string
+          required:
+          - query
+          type: object
+      required:
+      - data_source
+      - compute
+      type: object
+    FormulaAndFunctionEventQueryGroupBy:
+      description: List of objects used to group by.
+      properties:
+        facet:
+          description: Event facet.
+          example: status.
+          type: string
+        limit:
+          description: Number of groups to return.
+          example: 10
+          format: int64
+          type: integer
+        sort:
+          description: Options for sorting group by results.
+          properties:
+            aggregation:
+              $ref: '#/components/schemas/FormulaAndFunctionEventAggregation'
+            metric:
+              description: Metric used for sorting group by results.
+              type: string
+            order:
+              $ref: '#/components/schemas/QuerySortOrder'
+          required:
+          - aggregation
+          type: object
+      required:
+      - facet
+      type: object
     FormulaAndFunctionEventsDataSource:
       description: Data source for event platform-based queries.
       enum:
@@ -1644,6 +1729,28 @@ components:
       type: string
       x-enum-varnames:
       - METRICS
+    FormulaAndFunctionMetricQueryDefinition:
+      description: A formula and functions metrics query.
+      example:
+        data_source: metrics
+        query: avg:system.cpu.user{*}
+      properties:
+        aggregator:
+          $ref: '#/components/schemas/FormulaAndFunctionMetricAggregation'
+        data_source:
+          $ref: '#/components/schemas/FormulaAndFunctionMetricDataSource'
+        name:
+          description: Name of the query for use in formulas.
+          example: my_query
+          type: string
+        query:
+          description: Metrics query definition.
+          example: avg:system.cpu.user{*}
+          type: string
+      required:
+      - data_source
+      - query
+      type: object
     FormulaAndFunctionProcessQueryDataSource:
       description: Data sources that rely on the process backend.
       enum:
@@ -1653,12 +1760,48 @@ components:
       x-enum-varnames:
       - PROCESS
       - CONTAINER
+    FormulaAndFunctionProcessQueryDefinition:
+      description: Process query using formulas and functions.
+      properties:
+        aggregator:
+          $ref: '#/components/schemas/FormulaAndFunctionMetricAggregation'
+        data_source:
+          $ref: '#/components/schemas/FormulaAndFunctionProcessQueryDataSource'
+        is_normalized_cpu:
+          description: Whether to normalize the CPU percentages.
+          type: boolean
+        limit:
+          description: Number of hits to return.
+          format: int64
+          type: integer
+        metric:
+          description: Process metric name.
+          example: avg:system.cpu.user{*}
+          type: string
+        name:
+          description: Name of query for use in formulas.
+          type: string
+        sort:
+          $ref: '#/components/schemas/QuerySortOrder'
+        tag_filters:
+          description: An array of tags to filter by.
+          items:
+            description: One of the tags to filter by.
+            type: string
+          type: array
+        text_filter:
+          description: Text to use as filter.
+          type: string
+      required:
+      - data_source
+      - metric
+      type: object
     FormulaAndFunctionQueryDefinition:
       description: A formula and function query.
       oneOf:
-      - $ref: '#/components/schemas/TimeSeriesFormulaAndFunctionMetricQueryDefinition'
-      - $ref: '#/components/schemas/TimeSeriesFormulaAndFunctionEventQueryDefinition'
-      - $ref: '#/components/schemas/TimeSeriesFormulaAndFunctionProcessQueryDefinition'
+      - $ref: '#/components/schemas/FormulaAndFunctionMetricQueryDefinition'
+      - $ref: '#/components/schemas/FormulaAndFunctionEventQueryDefinition'
+      - $ref: '#/components/schemas/FormulaAndFunctionProcessQueryDefinition'
       type: object
     FormulaAndFunctionResponseFormat:
       description: Timeseries or Scalar response. This feature is currently in beta.
@@ -7808,149 +7951,6 @@ components:
       - STRING
       - INTEGER
       - DOUBLE
-    TimeSeriesFormulaAndFunctionEventQueryDefinition:
-      description: A timeseries formula and functions events query.
-      properties:
-        compute:
-          description: Compute options.
-          properties:
-            aggregation:
-              $ref: '#/components/schemas/FormulaAndFunctionEventAggregation'
-            interval:
-              description: A time interval in milliseconds.
-              example: 60000
-              format: int64
-              type: integer
-            metric:
-              description: Measurable attribute to compute.
-              example: '@duration'
-              type: string
-          required:
-          - aggregation
-          type: object
-        data_source:
-          $ref: '#/components/schemas/FormulaAndFunctionEventsDataSource'
-        group_by:
-          description: Group by options.
-          items:
-            $ref: '#/components/schemas/TimeSeriesFormulaAndFunctionEventQueryGroupBy'
-          type: array
-        indexes:
-          description: An array of index names to query in the stream. Omit or use
-            `[]` to query all indexes at once.
-          example:
-          - days-3
-          - days-7
-          items:
-            description: A log index set up for your organization. For additional
-              indexes, see the [multiple indexes](https://docs.datadoghq.com/logs/indexes/#multiple-indexes)
-              documentation.
-            type: string
-          type: array
-        name:
-          description: Name of the query for use in formulas.
-          example: query_errors
-          type: string
-        search:
-          description: Search options.
-          properties:
-            query:
-              description: Events search string.
-              example: service:query
-              type: string
-          required:
-          - query
-          type: object
-      required:
-      - data_source
-      - compute
-      type: object
-    TimeSeriesFormulaAndFunctionEventQueryGroupBy:
-      description: List of objects used to group by.
-      properties:
-        facet:
-          description: Event facet.
-          example: status.
-          type: string
-        limit:
-          description: Number of groups to return.
-          example: 10
-          format: int64
-          type: integer
-        sort:
-          description: Options for sorting group by results.
-          properties:
-            aggregation:
-              $ref: '#/components/schemas/FormulaAndFunctionEventAggregation'
-            metric:
-              description: Metric used for sorting group by results.
-              type: string
-            order:
-              $ref: '#/components/schemas/QuerySortOrder'
-          required:
-          - aggregation
-          type: object
-      required:
-      - facet
-      type: object
-    TimeSeriesFormulaAndFunctionMetricQueryDefinition:
-      description: A timeseries formula and functions metrics query.
-      example:
-        data_source: metrics
-        query: avg:system.cpu.user{*}
-      properties:
-        aggregator:
-          $ref: '#/components/schemas/FormulaAndFunctionMetricAggregation'
-        data_source:
-          $ref: '#/components/schemas/FormulaAndFunctionMetricDataSource'
-        name:
-          description: Name of the query for use in formulas.
-          example: my_query
-          type: string
-        query:
-          description: Metrics query definition.
-          example: avg:system.cpu.user{*}
-          type: string
-      required:
-      - data_source
-      - query
-      type: object
-    TimeSeriesFormulaAndFunctionProcessQueryDefinition:
-      description: Process query using formulas and functions.
-      properties:
-        aggregator:
-          $ref: '#/components/schemas/FormulaAndFunctionMetricAggregation'
-        data_source:
-          $ref: '#/components/schemas/FormulaAndFunctionProcessQueryDataSource'
-        is_normalized_cpu:
-          description: Whether to normalize the CPU percentages.
-          type: boolean
-        limit:
-          description: Number of hits to return.
-          format: int64
-          type: integer
-        metric:
-          description: Process metric name.
-          example: avg:system.cpu.user{*}
-          type: string
-        name:
-          description: Name of query for use in formulas.
-          type: string
-        sort:
-          $ref: '#/components/schemas/QuerySortOrder'
-        tag_filters:
-          description: An array of tags to filter by.
-          items:
-            description: One of the tags to filter by.
-            type: string
-          type: array
-        text_filter:
-          description: Text to use as filter.
-          type: string
-      required:
-      - data_source
-      - metric
-      type: object
     TimeseriesWidgetDefinition:
       description: The timeseries visualization allows you to display the evolution
         of one or more metrics, log events, or Indexed Spans over time.
diff --git a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinition.md b/docs/v1/FormulaAndFunctionEventQueryDefinition.md
similarity index 50%
rename from docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinition.md
rename to docs/v1/FormulaAndFunctionEventQueryDefinition.md
index 41349e24f8fb..9e87fdb17f9c 100644
--- a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinition.md
+++ b/docs/v1/FormulaAndFunctionEventQueryDefinition.md
@@ -1,22 +1,22 @@
-# DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition
+# DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition
 
 ## Properties
 
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
-| **compute** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute**](TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.md) |  |  |
+| **compute** | [**FormulaAndFunctionEventQueryDefinitionCompute**](FormulaAndFunctionEventQueryDefinitionCompute.md) |  |  |
 | **data_source** | [**FormulaAndFunctionEventsDataSource**](FormulaAndFunctionEventsDataSource.md) |  |  |
-| **group_by** | [**Array<TimeSeriesFormulaAndFunctionEventQueryGroupBy>**](TimeSeriesFormulaAndFunctionEventQueryGroupBy.md) | Group by options. | [optional] |
+| **group_by** | [**Array<FormulaAndFunctionEventQueryGroupBy>**](FormulaAndFunctionEventQueryGroupBy.md) | Group by options. | [optional] |
 | **indexes** | **Array<String>** | An array of index names to query in the stream. Omit or use `[]` to query all indexes at once. | [optional] |
 | **name** | **String** | Name of the query for use in formulas. | [optional] |
-| **search** | [**TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch**](TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.md) |  | [optional] |
+| **search** | [**FormulaAndFunctionEventQueryDefinitionSearch**](FormulaAndFunctionEventQueryDefinitionSearch.md) |  | [optional] |
 
 ## Example
 
 ```ruby
 require 'datadog_api_client/v1'
 
-instance = DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition.new(
+instance = DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition.new(
   compute: null,
   data_source: null,
   group_by: null,
diff --git a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.md b/docs/v1/FormulaAndFunctionEventQueryDefinitionCompute.md
similarity index 73%
rename from docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.md
rename to docs/v1/FormulaAndFunctionEventQueryDefinitionCompute.md
index a00e7733125d..126f44f2fcb4 100644
--- a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.md
+++ b/docs/v1/FormulaAndFunctionEventQueryDefinitionCompute.md
@@ -1,4 +1,4 @@
-# DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute
+# DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute
 
 ## Properties
 
@@ -13,7 +13,7 @@
 ```ruby
 require 'datadog_api_client/v1'
 
-instance = DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.new(
+instance = DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute.new(
   aggregation: null,
   interval: 60000,
   metric: @duration
diff --git a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.md b/docs/v1/FormulaAndFunctionEventQueryDefinitionSearch.md
similarity index 57%
rename from docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.md
rename to docs/v1/FormulaAndFunctionEventQueryDefinitionSearch.md
index 735baba6d66c..9d780da2e484 100644
--- a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.md
+++ b/docs/v1/FormulaAndFunctionEventQueryDefinitionSearch.md
@@ -1,4 +1,4 @@
-# DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch
+# DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch
 
 ## Properties
 
@@ -11,7 +11,7 @@
 ```ruby
 require 'datadog_api_client/v1'
 
-instance = DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.new(
+instance = DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch.new(
   query: service:query
 )
 ```
diff --git a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryGroupBy.md b/docs/v1/FormulaAndFunctionEventQueryGroupBy.md
similarity index 51%
rename from docs/v1/TimeSeriesFormulaAndFunctionEventQueryGroupBy.md
rename to docs/v1/FormulaAndFunctionEventQueryGroupBy.md
index 04b3b419728f..25284791a151 100644
--- a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryGroupBy.md
+++ b/docs/v1/FormulaAndFunctionEventQueryGroupBy.md
@@ -1,4 +1,4 @@
-# DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy
+# DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy
 
 ## Properties
 
@@ -6,14 +6,14 @@
 | ---- | ---- | ----------- | ----- |
 | **facet** | **String** | Event facet. |  |
 | **limit** | **Integer** | Number of groups to return. | [optional] |
-| **sort** | [**TimeSeriesFormulaAndFunctionEventQueryGroupBySort**](TimeSeriesFormulaAndFunctionEventQueryGroupBySort.md) |  | [optional] |
+| **sort** | [**FormulaAndFunctionEventQueryGroupBySort**](FormulaAndFunctionEventQueryGroupBySort.md) |  | [optional] |
 
 ## Example
 
 ```ruby
 require 'datadog_api_client/v1'
 
-instance = DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy.new(
+instance = DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy.new(
   facet: status.,
   limit: 10,
   sort: null
diff --git a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryGroupBySort.md b/docs/v1/FormulaAndFunctionEventQueryGroupBySort.md
similarity index 75%
rename from docs/v1/TimeSeriesFormulaAndFunctionEventQueryGroupBySort.md
rename to docs/v1/FormulaAndFunctionEventQueryGroupBySort.md
index 1710a60ae776..6b7505ada8ad 100644
--- a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryGroupBySort.md
+++ b/docs/v1/FormulaAndFunctionEventQueryGroupBySort.md
@@ -1,4 +1,4 @@
-# DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort
+# DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort
 
 ## Properties
 
@@ -13,7 +13,7 @@
 ```ruby
 require 'datadog_api_client/v1'
 
-instance = DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort.new(
+instance = DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort.new(
   aggregation: null,
   metric: null,
   order: null
diff --git a/docs/v1/TimeSeriesFormulaAndFunctionMetricQueryDefinition.md b/docs/v1/FormulaAndFunctionMetricQueryDefinition.md
similarity index 78%
rename from docs/v1/TimeSeriesFormulaAndFunctionMetricQueryDefinition.md
rename to docs/v1/FormulaAndFunctionMetricQueryDefinition.md
index 3f54468ece77..ee92805c63f3 100644
--- a/docs/v1/TimeSeriesFormulaAndFunctionMetricQueryDefinition.md
+++ b/docs/v1/FormulaAndFunctionMetricQueryDefinition.md
@@ -1,4 +1,4 @@
-# DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition
+# DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition
 
 ## Properties
 
@@ -14,7 +14,7 @@
 ```ruby
 require 'datadog_api_client/v1'
 
-instance = DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition.new(
+instance = DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition.new(
   aggregator: null,
   data_source: null,
   name: my_query,
diff --git a/docs/v1/TimeSeriesFormulaAndFunctionProcessQueryDefinition.md b/docs/v1/FormulaAndFunctionProcessQueryDefinition.md
similarity index 87%
rename from docs/v1/TimeSeriesFormulaAndFunctionProcessQueryDefinition.md
rename to docs/v1/FormulaAndFunctionProcessQueryDefinition.md
index 853185fa445c..8cec2eb0ef7f 100644
--- a/docs/v1/TimeSeriesFormulaAndFunctionProcessQueryDefinition.md
+++ b/docs/v1/FormulaAndFunctionProcessQueryDefinition.md
@@ -1,4 +1,4 @@
-# DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition
+# DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition
 
 ## Properties
 
@@ -19,7 +19,7 @@
 ```ruby
 require 'datadog_api_client/v1'
 
-instance = DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition.new(
+instance = DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition.new(
   aggregator: null,
   data_source: null,
   is_normalized_cpu: null,
diff --git a/docs/v1/FormulaAndFunctionQueryDefinition.md b/docs/v1/FormulaAndFunctionQueryDefinition.md
index 3ed6476a4477..58b8d6b3d457 100644
--- a/docs/v1/FormulaAndFunctionQueryDefinition.md
+++ b/docs/v1/FormulaAndFunctionQueryDefinition.md
@@ -14,9 +14,9 @@ require 'datadog_api_client/v1'
 DatadogAPIClient::V1::FormulaAndFunctionQueryDefinition.openapi_one_of
 # =>
 # [
-#   :'TimeSeriesFormulaAndFunctionEventQueryDefinition',
-#   :'TimeSeriesFormulaAndFunctionMetricQueryDefinition',
-#   :'TimeSeriesFormulaAndFunctionProcessQueryDefinition'
+#   :'FormulaAndFunctionEventQueryDefinition',
+#   :'FormulaAndFunctionMetricQueryDefinition',
+#   :'FormulaAndFunctionProcessQueryDefinition'
 # ]
 ```
 
@@ -30,7 +30,7 @@ Find the appropriate object from the `openapi_one_of` list and casts the data in
 require 'datadog_api_client/v1'
 
 DatadogAPIClient::V1::FormulaAndFunctionQueryDefinition.build(data)
-# => #<TimeSeriesFormulaAndFunctionEventQueryDefinition:0x00007fdd4aab02a0>
+# => #<FormulaAndFunctionEventQueryDefinition:0x00007fdd4aab02a0>
 
 DatadogAPIClient::V1::FormulaAndFunctionQueryDefinition.build(data_that_doesnt_match)
 # => nil
@@ -44,8 +44,8 @@ DatadogAPIClient::V1::FormulaAndFunctionQueryDefinition.build(data_that_doesnt_m
 
 #### Return type
 
-- `TimeSeriesFormulaAndFunctionEventQueryDefinition`
-- `TimeSeriesFormulaAndFunctionMetricQueryDefinition`
-- `TimeSeriesFormulaAndFunctionProcessQueryDefinition`
+- `FormulaAndFunctionEventQueryDefinition`
+- `FormulaAndFunctionMetricQueryDefinition`
+- `FormulaAndFunctionProcessQueryDefinition`
 - `nil` (if no type matches)
 
diff --git a/docs/v1/README.md b/docs/v1/README.md
index 9ad4b2c3b2fa..c90146f48d1f 100644
--- a/docs/v1/README.md
+++ b/docs/v1/README.md
@@ -334,10 +334,17 @@ Class | Method | HTTP request | Description
  - [DatadogAPIClient::V1::EventTimelineWidgetDefinition](EventTimelineWidgetDefinition.md)
  - [DatadogAPIClient::V1::EventTimelineWidgetDefinitionType](EventTimelineWidgetDefinitionType.md)
  - [DatadogAPIClient::V1::FormulaAndFunctionEventAggregation](FormulaAndFunctionEventAggregation.md)
+ - [DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition](FormulaAndFunctionEventQueryDefinition.md)
+ - [DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute](FormulaAndFunctionEventQueryDefinitionCompute.md)
+ - [DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch](FormulaAndFunctionEventQueryDefinitionSearch.md)
+ - [DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy](FormulaAndFunctionEventQueryGroupBy.md)
+ - [DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort](FormulaAndFunctionEventQueryGroupBySort.md)
  - [DatadogAPIClient::V1::FormulaAndFunctionEventsDataSource](FormulaAndFunctionEventsDataSource.md)
  - [DatadogAPIClient::V1::FormulaAndFunctionMetricAggregation](FormulaAndFunctionMetricAggregation.md)
  - [DatadogAPIClient::V1::FormulaAndFunctionMetricDataSource](FormulaAndFunctionMetricDataSource.md)
+ - [DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition](FormulaAndFunctionMetricQueryDefinition.md)
  - [DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDataSource](FormulaAndFunctionProcessQueryDataSource.md)
+ - [DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition](FormulaAndFunctionProcessQueryDefinition.md)
  - [DatadogAPIClient::V1::FormulaAndFunctionQueryDefinition](FormulaAndFunctionQueryDefinition.md)
  - [DatadogAPIClient::V1::FormulaAndFunctionResponseFormat](FormulaAndFunctionResponseFormat.md)
  - [DatadogAPIClient::V1::FreeTextWidgetDefinition](FreeTextWidgetDefinition.md)
@@ -615,13 +622,6 @@ Class | Method | HTTP request | Description
  - [DatadogAPIClient::V1::TableWidgetRequest](TableWidgetRequest.md)
  - [DatadogAPIClient::V1::TagToHosts](TagToHosts.md)
  - [DatadogAPIClient::V1::TargetFormatType](TargetFormatType.md)
- - [DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition](TimeSeriesFormulaAndFunctionEventQueryDefinition.md)
- - [DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute](TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.md)
- - [DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch](TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.md)
- - [DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy](TimeSeriesFormulaAndFunctionEventQueryGroupBy.md)
- - [DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort](TimeSeriesFormulaAndFunctionEventQueryGroupBySort.md)
- - [DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition](TimeSeriesFormulaAndFunctionMetricQueryDefinition.md)
- - [DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition](TimeSeriesFormulaAndFunctionProcessQueryDefinition.md)
  - [DatadogAPIClient::V1::TimeseriesWidgetDefinition](TimeseriesWidgetDefinition.md)
  - [DatadogAPIClient::V1::TimeseriesWidgetDefinitionType](TimeseriesWidgetDefinitionType.md)
  - [DatadogAPIClient::V1::TimeseriesWidgetExpressionAlias](TimeseriesWidgetExpressionAlias.md)
diff --git a/lib/datadog_api_client/v1.rb b/lib/datadog_api_client/v1.rb
index 674766402e0e..343c10c9ff57 100644
--- a/lib/datadog_api_client/v1.rb
+++ b/lib/datadog_api_client/v1.rb
@@ -92,10 +92,17 @@
 require 'datadog_api_client/v1/models/event_timeline_widget_definition'
 require 'datadog_api_client/v1/models/event_timeline_widget_definition_type'
 require 'datadog_api_client/v1/models/formula_and_function_event_aggregation'
+require 'datadog_api_client/v1/models/formula_and_function_event_query_definition'
+require 'datadog_api_client/v1/models/formula_and_function_event_query_definition_compute'
+require 'datadog_api_client/v1/models/formula_and_function_event_query_definition_search'
+require 'datadog_api_client/v1/models/formula_and_function_event_query_group_by'
+require 'datadog_api_client/v1/models/formula_and_function_event_query_group_by_sort'
 require 'datadog_api_client/v1/models/formula_and_function_events_data_source'
 require 'datadog_api_client/v1/models/formula_and_function_metric_aggregation'
 require 'datadog_api_client/v1/models/formula_and_function_metric_data_source'
+require 'datadog_api_client/v1/models/formula_and_function_metric_query_definition'
 require 'datadog_api_client/v1/models/formula_and_function_process_query_data_source'
+require 'datadog_api_client/v1/models/formula_and_function_process_query_definition'
 require 'datadog_api_client/v1/models/formula_and_function_query_definition'
 require 'datadog_api_client/v1/models/formula_and_function_response_format'
 require 'datadog_api_client/v1/models/free_text_widget_definition'
@@ -373,13 +380,6 @@
 require 'datadog_api_client/v1/models/table_widget_request'
 require 'datadog_api_client/v1/models/tag_to_hosts'
 require 'datadog_api_client/v1/models/target_format_type'
-require 'datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition'
-require 'datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_compute'
-require 'datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_search'
-require 'datadog_api_client/v1/models/time_series_formula_and_function_event_query_group_by'
-require 'datadog_api_client/v1/models/time_series_formula_and_function_event_query_group_by_sort'
-require 'datadog_api_client/v1/models/time_series_formula_and_function_metric_query_definition'
-require 'datadog_api_client/v1/models/time_series_formula_and_function_process_query_definition'
 require 'datadog_api_client/v1/models/timeseries_widget_definition'
 require 'datadog_api_client/v1/models/timeseries_widget_definition_type'
 require 'datadog_api_client/v1/models/timeseries_widget_expression_alias'
diff --git a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition.rb b/lib/datadog_api_client/v1/models/formula_and_function_event_query_definition.rb
similarity index 92%
rename from lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition.rb
rename to lib/datadog_api_client/v1/models/formula_and_function_event_query_definition.rb
index 1d24832c7574..f021ab9bea25 100644
--- a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition.rb
+++ b/lib/datadog_api_client/v1/models/formula_and_function_event_query_definition.rb
@@ -17,8 +17,8 @@
 require 'time'
 
 module DatadogAPIClient::V1
-  # A timeseries formula and functions events query.
-  class TimeSeriesFormulaAndFunctionEventQueryDefinition
+  # A formula and functions events query.
+  class FormulaAndFunctionEventQueryDefinition
     attr_accessor :compute
 
     attr_accessor :data_source
@@ -54,12 +54,12 @@ def self.acceptable_attributes
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'compute' => :'TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute',
+        :'compute' => :'FormulaAndFunctionEventQueryDefinitionCompute',
         :'data_source' => :'FormulaAndFunctionEventsDataSource',
-        :'group_by' => :'Array<TimeSeriesFormulaAndFunctionEventQueryGroupBy>',
+        :'group_by' => :'Array<FormulaAndFunctionEventQueryGroupBy>',
         :'indexes' => :'Array<String>',
         :'name' => :'String',
-        :'search' => :'TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch'
+        :'search' => :'FormulaAndFunctionEventQueryDefinitionSearch'
       }
     end
 
@@ -73,13 +73,13 @@ def self.openapi_nullable
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
diff --git a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_compute.rb b/lib/datadog_api_client/v1/models/formula_and_function_event_query_definition_compute.rb
similarity index 95%
rename from lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_compute.rb
rename to lib/datadog_api_client/v1/models/formula_and_function_event_query_definition_compute.rb
index 28a801ec43f5..8dc46368ab1e 100644
--- a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_compute.rb
+++ b/lib/datadog_api_client/v1/models/formula_and_function_event_query_definition_compute.rb
@@ -18,7 +18,7 @@
 
 module DatadogAPIClient::V1
   # Compute options.
-  class TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute
+  class FormulaAndFunctionEventQueryDefinitionCompute
     attr_accessor :aggregation
 
     # A time interval in milliseconds.
@@ -60,13 +60,13 @@ def self.openapi_nullable
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
diff --git a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_search.rb b/lib/datadog_api_client/v1/models/formula_and_function_event_query_definition_search.rb
similarity index 94%
rename from lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_search.rb
rename to lib/datadog_api_client/v1/models/formula_and_function_event_query_definition_search.rb
index 512e843e7488..1afc2d25fec2 100644
--- a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_search.rb
+++ b/lib/datadog_api_client/v1/models/formula_and_function_event_query_definition_search.rb
@@ -18,7 +18,7 @@
 
 module DatadogAPIClient::V1
   # Search options.
-  class TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch
+  class FormulaAndFunctionEventQueryDefinitionSearch
     # Events search string.
     attr_accessor :query
 
@@ -51,13 +51,13 @@ def self.openapi_nullable
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
diff --git a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_group_by.rb b/lib/datadog_api_client/v1/models/formula_and_function_event_query_group_by.rb
similarity index 94%
rename from lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_group_by.rb
rename to lib/datadog_api_client/v1/models/formula_and_function_event_query_group_by.rb
index 1d32271868bf..47ef39706a17 100644
--- a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_group_by.rb
+++ b/lib/datadog_api_client/v1/models/formula_and_function_event_query_group_by.rb
@@ -18,7 +18,7 @@
 
 module DatadogAPIClient::V1
   # List of objects used to group by.
-  class TimeSeriesFormulaAndFunctionEventQueryGroupBy
+  class FormulaAndFunctionEventQueryGroupBy
     # Event facet.
     attr_accessor :facet
 
@@ -46,7 +46,7 @@ def self.openapi_types
       {
         :'facet' => :'String',
         :'limit' => :'Integer',
-        :'sort' => :'TimeSeriesFormulaAndFunctionEventQueryGroupBySort'
+        :'sort' => :'FormulaAndFunctionEventQueryGroupBySort'
       }
     end
 
@@ -60,13 +60,13 @@ def self.openapi_nullable
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
diff --git a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_group_by_sort.rb b/lib/datadog_api_client/v1/models/formula_and_function_event_query_group_by_sort.rb
similarity index 95%
rename from lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_group_by_sort.rb
rename to lib/datadog_api_client/v1/models/formula_and_function_event_query_group_by_sort.rb
index 0d963f77260e..da7c4a345f39 100644
--- a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_group_by_sort.rb
+++ b/lib/datadog_api_client/v1/models/formula_and_function_event_query_group_by_sort.rb
@@ -18,7 +18,7 @@
 
 module DatadogAPIClient::V1
   # Options for sorting group by results.
-  class TimeSeriesFormulaAndFunctionEventQueryGroupBySort
+  class FormulaAndFunctionEventQueryGroupBySort
     attr_accessor :aggregation
 
     # Metric used for sorting group by results.
@@ -59,13 +59,13 @@ def self.openapi_nullable
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
diff --git a/lib/datadog_api_client/v1/models/time_series_formula_and_function_metric_query_definition.rb b/lib/datadog_api_client/v1/models/formula_and_function_metric_query_definition.rb
similarity index 94%
rename from lib/datadog_api_client/v1/models/time_series_formula_and_function_metric_query_definition.rb
rename to lib/datadog_api_client/v1/models/formula_and_function_metric_query_definition.rb
index 8aeb75541512..c82f22319d66 100644
--- a/lib/datadog_api_client/v1/models/time_series_formula_and_function_metric_query_definition.rb
+++ b/lib/datadog_api_client/v1/models/formula_and_function_metric_query_definition.rb
@@ -17,8 +17,8 @@
 require 'time'
 
 module DatadogAPIClient::V1
-  # A timeseries formula and functions metrics query.
-  class TimeSeriesFormulaAndFunctionMetricQueryDefinition
+  # A formula and functions metrics query.
+  class FormulaAndFunctionMetricQueryDefinition
     attr_accessor :aggregator
 
     attr_accessor :data_source
@@ -64,13 +64,13 @@ def self.openapi_nullable
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
diff --git a/lib/datadog_api_client/v1/models/time_series_formula_and_function_process_query_definition.rb b/lib/datadog_api_client/v1/models/formula_and_function_process_query_definition.rb
similarity index 96%
rename from lib/datadog_api_client/v1/models/time_series_formula_and_function_process_query_definition.rb
rename to lib/datadog_api_client/v1/models/formula_and_function_process_query_definition.rb
index 3cc37ef43214..ac1bb44638a6 100644
--- a/lib/datadog_api_client/v1/models/time_series_formula_and_function_process_query_definition.rb
+++ b/lib/datadog_api_client/v1/models/formula_and_function_process_query_definition.rb
@@ -18,7 +18,7 @@
 
 module DatadogAPIClient::V1
   # Process query using formulas and functions.
-  class TimeSeriesFormulaAndFunctionProcessQueryDefinition
+  class FormulaAndFunctionProcessQueryDefinition
     attr_accessor :aggregator
 
     attr_accessor :data_source
@@ -88,13 +88,13 @@ def self.openapi_nullable
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
diff --git a/lib/datadog_api_client/v1/models/formula_and_function_query_definition.rb b/lib/datadog_api_client/v1/models/formula_and_function_query_definition.rb
index 32e5c93bc2b4..62e3f27ce190 100644
--- a/lib/datadog_api_client/v1/models/formula_and_function_query_definition.rb
+++ b/lib/datadog_api_client/v1/models/formula_and_function_query_definition.rb
@@ -23,9 +23,9 @@ class << self
       # List of class defined in oneOf (OpenAPI v3)
       def openapi_one_of
         [
-          :'TimeSeriesFormulaAndFunctionEventQueryDefinition',
-          :'TimeSeriesFormulaAndFunctionMetricQueryDefinition',
-          :'TimeSeriesFormulaAndFunctionProcessQueryDefinition'
+          :'FormulaAndFunctionEventQueryDefinition',
+          :'FormulaAndFunctionMetricQueryDefinition',
+          :'FormulaAndFunctionProcessQueryDefinition'
         ]
       end
 
diff --git a/spec/v1/models/time_series_formula_and_function_event_query_definition_compute_spec.rb b/spec/v1/models/formula_and_function_event_query_definition_compute_spec.rb
similarity index 66%
rename from spec/v1/models/time_series_formula_and_function_event_query_definition_compute_spec.rb
rename to spec/v1/models/formula_and_function_event_query_definition_compute_spec.rb
index 2ce5b2514118..bce2711f9469 100644
--- a/spec/v1/models/time_series_formula_and_function_event_query_definition_compute_spec.rb
+++ b/spec/v1/models/formula_and_function_event_query_definition_compute_spec.rb
@@ -17,15 +17,15 @@
 require 'json'
 require 'date'
 
-# Unit tests for DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute
+# Unit tests for DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute do
-  let(:instance) { DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute.new }
+describe DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute do
+  let(:instance) { DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute.new }
 
-  describe 'test an instance of TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute' do
-    it 'should create an instance of TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute' do
-      expect(instance).to be_instance_of(DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionCompute)
+  describe 'test an instance of FormulaAndFunctionEventQueryDefinitionCompute' do
+    it 'should create an instance of FormulaAndFunctionEventQueryDefinitionCompute' do
+      expect(instance).to be_instance_of(DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionCompute)
     end
   end
   describe 'test attribute "aggregation"' do
diff --git a/spec/v1/models/time_series_formula_and_function_event_query_definition_search_spec.rb b/spec/v1/models/formula_and_function_event_query_definition_search_spec.rb
similarity index 57%
rename from spec/v1/models/time_series_formula_and_function_event_query_definition_search_spec.rb
rename to spec/v1/models/formula_and_function_event_query_definition_search_spec.rb
index f4f35876aea8..ab74eb31f7c3 100644
--- a/spec/v1/models/time_series_formula_and_function_event_query_definition_search_spec.rb
+++ b/spec/v1/models/formula_and_function_event_query_definition_search_spec.rb
@@ -17,15 +17,15 @@
 require 'json'
 require 'date'
 
-# Unit tests for DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch
+# Unit tests for DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch do
-  let(:instance) { DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch.new }
+describe DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch do
+  let(:instance) { DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch.new }
 
-  describe 'test an instance of TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch' do
-    it 'should create an instance of TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch' do
-      expect(instance).to be_instance_of(DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSearch)
+  describe 'test an instance of FormulaAndFunctionEventQueryDefinitionSearch' do
+    it 'should create an instance of FormulaAndFunctionEventQueryDefinitionSearch' do
+      expect(instance).to be_instance_of(DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinitionSearch)
     end
   end
   describe 'test attribute "query"' do
diff --git a/spec/v1/models/time_series_formula_and_function_event_query_definition_spec.rb b/spec/v1/models/formula_and_function_event_query_definition_spec.rb
similarity index 75%
rename from spec/v1/models/time_series_formula_and_function_event_query_definition_spec.rb
rename to spec/v1/models/formula_and_function_event_query_definition_spec.rb
index 8f61e6e44610..9da4fcd7c7be 100644
--- a/spec/v1/models/time_series_formula_and_function_event_query_definition_spec.rb
+++ b/spec/v1/models/formula_and_function_event_query_definition_spec.rb
@@ -17,15 +17,15 @@
 require 'json'
 require 'date'
 
-# Unit tests for DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition
+# Unit tests for DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition do
-  let(:instance) { DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition.new }
+describe DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition do
+  let(:instance) { DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition.new }
 
-  describe 'test an instance of TimeSeriesFormulaAndFunctionEventQueryDefinition' do
-    it 'should create an instance of TimeSeriesFormulaAndFunctionEventQueryDefinition' do
-      expect(instance).to be_instance_of(DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinition)
+  describe 'test an instance of FormulaAndFunctionEventQueryDefinition' do
+    it 'should create an instance of FormulaAndFunctionEventQueryDefinition' do
+      expect(instance).to be_instance_of(DatadogAPIClient::V1::FormulaAndFunctionEventQueryDefinition)
     end
   end
   describe 'test attribute "compute"' do
diff --git a/spec/v1/models/time_series_formula_and_function_event_query_group_by_sort_spec.rb b/spec/v1/models/formula_and_function_event_query_group_by_sort_spec.rb
similarity index 67%
rename from spec/v1/models/time_series_formula_and_function_event_query_group_by_sort_spec.rb
rename to spec/v1/models/formula_and_function_event_query_group_by_sort_spec.rb
index 4c2314f06aa6..aa99dc49bdf6 100644
--- a/spec/v1/models/time_series_formula_and_function_event_query_group_by_sort_spec.rb
+++ b/spec/v1/models/formula_and_function_event_query_group_by_sort_spec.rb
@@ -17,15 +17,15 @@
 require 'json'
 require 'date'
 
-# Unit tests for DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort
+# Unit tests for DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort do
-  let(:instance) { DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort.new }
+describe DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort do
+  let(:instance) { DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort.new }
 
-  describe 'test an instance of TimeSeriesFormulaAndFunctionEventQueryGroupBySort' do
-    it 'should create an instance of TimeSeriesFormulaAndFunctionEventQueryGroupBySort' do
-      expect(instance).to be_instance_of(DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBySort)
+  describe 'test an instance of FormulaAndFunctionEventQueryGroupBySort' do
+    it 'should create an instance of FormulaAndFunctionEventQueryGroupBySort' do
+      expect(instance).to be_instance_of(DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBySort)
     end
   end
   describe 'test attribute "aggregation"' do
diff --git a/spec/v1/models/time_series_formula_and_function_event_query_group_by_spec.rb b/spec/v1/models/formula_and_function_event_query_group_by_spec.rb
similarity index 68%
rename from spec/v1/models/time_series_formula_and_function_event_query_group_by_spec.rb
rename to spec/v1/models/formula_and_function_event_query_group_by_spec.rb
index 091ce73a5240..75735ef6996e 100644
--- a/spec/v1/models/time_series_formula_and_function_event_query_group_by_spec.rb
+++ b/spec/v1/models/formula_and_function_event_query_group_by_spec.rb
@@ -17,15 +17,15 @@
 require 'json'
 require 'date'
 
-# Unit tests for DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy
+# Unit tests for DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy do
-  let(:instance) { DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy.new }
+describe DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy do
+  let(:instance) { DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy.new }
 
-  describe 'test an instance of TimeSeriesFormulaAndFunctionEventQueryGroupBy' do
-    it 'should create an instance of TimeSeriesFormulaAndFunctionEventQueryGroupBy' do
-      expect(instance).to be_instance_of(DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryGroupBy)
+  describe 'test an instance of FormulaAndFunctionEventQueryGroupBy' do
+    it 'should create an instance of FormulaAndFunctionEventQueryGroupBy' do
+      expect(instance).to be_instance_of(DatadogAPIClient::V1::FormulaAndFunctionEventQueryGroupBy)
     end
   end
   describe 'test attribute "facet"' do
diff --git a/spec/v1/models/time_series_formula_and_function_metric_query_definition_spec.rb b/spec/v1/models/formula_and_function_metric_query_definition_spec.rb
similarity index 70%
rename from spec/v1/models/time_series_formula_and_function_metric_query_definition_spec.rb
rename to spec/v1/models/formula_and_function_metric_query_definition_spec.rb
index ae0a289df730..672684faf9a9 100644
--- a/spec/v1/models/time_series_formula_and_function_metric_query_definition_spec.rb
+++ b/spec/v1/models/formula_and_function_metric_query_definition_spec.rb
@@ -17,15 +17,15 @@
 require 'json'
 require 'date'
 
-# Unit tests for DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition
+# Unit tests for DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition do
-  let(:instance) { DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition.new }
+describe DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition do
+  let(:instance) { DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition.new }
 
-  describe 'test an instance of TimeSeriesFormulaAndFunctionMetricQueryDefinition' do
-    it 'should create an instance of TimeSeriesFormulaAndFunctionMetricQueryDefinition' do
-      expect(instance).to be_instance_of(DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionMetricQueryDefinition)
+  describe 'test an instance of FormulaAndFunctionMetricQueryDefinition' do
+    it 'should create an instance of FormulaAndFunctionMetricQueryDefinition' do
+      expect(instance).to be_instance_of(DatadogAPIClient::V1::FormulaAndFunctionMetricQueryDefinition)
     end
   end
   describe 'test attribute "aggregator"' do
diff --git a/spec/v1/models/time_series_formula_and_function_process_query_definition_spec.rb b/spec/v1/models/formula_and_function_process_query_definition_spec.rb
similarity index 80%
rename from spec/v1/models/time_series_formula_and_function_process_query_definition_spec.rb
rename to spec/v1/models/formula_and_function_process_query_definition_spec.rb
index 18467e5171fa..d0d33f0c6565 100644
--- a/spec/v1/models/time_series_formula_and_function_process_query_definition_spec.rb
+++ b/spec/v1/models/formula_and_function_process_query_definition_spec.rb
@@ -17,15 +17,15 @@
 require 'json'
 require 'date'
 
-# Unit tests for DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition
+# Unit tests for DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
-describe DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition do
-  let(:instance) { DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition.new }
+describe DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition do
+  let(:instance) { DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition.new }
 
-  describe 'test an instance of TimeSeriesFormulaAndFunctionProcessQueryDefinition' do
-    it 'should create an instance of TimeSeriesFormulaAndFunctionProcessQueryDefinition' do
-      expect(instance).to be_instance_of(DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionProcessQueryDefinition)
+  describe 'test an instance of FormulaAndFunctionProcessQueryDefinition' do
+    it 'should create an instance of FormulaAndFunctionProcessQueryDefinition' do
+      expect(instance).to be_instance_of(DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDefinition)
     end
   end
   describe 'test attribute "aggregator"' do