diff --git a/.apigentools-info b/.apigentools-info
index 1090e6148da7..a8e7c315ff94 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-10 16:48:54.777541",
-            "spec_repo_commit": "56b8bb9b"
+            "regenerated": "2024-10-10 18:55:09.560778",
+            "spec_repo_commit": "1bd8568a"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-10 16:48:54.796558",
-            "spec_repo_commit": "56b8bb9b"
+            "regenerated": "2024-10-10 18:55:09.580319",
+            "spec_repo_commit": "1bd8568a"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index ca35a1fcefa7..c592c7ff2864 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -203,7 +203,7 @@ components:
       schema:
         type: string
     EntityID:
-      description: UUID or Entity Ref
+      description: UUID or Entity Ref.
       in: path
       name: entity_id
       required: true
@@ -232,41 +232,41 @@ components:
       schema:
         type: string
     FilterByExcludeSnapshot:
-      description: Filter entities by excluding snapshotted entities
+      description: Filter entities by excluding snapshotted entities.
       in: query
-      name: fitler[exclude_snapshot]
+      name: filter[exclude_snapshot]
       required: false
       schema:
         type: string
     FilterByID:
-      description: Filter entities by UUID
+      description: Filter entities by UUID.
       explode: true
       in: query
-      name: fitler[id]
+      name: filter[id]
       required: false
       schema:
         type: string
     FilterByKind:
-      description: Filter entities by kind
+      description: Filter entities by kind.
       explode: true
       in: query
-      name: fitler[kind]
+      name: filter[kind]
       required: false
       schema:
         type: string
     FilterByName:
-      description: Filter entities by name
+      description: Filter entities by name.
       explode: true
       in: query
-      name: fitler[name]
+      name: filter[name]
       required: false
       schema:
         type: string
     FilterByOwner:
-      description: Filter entities by owner
+      description: Filter entities by owner.
       explode: true
       in: query
-      name: fitler[owner]
+      name: filter[owner]
       required: false
       schema:
         type: string
@@ -274,15 +274,15 @@ components:
       description: Filter entities by reference
       explode: true
       in: query
-      name: fitler[ref]
+      name: filter[ref]
       required: false
       schema:
         type: string
     FilterByRelationType:
-      description: Filter entities by relation type
+      description: Filter entities by relation type.
       explode: true
       in: query
-      name: fitler[relation][type]
+      name: filter[relation][type]
       required: false
       schema:
         $ref: '#/components/schemas/RelationType'
@@ -422,7 +422,7 @@ components:
       schema:
         type: string
     Include:
-      description: include relationship data
+      description: Include relationship data.
       explode: true
       in: query
       name: include
@@ -7680,7 +7680,7 @@ components:
       description: Entity attributes.
       properties:
         apiVersion:
-          description: The api version.
+          description: The API version.
           type: string
         description:
           description: The description.
@@ -7712,7 +7712,7 @@ components:
         attributes:
           $ref: '#/components/schemas/EntityAttributes'
         id:
-          description: Entity id.
+          description: Entity ID.
           type: string
         meta:
           $ref: '#/components/schemas/EntityMeta'
@@ -7739,7 +7739,7 @@ components:
           type: string
       type: object
     EntityRaw:
-      description: Entity definition in raw JSON/YAML representation.
+      description: Entity definition in raw JSON or YAML representation.
       example: "apiVersion: v3\nkind: service\nmetadata:\n  name: myservice\n"
       type: string
     EntityRelationships:
@@ -7767,7 +7767,7 @@ components:
         attributes:
           $ref: '#/components/schemas/EntityResponseIncludedRelatedIncidentAttributes'
         id:
-          description: Incident id.
+          description: Incident ID.
           type: string
         type:
           description: Incident description.
@@ -7791,7 +7791,7 @@ components:
         attributes:
           $ref: '#/components/schemas/EntityResponseIncludedRawSchemaAttributes'
         id:
-          description: Raw schema id.
+          description: Raw schema ID.
           type: string
         type:
           description: Raw schema type.
@@ -7882,7 +7882,7 @@ components:
           type: string
       type: object
     EntityResponseIncludedRelatedOncallEscalationItem:
-      description: Oncall escalation
+      description: Oncall escalation.
       properties:
         email:
           description: Oncall email.
@@ -7896,7 +7896,7 @@ components:
           type: string
       type: object
     EntityResponseIncludedRelatedOncallEscalations:
-      description: Oncall escalations
+      description: Oncall escalations.
       items:
         $ref: '#/components/schemas/EntityResponseIncludedRelatedOncallEscalationItem'
       type: array
@@ -7906,7 +7906,7 @@ components:
         attributes:
           $ref: '#/components/schemas/EntityResponseIncludedSchemaAttributes'
         id:
-          description: Entity id.
+          description: Entity ID.
           type: string
         type:
           description: Schema type.
@@ -7969,7 +7969,7 @@ components:
       - $ref: '#/components/schemas/EntityV3System'
     EntityV3APIVersion:
       description: The schema version of entity type. The field is known as schema-version
-        in the previous version
+        in the previous version.
       enum:
       - v3
       example: v3
@@ -7978,21 +7978,21 @@ components:
       - V3
     EntityV3DatadogCodeLocationItem:
       additionalProperties: false
-      description: code location item.
+      description: Code location item.
       properties:
         paths:
-          description: The paths (glob) to the source code of the service
+          description: The paths (glob) to the source code of the service.
           items:
             type: string
           type: array
         repositoryURL:
-          description: The repository path of the source code of the entity
+          description: The repository path of the source code of the entity.
           pattern: url
           type: string
       type: object
     EntityV3DatadogCodeLocations:
       additionalProperties: false
-      description: Schema for mapping source code locations to an entity
+      description: Schema for mapping source code locations to an entity.
       items:
         $ref: '#/components/schemas/EntityV3DatadogCodeLocationItem'
       type: array
@@ -8001,28 +8001,28 @@ components:
       description: Events association item.
       properties:
         name:
-          description: The name of the query
+          description: The name of the query.
           type: string
         query:
-          description: The query to run
+          description: The query to run.
           type: string
       type: object
     EntityV3DatadogEvents:
       additionalProperties: false
