diff --git a/static/api-specs/idn/sailpoint-api.v3.yaml b/static/api-specs/idn/sailpoint-api.v3.yaml
index 9b06ef488..ae1bf8f52 100644
--- a/static/api-specs/idn/sailpoint-api.v3.yaml
+++ b/static/api-specs/idn/sailpoint-api.v3.yaml
@@ -743,9 +743,9 @@ components:
     AccessRequestItem:
       $ref: "./v3/schemas/AccessRequestItem.yaml"
     AccessProfileDocument:
-      $ref: "./v3/schemas/search/model/access/profile/AccessProfile.yaml"
+      $ref: "./v3/schemas/search/model/access/profile/AccessProfileDocument.yaml"
     AccessProfileSummary:
-      $ref: "./v3/schemas/search/model/access/AccessProfile.yaml"
+      $ref: "./v3/schemas/search/model/access/AccessProfileSummary.yaml"
     AccessReviewReassignment:
       $ref: "./v3/schemas/ReviewReassign.yaml"
     Account:
@@ -753,11 +753,11 @@ components:
     AccountActivity:
       $ref: "./v3/schemas/AccountActivity.yaml"
     AccountActivitySearchedItem:
-      $ref: "./v3/schemas/search/model/account/activity/AccountActivity.yaml"
+      $ref: "./v3/schemas/search/model/account/activity/AccountActivityDocument.yaml"
     AccountAttributes:
       $ref: "./v3/schemas/AccountAttributes.yaml"
     AccountDocument:
-      $ref: "./v3/schemas/search/model/account/Account.yaml"
+      $ref: "./v3/schemas/search/model/account/AccountDocument.yaml"
     AccountsAsyncResult:
       $ref: "./v3/schemas/AccountsAsyncResult.yaml"
     AccountToggleRequest:
@@ -765,7 +765,7 @@ components:
     AccountUnlockRequest:
       $ref: "./v3/schemas/AccountUnlockRequest.yaml"
     Aggregation:
-      $ref: "./v3/schemas/search/model/aggregation/Aggregation.yaml"
+      $ref: "./v3/schemas/search/model/aggregation/AggregationDocument.yaml"
     ApprovalItems:
       $ref: "./v3/schemas/ApprovalItemDetails.yaml"
     Campaign:
@@ -775,13 +775,13 @@ components:
     CertificationReference:
       $ref: "./v3/schemas/CertificationReference.yaml"
     EntitlementDocument:
-      $ref: "./v3/schemas/search/model/entitlement/Entitlement.yaml"
+      $ref: "./v3/schemas/search/model/entitlement/EntitlementDocument.yaml"
     EntitlementSummary:
-      $ref: "./v3/schemas/search/model/access/Entitlement.yaml"
+      $ref: "./v3/schemas/search/model/access/AccessProfileEntitlement.yaml"
     Event:
-      $ref: "./v3/schemas/search/model/event/Event.yaml"
+      $ref: "./v3/schemas/search/model/event/EventDocument.yaml"
     IdentityDocument:
-      $ref: "./v3/schemas/search/model/identity/Identity.yaml"
+      $ref: "./v3/schemas/search/model/identity/IdentityDocument.yaml"
     IdentityProfile:
       $ref: "./v3/schemas/IdentityProfile.yaml"
     IdentityReferenceWithNameAndEmail:
@@ -807,9 +807,9 @@ components:
     Reviewer:
       $ref: "./v3/schemas/Reviewer.yaml"
     RoleDocument:
-      $ref: "./v3/schemas/search/model/role/Role.yaml"
+      $ref: "./v3/schemas/search/model/role/RoleDocument.yaml"
     RoleSummary:
-      $ref: "./v3/schemas/search/model/access/Role.yaml"
+      $ref: "./v3/schemas/search/model/access/AccessProfileRole.yaml"
     SearchDocument:
       $ref: "./v3/schemas/search/documents/SearchDocument.yaml"
     SavedSearch:
diff --git a/static/api-specs/idn/v3/paths/saved-searches.yaml b/static/api-specs/idn/v3/paths/saved-searches.yaml
index fbf0a33aa..279cc0d14 100644
--- a/static/api-specs/idn/v3/paths/saved-searches.yaml
+++ b/static/api-specs/idn/v3/paths/saved-searches.yaml
@@ -11,8 +11,8 @@ post:
       application/json:
         schema:
           allOf:
-          - $ref: '../schemas/search/saved/Name.yaml'
-          - $ref: '../schemas/search/saved/Search.yaml'
+          - $ref: '../schemas/search/saved/SavedSearchName.yaml'
+          - $ref: '../schemas/search/saved/SavedSearchDetail.yaml'
     required: true
   responses:
     '201':
diff --git a/static/api-specs/idn/v3/paths/scheduled-searches.yaml b/static/api-specs/idn/v3/paths/scheduled-searches.yaml
index a9da5e5bf..9257f4d5c 100644
--- a/static/api-specs/idn/v3/paths/scheduled-searches.yaml
+++ b/static/api-specs/idn/v3/paths/scheduled-searches.yaml
@@ -11,8 +11,8 @@ post:
       application/json:
         schema:
           allOf:
-          - $ref: '../schemas/search/scheduled/Name.yaml'
-          - $ref: '../schemas/search/scheduled/Schedule.yaml'
+          - $ref: '../schemas/search/scheduled/ScheduledSearchName.yaml'
+          - $ref: '../schemas/search/scheduled/SearchSchedule.yaml'
         examples:
           Daily Search:
             description: A search that executes each day at a 9 AM
diff --git a/static/api-specs/idn/v3/schemas/access/ApprovalScheme.yaml b/static/api-specs/idn/v3/schemas/access/AccessProfileApprovalScheme.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/access/ApprovalScheme.yaml
rename to static/api-specs/idn/v3/schemas/access/AccessProfileApprovalScheme.yaml
diff --git a/static/api-specs/idn/v3/schemas/access/Requestability.yaml b/static/api-specs/idn/v3/schemas/access/Requestability.yaml
index 2d482ee86..a7624b513 100644
--- a/static/api-specs/idn/v3/schemas/access/Requestability.yaml
+++ b/static/api-specs/idn/v3/schemas/access/Requestability.yaml
@@ -12,5 +12,5 @@ properties:
     type: array
     description: List describing the steps in approving the request
     items:
-      $ref: './ApprovalScheme.yaml'
+      $ref: './AccessProfileApprovalScheme.yaml'
 
diff --git a/static/api-specs/idn/v3/schemas/access/Revocability.yaml b/static/api-specs/idn/v3/schemas/access/Revocability.yaml
index c749b080f..e91f489aa 100644
--- a/static/api-specs/idn/v3/schemas/access/Revocability.yaml
+++ b/static/api-specs/idn/v3/schemas/access/Revocability.yaml
@@ -4,5 +4,5 @@ properties:
     type: array
     description: List describing the steps in approving the revocation request
     items:
-      $ref: './ApprovalScheme.yaml'
+      $ref: './AccessProfileApprovalScheme.yaml'
 
diff --git a/static/api-specs/idn/v3/schemas/search/Search.yaml b/static/api-specs/idn/v3/schemas/search/Search.yaml
index 4d171a110..860faf272 100644
--- a/static/api-specs/idn/v3/schemas/search/Search.yaml
+++ b/static/api-specs/idn/v3/schemas/search/Search.yaml
@@ -69,7 +69,7 @@ properties:
   aggregations:
     description: |
       The aggregation’s specifications, such as the groupings and calculations to be performed.
-    $ref: 'aggregate/Aggregation.yaml'
+    $ref: 'aggregate/SearchAggregationSpecification.yaml'
 
   sort:
     description: >-
diff --git a/static/api-specs/idn/v3/schemas/search/aggregate/FilterAggregation.yaml b/static/api-specs/idn/v3/schemas/search/aggregate/FilterAggregation.yaml
index 0d5636a6d..824b8f9cf 100644
--- a/static/api-specs/idn/v3/schemas/search/aggregate/FilterAggregation.yaml
+++ b/static/api-specs/idn/v3/schemas/search/aggregate/FilterAggregation.yaml
@@ -9,7 +9,7 @@ properties:
     type: string
     example: 'Entitlements'
   type:
-    $ref: 'FilterType.yaml'
+    $ref: 'SearchFilterType.yaml'
   field:
     description: |
       The search field to apply the filter to.
diff --git a/static/api-specs/idn/v3/schemas/search/aggregate/Aggregation.yaml b/static/api-specs/idn/v3/schemas/search/aggregate/SearchAggregationSpecification.yaml
similarity index 78%
rename from static/api-specs/idn/v3/schemas/search/aggregate/Aggregation.yaml
rename to static/api-specs/idn/v3/schemas/search/aggregate/SearchAggregationSpecification.yaml
index 35221d616..4719c434e 100644
--- a/static/api-specs/idn/v3/schemas/search/aggregate/Aggregation.yaml
+++ b/static/api-specs/idn/v3/schemas/search/aggregate/SearchAggregationSpecification.yaml
@@ -5,4 +5,4 @@ allOf:
     subAggregation:
       description: >-
           Aggregation to be performed on the result of the parent bucket aggregation.
