diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 397d1a8cdca..7d7dff65309 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -110560,72 +110560,62 @@ components:
           format: int64
           type: integer
       type: object
-    TagPoliciesListResponse:
-      description: A page of tag policies.
-      properties:
-        data:
-          $ref: "#/components/schemas/TagPolicyDataArray"
-        included:
-          $ref: "#/components/schemas/TagPolicyIncludedResources"
-      required:
-        - data
-      type: object
-    TagPolicyAttributes:
-      description: The attributes of a tag policy resource.
+    TagRuleAttributes:
+      description: The attributes of a tag rule resource.
       properties:
         created_at:
-          description: The RFC 3339 timestamp at which the policy was created.
+          description: The RFC 3339 timestamp at which the rule was created.
           example: "2026-05-21T22:11:06.108696Z"
           format: date-time
           type: string
         created_by:
-          description: The identifier of the user who created the policy.
+          description: The identifier of the user who created the rule.
           example: "test-user"
           type: string
         deleted_at:
-          description: The RFC 3339 timestamp at which the policy was soft-deleted. `null` if the policy has not been deleted. Only present when `include_deleted=true` is requested.
+          description: The RFC 3339 timestamp at which the rule was soft-deleted. `null` if the rule has not been deleted. Only present when `include_deleted=true` is requested.
           format: date-time
           nullable: true
           type: string
         deleted_by:
-          description: The identifier of the user who soft-deleted the policy. `null` if the policy has not been deleted.
+          description: The identifier of the user who soft-deleted the rule. `null` if the rule has not been deleted.
           nullable: true
           type: string
         enabled:
-          description: Whether the policy is currently enforced.
+          description: Whether the rule is currently enforced.
           example: true
           type: boolean
         modified_at:
-          description: The RFC 3339 timestamp at which the policy was last modified.
+          description: The RFC 3339 timestamp at which the rule was last modified.
           example: "2026-05-21T22:11:06.108696Z"
           format: date-time
           type: string
         modified_by:
-          description: The identifier of the user who last modified the policy.
+          description: The identifier of the user who last modified the rule.
           example: "test-user"
           type: string
         negated:
-          description: When `true`, the policy matches tag values that do NOT match any of the supplied patterns.
+          description: When `true`, the rule matches tag values that do NOT match any of the supplied patterns.
           example: false
           type: boolean
         policy_name:
-          description: Human-readable name for the tag policy.
+          description: Human-readable name for the tag rule.
           example: "Service tag must be one of api or web"
           type: string
         policy_type:
-          $ref: "#/components/schemas/TagPolicyType"
+          $ref: "#/components/schemas/TagRuleType"
         required:
           description: When `true`, telemetry without this tag is treated as a violation.
           example: true
           type: boolean
         scope:
-          description: The scope the policy applies within.
+          description: The scope the rule applies within.
           example: "env"
           type: string
         source:
-          $ref: "#/components/schemas/TagPolicySource"
+          $ref: "#/components/schemas/TagRuleSource"
         tag_key:
-          description: The tag key that the policy governs.
+          description: The tag key that the rule governs.
           example: "service"
           type: string
         tag_value_patterns:
@@ -110658,37 +110648,37 @@ components:
         - modified_at
         - modified_by
       type: object
-    TagPolicyCreateAttributes:
-      description: Attributes that can be supplied when creating a tag policy.
+    TagRuleCreateAttributes:
+      description: Attributes that can be supplied when creating a tag rule.
       properties:
         enabled:
-          description: Whether the policy is currently enforced. Defaults to `true` for newly created policies.
+          description: Whether the rule is currently enforced. Defaults to `true` for newly created rules.
           example: true
           type: boolean
         negated:
-          description: When `true`, the policy matches tag values that do NOT match any of the supplied patterns. Defaults to `false`.
+          description: When `true`, the rule matches tag values that do NOT match any of the supplied patterns. Defaults to `false`.
           example: false
           type: boolean
         policy_name:
-          description: Human-readable name for the tag policy.
+          description: Human-readable name for the tag rule.
           example: "Service tag must be one of api or web"
           type: string
         policy_type:
-          $ref: "#/components/schemas/TagPolicyCreateType"
+          $ref: "#/components/schemas/TagRuleCreateType"
         required:
           description: When `true`, telemetry without this tag is treated as a violation. Defaults to `false`.
           example: true
           type: boolean
         scope:
           description: |-
-            The scope the policy applies within. Typically an environment, team, or
-            organization-level identifier used to limit where the policy is enforced.
+            The scope the rule applies within. Typically an environment, team, or
+            organization-level identifier used to limit where the rule is enforced.
           example: "env"
           type: string
         source:
-          $ref: "#/components/schemas/TagPolicySource"
+          $ref: "#/components/schemas/TagRuleSource"
         tag_key:
-          description: The tag key that the policy governs (for example, `service`).
+          description: The tag key that the rule governs (for example, `service`).
           example: "service"
           type: string
         tag_value_patterns:
@@ -110711,28 +110701,28 @@ components:
         - tag_value_patterns
         - policy_type
       type: object
-    TagPolicyCreateData:
-      description: Data object for creating a tag policy.
+    TagRuleCreateData:
+      description: Data object for creating a tag rule.
       properties:
         attributes:
-          $ref: "#/components/schemas/TagPolicyCreateAttributes"
+          $ref: "#/components/schemas/TagRuleCreateAttributes"
         type:
-          $ref: "#/components/schemas/TagPolicyResourceType"
+          $ref: "#/components/schemas/TagRuleResourceType"
       required:
         - type
         - attributes
       type: object
-    TagPolicyCreateRequest:
-      description: Payload for creating a new tag policy.
+    TagRuleCreateRequest:
+      description: Payload for creating a new tag rule.
       properties:
         data:
-          $ref: "#/components/schemas/TagPolicyCreateData"
+          $ref: "#/components/schemas/TagRuleCreateData"
       required:
         - data
       type: object
-    TagPolicyCreateType:
+    TagRuleCreateType:
       description: |-
-        The policy type allowed when creating a tag policy. Only `surfacing` is accepted at
+        The rule type allowed when creating a tag rule. Only `surfacing` is accepted at
         creation time.
       enum:
         - surfacing
@@ -110740,72 +110730,72 @@ components:
       type: string
       x-enum-varnames:
         - SURFACING
-    TagPolicyData:
-      description: A tag policy resource.
+    TagRuleData:
+      description: A tag rule resource.
       properties:
         attributes:
-          $ref: "#/components/schemas/TagPolicyAttributes"
+          $ref: "#/components/schemas/TagRuleAttributes"
         id:
-          description: The unique identifier of the tag policy.
+          description: The unique identifier of the tag rule.
           example: "123"
           type: string
         relationships:
-          $ref: "#/components/schemas/TagPolicyRelationships"
+          $ref: "#/components/schemas/TagRuleRelationships"
         type:
-          $ref: "#/components/schemas/TagPolicyResourceType"
+          $ref: "#/components/schemas/TagRuleResourceType"
       required:
         - type
         - id
         - attributes
       type: object
-    TagPolicyDataArray:
-      description: An array of tag policy data objects.
+    TagRuleDataArray:
+      description: An array of tag rule data objects.
       items:
-        $ref: "#/components/schemas/TagPolicyData"
+        $ref: "#/components/schemas/TagRuleData"
       type: array
-    TagPolicyInclude:
-      description: A related resource to include alongside a tag policy in the response. Currently the only supported value is `score`.
+    TagRuleInclude:
+      description: A related resource to include alongside a tag rule in the response. Currently the only supported value is `score`.
       enum:
         - score
       example: "score"
       type: string
       x-enum-varnames:
         - SCORE
-    TagPolicyIncludedResources:
-      description: Related resources fetched alongside the primary tag policies. Populated when an `include` query parameter is supplied.
+    TagRuleIncludedResources:
+      description: Related resources fetched alongside the primary tag rules. Populated when an `include` query parameter is supplied.
       items:
-        $ref: "#/components/schemas/TagPolicyScoreData"
+        $ref: "#/components/schemas/TagRuleScoreData"
       type: array
-    TagPolicyRelationships:
-      description: Related resources for a tag policy. Only present when the corresponding `include` query parameter is supplied.
+    TagRuleRelationships:
+      description: Related resources for a tag rule. Only present when the corresponding `include` query parameter is supplied.
       properties:
         score:
-          $ref: "#/components/schemas/TagPolicyScoreRelationship"
+          $ref: "#/components/schemas/TagRuleScoreRelationship"
       type: object
-    TagPolicyResourceType:
-      description: JSON:API resource type for a tag policy.
+    TagRuleResourceType:
+      description: JSON:API resource type for a tag rule.
       enum:
         - tag_policy
       example: "tag_policy"
       type: string
       x-enum-varnames:
         - TAG_POLICY
-    TagPolicyResponse:
-      description: A single tag policy.
+    TagRuleResponse:
+      description: A single tag rule.
       properties:
         data:
-          $ref: "#/components/schemas/TagPolicyData"
+          $ref: "#/components/schemas/TagRuleData"
         included:
-          $ref: "#/components/schemas/TagPolicyIncludedResources"
+          $ref: "#/components/schemas/TagRuleIncludedResources"
       required:
         - data
       type: object
-    TagPolicyScoreAttributes:
-      description: Attributes of a tag policy compliance score.
+    TagRuleScoreAttributes:
+      description: Attributes of a tag rule compliance score.
       properties:
         score:
           description: |-
-            The compliance score for the policy over the requested time window, as a percentage
+            The compliance score for the rule over the requested time window, as a percentage
             between 0 and 100. `null` indicates that no relevant telemetry was found.
           example: 80
           format: double
@@ -110822,7 +110812,7 @@ components:
           format: int64
           type: integer
         version:
-          description: The version of the tag policy that the score was computed against.
+          description: The version of the tag rule that the score was computed against.
           example: 1
           format: int64
           type: integer
@@ -110832,31 +110822,31 @@ components:
         - ts_end
         - version
       type: object
-    TagPolicyScoreData:
-      description: A compliance score resource for a tag policy.
+    TagRuleScoreData:
+      description: A compliance score resource for a tag rule.
       properties:
         attributes:
-          $ref: "#/components/schemas/TagPolicyScoreAttributes"
+          $ref: "#/components/schemas/TagRuleScoreAttributes"
         id:
           description: The unique identifier of the compliance score resource.
           example: "123-v1-1779315066097-1779401466097"
           type: string
         type:
-          $ref: "#/components/schemas/TagPolicyScoreResourceType"
+          $ref: "#/components/schemas/TagRuleScoreResourceType"
       required:
         - type
         - id
         - attributes
       type: object
-    TagPolicyScoreRelationship:
-      description: A relationship to the compliance score resource for this policy.
+    TagRuleScoreRelationship:
+      description: A relationship to the compliance score resource for this rule.
       properties:
         data:
-          $ref: "#/components/schemas/TagPolicyScoreRelationshipData"
+          $ref: "#/components/schemas/TagRuleScoreRelationshipData"
       required:
         - data
       type: object
-    TagPolicyScoreRelationshipData:
+    TagRuleScoreRelationshipData:
       description: Identifier of the related compliance score resource.
       properties:
         id:
@@ -110864,46 +110854,42 @@ components:
           example: "123-v1-1779315066097-1779401466097"
           type: string
         type:
-          $ref: "#/components/schemas/TagPolicyScoreResourceType"
+          $ref: "#/components/schemas/TagRuleScoreResourceType"
       required:
         - type
         - id
       type: object
-    TagPolicyScoreResourceType:
-      description: JSON:API resource type for a tag policy compliance score.
+    TagRuleScoreResourceType:
+      description: JSON:API resource type for a tag rule compliance score.
       enum:
         - tag_policy_score
       example: "tag_policy_score"
       type: string
       x-enum-varnames:
         - TAG_POLICY_SCORE
-    TagPolicyScoreResponse:
-      description: A tag policy compliance score.
+    TagRuleScoreResponse:
+      description: A tag rule compliance score.
       properties:
         data:
-          $ref: "#/components/schemas/TagPolicyScoreData"
+          $ref: "#/components/schemas/TagRuleScoreData"
       required:
         - data
       type: object
-    TagPolicySource:
-      description: The telemetry source that a tag policy applies to.
+    TagRuleSource:
+      description: The telemetry source that a tag rule applies to.
       enum:
         - logs
         - spans
         - metrics
-        - rum
-        - feed
       example: "logs"
       type: string
       x-enum-varnames:
         - LOGS
         - SPANS
         - METRICS
-        - RUM
-        - FEED
-    TagPolicyType:
+    TagRuleType:
       description: |-
-        How the policy is enforced. `blocking` rejects telemetry that violates the policy.
+        How the rule is enforced. `blocking` rejects telemetry that violates the rule.
         `surfacing` only highlights non-compliant telemetry without blocking it.
       enum:
         - blocking
@@ -110913,30 +110899,30 @@ components:
       x-enum-varnames:
         - BLOCKING
         - SURFACING
-    TagPolicyUpdateAttributes:
+    TagRuleUpdateAttributes:
       description: |-
-        Mutable attributes of a tag policy. Each field is optional; omitting a field leaves its
-        current value unchanged. The `source` of a policy cannot be changed.
+        Mutable attributes of a tag rule. Each field is optional; omitting a field leaves its
+        current value unchanged. The `source` of a rule cannot be changed.
       properties:
         enabled:
-          description: Whether the policy is currently enforced.
+          description: Whether the rule is currently enforced.
           type: boolean
         negated:
-          description: When `true`, the policy matches tag values that do NOT match any of the supplied patterns.
+          description: When `true`, the rule matches tag values that do NOT match any of the supplied patterns.
           type: boolean
         policy_name:
-          description: Human-readable name for the tag policy.
+          description: Human-readable name for the tag rule.
           type: string
         policy_type:
-          $ref: "#/components/schemas/TagPolicyType"
+          $ref: "#/components/schemas/TagRuleType"
         required:
           description: When `true`, telemetry without this tag is treated as a violation.
           type: boolean
         scope:
-          description: The scope the policy applies within.
+          description: The scope the rule applies within.
           type: string
         tag_key:
-          description: The tag key that the policy governs.
+          description: The tag key that the rule governs.
           type: string
         tag_value_patterns:
           description: One or more patterns that valid values for the tag key must match.
@@ -110945,26 +110931,36 @@ components:
             type: string
           type: array
       type: object
-    TagPolicyUpdateData:
-      description: Data object for updating a tag policy.
+    TagRuleUpdateData:
+      description: Data object for updating a tag rule.
       properties:
         attributes:
-          $ref: "#/components/schemas/TagPolicyUpdateAttributes"
+          $ref: "#/components/schemas/TagRuleUpdateAttributes"
         id:
-          description: The unique identifier of the tag policy being updated.
+          description: The unique identifier of the tag rule being updated.
           example: "123"
           type: string
         type:
-          $ref: "#/components/schemas/TagPolicyResourceType"
+          $ref: "#/components/schemas/TagRuleResourceType"
       required:
         - type
         - id
       type: object
-    TagPolicyUpdateRequest:
-      description: Payload for updating an existing tag policy. Only the supplied fields are modified.
+    TagRuleUpdateRequest:
+      description: Payload for updating an existing tag rule. Only the supplied fields are modified.
       properties:
         data:
-          $ref: "#/components/schemas/TagPolicyUpdateData"
+          $ref: "#/components/schemas/TagRuleUpdateData"
+      required:
+        - data
+      type: object
+    TagRulesListResponse:
+      description: A page of tag rules.
+      properties:
+        data:
+          $ref: "#/components/schemas/TagRuleDataArray"
+        included:
+          $ref: "#/components/schemas/TagRuleIncludedResources"
       required:
         - data
       type: object
@@ -206603,38 +206599,38 @@ paths:
   /api/v2/tag_policies:
     get:
       description: |-
-        Retrieve all tag policies for the organization. Optionally include disabled or deleted
-        policies, filter by telemetry source, and include each policy's current compliance score
+        Retrieve all tag rules for the organization. Optionally include disabled or deleted
+        rules, filter by telemetry source, and include each rule's current compliance score
         via the `include=score` query parameter.
-      operationId: ListTagPolicies
+      operationId: ListTagRules
       parameters:
-        - description: Whether to include policies that are currently disabled. Defaults to `false`.
+        - description: Whether to include rules that are currently disabled. Defaults to `false`.
           example: false
           in: query
           name: include_disabled
           required: false
           schema:
             type: boolean
-        - description: Whether to include policies that have been soft-deleted. Defaults to `false`.
+        - description: Whether to include rules that have been soft-deleted. Defaults to `false`.
           example: false
           in: query
           name: include_deleted
           required: false
           schema:
             type: boolean
-        - description: Comma-separated list of related resources to include alongside each policy in the response. Currently the only supported value is `score`.
+        - description: Comma-separated list of related resources to include alongside each rule in the response. Currently the only supported value is `score`.
           example: "score"
           in: query
           name: include
           required: false
           schema:
-            $ref: "#/components/schemas/TagPolicyInclude"
-        - description: Restrict the result set to policies whose source matches the given value.
+            $ref: "#/components/schemas/TagRuleInclude"
+        - description: Restrict the result set to rules whose source matches the given value.
           in: query
           name: filter[source]
           required: false
           schema:
-            $ref: "#/components/schemas/TagPolicySource"
+            $ref: "#/components/schemas/TagRuleSource"
         - description: Start of the time window used for compliance score computation, as a Unix timestamp in milliseconds. Defaults to a recent window appropriate for the source.
           example: 1779315066097
           in: query
@@ -206692,7 +206688,7 @@ paths:
                         id: "123-v1-1779315066097-1779401466097"
                         type: "tag_policy_score"
               schema:
-                $ref: "#/components/schemas/TagPoliciesListResponse"
+                $ref: "#/components/schemas/TagRulesListResponse"
           description: OK
         "400":
           content:
@@ -206717,9 +206713,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List tag policies
+      summary: List tag rules
       tags:
-        - Tag Policies
+        - Tag Rules
       "x-permission":
         operator: OR
         permissions:
@@ -206730,10 +206726,10 @@ paths:
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
       description: |-
-        Create a new tag policy for the organization. The caller's organization is derived from
+        Create a new tag rule for the organization. The caller's organization is derived from
         the authenticated user; cross-organization creation is not supported. Fields such as
         `policy_id`, `version`, and the timestamp/audit fields are assigned by the server.
-      operationId: CreateTagPolicy
+      operationId: CreateTagRule
       requestBody:
         content:
           application/json:
@@ -206755,7 +206751,7 @@ paths:
                         - "web"
                     type: "tag_policy"
             schema:
-              $ref: "#/components/schemas/TagPolicyCreateRequest"
+              $ref: "#/components/schemas/TagRuleCreateRequest"
         required: true
       responses:
         "201":
@@ -206785,7 +206781,7 @@ paths:
                       id: "123"
                       type: "tag_policy"
               schema:
-                $ref: "#/components/schemas/TagPolicyResponse"
+                $ref: "#/components/schemas/TagRuleResponse"
           description: Created
         "400":
           content:
@@ -206816,9 +206812,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Create a tag policy
+      summary: Create a tag rule
       tags:
-        - Tag Policies
+        - Tag Rules
       "x-permission":
         operator: AND
         permissions:
@@ -206829,19 +206825,19 @@ paths:
   /api/v2/tag_policies/{policy_id}:
     delete:
       description: |-
-        Delete a tag policy. By default the policy is soft-deleted so it can be recovered later
+        Delete a tag rule. By default the rule is soft-deleted so it can be recovered later
         and so that historical score data remains queryable. Pass `hard_delete=true` to remove
-        the policy permanently.
-      operationId: DeleteTagPolicy
+        the rule permanently.
+      operationId: DeleteTagRule
       parameters:
-        - description: The unique identifier of the tag policy to delete.
+        - description: The unique identifier of the tag rule to delete.
           example: "123"
           in: path
           name: policy_id
           required: true
           schema:
             type: string
-        - description: Whether to permanently delete the policy instead of performing a soft delete. Defaults to `false`.
+        - description: Whether to permanently delete the rule instead of performing a soft delete. Defaults to `false`.
           example: false
           in: query
           name: hard_delete
@@ -206880,9 +206876,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Delete a tag policy
+      summary: Delete a tag rule
       tags:
-        - Tag Policies
+        - Tag Rules
       "x-permission":
         operator: AND
         permissions:
@@ -206892,25 +206888,25 @@ paths:
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     get:
       description: |-
-        Retrieve a single tag policy by ID. Optionally include the policy's current compliance
-        score via the `include=score` query parameter. Policies belonging to other organizations
+        Retrieve a single tag rule by ID. Optionally include the rule's current compliance
+        score via the `include=score` query parameter. Rules belonging to other organizations
         cannot be retrieved.
-      operationId: GetTagPolicy
+      operationId: GetTagRule
       parameters:
-        - description: The unique identifier of the tag policy.
+        - description: The unique identifier of the tag rule.
           example: "123"
           in: path
           name: policy_id
           required: true
           schema:
             type: string
-        - description: Comma-separated list of related resources to include alongside the policy. Currently the only supported value is `score`.
+        - description: Comma-separated list of related resources to include alongside the rule. Currently the only supported value is `score`.
           example: "score"
           in: query
           name: include
           required: false
           schema:
-            $ref: "#/components/schemas/TagPolicyInclude"
+            $ref: "#/components/schemas/TagRuleInclude"
         - description: Start of the time window used for compliance score computation, as a Unix timestamp in milliseconds.
           example: 1779315066097
           in: query
@@ -206968,7 +206964,7 @@ paths:
                         id: "123-v1-1779315066097-1779401466097"
                         type: "tag_policy_score"
               schema:
-                $ref: "#/components/schemas/TagPolicyResponse"
+                $ref: "#/components/schemas/TagRuleResponse"
           description: OK
         "400":
           content:
@@ -206999,9 +206995,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Get a tag policy
+      summary: Get a tag rule
       tags:
-        - Tag Policies
+        - Tag Rules
       "x-permission":
         operator: OR
         permissions:
@@ -207012,12 +207008,12 @@ paths:
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     patch:
       description: |-
-        Update one or more attributes of an existing tag policy. Only the fields supplied in the
-        request body are modified; omitted fields retain their current values. The policy's
+        Update one or more attributes of an existing tag rule. Only the fields supplied in the
+        request body are modified; omitted fields retain their current values. The rule's
         `source` cannot be changed after creation.
-      operationId: UpdateTagPolicy
+      operationId: UpdateTagRule
       parameters:
-        - description: The unique identifier of the tag policy to update.
+        - description: The unique identifier of the tag rule to update.
           example: "123"
           in: path
           name: policy_id
@@ -207037,7 +207033,7 @@ paths:
                     id: "123"
                     type: "tag_policy"
             schema:
-              $ref: "#/components/schemas/TagPolicyUpdateRequest"
+              $ref: "#/components/schemas/TagRuleUpdateRequest"
         required: true
       responses:
         "200":
@@ -207067,7 +207063,7 @@ paths:
                       id: "123"
                       type: "tag_policy"
               schema:
-                $ref: "#/components/schemas/TagPolicyResponse"
+                $ref: "#/components/schemas/TagRuleResponse"
           description: OK
         "400":
           content:
@@ -207098,9 +207094,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Update a tag policy
+      summary: Update a tag rule
       tags:
-        - Tag Policies
+        - Tag Rules
       "x-permission":
         operator: AND
         permissions:
@@ -207111,13 +207107,13 @@ paths:
   /api/v2/tag_policies/{policy_id}/score:
     get:
       description: |-
-        Retrieve the compliance score for a single tag policy. The score is computed over the
+        Retrieve the compliance score for a single tag rule. The score is computed over the
         requested time window (or a source-appropriate default) and represents the percentage of
-        telemetry within that window that conforms to the policy. A `null` score indicates that
+        telemetry within that window that conforms to the rule. A `null` score indicates that
         no relevant telemetry was found.
-      operationId: GetTagPolicyScore
+      operationId: GetTagRuleScore
       parameters:
-        - description: The unique identifier of the tag policy.
+        - description: The unique identifier of the tag rule.
           example: "123"
           in: path
           name: policy_id
@@ -207156,7 +207152,7 @@ paths:
                       id: "123-v1-1779315066097-1779401466097"
                       type: "tag_policy_score"
               schema:
-                $ref: "#/components/schemas/TagPolicyScoreResponse"
+                $ref: "#/components/schemas/TagRuleScoreResponse"
           description: OK
         "400":
           content:
@@ -207187,9 +207183,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Get a tag policy compliance score
+      summary: Get a tag rule compliance score
       tags:
-        - Tag Policies
+        - Tag Rules
       "x-permission":
         operator: OR
         permissions:
@@ -213664,12 +213660,12 @@ tags:
       For more information, see the [Synthetic Monitoring documentation](https://docs.datadoghq.com/synthetics/).
     name: Synthetics
   - description: |-
-      Tag Policies define rules that govern which tag values are accepted for a given tag key,
-      scoped to a particular telemetry source (such as logs, spans, or metrics). Policies can be
-      `blocking` (data not matching the policy is rejected) or `surfacing` (matching data is
-      highlighted but not blocked). Each policy reports a compliance `score` derived from how
-      much recent telemetry adheres to the policy.
-    name: Tag Policies
+      Tag Rules define rules that govern which tag values are accepted for a given tag key,
+      scoped to a particular telemetry source (such as logs, spans, or metrics). Rules can be
+      `blocking` (data not matching the rule is rejected) or `surfacing` (matching data is
+      highlighted but not blocked). Each rule reports a compliance `score` derived from how
+      much recent telemetry adheres to the rule.
+    name: Tag Rules
   - description: View and manage teams within Datadog. See the [Teams page](https://docs.datadoghq.com/account_management/teams/) for more information.
     name: Teams
   - description: |-
diff --git a/examples/v2/tag-policies/CreateTagPolicy.java b/examples/v2/tag-policies/CreateTagPolicy.java
deleted file mode 100644
index 46f272e6715..00000000000
--- a/examples/v2/tag-policies/CreateTagPolicy.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Create a tag policy returns "Created" response
-
-import com.datadog.api.client.ApiClient;
-import com.datadog.api.client.ApiException;
-import com.datadog.api.client.v2.api.TagPoliciesApi;
-import com.datadog.api.client.v2.model.TagPolicyCreateAttributes;
-import com.datadog.api.client.v2.model.TagPolicyCreateData;
-import com.datadog.api.client.v2.model.TagPolicyCreateRequest;
-import com.datadog.api.client.v2.model.TagPolicyCreateType;
-import com.datadog.api.client.v2.model.TagPolicyResourceType;
-import com.datadog.api.client.v2.model.TagPolicyResponse;
-import com.datadog.api.client.v2.model.TagPolicySource;
-import java.util.Arrays;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.createTagPolicy", true);
-    TagPoliciesApi apiInstance = new TagPoliciesApi(defaultClient);
-
-    TagPolicyCreateRequest body =
-        new TagPolicyCreateRequest()
-            .data(
-                new TagPolicyCreateData()
-                    .attributes(
-                        new TagPolicyCreateAttributes()
-                            .enabled(true)
-                            .negated(false)
-                            .policyName("Service tag must be one of api or web")
-                            .policyType(TagPolicyCreateType.SURFACING)
-                            .required(true)
-                            .scope("env")
-                            .source(TagPolicySource.LOGS)
-                            .tagKey("service")
-                            .tagValuePatterns(Arrays.asList("api", "web")))
-                    .type(TagPolicyResourceType.TAG_POLICY));
-
-    try {
-      TagPolicyResponse result = apiInstance.createTagPolicy(body);
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling TagPoliciesApi#createTagPolicy");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
diff --git a/examples/v2/tag-policies/UpdateTagPolicy.java b/examples/v2/tag-policies/UpdateTagPolicy.java
deleted file mode 100644
index 07bcef5ef2c..00000000000
--- a/examples/v2/tag-policies/UpdateTagPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// Update a tag policy returns "OK" response
-
-import com.datadog.api.client.ApiClient;
-import com.datadog.api.client.ApiException;
-import com.datadog.api.client.v2.api.TagPoliciesApi;
-import com.datadog.api.client.v2.model.TagPolicyResourceType;
-import com.datadog.api.client.v2.model.TagPolicyResponse;
-import com.datadog.api.client.v2.model.TagPolicyType;
-import com.datadog.api.client.v2.model.TagPolicyUpdateAttributes;
-import com.datadog.api.client.v2.model.TagPolicyUpdateData;
-import com.datadog.api.client.v2.model.TagPolicyUpdateRequest;
-
-public class Example {
-  public static void main(String[] args) {
-    ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.updateTagPolicy", true);
-    TagPoliciesApi apiInstance = new TagPoliciesApi(defaultClient);
-
-    TagPolicyUpdateRequest body =
-        new TagPolicyUpdateRequest()
-            .data(
-                new TagPolicyUpdateData()
-                    .attributes(new TagPolicyUpdateAttributes().policyType(TagPolicyType.SURFACING))
-                    .id("123")
-                    .type(TagPolicyResourceType.TAG_POLICY));
-
-    try {
-      TagPolicyResponse result = apiInstance.updateTagPolicy("123", body);
-      System.out.println(result);
-    } catch (ApiException e) {
-      System.err.println("Exception when calling TagPoliciesApi#updateTagPolicy");
-      System.err.println("Status code: " + e.getCode());
-      System.err.println("Reason: " + e.getResponseBody());
-      System.err.println("Response headers: " + e.getResponseHeaders());
-      e.printStackTrace();
-    }
-  }
-}
diff --git a/examples/v2/tag-rules/CreateTagRule.java b/examples/v2/tag-rules/CreateTagRule.java
new file mode 100644
index 00000000000..b363c83c481
--- /dev/null
+++ b/examples/v2/tag-rules/CreateTagRule.java
@@ -0,0 +1,49 @@
+// Create a tag rule returns "Created" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.TagRulesApi;
+import com.datadog.api.client.v2.model.TagRuleCreateAttributes;
+import com.datadog.api.client.v2.model.TagRuleCreateData;
+import com.datadog.api.client.v2.model.TagRuleCreateRequest;
+import com.datadog.api.client.v2.model.TagRuleCreateType;
+import com.datadog.api.client.v2.model.TagRuleResourceType;
+import com.datadog.api.client.v2.model.TagRuleResponse;
+import com.datadog.api.client.v2.model.TagRuleSource;
+import java.util.Arrays;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.createTagRule", true);
+    TagRulesApi apiInstance = new TagRulesApi(defaultClient);
+
+    TagRuleCreateRequest body =
+        new TagRuleCreateRequest()
+            .data(
+                new TagRuleCreateData()
+                    .attributes(
+                        new TagRuleCreateAttributes()
+                            .enabled(true)
+                            .negated(false)
+                            .policyName("Service tag must be one of api or web")
+                            .policyType(TagRuleCreateType.SURFACING)
+                            .required(true)
+                            .scope("env")
+                            .source(TagRuleSource.LOGS)
+                            .tagKey("service")
+                            .tagValuePatterns(Arrays.asList("api", "web")))
+                    .type(TagRuleResourceType.TAG_POLICY));
+
+    try {
+      TagRuleResponse result = apiInstance.createTagRule(body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling TagRulesApi#createTagRule");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/examples/v2/tag-policies/DeleteTagPolicy.java b/examples/v2/tag-rules/DeleteTagRule.java
similarity index 56%
rename from examples/v2/tag-policies/DeleteTagPolicy.java
rename to examples/v2/tag-rules/DeleteTagRule.java
index 1f99a8f9079..0710bcaa467 100644
--- a/examples/v2/tag-policies/DeleteTagPolicy.java
+++ b/examples/v2/tag-rules/DeleteTagRule.java
@@ -1,19 +1,19 @@
-// Delete a tag policy returns "No Content" response
+// Delete a tag rule returns "No Content" response
 
 import com.datadog.api.client.ApiClient;
 import com.datadog.api.client.ApiException;
-import com.datadog.api.client.v2.api.TagPoliciesApi;
+import com.datadog.api.client.v2.api.TagRulesApi;
 
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.deleteTagPolicy", true);
-    TagPoliciesApi apiInstance = new TagPoliciesApi(defaultClient);
+    defaultClient.setUnstableOperationEnabled("v2.deleteTagRule", true);
+    TagRulesApi apiInstance = new TagRulesApi(defaultClient);
 
     try {
-      apiInstance.deleteTagPolicy("123");
+      apiInstance.deleteTagRule("123");
     } catch (ApiException e) {
-      System.err.println("Exception when calling TagPoliciesApi#deleteTagPolicy");
+      System.err.println("Exception when calling TagRulesApi#deleteTagRule");
       System.err.println("Status code: " + e.getCode());
       System.err.println("Reason: " + e.getResponseBody());
       System.err.println("Response headers: " + e.getResponseHeaders());
diff --git a/examples/v2/tag-policies/ListTagPolicies.java b/examples/v2/tag-rules/GetTagRule.java
similarity index 53%
rename from examples/v2/tag-policies/ListTagPolicies.java
rename to examples/v2/tag-rules/GetTagRule.java
index 7aa01b75df1..fbf90596e9d 100644
--- a/examples/v2/tag-policies/ListTagPolicies.java
+++ b/examples/v2/tag-rules/GetTagRule.java
@@ -1,21 +1,21 @@
-// List tag policies returns "OK" response
+// Get a tag rule returns "OK" response
 
 import com.datadog.api.client.ApiClient;
 import com.datadog.api.client.ApiException;
-import com.datadog.api.client.v2.api.TagPoliciesApi;
-import com.datadog.api.client.v2.model.TagPoliciesListResponse;
+import com.datadog.api.client.v2.api.TagRulesApi;
+import com.datadog.api.client.v2.model.TagRuleResponse;
 
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.listTagPolicies", true);
-    TagPoliciesApi apiInstance = new TagPoliciesApi(defaultClient);
+    defaultClient.setUnstableOperationEnabled("v2.getTagRule", true);
+    TagRulesApi apiInstance = new TagRulesApi(defaultClient);
 
     try {
-      TagPoliciesListResponse result = apiInstance.listTagPolicies();
+      TagRuleResponse result = apiInstance.getTagRule("123");
       System.out.println(result);
     } catch (ApiException e) {
-      System.err.println("Exception when calling TagPoliciesApi#listTagPolicies");
+      System.err.println("Exception when calling TagRulesApi#getTagRule");
       System.err.println("Status code: " + e.getCode());
       System.err.println("Reason: " + e.getResponseBody());
       System.err.println("Response headers: " + e.getResponseHeaders());
diff --git a/examples/v2/tag-policies/GetTagPolicyScore.java b/examples/v2/tag-rules/GetTagRuleScore.java
similarity index 51%
rename from examples/v2/tag-policies/GetTagPolicyScore.java
rename to examples/v2/tag-rules/GetTagRuleScore.java
index 1574f9a5832..7ffd8c4e698 100644
--- a/examples/v2/tag-policies/GetTagPolicyScore.java
+++ b/examples/v2/tag-rules/GetTagRuleScore.java
@@ -1,21 +1,21 @@
-// Get a tag policy compliance score returns "OK" response
+// Get a tag rule compliance score returns "OK" response
 
 import com.datadog.api.client.ApiClient;
 import com.datadog.api.client.ApiException;
-import com.datadog.api.client.v2.api.TagPoliciesApi;
-import com.datadog.api.client.v2.model.TagPolicyScoreResponse;
+import com.datadog.api.client.v2.api.TagRulesApi;
+import com.datadog.api.client.v2.model.TagRuleScoreResponse;
 
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.getTagPolicyScore", true);
-    TagPoliciesApi apiInstance = new TagPoliciesApi(defaultClient);
+    defaultClient.setUnstableOperationEnabled("v2.getTagRuleScore", true);
+    TagRulesApi apiInstance = new TagRulesApi(defaultClient);
 
     try {
-      TagPolicyScoreResponse result = apiInstance.getTagPolicyScore("123");
+      TagRuleScoreResponse result = apiInstance.getTagRuleScore("123");
       System.out.println(result);
     } catch (ApiException e) {
-      System.err.println("Exception when calling TagPoliciesApi#getTagPolicyScore");
+      System.err.println("Exception when calling TagRulesApi#getTagRuleScore");
       System.err.println("Status code: " + e.getCode());
       System.err.println("Reason: " + e.getResponseBody());
       System.err.println("Response headers: " + e.getResponseHeaders());
diff --git a/examples/v2/tag-policies/GetTagPolicy.java b/examples/v2/tag-rules/ListTagRules.java
similarity index 55%
rename from examples/v2/tag-policies/GetTagPolicy.java
rename to examples/v2/tag-rules/ListTagRules.java
index b14c1c0139a..879d70d5edf 100644
--- a/examples/v2/tag-policies/GetTagPolicy.java
+++ b/examples/v2/tag-rules/ListTagRules.java
@@ -1,21 +1,21 @@
-// Get a tag policy returns "OK" response
+// List tag rules returns "OK" response
 
 import com.datadog.api.client.ApiClient;
 import com.datadog.api.client.ApiException;
-import com.datadog.api.client.v2.api.TagPoliciesApi;
-import com.datadog.api.client.v2.model.TagPolicyResponse;
+import com.datadog.api.client.v2.api.TagRulesApi;
+import com.datadog.api.client.v2.model.TagRulesListResponse;
 
 public class Example {
   public static void main(String[] args) {
     ApiClient defaultClient = ApiClient.getDefaultApiClient();
-    defaultClient.setUnstableOperationEnabled("v2.getTagPolicy", true);
-    TagPoliciesApi apiInstance = new TagPoliciesApi(defaultClient);
+    defaultClient.setUnstableOperationEnabled("v2.listTagRules", true);
+    TagRulesApi apiInstance = new TagRulesApi(defaultClient);
 
     try {
-      TagPolicyResponse result = apiInstance.getTagPolicy("123");
+      TagRulesListResponse result = apiInstance.listTagRules();
       System.out.println(result);
     } catch (ApiException e) {
-      System.err.println("Exception when calling TagPoliciesApi#getTagPolicy");
+      System.err.println("Exception when calling TagRulesApi#listTagRules");
       System.err.println("Status code: " + e.getCode());
       System.err.println("Reason: " + e.getResponseBody());
       System.err.println("Response headers: " + e.getResponseHeaders());
diff --git a/examples/v2/tag-rules/UpdateTagRule.java b/examples/v2/tag-rules/UpdateTagRule.java
new file mode 100644
index 00000000000..c7222a17e7d
--- /dev/null
+++ b/examples/v2/tag-rules/UpdateTagRule.java
@@ -0,0 +1,38 @@
+// Update a tag rule returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.TagRulesApi;
+import com.datadog.api.client.v2.model.TagRuleResourceType;
+import com.datadog.api.client.v2.model.TagRuleResponse;
+import com.datadog.api.client.v2.model.TagRuleType;
+import com.datadog.api.client.v2.model.TagRuleUpdateAttributes;
+import com.datadog.api.client.v2.model.TagRuleUpdateData;
+import com.datadog.api.client.v2.model.TagRuleUpdateRequest;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.updateTagRule", true);
+    TagRulesApi apiInstance = new TagRulesApi(defaultClient);
+
+    TagRuleUpdateRequest body =
+        new TagRuleUpdateRequest()
+            .data(
+                new TagRuleUpdateData()
+                    .attributes(new TagRuleUpdateAttributes().policyType(TagRuleType.SURFACING))
+                    .id("123")
+                    .type(TagRuleResourceType.TAG_POLICY));
+
+    try {
+      TagRuleResponse result = apiInstance.updateTagRule("123", body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling TagRulesApi#updateTagRule");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/ApiClient.java b/src/main/java/com/datadog/api/client/ApiClient.java
index 8ef606a214c..ff6be7d4915 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -1377,12 +1377,12 @@ public class ApiClient {
           put("v2.revertCustomRuleRevision", false);
           put("v2.updateAiCustomRuleset", false);
           put("v2.updateCustomRuleset", false);
-          put("v2.createTagPolicy", false);
-          put("v2.deleteTagPolicy", false);
-          put("v2.getTagPolicy", false);
-          put("v2.getTagPolicyScore", false);
-          put("v2.listTagPolicies", false);
-          put("v2.updateTagPolicy", false);
+          put("v2.createTagRule", false);
+          put("v2.deleteTagRule", false);
+          put("v2.getTagRule", false);
+          put("v2.getTagRuleScore", false);
+          put("v2.listTagRules", false);
+          put("v2.updateTagRule", false);
           put("v2.addMemberTeam", false);
           put("v2.listMemberTeams", false);
           put("v2.removeMemberTeam", false);
diff --git a/src/main/java/com/datadog/api/client/v2/api/TagPoliciesApi.java b/src/main/java/com/datadog/api/client/v2/api/TagRulesApi.java
similarity index 64%
rename from src/main/java/com/datadog/api/client/v2/api/TagPoliciesApi.java
rename to src/main/java/com/datadog/api/client/v2/api/TagRulesApi.java
index cb577697978..abfdbd62936 100644
--- a/src/main/java/com/datadog/api/client/v2/api/TagPoliciesApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/TagRulesApi.java
@@ -4,13 +4,13 @@
 import com.datadog.api.client.ApiException;
 import com.datadog.api.client.ApiResponse;
 import com.datadog.api.client.Pair;
-import com.datadog.api.client.v2.model.TagPoliciesListResponse;
-import com.datadog.api.client.v2.model.TagPolicyCreateRequest;
-import com.datadog.api.client.v2.model.TagPolicyInclude;
-import com.datadog.api.client.v2.model.TagPolicyResponse;
-import com.datadog.api.client.v2.model.TagPolicyScoreResponse;
-import com.datadog.api.client.v2.model.TagPolicySource;
-import com.datadog.api.client.v2.model.TagPolicyUpdateRequest;
+import com.datadog.api.client.v2.model.TagRuleCreateRequest;
+import com.datadog.api.client.v2.model.TagRuleInclude;
+import com.datadog.api.client.v2.model.TagRuleResponse;
+import com.datadog.api.client.v2.model.TagRuleScoreResponse;
+import com.datadog.api.client.v2.model.TagRuleSource;
+import com.datadog.api.client.v2.model.TagRuleUpdateRequest;
+import com.datadog.api.client.v2.model.TagRulesListResponse;
 import jakarta.ws.rs.client.Invocation;
 import jakarta.ws.rs.core.GenericType;
 import java.util.ArrayList;
@@ -21,14 +21,14 @@
 
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPoliciesApi {
+public class TagRulesApi {
   private ApiClient apiClient;
 
-  public TagPoliciesApi() {
+  public TagRulesApi() {
     this(ApiClient.getDefaultApiClient());
   }
 
-  public TagPoliciesApi(ApiClient apiClient) {
+  public TagRulesApi(ApiClient apiClient) {
     this.apiClient = apiClient;
   }
 
@@ -51,28 +51,28 @@ public void setApiClient(ApiClient apiClient) {
   }
 
   /**
-   * Create a tag policy.
+   * Create a tag rule.
    *
-   * <p>See {@link #createTagPolicyWithHttpInfo}.
+   * <p>See {@link #createTagRuleWithHttpInfo}.
    *
    * @param body (required)
-   * @return TagPolicyResponse
+   * @return TagRuleResponse
    * @throws ApiException if fails to make API call
    */
-  public TagPolicyResponse createTagPolicy(TagPolicyCreateRequest body) throws ApiException {
-    return createTagPolicyWithHttpInfo(body).getData();
+  public TagRuleResponse createTagRule(TagRuleCreateRequest body) throws ApiException {
+    return createTagRuleWithHttpInfo(body).getData();
   }
 
   /**
-   * Create a tag policy.
+   * Create a tag rule.
    *
-   * <p>See {@link #createTagPolicyWithHttpInfoAsync}.
+   * <p>See {@link #createTagRuleWithHttpInfoAsync}.
    *
    * @param body (required)
-   * @return CompletableFuture&lt;TagPolicyResponse&gt;
+   * @return CompletableFuture&lt;TagRuleResponse&gt;
    */
-  public CompletableFuture<TagPolicyResponse> createTagPolicyAsync(TagPolicyCreateRequest body) {
-    return createTagPolicyWithHttpInfoAsync(body)
+  public CompletableFuture<TagRuleResponse> createTagRuleAsync(TagRuleCreateRequest body) {
+    return createTagRuleWithHttpInfoAsync(body)
         .thenApply(
             response -> {
               return response.getData();
@@ -80,13 +80,13 @@ public CompletableFuture<TagPolicyResponse> createTagPolicyAsync(TagPolicyCreate
   }
 
   /**
-   * Create a new tag policy for the organization. The caller's organization is derived from the
+   * Create a new tag rule for the organization. The caller's organization is derived from the
    * authenticated user; cross-organization creation is not supported. Fields such as <code>
    * policy_id</code>, <code>version</code>, and the timestamp/audit fields are assigned by the
    * server.
    *
    * @param body (required)
-   * @return ApiResponse&lt;TagPolicyResponse&gt;
+   * @return ApiResponse&lt;TagRuleResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
    *     <table border="1">
@@ -100,10 +100,10 @@ public CompletableFuture<TagPolicyResponse> createTagPolicyAsync(TagPolicyCreate
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<TagPolicyResponse> createTagPolicyWithHttpInfo(TagPolicyCreateRequest body)
+  public ApiResponse<TagRuleResponse> createTagRuleWithHttpInfo(TagRuleCreateRequest body)
       throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "createTagPolicy";
+    String operationId = "createTagRule";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
@@ -114,7 +114,7 @@ public ApiResponse<TagPolicyResponse> createTagPolicyWithHttpInfo(TagPolicyCreat
     // verify the required parameter 'body' is set
     if (body == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'body' when calling createTagPolicy");
+          400, "Missing the required parameter 'body' when calling createTagRule");
     }
     // create path and map variables
     String localVarPath = "/api/v2/tag_policies";
@@ -123,7 +123,7 @@ public ApiResponse<TagPolicyResponse> createTagPolicyWithHttpInfo(TagPolicyCreat
 
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.TagPoliciesApi.createTagPolicy",
+            "v2.TagRulesApi.createTagRule",
             localVarPath,
             new ArrayList<Pair>(),
             localVarHeaderParams,
@@ -138,25 +138,25 @@ public ApiResponse<TagPolicyResponse> createTagPolicyWithHttpInfo(TagPolicyCreat
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPolicyResponse>() {});
+        new GenericType<TagRuleResponse>() {});
   }
 
   /**
-   * Create a tag policy.
+   * Create a tag rule.
    *
-   * <p>See {@link #createTagPolicyWithHttpInfo}.
+   * <p>See {@link #createTagRuleWithHttpInfo}.
    *
    * @param body (required)
-   * @return CompletableFuture&lt;ApiResponse&lt;TagPolicyResponse&gt;&gt;
+   * @return CompletableFuture&lt;ApiResponse&lt;TagRuleResponse&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<TagPolicyResponse>> createTagPolicyWithHttpInfoAsync(
-      TagPolicyCreateRequest body) {
+  public CompletableFuture<ApiResponse<TagRuleResponse>> createTagRuleWithHttpInfoAsync(
+      TagRuleCreateRequest body) {
     // Check if unstable operation is enabled
-    String operationId = "createTagPolicy";
+    String operationId = "createTagRule";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
@@ -165,10 +165,10 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> createTagPolicyWithHttp
 
     // verify the required parameter 'body' is set
     if (body == null) {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'body' when calling createTagPolicy"));
+              400, "Missing the required parameter 'body' when calling createTagRule"));
       return result;
     }
     // create path and map variables
@@ -180,7 +180,7 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> createTagPolicyWithHttp
     try {
       builder =
           apiClient.createBuilder(
-              "v2.TagPoliciesApi.createTagPolicy",
+              "v2.TagRulesApi.createTagRule",
               localVarPath,
               new ArrayList<Pair>(),
               localVarHeaderParams,
@@ -188,7 +188,7 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> createTagPolicyWithHttp
               new String[] {"application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
@@ -200,48 +200,48 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> createTagPolicyWithHttp
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPolicyResponse>() {});
+        new GenericType<TagRuleResponse>() {});
   }
 
-  /** Manage optional parameters to deleteTagPolicy. */
-  public static class DeleteTagPolicyOptionalParameters {
+  /** Manage optional parameters to deleteTagRule. */
+  public static class DeleteTagRuleOptionalParameters {
     private Boolean hardDelete;
 
     /**
      * Set hardDelete.
      *
-     * @param hardDelete Whether to permanently delete the policy instead of performing a soft
-     *     delete. Defaults to <code>false</code>. (optional)
-     * @return DeleteTagPolicyOptionalParameters
+     * @param hardDelete Whether to permanently delete the rule instead of performing a soft delete.
+     *     Defaults to <code>false</code>. (optional)
+     * @return DeleteTagRuleOptionalParameters
      */
-    public DeleteTagPolicyOptionalParameters hardDelete(Boolean hardDelete) {
+    public DeleteTagRuleOptionalParameters hardDelete(Boolean hardDelete) {
       this.hardDelete = hardDelete;
       return this;
     }
   }
 
   /**
-   * Delete a tag policy.
+   * Delete a tag rule.
    *
-   * <p>See {@link #deleteTagPolicyWithHttpInfo}.
+   * <p>See {@link #deleteTagRuleWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy to delete. (required)
+   * @param policyId The unique identifier of the tag rule to delete. (required)
    * @throws ApiException if fails to make API call
    */
-  public void deleteTagPolicy(String policyId) throws ApiException {
-    deleteTagPolicyWithHttpInfo(policyId, new DeleteTagPolicyOptionalParameters());
+  public void deleteTagRule(String policyId) throws ApiException {
+    deleteTagRuleWithHttpInfo(policyId, new DeleteTagRuleOptionalParameters());
   }
 
   /**
-   * Delete a tag policy.
+   * Delete a tag rule.
    *
-   * <p>See {@link #deleteTagPolicyWithHttpInfoAsync}.
+   * <p>See {@link #deleteTagRuleWithHttpInfoAsync}.
    *
-   * @param policyId The unique identifier of the tag policy to delete. (required)
+   * @param policyId The unique identifier of the tag rule to delete. (required)
    * @return CompletableFuture
    */
-  public CompletableFuture<Void> deleteTagPolicyAsync(String policyId) {
-    return deleteTagPolicyWithHttpInfoAsync(policyId, new DeleteTagPolicyOptionalParameters())
+  public CompletableFuture<Void> deleteTagRuleAsync(String policyId) {
+    return deleteTagRuleWithHttpInfoAsync(policyId, new DeleteTagRuleOptionalParameters())
         .thenApply(
             response -> {
               return response.getData();
@@ -249,31 +249,31 @@ public CompletableFuture<Void> deleteTagPolicyAsync(String policyId) {
   }
 
   /**
-   * Delete a tag policy.
+   * Delete a tag rule.
    *
-   * <p>See {@link #deleteTagPolicyWithHttpInfo}.
+   * <p>See {@link #deleteTagRuleWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy to delete. (required)
+   * @param policyId The unique identifier of the tag rule to delete. (required)
    * @param parameters Optional parameters for the request.
    * @throws ApiException if fails to make API call
    */
-  public void deleteTagPolicy(String policyId, DeleteTagPolicyOptionalParameters parameters)
+  public void deleteTagRule(String policyId, DeleteTagRuleOptionalParameters parameters)
       throws ApiException {
-    deleteTagPolicyWithHttpInfo(policyId, parameters);
+    deleteTagRuleWithHttpInfo(policyId, parameters);
   }
 
   /**
-   * Delete a tag policy.
+   * Delete a tag rule.
    *
-   * <p>See {@link #deleteTagPolicyWithHttpInfoAsync}.
+   * <p>See {@link #deleteTagRuleWithHttpInfoAsync}.
    *
-   * @param policyId The unique identifier of the tag policy to delete. (required)
+   * @param policyId The unique identifier of the tag rule to delete. (required)
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture
    */
-  public CompletableFuture<Void> deleteTagPolicyAsync(
-      String policyId, DeleteTagPolicyOptionalParameters parameters) {
-    return deleteTagPolicyWithHttpInfoAsync(policyId, parameters)
+  public CompletableFuture<Void> deleteTagRuleAsync(
+      String policyId, DeleteTagRuleOptionalParameters parameters) {
+    return deleteTagRuleWithHttpInfoAsync(policyId, parameters)
         .thenApply(
             response -> {
               return response.getData();
@@ -281,11 +281,11 @@ public CompletableFuture<Void> deleteTagPolicyAsync(
   }
 
   /**
-   * Delete a tag policy. By default the policy is soft-deleted so it can be recovered later and so
-   * that historical score data remains queryable. Pass <code>hard_delete=true</code> to remove the
-   * policy permanently.
+   * Delete a tag rule. By default the rule is soft-deleted so it can be recovered later and so that
+   * historical score data remains queryable. Pass <code>hard_delete=true</code> to remove the rule
+   * permanently.
    *
-   * @param policyId The unique identifier of the tag policy to delete. (required)
+   * @param policyId The unique identifier of the tag rule to delete. (required)
    * @param parameters Optional parameters for the request.
    * @return ApiResponse&lt;Void&gt;
    * @throws ApiException if fails to make API call
@@ -301,10 +301,10 @@ public CompletableFuture<Void> deleteTagPolicyAsync(
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<Void> deleteTagPolicyWithHttpInfo(
-      String policyId, DeleteTagPolicyOptionalParameters parameters) throws ApiException {
+  public ApiResponse<Void> deleteTagRuleWithHttpInfo(
+      String policyId, DeleteTagRuleOptionalParameters parameters) throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "deleteTagPolicy";
+    String operationId = "deleteTagRule";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
@@ -315,7 +315,7 @@ public ApiResponse<Void> deleteTagPolicyWithHttpInfo(
     // verify the required parameter 'policyId' is set
     if (policyId == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'policyId' when calling deleteTagPolicy");
+          400, "Missing the required parameter 'policyId' when calling deleteTagRule");
     }
     Boolean hardDelete = parameters.hardDelete;
     // create path and map variables
@@ -330,7 +330,7 @@ public ApiResponse<Void> deleteTagPolicyWithHttpInfo(
 
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.TagPoliciesApi.deleteTagPolicy",
+            "v2.TagRulesApi.deleteTagRule",
             localVarPath,
             localVarQueryParams,
             localVarHeaderParams,
@@ -349,18 +349,18 @@ public ApiResponse<Void> deleteTagPolicyWithHttpInfo(
   }
 
   /**
-   * Delete a tag policy.
+   * Delete a tag rule.
    *
-   * <p>See {@link #deleteTagPolicyWithHttpInfo}.
+   * <p>See {@link #deleteTagRuleWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy to delete. (required)
+   * @param policyId The unique identifier of the tag rule to delete. (required)
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<Void>> deleteTagPolicyWithHttpInfoAsync(
-      String policyId, DeleteTagPolicyOptionalParameters parameters) {
+  public CompletableFuture<ApiResponse<Void>> deleteTagRuleWithHttpInfoAsync(
+      String policyId, DeleteTagRuleOptionalParameters parameters) {
     // Check if unstable operation is enabled
-    String operationId = "deleteTagPolicy";
+    String operationId = "deleteTagRule";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
@@ -376,7 +376,7 @@ public CompletableFuture<ApiResponse<Void>> deleteTagPolicyWithHttpInfoAsync(
       CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'policyId' when calling deleteTagPolicy"));
+              400, "Missing the required parameter 'policyId' when calling deleteTagRule"));
       return result;
     }
     Boolean hardDelete = parameters.hardDelete;
@@ -394,7 +394,7 @@ public CompletableFuture<ApiResponse<Void>> deleteTagPolicyWithHttpInfoAsync(
     try {
       builder =
           apiClient.createBuilder(
-              "v2.TagPoliciesApi.deleteTagPolicy",
+              "v2.TagRulesApi.deleteTagRule",
               localVarPath,
               localVarQueryParams,
               localVarHeaderParams,
@@ -417,20 +417,20 @@ public CompletableFuture<ApiResponse<Void>> deleteTagPolicyWithHttpInfoAsync(
         null);
   }
 
-  /** Manage optional parameters to getTagPolicy. */
-  public static class GetTagPolicyOptionalParameters {
-    private TagPolicyInclude include;
+  /** Manage optional parameters to getTagRule. */
+  public static class GetTagRuleOptionalParameters {
+    private TagRuleInclude include;
     private Long tsStart;
     private Long tsEnd;
 
     /**
      * Set include.
      *
-     * @param include Comma-separated list of related resources to include alongside the policy.
+     * @param include Comma-separated list of related resources to include alongside the rule.
      *     Currently the only supported value is <code>score</code>. (optional)
-     * @return GetTagPolicyOptionalParameters
+     * @return GetTagRuleOptionalParameters
      */
-    public GetTagPolicyOptionalParameters include(TagPolicyInclude include) {
+    public GetTagRuleOptionalParameters include(TagRuleInclude include) {
       this.include = include;
       return this;
     }
@@ -440,9 +440,9 @@ public GetTagPolicyOptionalParameters include(TagPolicyInclude include) {
      *
      * @param tsStart Start of the time window used for compliance score computation, as a Unix
      *     timestamp in milliseconds. (optional)
-     * @return GetTagPolicyOptionalParameters
+     * @return GetTagRuleOptionalParameters
      */
-    public GetTagPolicyOptionalParameters tsStart(Long tsStart) {
+    public GetTagRuleOptionalParameters tsStart(Long tsStart) {
       this.tsStart = tsStart;
       return this;
     }
@@ -453,37 +453,37 @@ public GetTagPolicyOptionalParameters tsStart(Long tsStart) {
      * @param tsEnd End of the time window used for compliance score computation, as a Unix
      *     timestamp in milliseconds. Must be in the past and greater than <code>ts_start</code>.
      *     (optional)
-     * @return GetTagPolicyOptionalParameters
+     * @return GetTagRuleOptionalParameters
      */
-    public GetTagPolicyOptionalParameters tsEnd(Long tsEnd) {
+    public GetTagRuleOptionalParameters tsEnd(Long tsEnd) {
       this.tsEnd = tsEnd;
       return this;
     }
   }
 
   /**
-   * Get a tag policy.
+   * Get a tag rule.
    *
-   * <p>See {@link #getTagPolicyWithHttpInfo}.
+   * <p>See {@link #getTagRuleWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
-   * @return TagPolicyResponse
+   * @param policyId The unique identifier of the tag rule. (required)
+   * @return TagRuleResponse
    * @throws ApiException if fails to make API call
    */
-  public TagPolicyResponse getTagPolicy(String policyId) throws ApiException {
-    return getTagPolicyWithHttpInfo(policyId, new GetTagPolicyOptionalParameters()).getData();
+  public TagRuleResponse getTagRule(String policyId) throws ApiException {
+    return getTagRuleWithHttpInfo(policyId, new GetTagRuleOptionalParameters()).getData();
   }
 
   /**
-   * Get a tag policy.
+   * Get a tag rule.
    *
-   * <p>See {@link #getTagPolicyWithHttpInfoAsync}.
+   * <p>See {@link #getTagRuleWithHttpInfoAsync}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
-   * @return CompletableFuture&lt;TagPolicyResponse&gt;
+   * @param policyId The unique identifier of the tag rule. (required)
+   * @return CompletableFuture&lt;TagRuleResponse&gt;
    */
-  public CompletableFuture<TagPolicyResponse> getTagPolicyAsync(String policyId) {
-    return getTagPolicyWithHttpInfoAsync(policyId, new GetTagPolicyOptionalParameters())
+  public CompletableFuture<TagRuleResponse> getTagRuleAsync(String policyId) {
+    return getTagRuleWithHttpInfoAsync(policyId, new GetTagRuleOptionalParameters())
         .thenApply(
             response -> {
               return response.getData();
@@ -491,32 +491,32 @@ public CompletableFuture<TagPolicyResponse> getTagPolicyAsync(String policyId) {
   }
 
   /**
-   * Get a tag policy.
+   * Get a tag rule.
    *
-   * <p>See {@link #getTagPolicyWithHttpInfo}.
+   * <p>See {@link #getTagRuleWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
+   * @param policyId The unique identifier of the tag rule. (required)
    * @param parameters Optional parameters for the request.
-   * @return TagPolicyResponse
+   * @return TagRuleResponse
    * @throws ApiException if fails to make API call
    */
-  public TagPolicyResponse getTagPolicy(String policyId, GetTagPolicyOptionalParameters parameters)
+  public TagRuleResponse getTagRule(String policyId, GetTagRuleOptionalParameters parameters)
       throws ApiException {
-    return getTagPolicyWithHttpInfo(policyId, parameters).getData();
+    return getTagRuleWithHttpInfo(policyId, parameters).getData();
   }
 
   /**
-   * Get a tag policy.
+   * Get a tag rule.
    *
-   * <p>See {@link #getTagPolicyWithHttpInfoAsync}.
+   * <p>See {@link #getTagRuleWithHttpInfoAsync}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
+   * @param policyId The unique identifier of the tag rule. (required)
    * @param parameters Optional parameters for the request.
-   * @return CompletableFuture&lt;TagPolicyResponse&gt;
+   * @return CompletableFuture&lt;TagRuleResponse&gt;
    */
-  public CompletableFuture<TagPolicyResponse> getTagPolicyAsync(
-      String policyId, GetTagPolicyOptionalParameters parameters) {
-    return getTagPolicyWithHttpInfoAsync(policyId, parameters)
+  public CompletableFuture<TagRuleResponse> getTagRuleAsync(
+      String policyId, GetTagRuleOptionalParameters parameters) {
+    return getTagRuleWithHttpInfoAsync(policyId, parameters)
         .thenApply(
             response -> {
               return response.getData();
@@ -524,13 +524,13 @@ public CompletableFuture<TagPolicyResponse> getTagPolicyAsync(
   }
 
   /**
-   * Retrieve a single tag policy by ID. Optionally include the policy's current compliance score
-   * via the <code>include=score</code> query parameter. Policies belonging to other organizations
-   * cannot be retrieved.
+   * Retrieve a single tag rule by ID. Optionally include the rule's current compliance score via
+   * the <code>include=score</code> query parameter. Rules belonging to other organizations cannot
+   * be retrieved.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
+   * @param policyId The unique identifier of the tag rule. (required)
    * @param parameters Optional parameters for the request.
-   * @return ApiResponse&lt;TagPolicyResponse&gt;
+   * @return ApiResponse&lt;TagRuleResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
    *     <table border="1">
@@ -544,10 +544,10 @@ public CompletableFuture<TagPolicyResponse> getTagPolicyAsync(
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<TagPolicyResponse> getTagPolicyWithHttpInfo(
-      String policyId, GetTagPolicyOptionalParameters parameters) throws ApiException {
+  public ApiResponse<TagRuleResponse> getTagRuleWithHttpInfo(
+      String policyId, GetTagRuleOptionalParameters parameters) throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "getTagPolicy";
+    String operationId = "getTagRule";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
@@ -558,9 +558,9 @@ public ApiResponse<TagPolicyResponse> getTagPolicyWithHttpInfo(
     // verify the required parameter 'policyId' is set
     if (policyId == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'policyId' when calling getTagPolicy");
+          400, "Missing the required parameter 'policyId' when calling getTagRule");
     }
-    TagPolicyInclude include = parameters.include;
+    TagRuleInclude include = parameters.include;
     Long tsStart = parameters.tsStart;
     Long tsEnd = parameters.tsEnd;
     // create path and map variables
@@ -577,7 +577,7 @@ public ApiResponse<TagPolicyResponse> getTagPolicyWithHttpInfo(
 
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.TagPoliciesApi.getTagPolicy",
+            "v2.TagRulesApi.getTagRule",
             localVarPath,
             localVarQueryParams,
             localVarHeaderParams,
@@ -592,26 +592,26 @@ public ApiResponse<TagPolicyResponse> getTagPolicyWithHttpInfo(
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPolicyResponse>() {});
+        new GenericType<TagRuleResponse>() {});
   }
 
   /**
-   * Get a tag policy.
+   * Get a tag rule.
    *
-   * <p>See {@link #getTagPolicyWithHttpInfo}.
+   * <p>See {@link #getTagRuleWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
+   * @param policyId The unique identifier of the tag rule. (required)
    * @param parameters Optional parameters for the request.
-   * @return CompletableFuture&lt;ApiResponse&lt;TagPolicyResponse&gt;&gt;
+   * @return CompletableFuture&lt;ApiResponse&lt;TagRuleResponse&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<TagPolicyResponse>> getTagPolicyWithHttpInfoAsync(
-      String policyId, GetTagPolicyOptionalParameters parameters) {
+  public CompletableFuture<ApiResponse<TagRuleResponse>> getTagRuleWithHttpInfoAsync(
+      String policyId, GetTagRuleOptionalParameters parameters) {
     // Check if unstable operation is enabled
-    String operationId = "getTagPolicy";
+    String operationId = "getTagRule";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
@@ -620,13 +620,13 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> getTagPolicyWithHttpInf
 
     // verify the required parameter 'policyId' is set
     if (policyId == null) {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'policyId' when calling getTagPolicy"));
+              400, "Missing the required parameter 'policyId' when calling getTagRule"));
       return result;
     }
-    TagPolicyInclude include = parameters.include;
+    TagRuleInclude include = parameters.include;
     Long tsStart = parameters.tsStart;
     Long tsEnd = parameters.tsEnd;
     // create path and map variables
@@ -645,7 +645,7 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> getTagPolicyWithHttpInf
     try {
       builder =
           apiClient.createBuilder(
-              "v2.TagPoliciesApi.getTagPolicy",
+              "v2.TagRulesApi.getTagRule",
               localVarPath,
               localVarQueryParams,
               localVarHeaderParams,
@@ -653,7 +653,7 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> getTagPolicyWithHttpInf
               new String[] {"application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
@@ -665,11 +665,11 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> getTagPolicyWithHttpInf
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPolicyResponse>() {});
+        new GenericType<TagRuleResponse>() {});
   }
 
-  /** Manage optional parameters to getTagPolicyScore. */
-  public static class GetTagPolicyScoreOptionalParameters {
+  /** Manage optional parameters to getTagRuleScore. */
+  public static class GetTagRuleScoreOptionalParameters {
     private Long tsStart;
     private Long tsEnd;
 
@@ -678,9 +678,9 @@ public static class GetTagPolicyScoreOptionalParameters {
      *
      * @param tsStart Start of the time window used for compliance score computation, as a Unix
      *     timestamp in milliseconds. (optional)
-     * @return GetTagPolicyScoreOptionalParameters
+     * @return GetTagRuleScoreOptionalParameters
      */
-    public GetTagPolicyScoreOptionalParameters tsStart(Long tsStart) {
+    public GetTagRuleScoreOptionalParameters tsStart(Long tsStart) {
       this.tsStart = tsStart;
       return this;
     }
@@ -691,38 +691,37 @@ public GetTagPolicyScoreOptionalParameters tsStart(Long tsStart) {
      * @param tsEnd End of the time window used for compliance score computation, as a Unix
      *     timestamp in milliseconds. Must be in the past and greater than <code>ts_start</code>.
      *     (optional)
-     * @return GetTagPolicyScoreOptionalParameters
+     * @return GetTagRuleScoreOptionalParameters
      */
-    public GetTagPolicyScoreOptionalParameters tsEnd(Long tsEnd) {
+    public GetTagRuleScoreOptionalParameters tsEnd(Long tsEnd) {
       this.tsEnd = tsEnd;
       return this;
     }
   }
 
   /**
-   * Get a tag policy compliance score.
+   * Get a tag rule compliance score.
    *
-   * <p>See {@link #getTagPolicyScoreWithHttpInfo}.
+   * <p>See {@link #getTagRuleScoreWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
-   * @return TagPolicyScoreResponse
+   * @param policyId The unique identifier of the tag rule. (required)
+   * @return TagRuleScoreResponse
    * @throws ApiException if fails to make API call
    */
-  public TagPolicyScoreResponse getTagPolicyScore(String policyId) throws ApiException {
-    return getTagPolicyScoreWithHttpInfo(policyId, new GetTagPolicyScoreOptionalParameters())
-        .getData();
+  public TagRuleScoreResponse getTagRuleScore(String policyId) throws ApiException {
+    return getTagRuleScoreWithHttpInfo(policyId, new GetTagRuleScoreOptionalParameters()).getData();
   }
 
   /**
-   * Get a tag policy compliance score.
+   * Get a tag rule compliance score.
    *
-   * <p>See {@link #getTagPolicyScoreWithHttpInfoAsync}.
+   * <p>See {@link #getTagRuleScoreWithHttpInfoAsync}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
-   * @return CompletableFuture&lt;TagPolicyScoreResponse&gt;
+   * @param policyId The unique identifier of the tag rule. (required)
+   * @return CompletableFuture&lt;TagRuleScoreResponse&gt;
    */
-  public CompletableFuture<TagPolicyScoreResponse> getTagPolicyScoreAsync(String policyId) {
-    return getTagPolicyScoreWithHttpInfoAsync(policyId, new GetTagPolicyScoreOptionalParameters())
+  public CompletableFuture<TagRuleScoreResponse> getTagRuleScoreAsync(String policyId) {
+    return getTagRuleScoreWithHttpInfoAsync(policyId, new GetTagRuleScoreOptionalParameters())
         .thenApply(
             response -> {
               return response.getData();
@@ -730,32 +729,32 @@ public CompletableFuture<TagPolicyScoreResponse> getTagPolicyScoreAsync(String p
   }
 
   /**
-   * Get a tag policy compliance score.
+   * Get a tag rule compliance score.
    *
-   * <p>See {@link #getTagPolicyScoreWithHttpInfo}.
+   * <p>See {@link #getTagRuleScoreWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
+   * @param policyId The unique identifier of the tag rule. (required)
    * @param parameters Optional parameters for the request.
-   * @return TagPolicyScoreResponse
+   * @return TagRuleScoreResponse
    * @throws ApiException if fails to make API call
    */
-  public TagPolicyScoreResponse getTagPolicyScore(
-      String policyId, GetTagPolicyScoreOptionalParameters parameters) throws ApiException {
-    return getTagPolicyScoreWithHttpInfo(policyId, parameters).getData();
+  public TagRuleScoreResponse getTagRuleScore(
+      String policyId, GetTagRuleScoreOptionalParameters parameters) throws ApiException {
+    return getTagRuleScoreWithHttpInfo(policyId, parameters).getData();
   }
 
   /**
-   * Get a tag policy compliance score.
+   * Get a tag rule compliance score.
    *
-   * <p>See {@link #getTagPolicyScoreWithHttpInfoAsync}.
+   * <p>See {@link #getTagRuleScoreWithHttpInfoAsync}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
+   * @param policyId The unique identifier of the tag rule. (required)
    * @param parameters Optional parameters for the request.
-   * @return CompletableFuture&lt;TagPolicyScoreResponse&gt;
+   * @return CompletableFuture&lt;TagRuleScoreResponse&gt;
    */
-  public CompletableFuture<TagPolicyScoreResponse> getTagPolicyScoreAsync(
-      String policyId, GetTagPolicyScoreOptionalParameters parameters) {
-    return getTagPolicyScoreWithHttpInfoAsync(policyId, parameters)
+  public CompletableFuture<TagRuleScoreResponse> getTagRuleScoreAsync(
+      String policyId, GetTagRuleScoreOptionalParameters parameters) {
+    return getTagRuleScoreWithHttpInfoAsync(policyId, parameters)
         .thenApply(
             response -> {
               return response.getData();
@@ -763,14 +762,14 @@ public CompletableFuture<TagPolicyScoreResponse> getTagPolicyScoreAsync(
   }
 
   /**
-   * Retrieve the compliance score for a single tag policy. The score is computed over the requested
+   * Retrieve the compliance score for a single tag rule. The score is computed over the requested
    * time window (or a source-appropriate default) and represents the percentage of telemetry within
-   * that window that conforms to the policy. A <code>null</code> score indicates that no relevant
+   * that window that conforms to the rule. A <code>null</code> score indicates that no relevant
    * telemetry was found.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
+   * @param policyId The unique identifier of the tag rule. (required)
    * @param parameters Optional parameters for the request.
-   * @return ApiResponse&lt;TagPolicyScoreResponse&gt;
+   * @return ApiResponse&lt;TagRuleScoreResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
    *     <table border="1">
@@ -784,10 +783,10 @@ public CompletableFuture<TagPolicyScoreResponse> getTagPolicyScoreAsync(
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<TagPolicyScoreResponse> getTagPolicyScoreWithHttpInfo(
-      String policyId, GetTagPolicyScoreOptionalParameters parameters) throws ApiException {
+  public ApiResponse<TagRuleScoreResponse> getTagRuleScoreWithHttpInfo(
+      String policyId, GetTagRuleScoreOptionalParameters parameters) throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "getTagPolicyScore";
+    String operationId = "getTagRuleScore";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
@@ -798,7 +797,7 @@ public ApiResponse<TagPolicyScoreResponse> getTagPolicyScoreWithHttpInfo(
     // verify the required parameter 'policyId' is set
     if (policyId == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'policyId' when calling getTagPolicyScore");
+          400, "Missing the required parameter 'policyId' when calling getTagRuleScore");
     }
     Long tsStart = parameters.tsStart;
     Long tsEnd = parameters.tsEnd;
@@ -815,7 +814,7 @@ public ApiResponse<TagPolicyScoreResponse> getTagPolicyScoreWithHttpInfo(
 
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.TagPoliciesApi.getTagPolicyScore",
+            "v2.TagRulesApi.getTagRuleScore",
             localVarPath,
             localVarQueryParams,
             localVarHeaderParams,
@@ -830,26 +829,26 @@ public ApiResponse<TagPolicyScoreResponse> getTagPolicyScoreWithHttpInfo(
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPolicyScoreResponse>() {});
+        new GenericType<TagRuleScoreResponse>() {});
   }
 
   /**
-   * Get a tag policy compliance score.
+   * Get a tag rule compliance score.
    *
-   * <p>See {@link #getTagPolicyScoreWithHttpInfo}.
+   * <p>See {@link #getTagRuleScoreWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy. (required)
+   * @param policyId The unique identifier of the tag rule. (required)
    * @param parameters Optional parameters for the request.
-   * @return CompletableFuture&lt;ApiResponse&lt;TagPolicyScoreResponse&gt;&gt;
+   * @return CompletableFuture&lt;ApiResponse&lt;TagRuleScoreResponse&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<TagPolicyScoreResponse>> getTagPolicyScoreWithHttpInfoAsync(
-      String policyId, GetTagPolicyScoreOptionalParameters parameters) {
+  public CompletableFuture<ApiResponse<TagRuleScoreResponse>> getTagRuleScoreWithHttpInfoAsync(
+      String policyId, GetTagRuleScoreOptionalParameters parameters) {
     // Check if unstable operation is enabled
-    String operationId = "getTagPolicyScore";
+    String operationId = "getTagRuleScore";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<TagPolicyScoreResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleScoreResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
@@ -858,10 +857,10 @@ public CompletableFuture<ApiResponse<TagPolicyScoreResponse>> getTagPolicyScoreW
 
     // verify the required parameter 'policyId' is set
     if (policyId == null) {
-      CompletableFuture<ApiResponse<TagPolicyScoreResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleScoreResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'policyId' when calling getTagPolicyScore"));
+              400, "Missing the required parameter 'policyId' when calling getTagRuleScore"));
       return result;
     }
     Long tsStart = parameters.tsStart;
@@ -881,7 +880,7 @@ public CompletableFuture<ApiResponse<TagPolicyScoreResponse>> getTagPolicyScoreW
     try {
       builder =
           apiClient.createBuilder(
-              "v2.TagPoliciesApi.getTagPolicyScore",
+              "v2.TagRulesApi.getTagRuleScore",
               localVarPath,
               localVarQueryParams,
               localVarHeaderParams,
@@ -889,7 +888,7 @@ public CompletableFuture<ApiResponse<TagPolicyScoreResponse>> getTagPolicyScoreW
               new String[] {"application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<TagPolicyScoreResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleScoreResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
@@ -901,26 +900,26 @@ public CompletableFuture<ApiResponse<TagPolicyScoreResponse>> getTagPolicyScoreW
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPolicyScoreResponse>() {});
+        new GenericType<TagRuleScoreResponse>() {});
   }
 
-  /** Manage optional parameters to listTagPolicies. */
-  public static class ListTagPoliciesOptionalParameters {
+  /** Manage optional parameters to listTagRules. */
+  public static class ListTagRulesOptionalParameters {
     private Boolean includeDisabled;
     private Boolean includeDeleted;
-    private TagPolicyInclude include;
-    private TagPolicySource filterSource;
+    private TagRuleInclude include;
+    private TagRuleSource filterSource;
     private Long tsStart;
     private Long tsEnd;
 
     /**
      * Set includeDisabled.
      *
-     * @param includeDisabled Whether to include policies that are currently disabled. Defaults to
+     * @param includeDisabled Whether to include rules that are currently disabled. Defaults to
      *     <code>false</code>. (optional)
-     * @return ListTagPoliciesOptionalParameters
+     * @return ListTagRulesOptionalParameters
      */
-    public ListTagPoliciesOptionalParameters includeDisabled(Boolean includeDisabled) {
+    public ListTagRulesOptionalParameters includeDisabled(Boolean includeDisabled) {
       this.includeDisabled = includeDisabled;
       return this;
     }
@@ -928,11 +927,11 @@ public ListTagPoliciesOptionalParameters includeDisabled(Boolean includeDisabled
     /**
      * Set includeDeleted.
      *
-     * @param includeDeleted Whether to include policies that have been soft-deleted. Defaults to
+     * @param includeDeleted Whether to include rules that have been soft-deleted. Defaults to
      *     <code>false</code>. (optional)
-     * @return ListTagPoliciesOptionalParameters
+     * @return ListTagRulesOptionalParameters
      */
-    public ListTagPoliciesOptionalParameters includeDeleted(Boolean includeDeleted) {
+    public ListTagRulesOptionalParameters includeDeleted(Boolean includeDeleted) {
       this.includeDeleted = includeDeleted;
       return this;
     }
@@ -940,11 +939,11 @@ public ListTagPoliciesOptionalParameters includeDeleted(Boolean includeDeleted)
     /**
      * Set include.
      *
-     * @param include Comma-separated list of related resources to include alongside each policy in
+     * @param include Comma-separated list of related resources to include alongside each rule in
      *     the response. Currently the only supported value is <code>score</code>. (optional)
-     * @return ListTagPoliciesOptionalParameters
+     * @return ListTagRulesOptionalParameters
      */
-    public ListTagPoliciesOptionalParameters include(TagPolicyInclude include) {
+    public ListTagRulesOptionalParameters include(TagRuleInclude include) {
       this.include = include;
       return this;
     }
@@ -952,11 +951,11 @@ public ListTagPoliciesOptionalParameters include(TagPolicyInclude include) {
     /**
      * Set filterSource.
      *
-     * @param filterSource Restrict the result set to policies whose source matches the given value.
+     * @param filterSource Restrict the result set to rules whose source matches the given value.
      *     (optional)
-     * @return ListTagPoliciesOptionalParameters
+     * @return ListTagRulesOptionalParameters
      */
-    public ListTagPoliciesOptionalParameters filterSource(TagPolicySource filterSource) {
+    public ListTagRulesOptionalParameters filterSource(TagRuleSource filterSource) {
       this.filterSource = filterSource;
       return this;
     }
@@ -967,9 +966,9 @@ public ListTagPoliciesOptionalParameters filterSource(TagPolicySource filterSour
      * @param tsStart Start of the time window used for compliance score computation, as a Unix
      *     timestamp in milliseconds. Defaults to a recent window appropriate for the source.
      *     (optional)
-     * @return ListTagPoliciesOptionalParameters
+     * @return ListTagRulesOptionalParameters
      */
-    public ListTagPoliciesOptionalParameters tsStart(Long tsStart) {
+    public ListTagRulesOptionalParameters tsStart(Long tsStart) {
       this.tsStart = tsStart;
       return this;
     }
@@ -980,35 +979,35 @@ public ListTagPoliciesOptionalParameters tsStart(Long tsStart) {
      * @param tsEnd End of the time window used for compliance score computation, as a Unix
      *     timestamp in milliseconds. Must be in the past and greater than <code>ts_start</code>.
      *     (optional)
-     * @return ListTagPoliciesOptionalParameters
+     * @return ListTagRulesOptionalParameters
      */
-    public ListTagPoliciesOptionalParameters tsEnd(Long tsEnd) {
+    public ListTagRulesOptionalParameters tsEnd(Long tsEnd) {
       this.tsEnd = tsEnd;
       return this;
     }
   }
 
   /**
-   * List tag policies.
+   * List tag rules.
    *
-   * <p>See {@link #listTagPoliciesWithHttpInfo}.
+   * <p>See {@link #listTagRulesWithHttpInfo}.
    *
-   * @return TagPoliciesListResponse
+   * @return TagRulesListResponse
    * @throws ApiException if fails to make API call
    */
-  public TagPoliciesListResponse listTagPolicies() throws ApiException {
-    return listTagPoliciesWithHttpInfo(new ListTagPoliciesOptionalParameters()).getData();
+  public TagRulesListResponse listTagRules() throws ApiException {
+    return listTagRulesWithHttpInfo(new ListTagRulesOptionalParameters()).getData();
   }
 
   /**
-   * List tag policies.
+   * List tag rules.
    *
-   * <p>See {@link #listTagPoliciesWithHttpInfoAsync}.
+   * <p>See {@link #listTagRulesWithHttpInfoAsync}.
    *
-   * @return CompletableFuture&lt;TagPoliciesListResponse&gt;
+   * @return CompletableFuture&lt;TagRulesListResponse&gt;
    */
-  public CompletableFuture<TagPoliciesListResponse> listTagPoliciesAsync() {
-    return listTagPoliciesWithHttpInfoAsync(new ListTagPoliciesOptionalParameters())
+  public CompletableFuture<TagRulesListResponse> listTagRulesAsync() {
+    return listTagRulesWithHttpInfoAsync(new ListTagRulesOptionalParameters())
         .thenApply(
             response -> {
               return response.getData();
@@ -1016,30 +1015,30 @@ public CompletableFuture<TagPoliciesListResponse> listTagPoliciesAsync() {
   }
 
   /**
-   * List tag policies.
+   * List tag rules.
    *
-   * <p>See {@link #listTagPoliciesWithHttpInfo}.
+   * <p>See {@link #listTagRulesWithHttpInfo}.
    *
    * @param parameters Optional parameters for the request.
-   * @return TagPoliciesListResponse
+   * @return TagRulesListResponse
    * @throws ApiException if fails to make API call
    */
-  public TagPoliciesListResponse listTagPolicies(ListTagPoliciesOptionalParameters parameters)
+  public TagRulesListResponse listTagRules(ListTagRulesOptionalParameters parameters)
       throws ApiException {
-    return listTagPoliciesWithHttpInfo(parameters).getData();
+    return listTagRulesWithHttpInfo(parameters).getData();
   }
 
   /**
-   * List tag policies.
+   * List tag rules.
    *
-   * <p>See {@link #listTagPoliciesWithHttpInfoAsync}.
+   * <p>See {@link #listTagRulesWithHttpInfoAsync}.
    *
    * @param parameters Optional parameters for the request.
-   * @return CompletableFuture&lt;TagPoliciesListResponse&gt;
+   * @return CompletableFuture&lt;TagRulesListResponse&gt;
    */
-  public CompletableFuture<TagPoliciesListResponse> listTagPoliciesAsync(
-      ListTagPoliciesOptionalParameters parameters) {
-    return listTagPoliciesWithHttpInfoAsync(parameters)
+  public CompletableFuture<TagRulesListResponse> listTagRulesAsync(
+      ListTagRulesOptionalParameters parameters) {
+    return listTagRulesWithHttpInfoAsync(parameters)
         .thenApply(
             response -> {
               return response.getData();
@@ -1047,12 +1046,12 @@ public CompletableFuture<TagPoliciesListResponse> listTagPoliciesAsync(
   }
 
   /**
-   * Retrieve all tag policies for the organization. Optionally include disabled or deleted
-   * policies, filter by telemetry source, and include each policy's current compliance score via
-   * the <code>include=score</code> query parameter.
+   * Retrieve all tag rules for the organization. Optionally include disabled or deleted rules,
+   * filter by telemetry source, and include each rule's current compliance score via the <code>
+   * include=score</code> query parameter.
    *
    * @param parameters Optional parameters for the request.
-   * @return ApiResponse&lt;TagPoliciesListResponse&gt;
+   * @return ApiResponse&lt;TagRulesListResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
    *     <table border="1">
@@ -1065,10 +1064,10 @@ public CompletableFuture<TagPoliciesListResponse> listTagPoliciesAsync(
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<TagPoliciesListResponse> listTagPoliciesWithHttpInfo(
-      ListTagPoliciesOptionalParameters parameters) throws ApiException {
+  public ApiResponse<TagRulesListResponse> listTagRulesWithHttpInfo(
+      ListTagRulesOptionalParameters parameters) throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "listTagPolicies";
+    String operationId = "listTagRules";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
@@ -1077,8 +1076,8 @@ public ApiResponse<TagPoliciesListResponse> listTagPoliciesWithHttpInfo(
     Object localVarPostBody = null;
     Boolean includeDisabled = parameters.includeDisabled;
     Boolean includeDeleted = parameters.includeDeleted;
-    TagPolicyInclude include = parameters.include;
-    TagPolicySource filterSource = parameters.filterSource;
+    TagRuleInclude include = parameters.include;
+    TagRuleSource filterSource = parameters.filterSource;
     Long tsStart = parameters.tsStart;
     Long tsEnd = parameters.tsEnd;
     // create path and map variables
@@ -1096,7 +1095,7 @@ public ApiResponse<TagPoliciesListResponse> listTagPoliciesWithHttpInfo(
 
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.TagPoliciesApi.listTagPolicies",
+            "v2.TagRulesApi.listTagRules",
             localVarPath,
             localVarQueryParams,
             localVarHeaderParams,
@@ -1111,25 +1110,25 @@ public ApiResponse<TagPoliciesListResponse> listTagPoliciesWithHttpInfo(
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPoliciesListResponse>() {});
+        new GenericType<TagRulesListResponse>() {});
   }
 
   /**
-   * List tag policies.
+   * List tag rules.
    *
-   * <p>See {@link #listTagPoliciesWithHttpInfo}.
+   * <p>See {@link #listTagRulesWithHttpInfo}.
    *
    * @param parameters Optional parameters for the request.
-   * @return CompletableFuture&lt;ApiResponse&lt;TagPoliciesListResponse&gt;&gt;
+   * @return CompletableFuture&lt;ApiResponse&lt;TagRulesListResponse&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<TagPoliciesListResponse>> listTagPoliciesWithHttpInfoAsync(
-      ListTagPoliciesOptionalParameters parameters) {
+  public CompletableFuture<ApiResponse<TagRulesListResponse>> listTagRulesWithHttpInfoAsync(
+      ListTagRulesOptionalParameters parameters) {
     // Check if unstable operation is enabled
-    String operationId = "listTagPolicies";
+    String operationId = "listTagRules";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<TagPoliciesListResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRulesListResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
@@ -1137,8 +1136,8 @@ public CompletableFuture<ApiResponse<TagPoliciesListResponse>> listTagPoliciesWi
     Object localVarPostBody = null;
     Boolean includeDisabled = parameters.includeDisabled;
     Boolean includeDeleted = parameters.includeDeleted;
-    TagPolicyInclude include = parameters.include;
-    TagPolicySource filterSource = parameters.filterSource;
+    TagRuleInclude include = parameters.include;
+    TagRuleSource filterSource = parameters.filterSource;
     Long tsStart = parameters.tsStart;
     Long tsEnd = parameters.tsEnd;
     // create path and map variables
@@ -1158,7 +1157,7 @@ public CompletableFuture<ApiResponse<TagPoliciesListResponse>> listTagPoliciesWi
     try {
       builder =
           apiClient.createBuilder(
-              "v2.TagPoliciesApi.listTagPolicies",
+              "v2.TagRulesApi.listTagRules",
               localVarPath,
               localVarQueryParams,
               localVarHeaderParams,
@@ -1166,7 +1165,7 @@ public CompletableFuture<ApiResponse<TagPoliciesListResponse>> listTagPoliciesWi
               new String[] {"application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<TagPoliciesListResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRulesListResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
@@ -1178,36 +1177,36 @@ public CompletableFuture<ApiResponse<TagPoliciesListResponse>> listTagPoliciesWi
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPoliciesListResponse>() {});
+        new GenericType<TagRulesListResponse>() {});
   }
 
   /**
-   * Update a tag policy.
+   * Update a tag rule.
    *
-   * <p>See {@link #updateTagPolicyWithHttpInfo}.
+   * <p>See {@link #updateTagRuleWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy to update. (required)
+   * @param policyId The unique identifier of the tag rule to update. (required)
    * @param body (required)
-   * @return TagPolicyResponse
+   * @return TagRuleResponse
    * @throws ApiException if fails to make API call
    */
-  public TagPolicyResponse updateTagPolicy(String policyId, TagPolicyUpdateRequest body)
+  public TagRuleResponse updateTagRule(String policyId, TagRuleUpdateRequest body)
       throws ApiException {
-    return updateTagPolicyWithHttpInfo(policyId, body).getData();
+    return updateTagRuleWithHttpInfo(policyId, body).getData();
   }
 
   /**
-   * Update a tag policy.
+   * Update a tag rule.
    *
-   * <p>See {@link #updateTagPolicyWithHttpInfoAsync}.
+   * <p>See {@link #updateTagRuleWithHttpInfoAsync}.
    *
-   * @param policyId The unique identifier of the tag policy to update. (required)
+   * @param policyId The unique identifier of the tag rule to update. (required)
    * @param body (required)
-   * @return CompletableFuture&lt;TagPolicyResponse&gt;
+   * @return CompletableFuture&lt;TagRuleResponse&gt;
    */
-  public CompletableFuture<TagPolicyResponse> updateTagPolicyAsync(
-      String policyId, TagPolicyUpdateRequest body) {
-    return updateTagPolicyWithHttpInfoAsync(policyId, body)
+  public CompletableFuture<TagRuleResponse> updateTagRuleAsync(
+      String policyId, TagRuleUpdateRequest body) {
+    return updateTagRuleWithHttpInfoAsync(policyId, body)
         .thenApply(
             response -> {
               return response.getData();
@@ -1215,13 +1214,13 @@ public CompletableFuture<TagPolicyResponse> updateTagPolicyAsync(
   }
 
   /**
-   * Update one or more attributes of an existing tag policy. Only the fields supplied in the
-   * request body are modified; omitted fields retain their current values. The policy's <code>
-   * source</code> cannot be changed after creation.
+   * Update one or more attributes of an existing tag rule. Only the fields supplied in the request
+   * body are modified; omitted fields retain their current values. The rule's <code>source</code>
+   * cannot be changed after creation.
    *
-   * @param policyId The unique identifier of the tag policy to update. (required)
+   * @param policyId The unique identifier of the tag rule to update. (required)
    * @param body (required)
-   * @return ApiResponse&lt;TagPolicyResponse&gt;
+   * @return ApiResponse&lt;TagRuleResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
    *     <table border="1">
@@ -1235,10 +1234,10 @@ public CompletableFuture<TagPolicyResponse> updateTagPolicyAsync(
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<TagPolicyResponse> updateTagPolicyWithHttpInfo(
-      String policyId, TagPolicyUpdateRequest body) throws ApiException {
+  public ApiResponse<TagRuleResponse> updateTagRuleWithHttpInfo(
+      String policyId, TagRuleUpdateRequest body) throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "updateTagPolicy";
+    String operationId = "updateTagRule";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
@@ -1249,13 +1248,13 @@ public ApiResponse<TagPolicyResponse> updateTagPolicyWithHttpInfo(
     // verify the required parameter 'policyId' is set
     if (policyId == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'policyId' when calling updateTagPolicy");
+          400, "Missing the required parameter 'policyId' when calling updateTagRule");
     }
 
     // verify the required parameter 'body' is set
     if (body == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'body' when calling updateTagPolicy");
+          400, "Missing the required parameter 'body' when calling updateTagRule");
     }
     // create path and map variables
     String localVarPath =
@@ -1266,7 +1265,7 @@ public ApiResponse<TagPolicyResponse> updateTagPolicyWithHttpInfo(
 
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.TagPoliciesApi.updateTagPolicy",
+            "v2.TagRulesApi.updateTagRule",
             localVarPath,
             new ArrayList<Pair>(),
             localVarHeaderParams,
@@ -1281,26 +1280,26 @@ public ApiResponse<TagPolicyResponse> updateTagPolicyWithHttpInfo(
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPolicyResponse>() {});
+        new GenericType<TagRuleResponse>() {});
   }
 
   /**
-   * Update a tag policy.
+   * Update a tag rule.
    *
-   * <p>See {@link #updateTagPolicyWithHttpInfo}.
+   * <p>See {@link #updateTagRuleWithHttpInfo}.
    *
-   * @param policyId The unique identifier of the tag policy to update. (required)
+   * @param policyId The unique identifier of the tag rule to update. (required)
    * @param body (required)
-   * @return CompletableFuture&lt;ApiResponse&lt;TagPolicyResponse&gt;&gt;
+   * @return CompletableFuture&lt;ApiResponse&lt;TagRuleResponse&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<TagPolicyResponse>> updateTagPolicyWithHttpInfoAsync(
-      String policyId, TagPolicyUpdateRequest body) {
+  public CompletableFuture<ApiResponse<TagRuleResponse>> updateTagRuleWithHttpInfoAsync(
+      String policyId, TagRuleUpdateRequest body) {
     // Check if unstable operation is enabled
-    String operationId = "updateTagPolicy";
+    String operationId = "updateTagRule";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
@@ -1309,19 +1308,19 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> updateTagPolicyWithHttp
 
     // verify the required parameter 'policyId' is set
     if (policyId == null) {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'policyId' when calling updateTagPolicy"));
+              400, "Missing the required parameter 'policyId' when calling updateTagRule"));
       return result;
     }
 
     // verify the required parameter 'body' is set
     if (body == null) {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'body' when calling updateTagPolicy"));
+              400, "Missing the required parameter 'body' when calling updateTagRule"));
       return result;
     }
     // create path and map variables
@@ -1335,7 +1334,7 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> updateTagPolicyWithHttp
     try {
       builder =
           apiClient.createBuilder(
-              "v2.TagPoliciesApi.updateTagPolicy",
+              "v2.TagRulesApi.updateTagRule",
               localVarPath,
               new ArrayList<Pair>(),
               localVarHeaderParams,
@@ -1343,7 +1342,7 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> updateTagPolicyWithHttp
               new String[] {"application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<TagPolicyResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<TagRuleResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
@@ -1355,6 +1354,6 @@ public CompletableFuture<ApiResponse<TagPolicyResponse>> updateTagPolicyWithHttp
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<TagPolicyResponse>() {});
+        new GenericType<TagRuleResponse>() {});
   }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyAttributes.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleAttributes.java
similarity index 75%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyAttributes.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleAttributes.java
index df8b4e8db40..5c545b8157e 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleAttributes.java
@@ -21,28 +21,28 @@
 import java.util.Objects;
 import org.openapitools.jackson.nullable.JsonNullable;
 
-/** The attributes of a tag policy resource. */
+/** The attributes of a tag rule resource. */
 @JsonPropertyOrder({
-  TagPolicyAttributes.JSON_PROPERTY_CREATED_AT,
-  TagPolicyAttributes.JSON_PROPERTY_CREATED_BY,
-  TagPolicyAttributes.JSON_PROPERTY_DELETED_AT,
-  TagPolicyAttributes.JSON_PROPERTY_DELETED_BY,
-  TagPolicyAttributes.JSON_PROPERTY_ENABLED,
-  TagPolicyAttributes.JSON_PROPERTY_MODIFIED_AT,
-  TagPolicyAttributes.JSON_PROPERTY_MODIFIED_BY,
-  TagPolicyAttributes.JSON_PROPERTY_NEGATED,
-  TagPolicyAttributes.JSON_PROPERTY_POLICY_NAME,
-  TagPolicyAttributes.JSON_PROPERTY_POLICY_TYPE,
-  TagPolicyAttributes.JSON_PROPERTY_REQUIRED,
-  TagPolicyAttributes.JSON_PROPERTY_SCOPE,
-  TagPolicyAttributes.JSON_PROPERTY_SOURCE,
-  TagPolicyAttributes.JSON_PROPERTY_TAG_KEY,
-  TagPolicyAttributes.JSON_PROPERTY_TAG_VALUE_PATTERNS,
-  TagPolicyAttributes.JSON_PROPERTY_VERSION
+  TagRuleAttributes.JSON_PROPERTY_CREATED_AT,
+  TagRuleAttributes.JSON_PROPERTY_CREATED_BY,
+  TagRuleAttributes.JSON_PROPERTY_DELETED_AT,
+  TagRuleAttributes.JSON_PROPERTY_DELETED_BY,
+  TagRuleAttributes.JSON_PROPERTY_ENABLED,
+  TagRuleAttributes.JSON_PROPERTY_MODIFIED_AT,
+  TagRuleAttributes.JSON_PROPERTY_MODIFIED_BY,
+  TagRuleAttributes.JSON_PROPERTY_NEGATED,
+  TagRuleAttributes.JSON_PROPERTY_POLICY_NAME,
+  TagRuleAttributes.JSON_PROPERTY_POLICY_TYPE,
+  TagRuleAttributes.JSON_PROPERTY_REQUIRED,
+  TagRuleAttributes.JSON_PROPERTY_SCOPE,
+  TagRuleAttributes.JSON_PROPERTY_SOURCE,
+  TagRuleAttributes.JSON_PROPERTY_TAG_KEY,
+  TagRuleAttributes.JSON_PROPERTY_TAG_VALUE_PATTERNS,
+  TagRuleAttributes.JSON_PROPERTY_VERSION
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyAttributes {
+public class TagRuleAttributes {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_CREATED_AT = "created_at";
   private OffsetDateTime createdAt;
@@ -72,7 +72,7 @@ public class TagPolicyAttributes {
   private String policyName;
 
   public static final String JSON_PROPERTY_POLICY_TYPE = "policy_type";
-  private TagPolicyType policyType;
+  private TagRuleType policyType;
 
   public static final String JSON_PROPERTY_REQUIRED = "required";
   private Boolean required;
@@ -81,7 +81,7 @@ public class TagPolicyAttributes {
   private String scope;
 
   public static final String JSON_PROPERTY_SOURCE = "source";
-  private TagPolicySource source;
+  private TagRuleSource source;
 
   public static final String JSON_PROPERTY_TAG_KEY = "tag_key";
   private String tagKey;
@@ -92,10 +92,10 @@ public class TagPolicyAttributes {
   public static final String JSON_PROPERTY_VERSION = "version";
   private Long version;
 
-  public TagPolicyAttributes() {}
+  public TagRuleAttributes() {}
 
   @JsonCreator
-  public TagPolicyAttributes(
+  public TagRuleAttributes(
       @JsonProperty(required = true, value = JSON_PROPERTY_CREATED_AT) OffsetDateTime createdAt,
       @JsonProperty(required = true, value = JSON_PROPERTY_CREATED_BY) String createdBy,
       @JsonProperty(required = true, value = JSON_PROPERTY_ENABLED) Boolean enabled,
@@ -103,10 +103,10 @@ public TagPolicyAttributes(
       @JsonProperty(required = true, value = JSON_PROPERTY_MODIFIED_BY) String modifiedBy,
       @JsonProperty(required = true, value = JSON_PROPERTY_NEGATED) Boolean negated,
       @JsonProperty(required = true, value = JSON_PROPERTY_POLICY_NAME) String policyName,
-      @JsonProperty(required = true, value = JSON_PROPERTY_POLICY_TYPE) TagPolicyType policyType,
+      @JsonProperty(required = true, value = JSON_PROPERTY_POLICY_TYPE) TagRuleType policyType,
       @JsonProperty(required = true, value = JSON_PROPERTY_REQUIRED) Boolean required,
       @JsonProperty(required = true, value = JSON_PROPERTY_SCOPE) String scope,
-      @JsonProperty(required = true, value = JSON_PROPERTY_SOURCE) TagPolicySource source,
+      @JsonProperty(required = true, value = JSON_PROPERTY_SOURCE) TagRuleSource source,
       @JsonProperty(required = true, value = JSON_PROPERTY_TAG_KEY) String tagKey,
       @JsonProperty(required = true, value = JSON_PROPERTY_TAG_VALUE_PATTERNS)
           List<String> tagValuePatterns,
@@ -129,13 +129,13 @@ public TagPolicyAttributes(
     this.version = version;
   }
 
-  public TagPolicyAttributes createdAt(OffsetDateTime createdAt) {
+  public TagRuleAttributes createdAt(OffsetDateTime createdAt) {
     this.createdAt = createdAt;
     return this;
   }
 
   /**
-   * The RFC 3339 timestamp at which the policy was created.
+   * The RFC 3339 timestamp at which the rule was created.
    *
    * @return createdAt
    */
@@ -149,13 +149,13 @@ public void setCreatedAt(OffsetDateTime createdAt) {
     this.createdAt = createdAt;
   }
 
-  public TagPolicyAttributes createdBy(String createdBy) {
+  public TagRuleAttributes createdBy(String createdBy) {
     this.createdBy = createdBy;
     return this;
   }
 
   /**
-   * The identifier of the user who created the policy.
+   * The identifier of the user who created the rule.
    *
    * @return createdBy
    */
@@ -169,14 +169,14 @@ public void setCreatedBy(String createdBy) {
     this.createdBy = createdBy;
   }
 
-  public TagPolicyAttributes deletedAt(OffsetDateTime deletedAt) {
+  public TagRuleAttributes deletedAt(OffsetDateTime deletedAt) {
     this.deletedAt = JsonNullable.<OffsetDateTime>of(deletedAt);
     return this;
   }
 
   /**
-   * The RFC 3339 timestamp at which the policy was soft-deleted. <code>null</code> if the policy
-   * has not been deleted. Only present when <code>include_deleted=true</code> is requested.
+   * The RFC 3339 timestamp at which the rule was soft-deleted. <code>null</code> if the rule has
+   * not been deleted. Only present when <code>include_deleted=true</code> is requested.
    *
    * @return deletedAt
    */
@@ -201,13 +201,13 @@ public void setDeletedAt(OffsetDateTime deletedAt) {
     this.deletedAt = JsonNullable.<OffsetDateTime>of(deletedAt);
   }
 
-  public TagPolicyAttributes deletedBy(String deletedBy) {
+  public TagRuleAttributes deletedBy(String deletedBy) {
     this.deletedBy = JsonNullable.<String>of(deletedBy);
     return this;
   }
 
   /**
-   * The identifier of the user who soft-deleted the policy. <code>null</code> if the policy has not
+   * The identifier of the user who soft-deleted the rule. <code>null</code> if the rule has not
    * been deleted.
    *
    * @return deletedBy
@@ -233,13 +233,13 @@ public void setDeletedBy(String deletedBy) {
     this.deletedBy = JsonNullable.<String>of(deletedBy);
   }
 
-  public TagPolicyAttributes enabled(Boolean enabled) {
+  public TagRuleAttributes enabled(Boolean enabled) {
     this.enabled = enabled;
     return this;
   }
 
   /**
-   * Whether the policy is currently enforced.
+   * Whether the rule is currently enforced.
    *
    * @return enabled
    */
@@ -253,13 +253,13 @@ public void setEnabled(Boolean enabled) {
     this.enabled = enabled;
   }
 
-  public TagPolicyAttributes modifiedAt(OffsetDateTime modifiedAt) {
+  public TagRuleAttributes modifiedAt(OffsetDateTime modifiedAt) {
     this.modifiedAt = modifiedAt;
     return this;
   }
 
   /**
-   * The RFC 3339 timestamp at which the policy was last modified.
+   * The RFC 3339 timestamp at which the rule was last modified.
    *
    * @return modifiedAt
    */
@@ -273,13 +273,13 @@ public void setModifiedAt(OffsetDateTime modifiedAt) {
     this.modifiedAt = modifiedAt;
   }
 
-  public TagPolicyAttributes modifiedBy(String modifiedBy) {
+  public TagRuleAttributes modifiedBy(String modifiedBy) {
     this.modifiedBy = modifiedBy;
     return this;
   }
 
   /**
-   * The identifier of the user who last modified the policy.
+   * The identifier of the user who last modified the rule.
    *
    * @return modifiedBy
    */
@@ -293,13 +293,13 @@ public void setModifiedBy(String modifiedBy) {
     this.modifiedBy = modifiedBy;
   }
 
-  public TagPolicyAttributes negated(Boolean negated) {
+  public TagRuleAttributes negated(Boolean negated) {
     this.negated = negated;
     return this;
   }
 
   /**
-   * When <code>true</code>, the policy matches tag values that do NOT match any of the supplied
+   * When <code>true</code>, the rule matches tag values that do NOT match any of the supplied
    * patterns.
    *
    * @return negated
@@ -314,13 +314,13 @@ public void setNegated(Boolean negated) {
     this.negated = negated;
   }
 
-  public TagPolicyAttributes policyName(String policyName) {
+  public TagRuleAttributes policyName(String policyName) {
     this.policyName = policyName;
     return this;
   }
 
   /**
-   * Human-readable name for the tag policy.
+   * Human-readable name for the tag rule.
    *
    * @return policyName
    */
@@ -334,32 +334,32 @@ public void setPolicyName(String policyName) {
     this.policyName = policyName;
   }
 
-  public TagPolicyAttributes policyType(TagPolicyType policyType) {
+  public TagRuleAttributes policyType(TagRuleType policyType) {
     this.policyType = policyType;
     this.unparsed |= !policyType.isValid();
     return this;
   }
 
   /**
-   * How the policy is enforced. <code>blocking</code> rejects telemetry that violates the policy.
+   * How the rule is enforced. <code>blocking</code> rejects telemetry that violates the rule.
    * <code>surfacing</code> only highlights non-compliant telemetry without blocking it.
    *
    * @return policyType
    */
   @JsonProperty(JSON_PROPERTY_POLICY_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyType getPolicyType() {
+  public TagRuleType getPolicyType() {
     return policyType;
   }
 
-  public void setPolicyType(TagPolicyType policyType) {
+  public void setPolicyType(TagRuleType policyType) {
     if (!policyType.isValid()) {
       this.unparsed = true;
     }
     this.policyType = policyType;
   }
 
-  public TagPolicyAttributes required(Boolean required) {
+  public TagRuleAttributes required(Boolean required) {
     this.required = required;
     return this;
   }
@@ -379,13 +379,13 @@ public void setRequired(Boolean required) {
     this.required = required;
   }
 
-  public TagPolicyAttributes scope(String scope) {
+  public TagRuleAttributes scope(String scope) {
     this.scope = scope;
     return this;
   }
 
   /**
-   * The scope the policy applies within.
+   * The scope the rule applies within.
    *
    * @return scope
    */
@@ -399,37 +399,37 @@ public void setScope(String scope) {
     this.scope = scope;
   }
 
-  public TagPolicyAttributes source(TagPolicySource source) {
+  public TagRuleAttributes source(TagRuleSource source) {
     this.source = source;
     this.unparsed |= !source.isValid();
     return this;
   }
 
   /**
-   * The telemetry source that a tag policy applies to.
+   * The telemetry source that a tag rule applies to.
    *
    * @return source
    */
   @JsonProperty(JSON_PROPERTY_SOURCE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicySource getSource() {
+  public TagRuleSource getSource() {
     return source;
   }
 
-  public void setSource(TagPolicySource source) {
+  public void setSource(TagRuleSource source) {
     if (!source.isValid()) {
       this.unparsed = true;
     }
     this.source = source;
   }
 
-  public TagPolicyAttributes tagKey(String tagKey) {
+  public TagRuleAttributes tagKey(String tagKey) {
     this.tagKey = tagKey;
     return this;
   }
 
   /**
-   * The tag key that the policy governs.
+   * The tag key that the rule governs.
    *
    * @return tagKey
    */
@@ -443,12 +443,12 @@ public void setTagKey(String tagKey) {
     this.tagKey = tagKey;
   }
 
-  public TagPolicyAttributes tagValuePatterns(List<String> tagValuePatterns) {
+  public TagRuleAttributes tagValuePatterns(List<String> tagValuePatterns) {
     this.tagValuePatterns = tagValuePatterns;
     return this;
   }
 
-  public TagPolicyAttributes addTagValuePatternsItem(String tagValuePatternsItem) {
+  public TagRuleAttributes addTagValuePatternsItem(String tagValuePatternsItem) {
     this.tagValuePatterns.add(tagValuePatternsItem);
     return this;
   }
@@ -468,7 +468,7 @@ public void setTagValuePatterns(List<String> tagValuePatterns) {
     this.tagValuePatterns = tagValuePatterns;
   }
 
-  public TagPolicyAttributes version(Long version) {
+  public TagRuleAttributes version(Long version) {
     this.version = version;
     return this;
   }
@@ -500,10 +500,10 @@ public void setVersion(Long version) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyAttributes
+   * @return TagRuleAttributes
    */
   @JsonAnySetter
-  public TagPolicyAttributes putAdditionalProperty(String key, Object value) {
+  public TagRuleAttributes putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -534,7 +534,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyAttributes object is equal to o. */
+  /** Return true if this TagRuleAttributes object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -543,24 +543,24 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyAttributes tagPolicyAttributes = (TagPolicyAttributes) o;
-    return Objects.equals(this.createdAt, tagPolicyAttributes.createdAt)
-        && Objects.equals(this.createdBy, tagPolicyAttributes.createdBy)
-        && Objects.equals(this.deletedAt, tagPolicyAttributes.deletedAt)
-        && Objects.equals(this.deletedBy, tagPolicyAttributes.deletedBy)
-        && Objects.equals(this.enabled, tagPolicyAttributes.enabled)
-        && Objects.equals(this.modifiedAt, tagPolicyAttributes.modifiedAt)
-        && Objects.equals(this.modifiedBy, tagPolicyAttributes.modifiedBy)
-        && Objects.equals(this.negated, tagPolicyAttributes.negated)
-        && Objects.equals(this.policyName, tagPolicyAttributes.policyName)
-        && Objects.equals(this.policyType, tagPolicyAttributes.policyType)
-        && Objects.equals(this.required, tagPolicyAttributes.required)
-        && Objects.equals(this.scope, tagPolicyAttributes.scope)
-        && Objects.equals(this.source, tagPolicyAttributes.source)
-        && Objects.equals(this.tagKey, tagPolicyAttributes.tagKey)
-        && Objects.equals(this.tagValuePatterns, tagPolicyAttributes.tagValuePatterns)
-        && Objects.equals(this.version, tagPolicyAttributes.version)
-        && Objects.equals(this.additionalProperties, tagPolicyAttributes.additionalProperties);
+    TagRuleAttributes tagRuleAttributes = (TagRuleAttributes) o;
+    return Objects.equals(this.createdAt, tagRuleAttributes.createdAt)
+        && Objects.equals(this.createdBy, tagRuleAttributes.createdBy)
+        && Objects.equals(this.deletedAt, tagRuleAttributes.deletedAt)
+        && Objects.equals(this.deletedBy, tagRuleAttributes.deletedBy)
+        && Objects.equals(this.enabled, tagRuleAttributes.enabled)
+        && Objects.equals(this.modifiedAt, tagRuleAttributes.modifiedAt)
+        && Objects.equals(this.modifiedBy, tagRuleAttributes.modifiedBy)
+        && Objects.equals(this.negated, tagRuleAttributes.negated)
+        && Objects.equals(this.policyName, tagRuleAttributes.policyName)
+        && Objects.equals(this.policyType, tagRuleAttributes.policyType)
+        && Objects.equals(this.required, tagRuleAttributes.required)
+        && Objects.equals(this.scope, tagRuleAttributes.scope)
+        && Objects.equals(this.source, tagRuleAttributes.source)
+        && Objects.equals(this.tagKey, tagRuleAttributes.tagKey)
+        && Objects.equals(this.tagValuePatterns, tagRuleAttributes.tagValuePatterns)
+        && Objects.equals(this.version, tagRuleAttributes.version)
+        && Objects.equals(this.additionalProperties, tagRuleAttributes.additionalProperties);
   }
 
   @Override
@@ -588,7 +588,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyAttributes {\n");
+    sb.append("class TagRuleAttributes {\n");
     sb.append("    createdAt: ").append(toIndentedString(createdAt)).append("\n");
     sb.append("    createdBy: ").append(toIndentedString(createdBy)).append("\n");
     sb.append("    deletedAt: ").append(toIndentedString(deletedAt)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateAttributes.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleCreateAttributes.java
similarity index 72%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateAttributes.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleCreateAttributes.java
index d0a92645549..5875b54c325 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleCreateAttributes.java
@@ -19,21 +19,21 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** Attributes that can be supplied when creating a tag policy. */
+/** Attributes that can be supplied when creating a tag rule. */
 @JsonPropertyOrder({
-  TagPolicyCreateAttributes.JSON_PROPERTY_ENABLED,
-  TagPolicyCreateAttributes.JSON_PROPERTY_NEGATED,
-  TagPolicyCreateAttributes.JSON_PROPERTY_POLICY_NAME,
-  TagPolicyCreateAttributes.JSON_PROPERTY_POLICY_TYPE,
-  TagPolicyCreateAttributes.JSON_PROPERTY_REQUIRED,
-  TagPolicyCreateAttributes.JSON_PROPERTY_SCOPE,
-  TagPolicyCreateAttributes.JSON_PROPERTY_SOURCE,
-  TagPolicyCreateAttributes.JSON_PROPERTY_TAG_KEY,
-  TagPolicyCreateAttributes.JSON_PROPERTY_TAG_VALUE_PATTERNS
+  TagRuleCreateAttributes.JSON_PROPERTY_ENABLED,
+  TagRuleCreateAttributes.JSON_PROPERTY_NEGATED,
+  TagRuleCreateAttributes.JSON_PROPERTY_POLICY_NAME,
+  TagRuleCreateAttributes.JSON_PROPERTY_POLICY_TYPE,
+  TagRuleCreateAttributes.JSON_PROPERTY_REQUIRED,
+  TagRuleCreateAttributes.JSON_PROPERTY_SCOPE,
+  TagRuleCreateAttributes.JSON_PROPERTY_SOURCE,
+  TagRuleCreateAttributes.JSON_PROPERTY_TAG_KEY,
+  TagRuleCreateAttributes.JSON_PROPERTY_TAG_VALUE_PATTERNS
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyCreateAttributes {
+public class TagRuleCreateAttributes {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_ENABLED = "enabled";
   private Boolean enabled;
@@ -45,7 +45,7 @@ public class TagPolicyCreateAttributes {
   private String policyName;
 
   public static final String JSON_PROPERTY_POLICY_TYPE = "policy_type";
-  private TagPolicyCreateType policyType;
+  private TagRuleCreateType policyType;
 
   public static final String JSON_PROPERTY_REQUIRED = "required";
   private Boolean required;
@@ -54,7 +54,7 @@ public class TagPolicyCreateAttributes {
   private String scope;
 
   public static final String JSON_PROPERTY_SOURCE = "source";
-  private TagPolicySource source;
+  private TagRuleSource source;
 
   public static final String JSON_PROPERTY_TAG_KEY = "tag_key";
   private String tagKey;
@@ -62,15 +62,15 @@ public class TagPolicyCreateAttributes {
   public static final String JSON_PROPERTY_TAG_VALUE_PATTERNS = "tag_value_patterns";
   private List<String> tagValuePatterns = new ArrayList<>();
 
-  public TagPolicyCreateAttributes() {}
+  public TagRuleCreateAttributes() {}
 
   @JsonCreator
-  public TagPolicyCreateAttributes(
+  public TagRuleCreateAttributes(
       @JsonProperty(required = true, value = JSON_PROPERTY_POLICY_NAME) String policyName,
       @JsonProperty(required = true, value = JSON_PROPERTY_POLICY_TYPE)
-          TagPolicyCreateType policyType,
+          TagRuleCreateType policyType,
       @JsonProperty(required = true, value = JSON_PROPERTY_SCOPE) String scope,
-      @JsonProperty(required = true, value = JSON_PROPERTY_SOURCE) TagPolicySource source,
+      @JsonProperty(required = true, value = JSON_PROPERTY_SOURCE) TagRuleSource source,
       @JsonProperty(required = true, value = JSON_PROPERTY_TAG_KEY) String tagKey,
       @JsonProperty(required = true, value = JSON_PROPERTY_TAG_VALUE_PATTERNS)
           List<String> tagValuePatterns) {
@@ -84,14 +84,13 @@ public TagPolicyCreateAttributes(
     this.tagValuePatterns = tagValuePatterns;
   }
 
-  public TagPolicyCreateAttributes enabled(Boolean enabled) {
+  public TagRuleCreateAttributes enabled(Boolean enabled) {
     this.enabled = enabled;
     return this;
   }
 
   /**
-   * Whether the policy is currently enforced. Defaults to <code>true</code> for newly created
-   * policies.
+   * Whether the rule is currently enforced. Defaults to <code>true</code> for newly created rules.
    *
    * @return enabled
    */
@@ -106,13 +105,13 @@ public void setEnabled(Boolean enabled) {
     this.enabled = enabled;
   }
 
-  public TagPolicyCreateAttributes negated(Boolean negated) {
+  public TagRuleCreateAttributes negated(Boolean negated) {
     this.negated = negated;
     return this;
   }
 
   /**
-   * When <code>true</code>, the policy matches tag values that do NOT match any of the supplied
+   * When <code>true</code>, the rule matches tag values that do NOT match any of the supplied
    * patterns. Defaults to <code>false</code>.
    *
    * @return negated
@@ -128,13 +127,13 @@ public void setNegated(Boolean negated) {
     this.negated = negated;
   }
 
-  public TagPolicyCreateAttributes policyName(String policyName) {
+  public TagRuleCreateAttributes policyName(String policyName) {
     this.policyName = policyName;
     return this;
   }
 
   /**
-   * Human-readable name for the tag policy.
+   * Human-readable name for the tag rule.
    *
    * @return policyName
    */
@@ -148,32 +147,32 @@ public void setPolicyName(String policyName) {
     this.policyName = policyName;
   }
 
-  public TagPolicyCreateAttributes policyType(TagPolicyCreateType policyType) {
+  public TagRuleCreateAttributes policyType(TagRuleCreateType policyType) {
     this.policyType = policyType;
     this.unparsed |= !policyType.isValid();
     return this;
   }
 
   /**
-   * The policy type allowed when creating a tag policy. Only <code>surfacing</code> is accepted at
+   * The rule type allowed when creating a tag rule. Only <code>surfacing</code> is accepted at
    * creation time.
    *
    * @return policyType
    */
   @JsonProperty(JSON_PROPERTY_POLICY_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyCreateType getPolicyType() {
+  public TagRuleCreateType getPolicyType() {
     return policyType;
   }
 
-  public void setPolicyType(TagPolicyCreateType policyType) {
+  public void setPolicyType(TagRuleCreateType policyType) {
     if (!policyType.isValid()) {
       this.unparsed = true;
     }
     this.policyType = policyType;
   }
 
-  public TagPolicyCreateAttributes required(Boolean required) {
+  public TagRuleCreateAttributes required(Boolean required) {
     this.required = required;
     return this;
   }
@@ -195,14 +194,14 @@ public void setRequired(Boolean required) {
     this.required = required;
   }
 
-  public TagPolicyCreateAttributes scope(String scope) {
+  public TagRuleCreateAttributes scope(String scope) {
     this.scope = scope;
     return this;
   }
 
   /**
-   * The scope the policy applies within. Typically an environment, team, or organization-level
-   * identifier used to limit where the policy is enforced.
+   * The scope the rule applies within. Typically an environment, team, or organization-level
+   * identifier used to limit where the rule is enforced.
    *
    * @return scope
    */
@@ -216,37 +215,37 @@ public void setScope(String scope) {
     this.scope = scope;
   }
 
-  public TagPolicyCreateAttributes source(TagPolicySource source) {
+  public TagRuleCreateAttributes source(TagRuleSource source) {
     this.source = source;
     this.unparsed |= !source.isValid();
     return this;
   }
 
   /**
-   * The telemetry source that a tag policy applies to.
+   * The telemetry source that a tag rule applies to.
    *
    * @return source
    */
   @JsonProperty(JSON_PROPERTY_SOURCE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicySource getSource() {
+  public TagRuleSource getSource() {
     return source;
   }
 
-  public void setSource(TagPolicySource source) {
+  public void setSource(TagRuleSource source) {
     if (!source.isValid()) {
       this.unparsed = true;
     }
     this.source = source;
   }
 
-  public TagPolicyCreateAttributes tagKey(String tagKey) {
+  public TagRuleCreateAttributes tagKey(String tagKey) {
     this.tagKey = tagKey;
     return this;
   }
 
   /**
-   * The tag key that the policy governs (for example, <code>service</code>).
+   * The tag key that the rule governs (for example, <code>service</code>).
    *
    * @return tagKey
    */
@@ -260,12 +259,12 @@ public void setTagKey(String tagKey) {
     this.tagKey = tagKey;
   }
 
-  public TagPolicyCreateAttributes tagValuePatterns(List<String> tagValuePatterns) {
+  public TagRuleCreateAttributes tagValuePatterns(List<String> tagValuePatterns) {
     this.tagValuePatterns = tagValuePatterns;
     return this;
   }
 
-  public TagPolicyCreateAttributes addTagValuePatternsItem(String tagValuePatternsItem) {
+  public TagRuleCreateAttributes addTagValuePatternsItem(String tagValuePatternsItem) {
     this.tagValuePatterns.add(tagValuePatternsItem);
     return this;
   }
@@ -298,10 +297,10 @@ public void setTagValuePatterns(List<String> tagValuePatterns) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyCreateAttributes
+   * @return TagRuleCreateAttributes
    */
   @JsonAnySetter
-  public TagPolicyCreateAttributes putAdditionalProperty(String key, Object value) {
+  public TagRuleCreateAttributes putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -332,7 +331,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyCreateAttributes object is equal to o. */
+  /** Return true if this TagRuleCreateAttributes object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -341,18 +340,17 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyCreateAttributes tagPolicyCreateAttributes = (TagPolicyCreateAttributes) o;
-    return Objects.equals(this.enabled, tagPolicyCreateAttributes.enabled)
-        && Objects.equals(this.negated, tagPolicyCreateAttributes.negated)
-        && Objects.equals(this.policyName, tagPolicyCreateAttributes.policyName)
-        && Objects.equals(this.policyType, tagPolicyCreateAttributes.policyType)
-        && Objects.equals(this.required, tagPolicyCreateAttributes.required)
-        && Objects.equals(this.scope, tagPolicyCreateAttributes.scope)
-        && Objects.equals(this.source, tagPolicyCreateAttributes.source)
-        && Objects.equals(this.tagKey, tagPolicyCreateAttributes.tagKey)
-        && Objects.equals(this.tagValuePatterns, tagPolicyCreateAttributes.tagValuePatterns)
-        && Objects.equals(
-            this.additionalProperties, tagPolicyCreateAttributes.additionalProperties);
+    TagRuleCreateAttributes tagRuleCreateAttributes = (TagRuleCreateAttributes) o;
+    return Objects.equals(this.enabled, tagRuleCreateAttributes.enabled)
+        && Objects.equals(this.negated, tagRuleCreateAttributes.negated)
+        && Objects.equals(this.policyName, tagRuleCreateAttributes.policyName)
+        && Objects.equals(this.policyType, tagRuleCreateAttributes.policyType)
+        && Objects.equals(this.required, tagRuleCreateAttributes.required)
+        && Objects.equals(this.scope, tagRuleCreateAttributes.scope)
+        && Objects.equals(this.source, tagRuleCreateAttributes.source)
+        && Objects.equals(this.tagKey, tagRuleCreateAttributes.tagKey)
+        && Objects.equals(this.tagValuePatterns, tagRuleCreateAttributes.tagValuePatterns)
+        && Objects.equals(this.additionalProperties, tagRuleCreateAttributes.additionalProperties);
   }
 
   @Override
@@ -373,7 +371,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyCreateAttributes {\n");
+    sb.append("class TagRuleCreateAttributes {\n");
     sb.append("    enabled: ").append(toIndentedString(enabled)).append("\n");
     sb.append("    negated: ").append(toIndentedString(negated)).append("\n");
     sb.append("    policyName: ").append(toIndentedString(policyName)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateData.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleCreateData.java
similarity index 75%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateData.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleCreateData.java
index 1965c461446..55d30aab3e1 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateData.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleCreateData.java
@@ -17,76 +17,76 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** Data object for creating a tag policy. */
+/** Data object for creating a tag rule. */
 @JsonPropertyOrder({
-  TagPolicyCreateData.JSON_PROPERTY_ATTRIBUTES,
-  TagPolicyCreateData.JSON_PROPERTY_TYPE
+  TagRuleCreateData.JSON_PROPERTY_ATTRIBUTES,
+  TagRuleCreateData.JSON_PROPERTY_TYPE
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyCreateData {
+public class TagRuleCreateData {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
-  private TagPolicyCreateAttributes attributes;
+  private TagRuleCreateAttributes attributes;
 
   public static final String JSON_PROPERTY_TYPE = "type";
-  private TagPolicyResourceType type;
+  private TagRuleResourceType type;
 
-  public TagPolicyCreateData() {}
+  public TagRuleCreateData() {}
 
   @JsonCreator
-  public TagPolicyCreateData(
+  public TagRuleCreateData(
       @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
-          TagPolicyCreateAttributes attributes,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagPolicyResourceType type) {
+          TagRuleCreateAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagRuleResourceType type) {
     this.attributes = attributes;
     this.unparsed |= attributes.unparsed;
     this.type = type;
     this.unparsed |= !type.isValid();
   }
 
-  public TagPolicyCreateData attributes(TagPolicyCreateAttributes attributes) {
+  public TagRuleCreateData attributes(TagRuleCreateAttributes attributes) {
     this.attributes = attributes;
     this.unparsed |= attributes.unparsed;
     return this;
   }
 
   /**
-   * Attributes that can be supplied when creating a tag policy.
+   * Attributes that can be supplied when creating a tag rule.
    *
    * @return attributes
    */
   @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyCreateAttributes getAttributes() {
+  public TagRuleCreateAttributes getAttributes() {
     return attributes;
   }
 
-  public void setAttributes(TagPolicyCreateAttributes attributes) {
+  public void setAttributes(TagRuleCreateAttributes attributes) {
     this.attributes = attributes;
     if (attributes != null) {
       this.unparsed |= attributes.unparsed;
     }
   }
 
-  public TagPolicyCreateData type(TagPolicyResourceType type) {
+  public TagRuleCreateData type(TagRuleResourceType type) {
     this.type = type;
     this.unparsed |= !type.isValid();
     return this;
   }
 
   /**
-   * JSON:API resource type for a tag policy.
+   * JSON:API resource type for a tag rule.
    *
    * @return type
    */
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyResourceType getType() {
+  public TagRuleResourceType getType() {
     return type;
   }
 
-  public void setType(TagPolicyResourceType type) {
+  public void setType(TagRuleResourceType type) {
     if (!type.isValid()) {
       this.unparsed = true;
     }
@@ -105,10 +105,10 @@ public void setType(TagPolicyResourceType type) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyCreateData
+   * @return TagRuleCreateData
    */
   @JsonAnySetter
-  public TagPolicyCreateData putAdditionalProperty(String key, Object value) {
+  public TagRuleCreateData putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -139,7 +139,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyCreateData object is equal to o. */
+  /** Return true if this TagRuleCreateData object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -148,10 +148,10 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyCreateData tagPolicyCreateData = (TagPolicyCreateData) o;
-    return Objects.equals(this.attributes, tagPolicyCreateData.attributes)
-        && Objects.equals(this.type, tagPolicyCreateData.type)
-        && Objects.equals(this.additionalProperties, tagPolicyCreateData.additionalProperties);
+    TagRuleCreateData tagRuleCreateData = (TagRuleCreateData) o;
+    return Objects.equals(this.attributes, tagRuleCreateData.attributes)
+        && Objects.equals(this.type, tagRuleCreateData.type)
+        && Objects.equals(this.additionalProperties, tagRuleCreateData.additionalProperties);
   }
 
   @Override
@@ -162,7 +162,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyCreateData {\n");
+    sb.append("class TagRuleCreateData {\n");
     sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("    additionalProperties: ")
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreResponse.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleCreateRequest.java
similarity index 78%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreResponse.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleCreateRequest.java
index 9e697f964f1..0246fdd17ee 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreResponse.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleCreateRequest.java
@@ -17,42 +17,42 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** A tag policy compliance score. */
-@JsonPropertyOrder({TagPolicyScoreResponse.JSON_PROPERTY_DATA})
+/** Payload for creating a new tag rule. */
+@JsonPropertyOrder({TagRuleCreateRequest.JSON_PROPERTY_DATA})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyScoreResponse {
+public class TagRuleCreateRequest {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_DATA = "data";
-  private TagPolicyScoreData data;
+  private TagRuleCreateData data;
 
-  public TagPolicyScoreResponse() {}
+  public TagRuleCreateRequest() {}
 
   @JsonCreator
-  public TagPolicyScoreResponse(
-      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) TagPolicyScoreData data) {
+  public TagRuleCreateRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) TagRuleCreateData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
   }
 
-  public TagPolicyScoreResponse data(TagPolicyScoreData data) {
+  public TagRuleCreateRequest data(TagRuleCreateData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
     return this;
   }
 
   /**
-   * A compliance score resource for a tag policy.
+   * Data object for creating a tag rule.
    *
    * @return data
    */
   @JsonProperty(JSON_PROPERTY_DATA)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyScoreData getData() {
+  public TagRuleCreateData getData() {
     return data;
   }
 
-  public void setData(TagPolicyScoreData data) {
+  public void setData(TagRuleCreateData data) {
     this.data = data;
     if (data != null) {
       this.unparsed |= data.unparsed;
@@ -71,10 +71,10 @@ public void setData(TagPolicyScoreData data) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyScoreResponse
+   * @return TagRuleCreateRequest
    */
   @JsonAnySetter
-  public TagPolicyScoreResponse putAdditionalProperty(String key, Object value) {
+  public TagRuleCreateRequest putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -105,7 +105,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyScoreResponse object is equal to o. */
+  /** Return true if this TagRuleCreateRequest object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -114,9 +114,9 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyScoreResponse tagPolicyScoreResponse = (TagPolicyScoreResponse) o;
-    return Objects.equals(this.data, tagPolicyScoreResponse.data)
-        && Objects.equals(this.additionalProperties, tagPolicyScoreResponse.additionalProperties);
+    TagRuleCreateRequest tagRuleCreateRequest = (TagRuleCreateRequest) o;
+    return Objects.equals(this.data, tagRuleCreateRequest.data)
+        && Objects.equals(this.additionalProperties, tagRuleCreateRequest.additionalProperties);
   }
 
   @Override
@@ -127,7 +127,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyScoreResponse {\n");
+    sb.append("class TagRuleCreateRequest {\n");
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateType.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleCreateType.java
similarity index 58%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateType.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleCreateType.java
index 7bdc140efc0..9eb53a85e26 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateType.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleCreateType.java
@@ -19,39 +19,38 @@
 import java.util.Set;
 
 /**
- * The policy type allowed when creating a tag policy. Only <code>surfacing</code> is accepted at
+ * The rule type allowed when creating a tag rule. Only <code>surfacing</code> is accepted at
  * creation time.
  */
-@JsonSerialize(using = TagPolicyCreateType.TagPolicyCreateTypeSerializer.class)
-public class TagPolicyCreateType extends ModelEnum<String> {
+@JsonSerialize(using = TagRuleCreateType.TagRuleCreateTypeSerializer.class)
+public class TagRuleCreateType extends ModelEnum<String> {
 
   private static final Set<String> allowedValues = new HashSet<String>(Arrays.asList("surfacing"));
 
-  public static final TagPolicyCreateType SURFACING = new TagPolicyCreateType("surfacing");
+  public static final TagRuleCreateType SURFACING = new TagRuleCreateType("surfacing");
 
-  TagPolicyCreateType(String value) {
+  TagRuleCreateType(String value) {
     super(value, allowedValues);
   }
 
-  public static class TagPolicyCreateTypeSerializer extends StdSerializer<TagPolicyCreateType> {
-    public TagPolicyCreateTypeSerializer(Class<TagPolicyCreateType> t) {
+  public static class TagRuleCreateTypeSerializer extends StdSerializer<TagRuleCreateType> {
+    public TagRuleCreateTypeSerializer(Class<TagRuleCreateType> t) {
       super(t);
     }
 
-    public TagPolicyCreateTypeSerializer() {
+    public TagRuleCreateTypeSerializer() {
       this(null);
     }
 
     @Override
-    public void serialize(
-        TagPolicyCreateType value, JsonGenerator jgen, SerializerProvider provider)
+    public void serialize(TagRuleCreateType value, JsonGenerator jgen, SerializerProvider provider)
         throws IOException, JsonProcessingException {
       jgen.writeObject(value.value);
     }
   }
 
   @JsonCreator
-  public static TagPolicyCreateType fromValue(String value) {
-    return new TagPolicyCreateType(value);
+  public static TagRuleCreateType fromValue(String value) {
+    return new TagRuleCreateType(value);
   }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyData.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleData.java
similarity index 74%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyData.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleData.java
index 76bd777b54c..e754343f7b1 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyData.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleData.java
@@ -17,37 +17,36 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** A tag policy resource. */
+/** A tag rule resource. */
 @JsonPropertyOrder({
-  TagPolicyData.JSON_PROPERTY_ATTRIBUTES,
-  TagPolicyData.JSON_PROPERTY_ID,
-  TagPolicyData.JSON_PROPERTY_RELATIONSHIPS,
-  TagPolicyData.JSON_PROPERTY_TYPE
+  TagRuleData.JSON_PROPERTY_ATTRIBUTES,
+  TagRuleData.JSON_PROPERTY_ID,
+  TagRuleData.JSON_PROPERTY_RELATIONSHIPS,
+  TagRuleData.JSON_PROPERTY_TYPE
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyData {
+public class TagRuleData {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
-  private TagPolicyAttributes attributes;
+  private TagRuleAttributes attributes;
 
   public static final String JSON_PROPERTY_ID = "id";
   private String id;
 
   public static final String JSON_PROPERTY_RELATIONSHIPS = "relationships";
-  private TagPolicyRelationships relationships;
+  private TagRuleRelationships relationships;
 
   public static final String JSON_PROPERTY_TYPE = "type";
-  private TagPolicyResourceType type;
+  private TagRuleResourceType type;
 
-  public TagPolicyData() {}
+  public TagRuleData() {}
 
   @JsonCreator
-  public TagPolicyData(
-      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
-          TagPolicyAttributes attributes,
+  public TagRuleData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES) TagRuleAttributes attributes,
       @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagPolicyResourceType type) {
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagRuleResourceType type) {
     this.attributes = attributes;
     this.unparsed |= attributes.unparsed;
     this.id = id;
@@ -55,37 +54,37 @@ public TagPolicyData(
     this.unparsed |= !type.isValid();
   }
 
-  public TagPolicyData attributes(TagPolicyAttributes attributes) {
+  public TagRuleData attributes(TagRuleAttributes attributes) {
     this.attributes = attributes;
     this.unparsed |= attributes.unparsed;
     return this;
   }
 
   /**
-   * The attributes of a tag policy resource.
+   * The attributes of a tag rule resource.
    *
    * @return attributes
    */
   @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyAttributes getAttributes() {
+  public TagRuleAttributes getAttributes() {
     return attributes;
   }
 
-  public void setAttributes(TagPolicyAttributes attributes) {
+  public void setAttributes(TagRuleAttributes attributes) {
     this.attributes = attributes;
     if (attributes != null) {
       this.unparsed |= attributes.unparsed;
     }
   }
 
-  public TagPolicyData id(String id) {
+  public TagRuleData id(String id) {
     this.id = id;
     return this;
   }
 
   /**
-   * The unique identifier of the tag policy.
+   * The unique identifier of the tag rule.
    *
    * @return id
    */
@@ -99,14 +98,14 @@ public void setId(String id) {
     this.id = id;
   }
 
-  public TagPolicyData relationships(TagPolicyRelationships relationships) {
+  public TagRuleData relationships(TagRuleRelationships relationships) {
     this.relationships = relationships;
     this.unparsed |= relationships.unparsed;
     return this;
   }
 
   /**
-   * Related resources for a tag policy. Only present when the corresponding <code>include</code>
+   * Related resources for a tag rule. Only present when the corresponding <code>include</code>
    * query parameter is supplied.
    *
    * @return relationships
@@ -114,35 +113,35 @@ public TagPolicyData relationships(TagPolicyRelationships relationships) {
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RELATIONSHIPS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public TagPolicyRelationships getRelationships() {
+  public TagRuleRelationships getRelationships() {
     return relationships;
   }
 
-  public void setRelationships(TagPolicyRelationships relationships) {
+  public void setRelationships(TagRuleRelationships relationships) {
     this.relationships = relationships;
     if (relationships != null) {
       this.unparsed |= relationships.unparsed;
     }
   }
 
-  public TagPolicyData type(TagPolicyResourceType type) {
+  public TagRuleData type(TagRuleResourceType type) {
     this.type = type;
     this.unparsed |= !type.isValid();
     return this;
   }
 
   /**
-   * JSON:API resource type for a tag policy.
+   * JSON:API resource type for a tag rule.
    *
    * @return type
    */
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyResourceType getType() {
+  public TagRuleResourceType getType() {
     return type;
   }
 
-  public void setType(TagPolicyResourceType type) {
+  public void setType(TagRuleResourceType type) {
     if (!type.isValid()) {
       this.unparsed = true;
     }
@@ -161,10 +160,10 @@ public void setType(TagPolicyResourceType type) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyData
+   * @return TagRuleData
    */
   @JsonAnySetter
-  public TagPolicyData putAdditionalProperty(String key, Object value) {
+  public TagRuleData putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -195,7 +194,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyData object is equal to o. */
+  /** Return true if this TagRuleData object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -204,12 +203,12 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyData tagPolicyData = (TagPolicyData) o;
-    return Objects.equals(this.attributes, tagPolicyData.attributes)
-        && Objects.equals(this.id, tagPolicyData.id)
-        && Objects.equals(this.relationships, tagPolicyData.relationships)
-        && Objects.equals(this.type, tagPolicyData.type)
-        && Objects.equals(this.additionalProperties, tagPolicyData.additionalProperties);
+    TagRuleData tagRuleData = (TagRuleData) o;
+    return Objects.equals(this.attributes, tagRuleData.attributes)
+        && Objects.equals(this.id, tagRuleData.id)
+        && Objects.equals(this.relationships, tagRuleData.relationships)
+        && Objects.equals(this.type, tagRuleData.type)
+        && Objects.equals(this.additionalProperties, tagRuleData.additionalProperties);
   }
 
   @Override
@@ -220,7 +219,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyData {\n");
+    sb.append("class TagRuleData {\n");
     sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    relationships: ").append(toIndentedString(relationships)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyInclude.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleInclude.java
similarity index 58%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyInclude.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleInclude.java
index 6c88da7b102..e577d057846 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyInclude.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleInclude.java
@@ -19,38 +19,38 @@
 import java.util.Set;
 
 /**
- * A related resource to include alongside a tag policy in the response. Currently the only
- * supported value is <code>score</code>.
+ * A related resource to include alongside a tag rule in the response. Currently the only supported
+ * value is <code>score</code>.
  */
-@JsonSerialize(using = TagPolicyInclude.TagPolicyIncludeSerializer.class)
-public class TagPolicyInclude extends ModelEnum<String> {
+@JsonSerialize(using = TagRuleInclude.TagRuleIncludeSerializer.class)
+public class TagRuleInclude extends ModelEnum<String> {
 
   private static final Set<String> allowedValues = new HashSet<String>(Arrays.asList("score"));
 
-  public static final TagPolicyInclude SCORE = new TagPolicyInclude("score");
+  public static final TagRuleInclude SCORE = new TagRuleInclude("score");
 
-  TagPolicyInclude(String value) {
+  TagRuleInclude(String value) {
     super(value, allowedValues);
   }
 
-  public static class TagPolicyIncludeSerializer extends StdSerializer<TagPolicyInclude> {
-    public TagPolicyIncludeSerializer(Class<TagPolicyInclude> t) {
+  public static class TagRuleIncludeSerializer extends StdSerializer<TagRuleInclude> {
+    public TagRuleIncludeSerializer(Class<TagRuleInclude> t) {
       super(t);
     }
 
-    public TagPolicyIncludeSerializer() {
+    public TagRuleIncludeSerializer() {
       this(null);
     }
 
     @Override
-    public void serialize(TagPolicyInclude value, JsonGenerator jgen, SerializerProvider provider)
+    public void serialize(TagRuleInclude value, JsonGenerator jgen, SerializerProvider provider)
         throws IOException, JsonProcessingException {
       jgen.writeObject(value.value);
     }
   }
 
   @JsonCreator
-  public static TagPolicyInclude fromValue(String value) {
-    return new TagPolicyInclude(value);
+  public static TagRuleInclude fromValue(String value) {
+    return new TagRuleInclude(value);
   }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyRelationships.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleRelationships.java
similarity index 77%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyRelationships.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleRelationships.java
index d4a4ee67a44..84c160c982f 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyRelationships.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleRelationships.java
@@ -17,36 +17,36 @@
 import java.util.Objects;
 
 /**
- * Related resources for a tag policy. Only present when the corresponding <code>include</code>
- * query parameter is supplied.
+ * Related resources for a tag rule. Only present when the corresponding <code>include</code> query
+ * parameter is supplied.
  */
-@JsonPropertyOrder({TagPolicyRelationships.JSON_PROPERTY_SCORE})
+@JsonPropertyOrder({TagRuleRelationships.JSON_PROPERTY_SCORE})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyRelationships {
+public class TagRuleRelationships {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_SCORE = "score";
-  private TagPolicyScoreRelationship score;
+  private TagRuleScoreRelationship score;
 
-  public TagPolicyRelationships score(TagPolicyScoreRelationship score) {
+  public TagRuleRelationships score(TagRuleScoreRelationship score) {
     this.score = score;
     this.unparsed |= score.unparsed;
     return this;
   }
 
   /**
-   * A relationship to the compliance score resource for this policy.
+   * A relationship to the compliance score resource for this rule.
    *
    * @return score
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SCORE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public TagPolicyScoreRelationship getScore() {
+  public TagRuleScoreRelationship getScore() {
     return score;
   }
 
-  public void setScore(TagPolicyScoreRelationship score) {
+  public void setScore(TagRuleScoreRelationship score) {
     this.score = score;
     if (score != null) {
       this.unparsed |= score.unparsed;
@@ -65,10 +65,10 @@ public void setScore(TagPolicyScoreRelationship score) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyRelationships
+   * @return TagRuleRelationships
    */
   @JsonAnySetter
-  public TagPolicyRelationships putAdditionalProperty(String key, Object value) {
+  public TagRuleRelationships putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -99,7 +99,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyRelationships object is equal to o. */
+  /** Return true if this TagRuleRelationships object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -108,9 +108,9 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyRelationships tagPolicyRelationships = (TagPolicyRelationships) o;
-    return Objects.equals(this.score, tagPolicyRelationships.score)
-        && Objects.equals(this.additionalProperties, tagPolicyRelationships.additionalProperties);
+    TagRuleRelationships tagRuleRelationships = (TagRuleRelationships) o;
+    return Objects.equals(this.score, tagRuleRelationships.score)
+        && Objects.equals(this.additionalProperties, tagRuleRelationships.additionalProperties);
   }
 
   @Override
@@ -121,7 +121,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyRelationships {\n");
+    sb.append("class TagRuleRelationships {\n");
     sb.append("    score: ").append(toIndentedString(score)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyResourceType.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleResourceType.java
similarity index 59%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyResourceType.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleResourceType.java
index f420305461d..54e3204f5de 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyResourceType.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleResourceType.java
@@ -18,37 +18,37 @@
 import java.util.HashSet;
 import java.util.Set;
 
-/** JSON:API resource type for a tag policy. */
-@JsonSerialize(using = TagPolicyResourceType.TagPolicyResourceTypeSerializer.class)
-public class TagPolicyResourceType extends ModelEnum<String> {
+/** JSON:API resource type for a tag rule. */
+@JsonSerialize(using = TagRuleResourceType.TagRuleResourceTypeSerializer.class)
+public class TagRuleResourceType extends ModelEnum<String> {
 
   private static final Set<String> allowedValues = new HashSet<String>(Arrays.asList("tag_policy"));
 
-  public static final TagPolicyResourceType TAG_POLICY = new TagPolicyResourceType("tag_policy");
+  public static final TagRuleResourceType TAG_POLICY = new TagRuleResourceType("tag_policy");
 
-  TagPolicyResourceType(String value) {
+  TagRuleResourceType(String value) {
     super(value, allowedValues);
   }
 
-  public static class TagPolicyResourceTypeSerializer extends StdSerializer<TagPolicyResourceType> {
-    public TagPolicyResourceTypeSerializer(Class<TagPolicyResourceType> t) {
+  public static class TagRuleResourceTypeSerializer extends StdSerializer<TagRuleResourceType> {
+    public TagRuleResourceTypeSerializer(Class<TagRuleResourceType> t) {
       super(t);
     }
 
-    public TagPolicyResourceTypeSerializer() {
+    public TagRuleResourceTypeSerializer() {
       this(null);
     }
 
     @Override
     public void serialize(
-        TagPolicyResourceType value, JsonGenerator jgen, SerializerProvider provider)
+        TagRuleResourceType value, JsonGenerator jgen, SerializerProvider provider)
         throws IOException, JsonProcessingException {
       jgen.writeObject(value.value);
     }
   }
 
   @JsonCreator
-  public static TagPolicyResourceType fromValue(String value) {
-    return new TagPolicyResourceType(value);
+  public static TagRuleResourceType fromValue(String value) {
+    return new TagRuleResourceType(value);
   }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyResponse.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleResponse.java
similarity index 75%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyResponse.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleResponse.java
index d5700a7a6d6..ea4f7f161dc 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyResponse.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleResponse.java
@@ -19,62 +19,62 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** A single tag policy. */
-@JsonPropertyOrder({TagPolicyResponse.JSON_PROPERTY_DATA, TagPolicyResponse.JSON_PROPERTY_INCLUDED})
+/** A single tag rule. */
+@JsonPropertyOrder({TagRuleResponse.JSON_PROPERTY_DATA, TagRuleResponse.JSON_PROPERTY_INCLUDED})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyResponse {
+public class TagRuleResponse {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_DATA = "data";
-  private TagPolicyData data;
+  private TagRuleData data;
 
   public static final String JSON_PROPERTY_INCLUDED = "included";
-  private List<TagPolicyScoreData> included = null;
+  private List<TagRuleScoreData> included = null;
 
-  public TagPolicyResponse() {}
+  public TagRuleResponse() {}
 
   @JsonCreator
-  public TagPolicyResponse(
-      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) TagPolicyData data) {
+  public TagRuleResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) TagRuleData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
   }
 
-  public TagPolicyResponse data(TagPolicyData data) {
+  public TagRuleResponse data(TagRuleData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
     return this;
   }
 
   /**
-   * A tag policy resource.
+   * A tag rule resource.
    *
    * @return data
    */
   @JsonProperty(JSON_PROPERTY_DATA)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyData getData() {
+  public TagRuleData getData() {
     return data;
   }
 
-  public void setData(TagPolicyData data) {
+  public void setData(TagRuleData data) {
     this.data = data;
     if (data != null) {
       this.unparsed |= data.unparsed;
     }
   }
 
-  public TagPolicyResponse included(List<TagPolicyScoreData> included) {
+  public TagRuleResponse included(List<TagRuleScoreData> included) {
     this.included = included;
     if (included != null) {
-      for (TagPolicyScoreData item : included) {
+      for (TagRuleScoreData item : included) {
         this.unparsed |= item.unparsed;
       }
     }
     return this;
   }
 
-  public TagPolicyResponse addIncludedItem(TagPolicyScoreData includedItem) {
+  public TagRuleResponse addIncludedItem(TagRuleScoreData includedItem) {
     if (this.included == null) {
       this.included = new ArrayList<>();
     }
@@ -84,7 +84,7 @@ public TagPolicyResponse addIncludedItem(TagPolicyScoreData includedItem) {
   }
 
   /**
-   * Related resources fetched alongside the primary tag policies. Populated when an <code>include
+   * Related resources fetched alongside the primary tag rules. Populated when an <code>include
    * </code> query parameter is supplied.
    *
    * @return included
@@ -92,14 +92,14 @@ public TagPolicyResponse addIncludedItem(TagPolicyScoreData includedItem) {
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INCLUDED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public List<TagPolicyScoreData> getIncluded() {
+  public List<TagRuleScoreData> getIncluded() {
     return included;
   }
 
-  public void setIncluded(List<TagPolicyScoreData> included) {
+  public void setIncluded(List<TagRuleScoreData> included) {
     this.included = included;
     if (included != null) {
-      for (TagPolicyScoreData item : included) {
+      for (TagRuleScoreData item : included) {
         this.unparsed |= item.unparsed;
       }
     }
@@ -117,10 +117,10 @@ public void setIncluded(List<TagPolicyScoreData> included) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyResponse
+   * @return TagRuleResponse
    */
   @JsonAnySetter
-  public TagPolicyResponse putAdditionalProperty(String key, Object value) {
+  public TagRuleResponse putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -151,7 +151,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyResponse object is equal to o. */
+  /** Return true if this TagRuleResponse object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -160,10 +160,10 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyResponse tagPolicyResponse = (TagPolicyResponse) o;
-    return Objects.equals(this.data, tagPolicyResponse.data)
-        && Objects.equals(this.included, tagPolicyResponse.included)
-        && Objects.equals(this.additionalProperties, tagPolicyResponse.additionalProperties);
+    TagRuleResponse tagRuleResponse = (TagRuleResponse) o;
+    return Objects.equals(this.data, tagRuleResponse.data)
+        && Objects.equals(this.included, tagRuleResponse.included)
+        && Objects.equals(this.additionalProperties, tagRuleResponse.additionalProperties);
   }
 
   @Override
@@ -174,7 +174,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyResponse {\n");
+    sb.append("class TagRuleResponse {\n");
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    included: ").append(toIndentedString(included)).append("\n");
     sb.append("    additionalProperties: ")
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreAttributes.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreAttributes.java
similarity index 78%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreAttributes.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleScoreAttributes.java
index 1fce6452a29..f09821b8bea 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreAttributes.java
@@ -17,16 +17,16 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** Attributes of a tag policy compliance score. */
+/** Attributes of a tag rule compliance score. */
 @JsonPropertyOrder({
-  TagPolicyScoreAttributes.JSON_PROPERTY_SCORE,
-  TagPolicyScoreAttributes.JSON_PROPERTY_TS_END,
-  TagPolicyScoreAttributes.JSON_PROPERTY_TS_START,
-  TagPolicyScoreAttributes.JSON_PROPERTY_VERSION
+  TagRuleScoreAttributes.JSON_PROPERTY_SCORE,
+  TagRuleScoreAttributes.JSON_PROPERTY_TS_END,
+  TagRuleScoreAttributes.JSON_PROPERTY_TS_START,
+  TagRuleScoreAttributes.JSON_PROPERTY_VERSION
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyScoreAttributes {
+public class TagRuleScoreAttributes {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_SCORE = "score";
   private Double score;
@@ -40,10 +40,10 @@ public class TagPolicyScoreAttributes {
   public static final String JSON_PROPERTY_VERSION = "version";
   private Long version;
 
-  public TagPolicyScoreAttributes() {}
+  public TagRuleScoreAttributes() {}
 
   @JsonCreator
-  public TagPolicyScoreAttributes(
+  public TagRuleScoreAttributes(
       @JsonProperty(required = true, value = JSON_PROPERTY_SCORE) Double score,
       @JsonProperty(required = true, value = JSON_PROPERTY_TS_END) Long tsEnd,
       @JsonProperty(required = true, value = JSON_PROPERTY_TS_START) Long tsStart,
@@ -55,15 +55,15 @@ public TagPolicyScoreAttributes(
     this.version = version;
   }
 
-  public TagPolicyScoreAttributes score(Double score) {
+  public TagRuleScoreAttributes score(Double score) {
     this.score = score;
     if (score != null) {}
     return this;
   }
 
   /**
-   * The compliance score for the policy over the requested time window, as a percentage between 0
-   * and 100. <code>null</code> indicates that no relevant telemetry was found.
+   * The compliance score for the rule over the requested time window, as a percentage between 0 and
+   * 100. <code>null</code> indicates that no relevant telemetry was found.
    *
    * @return score
    */
@@ -78,7 +78,7 @@ public void setScore(Double score) {
     this.score = score;
   }
 
-  public TagPolicyScoreAttributes tsEnd(Long tsEnd) {
+  public TagRuleScoreAttributes tsEnd(Long tsEnd) {
     this.tsEnd = tsEnd;
     return this;
   }
@@ -98,7 +98,7 @@ public void setTsEnd(Long tsEnd) {
     this.tsEnd = tsEnd;
   }
 
-  public TagPolicyScoreAttributes tsStart(Long tsStart) {
+  public TagRuleScoreAttributes tsStart(Long tsStart) {
     this.tsStart = tsStart;
     return this;
   }
@@ -118,13 +118,13 @@ public void setTsStart(Long tsStart) {
     this.tsStart = tsStart;
   }
 
-  public TagPolicyScoreAttributes version(Long version) {
+  public TagRuleScoreAttributes version(Long version) {
     this.version = version;
     return this;
   }
 
   /**
-   * The version of the tag policy that the score was computed against.
+   * The version of the tag rule that the score was computed against.
    *
    * @return version
    */
@@ -150,10 +150,10 @@ public void setVersion(Long version) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyScoreAttributes
+   * @return TagRuleScoreAttributes
    */
   @JsonAnySetter
-  public TagPolicyScoreAttributes putAdditionalProperty(String key, Object value) {
+  public TagRuleScoreAttributes putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -184,7 +184,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyScoreAttributes object is equal to o. */
+  /** Return true if this TagRuleScoreAttributes object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -193,12 +193,12 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyScoreAttributes tagPolicyScoreAttributes = (TagPolicyScoreAttributes) o;
-    return Objects.equals(this.score, tagPolicyScoreAttributes.score)
-        && Objects.equals(this.tsEnd, tagPolicyScoreAttributes.tsEnd)
-        && Objects.equals(this.tsStart, tagPolicyScoreAttributes.tsStart)
-        && Objects.equals(this.version, tagPolicyScoreAttributes.version)
-        && Objects.equals(this.additionalProperties, tagPolicyScoreAttributes.additionalProperties);
+    TagRuleScoreAttributes tagRuleScoreAttributes = (TagRuleScoreAttributes) o;
+    return Objects.equals(this.score, tagRuleScoreAttributes.score)
+        && Objects.equals(this.tsEnd, tagRuleScoreAttributes.tsEnd)
+        && Objects.equals(this.tsStart, tagRuleScoreAttributes.tsStart)
+        && Objects.equals(this.version, tagRuleScoreAttributes.version)
+        && Objects.equals(this.additionalProperties, tagRuleScoreAttributes.additionalProperties);
   }
 
   @Override
@@ -209,7 +209,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyScoreAttributes {\n");
+    sb.append("class TagRuleScoreAttributes {\n");
     sb.append("    score: ").append(toIndentedString(score)).append("\n");
     sb.append("    tsEnd: ").append(toIndentedString(tsEnd)).append("\n");
     sb.append("    tsStart: ").append(toIndentedString(tsStart)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreData.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreData.java
similarity index 75%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreData.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleScoreData.java
index 9b9f771b932..d793bd8f7bc 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreData.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreData.java
@@ -17,33 +17,33 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** A compliance score resource for a tag policy. */
+/** A compliance score resource for a tag rule. */
 @JsonPropertyOrder({
-  TagPolicyScoreData.JSON_PROPERTY_ATTRIBUTES,
-  TagPolicyScoreData.JSON_PROPERTY_ID,
-  TagPolicyScoreData.JSON_PROPERTY_TYPE
+  TagRuleScoreData.JSON_PROPERTY_ATTRIBUTES,
+  TagRuleScoreData.JSON_PROPERTY_ID,
+  TagRuleScoreData.JSON_PROPERTY_TYPE
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyScoreData {
+public class TagRuleScoreData {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
-  private TagPolicyScoreAttributes attributes;
+  private TagRuleScoreAttributes attributes;
 
   public static final String JSON_PROPERTY_ID = "id";
   private String id;
 
   public static final String JSON_PROPERTY_TYPE = "type";
-  private TagPolicyScoreResourceType type;
+  private TagRuleScoreResourceType type;
 
-  public TagPolicyScoreData() {}
+  public TagRuleScoreData() {}
 
   @JsonCreator
-  public TagPolicyScoreData(
+  public TagRuleScoreData(
       @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
-          TagPolicyScoreAttributes attributes,
+          TagRuleScoreAttributes attributes,
       @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagPolicyScoreResourceType type) {
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagRuleScoreResourceType type) {
     this.attributes = attributes;
     this.unparsed |= attributes.unparsed;
     this.id = id;
@@ -51,31 +51,31 @@ public TagPolicyScoreData(
     this.unparsed |= !type.isValid();
   }
 
-  public TagPolicyScoreData attributes(TagPolicyScoreAttributes attributes) {
+  public TagRuleScoreData attributes(TagRuleScoreAttributes attributes) {
     this.attributes = attributes;
     this.unparsed |= attributes.unparsed;
     return this;
   }
 
   /**
-   * Attributes of a tag policy compliance score.
+   * Attributes of a tag rule compliance score.
    *
    * @return attributes
    */
   @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyScoreAttributes getAttributes() {
+  public TagRuleScoreAttributes getAttributes() {
     return attributes;
   }
 
-  public void setAttributes(TagPolicyScoreAttributes attributes) {
+  public void setAttributes(TagRuleScoreAttributes attributes) {
     this.attributes = attributes;
     if (attributes != null) {
       this.unparsed |= attributes.unparsed;
     }
   }
 
-  public TagPolicyScoreData id(String id) {
+  public TagRuleScoreData id(String id) {
     this.id = id;
     return this;
   }
@@ -95,24 +95,24 @@ public void setId(String id) {
     this.id = id;
   }
 
-  public TagPolicyScoreData type(TagPolicyScoreResourceType type) {
+  public TagRuleScoreData type(TagRuleScoreResourceType type) {
     this.type = type;
     this.unparsed |= !type.isValid();
     return this;
   }
 
   /**
-   * JSON:API resource type for a tag policy compliance score.
+   * JSON:API resource type for a tag rule compliance score.
    *
    * @return type
    */
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyScoreResourceType getType() {
+  public TagRuleScoreResourceType getType() {
     return type;
   }
 
-  public void setType(TagPolicyScoreResourceType type) {
+  public void setType(TagRuleScoreResourceType type) {
     if (!type.isValid()) {
       this.unparsed = true;
     }
@@ -131,10 +131,10 @@ public void setType(TagPolicyScoreResourceType type) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyScoreData
+   * @return TagRuleScoreData
    */
   @JsonAnySetter
-  public TagPolicyScoreData putAdditionalProperty(String key, Object value) {
+  public TagRuleScoreData putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -165,7 +165,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyScoreData object is equal to o. */
+  /** Return true if this TagRuleScoreData object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -174,11 +174,11 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyScoreData tagPolicyScoreData = (TagPolicyScoreData) o;
-    return Objects.equals(this.attributes, tagPolicyScoreData.attributes)
-        && Objects.equals(this.id, tagPolicyScoreData.id)
-        && Objects.equals(this.type, tagPolicyScoreData.type)
-        && Objects.equals(this.additionalProperties, tagPolicyScoreData.additionalProperties);
+    TagRuleScoreData tagRuleScoreData = (TagRuleScoreData) o;
+    return Objects.equals(this.attributes, tagRuleScoreData.attributes)
+        && Objects.equals(this.id, tagRuleScoreData.id)
+        && Objects.equals(this.type, tagRuleScoreData.type)
+        && Objects.equals(this.additionalProperties, tagRuleScoreData.additionalProperties);
   }
 
   @Override
@@ -189,7 +189,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyScoreData {\n");
+    sb.append("class TagRuleScoreData {\n");
     sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreRelationship.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreRelationship.java
similarity index 77%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreRelationship.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleScoreRelationship.java
index 8dc4b58ca3f..eeb41187b02 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreRelationship.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreRelationship.java
@@ -17,26 +17,26 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** A relationship to the compliance score resource for this policy. */
-@JsonPropertyOrder({TagPolicyScoreRelationship.JSON_PROPERTY_DATA})
+/** A relationship to the compliance score resource for this rule. */
+@JsonPropertyOrder({TagRuleScoreRelationship.JSON_PROPERTY_DATA})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyScoreRelationship {
+public class TagRuleScoreRelationship {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_DATA = "data";
-  private TagPolicyScoreRelationshipData data;
+  private TagRuleScoreRelationshipData data;
 
-  public TagPolicyScoreRelationship() {}
+  public TagRuleScoreRelationship() {}
 
   @JsonCreator
-  public TagPolicyScoreRelationship(
+  public TagRuleScoreRelationship(
       @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
-          TagPolicyScoreRelationshipData data) {
+          TagRuleScoreRelationshipData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
   }
 
-  public TagPolicyScoreRelationship data(TagPolicyScoreRelationshipData data) {
+  public TagRuleScoreRelationship data(TagRuleScoreRelationshipData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
     return this;
@@ -49,11 +49,11 @@ public TagPolicyScoreRelationship data(TagPolicyScoreRelationshipData data) {
    */
   @JsonProperty(JSON_PROPERTY_DATA)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyScoreRelationshipData getData() {
+  public TagRuleScoreRelationshipData getData() {
     return data;
   }
 
-  public void setData(TagPolicyScoreRelationshipData data) {
+  public void setData(TagRuleScoreRelationshipData data) {
     this.data = data;
     if (data != null) {
       this.unparsed |= data.unparsed;
@@ -72,10 +72,10 @@ public void setData(TagPolicyScoreRelationshipData data) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyScoreRelationship
+   * @return TagRuleScoreRelationship
    */
   @JsonAnySetter
-  public TagPolicyScoreRelationship putAdditionalProperty(String key, Object value) {
+  public TagRuleScoreRelationship putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -106,7 +106,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyScoreRelationship object is equal to o. */
+  /** Return true if this TagRuleScoreRelationship object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -115,10 +115,9 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyScoreRelationship tagPolicyScoreRelationship = (TagPolicyScoreRelationship) o;
-    return Objects.equals(this.data, tagPolicyScoreRelationship.data)
-        && Objects.equals(
-            this.additionalProperties, tagPolicyScoreRelationship.additionalProperties);
+    TagRuleScoreRelationship tagRuleScoreRelationship = (TagRuleScoreRelationship) o;
+    return Objects.equals(this.data, tagRuleScoreRelationship.data)
+        && Objects.equals(this.additionalProperties, tagRuleScoreRelationship.additionalProperties);
   }
 
   @Override
@@ -129,7 +128,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyScoreRelationship {\n");
+    sb.append("class TagRuleScoreRelationship {\n");
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreRelationshipData.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreRelationshipData.java
similarity index 77%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreRelationshipData.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleScoreRelationshipData.java
index 1779f4954e5..96d9099a7da 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreRelationshipData.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreRelationshipData.java
@@ -19,31 +19,31 @@
 
 /** Identifier of the related compliance score resource. */
 @JsonPropertyOrder({
-  TagPolicyScoreRelationshipData.JSON_PROPERTY_ID,
-  TagPolicyScoreRelationshipData.JSON_PROPERTY_TYPE
+  TagRuleScoreRelationshipData.JSON_PROPERTY_ID,
+  TagRuleScoreRelationshipData.JSON_PROPERTY_TYPE
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyScoreRelationshipData {
+public class TagRuleScoreRelationshipData {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_ID = "id";
   private String id;
 
   public static final String JSON_PROPERTY_TYPE = "type";
-  private TagPolicyScoreResourceType type;
+  private TagRuleScoreResourceType type;
 
-  public TagPolicyScoreRelationshipData() {}
+  public TagRuleScoreRelationshipData() {}
 
   @JsonCreator
-  public TagPolicyScoreRelationshipData(
+  public TagRuleScoreRelationshipData(
       @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagPolicyScoreResourceType type) {
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagRuleScoreResourceType type) {
     this.id = id;
     this.type = type;
     this.unparsed |= !type.isValid();
   }
 
-  public TagPolicyScoreRelationshipData id(String id) {
+  public TagRuleScoreRelationshipData id(String id) {
     this.id = id;
     return this;
   }
@@ -63,24 +63,24 @@ public void setId(String id) {
     this.id = id;
   }
 
-  public TagPolicyScoreRelationshipData type(TagPolicyScoreResourceType type) {
+  public TagRuleScoreRelationshipData type(TagRuleScoreResourceType type) {
     this.type = type;
     this.unparsed |= !type.isValid();
     return this;
   }
 
   /**
-   * JSON:API resource type for a tag policy compliance score.
+   * JSON:API resource type for a tag rule compliance score.
    *
    * @return type
    */
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyScoreResourceType getType() {
+  public TagRuleScoreResourceType getType() {
     return type;
   }
 
-  public void setType(TagPolicyScoreResourceType type) {
+  public void setType(TagRuleScoreResourceType type) {
     if (!type.isValid()) {
       this.unparsed = true;
     }
@@ -99,10 +99,10 @@ public void setType(TagPolicyScoreResourceType type) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyScoreRelationshipData
+   * @return TagRuleScoreRelationshipData
    */
   @JsonAnySetter
-  public TagPolicyScoreRelationshipData putAdditionalProperty(String key, Object value) {
+  public TagRuleScoreRelationshipData putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -133,7 +133,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyScoreRelationshipData object is equal to o. */
+  /** Return true if this TagRuleScoreRelationshipData object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -142,12 +142,11 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyScoreRelationshipData tagPolicyScoreRelationshipData =
-        (TagPolicyScoreRelationshipData) o;
-    return Objects.equals(this.id, tagPolicyScoreRelationshipData.id)
-        && Objects.equals(this.type, tagPolicyScoreRelationshipData.type)
+    TagRuleScoreRelationshipData tagRuleScoreRelationshipData = (TagRuleScoreRelationshipData) o;
+    return Objects.equals(this.id, tagRuleScoreRelationshipData.id)
+        && Objects.equals(this.type, tagRuleScoreRelationshipData.type)
         && Objects.equals(
-            this.additionalProperties, tagPolicyScoreRelationshipData.additionalProperties);
+            this.additionalProperties, tagRuleScoreRelationshipData.additionalProperties);
   }
 
   @Override
@@ -158,7 +157,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyScoreRelationshipData {\n");
+    sb.append("class TagRuleScoreRelationshipData {\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("    additionalProperties: ")
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreResourceType.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreResourceType.java
similarity index 56%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreResourceType.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleScoreResourceType.java
index b6fefba46f8..c773ca22ae8 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyScoreResourceType.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreResourceType.java
@@ -18,40 +18,40 @@
 import java.util.HashSet;
 import java.util.Set;
 
-/** JSON:API resource type for a tag policy compliance score. */
-@JsonSerialize(using = TagPolicyScoreResourceType.TagPolicyScoreResourceTypeSerializer.class)
-public class TagPolicyScoreResourceType extends ModelEnum<String> {
+/** JSON:API resource type for a tag rule compliance score. */
+@JsonSerialize(using = TagRuleScoreResourceType.TagRuleScoreResourceTypeSerializer.class)
+public class TagRuleScoreResourceType extends ModelEnum<String> {
 
   private static final Set<String> allowedValues =
       new HashSet<String>(Arrays.asList("tag_policy_score"));
 
-  public static final TagPolicyScoreResourceType TAG_POLICY_SCORE =
-      new TagPolicyScoreResourceType("tag_policy_score");
+  public static final TagRuleScoreResourceType TAG_POLICY_SCORE =
+      new TagRuleScoreResourceType("tag_policy_score");
 
-  TagPolicyScoreResourceType(String value) {
+  TagRuleScoreResourceType(String value) {
     super(value, allowedValues);
   }
 
-  public static class TagPolicyScoreResourceTypeSerializer
-      extends StdSerializer<TagPolicyScoreResourceType> {
-    public TagPolicyScoreResourceTypeSerializer(Class<TagPolicyScoreResourceType> t) {
+  public static class TagRuleScoreResourceTypeSerializer
+      extends StdSerializer<TagRuleScoreResourceType> {
+    public TagRuleScoreResourceTypeSerializer(Class<TagRuleScoreResourceType> t) {
       super(t);
     }
 
-    public TagPolicyScoreResourceTypeSerializer() {
+    public TagRuleScoreResourceTypeSerializer() {
       this(null);
     }
 
     @Override
     public void serialize(
-        TagPolicyScoreResourceType value, JsonGenerator jgen, SerializerProvider provider)
+        TagRuleScoreResourceType value, JsonGenerator jgen, SerializerProvider provider)
         throws IOException, JsonProcessingException {
       jgen.writeObject(value.value);
     }
   }
 
   @JsonCreator
-  public static TagPolicyScoreResourceType fromValue(String value) {
-    return new TagPolicyScoreResourceType(value);
+  public static TagRuleScoreResourceType fromValue(String value) {
+    return new TagRuleScoreResourceType(value);
   }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateRequest.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreResponse.java
similarity index 78%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateRequest.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleScoreResponse.java
index a8a560313d3..30c01789f2a 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyCreateRequest.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleScoreResponse.java
@@ -17,42 +17,42 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** Payload for creating a new tag policy. */
-@JsonPropertyOrder({TagPolicyCreateRequest.JSON_PROPERTY_DATA})
+/** A tag rule compliance score. */
+@JsonPropertyOrder({TagRuleScoreResponse.JSON_PROPERTY_DATA})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyCreateRequest {
+public class TagRuleScoreResponse {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_DATA = "data";
-  private TagPolicyCreateData data;
+  private TagRuleScoreData data;
 
-  public TagPolicyCreateRequest() {}
+  public TagRuleScoreResponse() {}
 
   @JsonCreator
-  public TagPolicyCreateRequest(
-      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) TagPolicyCreateData data) {
+  public TagRuleScoreResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) TagRuleScoreData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
   }
 
-  public TagPolicyCreateRequest data(TagPolicyCreateData data) {
+  public TagRuleScoreResponse data(TagRuleScoreData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
     return this;
   }
 
   /**
-   * Data object for creating a tag policy.
+   * A compliance score resource for a tag rule.
    *
    * @return data
    */
   @JsonProperty(JSON_PROPERTY_DATA)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyCreateData getData() {
+  public TagRuleScoreData getData() {
     return data;
   }
 
-  public void setData(TagPolicyCreateData data) {
+  public void setData(TagRuleScoreData data) {
     this.data = data;
     if (data != null) {
       this.unparsed |= data.unparsed;
@@ -71,10 +71,10 @@ public void setData(TagPolicyCreateData data) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyCreateRequest
+   * @return TagRuleScoreResponse
    */
   @JsonAnySetter
-  public TagPolicyCreateRequest putAdditionalProperty(String key, Object value) {
+  public TagRuleScoreResponse putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -105,7 +105,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyCreateRequest object is equal to o. */
+  /** Return true if this TagRuleScoreResponse object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -114,9 +114,9 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyCreateRequest tagPolicyCreateRequest = (TagPolicyCreateRequest) o;
-    return Objects.equals(this.data, tagPolicyCreateRequest.data)
-        && Objects.equals(this.additionalProperties, tagPolicyCreateRequest.additionalProperties);
+    TagRuleScoreResponse tagRuleScoreResponse = (TagRuleScoreResponse) o;
+    return Objects.equals(this.data, tagRuleScoreResponse.data)
+        && Objects.equals(this.additionalProperties, tagRuleScoreResponse.additionalProperties);
   }
 
   @Override
@@ -127,7 +127,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyCreateRequest {\n");
+    sb.append("class TagRuleScoreResponse {\n");
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicySource.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleSource.java
similarity index 52%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicySource.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleSource.java
index fae2c66be0f..9c5b905d650 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicySource.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleSource.java
@@ -18,41 +18,39 @@
 import java.util.HashSet;
 import java.util.Set;
 
-/** The telemetry source that a tag policy applies to. */
-@JsonSerialize(using = TagPolicySource.TagPolicySourceSerializer.class)
-public class TagPolicySource extends ModelEnum<String> {
+/** The telemetry source that a tag rule applies to. */
+@JsonSerialize(using = TagRuleSource.TagRuleSourceSerializer.class)
+public class TagRuleSource extends ModelEnum<String> {
 
   private static final Set<String> allowedValues =
-      new HashSet<String>(Arrays.asList("logs", "spans", "metrics", "rum", "feed"));
+      new HashSet<String>(Arrays.asList("logs", "spans", "metrics"));
 
-  public static final TagPolicySource LOGS = new TagPolicySource("logs");
-  public static final TagPolicySource SPANS = new TagPolicySource("spans");
-  public static final TagPolicySource METRICS = new TagPolicySource("metrics");
-  public static final TagPolicySource RUM = new TagPolicySource("rum");
-  public static final TagPolicySource FEED = new TagPolicySource("feed");
+  public static final TagRuleSource LOGS = new TagRuleSource("logs");
+  public static final TagRuleSource SPANS = new TagRuleSource("spans");
+  public static final TagRuleSource METRICS = new TagRuleSource("metrics");
 
-  TagPolicySource(String value) {
+  TagRuleSource(String value) {
     super(value, allowedValues);
   }
 
-  public static class TagPolicySourceSerializer extends StdSerializer<TagPolicySource> {
-    public TagPolicySourceSerializer(Class<TagPolicySource> t) {
+  public static class TagRuleSourceSerializer extends StdSerializer<TagRuleSource> {
+    public TagRuleSourceSerializer(Class<TagRuleSource> t) {
       super(t);
     }
 
-    public TagPolicySourceSerializer() {
+    public TagRuleSourceSerializer() {
       this(null);
     }
 
     @Override
-    public void serialize(TagPolicySource value, JsonGenerator jgen, SerializerProvider provider)
+    public void serialize(TagRuleSource value, JsonGenerator jgen, SerializerProvider provider)
         throws IOException, JsonProcessingException {
       jgen.writeObject(value.value);
     }
   }
 
   @JsonCreator
-  public static TagPolicySource fromValue(String value) {
-    return new TagPolicySource(value);
+  public static TagRuleSource fromValue(String value) {
+    return new TagRuleSource(value);
   }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyType.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleType.java
similarity index 56%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyType.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleType.java
index fece6577b57..3dc191f3634 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyType.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleType.java
@@ -19,40 +19,40 @@
 import java.util.Set;
 
 /**
- * How the policy is enforced. <code>blocking</code> rejects telemetry that violates the policy.
- * <code>surfacing</code> only highlights non-compliant telemetry without blocking it.
+ * How the rule is enforced. <code>blocking</code> rejects telemetry that violates the rule. <code>
+ * surfacing</code> only highlights non-compliant telemetry without blocking it.
  */
-@JsonSerialize(using = TagPolicyType.TagPolicyTypeSerializer.class)
-public class TagPolicyType extends ModelEnum<String> {
+@JsonSerialize(using = TagRuleType.TagRuleTypeSerializer.class)
+public class TagRuleType extends ModelEnum<String> {
 
   private static final Set<String> allowedValues =
       new HashSet<String>(Arrays.asList("blocking", "surfacing"));
 
-  public static final TagPolicyType BLOCKING = new TagPolicyType("blocking");
-  public static final TagPolicyType SURFACING = new TagPolicyType("surfacing");
+  public static final TagRuleType BLOCKING = new TagRuleType("blocking");
+  public static final TagRuleType SURFACING = new TagRuleType("surfacing");
 
-  TagPolicyType(String value) {
+  TagRuleType(String value) {
     super(value, allowedValues);
   }
 
-  public static class TagPolicyTypeSerializer extends StdSerializer<TagPolicyType> {
-    public TagPolicyTypeSerializer(Class<TagPolicyType> t) {
+  public static class TagRuleTypeSerializer extends StdSerializer<TagRuleType> {
+    public TagRuleTypeSerializer(Class<TagRuleType> t) {
       super(t);
     }
 
-    public TagPolicyTypeSerializer() {
+    public TagRuleTypeSerializer() {
       this(null);
     }
 
     @Override
-    public void serialize(TagPolicyType value, JsonGenerator jgen, SerializerProvider provider)
+    public void serialize(TagRuleType value, JsonGenerator jgen, SerializerProvider provider)
         throws IOException, JsonProcessingException {
       jgen.writeObject(value.value);
     }
   }
 
   @JsonCreator
-  public static TagPolicyType fromValue(String value) {
-    return new TagPolicyType(value);
+  public static TagRuleType fromValue(String value) {
+    return new TagRuleType(value);
   }
 }
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateAttributes.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateAttributes.java
similarity index 73%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateAttributes.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateAttributes.java
index 0fafc50b784..d2588c6da75 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateAttributes.java
@@ -19,22 +19,22 @@
 import java.util.Objects;
 
 /**
- * Mutable attributes of a tag policy. Each field is optional; omitting a field leaves its current
- * value unchanged. The <code>source</code> of a policy cannot be changed.
+ * Mutable attributes of a tag rule. Each field is optional; omitting a field leaves its current
+ * value unchanged. The <code>source</code> of a rule cannot be changed.
  */
 @JsonPropertyOrder({
-  TagPolicyUpdateAttributes.JSON_PROPERTY_ENABLED,
-  TagPolicyUpdateAttributes.JSON_PROPERTY_NEGATED,
-  TagPolicyUpdateAttributes.JSON_PROPERTY_POLICY_NAME,
-  TagPolicyUpdateAttributes.JSON_PROPERTY_POLICY_TYPE,
-  TagPolicyUpdateAttributes.JSON_PROPERTY_REQUIRED,
-  TagPolicyUpdateAttributes.JSON_PROPERTY_SCOPE,
-  TagPolicyUpdateAttributes.JSON_PROPERTY_TAG_KEY,
-  TagPolicyUpdateAttributes.JSON_PROPERTY_TAG_VALUE_PATTERNS
+  TagRuleUpdateAttributes.JSON_PROPERTY_ENABLED,
+  TagRuleUpdateAttributes.JSON_PROPERTY_NEGATED,
+  TagRuleUpdateAttributes.JSON_PROPERTY_POLICY_NAME,
+  TagRuleUpdateAttributes.JSON_PROPERTY_POLICY_TYPE,
+  TagRuleUpdateAttributes.JSON_PROPERTY_REQUIRED,
+  TagRuleUpdateAttributes.JSON_PROPERTY_SCOPE,
+  TagRuleUpdateAttributes.JSON_PROPERTY_TAG_KEY,
+  TagRuleUpdateAttributes.JSON_PROPERTY_TAG_VALUE_PATTERNS
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyUpdateAttributes {
+public class TagRuleUpdateAttributes {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_ENABLED = "enabled";
   private Boolean enabled;
@@ -46,7 +46,7 @@ public class TagPolicyUpdateAttributes {
   private String policyName;
 
   public static final String JSON_PROPERTY_POLICY_TYPE = "policy_type";
-  private TagPolicyType policyType;
+  private TagRuleType policyType;
 
   public static final String JSON_PROPERTY_REQUIRED = "required";
   private Boolean required;
@@ -60,13 +60,13 @@ public class TagPolicyUpdateAttributes {
   public static final String JSON_PROPERTY_TAG_VALUE_PATTERNS = "tag_value_patterns";
   private List<String> tagValuePatterns = null;
 
-  public TagPolicyUpdateAttributes enabled(Boolean enabled) {
+  public TagRuleUpdateAttributes enabled(Boolean enabled) {
     this.enabled = enabled;
     return this;
   }
 
   /**
-   * Whether the policy is currently enforced.
+   * Whether the rule is currently enforced.
    *
    * @return enabled
    */
@@ -81,13 +81,13 @@ public void setEnabled(Boolean enabled) {
     this.enabled = enabled;
   }
 
-  public TagPolicyUpdateAttributes negated(Boolean negated) {
+  public TagRuleUpdateAttributes negated(Boolean negated) {
     this.negated = negated;
     return this;
   }
 
   /**
-   * When <code>true</code>, the policy matches tag values that do NOT match any of the supplied
+   * When <code>true</code>, the rule matches tag values that do NOT match any of the supplied
    * patterns.
    *
    * @return negated
@@ -103,13 +103,13 @@ public void setNegated(Boolean negated) {
     this.negated = negated;
   }
 
-  public TagPolicyUpdateAttributes policyName(String policyName) {
+  public TagRuleUpdateAttributes policyName(String policyName) {
     this.policyName = policyName;
     return this;
   }
 
   /**
-   * Human-readable name for the tag policy.
+   * Human-readable name for the tag rule.
    *
    * @return policyName
    */
@@ -124,14 +124,14 @@ public void setPolicyName(String policyName) {
     this.policyName = policyName;
   }
 
-  public TagPolicyUpdateAttributes policyType(TagPolicyType policyType) {
+  public TagRuleUpdateAttributes policyType(TagRuleType policyType) {
     this.policyType = policyType;
     this.unparsed |= !policyType.isValid();
     return this;
   }
 
   /**
-   * How the policy is enforced. <code>blocking</code> rejects telemetry that violates the policy.
+   * How the rule is enforced. <code>blocking</code> rejects telemetry that violates the rule.
    * <code>surfacing</code> only highlights non-compliant telemetry without blocking it.
    *
    * @return policyType
@@ -139,18 +139,18 @@ public TagPolicyUpdateAttributes policyType(TagPolicyType policyType) {
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_POLICY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public TagPolicyType getPolicyType() {
+  public TagRuleType getPolicyType() {
     return policyType;
   }
 
-  public void setPolicyType(TagPolicyType policyType) {
+  public void setPolicyType(TagRuleType policyType) {
     if (!policyType.isValid()) {
       this.unparsed = true;
     }
     this.policyType = policyType;
   }
 
-  public TagPolicyUpdateAttributes required(Boolean required) {
+  public TagRuleUpdateAttributes required(Boolean required) {
     this.required = required;
     return this;
   }
@@ -171,13 +171,13 @@ public void setRequired(Boolean required) {
     this.required = required;
   }
 
-  public TagPolicyUpdateAttributes scope(String scope) {
+  public TagRuleUpdateAttributes scope(String scope) {
     this.scope = scope;
     return this;
   }
 
   /**
-   * The scope the policy applies within.
+   * The scope the rule applies within.
    *
    * @return scope
    */
@@ -192,13 +192,13 @@ public void setScope(String scope) {
     this.scope = scope;
   }
 
-  public TagPolicyUpdateAttributes tagKey(String tagKey) {
+  public TagRuleUpdateAttributes tagKey(String tagKey) {
     this.tagKey = tagKey;
     return this;
   }
 
   /**
-   * The tag key that the policy governs.
+   * The tag key that the rule governs.
    *
    * @return tagKey
    */
@@ -213,12 +213,12 @@ public void setTagKey(String tagKey) {
     this.tagKey = tagKey;
   }
 
-  public TagPolicyUpdateAttributes tagValuePatterns(List<String> tagValuePatterns) {
+  public TagRuleUpdateAttributes tagValuePatterns(List<String> tagValuePatterns) {
     this.tagValuePatterns = tagValuePatterns;
     return this;
   }
 
-  public TagPolicyUpdateAttributes addTagValuePatternsItem(String tagValuePatternsItem) {
+  public TagRuleUpdateAttributes addTagValuePatternsItem(String tagValuePatternsItem) {
     if (this.tagValuePatterns == null) {
       this.tagValuePatterns = new ArrayList<>();
     }
@@ -254,10 +254,10 @@ public void setTagValuePatterns(List<String> tagValuePatterns) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyUpdateAttributes
+   * @return TagRuleUpdateAttributes
    */
   @JsonAnySetter
-  public TagPolicyUpdateAttributes putAdditionalProperty(String key, Object value) {
+  public TagRuleUpdateAttributes putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -288,7 +288,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyUpdateAttributes object is equal to o. */
+  /** Return true if this TagRuleUpdateAttributes object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -297,17 +297,16 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyUpdateAttributes tagPolicyUpdateAttributes = (TagPolicyUpdateAttributes) o;
-    return Objects.equals(this.enabled, tagPolicyUpdateAttributes.enabled)
-        && Objects.equals(this.negated, tagPolicyUpdateAttributes.negated)
-        && Objects.equals(this.policyName, tagPolicyUpdateAttributes.policyName)
-        && Objects.equals(this.policyType, tagPolicyUpdateAttributes.policyType)
-        && Objects.equals(this.required, tagPolicyUpdateAttributes.required)
-        && Objects.equals(this.scope, tagPolicyUpdateAttributes.scope)
-        && Objects.equals(this.tagKey, tagPolicyUpdateAttributes.tagKey)
-        && Objects.equals(this.tagValuePatterns, tagPolicyUpdateAttributes.tagValuePatterns)
-        && Objects.equals(
-            this.additionalProperties, tagPolicyUpdateAttributes.additionalProperties);
+    TagRuleUpdateAttributes tagRuleUpdateAttributes = (TagRuleUpdateAttributes) o;
+    return Objects.equals(this.enabled, tagRuleUpdateAttributes.enabled)
+        && Objects.equals(this.negated, tagRuleUpdateAttributes.negated)
+        && Objects.equals(this.policyName, tagRuleUpdateAttributes.policyName)
+        && Objects.equals(this.policyType, tagRuleUpdateAttributes.policyType)
+        && Objects.equals(this.required, tagRuleUpdateAttributes.required)
+        && Objects.equals(this.scope, tagRuleUpdateAttributes.scope)
+        && Objects.equals(this.tagKey, tagRuleUpdateAttributes.tagKey)
+        && Objects.equals(this.tagValuePatterns, tagRuleUpdateAttributes.tagValuePatterns)
+        && Objects.equals(this.additionalProperties, tagRuleUpdateAttributes.additionalProperties);
   }
 
   @Override
@@ -327,7 +326,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyUpdateAttributes {\n");
+    sb.append("class TagRuleUpdateAttributes {\n");
     sb.append("    enabled: ").append(toIndentedString(enabled)).append("\n");
     sb.append("    negated: ").append(toIndentedString(negated)).append("\n");
     sb.append("    policyName: ").append(toIndentedString(policyName)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateData.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateData.java
similarity index 73%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateData.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateData.java
index 4166fe752b5..8af719d1c4d 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateData.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateData.java
@@ -17,69 +17,69 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** Data object for updating a tag policy. */
+/** Data object for updating a tag rule. */
 @JsonPropertyOrder({
-  TagPolicyUpdateData.JSON_PROPERTY_ATTRIBUTES,
-  TagPolicyUpdateData.JSON_PROPERTY_ID,
-  TagPolicyUpdateData.JSON_PROPERTY_TYPE
+  TagRuleUpdateData.JSON_PROPERTY_ATTRIBUTES,
+  TagRuleUpdateData.JSON_PROPERTY_ID,
+  TagRuleUpdateData.JSON_PROPERTY_TYPE
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyUpdateData {
+public class TagRuleUpdateData {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
-  private TagPolicyUpdateAttributes attributes;
+  private TagRuleUpdateAttributes attributes;
 
   public static final String JSON_PROPERTY_ID = "id";
   private String id;
 
   public static final String JSON_PROPERTY_TYPE = "type";
-  private TagPolicyResourceType type;
+  private TagRuleResourceType type;
 
-  public TagPolicyUpdateData() {}
+  public TagRuleUpdateData() {}
 
   @JsonCreator
-  public TagPolicyUpdateData(
+  public TagRuleUpdateData(
       @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
-      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagPolicyResourceType type) {
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) TagRuleResourceType type) {
     this.id = id;
     this.type = type;
     this.unparsed |= !type.isValid();
   }
 
-  public TagPolicyUpdateData attributes(TagPolicyUpdateAttributes attributes) {
+  public TagRuleUpdateData attributes(TagRuleUpdateAttributes attributes) {
     this.attributes = attributes;
     this.unparsed |= attributes.unparsed;
     return this;
   }
 
   /**
-   * Mutable attributes of a tag policy. Each field is optional; omitting a field leaves its current
-   * value unchanged. The <code>source</code> of a policy cannot be changed.
+   * Mutable attributes of a tag rule. Each field is optional; omitting a field leaves its current
+   * value unchanged. The <code>source</code> of a rule cannot be changed.
    *
    * @return attributes
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public TagPolicyUpdateAttributes getAttributes() {
+  public TagRuleUpdateAttributes getAttributes() {
     return attributes;
   }
 
-  public void setAttributes(TagPolicyUpdateAttributes attributes) {
+  public void setAttributes(TagRuleUpdateAttributes attributes) {
     this.attributes = attributes;
     if (attributes != null) {
       this.unparsed |= attributes.unparsed;
     }
   }
 
-  public TagPolicyUpdateData id(String id) {
+  public TagRuleUpdateData id(String id) {
     this.id = id;
     return this;
   }
 
   /**
-   * The unique identifier of the tag policy being updated.
+   * The unique identifier of the tag rule being updated.
    *
    * @return id
    */
@@ -93,24 +93,24 @@ public void setId(String id) {
     this.id = id;
   }
 
-  public TagPolicyUpdateData type(TagPolicyResourceType type) {
+  public TagRuleUpdateData type(TagRuleResourceType type) {
     this.type = type;
     this.unparsed |= !type.isValid();
     return this;
   }
 
   /**
-   * JSON:API resource type for a tag policy.
+   * JSON:API resource type for a tag rule.
    *
    * @return type
    */
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyResourceType getType() {
+  public TagRuleResourceType getType() {
     return type;
   }
 
-  public void setType(TagPolicyResourceType type) {
+  public void setType(TagRuleResourceType type) {
     if (!type.isValid()) {
       this.unparsed = true;
     }
@@ -129,10 +129,10 @@ public void setType(TagPolicyResourceType type) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyUpdateData
+   * @return TagRuleUpdateData
    */
   @JsonAnySetter
-  public TagPolicyUpdateData putAdditionalProperty(String key, Object value) {
+  public TagRuleUpdateData putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -163,7 +163,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyUpdateData object is equal to o. */
+  /** Return true if this TagRuleUpdateData object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -172,11 +172,11 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyUpdateData tagPolicyUpdateData = (TagPolicyUpdateData) o;
-    return Objects.equals(this.attributes, tagPolicyUpdateData.attributes)
-        && Objects.equals(this.id, tagPolicyUpdateData.id)
-        && Objects.equals(this.type, tagPolicyUpdateData.type)
-        && Objects.equals(this.additionalProperties, tagPolicyUpdateData.additionalProperties);
+    TagRuleUpdateData tagRuleUpdateData = (TagRuleUpdateData) o;
+    return Objects.equals(this.attributes, tagRuleUpdateData.attributes)
+        && Objects.equals(this.id, tagRuleUpdateData.id)
+        && Objects.equals(this.type, tagRuleUpdateData.type)
+        && Objects.equals(this.additionalProperties, tagRuleUpdateData.additionalProperties);
   }
 
   @Override
@@ -187,7 +187,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyUpdateData {\n");
+    sb.append("class TagRuleUpdateData {\n");
     sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateRequest.java b/src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateRequest.java
similarity index 77%
rename from src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateRequest.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateRequest.java
index 2c783fdb80b..d5078c8acd0 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPolicyUpdateRequest.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRuleUpdateRequest.java
@@ -17,42 +17,42 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** Payload for updating an existing tag policy. Only the supplied fields are modified. */
-@JsonPropertyOrder({TagPolicyUpdateRequest.JSON_PROPERTY_DATA})
+/** Payload for updating an existing tag rule. Only the supplied fields are modified. */
+@JsonPropertyOrder({TagRuleUpdateRequest.JSON_PROPERTY_DATA})
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPolicyUpdateRequest {
+public class TagRuleUpdateRequest {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_DATA = "data";
-  private TagPolicyUpdateData data;
+  private TagRuleUpdateData data;
 
-  public TagPolicyUpdateRequest() {}
+  public TagRuleUpdateRequest() {}
 
   @JsonCreator
-  public TagPolicyUpdateRequest(
-      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) TagPolicyUpdateData data) {
+  public TagRuleUpdateRequest(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) TagRuleUpdateData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
   }
 
-  public TagPolicyUpdateRequest data(TagPolicyUpdateData data) {
+  public TagRuleUpdateRequest data(TagRuleUpdateData data) {
     this.data = data;
     this.unparsed |= data.unparsed;
     return this;
   }
 
   /**
-   * Data object for updating a tag policy.
+   * Data object for updating a tag rule.
    *
    * @return data
    */
   @JsonProperty(JSON_PROPERTY_DATA)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public TagPolicyUpdateData getData() {
+  public TagRuleUpdateData getData() {
     return data;
   }
 
-  public void setData(TagPolicyUpdateData data) {
+  public void setData(TagRuleUpdateData data) {
     this.data = data;
     if (data != null) {
       this.unparsed |= data.unparsed;
@@ -71,10 +71,10 @@ public void setData(TagPolicyUpdateData data) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPolicyUpdateRequest
+   * @return TagRuleUpdateRequest
    */
   @JsonAnySetter
-  public TagPolicyUpdateRequest putAdditionalProperty(String key, Object value) {
+  public TagRuleUpdateRequest putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -105,7 +105,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPolicyUpdateRequest object is equal to o. */
+  /** Return true if this TagRuleUpdateRequest object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -114,9 +114,9 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPolicyUpdateRequest tagPolicyUpdateRequest = (TagPolicyUpdateRequest) o;
-    return Objects.equals(this.data, tagPolicyUpdateRequest.data)
-        && Objects.equals(this.additionalProperties, tagPolicyUpdateRequest.additionalProperties);
+    TagRuleUpdateRequest tagRuleUpdateRequest = (TagRuleUpdateRequest) o;
+    return Objects.equals(this.data, tagRuleUpdateRequest.data)
+        && Objects.equals(this.additionalProperties, tagRuleUpdateRequest.additionalProperties);
   }
 
   @Override
@@ -127,7 +127,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPolicyUpdateRequest {\n");
+    sb.append("class TagRuleUpdateRequest {\n");
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
diff --git a/src/main/java/com/datadog/api/client/v2/model/TagPoliciesListResponse.java b/src/main/java/com/datadog/api/client/v2/model/TagRulesListResponse.java
similarity index 71%
rename from src/main/java/com/datadog/api/client/v2/model/TagPoliciesListResponse.java
rename to src/main/java/com/datadog/api/client/v2/model/TagRulesListResponse.java
index d4b4b55d7b2..bb27f82cc6c 100644
--- a/src/main/java/com/datadog/api/client/v2/model/TagPoliciesListResponse.java
+++ b/src/main/java/com/datadog/api/client/v2/model/TagRulesListResponse.java
@@ -19,77 +19,77 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** A page of tag policies. */
+/** A page of tag rules. */
 @JsonPropertyOrder({
-  TagPoliciesListResponse.JSON_PROPERTY_DATA,
-  TagPoliciesListResponse.JSON_PROPERTY_INCLUDED
+  TagRulesListResponse.JSON_PROPERTY_DATA,
+  TagRulesListResponse.JSON_PROPERTY_INCLUDED
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
-public class TagPoliciesListResponse {
+public class TagRulesListResponse {
   @JsonIgnore public boolean unparsed = false;
   public static final String JSON_PROPERTY_DATA = "data";
-  private List<TagPolicyData> data = new ArrayList<>();
+  private List<TagRuleData> data = new ArrayList<>();
 
   public static final String JSON_PROPERTY_INCLUDED = "included";
-  private List<TagPolicyScoreData> included = null;
+  private List<TagRuleScoreData> included = null;
 
-  public TagPoliciesListResponse() {}
+  public TagRulesListResponse() {}
 
   @JsonCreator
-  public TagPoliciesListResponse(
-      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) List<TagPolicyData> data) {
+  public TagRulesListResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) List<TagRuleData> data) {
     this.data = data;
-    for (TagPolicyData item : data) {
+    for (TagRuleData item : data) {
       this.unparsed |= item.unparsed;
     }
   }
 
-  public TagPoliciesListResponse data(List<TagPolicyData> data) {
+  public TagRulesListResponse data(List<TagRuleData> data) {
     this.data = data;
-    for (TagPolicyData item : data) {
+    for (TagRuleData item : data) {
       this.unparsed |= item.unparsed;
     }
     return this;
   }
 
-  public TagPoliciesListResponse addDataItem(TagPolicyData dataItem) {
+  public TagRulesListResponse addDataItem(TagRuleData dataItem) {
     this.data.add(dataItem);
     this.unparsed |= dataItem.unparsed;
     return this;
   }
 
   /**
-   * An array of tag policy data objects.
+   * An array of tag rule data objects.
    *
    * @return data
    */
   @JsonProperty(JSON_PROPERTY_DATA)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public List<TagPolicyData> getData() {
+  public List<TagRuleData> getData() {
     return data;
   }
 
-  public void setData(List<TagPolicyData> data) {
+  public void setData(List<TagRuleData> data) {
     this.data = data;
     if (data != null) {
-      for (TagPolicyData item : data) {
+      for (TagRuleData item : data) {
         this.unparsed |= item.unparsed;
       }
     }
   }
 
-  public TagPoliciesListResponse included(List<TagPolicyScoreData> included) {
+  public TagRulesListResponse included(List<TagRuleScoreData> included) {
     this.included = included;
     if (included != null) {
-      for (TagPolicyScoreData item : included) {
+      for (TagRuleScoreData item : included) {
         this.unparsed |= item.unparsed;
       }
     }
     return this;
   }
 
-  public TagPoliciesListResponse addIncludedItem(TagPolicyScoreData includedItem) {
+  public TagRulesListResponse addIncludedItem(TagRuleScoreData includedItem) {
     if (this.included == null) {
       this.included = new ArrayList<>();
     }
@@ -99,7 +99,7 @@ public TagPoliciesListResponse addIncludedItem(TagPolicyScoreData includedItem)
   }
 
   /**
-   * Related resources fetched alongside the primary tag policies. Populated when an <code>include
+   * Related resources fetched alongside the primary tag rules. Populated when an <code>include
    * </code> query parameter is supplied.
    *
    * @return included
@@ -107,14 +107,14 @@ public TagPoliciesListResponse addIncludedItem(TagPolicyScoreData includedItem)
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INCLUDED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public List<TagPolicyScoreData> getIncluded() {
+  public List<TagRuleScoreData> getIncluded() {
     return included;
   }
 
-  public void setIncluded(List<TagPolicyScoreData> included) {
+  public void setIncluded(List<TagRuleScoreData> included) {
     this.included = included;
     if (included != null) {
-      for (TagPolicyScoreData item : included) {
+      for (TagRuleScoreData item : included) {
         this.unparsed |= item.unparsed;
       }
     }
@@ -132,10 +132,10 @@ public void setIncluded(List<TagPolicyScoreData> included) {
    *
    * @param key The arbitrary key to set
    * @param value The associated value
-   * @return TagPoliciesListResponse
+   * @return TagRulesListResponse
    */
   @JsonAnySetter
-  public TagPoliciesListResponse putAdditionalProperty(String key, Object value) {
+  public TagRulesListResponse putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
       this.additionalProperties = new HashMap<String, Object>();
     }
@@ -166,7 +166,7 @@ public Object getAdditionalProperty(String key) {
     return this.additionalProperties.get(key);
   }
 
-  /** Return true if this TagPoliciesListResponse object is equal to o. */
+  /** Return true if this TagRulesListResponse object is equal to o. */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -175,10 +175,10 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TagPoliciesListResponse tagPoliciesListResponse = (TagPoliciesListResponse) o;
-    return Objects.equals(this.data, tagPoliciesListResponse.data)
-        && Objects.equals(this.included, tagPoliciesListResponse.included)
-        && Objects.equals(this.additionalProperties, tagPoliciesListResponse.additionalProperties);
+    TagRulesListResponse tagRulesListResponse = (TagRulesListResponse) o;
+    return Objects.equals(this.data, tagRulesListResponse.data)
+        && Objects.equals(this.included, tagRulesListResponse.included)
+        && Objects.equals(this.additionalProperties, tagRulesListResponse.additionalProperties);
   }
 
   @Override
@@ -189,7 +189,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TagPoliciesListResponse {\n");
+    sb.append("class TagRulesListResponse {\n");
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    included: ").append(toIndentedString(included)).append("\n");
     sb.append("    additionalProperties: ")
diff --git a/src/test/resources/com/datadog/api/client/v2/api/tag_policies.feature b/src/test/resources/com/datadog/api/client/v2/api/tag_rules.feature
similarity index 60%
rename from src/test/resources/com/datadog/api/client/v2/api/tag_policies.feature
rename to src/test/resources/com/datadog/api/client/v2/api/tag_rules.feature
index b5d064c202e..a78d0357e31 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/tag_policies.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/tag_rules.feature
@@ -1,149 +1,149 @@
-@endpoint(tag-policies) @endpoint(tag-policies-v2)
-Feature: Tag Policies
-  Tag Policies define rules that govern which tag values are accepted for a
+@endpoint(tag-rules) @endpoint(tag-rules-v2)
+Feature: Tag Rules
+  Tag Rules define rules that govern which tag values are accepted for a
   given tag key, scoped to a particular telemetry source (such as logs,
-  spans, or metrics). Policies can be `blocking` (data not matching the
-  policy is rejected) or `surfacing` (matching data is highlighted but not
-  blocked). Each policy reports a compliance `score` derived from how much
-  recent telemetry adheres to the policy.
+  spans, or metrics). Rules can be `blocking` (data not matching the rule is
+  rejected) or `surfacing` (matching data is highlighted but not blocked).
+  Each rule reports a compliance `score` derived from how much recent
+  telemetry adheres to the rule.
 
   Background:
     Given a valid "apiKeyAuth" key in the system
     And a valid "appKeyAuth" key in the system
-    And an instance of "TagPolicies" API
+    And an instance of "TagRules" API
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Create a tag policy returns "Bad Request" response
-    Given operation "CreateTagPolicy" enabled
-    And new "CreateTagPolicy" request
+  Scenario: Create a tag rule returns "Bad Request" response
+    Given operation "CreateTagRule" enabled
+    And new "CreateTagRule" request
     And body with value {"data": {"attributes": {"enabled": true, "negated": false, "policy_name": "Service tag must be one of api or web", "policy_type": "surfacing", "required": true, "scope": "env", "source": "logs", "tag_key": "service", "tag_value_patterns": ["api", "web"]}, "type": "tag_policy"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Create a tag policy returns "Conflict" response
-    Given operation "CreateTagPolicy" enabled
-    And new "CreateTagPolicy" request
+  Scenario: Create a tag rule returns "Conflict" response
+    Given operation "CreateTagRule" enabled
+    And new "CreateTagRule" request
     And body with value {"data": {"attributes": {"enabled": true, "negated": false, "policy_name": "Service tag must be one of api or web", "policy_type": "surfacing", "required": true, "scope": "env", "source": "logs", "tag_key": "service", "tag_value_patterns": ["api", "web"]}, "type": "tag_policy"}}
     When the request is sent
     Then the response status is 409 Conflict
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Create a tag policy returns "Created" response
-    Given operation "CreateTagPolicy" enabled
-    And new "CreateTagPolicy" request
+  Scenario: Create a tag rule returns "Created" response
+    Given operation "CreateTagRule" enabled
+    And new "CreateTagRule" request
     And body with value {"data": {"attributes": {"enabled": true, "negated": false, "policy_name": "Service tag must be one of api or web", "policy_type": "surfacing", "required": true, "scope": "env", "source": "logs", "tag_key": "service", "tag_value_patterns": ["api", "web"]}, "type": "tag_policy"}}
     When the request is sent
     Then the response status is 201 Created
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Delete a tag policy returns "Bad Request" response
-    Given operation "DeleteTagPolicy" enabled
-    And new "DeleteTagPolicy" request
+  Scenario: Delete a tag rule returns "Bad Request" response
+    Given operation "DeleteTagRule" enabled
+    And new "DeleteTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Delete a tag policy returns "No Content" response
-    Given operation "DeleteTagPolicy" enabled
-    And new "DeleteTagPolicy" request
+  Scenario: Delete a tag rule returns "No Content" response
+    Given operation "DeleteTagRule" enabled
+    And new "DeleteTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 204 No Content
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Delete a tag policy returns "Not Found" response
-    Given operation "DeleteTagPolicy" enabled
-    And new "DeleteTagPolicy" request
+  Scenario: Delete a tag rule returns "Not Found" response
+    Given operation "DeleteTagRule" enabled
+    And new "DeleteTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Get a tag policy compliance score returns "Bad Request" response
-    Given operation "GetTagPolicyScore" enabled
-    And new "GetTagPolicyScore" request
+  Scenario: Get a tag rule compliance score returns "Bad Request" response
+    Given operation "GetTagRuleScore" enabled
+    And new "GetTagRuleScore" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Get a tag policy compliance score returns "Not Found" response
-    Given operation "GetTagPolicyScore" enabled
-    And new "GetTagPolicyScore" request
+  Scenario: Get a tag rule compliance score returns "Not Found" response
+    Given operation "GetTagRuleScore" enabled
+    And new "GetTagRuleScore" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Get a tag policy compliance score returns "OK" response
-    Given operation "GetTagPolicyScore" enabled
-    And new "GetTagPolicyScore" request
+  Scenario: Get a tag rule compliance score returns "OK" response
+    Given operation "GetTagRuleScore" enabled
+    And new "GetTagRuleScore" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Get a tag policy returns "Bad Request" response
-    Given operation "GetTagPolicy" enabled
-    And new "GetTagPolicy" request
+  Scenario: Get a tag rule returns "Bad Request" response
+    Given operation "GetTagRule" enabled
+    And new "GetTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Get a tag policy returns "Not Found" response
-    Given operation "GetTagPolicy" enabled
-    And new "GetTagPolicy" request
+  Scenario: Get a tag rule returns "Not Found" response
+    Given operation "GetTagRule" enabled
+    And new "GetTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Get a tag policy returns "OK" response
-    Given operation "GetTagPolicy" enabled
-    And new "GetTagPolicy" request
+  Scenario: Get a tag rule returns "OK" response
+    Given operation "GetTagRule" enabled
+    And new "GetTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: List tag policies returns "Bad Request" response
-    Given operation "ListTagPolicies" enabled
-    And new "ListTagPolicies" request
+  Scenario: List tag rules returns "Bad Request" response
+    Given operation "ListTagRules" enabled
+    And new "ListTagRules" request
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: List tag policies returns "OK" response
-    Given operation "ListTagPolicies" enabled
-    And new "ListTagPolicies" request
+  Scenario: List tag rules returns "OK" response
+    Given operation "ListTagRules" enabled
+    And new "ListTagRules" request
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Update a tag policy returns "Bad Request" response
-    Given operation "UpdateTagPolicy" enabled
-    And new "UpdateTagPolicy" request
+  Scenario: Update a tag rule returns "Bad Request" response
+    Given operation "UpdateTagRule" enabled
+    And new "UpdateTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     And body with value {"data": {"attributes": {"policy_type": "surfacing", "tag_value_patterns": []}, "id": "123", "type": "tag_policy"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Update a tag policy returns "Not Found" response
-    Given operation "UpdateTagPolicy" enabled
-    And new "UpdateTagPolicy" request
+  Scenario: Update a tag rule returns "Not Found" response
+    Given operation "UpdateTagRule" enabled
+    And new "UpdateTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     And body with value {"data": {"attributes": {"policy_type": "surfacing", "tag_value_patterns": []}, "id": "123", "type": "tag_policy"}}
     When the request is sent
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/aaa-governance-console
-  Scenario: Update a tag policy returns "OK" response
-    Given operation "UpdateTagPolicy" enabled
-    And new "UpdateTagPolicy" request
+  Scenario: Update a tag rule returns "OK" response
+    Given operation "UpdateTagRule" enabled
+    And new "UpdateTagRule" request
     And request contains "policy_id" parameter from "REPLACE.ME"
     And body with value {"data": {"attributes": {"policy_type": "surfacing", "tag_value_patterns": []}, "id": "123", "type": "tag_policy"}}
     When the request is sent
diff --git a/src/test/resources/com/datadog/api/client/v2/api/undo.json b/src/test/resources/com/datadog/api/client/v2/api/undo.json
index 9903d959ffb..3afad07d1d3 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/undo.json
+++ b/src/test/resources/com/datadog/api/client/v2/api/undo.json
@@ -9448,16 +9448,16 @@
       "type": "safe"
     }
   },
-  "ListTagPolicies": {
-    "tag": "Tag Policies",
+  "ListTagRules": {
+    "tag": "Tag Rules",
     "undo": {
       "type": "safe"
     }
   },
-  "CreateTagPolicy": {
-    "tag": "Tag Policies",
+  "CreateTagRule": {
+    "tag": "Tag Rules",
     "undo": {
-      "operationId": "DeleteTagPolicy",
+      "operationId": "DeleteTagRule",
       "parameters": [
         {
           "name": "policy_id",
@@ -9467,26 +9467,26 @@
       "type": "unsafe"
     }
   },
-  "DeleteTagPolicy": {
-    "tag": "Tag Policies",
+  "DeleteTagRule": {
+    "tag": "Tag Rules",
     "undo": {
       "type": "idempotent"
     }
   },
-  "GetTagPolicy": {
-    "tag": "Tag Policies",
+  "GetTagRule": {
+    "tag": "Tag Rules",
     "undo": {
       "type": "safe"
     }
   },
-  "UpdateTagPolicy": {
-    "tag": "Tag Policies",
+  "UpdateTagRule": {
+    "tag": "Tag Rules",
     "undo": {
       "type": "idempotent"
     }
   },
-  "GetTagPolicyScore": {
-    "tag": "Tag Policies",
+  "GetTagRuleScore": {
+    "tag": "Tag Rules",
     "undo": {
       "type": "safe"
     }