-      description: Events associations
+      description: Events associations.
       items:
         $ref: '#/components/schemas/EntityV3DatadogEventItem'
       type: array
     EntityV3DatadogIntegrationOpsgenie:
       additionalProperties: false
-      description: An Opsgenie integration schema
+      description: An Opsgenie integration schema.
       properties:
         region:
           description: The region for the Opsgenie integration.
           minLength: 1
           type: string
         serviceURL:
-          description: The service url for the Opsgenie integration.
+          description: The service URL for the Opsgenie integration.
           example: https://www.opsgenie.com/service/shopping-cart
           minLength: 1
           type: string
@@ -8031,10 +8031,10 @@ components:
       type: object
     EntityV3DatadogIntegrationPagerduty:
       additionalProperties: false
-      description: An PagerDuty integration schema
+      description: A PagerDuty integration schema.
       properties:
         serviceURL:
-          description: The service url for the PagerDuty integration.
+          description: The service URL for the PagerDuty integration.
           example: https://www.pagerduty.com/service-directory/Pshopping-cart
           minLength: 1
           type: string
@@ -8043,46 +8043,46 @@ components:
       type: object
     EntityV3DatadogLogItem:
       additionalProperties: false
-      description: log association item.
+      description: Log association item.
       properties:
         name:
-          description: The name of the query
+          description: The name of the query.
           type: string
         query:
-          description: The query to run
+          description: The query to run.
           type: string
       type: object
     EntityV3DatadogLogs:
       additionalProperties: false
-      description: Logs association
+      description: Logs association.
       items:
         $ref: '#/components/schemas/EntityV3DatadogLogItem'
       type: array
     EntityV3DatadogPerformance:
       additionalProperties: false
-      description: Performance stats association
+      description: Performance stats association.
       properties:
         tags:
           description: A list of APM entity tags that associates the APM Stats data
-            with the entity
+            with the entity.
           items:
             type: string
           type: array
       type: object
     EntityV3DatadogPipelines:
       additionalProperties: false
-      description: CI Pipelines association
+      description: CI Pipelines association.
       properties:
         fingerprints:
           description: A list of CI Fingerprints that associate CI Pipelines with
-            the entity
+            the entity.
           items:
             type: string
           type: array
       type: object
     EntityV3Datastore:
       additionalProperties: false
-      description: Schema for datastore entities
+      description: Schema for datastore entities.
       properties:
         apiVersion:
           $ref: '#/components/schemas/EntityV3APIVersion'
@@ -8108,7 +8108,7 @@ components:
       type: object
     EntityV3DatastoreDatadog:
       additionalProperties: false
-      description: Datadog product integrations for the datastore entity
+      description: Datadog product integrations for the datastore entity.
       properties:
         events:
           $ref: '#/components/schemas/EntityV3DatadogEvents'
@@ -8134,16 +8134,16 @@ components:
           minLength: 1
           type: string
         tier:
-          description: The importance of the datastore
+          description: The importance of the datastore.
           minLength: 1
           type: string
         type:
-          description: The type of datastore
+          description: The type of datastore.
           type: string
       type: object
     EntityV3Integrations:
       additionalProperties: false
-      description: A base schema for defining third party integrations
+      description: A base schema for defining third-party integrations.
       properties:
         opsgenie:
           $ref: '#/components/schemas/EntityV3DatadogIntegrationOpsgenie'
@@ -8156,23 +8156,23 @@ components:
       properties:
         additionalOwners:
           additionalProperties: false
-          description: The additional owners of the entity, usually a team
+          description: The additional owners of the entity, usually a team.
           items:
             $ref: '#/components/schemas/EntityV3MetadataAdditionalOwnersItems'
           type: array
         contacts:
           additionalProperties: false
-          description: A list of contacts for the entity
+          description: A list of contacts for the entity.
           items:
             $ref: '#/components/schemas/EntityV3MetadataContactsItems'
           type: array
         description:
           description: Short description of the entity. The UI can leverage the description
-            for display
+            for display.
           type: string
         displayName:
           description: User friendly name of the entity. The UI can leverage the display
-            name for display
+            name for display.
           type: string
         id:
           description: A read-only globally unique identifier for the entity generated
@@ -8186,7 +8186,7 @@ components:
           type: string
         links:
           additionalProperties: false
-          description: A list of links for the entity
+          description: A list of links for the entity.
           items:
             $ref: '#/components/schemas/EntityV3MetadataLinksItems'
           type: array
@@ -8196,20 +8196,20 @@ components:
             Datadog.  User supplied values are ignored.
           type: object
         name:
-          description: 'Unique name given to an entity under the kind/namespace '
+          description: Unique name given to an entity under the kind/namespace.
           example: myService
           minLength: 1
           type: string
         namespace:
           description: Namespace is a part of unique identifier. It has a default
-            value of 'default'
+            value of 'default'.
           example: default
           minLength: 1
           type: string
         owner:
           $ref: '#/components/schemas/EntityV3MetadataOwner'
         tags:
-          description: A set of custom tags
+          description: A set of custom tags.
           example:
           - this:tag
           - that:tag
@@ -8223,11 +8223,11 @@ components:
       description: The definition of Entity V3 Metadata Additional Owners Items object.
       properties:
         name:
-          description: Team name
+          description: Team name.
           example: ''
           type: string
         type:
-          description: Team type
+          description: Team type.
           type: string
       required:
       - name
@@ -8236,11 +8236,11 @@ components:
       description: The definition of Entity V3 Metadata Contacts Items object.
       properties:
         contact:
-          description: Contact value
+          description: Contact value.
           example: https://slack/
           type: string
         name:
-          description: Contact name
+          description: Contact name.
           minLength: 2
           type: string
         type:
@@ -8256,7 +8256,7 @@ components:
       description: The definition of Entity V3 Metadata Links Items object.
       properties:
         name:
-          description: Link name
+          description: Link name.
           example: mylink
           type: string
         provider:
@@ -8268,7 +8268,7 @@ components:
           example: link
           type: string
         url:
-          description: Link url
+          description: Link URL.
           example: https://mylink
           type: string
       required:
@@ -8278,14 +8278,14 @@ components:
       type: object
     EntityV3MetadataOwner:
       additionalProperties: false