-      $ref: 'Aggregation-2.yaml'
+      $ref: 'SubSearchAggregationSpecification.yaml'
diff --git a/static/api-specs/idn/v3/schemas/search/aggregate/FilterType.yaml b/static/api-specs/idn/v3/schemas/search/aggregate/SearchFilterType.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/aggregate/FilterType.yaml
rename to static/api-specs/idn/v3/schemas/search/aggregate/SearchFilterType.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/aggregate/Aggregation-2.yaml b/static/api-specs/idn/v3/schemas/search/aggregate/SubSearchAggregationSpecification.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/aggregate/Aggregation-2.yaml
rename to static/api-specs/idn/v3/schemas/search/aggregate/SubSearchAggregationSpecification.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/documents/SearchDocument.yaml b/static/api-specs/idn/v3/schemas/search/documents/SearchDocument.yaml
index 22ed47bbc..08002e5e6 100644
--- a/static/api-specs/idn/v3/schemas/search/documents/SearchDocument.yaml
+++ b/static/api-specs/idn/v3/schemas/search/documents/SearchDocument.yaml
@@ -1,22 +1,22 @@
 discriminator:
   propertyName: '_type'
   mapping:
-    accessprofile: '../model/access/profile/AccessProfile.yaml'
-    accountactivity: '../model/account/activity/AccountActivity.yaml'
-    account: '../model/account/Account.yaml'
-    aggregation: '../model/aggregation/Aggregation.yaml'
-    entitlement: '../model/entitlement/Entitlement.yaml'
-    event: '../model/event/Event.yaml'
-    identity: '../model/identity/Identity.yaml'
-    role: '../model/role/Role.yaml'
+    accessprofile: '../model/access/profile/AccessProfileDocument.yaml'
+    accountactivity: '../model/account/activity/AccountActivityDocument.yaml'
+    account: '../model/account/AccountDocument.yaml'
+    aggregation: '../model/aggregation/AggregationDocument.yaml'
+    entitlement: '../model/entitlement/EntitlementDocument.yaml'
+    event: '../model/event/EventDocument.yaml'
+    identity: '../model/identity/IdentityDocument.yaml'
+    role: '../model/role/RoleDocument.yaml'
 
 oneOf:
-- $ref: '../model/access/profile/AccessProfile.yaml'
-- $ref: '../model/account/activity/AccountActivity.yaml'
-- $ref: '../model/account/Account.yaml'
-- $ref: '../model/aggregation/Aggregation.yaml'
-- $ref: '../model/entitlement/Entitlement.yaml'
-- $ref: '../model/event/Event.yaml'
-- $ref: '../model/identity/Identity.yaml'
-- $ref: '../model/role/Role.yaml'
+- $ref: '../model/access/profile/AccessProfileDocument.yaml'
+- $ref: '../model/account/activity/AccountActivityDocument.yaml'
+- $ref: '../model/account/AccountDocument.yaml'
+- $ref: '../model/aggregation/AggregationDocument.yaml'
+- $ref: '../model/entitlement/EntitlementDocument.yaml'
+- $ref: '../model/event/EventDocument.yaml'
+- $ref: '../model/identity/IdentityDocument.yaml'
+- $ref: '../model/role/RoleDocument.yaml'
 