-      description: The owner of the entity, usually a team
+      description: The owner of the entity, usually a team.
       properties:
         name:
-          description: Team name
+          description: Team name.
           type: string
     EntityV3Queue:
       additionalProperties: false
-      description: Schema for queue entities
+      description: Schema for queue entities.
       properties:
         apiVersion:
           $ref: '#/components/schemas/EntityV3APIVersion'
@@ -8293,8 +8293,8 @@ components:
           $ref: '#/components/schemas/EntityV3QueueDatadog'
         extensions:
           additionalProperties: {}
-          description: Custom extensions. This is the free-formed field to send client
-            side metadata. No Datadog features are affected by this field.
+          description: Custom extensions. This is the free-formed field to send client-side
+            metadata. No Datadog features are affected by this field.
           type: object
         integrations:
           $ref: '#/components/schemas/EntityV3Integrations'
@@ -8311,7 +8311,7 @@ components:
       type: object
     EntityV3QueueDatadog:
       additionalProperties: false
-      description: Datadog product integrations for the datastore entity
+      description: Datadog product integrations for the datastore entity.
       properties:
         events:
           $ref: '#/components/schemas/EntityV3DatadogEvents'
@@ -8337,16 +8337,16 @@ components:
           minLength: 1
           type: string
         tier:
-          description: The importance of the queue
+          description: The importance of the queue.
           minLength: 1
           type: string
         type:
-          description: The type of queue
+          description: The type of queue.
           type: string
       type: object
     EntityV3Service:
       additionalProperties: false
-      description: Schema for service entities
+      description: Schema for service entities.
       properties:
         apiVersion:
           $ref: '#/components/schemas/EntityV3APIVersion'
@@ -8354,8 +8354,8 @@ components:
           $ref: '#/components/schemas/EntityV3ServiceDatadog'
         extensions:
           additionalProperties: {}
-          description: Custom extensions. This is the free-formed field to send client
-            side metadata. No Datadog features are affected by this field.
+          description: Custom extensions. This is the free-formed field to send client-side
+            metadata. No Datadog features are affected by this field.
           type: object
         integrations:
           $ref: '#/components/schemas/EntityV3Integrations'
@@ -8372,7 +8372,7 @@ components:
       type: object
     EntityV3ServiceDatadog:
       additionalProperties: false
-      description: Datadog product integrations for the service entity
+      description: Datadog product integrations for the service entity.
       properties:
         codeLocations:
           $ref: '#/components/schemas/EntityV3DatadogCodeLocations'
@@ -8398,7 +8398,7 @@ components:
       description: The definition of Entity V3 Service Spec object.
       properties:
         dependsOn:
-          description: A list of components the service depends on
+          description: A list of components the service depends on.
           items:
             type: string
           type: array
@@ -8412,16 +8412,16 @@ components:
           minLength: 1
           type: string
         tier:
-          description: The importance of the component
+          description: The importance of the component.
           minLength: 1
           type: string
         type:
-          description: The type of service
+          description: The type of service.
           type: string
       type: object
     EntityV3System:
       additionalProperties: false
-      description: Schema for system entities
+      description: Schema for system entities.
       properties:
         apiVersion:
           $ref: '#/components/schemas/EntityV3APIVersion'
@@ -8429,8 +8429,8 @@ components:
           $ref: '#/components/schemas/EntityV3SystemDatadog'
         extensions:
           additionalProperties: {}
-          description: Custom extensions. This is the free-formed field to send client
-            side metadata. No Datadog features are affected by this field.
+          description: Custom extensions. This is the free-formed field to send client-side
+            metadata. No Datadog features are affected by this field.
           type: object
         integrations:
           $ref: '#/components/schemas/EntityV3Integrations'
@@ -8447,7 +8447,7 @@ components:
       type: object
     EntityV3SystemDatadog:
       additionalProperties: false
-      description: Datadog product integrations for the service entity
+      description: Datadog product integrations for the service entity.
       properties:
         events:
           $ref: '#/components/schemas/EntityV3DatadogEvents'
@@ -12040,7 +12040,7 @@ components:
       - data
       type: object
     IncludeType:
-      description: supported include types.
+      description: Supported include types.
       enum:
       - schema
       - raw_schema
@@ -12376,13 +12376,13 @@ components:
       description: List entity response links.
       properties:
         next:
-          description: next link.
+          description: Next link.
           type: string
         previous:
-          description: previous link.
+          description: Previous link.
           type: string
         self:
-          description: current link.
+          description: Current link.
           type: string
       type: object
     ListFindingsData:
@@ -17792,7 +17792,7 @@ components:
           type: string
       type: object
     RelationType:
-      description: supported relation types
+      description: Supported relation types.
       enum:
       - RelationTypeOwns
       - RelationTypeOwnedBy
@@ -17825,7 +17825,7 @@ components:
       description: Relationship entry.
       properties:
         id:
-          description: Associated data id.
+          description: Associated data ID.
           type: string
         type:
           description: Relationship type.
@@ -24872,7 +24872,7 @@ components:
           $ref: '#/components/schemas/RuleType'
       type: object
     UpsertCatalogEntityRequest:
-      description: Create / Update entity request.
+      description: Create or update entity request.
       oneOf:
       - $ref: '#/components/schemas/EntityV3'
       - $ref: '#/components/schemas/EntityRaw'
@@ -27540,7 +27540,7 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/UpsertCatalogEntityRequest'
-        description: Entity YAML/JSON.
+        description: Entity YAML or JSON.
         required: true
       responses:
         '202':
@@ -41603,7 +41603,7 @@ tags:
     This feature is currently in BETA. If you have any feedback, contact [Datadog
     support](https://docs.datadoghq.com/help/).'
   name: Service Scorecards
-- description: API to create, update, retrieve and delete Software Catalog entities.
+- description: API to create, update, retrieve, and delete Software Catalog entities.
   externalDocs:
     url: https://docs.datadoghq.com/service_catalog/service_definitions#metadata-schema-v30-beta
   name: Software Catalog
diff --git a/features/scenarios_model_mapping.rb b/features/scenarios_model_mapping.rb
index 58b4b704f8f8..7ebbf68ba166 100644
--- a/features/scenarios_model_mapping.rb
+++ b/features/scenarios_model_mapping.rb
@@ -1023,13 +1023,13 @@
     "v2.ListCatalogEntity" => {
             "page_offset" => "Integer",
             "page_limit" => "Integer",
-            "fitler_id" => "String",
-            "fitler_ref" => "String",
-            "fitler_name" => "String",
-            "fitler_kind" => "String",
-            "fitler_owner" => "String",
-            "fitler_relation_type" => "RelationType",
-            "fitler_exclude_snapshot" => "String",
+            "filter_id" => "String",
+            "filter_ref" => "String",
+            "filter_name" => "String",
+            "filter_kind" => "String",
+            "filter_owner" => "String",
+            "filter_relation_type" => "RelationType",
+            "filter_exclude_snapshot" => "String",
             "include" => "IncludeType",
     },
     "v2.UpsertCatalogEntity" => {
diff --git a/features/v2/software_catalog.feature b/features/v2/software_catalog.feature
index e90278e37347..1dd3e479bb93 100644
--- a/features/v2/software_catalog.feature
+++ b/features/v2/software_catalog.feature
@@ -1,6 +1,6 @@
 @endpoint(software-catalog) @endpoint(software-catalog-v2)
 Feature: Software Catalog
-  API to create, update, retrieve and delete Software Catalog entities.
+  API to create, update, retrieve, and delete Software Catalog entities.
 
   Background:
     Given a valid "apiKeyAuth" key in the system
diff --git a/lib/datadog_api_client/v2/api/software_catalog_api.rb b/lib/datadog_api_client/v2/api/software_catalog_api.rb
index c72d30f656f1..e3ad299f752a 100644
--- a/lib/datadog_api_client/v2/api/software_catalog_api.rb
+++ b/lib/datadog_api_client/v2/api/software_catalog_api.rb
@@ -35,7 +35,7 @@ def delete_catalog_entity(entity_id, opts = {})
     #
     # Delete a single entity in Software Catalog.
     #
-    # @param entity_id [String] UUID or Entity Ref
+    # @param entity_id [String] UUID or Entity Ref.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def delete_catalog_entity_with_http_info(entity_id, opts = {})
@@ -103,14 +103,14 @@ def list_catalog_entity(opts = {})
     # @param opts [Hash] the optional parameters
     # @option opts [Integer] :page_offset Specific offset to use as the beginning of the returned page.
     # @option opts [Integer] :page_limit Maximum number of entities in the response.
-    # @option opts [String] :fitler_id Filter entities by UUID
-    # @option opts [String] :fitler_ref Filter entities by reference
-    # @option opts [String] :fitler_name Filter entities by name
-    # @option opts [String] :fitler_kind Filter entities by kind
-    # @option opts [String] :fitler_owner Filter entities by owner
-    # @option opts [RelationType] :fitler_relation_type Filter entities by relation type
-    # @option opts [String] :fitler_exclude_snapshot Filter entities by excluding snapshotted entities
-    # @option opts [IncludeType] :include include relationship data
+    # @option opts [String] :filter_id Filter entities by UUID.
+    # @option opts [String] :filter_ref Filter entities by reference
+    # @option opts [String] :filter_name Filter entities by name.
+    # @option opts [String] :filter_kind Filter entities by kind.
+    # @option opts [String] :filter_owner Filter entities by owner.
+    # @option opts [RelationType] :filter_relation_type Filter entities by relation type.
+    # @option opts [String] :filter_exclude_snapshot Filter entities by excluding snapshotted entities.
+    # @option opts [IncludeType] :include Include relationship data.
     # @return [Array<(ListEntityCatalogResponse, Integer, Hash)>] ListEntityCatalogResponse data, response status code and response headers
     def list_catalog_entity_with_http_info(opts = {})
 
@@ -118,8 +118,8 @@ def list_catalog_entity_with_http_info(opts = {})
         @api_client.config.logger.debug 'Calling API: SoftwareCatalogAPI.list_catalog_entity ...'
       end
       allowable_values = ['RelationTypeOwns', 'RelationTypeOwnedBy', 'RelationTypeDependsOn', 'RelationTypeDependencyOf', 'RelationTypePartsOf', 'RelationTypeHasPart', 'RelationTypeOtherOwns', 'RelationTypeOtherOwnedBy', 'RelationTypeImplementedBy', 'RelationTypeImplements']
-      if @api_client.config.client_side_validation && opts[:'fitler_relation_type'] && !allowable_values.include?(opts[:'fitler_relation_type'])
-        fail ArgumentError, "invalid value for \"fitler_relation_type\", must be one of #{allowable_values}"
+      if @api_client.config.client_side_validation && opts[:'filter_relation_type'] && !allowable_values.include?(opts[:'filter_relation_type'])
+        fail ArgumentError, "invalid value for \"filter_relation_type\", must be one of #{allowable_values}"
       end
       allowable_values = ['schema', 'raw_schema', 'oncall', 'incident', 'relation']
       if @api_client.config.client_side_validation && opts[:'include'] && !allowable_values.include?(opts[:'include'])
@@ -132,13 +132,13 @@ def list_catalog_entity_with_http_info(opts = {})
       query_params = opts[:query_params] || {}
       query_params[:'page[offset]'] = opts[:'page_offset'] if !opts[:'page_offset'].nil?
       query_params[:'page[limit]'] = opts[:'page_limit'] if !opts[:'page_limit'].nil?
-      query_params[:'fitler[id]'] = opts[:'fitler_id'] if !opts[:'fitler_id'].nil?
-      query_params[:'fitler[ref]'] = opts[:'fitler_ref'] if !opts[:'fitler_ref'].nil?
-      query_params[:'fitler[name]'] = opts[:'fitler_name'] if !opts[:'fitler_name'].nil?
-      query_params[:'fitler[kind]'] = opts[:'fitler_kind'] if !opts[:'fitler_kind'].nil?
-      query_params[:'fitler[owner]'] = opts[:'fitler_owner'] if !opts[:'fitler_owner'].nil?
-      query_params[:'fitler[relation][type]'] = opts[:'fitler_relation_type'] if !opts[:'fitler_relation_type'].nil?
-      query_params[:'fitler[exclude_snapshot]'] = opts[:'fitler_exclude_snapshot'] if !opts[:'fitler_exclude_snapshot'].nil?
+      query_params[:'filter[id]'] = opts[:'filter_id'] if !opts[:'filter_id'].nil?
+      query_params[:'filter[ref]'] = opts[:'filter_ref'] if !opts[:'filter_ref'].nil?
+      query_params[:'filter[name]'] = opts[:'filter_name'] if !opts[:'filter_name'].nil?
+      query_params[:'filter[kind]'] = opts[:'filter_kind'] if !opts[:'filter_kind'].nil?
+      query_params[:'filter[owner]'] = opts[:'filter_owner'] if !opts[:'filter_owner'].nil?
+      query_params[:'filter[relation][type]'] = opts[:'filter_relation_type'] if !opts[:'filter_relation_type'].nil?
+      query_params[:'filter[exclude_snapshot]'] = opts[:'filter_exclude_snapshot'] if !opts[:'filter_exclude_snapshot'].nil?
       query_params[:'include'] = opts[:'include'] if !opts[:'include'].nil?
 
       # header parameters
@@ -210,7 +210,7 @@ def upsert_catalog_entity(body, opts = {})
     #
     # Create or update entities in Software Catalog.
     #
-    # @param body [UpsertCatalogEntityRequest] Entity YAML/JSON.
+    # @param body [UpsertCatalogEntityRequest] Entity YAML or JSON.
     # @param opts [Hash] the optional parameters
     # @return [Array<(UpsertCatalogEntityResponse, Integer, Hash)>] UpsertCatalogEntityResponse data, response status code and response headers
     def upsert_catalog_entity_with_http_info(body, opts = {})
diff --git a/lib/datadog_api_client/v2/models/entity_attributes.rb b/lib/datadog_api_client/v2/models/entity_attributes.rb
index d6565a1dbf73..71aa6a6f4ee7 100644
--- a/lib/datadog_api_client/v2/models/entity_attributes.rb
+++ b/lib/datadog_api_client/v2/models/entity_attributes.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityAttributes
     include BaseGenericModel
 
-    # The api version.
+    # The API version.
     attr_accessor :api_version
 
     # The description.
diff --git a/lib/datadog_api_client/v2/models/entity_data.rb b/lib/datadog_api_client/v2/models/entity_data.rb
index 134ed8c6af46..296ad9ba2fd7 100644
--- a/lib/datadog_api_client/v2/models/entity_data.rb
+++ b/lib/datadog_api_client/v2/models/entity_data.rb
@@ -24,7 +24,7 @@ class EntityData
     # Entity attributes.
     attr_accessor :attributes
 
-    # Entity id.
+    # Entity ID.
     attr_accessor :id
 
     # Entity metadata.
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_incident.rb b/lib/datadog_api_client/v2/models/entity_response_included_incident.rb
index cbe39a7f25fa..886305853903 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_incident.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_incident.rb
@@ -24,7 +24,7 @@ class EntityResponseIncludedIncident
     # Incident attributes.
     attr_accessor :attributes
 
-    # Incident id.
+    # Incident ID.
     attr_accessor :id
 
     # Incident description.
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_raw_schema.rb b/lib/datadog_api_client/v2/models/entity_response_included_raw_schema.rb
index e0f961c8edcf..4c5650474503 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_raw_schema.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_raw_schema.rb
@@ -24,7 +24,7 @@ class EntityResponseIncludedRawSchema
     # Included raw schema attributes.
     attr_accessor :attributes
 
-    # Raw schema id.
+    # Raw schema ID.
     attr_accessor :id
 
     # Raw schema type.
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_related_oncall_attributes.rb b/lib/datadog_api_client/v2/models/entity_response_included_related_oncall_attributes.rb
index 43baacac6505..5b76cafd4717 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_related_oncall_attributes.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_related_oncall_attributes.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityResponseIncludedRelatedOncallAttributes
     include BaseGenericModel
 
-    # Oncall escalations
+    # Oncall escalations.
     attr_accessor :escalations
 
     # Oncall provider.
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_related_oncall_escalation_item.rb b/lib/datadog_api_client/v2/models/entity_response_included_related_oncall_escalation_item.rb
index 9bcd1be48599..9a2b9a23d7de 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_related_oncall_escalation_item.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_related_oncall_escalation_item.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Oncall escalation
+  # Oncall escalation.
   class EntityResponseIncludedRelatedOncallEscalationItem
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/entity_response_included_schema.rb b/lib/datadog_api_client/v2/models/entity_response_included_schema.rb
index 1f6d50700121..69bbc66bc3e6 100644
--- a/lib/datadog_api_client/v2/models/entity_response_included_schema.rb
+++ b/lib/datadog_api_client/v2/models/entity_response_included_schema.rb
@@ -24,7 +24,7 @@ class EntityResponseIncludedSchema
     # Included schema.
     attr_accessor :attributes
 
-    # Entity id.
+    # Entity ID.
     attr_accessor :id
 
     # Schema type.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_api_version.rb b/lib/datadog_api_client/v2/models/entity_v3_api_version.rb
index fbdac27672e2..152114532d9c 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_api_version.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_api_version.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # The schema version of entity type. The field is known as schema-version in the previous version
+  # The schema version of entity type. The field is known as schema-version in the previous version.
   class EntityV3APIVersion
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datadog_code_location_item.rb b/lib/datadog_api_client/v2/models/entity_v3_datadog_code_location_item.rb
index cb3de2fafa85..64f2f8006c0e 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datadog_code_location_item.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datadog_code_location_item.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # code location item.
+  # Code location item.
   class EntityV3DatadogCodeLocationItem
     include BaseGenericModel
 
-    # The paths (glob) to the source code of the service
+    # The paths (glob) to the source code of the service.
     attr_accessor :paths
 
-    # The repository path of the source code of the entity
+    # The repository path of the source code of the entity.
     attr_reader :repository_url
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datadog_event_item.rb b/lib/datadog_api_client/v2/models/entity_v3_datadog_event_item.rb
index 08f5d7a5dded..35bef6ff71fd 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datadog_event_item.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datadog_event_item.rb
@@ -21,10 +21,10 @@ module DatadogAPIClient::V2
   class EntityV3DatadogEventItem
     include BaseGenericModel
 
-    # The name of the query
+    # The name of the query.
     attr_accessor :name
 
-    # The query to run
+    # The query to run.
     attr_accessor :query
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datadog_integration_opsgenie.rb b/lib/datadog_api_client/v2/models/entity_v3_datadog_integration_opsgenie.rb
index b43db7071fe3..1c710dc5729f 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datadog_integration_opsgenie.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datadog_integration_opsgenie.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # An Opsgenie integration schema
+  # An Opsgenie integration schema.
   class EntityV3DatadogIntegrationOpsgenie
     include BaseGenericModel
 
     # The region for the Opsgenie integration.
     attr_reader :region
 
-    # The service url for the Opsgenie integration.
+    # The service URL for the Opsgenie integration.
     attr_reader :service_url
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datadog_integration_pagerduty.rb b/lib/datadog_api_client/v2/models/entity_v3_datadog_integration_pagerduty.rb
index b1541176c6de..23d6efcffea6 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datadog_integration_pagerduty.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datadog_integration_pagerduty.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # An PagerDuty integration schema
+  # A PagerDuty integration schema.
   class EntityV3DatadogIntegrationPagerduty
     include BaseGenericModel
 
-    # The service url for the PagerDuty integration.
+    # The service URL for the PagerDuty integration.
     attr_reader :service_url
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datadog_log_item.rb b/lib/datadog_api_client/v2/models/entity_v3_datadog_log_item.rb
index 2cb3b9776b54..3c5e631919ee 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datadog_log_item.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datadog_log_item.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # log association item.
+  # Log association item.
   class EntityV3DatadogLogItem
     include BaseGenericModel
 
-    # The name of the query
+    # The name of the query.
     attr_accessor :name
 
-    # The query to run
+    # The query to run.
     attr_accessor :query
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datadog_performance.rb b/lib/datadog_api_client/v2/models/entity_v3_datadog_performance.rb
index 9a22b7b0c8ab..887017face07 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datadog_performance.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datadog_performance.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Performance stats association
+  # Performance stats association.
   class EntityV3DatadogPerformance
     include BaseGenericModel
 
-    # A list of APM entity tags that associates the APM Stats data with the entity
+    # A list of APM entity tags that associates the APM Stats data with the entity.
     attr_accessor :tags
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datadog_pipelines.rb b/lib/datadog_api_client/v2/models/entity_v3_datadog_pipelines.rb
index 27643a8165b7..bcff29a94135 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datadog_pipelines.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datadog_pipelines.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # CI Pipelines association
+  # CI Pipelines association.
   class EntityV3DatadogPipelines
     include BaseGenericModel
 
-    # A list of CI Fingerprints that associate CI Pipelines with the entity
+    # A list of CI Fingerprints that associate CI Pipelines with the entity.
     attr_accessor :fingerprints
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datastore.rb b/lib/datadog_api_client/v2/models/entity_v3_datastore.rb
index 4067f38711c7..1d158f349a98 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datastore.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datastore.rb
@@ -17,20 +17,20 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Schema for datastore entities
+  # Schema for datastore entities.
   class EntityV3Datastore
     include BaseGenericModel
 
-    # The schema version of entity type. The field is known as schema-version in the previous version
+    # The schema version of entity type. The field is known as schema-version in the previous version.
     attr_reader :api_version
 
-    # Datadog product integrations for the datastore entity
+    # Datadog product integrations for the datastore entity.
     attr_accessor :datadog
 
     # Custom extensions. This is the free-formed field to send client side metadata. No Datadog features are affected by this field.
     attr_accessor :extensions
 
-    # A base schema for defining third party integrations
+    # A base schema for defining third-party integrations.
     attr_accessor :integrations
 
     # The definition of Entity V3 Datastore Kind object.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datastore_datadog.rb b/lib/datadog_api_client/v2/models/entity_v3_datastore_datadog.rb
index d0c7fae63b60..46ce4ad797dd 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datastore_datadog.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datastore_datadog.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Datadog product integrations for the datastore entity
+  # Datadog product integrations for the datastore entity.
   class EntityV3DatastoreDatadog
     include BaseGenericModel
 
-    # Events associations
+    # Events associations.
     attr_accessor :events
 
-    # Logs association
+    # Logs association.
     attr_accessor :logs
 
-    # Performance stats association
+    # Performance stats association.
     attr_accessor :performance_data
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_datastore_spec.rb b/lib/datadog_api_client/v2/models/entity_v3_datastore_spec.rb
index 8cb8d9c3df4b..9c8bc69b59e9 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_datastore_spec.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_datastore_spec.rb
@@ -24,10 +24,10 @@ class EntityV3DatastoreSpec
     # The lifecycle state of the datastore.
     attr_reader :lifecycle
 
-    # The importance of the datastore
+    # The importance of the datastore.
     attr_reader :tier
 
-    # The type of datastore
+    # The type of datastore.
     attr_accessor :type
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_integrations.rb b/lib/datadog_api_client/v2/models/entity_v3_integrations.rb
index 4c871002fdc9..cf8ebe13872b 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_integrations.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_integrations.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A base schema for defining third party integrations
+  # A base schema for defining third-party integrations.
   class EntityV3Integrations
     include BaseGenericModel
 
-    # An Opsgenie integration schema
+    # An Opsgenie integration schema.
     attr_accessor :opsgenie
 
-    # An PagerDuty integration schema
+    # A PagerDuty integration schema.
     attr_accessor :pagerduty
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_metadata.rb b/lib/datadog_api_client/v2/models/entity_v3_metadata.rb
index db21bb0d25ed..39b8d1586302 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_metadata.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_metadata.rb
@@ -21,16 +21,16 @@ module DatadogAPIClient::V2
   class EntityV3Metadata
     include BaseGenericModel
 
-    # The additional owners of the entity, usually a team
+    # The additional owners of the entity, usually a team.
     attr_accessor :additional_owners
 
-    # A list of contacts for the entity
+    # A list of contacts for the entity.
     attr_accessor :contacts
 
-    # Short description of the entity. The UI can leverage the description for display
+    # Short description of the entity. The UI can leverage the description for display.
     attr_accessor :description
 
-    # User friendly name of the entity. The UI can leverage the display name for display
+    # User friendly name of the entity. The UI can leverage the display name for display.
     attr_accessor :display_name
 
     # A read-only globally unique identifier for the entity generated by Datadog.  User supplied values are ignored.
@@ -39,22 +39,22 @@ class EntityV3Metadata
     # The entity reference from which to inherit metadata
     attr_accessor :inherit_from
 
-    # A list of links for the entity
+    # A list of links for the entity.
     attr_accessor :links
 
     # A read-only set of Datadog managed attributes generated by Datadog.  User supplied values are ignored.
     attr_accessor :managed
 
-    # Unique name given to an entity under the kind/namespace
+    # Unique name given to an entity under the kind/namespace.
     attr_reader :name
 
-    # Namespace is a part of unique identifier. It has a default value of 'default'
+    # Namespace is a part of unique identifier. It has a default value of 'default'.
     attr_reader :namespace
 
-    # The owner of the entity, usually a team
+    # The owner of the entity, usually a team.
     attr_accessor :owner
 
-    # A set of custom tags
+    # A set of custom tags.
     attr_accessor :tags
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_metadata_additional_owners_items.rb b/lib/datadog_api_client/v2/models/entity_v3_metadata_additional_owners_items.rb
index 0a43b11e0021..3b0a25d9d7ca 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_metadata_additional_owners_items.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_metadata_additional_owners_items.rb
@@ -21,10 +21,10 @@ module DatadogAPIClient::V2
   class EntityV3MetadataAdditionalOwnersItems
     include BaseGenericModel
 
-    # Team name
+    # Team name.
     attr_reader :name
 
-    # Team type
+    # Team type.
     attr_accessor :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/entity_v3_metadata_contacts_items.rb b/lib/datadog_api_client/v2/models/entity_v3_metadata_contacts_items.rb
index ac43551252ca..35d9e879691b 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_metadata_contacts_items.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_metadata_contacts_items.rb
@@ -21,10 +21,10 @@ module DatadogAPIClient::V2
   class EntityV3MetadataContactsItems
     include BaseGenericModel
 
-    # Contact value
+    # Contact value.
     attr_reader :contact
 
-    # Contact name
+    # Contact name.
     attr_reader :name
 
     # Contact type.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_metadata_links_items.rb b/lib/datadog_api_client/v2/models/entity_v3_metadata_links_items.rb
index 366dea28f0da..18816f2e39f9 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_metadata_links_items.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_metadata_links_items.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityV3MetadataLinksItems
     include BaseGenericModel
 
-    # Link name
+    # Link name.
     attr_reader :name
 
     # Link provider.
@@ -30,7 +30,7 @@ class EntityV3MetadataLinksItems
     # Link type.
     attr_reader :type
 
-    # Link url
+    # Link URL.
     attr_reader :url
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_metadata_owner.rb b/lib/datadog_api_client/v2/models/entity_v3_metadata_owner.rb
index cddd04672381..a8357b3dff01 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_metadata_owner.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_metadata_owner.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # The owner of the entity, usually a team
+  # The owner of the entity, usually a team.
   class EntityV3MetadataOwner
     include BaseGenericModel
 
-    # Team name
+    # Team name.
     attr_accessor :name
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_queue.rb b/lib/datadog_api_client/v2/models/entity_v3_queue.rb
index bc3997d7576c..2e227adb5014 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_queue.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_queue.rb
@@ -17,20 +17,20 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Schema for queue entities
+  # Schema for queue entities.
   class EntityV3Queue
     include BaseGenericModel
 
-    # The schema version of entity type. The field is known as schema-version in the previous version
+    # The schema version of entity type. The field is known as schema-version in the previous version.
     attr_reader :api_version
 
-    # Datadog product integrations for the datastore entity
+    # Datadog product integrations for the datastore entity.
     attr_accessor :datadog
 
-    # Custom extensions. This is the free-formed field to send client side metadata. No Datadog features are affected by this field.
+    # Custom extensions. This is the free-formed field to send client-side metadata. No Datadog features are affected by this field.
     attr_accessor :extensions
 
-    # A base schema for defining third party integrations
+    # A base schema for defining third-party integrations.
     attr_accessor :integrations
 
     # The definition of Entity V3 Queue Kind object.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_queue_datadog.rb b/lib/datadog_api_client/v2/models/entity_v3_queue_datadog.rb
index d91920848f56..c1a0ec5d6d9c 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_queue_datadog.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_queue_datadog.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Datadog product integrations for the datastore entity
+  # Datadog product integrations for the datastore entity.
   class EntityV3QueueDatadog
     include BaseGenericModel
 
-    # Events associations
+    # Events associations.
     attr_accessor :events
 
-    # Logs association
+    # Logs association.
     attr_accessor :logs
 
-    # Performance stats association
+    # Performance stats association.
     attr_accessor :performance_data
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_queue_spec.rb b/lib/datadog_api_client/v2/models/entity_v3_queue_spec.rb
index 01232df3cd0a..dc009bafc18e 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_queue_spec.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_queue_spec.rb
@@ -24,10 +24,10 @@ class EntityV3QueueSpec
     # The lifecycle state of the queue.
     attr_reader :lifecycle
 
-    # The importance of the queue
+    # The importance of the queue.
     attr_reader :tier
 
-    # The type of queue
+    # The type of queue.
     attr_accessor :type
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_service.rb b/lib/datadog_api_client/v2/models/entity_v3_service.rb
index b01545113afd..13bb13cb8f98 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_service.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_service.rb
@@ -17,20 +17,20 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Schema for service entities
+  # Schema for service entities.
   class EntityV3Service
     include BaseGenericModel
 
-    # The schema version of entity type. The field is known as schema-version in the previous version
+    # The schema version of entity type. The field is known as schema-version in the previous version.
     attr_reader :api_version
 
-    # Datadog product integrations for the service entity
+    # Datadog product integrations for the service entity.
     attr_accessor :datadog
 
-    # Custom extensions. This is the free-formed field to send client side metadata. No Datadog features are affected by this field.
+    # Custom extensions. This is the free-formed field to send client-side metadata. No Datadog features are affected by this field.
     attr_accessor :extensions
 
-    # A base schema for defining third party integrations
+    # A base schema for defining third-party integrations.
     attr_accessor :integrations
 
     # The definition of Entity V3 Service Kind object.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_service_datadog.rb b/lib/datadog_api_client/v2/models/entity_v3_service_datadog.rb
index 9e422657e29a..92f2a3bda909 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_service_datadog.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_service_datadog.rb
@@ -17,23 +17,23 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Datadog product integrations for the service entity
+  # Datadog product integrations for the service entity.
   class EntityV3ServiceDatadog
     include BaseGenericModel
 
-    # Schema for mapping source code locations to an entity
+    # Schema for mapping source code locations to an entity.
     attr_accessor :code_locations
 
-    # Events associations
+    # Events associations.
     attr_accessor :events
 
-    # Logs association
+    # Logs association.
     attr_accessor :logs
 
-    # Performance stats association
+    # Performance stats association.
     attr_accessor :performance_data
 
-    # CI Pipelines association
+    # CI Pipelines association.
     attr_accessor :pipelines
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_service_spec.rb b/lib/datadog_api_client/v2/models/entity_v3_service_spec.rb
index 8918d4618adc..9b88daaf2e1e 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_service_spec.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_service_spec.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class EntityV3ServiceSpec
     include BaseGenericModel
 
-    # A list of components the service depends on
+    # A list of components the service depends on.
     attr_accessor :depends_on
 
     # The service's programming language.
@@ -30,10 +30,10 @@ class EntityV3ServiceSpec
     # The lifecycle state of the component.
     attr_reader :lifecycle
 
-    # The importance of the component
+    # The importance of the component.
     attr_reader :tier
 
-    # The type of service
+    # The type of service.
     attr_accessor :type
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_system.rb b/lib/datadog_api_client/v2/models/entity_v3_system.rb
index fb3963508c1a..0c57ad7b2f63 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_system.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_system.rb
@@ -17,20 +17,20 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Schema for system entities
+  # Schema for system entities.
   class EntityV3System
     include BaseGenericModel
 
-    # The schema version of entity type. The field is known as schema-version in the previous version
+    # The schema version of entity type. The field is known as schema-version in the previous version.
     attr_reader :api_version
 
-    # Datadog product integrations for the service entity
+    # Datadog product integrations for the service entity.
     attr_accessor :datadog
 
-    # Custom extensions. This is the free-formed field to send client side metadata. No Datadog features are affected by this field.
+    # Custom extensions. This is the free-formed field to send client-side metadata. No Datadog features are affected by this field.
     attr_accessor :extensions
 
-    # A base schema for defining third party integrations
+    # A base schema for defining third-party integrations.
     attr_accessor :integrations
 
     # The definition of Entity V3 System Kind object.
diff --git a/lib/datadog_api_client/v2/models/entity_v3_system_datadog.rb b/lib/datadog_api_client/v2/models/entity_v3_system_datadog.rb
index fb300b31b427..958dd244d33b 100644
--- a/lib/datadog_api_client/v2/models/entity_v3_system_datadog.rb
+++ b/lib/datadog_api_client/v2/models/entity_v3_system_datadog.rb
@@ -17,20 +17,20 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Datadog product integrations for the service entity
+  # Datadog product integrations for the service entity.
   class EntityV3SystemDatadog
     include BaseGenericModel
 
-    # Events associations
+    # Events associations.
     attr_accessor :events
 
-    # Logs association
+    # Logs association.
     attr_accessor :logs
 
-    # Performance stats association
+    # Performance stats association.
     attr_accessor :performance_data
 
-    # CI Pipelines association
+    # CI Pipelines association.
     attr_accessor :pipelines
 
     # Attribute mapping from ruby-style variable name to JSON key.
diff --git a/lib/datadog_api_client/v2/models/include_type.rb b/lib/datadog_api_client/v2/models/include_type.rb
index c60f73e18204..26e5d1a7d1c0 100644
--- a/lib/datadog_api_client/v2/models/include_type.rb
+++ b/lib/datadog_api_client/v2/models/include_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # supported include types.
+  # Supported include types.
   class IncludeType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/list_entity_catalog_response_links.rb b/lib/datadog_api_client/v2/models/list_entity_catalog_response_links.rb
index a7bccb807bfa..7a79d5f124c3 100644
--- a/lib/datadog_api_client/v2/models/list_entity_catalog_response_links.rb
+++ b/lib/datadog_api_client/v2/models/list_entity_catalog_response_links.rb
@@ -21,13 +21,13 @@ module DatadogAPIClient::V2
   class ListEntityCatalogResponseLinks
     include BaseGenericModel
 
-    # next link.
+    # Next link.
     attr_accessor :_next
 
-    # previous link.
+    # Previous link.
     attr_accessor :previous
 
-    # current link.
+    # Current link.
     attr_accessor :_self
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/relation_type.rb b/lib/datadog_api_client/v2/models/relation_type.rb
index 1fa3eaaff607..df36f09fb74e 100644
--- a/lib/datadog_api_client/v2/models/relation_type.rb
+++ b/lib/datadog_api_client/v2/models/relation_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # supported relation types
+  # Supported relation types.
   class RelationType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/relationship_item.rb b/lib/datadog_api_client/v2/models/relationship_item.rb
index 00f1fff65136..a20ebacca742 100644
--- a/lib/datadog_api_client/v2/models/relationship_item.rb
+++ b/lib/datadog_api_client/v2/models/relationship_item.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class RelationshipItem
     include BaseGenericModel
 
-    # Associated data id.
+    # Associated data ID.
     attr_accessor :id
 
     # Relationship type.
diff --git a/lib/datadog_api_client/v2/models/upsert_catalog_entity_request.rb b/lib/datadog_api_client/v2/models/upsert_catalog_entity_request.rb
index a0e073dfb066..186c4cd8a40d 100644
--- a/lib/datadog_api_client/v2/models/upsert_catalog_entity_request.rb
+++ b/lib/datadog_api_client/v2/models/upsert_catalog_entity_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Create / Update entity request.
+  # Create or update entity request.
   module UpsertCatalogEntityRequest
     class << self
       include BaseOneOfModel