diff --git a/static/api-specs/idn/v3/schemas/search/model/access/Entitlement.yaml b/static/api-specs/idn/v3/schemas/search/model/access/AccessProfileEntitlement.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/access/Entitlement.yaml
rename to static/api-specs/idn/v3/schemas/search/model/access/AccessProfileEntitlement.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/access/Role.yaml b/static/api-specs/idn/v3/schemas/search/model/access/AccessProfileRole.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/access/Role.yaml
rename to static/api-specs/idn/v3/schemas/search/model/access/AccessProfileRole.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/access/AccessProfile.yaml b/static/api-specs/idn/v3/schemas/search/model/access/AccessProfileSummary.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/access/AccessProfile.yaml
rename to static/api-specs/idn/v3/schemas/search/model/access/AccessProfileSummary.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/access/profile/AccessProfile.yaml b/static/api-specs/idn/v3/schemas/search/model/access/profile/AccessProfileDocument.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/access/profile/AccessProfile.yaml
rename to static/api-specs/idn/v3/schemas/search/model/access/profile/AccessProfileDocument.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/Account.yaml b/static/api-specs/idn/v3/schemas/search/model/account/AccountDocument.yaml
similarity index 93%
rename from static/api-specs/idn/v3/schemas/search/model/account/Account.yaml
rename to static/api-specs/idn/v3/schemas/search/model/account/AccountDocument.yaml
index 55bc48623..5817e09ab 100644
--- a/static/api-specs/idn/v3/schemas/search/model/account/Account.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/account/AccountDocument.yaml
@@ -19,7 +19,7 @@ allOf:
       access:
         type: array
         items:
-          $ref: "../access/Entitlement.yaml"
+          $ref: "../access/AccessProfileEntitlement.yaml"
       entitlementCount:
         type: integer
         description: The number of entitlements assigned to the account
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/Source.yaml b/static/api-specs/idn/v3/schemas/search/model/account/AccountSource.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/account/Source.yaml
rename to static/api-specs/idn/v3/schemas/search/model/account/AccountSource.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/BaseAccount.yaml b/static/api-specs/idn/v3/schemas/search/model/account/BaseAccount.yaml
index 7f3cc6e91..19f4024b3 100644
--- a/static/api-specs/idn/v3/schemas/search/model/account/BaseAccount.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/account/BaseAccount.yaml
@@ -7,7 +7,7 @@ allOf:
         description: The ID of the account
         example: "john.doe"
       source:
-        $ref: "Source.yaml"
+        $ref: "AccountSource.yaml"
       disabled:
         type: boolean
         description: Indicates if the account is disabled
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/activity/AccountActivity.yaml b/static/api-specs/idn/v3/schemas/search/model/account/activity/AccountActivityDocument.yaml
similarity index 95%
rename from static/api-specs/idn/v3/schemas/search/model/account/activity/AccountActivity.yaml
rename to static/api-specs/idn/v3/schemas/search/model/account/activity/AccountActivityDocument.yaml
index 041c9b524..bbc772085 100644
--- a/static/api-specs/idn/v3/schemas/search/model/account/activity/AccountActivity.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/account/activity/AccountActivityDocument.yaml
@@ -27,9 +27,9 @@ allOf:
         description: the current status of the activity
         example: Complete
       requester:
-        $ref: "../Source.yaml"
+        $ref: "../AccountSource.yaml"
       recipient:
-        $ref: "../Source.yaml"
+        $ref: "../AccountSource.yaml"
       trackingNumber:
         type: string
         example: 61aad0c9e8134eca89e76a35e0cabe3f
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/activity/AccountRequest.yaml b/static/api-specs/idn/v3/schemas/search/model/account/activity/AccountRequest.yaml
index aace25e34..9ea0f8538 100644
--- a/static/api-specs/idn/v3/schemas/search/model/account/activity/AccountRequest.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/account/activity/AccountRequest.yaml
@@ -13,7 +13,7 @@ properties:
     example: Modify
     description: The operation that was performed
   provisioningTarget:
-    $ref: "../Source.yaml"
+    $ref: "../AccountSource.yaml"
   result:
     type: object
     properties:
@@ -36,4 +36,4 @@ properties:
         nullable: true
         example: null
   source:
-    $ref: "../Source.yaml"
+    $ref: "../AccountSource.yaml"
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/activity/Approval.yaml b/static/api-specs/idn/v3/schemas/search/model/account/activity/Approval.yaml
index ff98eb325..20bc88147 100644
--- a/static/api-specs/idn/v3/schemas/search/model/account/activity/Approval.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/account/activity/Approval.yaml
@@ -3,13 +3,13 @@ properties:
   comments:
     type: array
     items:
-      $ref: "Comment.yaml"
+      $ref: "ApprovalComment.yaml"
   created:
     $ref: "../../base/DateTime.yaml"
   modified:
     $ref: "../../base/DateTime.yaml"
   owner:
-    $ref: "../Source.yaml"
+    $ref: "../AccountSource.yaml"
   result:
     type: string
     description: The result of the approval
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/activity/Comment.yaml b/static/api-specs/idn/v3/schemas/search/model/account/activity/ApprovalComment.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/account/activity/Comment.yaml
rename to static/api-specs/idn/v3/schemas/search/model/account/activity/ApprovalComment.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/activity/ExpansionItem.yaml b/static/api-specs/idn/v3/schemas/search/model/account/activity/ExpansionItem.yaml
index 71bc021f2..e0d8ec8af 100644
--- a/static/api-specs/idn/v3/schemas/search/model/account/activity/ExpansionItem.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/account/activity/ExpansionItem.yaml
@@ -16,4 +16,4 @@ properties:
     items:
       $ref: "AttributeRequest.yaml"
   source:
-    $ref: "../Source.yaml"
+    $ref: "../AccountSource.yaml"
diff --git a/static/api-specs/idn/v3/schemas/search/model/account/activity/OriginalRequest.yaml b/static/api-specs/idn/v3/schemas/search/model/account/activity/OriginalRequest.yaml
index 9e8ae972c..141f0f717 100644
--- a/static/api-specs/idn/v3/schemas/search/model/account/activity/OriginalRequest.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/account/activity/OriginalRequest.yaml
@@ -13,4 +13,4 @@ properties:
     description: the operation that was used
     example: add
   source:
-    $ref: '../Source.yaml'
+    $ref: '../AccountSource.yaml'
diff --git a/static/api-specs/idn/v3/schemas/search/model/aggregation/Aggregation.yaml b/static/api-specs/idn/v3/schemas/search/model/aggregation/AggregationDocument.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/aggregation/Aggregation.yaml
rename to static/api-specs/idn/v3/schemas/search/model/aggregation/AggregationDocument.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/base/Reference.yaml b/static/api-specs/idn/v3/schemas/search/model/base/Reference.yaml
index 775ba520e..3e6a1f0ba 100644
--- a/static/api-specs/idn/v3/schemas/search/model/base/Reference.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/base/Reference.yaml
@@ -3,6 +3,8 @@ properties:
   id:
     type: string
     example: '2c91808568c529c60168cca6f90c1313'
+    description: The unique ID of the referenced object.
   name:
     type: string
     example: 'John Doe'
+    description: The human readable name of the referenced object.
diff --git a/static/api-specs/idn/v3/schemas/search/model/entitlement/Entitlement.yaml b/static/api-specs/idn/v3/schemas/search/model/entitlement/EntitlementDocument.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/entitlement/Entitlement.yaml
rename to static/api-specs/idn/v3/schemas/search/model/entitlement/EntitlementDocument.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/event/Event.yaml b/static/api-specs/idn/v3/schemas/search/model/event/EventDocument.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/event/Event.yaml
rename to static/api-specs/idn/v3/schemas/search/model/event/EventDocument.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/identity/Access.yaml b/static/api-specs/idn/v3/schemas/search/model/identity/Access.yaml
deleted file mode 100644
index 7656af401..000000000
--- a/static/api-specs/idn/v3/schemas/search/model/identity/Access.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-discriminator:
-  propertyName: 'type'
-  mapping:
-    ACCESS_PROFILE: '../access/AccessProfile.yaml'
-    ENTITLEMENT: '../access/Entitlement.yaml'
-    ROLE: '../access/Role.yaml'
-oneOf:
-- $ref: '../access/AccessProfile.yaml'
-- $ref: '../access/Entitlement.yaml'
-- $ref: '../access/Role.yaml'
diff --git a/static/api-specs/idn/v3/schemas/search/model/identity/IdentityAccess.yaml b/static/api-specs/idn/v3/schemas/search/model/identity/IdentityAccess.yaml
new file mode 100644
index 000000000..07b4d021f
--- /dev/null
+++ b/static/api-specs/idn/v3/schemas/search/model/identity/IdentityAccess.yaml
@@ -0,0 +1,10 @@
+discriminator:
+  propertyName: 'type'
+  mapping:
+    ACCESS_PROFILE: '../access/AccessProfileSummary.yaml'
+    ENTITLEMENT: '../access/AccessProfileEntitlement.yaml'
+    ROLE: '../access/AccessProfileRole.yaml'
+oneOf:
+- $ref: '../access/AccessProfileSummary.yaml'
+- $ref: '../access/AccessProfileEntitlement.yaml'
+- $ref: '../access/AccessProfileRole.yaml'
diff --git a/static/api-specs/idn/v3/schemas/search/model/identity/Identity.yaml b/static/api-specs/idn/v3/schemas/search/model/identity/IdentityDocument.yaml
similarity index 98%
rename from static/api-specs/idn/v3/schemas/search/model/identity/Identity.yaml
rename to static/api-specs/idn/v3/schemas/search/model/identity/IdentityDocument.yaml
index d2cb137f2..0fd2e0a25 100644
--- a/static/api-specs/idn/v3/schemas/search/model/identity/Identity.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/identity/IdentityDocument.yaml
@@ -94,7 +94,7 @@ allOf:
       type: array
       description: The list of access items assigned to the identity
       items:
-        $ref: 'Access.yaml'
+        $ref: 'IdentityAccess.yaml'
     accessCount:
       type: integer
       format: int32
diff --git a/static/api-specs/idn/v3/schemas/search/model/identity/Owner.yaml b/static/api-specs/idn/v3/schemas/search/model/identity/Owner.yaml
index ebe5a2168..59004ff64 100644
--- a/static/api-specs/idn/v3/schemas/search/model/identity/Owner.yaml
+++ b/static/api-specs/idn/v3/schemas/search/model/identity/Owner.yaml
@@ -1,5 +1,5 @@
 allOf:
-- $ref: 'IdentityReference.yaml'
+- $ref: 'SearchIdentityReference.yaml'
 - type: object
   properties:
     email:
diff --git a/static/api-specs/idn/v3/schemas/search/model/identity/IdentityReference.yaml b/static/api-specs/idn/v3/schemas/search/model/identity/SearchIdentityReference.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/identity/IdentityReference.yaml
rename to static/api-specs/idn/v3/schemas/search/model/identity/SearchIdentityReference.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/model/role/Role.yaml b/static/api-specs/idn/v3/schemas/search/model/role/RoleDocument.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/model/role/Role.yaml
rename to static/api-specs/idn/v3/schemas/search/model/role/RoleDocument.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/saved/SavedSearch.yaml b/static/api-specs/idn/v3/schemas/search/saved/SavedSearch.yaml
index 5222ba9bf..1489753c7 100644
--- a/static/api-specs/idn/v3/schemas/search/saved/SavedSearch.yaml
+++ b/static/api-specs/idn/v3/schemas/search/saved/SavedSearch.yaml
@@ -11,5 +11,5 @@ allOf:
       description: |
           The owner of the saved search.
       $ref: ../model/base/TypedReference.yaml
-- $ref: 'Name.yaml'
-- $ref: 'Search.yaml'
+- $ref: 'SavedSearchName.yaml'
+- $ref: 'SavedSearchDetail.yaml'
diff --git a/static/api-specs/idn/v3/schemas/search/saved/Search.yaml b/static/api-specs/idn/v3/schemas/search/saved/SavedSearchDetail.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/saved/Search.yaml
rename to static/api-specs/idn/v3/schemas/search/saved/SavedSearchDetail.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/saved/Name.yaml b/static/api-specs/idn/v3/schemas/search/saved/SavedSearchName.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/saved/Name.yaml
rename to static/api-specs/idn/v3/schemas/search/saved/SavedSearchName.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/scheduled/ScheduledSearch.yaml b/static/api-specs/idn/v3/schemas/search/scheduled/ScheduledSearch.yaml
index 18a31af8b..6efd4f6af 100644
--- a/static/api-specs/idn/v3/schemas/search/scheduled/ScheduledSearch.yaml
+++ b/static/api-specs/idn/v3/schemas/search/scheduled/ScheduledSearch.yaml
@@ -34,8 +34,8 @@ allOf:
       example: 2c9180867624cbd7017642d8c8c81f67
       readOnly: true
       deprecated: true
-- $ref: 'Name.yaml'
-- $ref: 'Schedule.yaml'
+- $ref: 'ScheduledSearchName.yaml'
+- $ref: 'SearchSchedule.yaml'
 required:
 - id
 - owner
diff --git a/static/api-specs/idn/v3/schemas/search/scheduled/Name.yaml b/static/api-specs/idn/v3/schemas/search/scheduled/ScheduledSearchName.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/scheduled/Name.yaml
rename to static/api-specs/idn/v3/schemas/search/scheduled/ScheduledSearchName.yaml
diff --git a/static/api-specs/idn/v3/schemas/search/scheduled/Schedule.yaml b/static/api-specs/idn/v3/schemas/search/scheduled/SearchSchedule.yaml
similarity index 100%
rename from static/api-specs/idn/v3/schemas/search/scheduled/Schedule.yaml
rename to static/api-specs/idn/v3/schemas/search/scheduled/SearchSchedule.yaml