diff --git a/docs/arch.md b/docs/arch.md
index c926abcef..e6f34845c 100644
--- a/docs/arch.md
+++ b/docs/arch.md
@@ -1,59 +1,97 @@
 # 📂 Folder Structure
 
-Project based on principle **Feature-based Architecture**, this approach provides reusable and consistant
-features across the application.
+Project based on principle **Feature-based Architecture**: each feature owns its UI, routes, models, mappers, services, and store when needed. Shared and core code live outside features.
 
 ```bash
 📦 src/
- ├── 📂 features/            # Каталог із функціональними модулями
- │   ├── 📂 feature-name/
- │   │   ├── 📂 feature.component.ts/html/scss  # Component with template and styles, and base logic file
- │   │   ├── 📂 feature-service.ts              # Service or Facade to provide data for NGXS
- │   │   ├── 📂 feature.store.ts                # NGXS Store for feature
- │   │   ├── 📂 feature.entitity.ts             # Feature Interface for data, Types, Enums
- │   │   ├── 📂 feature.guards.ts               # Guard's for feature routing and permissions
- │   │   ├── 📂 feature.resolvers.ts            # Resolvers for data fetching and preloading
- │   │   ├── 📂 feature.utils.ts                # Additinal utils for feature (formBuilders, converters, mappers)
- │   │   ├── feature.module.ts                  # Optional, if standalone
- │   │   ├── feature.routing.ts                 # Export of standalone components by path
+ ├── 📂 app/
+ │   ├── 📂 features/                    # Feature modules
+ │   │   └── 📂 feature-name/
+ │   │       ├── 📂 components/          # Feature UI pieces
+ │   │       ├── 📂 pages/               # Route-level pages (when used)
+ │   │       ├── 📂 models/              # Feature-local *.model.ts types
+ │   │       ├── 📂 mappers/             # Feature API ↔ domain mappers
+ │   │       ├── 📂 services/            # Feature HTTP / facade services
+ │   │       ├── 📂 store/               # Feature NGXS state (actions, model, state, selectors)
+ │   │       ├── 📂 enums/               # Feature enums
+ │   │       ├── 📂 constants/           # Feature constants
+ │   │       ├── feature.routes.ts       # Feature routes
+ │   │       └── feature.component.ts    # Feature shell / entry component
+ │   │
+ │   ├── 📂 core/                        # App-wide infrastructure
+ │   │   ├── 📂 components/              # Shell UI (header, banners, …)
+ │   │   ├── 📂 services/                # Global services
+ │   │   ├── 📂 store/                   # Core NGXS state (user, emails, …)
+ │   │   ├── 📂 models/                  # Core config / routing types
+ │   │   ├── 📂 guards/
+ │   │   ├── 📂 interceptors/
+ │   │   ├── 📂 helpers/
+ │   │   └── 📂 provider/
+ │   │
+ │   ├── 📂 shared/                      # Cross-feature reusable code
+ │   │   ├── 📂 components/              # Shared UI
+ │   │   ├── 📂 directives/
+ │   │   ├── 📂 pipes/
+ │   │   ├── 📂 services/                # Shared HTTP / helpers
+ │   │   ├── 📂 stores/                  # Shared NGXS domains
+ │   │   ├── 📂 models/                  # Shared domain + JSON:API models
+ │   │   ├── 📂 mappers/                 # Shared mappers
+ │   │   ├── 📂 enums/
+ │   │   ├── 📂 guards/
+ │   │   └── 📂 helpers/
+ │   │
+ │   ├── app.component.ts
+ │   ├── app.config.ts
+ │   ├── app.config.server.ts            # SSR app config
+ │   ├── app.routes.ts
+ │   └── app.routes.server.ts            # SSR routes
  │
- ├── 📂 core/                # Base module for global services, components, and state
- │   ├── 📂 services/        # Global services (API, Auth, LocalStorage)
- │   ├── 📂 components/      # Global components (Header, Footer, Sidebar)
- │   ├── 📂 store/           # Core state management (Auth, Settings, Router)
- │   ├── core.module.ts      # Optional, but must have a provider for core.
- │
- ├── 📂 shared/              # Shared module for common components, directives, pipes, and services
- │   ├── 📂 ui/              # Shared UI components (Button, Input, Modal), or wrappers for 3rd party
- │   ├── 📂 directives/      # Shared Directives (ClickOutside, Draggable)
- │   ├── 📂 pipes/           # Shared Pipes (Filter, Sort, Format)
- │   ├── 📂 services/        # Services, Facades for shared logic (Http, LocalStorage)
- │   ├── 📂 store/           # Shared State management (Settings, Theme, Language)
- │
- ├── app.routes.ts           # General Entry point for routing
- ├── main.ts                 # Providers Setup and Bootstrap
- ├── package.json            # Dependencies and Scripts
+ ├── 📂 assets/
+ ├── 📂 environments/
+ ├── 📂 styles/
+ ├── 📂 testing/                         # Test helpers, mocks, builders (@testing/*)
+ ├── main.ts                             # Browser bootstrap
+ ├── main.server.ts                      # SSR bootstrap
+ ├── server.ts                           # Express / SSR server entry
+ └── index.html
+```
+
+---
 
+## 📋 Models and mappers
+
+- Types live in `*.model.ts` files (interfaces/types, not classes).
+- Shared catalog: `shared/models/<domain>/` with optional `*-json-api.model.ts` twins.
+- Feature-local types: `features/<feature>/models/`.
+- Mappers convert JSON:API ↔ domain at the service boundary.
+
+See [Models Conventions](./models.md).
+
+---
+
+## 🗃️ State
+
+- Shared domains: `shared/stores/<domain>/`
+- Feature domains: `features/<feature>/store/`
+- Core domains: `core/store/`
+
+See [NGXS State Management](./ngxs.md).
 
 ---
-```
 
 ## 🚀 Dynamic File Generation (Schematics)
 
-Use Angular CLI to generate new feature components, services, and modules.
+Use Angular CLI for scaffolding:
 
 ```sh
 ng generate component feature-name/components/new-component
+```
 
 ### 📌 Other Schematics:
 
-| **Entity**  | **Command** |
-|--------------|----------------------------------------------|
-| 📌 **Service**  | `ng g s feature-name/services/new-service` |
-| 📦 **Module**  | `ng g m feature-name` |
-| 🔐 **Guard**   | `ng g g feature-name/guards/auth-guard` |
-| 🔄 **Pipe**    | `ng g p shared/pipes/currency-format` |
-| ✨ **Directive** | `ng g d shared/directives/highlight` |
-
-
-```
+| **Entity**       | **Command**                                |
+| ---------------- | ------------------------------------------ |
+| 📌 **Service**   | `ng g s feature-name/services/new-service` |
+| 🔐 **Guard**     | `ng g g feature-name/guards/auth-guard`    |
+| 🔄 **Pipe**      | `ng g p shared/pipes/currency-format`      |
+| ✨ **Directive** | `ng g d shared/directives/highlight`       |
diff --git a/docs/models.md b/docs/models.md
new file mode 100644
index 000000000..ac08f49e8
--- /dev/null
+++ b/docs/models.md
@@ -0,0 +1,94 @@
+# Models Conventions
+
+## Purpose
+
+Models are TypeScript interfaces and types that describe data shapes. They are not classes. Mapping from API wire format to app domain happens in mappers.
+
+## Layers
+
+```
+JSON:API (*-json-api.model.ts) → mapper → domain model → store (*StateModel) → UI
+```
+
+| Layer    | Role                                                   | Naming                                                |
+| -------- | ------------------------------------------------------ | ----------------------------------------------------- |
+| JSON:API | Wire/DTO shapes from the backend (`snake_case` fields) | `*JsonApi`, `*DataJsonApi`, `*ResponseJsonApi`        |
+| Domain   | App-facing shapes (`camelCase` fields)                 | Prefer descriptive names; `*Model` suffix is optional |
+| State    | NGXS slice shape                                       | Always `*StateModel`                                  |
+| Form     | Reactive form value shapes                             | `*Form`, `*FormGroup`                                 |
+
+Keep JSON:API types in services and mappers. Prefer domain models in stores, selectors, and components.
+
+## Locations
+
+| Location                                 | Use for                                                                                     |
+| ---------------------------------------- | ------------------------------------------------------------------------------------------- |
+| `src/app/shared/models/<domain>/`        | Cross-feature domain + JSON:API types                                                       |
+| `src/app/shared/models/common/json-api/` | Shared JSON:API primitives (`JsonApiResource`, `ItemResponse`, `ListResponse`, links, meta) |
+| `src/app/features/<feature>/models/`     | Feature-local UI, form, and API types                                                       |
+| `src/app/**/store*/**/*.model.ts`        | Colocated NGXS state models                                                                 |
+| `src/app/core/models/`                   | App-wide config and core types                                                              |
+
+## File naming
+
+- Domain / general: `kebab-case.model.ts`
+- JSON:API twin: `kebab-case-json-api.model.ts` (dash, not dot)
+- Forms: `kebab-case-form.model.ts`
+- One concern per file when practical; group related exports in the same domain folder
+
+Examples:
+
+- `user.model.ts` + `user-json-api.model.ts`
+- `configured-addon.model.ts` + `configured-addon-json-api.model.ts`
+
+## Symbol naming
+
+- Domain: `UserModel`, `InstitutionUser`, `RegistrationCard` (suffix `Model` is encouraged for primary entities, not required for every interface)
+- JSON:API: always end with `JsonApi` (e.g. `UserDataJsonApi`, `UserResponseJsonApi`)
+- State: always `*StateModel` (e.g. `AddonsStateModel`, `SubjectsStateModel`)
+- Do not put snake_case field names on domain models; map them in the mapper
+
+## Mappers
+
+- Live in `shared/mappers/` or `features/<feature>/mappers/`
+- Convert `*JsonApi` → domain models (and domain → request payloads when needed)
+- Prefer static mapper classes (`UserMapper.fromUserGetResponse`) or focused `mapX` functions; keep one style within a feature
+
+## Imports
+
+Prefer the `@osf/` alias for app code:
+
+```ts
+import { UserModel } from '@osf/shared/models/user/user.model';
+import { UserDataJsonApi } from '@osf/shared/models/user/user-json-api.model';
+```
+
+Feature barrels are optional. When a feature has `models/index.ts`, import from the barrel:
+
+```ts
+import { ModeratorModel } from '@osf/features/moderation/models';
+```
+
+Otherwise import the file path directly. Do not mix `@osf/shared/models/...` and `@shared/models/...` in new code — use `@osf/...`.
+
+## State models
+
+Colocate with the store. Compose domain types inside `AsyncStateModel` / `AsyncStateWithTotalCount`:
+
+```ts
+export interface FilesStateModel {
+  files: AsyncStateModel<FileModel[]>;
+}
+```
+
+See [NGXS docs](./ngxs.md) for store layout and async state shape.
+
+## Checklist for new models
+
+1. Put shared types under `shared/models/<domain>/`, feature-only types under `features/<feature>/models/`
+2. Add a `*-json-api.model.ts` twin only when typing an HTTP payload/response
+3. Use interfaces/types, not classes
+4. Keep domain fields camelCase; leave snake_case in JSON:API types
+5. Map at the service/mapper boundary before storing or rendering
+6. Name store interfaces `*StateModel`
+7. Import via `@osf/...`
diff --git a/docs/ngxs.md b/docs/ngxs.md
index 583394c53..cb3df1551 100644
--- a/docs/ngxs.md
+++ b/docs/ngxs.md
@@ -34,7 +34,7 @@ The goal of using NGXS is to centralize and streamline the handling of applicati
 
 ### Diagram
 
-[![OSF NGRX Diagram](./assets/osf-ngxs-diagram.png)](./assets/osf-ngxs-diagram.png)
+[![OSF NGXS Diagram](./assets/osf-ngxs-diagram.png)](./assets/osf-ngxs-diagram.png)
 
 ---
 
@@ -45,44 +45,51 @@ Typical NGXS-related files are organized as follows:
 ```
 src/app/shared/stores/
   └── addons/
-      ├── addons.actions.ts       # All action definitions
-      ├── addons.model.ts        # Interfaces & data model
-      ├── addons.state.ts         # State implementation
-      ├── addons.selectors.ts     # Reusable selectors
+      ├── addons.actions.ts       # Action definitions
+      ├── addons.model.ts         # State interface (*StateModel) and defaults
+      ├── addons.state.ts          # State implementation
+      ├── addons.selectors.ts     # Selectors
 ```
 
 ```
 src/app/shared/services/
   └── addons/
-      ├── addons.service.ts       # External API calls
+      ├── addons.service.ts       # External API calls (map JSON:API → domain)
 ```
 
+Feature stores follow the same file set under `features/<feature>/store/`. Core stores live under `core/store/`.
+
 ---
 
 ## State Models
 
-The OSF Angular project follows a consistent NGXS state model structure to ensure clarity, predictability, and alignment across all features. The recommended shape for each domain-specific state is as follows:
+State interfaces are named `*StateModel` and live in the colocated `*.model.ts` file. They are TypeScript interfaces (not classes). Domain entity types come from `shared/models` or feature `models/` — see [Models Conventions](./models.md).
 
-1. Domain state pattern:
+Use `AsyncStateModel<T>` (and `AsyncStateWithTotalCount` when a total count is needed) from `shared/models/store/`:
 
 ```ts
-domain: {
-  data: [],             // Array of typed model data (e.g., Project[], User[])
-  isLoading: false,     // Indicates if data retrieval (GET) is in progress
-  isSubmitting: false,  // Indicates if data submission (POST/PUT/DELETE) is in progress
-  error: null,          // Captures error messages from failed HTTP requests
+export interface AsyncStateModel<T> {
+  data: T;
+  isLoading: boolean;
+  isSubmitting?: boolean;
+  error: string | null;
 }
 ```
 
-2. `data` holds the strongly typed collection of entities defined by the feature's interface or model class.
-
-3. `isLoading` is a signal used to inform the component and template layer that a read or fetch operation is currently pending.
+Example store shape:
 
-4. `isSubmitting` signals that a write operation (form submission, update, delete, etc.) is currently in progress.
+```ts
+export interface FilesStateModel {
+  files: AsyncStateModel<FileModel[]>;
+}
+```
 
-5. `error` stores error state information (commonly strings or structured error objects) that result from failed service interactions. This can be displayed in UI or logged for debugging.
+1. `data` holds strongly typed domain data (not raw JSON:API payloads when a domain model exists).
+2. `isLoading` indicates a read/fetch is in progress.
+3. `isSubmitting` indicates a write (create/update/delete) is in progress.
+4. `error` stores a failed request message for UI or logging.
 
-Each domain state should be minimal, normalized, and scoped to its specific feature, mirroring the structure and shape of the corresponding OSF backend API response.
+Each domain state should be minimal and scoped to its feature.
 
 ---
 
@@ -96,12 +103,13 @@ Each domain state should be minimal, normalized, and scoped to its specific feat
 
 ## Testing
 
-- [Testing Strategy](docs/testing.md)
-- [NGXS State Testing Strategy](docs/testing.md#ngxs-state-testing-strategy)
+- [Testing Strategy](./testing.md)
+- [NGXS State Testing Strategy](./testing.md#15-testing-ngxs-state)
 
 ---
 
 ## Documentation
 
-Refer to the official NGXS documentation for full API details and advanced usage:
-[https://www.ngxs.io/docs](https://www.ngxs.io/docs)
+- [Models Conventions](./models.md)
+- [Folder Structure](./arch.md)
+- Official NGXS docs: [https://www.ngxs.io/docs](https://www.ngxs.io/docs)
diff --git a/src/app/core/constants/nav-items.constant.ts b/src/app/core/constants/nav-items.constant.ts
index 6ec9ee652..1a4f3b833 100644
--- a/src/app/core/constants/nav-items.constant.ts
+++ b/src/app/core/constants/nav-items.constant.ts
@@ -380,7 +380,7 @@ export const MENU_ITEMS: CustomMenuItem[] = [
         routerLink: '/settings/profile',
         label: 'navigation.profileSettings',
         visible: true,
-        routerLinkActiveOptions: { exact: true },
+        routerLinkActiveOptions: { exact: false },
       },
       {
         id: 'settings-account',
diff --git a/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts b/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts
index 5ec51efde..836ee5c46 100644
--- a/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts
+++ b/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts
@@ -10,7 +10,7 @@ import { ChangeDetectionStrategy, Component, model } from '@angular/core';
 import { FilterChipsComponent } from '@osf/shared/components/filter-chips/filter-chips.component';
 import { SearchFiltersComponent } from '@osf/shared/components/search-filters/search-filters.component';
 import { DiscoverableFilter } from '@osf/shared/models/search/discoverable-filter.model';
-import { FilterOptionRemoved } from '@osf/shared/models/search/filter-option-removed';
+import { FilterOptionRemoved } from '@osf/shared/models/search/filter-option-removed.model';
 import { FilterOptionSelected } from '@osf/shared/models/search/filter-option-selected.model';
 import { FilterOptionsSearchText } from '@osf/shared/models/search/filter-options-search-text.model';
 import {
diff --git a/src/app/features/admin-institutions/mappers/institution-departments.mapper.ts b/src/app/features/admin-institutions/mappers/institution-departments.mapper.ts
index 22b0f07df..aced15a9c 100644
--- a/src/app/features/admin-institutions/mappers/institution-departments.mapper.ts
+++ b/src/app/features/admin-institutions/mappers/institution-departments.mapper.ts
@@ -1,15 +1,10 @@
-import {
-  InstitutionDepartment,
-  InstitutionDepartmentDataJsonApi,
-  InstitutionDepartmentsJsonApi,
-} from '@osf/features/admin-institutions/models';
+import { InstitutionDepartment, InstitutionDepartmentDataJsonApi, InstitutionDepartmentsJsonApi } from '../models';
 
 export function mapInstitutionDepartments(jsonApiData: InstitutionDepartmentsJsonApi): InstitutionDepartment[] {
   return jsonApiData.data.map((department: InstitutionDepartmentDataJsonApi) => ({
     id: department.id,
     name: department.attributes.name,
     numberOfUsers: department.attributes.number_of_users,
-    selfLink: department.links.self,
   }));
 }
 
@@ -18,6 +13,5 @@ export function mapInstitutionDepartment(department: InstitutionDepartmentDataJs
     id: department.id,
     name: department.attributes.name,
     numberOfUsers: department.attributes.number_of_users,
-    selfLink: department.links.self,
   };
 }
diff --git a/src/app/features/admin-institutions/mappers/institution-summary-index.mapper.ts b/src/app/features/admin-institutions/mappers/institution-summary-index.mapper.ts
index 14c55de85..6f40631a6 100644
--- a/src/app/features/admin-institutions/mappers/institution-summary-index.mapper.ts
+++ b/src/app/features/admin-institutions/mappers/institution-summary-index.mapper.ts
@@ -3,9 +3,15 @@ import {
   InstitutionIndexValueSearchIncludedJsonApi,
   InstitutionSearchFilter,
   InstitutionSearchResultCountJsonApi,
-} from '@osf/features/admin-institutions/models';
+} from '../models';
+
+export function mapIndexCardResults(
+  included: InstitutionIndexValueSearchIncludedJsonApi[] | undefined
+): InstitutionSearchFilter[] {
+  if (!included) {
+    return [];
+  }
 
-export function mapIndexCardResults(included: InstitutionIndexValueSearchIncludedJsonApi[]): InstitutionSearchFilter[] {
   const indexCardMap = included.reduce(
     (acc, item) => {
       if (item.type === 'index-card') {
diff --git a/src/app/features/admin-institutions/mappers/institution-users.mapper.ts b/src/app/features/admin-institutions/mappers/institution-users.mapper.ts
index 7f9785b2e..d79f8f198 100644
--- a/src/app/features/admin-institutions/mappers/institution-users.mapper.ts
+++ b/src/app/features/admin-institutions/mappers/institution-users.mapper.ts
@@ -3,7 +3,7 @@ import { InstitutionUser, InstitutionUserDataJsonApi, InstitutionUsersJsonApi }
 export function mapInstitutionUsers(jsonApiData: InstitutionUsersJsonApi): InstitutionUser[] {
   return jsonApiData.data.map((user: InstitutionUserDataJsonApi) => ({
     id: user.id,
-    userId: user.relationships.user.data.id,
+    userId: user.relationships?.user?.data?.id ?? '',
     userName: user.attributes.user_name,
     department: user.attributes.department,
     orcidId: user.attributes.orcid_id,
diff --git a/src/app/features/admin-institutions/models/institution-department.model.ts b/src/app/features/admin-institutions/models/institution-department.model.ts
index f0341bd1d..9119aa3e6 100644
--- a/src/app/features/admin-institutions/models/institution-department.model.ts
+++ b/src/app/features/admin-institutions/models/institution-department.model.ts
@@ -2,5 +2,4 @@ export interface InstitutionDepartment {
   id: string;
   name: string;
   numberOfUsers: number;
-  selfLink: string;
 }
diff --git a/src/app/features/admin-institutions/models/institution-departments-json-api.model.ts b/src/app/features/admin-institutions/models/institution-departments-json-api.model.ts
index b44db76b7..cf15fb815 100644
--- a/src/app/features/admin-institutions/models/institution-departments-json-api.model.ts
+++ b/src/app/features/admin-institutions/models/institution-departments-json-api.model.ts
@@ -1,19 +1,14 @@
-export interface InstitutionDepartmentAttributesJsonApi {
-  name: string;
-  number_of_users: number;
-}
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export interface InstitutionDepartmentLinksJsonApi {
-  self: string;
-}
+export type InstitutionDepartmentsJsonApi = ListResponse<InstitutionDepartmentDataJsonApi>;
 
-export interface InstitutionDepartmentDataJsonApi {
-  id: string;
-  type: 'institution-departments';
-  attributes: InstitutionDepartmentAttributesJsonApi;
-  links: InstitutionDepartmentLinksJsonApi;
-}
+export type InstitutionDepartmentDataJsonApi = JsonApiResource<
+  'institution-departments',
+  InstitutionDepartmentAttributesJsonApi
+>;
 
-export interface InstitutionDepartmentsJsonApi {
-  data: InstitutionDepartmentDataJsonApi[];
+interface InstitutionDepartmentAttributesJsonApi {
+  name: string;
+  number_of_users: number;
 }
diff --git a/src/app/features/admin-institutions/models/institution-index-value-search-json-api.model.ts b/src/app/features/admin-institutions/models/institution-index-value-search-json-api.model.ts
index b76c8e348..1d0767823 100644
--- a/src/app/features/admin-institutions/models/institution-index-value-search-json-api.model.ts
+++ b/src/app/features/admin-institutions/models/institution-index-value-search-json-api.model.ts
@@ -1,42 +1,37 @@
-import { JsonApiResponse } from '@shared/models/common/json-api.model';
+import { ToOneRelData } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { JsonApiResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export interface InstitutionSearchResultCountJsonApi {
-  attributes: {
-    cardSearchResultCount: number;
-  };
-  id: string;
-  type: string;
-  relationships: {
-    indexCard: {
-      data: {
-        id: string;
-        type: string;
-      };
-    };
-  };
+export type InstitutionIndexValueSearchIncludedJsonApi =
+  | InstitutionSearchResultCountJsonApi
+  | InstitutionIndexCardFilterJsonApi;
+
+export type InstitutionIndexValueSearchJsonApi = JsonApiResponse<null, InstitutionIndexValueSearchIncludedJsonApi[]>;
+export type InstitutionIndexCardFilterJsonApi = JsonApiResource<'index-card', InstitutionIndexCardAttributesJsonApi>;
+
+interface InstitutionIndexCardResourceMetadataJsonApi {
+  '@id': string;
+  displayLabel?: { '@value': string }[];
+  name: { '@value': string }[];
 }
 
-export interface InstitutionIndexCardFilterJsonApi {
-  attributes: {
-    resourceIdentifier: string[];
-    resourceMetadata: {
-      displayLabel: { '@value': string }[];
-      '@id': string;
-      name: { '@value': string }[];
-    };
-  };
-  id: string;
-  type: string;
+interface InstitutionIndexCardAttributesJsonApi {
+  resourceIdentifier: string[];
+  resourceMetadata: InstitutionIndexCardResourceMetadataJsonApi;
 }
 
-export type InstitutionIndexValueSearchIncludedJsonApi =
-  | InstitutionSearchResultCountJsonApi
-  | InstitutionIndexCardFilterJsonApi;
+interface InstitutionSearchResultAttributesJsonApi {
+  cardSearchResultCount: number;
+}
+
+interface InstitutionSearchResultRelationshipsJsonApi {
+  indexCard: ToOneRelData;
+}
 
-export interface InstitutionIndexValueSearchJsonApi extends JsonApiResponse<
-  null,
-  InstitutionIndexValueSearchIncludedJsonApi[]
+export interface InstitutionSearchResultCountJsonApi extends Omit<
+  JsonApiResource<string, InstitutionSearchResultAttributesJsonApi>,
+  'attributes'
 > {
-  data: null;
-  included: InstitutionIndexValueSearchIncludedJsonApi[];
+  attributes?: InstitutionSearchResultAttributesJsonApi;
+  relationships: InstitutionSearchResultRelationshipsJsonApi;
 }
diff --git a/src/app/features/admin-institutions/models/institution-summary-metrics-json-api.model.ts b/src/app/features/admin-institutions/models/institution-summary-metrics-json-api.model.ts
index c418e98ac..77a62bad9 100644
--- a/src/app/features/admin-institutions/models/institution-summary-metrics-json-api.model.ts
+++ b/src/app/features/admin-institutions/models/institution-summary-metrics-json-api.model.ts
@@ -1,3 +1,13 @@
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+export type InstitutionSummaryMetricsJsonApi = ItemResponse<InstitutionSummaryMetricsDataJsonApi>;
+
+export type InstitutionSummaryMetricsDataJsonApi = JsonApiResource<
+  'institution-summary-metrics',
+  InstitutionSummaryMetricsAttributesJsonApi
+>;
+
 export interface InstitutionSummaryMetricsAttributesJsonApi {
   report_yearmonth: string;
   user_count: number;
@@ -11,36 +21,3 @@ export interface InstitutionSummaryMetricsAttributesJsonApi {
   monthly_logged_in_user_count: number;
   monthly_active_user_count: number;
 }
-
-export interface InstitutionSummaryMetricsRelationshipsJsonApi {
-  user: {
-    data: null;
-  };
-  institution: {
-    links: {
-      related: {
-        href: string;
-        meta: Record<string, unknown>;
-      };
-    };
-    data: {
-      id: string;
-      type: 'institutions';
-    };
-  };
-}
-
-export interface InstitutionSummaryMetricsDataJsonApi {
-  id: string;
-  type: 'institution-summary-metrics';
-  attributes: InstitutionSummaryMetricsAttributesJsonApi;
-  relationships: InstitutionSummaryMetricsRelationshipsJsonApi;
-  links: Record<string, unknown>;
-}
-
-export interface InstitutionSummaryMetricsJsonApi {
-  data: InstitutionSummaryMetricsDataJsonApi;
-  meta: {
-    version: string;
-  };
-}
diff --git a/src/app/features/admin-institutions/models/institution-users-json-api.model.ts b/src/app/features/admin-institutions/models/institution-users-json-api.model.ts
index dd07ec1eb..b35559cee 100644
--- a/src/app/features/admin-institutions/models/institution-users-json-api.model.ts
+++ b/src/app/features/admin-institutions/models/institution-users-json-api.model.ts
@@ -1,6 +1,17 @@
-import { MetaJsonApi } from '@osf/shared/models/common/json-api.model';
+import { ToOneRel } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export interface InstitutionUserAttributesJsonApi {
+export type InstitutionUsersJsonApi = ListResponse<InstitutionUserDataJsonApi>;
+
+export interface InstitutionUserDataJsonApi extends JsonApiResource<
+  'institution-users',
+  InstitutionUserAttributesJsonApi
+> {
+  relationships: InstitutionUserRelationshipsJsonApi;
+}
+
+interface InstitutionUserAttributesJsonApi {
   user_name: string;
   department: string | null;
   orcid_id: string | null;
@@ -18,29 +29,7 @@ export interface InstitutionUserAttributesJsonApi {
   storage_byte_count: number;
 }
 
-export interface InstitutionUserRelationshipDataJsonApi {
-  id: string;
-  type: string;
-}
-
-export interface InstitutionUserRelationshipJsonApi {
-  data: InstitutionUserRelationshipDataJsonApi;
-}
-
-export interface InstitutionUserRelationshipsJsonApi {
-  user: InstitutionUserRelationshipJsonApi;
-  institution: InstitutionUserRelationshipJsonApi;
-}
-
-export interface InstitutionUserDataJsonApi {
-  id: string;
-  type: 'institution-users';
-  attributes: InstitutionUserAttributesJsonApi;
-  relationships: InstitutionUserRelationshipsJsonApi;
-  links: Record<string, unknown>;
-}
-
-export interface InstitutionUsersJsonApi {
-  data: InstitutionUserDataJsonApi[];
-  meta: MetaJsonApi;
+interface InstitutionUserRelationshipsJsonApi {
+  user: ToOneRel<'user'>;
+  institution: ToOneRel<'institution'>;
 }
diff --git a/src/app/features/admin-institutions/models/send-message-json-api.model.ts b/src/app/features/admin-institutions/models/send-message-json-api.model.ts
index e561865da..70d03b304 100644
--- a/src/app/features/admin-institutions/models/send-message-json-api.model.ts
+++ b/src/app/features/admin-institutions/models/send-message-json-api.model.ts
@@ -1,12 +1,13 @@
-export interface SendMessageResponseJsonApi {
-  data: {
-    id: string;
-    type: string;
-    attributes: {
-      message_text: string;
-      message_type: string;
-      bcc_sender: boolean;
-      reply_to: boolean;
-    };
-  };
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+export type SendMessageResponseJsonApi = ItemResponse<SendMessageDataJsonApi>;
+
+export type SendMessageDataJsonApi = JsonApiResource<'send-message', SendMessageAttributesJsonApi>;
+
+interface SendMessageAttributesJsonApi {
+  message_text: string;
+  message_type: string;
+  bcc_sender: boolean;
+  reply_to: boolean;
 }
diff --git a/src/app/features/admin-institutions/store/institutions-admin.model.ts b/src/app/features/admin-institutions/store/institutions-admin.model.ts
index 239078b99..e1f994297 100644
--- a/src/app/features/admin-institutions/store/institutions-admin.model.ts
+++ b/src/app/features/admin-institutions/store/institutions-admin.model.ts
@@ -4,7 +4,7 @@ import { AsyncStateWithTotalCount } from '@osf/shared/models/store/async-state-w
 
 import { InstitutionDepartment, InstitutionSearchFilter, InstitutionSummaryMetrics, InstitutionUser } from '../models';
 
-export interface InstitutionsAdminModel {
+export interface InstitutionsAdminStateModel {
   departments: AsyncStateModel<InstitutionDepartment[]>;
   summaryMetrics: AsyncStateModel<InstitutionSummaryMetrics>;
   hasOsfAddonSearch: AsyncStateModel<InstitutionSearchFilter[]>;
@@ -14,7 +14,7 @@ export interface InstitutionsAdminModel {
   institution: AsyncStateModel<Institution>;
 }
 
-export const INSTITUTIONS_ADMIN_STATE_DEFAULTS: InstitutionsAdminModel = {
+export const INSTITUTIONS_ADMIN_STATE_DEFAULTS: InstitutionsAdminStateModel = {
   departments: { data: [], isLoading: false, error: null },
   summaryMetrics: { data: {} as InstitutionSummaryMetrics, isLoading: false, error: null },
   hasOsfAddonSearch: { data: [], isLoading: false, error: null },
diff --git a/src/app/features/admin-institutions/store/institutions-admin.selectors.ts b/src/app/features/admin-institutions/store/institutions-admin.selectors.ts
index 721901e4d..a92c98d40 100644
--- a/src/app/features/admin-institutions/store/institutions-admin.selectors.ts
+++ b/src/app/features/admin-institutions/store/institutions-admin.selectors.ts
@@ -4,82 +4,82 @@ import { Institution } from '@osf/shared/models/institutions/institutions.model'
 
 import { InstitutionDepartment, InstitutionSearchFilter, InstitutionSummaryMetrics, InstitutionUser } from '../models';
 
-import { InstitutionsAdminModel } from './institutions-admin.model';
+import { InstitutionsAdminStateModel } from './institutions-admin.model';
 import { InstitutionsAdminState } from './institutions-admin.state';
 
 export class InstitutionsAdminSelectors {
   @Selector([InstitutionsAdminState])
-  static getDepartments(state: InstitutionsAdminModel): InstitutionDepartment[] {
+  static getDepartments(state: InstitutionsAdminStateModel): InstitutionDepartment[] {
     return state.departments.data;
   }
 
   @Selector([InstitutionsAdminState])
-  static getDepartmentsLoading(state: InstitutionsAdminModel): boolean {
+  static getDepartmentsLoading(state: InstitutionsAdminStateModel): boolean {
     return state.departments.isLoading;
   }
 
   @Selector([InstitutionsAdminState])
-  static getSummaryMetrics(state: InstitutionsAdminModel): InstitutionSummaryMetrics {
+  static getSummaryMetrics(state: InstitutionsAdminStateModel): InstitutionSummaryMetrics {
     return state.summaryMetrics.data;
   }
 
   @Selector([InstitutionsAdminState])
-  static getSummaryMetricsLoading(state: InstitutionsAdminModel): boolean {
+  static getSummaryMetricsLoading(state: InstitutionsAdminStateModel): boolean {
     return state.summaryMetrics.isLoading;
   }
 
   @Selector([InstitutionsAdminState])
-  static getHasOsfAddonSearch(state: InstitutionsAdminModel): InstitutionSearchFilter[] {
+  static getHasOsfAddonSearch(state: InstitutionsAdminStateModel): InstitutionSearchFilter[] {
     return state.hasOsfAddonSearch.data;
   }
 
   @Selector([InstitutionsAdminState])
-  static getHasOsfAddonSearchLoading(state: InstitutionsAdminModel): boolean {
+  static getHasOsfAddonSearchLoading(state: InstitutionsAdminStateModel): boolean {
     return state.hasOsfAddonSearch.isLoading;
   }
 
   @Selector([InstitutionsAdminState])
-  static getStorageRegionSearch(state: InstitutionsAdminModel): InstitutionSearchFilter[] {
+  static getStorageRegionSearch(state: InstitutionsAdminStateModel): InstitutionSearchFilter[] {
     return state.storageRegionSearch.data;
   }
 
   @Selector([InstitutionsAdminState])
-  static getStorageRegionSearchLoading(state: InstitutionsAdminModel): boolean {
+  static getStorageRegionSearchLoading(state: InstitutionsAdminStateModel): boolean {
     return state.storageRegionSearch.isLoading;
   }
 
   @Selector([InstitutionsAdminState])
-  static getSearchResults(state: InstitutionsAdminModel): InstitutionSearchFilter[] {
+  static getSearchResults(state: InstitutionsAdminStateModel): InstitutionSearchFilter[] {
     return state.searchResults.data;
   }
 
   @Selector([InstitutionsAdminState])
-  static getSearchResultsLoading(state: InstitutionsAdminModel): boolean {
+  static getSearchResultsLoading(state: InstitutionsAdminStateModel): boolean {
     return state.searchResults.isLoading;
   }
 
   @Selector([InstitutionsAdminState])
-  static getUsers(state: InstitutionsAdminModel): InstitutionUser[] {
+  static getUsers(state: InstitutionsAdminStateModel): InstitutionUser[] {
     return state.users.data;
   }
 
   @Selector([InstitutionsAdminState])
-  static getUsersLoading(state: InstitutionsAdminModel): boolean {
+  static getUsersLoading(state: InstitutionsAdminStateModel): boolean {
     return state.users.isLoading;
   }
 
   @Selector([InstitutionsAdminState])
-  static getUsersTotalCount(state: InstitutionsAdminModel): number {
+  static getUsersTotalCount(state: InstitutionsAdminStateModel): number {
     return state.users.totalCount;
   }
 
   @Selector([InstitutionsAdminState])
-  static getInstitution(state: InstitutionsAdminModel): Institution {
+  static getInstitution(state: InstitutionsAdminStateModel): Institution {
     return state.institution.data;
   }
 
   @Selector([InstitutionsAdminState])
-  static getInstitutionLoading(state: InstitutionsAdminModel): boolean {
+  static getInstitutionLoading(state: InstitutionsAdminStateModel): boolean {
     return state.institution.isLoading;
   }
 }
diff --git a/src/app/features/admin-institutions/store/institutions-admin.state.ts b/src/app/features/admin-institutions/store/institutions-admin.state.ts
index 8285669a1..db763a6be 100644
--- a/src/app/features/admin-institutions/store/institutions-admin.state.ts
+++ b/src/app/features/admin-institutions/store/institutions-admin.state.ts
@@ -22,9 +22,9 @@ import {
   RequestProjectAccess,
   SendUserMessage,
 } from './institutions-admin.actions';
-import { INSTITUTIONS_ADMIN_STATE_DEFAULTS, InstitutionsAdminModel } from './institutions-admin.model';
+import { INSTITUTIONS_ADMIN_STATE_DEFAULTS, InstitutionsAdminStateModel } from './institutions-admin.model';
 
-@State<InstitutionsAdminModel>({
+@State<InstitutionsAdminStateModel>({
   name: 'institutionsAdmin',
   defaults: INSTITUTIONS_ADMIN_STATE_DEFAULTS,
 })
@@ -34,7 +34,7 @@ export class InstitutionsAdminState {
   private readonly institutionsAdminService = inject(InstitutionsAdminService);
 
   @Action(FetchInstitutionById)
-  fetchInstitutionById(ctx: StateContext<InstitutionsAdminModel>, action: FetchInstitutionById) {
+  fetchInstitutionById(ctx: StateContext<InstitutionsAdminStateModel>, action: FetchInstitutionById) {
     ctx.patchState({ institution: { data: {} as Institution, isLoading: true, error: null } });
 
     return this.institutionsService.getInstitutionById(action.institutionId).pipe(
@@ -50,7 +50,7 @@ export class InstitutionsAdminState {
   }
 
   @Action(FetchInstitutionDepartments)
-  fetchDepartments(ctx: StateContext<InstitutionsAdminModel>) {
+  fetchDepartments(ctx: StateContext<InstitutionsAdminStateModel>) {
     const state = ctx.getState();
     ctx.patchState({
       departments: { ...state.departments, isLoading: true, error: null },
@@ -69,7 +69,7 @@ export class InstitutionsAdminState {
   }
 
   @Action(FetchInstitutionSummaryMetrics)
-  fetchSummaryMetrics(ctx: StateContext<InstitutionsAdminModel>) {
+  fetchSummaryMetrics(ctx: StateContext<InstitutionsAdminStateModel>) {
     const state = ctx.getState();
     ctx.patchState({
       summaryMetrics: { ...state.summaryMetrics, isLoading: true, error: null },
@@ -87,7 +87,7 @@ export class InstitutionsAdminState {
   }
 
   @Action(FetchInstitutionSearchResults)
-  fetchSearchResults(ctx: StateContext<InstitutionsAdminModel>, action: FetchInstitutionSearchResults) {
+  fetchSearchResults(ctx: StateContext<InstitutionsAdminStateModel>, action: FetchInstitutionSearchResults) {
     const state = ctx.getState();
     ctx.patchState({
       searchResults: { ...state.searchResults, isLoading: true, error: null },
@@ -107,7 +107,7 @@ export class InstitutionsAdminState {
   }
 
   @Action(FetchHasOsfAddonSearch)
-  fetchHasOsfAddonSearch(ctx: StateContext<InstitutionsAdminModel>) {
+  fetchHasOsfAddonSearch(ctx: StateContext<InstitutionsAdminStateModel>) {
     const state = ctx.getState();
     ctx.patchState({
       hasOsfAddonSearch: { ...state.hasOsfAddonSearch, isLoading: true, error: null },
@@ -125,7 +125,7 @@ export class InstitutionsAdminState {
   }
 
   @Action(FetchStorageRegionSearch)
-  fetchStorageRegionSearch(ctx: StateContext<InstitutionsAdminModel>) {
+  fetchStorageRegionSearch(ctx: StateContext<InstitutionsAdminStateModel>) {
     const state = ctx.getState();
     ctx.patchState({
       storageRegionSearch: { ...state.storageRegionSearch, isLoading: true, error: null },
@@ -143,7 +143,7 @@ export class InstitutionsAdminState {
   }
 
   @Action(FetchInstitutionUsers)
-  fetchUsers(ctx: StateContext<InstitutionsAdminModel>, action: FetchInstitutionUsers) {
+  fetchUsers(ctx: StateContext<InstitutionsAdminStateModel>, action: FetchInstitutionUsers) {
     const state = ctx.getState();
     ctx.patchState({
       users: { ...state.users, isLoading: true, error: null },
@@ -162,7 +162,7 @@ export class InstitutionsAdminState {
   }
 
   @Action(SendUserMessage)
-  sendUserMessage(_: StateContext<InstitutionsAdminModel>, action: SendUserMessage) {
+  sendUserMessage(_: StateContext<InstitutionsAdminStateModel>, action: SendUserMessage) {
     return this.institutionsAdminService
       .sendMessage({
         userId: action.userId,
@@ -175,7 +175,7 @@ export class InstitutionsAdminState {
   }
 
   @Action(RequestProjectAccess)
-  requestProjectAccess(_: StateContext<InstitutionsAdminModel>, action: RequestProjectAccess) {
+  requestProjectAccess(_: StateContext<InstitutionsAdminStateModel>, action: RequestProjectAccess) {
     return this.institutionsAdminService
       .requestProjectAccess(action.payload)
       .pipe(catchError((error) => throwError(() => error)));
diff --git a/src/app/features/analytics/mappers/related-counts.mapper.ts b/src/app/features/analytics/mappers/related-counts.mapper.ts
index 89ba90f4f..caef745eb 100644
--- a/src/app/features/analytics/mappers/related-counts.mapper.ts
+++ b/src/app/features/analytics/mappers/related-counts.mapper.ts
@@ -1,13 +1,13 @@
-import { RelatedCountsGetResponse, RelatedCountsModel } from '../models';
+import { RelatedCountsModel, RelatedCountsResponseJsonApi } from '../models';
 
 export class RelatedCountsMapper {
-  static fromResponse(response: RelatedCountsGetResponse): RelatedCountsModel {
+  static fromResponse(response: RelatedCountsResponseJsonApi): RelatedCountsModel {
     return {
       id: response.data.id,
       isPublic: response.data.attributes.public,
-      forksCount: response.data.relationships.forks?.links.related.meta.count || 0,
-      linksToCount: response.data.relationships.linked_by_nodes?.links.related.meta.count || 0,
-      templateCount: response.meta.templated_by_count || 0,
+      forksCount: response.data.relationships.forks?.links?.related?.meta?.count ?? 0,
+      linksToCount: response.data.relationships.linked_by_nodes?.links?.related?.meta?.count ?? 0,
+      templateCount: response.meta?.templated_by_count ?? 0,
     };
   }
 }
diff --git a/src/app/features/analytics/models/node-analytics-json-api.model.ts b/src/app/features/analytics/models/node-analytics-json-api.model.ts
index e06297531..6fdf9f7be 100644
--- a/src/app/features/analytics/models/node-analytics-json-api.model.ts
+++ b/src/app/features/analytics/models/node-analytics-json-api.model.ts
@@ -1,33 +1,30 @@
-import { ResponseDataJsonApi } from '@osf/shared/models/common/json-api.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export type NodeAnalyticsResponseJsonApi = ResponseDataJsonApi<NodeAnalyticsDataJsonApi>;
+export type NodeAnalyticsResponseJsonApi = ItemResponse<NodeAnalyticsDataJsonApi>;
 
-export interface NodeAnalyticsDataJsonApi {
-  id: string;
-  type: 'node-analytics';
-  attributes: NodeAnalyticsAttributesJsonApi;
-}
+export type NodeAnalyticsDataJsonApi = JsonApiResource<'node-analytics', NodeAnalyticsAttributesJsonApi>;
 
-export interface NodeAnalyticsAttributesJsonApi {
+interface NodeAnalyticsAttributesJsonApi {
   popular_pages: PopularPageJsonApi[];
   unique_visits: UniqueVisitJsonApi[];
   time_of_day: TimeOfDayJsonApi[];
   referer_domain: RefererDomainJsonApi[];
 }
 
-export interface PopularPageJsonApi {
+interface PopularPageJsonApi {
   path: string;
   route: string;
   title: string;
   count: number;
 }
 
-export interface UniqueVisitJsonApi {
+interface UniqueVisitJsonApi {
   date: string;
   count: number;
 }
 
-export interface TimeOfDayJsonApi {
+interface TimeOfDayJsonApi {
   hour: number;
   count: number;
 }
diff --git a/src/app/features/analytics/models/related-counts-json-api.model.ts b/src/app/features/analytics/models/related-counts-json-api.model.ts
index f51b9acf4..2914a1545 100644
--- a/src/app/features/analytics/models/related-counts-json-api.model.ts
+++ b/src/app/features/analytics/models/related-counts-json-api.model.ts
@@ -1,39 +1,21 @@
-export interface RelatedCountsGetResponse {
-  data: RelatedCountsDataResponse;
-  meta: MetaGetResponse;
-}
-
-interface MetaGetResponse {
-  templated_by_count: number;
-}
-
-interface RelatedCountsDataResponse {
-  id: string;
-  attributes: RelatedCountsAttributes;
-  relationships: RelationshipsResponse;
-}
+import { RelatedCountRel } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
+import { BaseNodeAttributesJsonApi } from '@osf/shared/models/nodes/base-node-attributes-json-api.model';
 
-interface RelatedCountsAttributes {
-  public: boolean;
-}
-
-interface RelationshipsResponse {
-  forks: Relationship;
-  linked_by_nodes: Relationship;
-}
+export type RelatedCountsResponseJsonApi = ItemResponse<RelatedCountsDataJsonApi> & {
+  meta: RelatedCountsResponseMetaJsonApi;
+};
 
-interface Relationship {
-  links: Links;
+interface RelatedCountsDataJsonApi extends JsonApiResource<'related-counts', BaseNodeAttributesJsonApi> {
+  relationships: RelatedCountsRelationshipsJsonApi;
 }
 
-interface Links {
-  related: RelatedLink;
+interface RelatedCountsRelationshipsJsonApi {
+  forks?: RelatedCountRel;
+  linked_by_nodes?: RelatedCountRel;
 }
 
-interface RelatedLink {
-  meta: MetaCount;
-}
-
-interface MetaCount {
-  count: number;
+interface RelatedCountsResponseMetaJsonApi {
+  templated_by_count: number;
 }
diff --git a/src/app/features/analytics/services/resource-analytics.service.ts b/src/app/features/analytics/services/resource-analytics.service.ts
index 96a7e1bf6..019de928c 100644
--- a/src/app/features/analytics/services/resource-analytics.service.ts
+++ b/src/app/features/analytics/services/resource-analytics.service.ts
@@ -7,7 +7,7 @@ import { AnalyticsMetricsMapper, RelatedCountsMapper } from '@osf/features/analy
 import {
   NodeAnalyticsModel,
   NodeAnalyticsResponseJsonApi,
-  RelatedCountsGetResponse,
+  RelatedCountsResponseJsonApi,
 } from '@osf/features/analytics/models';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
@@ -41,7 +41,7 @@ export class ResourceAnalyticsService {
     const url = `${this.apiDomainUrl}/v2/${resourcePath}/${resourceId}/?related_counts=true`;
 
     return this.jsonApiService
-      .get<RelatedCountsGetResponse>(url)
+      .get<RelatedCountsResponseJsonApi>(url)
       .pipe(map((response) => RelatedCountsMapper.fromResponse(response)));
   }
 }
diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.spec.ts b/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.spec.ts
index 8ca0ac448..976162229 100644
--- a/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.spec.ts
+++ b/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.spec.ts
@@ -11,7 +11,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CreateCollectionSubmission } from '@osf/features/collections/store/add-to-collection/add-to-collection.actions';
 import {
   CedarMetadataAttributes,
-  CedarMetadataRecordData,
+  CedarMetadataRecordModel,
   CedarRecordDataBinding,
 } from '@osf/features/metadata/models';
 import { CreateCedarMetadataRecord, UpdateCedarMetadataRecord } from '@osf/features/metadata/store';
@@ -33,13 +33,13 @@ const MOCK_CEDAR_DATA: CedarRecordDataBinding = {
   isPublished: true,
 };
 
-const MOCK_EXISTING_CEDAR_RECORD: CedarMetadataRecordData = {
+const MOCK_EXISTING_CEDAR_RECORD: CedarMetadataRecordModel = {
   id: 'cedar-record-1',
-  attributes: { metadata: {} as CedarMetadataAttributes, is_published: true },
-  relationships: {
-    template: { data: { type: 'cedar-metadata-templates', id: 'template-1' } },
-    target: { data: { type: 'nodes', id: 'project-1' } },
-  },
+  metadata: {} as CedarMetadataAttributes,
+  isPublished: true,
+  templateId: 'template-1',
+  targetId: 'project-1',
+  schemaName: 'Test Schema',
 };
 
 describe('AddToCollectionConfirmationDialogComponent', () => {
@@ -53,7 +53,7 @@ describe('AddToCollectionConfirmationDialogComponent', () => {
       payload?: CollectionSubmissionPayload;
       project?: { id: string; isPublic: boolean };
       cedarData?: CedarRecordDataBinding | null;
-      existingCedarRecord?: CedarMetadataRecordData | null;
+      existingCedarRecord?: CedarMetadataRecordModel | null;
     };
   };
 
diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts b/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts
index 52aef57c0..b7be98cef 100644
--- a/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts
+++ b/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts
@@ -11,7 +11,7 @@ import { ChangeDetectionStrategy, Component, DestroyRef, inject, signal } from '
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 import { CreateCollectionSubmission } from '@osf/features/collections/store/add-to-collection/add-to-collection.actions';
-import { CedarMetadataRecordData, CedarRecordDataBinding } from '@osf/features/metadata/models';
+import { CedarMetadataRecordModel, CedarRecordDataBinding } from '@osf/features/metadata/models';
 import { CreateCedarMetadataRecord, UpdateCedarMetadataRecord } from '@osf/features/metadata/store';
 import { UpdateProjectPublicStatus } from '@osf/features/project/overview/store';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
@@ -26,12 +26,15 @@ import { ToastService } from '@osf/shared/services/toast.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AddToCollectionConfirmationDialogComponent {
-  private toastService = inject(ToastService);
-  dialogRef = inject(DynamicDialogRef);
-  config = inject(DynamicDialogConfig);
-  destroyRef = inject(DestroyRef);
-  isSubmitting = signal<boolean>(false);
-  actions = createDispatchMap({
+  readonly dialogRef = inject(DynamicDialogRef);
+
+  private readonly toastService = inject(ToastService);
+  private readonly config = inject(DynamicDialogConfig);
+  private readonly destroyRef = inject(DestroyRef);
+
+  readonly isSubmitting = signal<boolean>(false);
+
+  private readonly actions = createDispatchMap({
     createCollectionSubmission: CreateCollectionSubmission,
     updateProjectPublicStatus: UpdateProjectPublicStatus,
     createCedarRecord: CreateCedarMetadataRecord,
@@ -42,7 +45,7 @@ export class AddToCollectionConfirmationDialogComponent {
     const payload = this.config.data.payload;
     const project = this.config.data.project as ProjectModel | null | undefined;
     const cedarData = this.config.data.cedarData as CedarRecordDataBinding | null | undefined;
-    const existingCedarRecord = this.config.data.existingCedarRecord as CedarMetadataRecordData | null | undefined;
+    const existingCedarRecord = this.config.data.existingCedarRecord as CedarMetadataRecordModel | null | undefined;
 
     if (!payload || !project) return;
 
diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts b/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts
index 7c78df5cb..2d9b08390 100644
--- a/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts
+++ b/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts
@@ -23,7 +23,7 @@ import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
 import { UserSelectors } from '@core/store/user';
-import { CedarMetadataRecordData, CedarRecordDataBinding } from '@osf/features/metadata/models';
+import { CedarMetadataRecordModel, CedarRecordDataBinding } from '@osf/features/metadata/models';
 import {
   CreateCedarMetadataRecord,
   GetCedarMetadataRecords,
@@ -117,11 +117,11 @@ export class AddToCollectionComponent implements CanDeactivateComponent {
   isCollectionMetadataDisabled = computed(
     () => !this.selectedProject() || !this.projectMetadataSaved() || !this.projectContributorsSaved()
   );
-  existingCedarRecord = computed<CedarMetadataRecordData | null>(() => {
+  existingCedarRecord = computed<CedarMetadataRecordModel | null>(() => {
     const records = this.cedarRecords();
     const templateId = this.requiredMetadataTemplate()?.id;
     if (!records?.length || !templateId) return null;
-    return records.find((r) => r.relationships?.template?.data?.id === templateId) ?? null;
+    return records.find((r) => r.templateId === templateId) ?? null;
   });
 
   readonly actions = createDispatchMap({
diff --git a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.html b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.html
index 0b345920a..0a07bac19 100644
--- a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.html
+++ b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.html
@@ -17,7 +17,7 @@ <h3>{{ 'collections.addToCollection.collectionMetadata' | translate }}</h3>
               <cedar-artifact-viewer
                 #cedarViewer
                 [config]="cedarViewerConfig"
-                [templateObject]="cedarTpl.attributes.template"
+                [templateObject]="cedarTpl.template"
                 [instanceObject]="cedarFormData()"
               ></cedar-artifact-viewer>
             }
@@ -44,7 +44,7 @@ <h3>{{ 'collections.addToCollection.collectionMetadata' | translate }}</h3>
             <cedar-embeddable-editor
               #cedarEditor
               [config]="cedarConfig"
-              [templateObject]="cedarTpl.attributes.template"
+              [templateObject]="cedarTpl.template"
               [metadata]="cedarFormData()"
               (change)="onCedarChange($event)"
               (keyup)="onCedarChange($event)"
diff --git a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts
index 6bb079688..0a65b99f0 100644
--- a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts
+++ b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts
@@ -4,24 +4,25 @@ import { Step, StepItem, StepPanel } from 'primeng/stepper';
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CedarMetadataDataTemplateJsonApi, CedarMetadataRecordData } from '@osf/features/metadata/models';
+import { CedarMetadataRecordModel, CedarMetadataTemplateModel } from '@osf/features/metadata/models';
 
-import { MOCK_CEDAR_RECORD, MOCK_CEDAR_TEMPLATE } from '@testing/data/collections/cedar-metadata.mock';
+import { MOCK_CEDAR_RECORD } from '@testing/data/collections/cedar-metadata.mock';
+import { MOCK_CEDAR_METADATA_TEMPLATE } from '@testing/mocks/cedar-metadata-domain.mock';
 import { provideOSFCore } from '@testing/osf.testing.provider';
 import { provideMockStore } from '@testing/providers/store-provider.mock';
 
-import '@testing/mocks/cedar-embeddable-editor.mock';
-
 import { CollectionMetadataStepComponent } from './collection-metadata-step.component';
 
 describe('CollectionMetadataStepComponent', () => {
   let component: CollectionMetadataStepComponent;
   let fixture: ComponentFixture<CollectionMetadataStepComponent>;
 
+  const mockCedarTemplate = MOCK_CEDAR_METADATA_TEMPLATE;
+
   function setup(
     options: {
-      cedarTemplate?: CedarMetadataDataTemplateJsonApi | null;
-      existingCedarRecord?: CedarMetadataRecordData | null;
+      cedarTemplate?: CedarMetadataTemplateModel | null;
+      existingCedarRecord?: CedarMetadataRecordModel | null;
       stepperActiveValue?: number;
       targetStepValue?: number;
       isDisabled?: boolean;
@@ -88,13 +89,13 @@ describe('CollectionMetadataStepComponent', () => {
   });
 
   it('should accept cedar template', () => {
-    setup({ cedarTemplate: MOCK_CEDAR_TEMPLATE });
+    setup({ cedarTemplate: mockCedarTemplate });
 
-    expect(component.cedarTemplate()).toEqual(MOCK_CEDAR_TEMPLATE);
+    expect(component.cedarTemplate()).toEqual(mockCedarTemplate);
   });
 
   it('should handle discard changes without existing record', () => {
-    setup({ cedarTemplate: MOCK_CEDAR_TEMPLATE });
+    setup({ cedarTemplate: mockCedarTemplate });
 
     component.cedarFormData.set({ field: 'value' });
     component.collectionMetadataSaved.set(true);
@@ -107,7 +108,7 @@ describe('CollectionMetadataStepComponent', () => {
 
   it('should discard cedar changes to existing record metadata', () => {
     setup({
-      cedarTemplate: MOCK_CEDAR_TEMPLATE,
+      cedarTemplate: mockCedarTemplate,
       existingCedarRecord: MOCK_CEDAR_RECORD,
     });
 
@@ -122,7 +123,7 @@ describe('CollectionMetadataStepComponent', () => {
 
   it('should populate cedarFormData from existingCedarRecord', () => {
     setup({
-      cedarTemplate: MOCK_CEDAR_TEMPLATE,
+      cedarTemplate: mockCedarTemplate,
       existingCedarRecord: MOCK_CEDAR_RECORD,
     });
 
@@ -131,7 +132,7 @@ describe('CollectionMetadataStepComponent', () => {
 
   it('should not overwrite cedarFormData from API when metadata is already saved locally', () => {
     setup({
-      cedarTemplate: MOCK_CEDAR_TEMPLATE,
+      cedarTemplate: mockCedarTemplate,
       existingCedarRecord: MOCK_CEDAR_RECORD,
     });
 
@@ -140,10 +141,7 @@ describe('CollectionMetadataStepComponent', () => {
 
     fixture.componentRef.setInput('existingCedarRecord', {
       ...MOCK_CEDAR_RECORD,
-      attributes: {
-        ...MOCK_CEDAR_RECORD.attributes,
-        metadata: { field: 'api' } as unknown as CedarMetadataRecordData['attributes']['metadata'],
-      },
+      metadata: { field: 'api' } as unknown as CedarMetadataRecordModel['metadata'],
     });
     fixture.detectChanges();
 
@@ -151,7 +149,7 @@ describe('CollectionMetadataStepComponent', () => {
   });
 
   it('should not emit cedarDataSaved when handleSaveCedarMetadata is called without editor', () => {
-    setup({ cedarTemplate: MOCK_CEDAR_TEMPLATE });
+    setup({ cedarTemplate: mockCedarTemplate });
 
     const cedarDataSavedSpy = vi.spyOn(component.cedarDataSaved, 'emit');
     const stepChangeSpy = vi.spyOn(component.stepChange, 'emit');
@@ -163,7 +161,7 @@ describe('CollectionMetadataStepComponent', () => {
   });
 
   it('should handle onCedarChange event', () => {
-    setup({ cedarTemplate: MOCK_CEDAR_TEMPLATE });
+    setup({ cedarTemplate: mockCedarTemplate });
 
     const mockMetadata = { field: 'changed' };
     const mockEditor = { currentMetadata: mockMetadata };
@@ -177,7 +175,7 @@ describe('CollectionMetadataStepComponent', () => {
   });
 
   it('should not update cedarFormData when onCedarChange has no currentMetadata', () => {
-    setup({ cedarTemplate: MOCK_CEDAR_TEMPLATE });
+    setup({ cedarTemplate: mockCedarTemplate });
 
     const mockEvent = new CustomEvent('change', {});
     const mockEditor = {};
@@ -192,7 +190,7 @@ describe('CollectionMetadataStepComponent', () => {
   });
 
   it('should not emit cedarDataSaved without template', () => {
-    setup({ cedarTemplate: MOCK_CEDAR_TEMPLATE });
+    setup({ cedarTemplate: mockCedarTemplate });
 
     fixture.componentRef.setInput('cedarTemplate', null);
     fixture.detectChanges();
diff --git a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts
index 0a1934b02..d383908ec 100644
--- a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts
+++ b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts
@@ -23,8 +23,8 @@ import { AddToCollectionSteps } from '@osf/features/collections/enums';
 import { CEDAR_CONFIG, CEDAR_VIEWER_CONFIG } from '@osf/features/metadata/constants';
 import {
   CedarEditorElement,
-  CedarMetadataDataTemplateJsonApi,
-  CedarMetadataRecordData,
+  CedarMetadataRecordModel,
+  CedarMetadataTemplateModel,
   CedarRecordDataBinding,
 } from '@osf/features/metadata/models';
 
@@ -41,8 +41,8 @@ export class CollectionMetadataStepComponent {
   stepperActiveValue = input.required<number>();
   targetStepValue = input.required<number>();
   isDisabled = input.required<boolean>();
-  cedarTemplate = input<CedarMetadataDataTemplateJsonApi | null>(null);
-  existingCedarRecord = input<CedarMetadataRecordData | null>(null);
+  cedarTemplate = input<CedarMetadataTemplateModel | null>(null);
+  existingCedarRecord = input<CedarMetadataRecordModel | null>(null);
 
   stepChange = output<number>();
   cedarDataSaved = output<CedarRecordDataBinding>();
@@ -68,7 +68,7 @@ export class CollectionMetadataStepComponent {
 
   handleDiscardChanges() {
     const record = this.existingCedarRecord();
-    this.cedarFormData.set(record?.attributes?.metadata ? (record.attributes.metadata as Record<string, unknown>) : {});
+    this.cedarFormData.set(record?.metadata ? (record.metadata as Record<string, unknown>) : {});
     this.syncCedarInstance(this.cedarEditor()?.nativeElement);
     this.collectionMetadataSaved.set(false);
   }
@@ -111,8 +111,8 @@ export class CollectionMetadataStepComponent {
       if (this.collectionMetadataSaved()) return;
 
       const record = this.existingCedarRecord();
-      if (record?.attributes?.metadata) {
-        this.cedarFormData.set(record.attributes.metadata as Record<string, unknown>);
+      if (record?.metadata) {
+        this.cedarFormData.set(record.metadata as Record<string, unknown>);
       }
     });
 
@@ -122,7 +122,7 @@ export class CollectionMetadataStepComponent {
       const record = this.existingCedarRecord();
       const saved = this.collectionMetadataSaved();
 
-      if (!record?.attributes?.metadata && !saved) return;
+      if (!record?.metadata && !saved) return;
 
       this.syncCedarInstance(this.cedarEditor()?.nativeElement);
     });
diff --git a/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts b/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts
index 42e4f6c3c..bc5426251 100644
--- a/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts
+++ b/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts
@@ -38,38 +38,37 @@ const MOCK_COLLECTION_PROVIDER_WITH_TEMPLATE = {
   ...MOCK_COLLECTION_PROVIDER,
   requiredMetadataTemplate: {
     id: 'template-1',
-    type: 'cedar-metadata-templates' as const,
-    attributes: {
-      schema_name: 'Test',
-      cedar_id: 'cedar-1',
-      template: {
-        '@id': 'https://repo.metadatacenter.org/templates/test',
-        '@type': 'https://schema.metadatacenter.org/core/Template',
-        type: 'object',
-        title: 'Test',
-        description: '',
-        $schema: 'http://json-schema.org/draft-04/schema',
-        '@context': {} as never,
-        required: [],
-        properties: {
-          '@context': {
-            properties: {
-              field1: { enum: ['https://schema.metadatacenter.org/properties/test-field-uuid'] },
-            },
-          },
-          field1: {
-            '@type': 'https://schema.metadatacenter.org/core/TemplateField',
-            _valueConstraints: {
-              literals: [{ label: 'Option A' }, { label: 'Option B' }],
-            },
+    schemaName: 'Test',
+    isForCollections: false,
+    active: true,
+    cedarId: 'cedar-1',
+    template: {
+      '@id': 'https://repo.metadatacenter.org/templates/test',
+      '@type': 'https://schema.metadatacenter.org/core/Template',
+      type: 'object',
+      title: 'Test',
+      description: '',
+      $schema: 'http://json-schema.org/draft-04/schema',
+      '@context': {} as never,
+      required: [],
+      properties: {
+        '@context': {
+          properties: {
+            field1: { enum: ['https://schema.metadatacenter.org/properties/test-field-uuid'] },
           },
         },
-        _ui: {
-          order: ['field1'],
-          propertyLabels: { field1: 'Field One' },
-          propertyDescriptions: {},
+        field1: {
+          '@type': 'https://schema.metadatacenter.org/core/TemplateField',
+          _valueConstraints: {
+            literals: [{ label: 'Option A' }, { label: 'Option B' }],
+          },
         },
       },
+      _ui: {
+        order: ['field1'],
+        propertyLabels: { field1: 'Field One' },
+        propertyDescriptions: {},
+      },
     },
   },
 };
diff --git a/src/app/features/collections/components/collections-discover/collections-discover.component.ts b/src/app/features/collections/components/collections-discover/collections-discover.component.ts
index 39fc8245d..73098fc71 100644
--- a/src/app/features/collections/components/collections-discover/collections-discover.component.ts
+++ b/src/app/features/collections/components/collections-discover/collections-discover.component.ts
@@ -113,10 +113,8 @@ export class CollectionsDiscoverComponent {
 
       this.actions.setDefaultFilterValue('isPartOfCollection', collectionIri);
 
-      if (provider.requiredMetadataTemplate?.attributes?.template) {
-        const extraFilters = CedarTemplateFilterMapper.fromTemplate(
-          provider.requiredMetadataTemplate.attributes.template
-        );
+      if (provider.requiredMetadataTemplate?.template) {
+        const extraFilters = CedarTemplateFilterMapper.fromTemplate(provider.requiredMetadataTemplate.template);
         this.actions.setExtraFilters(extraFilters);
       }
 
diff --git a/src/app/features/collections/models/collection-license-json-api.model.ts b/src/app/features/collections/models/collection-license-json-api.model.ts
index 10f98c57e..13072e4ed 100644
--- a/src/app/features/collections/models/collection-license-json-api.model.ts
+++ b/src/app/features/collections/models/collection-license-json-api.model.ts
@@ -1,22 +1,24 @@
+import { ToOneRelData } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { DataResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { LicenseRecordJsonApi } from '@osf/shared/models/license/licenses-json-api.model';
 
-export interface CollectionSubmissionMetadataPayloadJsonApi {
-  data: {
-    type: 'nodes';
-    id: string;
-    relationships: {
-      license: {
-        data: {
-          id: string;
-          type: string;
-        };
-      };
-    };
-    attributes: {
-      node_license?: LicenseRecordJsonApi;
-      title?: string;
-      description?: string;
-      tags?: string[];
-    };
-  };
+export type CollectionSubmissionMetadataPayloadJsonApi = DataResponse<CollectionSubmissionMetadataDataJsonApi>;
+
+interface CollectionSubmissionMetadataDataJsonApi extends JsonApiResource<
+  'nodes',
+  CollectionSubmissionMetadataAttributesJsonApi
+> {
+  relationships: CollectionSubmissionMetadataRelationshipsJsonApi;
+}
+
+interface CollectionSubmissionMetadataAttributesJsonApi {
+  node_license?: LicenseRecordJsonApi;
+  title?: string;
+  description?: string;
+  tags?: string[];
+}
+
+interface CollectionSubmissionMetadataRelationshipsJsonApi {
+  license: ToOneRelData<'licenses'>;
 }
diff --git a/src/app/features/collections/models/project-metadata-form.model.ts b/src/app/features/collections/models/project-metadata-form.model.ts
index 464ca263a..c21bdf81f 100644
--- a/src/app/features/collections/models/project-metadata-form.model.ts
+++ b/src/app/features/collections/models/project-metadata-form.model.ts
@@ -1,8 +1,9 @@
 import { FormControl } from '@angular/forms';
 
-import { ProjectMetadataFormControls } from '@osf/features/collections/enums';
 import { LicenseModel } from '@osf/shared/models/license/license.model';
 
+import { ProjectMetadataFormControls } from '../enums';
+
 export interface ProjectMetadataForm {
   [ProjectMetadataFormControls.Title]: FormControl<string>;
   [ProjectMetadataFormControls.Description]: FormControl<string>;
diff --git a/src/app/features/collections/store/add-to-collection/add-to-collection.model.ts b/src/app/features/collections/store/add-to-collection/add-to-collection.model.ts
index ba47d319d..bbdc0823a 100644
--- a/src/app/features/collections/store/add-to-collection/add-to-collection.model.ts
+++ b/src/app/features/collections/store/add-to-collection/add-to-collection.model.ts
@@ -1,4 +1,4 @@
-import { CollectionProjectSubmission } from '@osf/shared/models/collections/collections.model';
+import { CollectionProjectSubmission } from '@osf/shared/models/collections/collection-submissions.model';
 import { LicenseModel } from '@shared/models/license/license.model';
 import { AsyncStateModel } from '@shared/models/store/async-state.model';
 
diff --git a/src/app/features/files/mappers/file-custom-metadata.mapper.ts b/src/app/features/files/mappers/file-custom-metadata.mapper.ts
index 1292bd004..233dd0a2c 100644
--- a/src/app/features/files/mappers/file-custom-metadata.mapper.ts
+++ b/src/app/features/files/mappers/file-custom-metadata.mapper.ts
@@ -1,10 +1,9 @@
-import { ApiData } from '@osf/shared/models/common/json-api.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { OsfFileCustomMetadata } from '../models/file-custom-metadata.model';
-import { FileCustomMetadata } from '../models/get-file-metadata-response.model';
+import { FileCustomMetadataDataJsonApi } from '../models/file-metadata-response.model';
 
-export function MapFileCustomMetadata(data: ApiData<FileCustomMetadata, null, null, null>): OsfFileCustomMetadata {
+export function MapFileCustomMetadata(data: FileCustomMetadataDataJsonApi): OsfFileCustomMetadata {
   return {
     id: data.id,
     description: replaceBadEncodedChars(data.attributes.description),
diff --git a/src/app/features/files/mappers/file-revision.mapper.ts b/src/app/features/files/mappers/file-revision.mapper.ts
index 34c6b08a4..83268af3a 100644
--- a/src/app/features/files/mappers/file-revision.mapper.ts
+++ b/src/app/features/files/mappers/file-revision.mapper.ts
@@ -1,14 +1,11 @@
-import { ApiData } from '@osf/shared/models/common/json-api.model';
-
 import { OsfFileRevision } from '../models/file-revisions.model';
-import { FileRevisionJsonApi } from '../models/get-file-revisions-response.model';
+import { FileRevisionDataJsonApi } from '../models/file-revisions-response.model';
 
-export function MapFileRevision(data: ApiData<FileRevisionJsonApi, null, null, null>[]): OsfFileRevision[] {
-  const revision = data.map((revision) => ({
+export function MapFileRevision(data: FileRevisionDataJsonApi[]): OsfFileRevision[] {
+  return data.map((revision) => ({
     downloads: revision.attributes.extra.downloads ?? 0,
     hashes: { md5: revision.attributes.extra.hashes?.md5, sha256: revision.attributes.extra.hashes?.sha256 },
     dateTime: new Date(revision.attributes.modified_utc),
     version: revision.attributes.version,
   }));
-  return revision;
 }
diff --git a/src/app/features/files/mappers/resource-metadata.mapper.ts b/src/app/features/files/mappers/resource-metadata.mapper.ts
index 5fc0e6fc0..827c3e92b 100644
--- a/src/app/features/files/mappers/resource-metadata.mapper.ts
+++ b/src/app/features/files/mappers/resource-metadata.mapper.ts
@@ -2,12 +2,12 @@ import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper';
 import { ResourceMetadata } from '@osf/shared/models/resource-metadata.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
-import { GetResourceCustomMetadataResponse } from '../models/get-resource-custom-metadata-response.model';
-import { GetResourceShortInfoResponse } from '../models/get-resource-short-info-response.model';
+import { NodeShortInfoResponse } from '../models/node-short-info-response.model';
+import { ResourceCustomMetadataResponse } from '../models/resource-custom-metadata-response.model';
 
 export function MapResourceMetadata(
-  shortInfo: GetResourceShortInfoResponse,
-  customMetadata: GetResourceCustomMetadataResponse
+  shortInfo: NodeShortInfoResponse,
+  customMetadata: ResourceCustomMetadataResponse
 ): ResourceMetadata {
   return {
     title: replaceBadEncodedChars(shortInfo.data.attributes.title),
diff --git a/src/app/features/files/models/file-metadata-response.model.ts b/src/app/features/files/models/file-metadata-response.model.ts
new file mode 100644
index 000000000..925861218
--- /dev/null
+++ b/src/app/features/files/models/file-metadata-response.model.ts
@@ -0,0 +1,16 @@
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+export type FileMetadataResponse = ItemResponse<FileCustomMetadataDataJsonApi>;
+
+export type FileCustomMetadataDataJsonApi = JsonApiResource<
+  'custom_file_metadata_records',
+  FileCustomMetadataAttributesJsonApi
+>;
+
+interface FileCustomMetadataAttributesJsonApi {
+  description: string;
+  language: string;
+  resource_type_general: string;
+  title: string;
+}
diff --git a/src/app/features/files/models/file-revisions-response.model.ts b/src/app/features/files/models/file-revisions-response.model.ts
new file mode 100644
index 000000000..0ee38dddd
--- /dev/null
+++ b/src/app/features/files/models/file-revisions-response.model.ts
@@ -0,0 +1,23 @@
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { DataResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+export type FileRevisionsResponse = DataResponse<FileRevisionDataJsonApi[]>;
+
+export type FileRevisionDataJsonApi = JsonApiResource<string, FileRevisionAttributesJsonApi>;
+
+interface FileRevisionAttributesJsonApi {
+  extra: FileRevisionExtraJsonApi;
+  modified: string;
+  modified_utc: string;
+  version: string;
+}
+
+interface FileRevisionExtraJsonApi {
+  downloads: number;
+  hashes: FileRevisionHashesJsonApi;
+}
+
+interface FileRevisionHashesJsonApi {
+  md5: string;
+  sha256: string;
+}
diff --git a/src/app/features/files/models/get-custom-metadata-response.model.ts b/src/app/features/files/models/get-custom-metadata-response.model.ts
deleted file mode 100644
index 4420eff6e..000000000
--- a/src/app/features/files/models/get-custom-metadata-response.model.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models/common/json-api.model';
-
-export type GetCustomMetadataResponse = JsonApiResponse<ApiData<null, MetadataEmbedResponse, null, null>, null>;
-
-export interface MetadataEmbedResponse {
-  custom_metadata: JsonApiResponse<
-    ApiData<
-      {
-        language: string;
-        resource_type_general: string;
-        funders: {
-          funder_name: string;
-          funder_identifier: string;
-          funder_identifier_type: string;
-          award_number: string;
-          award_uri: string;
-          award_title: string;
-        }[];
-      },
-      null,
-      null,
-      null
-    >,
-    null
-  >;
-}
diff --git a/src/app/features/files/models/get-file-metadata-response.model.ts b/src/app/features/files/models/get-file-metadata-response.model.ts
deleted file mode 100644
index 7f0662855..000000000
--- a/src/app/features/files/models/get-file-metadata-response.model.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models/common/json-api.model';
-
-export type GetFileMetadataResponse = JsonApiResponse<ApiData<FileCustomMetadata, null, null, null>, null>;
-
-export interface FileCustomMetadata {
-  language: string;
-  resource_type_general: string;
-  title: string;
-  description: string;
-}
diff --git a/src/app/features/files/models/get-file-revisions-response.model.ts b/src/app/features/files/models/get-file-revisions-response.model.ts
deleted file mode 100644
index 04de4bc59..000000000
--- a/src/app/features/files/models/get-file-revisions-response.model.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models/common/json-api.model';
-
-export interface FileRevisionJsonApi {
-  extra: {
-    downloads: number;
-    hashes: {
-      md5: string;
-      sha256: string;
-    };
-  };
-  version: string;
-  modified: string;
-  modified_utc: string;
-}
-
-export type GetFileRevisionsResponse = JsonApiResponse<ApiData<FileRevisionJsonApi, null, null, null>[], null>;
diff --git a/src/app/features/files/models/get-resource-custom-metadata-response.model.ts b/src/app/features/files/models/get-resource-custom-metadata-response.model.ts
deleted file mode 100644
index 10e121cfa..000000000
--- a/src/app/features/files/models/get-resource-custom-metadata-response.model.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models/common/json-api.model';
-
-export type GetResourceCustomMetadataResponse = JsonApiResponse<
-  ApiData<null, ResourceMetadataEmbedResponse, null, null>,
-  null
->;
-
-export interface ResourceMetadataEmbedResponse {
-  custom_metadata: JsonApiResponse<
-    ApiData<
-      {
-        language: string;
-        resource_type_general: string;
-        funders: {
-          funder_name: string;
-          funder_identifier: string;
-          funder_identifier_type: string;
-          award_number: string;
-          award_uri: string;
-          award_title: string;
-        }[];
-      },
-      null,
-      null,
-      null
-    >,
-    null
-  >;
-}
diff --git a/src/app/features/files/models/get-resource-short-info-response.model.ts b/src/app/features/files/models/get-resource-short-info-response.model.ts
deleted file mode 100644
index 831a33f76..000000000
--- a/src/app/features/files/models/get-resource-short-info-response.model.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models/common/json-api.model';
-import { IdentifiersResponseJsonApi } from '@osf/shared/models/identifiers/identifier-json-api.model';
-
-export type GetResourceShortInfoResponse = JsonApiResponse<
-  ApiData<
-    {
-      title: string;
-      description: string;
-      date_created: string;
-      date_modified: string;
-    },
-    { identifiers: IdentifiersResponseJsonApi },
-    null,
-    null
-  >,
-  null
->;
diff --git a/src/app/features/files/models/get-short-info-response.model.ts b/src/app/features/files/models/get-short-info-response.model.ts
deleted file mode 100644
index 2fd10f273..000000000
--- a/src/app/features/files/models/get-short-info-response.model.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models/common/json-api.model';
-import { IdentifiersResponseJsonApi } from '@osf/shared/models/identifiers/identifier-json-api.model';
-
-export type GetShortInfoResponse = JsonApiResponse<
-  ApiData<
-    {
-      title: string;
-      description: string;
-      date_created: string;
-      date_modified: string;
-    },
-    { identifiers: IdentifiersResponseJsonApi },
-    null,
-    null
-  >,
-  null
->;
diff --git a/src/app/features/files/models/node-short-info-response.model.ts b/src/app/features/files/models/node-short-info-response.model.ts
new file mode 100644
index 000000000..13a248d8e
--- /dev/null
+++ b/src/app/features/files/models/node-short-info-response.model.ts
@@ -0,0 +1,20 @@
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
+import { IdentifiersResponseJsonApi } from '@osf/shared/models/identifiers/identifier-json-api.model';
+
+export type NodeShortInfoResponse = ItemResponse<NodeShortInfoDataJsonApi>;
+
+export interface NodeShortInfoDataJsonApi extends JsonApiResource<string, NodeShortInfoAttributesJsonApi> {
+  embeds?: NodeShortInfoEmbedsJsonApi;
+}
+
+interface NodeShortInfoAttributesJsonApi {
+  date_created: string;
+  date_modified: string;
+  description: string;
+  title: string;
+}
+
+interface NodeShortInfoEmbedsJsonApi {
+  identifiers: IdentifiersResponseJsonApi;
+}
diff --git a/src/app/features/files/models/resource-custom-metadata-response.model.ts b/src/app/features/files/models/resource-custom-metadata-response.model.ts
new file mode 100644
index 000000000..debe5a66b
--- /dev/null
+++ b/src/app/features/files/models/resource-custom-metadata-response.model.ts
@@ -0,0 +1,30 @@
+import { Embed } from '@osf/shared/models/common/json-api/embeds.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+export type ResourceCustomMetadataResponse = ItemResponse<ResourceCustomMetadataGuidDataJsonApi>;
+
+export interface ResourceCustomMetadataGuidDataJsonApi extends JsonApiResource<'guids', Record<string, never>> {
+  embeds: ResourceCustomMetadataEmbedsJsonApi;
+}
+
+interface ResourceCustomMetadataEmbedsJsonApi {
+  custom_metadata: Embed<CustomMetadataDataJsonApi>;
+}
+
+type CustomMetadataDataJsonApi = JsonApiResource<'custom-metadata-records', CustomMetadataAttributesJsonApi>;
+
+interface CustomMetadataAttributesJsonApi {
+  funders: CustomMetadataFunderJsonApi[];
+  language: string;
+  resource_type_general: string;
+}
+
+interface CustomMetadataFunderJsonApi {
+  award_number: string;
+  award_title: string;
+  award_uri: string;
+  funder_identifier: string;
+  funder_identifier_type: string;
+  funder_name: string;
+}
diff --git a/src/app/features/files/pages/file-detail/file-detail.component.spec.ts b/src/app/features/files/pages/file-detail/file-detail.component.spec.ts
index 6cb497816..275f16279 100644
--- a/src/app/features/files/pages/file-detail/file-detail.component.spec.ts
+++ b/src/app/features/files/pages/file-detail/file-detail.component.spec.ts
@@ -8,10 +8,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import {
-  CedarMetadataDataTemplateJsonApi,
-  CedarMetadataRecordData,
+  CedarMetadataRecordModel,
+  CedarMetadataTemplateModel,
   CedarRecordDataBinding,
-  CedarTemplate,
 } from '@osf/features/metadata/models';
 import { GetCedarMetadataRecords, MetadataSelectors, UpdateCedarMetadataRecord } from '@osf/features/metadata/store';
 import { LoadingSpinnerComponent } from '@osf/shared/components/loading-spinner/loading-spinner.component';
@@ -349,26 +348,22 @@ describe('FileDetailComponent', () => {
   });
 
   it('should select cedar record when metadata tab matches cedar record id', () => {
-    const cedarRecord = {
+    const cedarRecord: CedarMetadataRecordModel = {
       id: 'rec-1',
-      attributes: {
-        metadata: {},
-        is_published: false,
-      },
-      relationships: {
-        template: { data: { type: 'cedar-metadata-templates', id: 'tpl-1' } },
-        target: { data: { type: 'files', id: 'file-1' } },
-      },
-    } as CedarMetadataRecordData;
-    const cedarTemplate = {
+      metadata: {} as CedarMetadataRecordModel['metadata'],
+      isPublished: false,
+      templateId: 'tpl-1',
+      targetId: 'file-1',
+      schemaName: 'Schema A',
+    };
+    const cedarTemplate: CedarMetadataTemplateModel = {
       id: 'tpl-1',
-      type: 'cedar-metadata-templates',
-      attributes: {
-        schema_name: 'Schema A',
-        cedar_id: 'cedar',
-        template: {} as CedarTemplate,
-      },
-    } as CedarMetadataDataTemplateJsonApi;
+      schemaName: 'Schema A',
+      isForCollections: false,
+      active: true,
+      cedarId: 'cedar',
+      template: {} as CedarMetadataTemplateModel['template'],
+    };
     setup({
       selectorOverrides: [
         { selector: MetadataSelectors.getCedarRecords, value: [cedarRecord] },
@@ -383,26 +378,22 @@ describe('FileDetailComponent', () => {
   });
 
   it('should dispatch cedar update and refresh records on cedar form submit', async () => {
-    const cedarRecord = {
+    const cedarRecord: CedarMetadataRecordModel = {
       id: 'rec-1',
-      attributes: {
-        metadata: {},
-        is_published: false,
-      },
-      relationships: {
-        template: { data: { type: 'cedar-metadata-templates', id: 'tpl-1' } },
-        target: { data: { type: 'files', id: 'file-1' } },
-      },
-    } as CedarMetadataRecordData;
-    const cedarTemplate = {
+      metadata: {} as CedarMetadataRecordModel['metadata'],
+      isPublished: false,
+      templateId: 'tpl-1',
+      targetId: 'file-1',
+      schemaName: 'Schema A',
+    };
+    const cedarTemplate: CedarMetadataTemplateModel = {
       id: 'tpl-1',
-      type: 'cedar-metadata-templates',
-      attributes: {
-        schema_name: 'Schema A',
-        cedar_id: 'cedar',
-        template: {} as CedarTemplate,
-      },
-    } as CedarMetadataDataTemplateJsonApi;
+      schemaName: 'Schema A',
+      isForCollections: false,
+      active: true,
+      cedarId: 'cedar',
+      template: {} as CedarMetadataTemplateModel['template'],
+    };
     setup({
       selectorOverrides: [
         { selector: MetadataSelectors.getCedarRecords, value: [cedarRecord] },
diff --git a/src/app/features/files/pages/file-detail/file-detail.component.ts b/src/app/features/files/pages/file-detail/file-detail.component.ts
index 4e1591d22..e9d72d80d 100644
--- a/src/app/features/files/pages/file-detail/file-detail.component.ts
+++ b/src/app/features/files/pages/file-detail/file-detail.component.ts
@@ -24,8 +24,8 @@ import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
 import {
-  CedarMetadataDataTemplateJsonApi,
-  CedarMetadataRecordData,
+  CedarMetadataRecordModel,
+  CedarMetadataTemplateModel,
   CedarRecordDataBinding,
 } from '@osf/features/metadata/models';
 import {
@@ -182,8 +182,8 @@ export class FileDetailComponent implements OnDestroy {
 
   selectedMetadataTab = signal('osf');
 
-  selectedCedarRecord = signal<CedarMetadataRecordData | null>(null);
-  selectedCedarTemplate = signal<CedarMetadataDataTemplateJsonApi | null>(null);
+  selectedCedarRecord = signal<CedarMetadataRecordModel | null>(null);
+  selectedCedarTemplate = signal<CedarMetadataTemplateModel | null>(null);
   cedarFormReadonly = signal<boolean>(true);
 
   canManageFileActions = computed(() => !this.isAnonymous() && !this.hasViewOnly() && this.hasWriteAccess());
@@ -394,7 +394,7 @@ export class FileDetailComponent implements OnDestroy {
     this.selectedCedarRecord.set(record);
     this.cedarFormReadonly.set(true);
 
-    const templateId = record.relationships?.template?.data?.id;
+    const templateId = record.templateId;
 
     if (templateId && templates?.data) {
       const template = templates.data.find((t) => t.id === templateId);
@@ -419,7 +419,7 @@ export class FileDetailComponent implements OnDestroy {
       const cedarTabs =
         records?.map((record) => ({
           id: record.id || '',
-          label: record.embeds?.template?.data?.attributes?.schema_name || `Record ${record.id}`,
+          label: record.schemaName || `Record ${record.id}`,
           type: MetadataResourceEnum.CEDAR,
         })) || [];
 
diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts
index 9b84843c5..5813dfce0 100644
--- a/src/app/features/files/store/files.state.ts
+++ b/src/app/features/files/store/files.state.ts
@@ -159,11 +159,11 @@ export class FilesState {
     ctx.patchState({ tags: { ...state.tags, isLoading: true, error: null } });
 
     return this.filesService.getFileTarget(action.fileGuid).pipe(
-      tap(({ file, meta }) => {
+      tap(({ file, isAnonymous }) => {
         ctx.patchState({
           openedFile: { data: file, isLoading: false, error: null },
           tags: { data: file.tags, isLoading: false, error: null },
-          isAnonymous: meta?.anonymous ?? false,
+          isAnonymous,
         });
       }),
       catchError((error) => handleSectionError(ctx, 'openedFile', error))
@@ -267,11 +267,11 @@ export class FilesState {
       tap((response) =>
         ctx.patchState({
           rootFolders: {
-            data: response.files,
+            data: response.data,
             isLoading: false,
             error: null,
           },
-          isAnonymous: response.meta?.anonymous ?? false,
+          isAnonymous: response.isAnonymous,
         })
       ),
       catchError((error) => handleSectionError(ctx, 'rootFolders', error))
@@ -287,11 +287,11 @@ export class FilesState {
       tap((response) =>
         ctx.patchState({
           moveDialogRootFolders: {
-            data: response.files,
+            data: response.data,
             isLoading: false,
             error: null,
           },
-          isAnonymous: response.meta?.anonymous ?? false,
+          isAnonymous: response.isAnonymous,
         })
       ),
       catchError((error) => handleSectionError(ctx, 'moveDialogRootFolders', error))
diff --git a/src/app/features/home/pages/dashboard/dashboard.component.ts b/src/app/features/home/pages/dashboard/dashboard.component.ts
index 63ec0f106..886c670fc 100644
--- a/src/app/features/home/pages/dashboard/dashboard.component.ts
+++ b/src/app/features/home/pages/dashboard/dashboard.component.ts
@@ -23,7 +23,7 @@ import { SearchInputComponent } from '@osf/shared/components/search-input/search
 import { SubHeaderComponent } from '@osf/shared/components/sub-header/sub-header.component';
 import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { SortOrder } from '@osf/shared/enums/sort-order.enum';
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { MyResourcesSearchFilters } from '@osf/shared/models/my-resources/my-resources-search-filters.model';
 import { CustomDialogService } from '@osf/shared/services/custom-dialog.service';
 import { ProjectRedirectDialogService } from '@osf/shared/services/project-redirect-dialog.service';
diff --git a/src/app/features/meetings/mappers/meetings.mapper.ts b/src/app/features/meetings/mappers/meetings.mapper.ts
index f967aa4bb..bd34d187f 100644
--- a/src/app/features/meetings/mappers/meetings.mapper.ts
+++ b/src/app/features/meetings/mappers/meetings.mapper.ts
@@ -1,15 +1,15 @@
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import {
-  MeetingGetResponseJsonApi,
-  MeetingSubmissionGetResponseJsonApi,
+  MeetingDataJsonApi,
+  MeetingsListResponseJsonApi,
+  MeetingSubmissionsListResponseJsonApi,
   MeetingSubmissionsWithPaging,
   MeetingsWithPaging,
 } from '../models';
 
 export class MeetingsMapper {
-  static fromMeetingsGetResponse(response: ResponseJsonApi<MeetingGetResponseJsonApi[]>): MeetingsWithPaging {
+  static fromMeetingsGetResponse(response: MeetingsListResponseJsonApi): MeetingsWithPaging {
     return {
       data: response.data.map((item) => ({
         id: item.id,
@@ -24,7 +24,7 @@ export class MeetingsMapper {
   }
 
   static fromMeetingSubmissionGetResponse(
-    response: ResponseJsonApi<MeetingSubmissionGetResponseJsonApi[]>
+    response: MeetingSubmissionsListResponseJsonApi
   ): MeetingSubmissionsWithPaging {
     return {
       data: response.data.map((item) => ({
@@ -40,7 +40,7 @@ export class MeetingsMapper {
     };
   }
 
-  static fromMeetingGetResponse(response: MeetingGetResponseJsonApi) {
+  static fromMeetingGetResponse(response: MeetingDataJsonApi) {
     return {
       id: response.id,
       name: response.attributes.name,
diff --git a/src/app/features/meetings/models/meetings-json-api.model.ts b/src/app/features/meetings/models/meetings-json-api.model.ts
index b2d77d7e1..c66e38c64 100644
--- a/src/app/features/meetings/models/meetings-json-api.model.ts
+++ b/src/app/features/meetings/models/meetings-json-api.model.ts
@@ -1,28 +1,36 @@
 import { NumberOrNull, StringOrNull } from '@osf/shared/helpers/types.helper';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export interface MeetingGetResponseJsonApi {
-  id: string;
-  type: 'meetings';
-  attributes: {
-    name: string;
-    location: string;
-    start_date: Date;
-    end_date: Date;
-    submissions_count: number;
-  };
+export type MeetingsListResponseJsonApi = ListResponse<MeetingDataJsonApi>;
+export type MeetingSubmissionsListResponseJsonApi = ListResponse<MeetingSubmissionDataJsonApi>;
+export type MeetingResponseJsonApi = ItemResponse<MeetingDataJsonApi>;
+
+export type MeetingDataJsonApi = JsonApiResource<'meetings', MeetingAttributesJsonApi>;
+
+export interface MeetingSubmissionDataJsonApi extends JsonApiResource<
+  'meeting-submissions',
+  MeetingSubmissionAttributesJsonApi
+> {
+  links: MeetingSubmissionLinksJsonApi;
+}
+
+interface MeetingAttributesJsonApi {
+  end_date: Date;
+  location: string;
+  name: string;
+  start_date: Date;
+  submissions_count: number;
+}
+
+interface MeetingSubmissionAttributesJsonApi {
+  author_name: string;
+  date_created: Date;
+  download_count: NumberOrNull;
+  meeting_category: string;
+  title: string;
 }
 
-export interface MeetingSubmissionGetResponseJsonApi {
-  id: string;
-  type: 'meeting-submissions';
-  attributes: {
-    title: string;
-    date_created: Date;
-    author_name: string;
-    download_count: NumberOrNull;
-    meeting_category: string;
-  };
-  links: {
-    download: StringOrNull;
-  };
+interface MeetingSubmissionLinksJsonApi {
+  download: StringOrNull;
 }
diff --git a/src/app/features/meetings/services/meetings.service.ts b/src/app/features/meetings/services/meetings.service.ts
index d3dc25201..d0f95e029 100644
--- a/src/app/features/meetings/services/meetings.service.ts
+++ b/src/app/features/meetings/services/meetings.service.ts
@@ -4,15 +4,15 @@ import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { searchPreferencesToJsonApiQueryParams } from '@osf/shared/helpers/search-pref-to-json-api-query-params.helper';
-import { JsonApiResponse, ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { SearchFilters } from '@osf/shared/models/search-filters.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 import { meetingSortFieldMap, meetingSubmissionSortFieldMap } from '../constants';
 import { MeetingsMapper } from '../mappers';
 import {
-  MeetingGetResponseJsonApi,
-  MeetingSubmissionGetResponseJsonApi,
+  MeetingResponseJsonApi,
+  MeetingsListResponseJsonApi,
+  MeetingSubmissionsListResponseJsonApi,
   MeetingSubmissionsWithPaging,
   MeetingsWithPaging,
 } from '../models';
@@ -38,7 +38,7 @@ export class MeetingsService {
     );
 
     return this.jsonApiService
-      .get<ResponseJsonApi<MeetingGetResponseJsonApi[]>>(this.apiUrl, params)
+      .get<MeetingsListResponseJsonApi>(this.apiUrl, params)
       .pipe(map((response) => MeetingsMapper.fromMeetingsGetResponse(response)));
   }
 
@@ -57,13 +57,13 @@ export class MeetingsService {
     );
 
     return this.jsonApiService
-      .get<ResponseJsonApi<MeetingSubmissionGetResponseJsonApi[]>>(`${this.apiUrl}${meetingId}/submissions/`, params)
+      .get<MeetingSubmissionsListResponseJsonApi>(`${this.apiUrl}${meetingId}/submissions/`, params)
       .pipe(map((response) => MeetingsMapper.fromMeetingSubmissionGetResponse(response)));
   }
 
   getMeetingById(meetingId: string) {
     return this.jsonApiService
-      .get<JsonApiResponse<MeetingGetResponseJsonApi, null>>(this.apiUrl + meetingId)
+      .get<MeetingResponseJsonApi>(this.apiUrl + meetingId)
       .pipe(map((response) => MeetingsMapper.fromMeetingGetResponse(response.data)));
   }
 }
diff --git a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.html b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.html
index 9fbe071e8..634051a81 100644
--- a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.html
+++ b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.html
@@ -2,7 +2,7 @@
   <div class="cedar-template-form bg-white">
     @if (readonly()) {
       <div class="flex justify-content-between gap-4 p-4">
-        @if (existingRecord()?.attributes?.is_published) {
+        @if (existingRecord()?.isPublished) {
           <h3 class="text-lg">{{ 'project.metadata.addMetadata.publishedText' | translate }}</h3>
         } @else {
           <h3 class="text-lg text-red-500">{{ 'project.metadata.addMetadata.notPublishedText' | translate }}</h3>
@@ -58,14 +58,14 @@ <h3 class="text-lg text-red-500">{{ 'project.metadata.addMetadata.notPublishedTe
         <cedar-artifact-viewer
           #cedarViewer
           [config]="cedarViewerConfig"
-          [templateObject]="template().attributes.template"
+          [templateObject]="template().template"
           [instanceObject]="formData()"
         ></cedar-artifact-viewer>
       } @else {
         <cedar-embeddable-editor
           #cedarEditor
           [config]="cedarConfig"
-          [templateObject]="template().attributes.template"
+          [templateObject]="template().template"
           [metadata]="formData()"
           (change)="onCedarChange($event)"
           (pointerover)="validateCedarMetadata()"
diff --git a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.spec.ts b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.spec.ts
index a4fc5693e..83bc459ae 100644
--- a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.spec.ts
+++ b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.spec.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router';
 
 import { CedarMetadataHelper } from '@osf/features/metadata/helpers';
 
-import { CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK } from '@testing/mocks/cedar-metadata-data-template-json-api.mock';
+import { MOCK_CEDAR_METADATA_RECORD, MOCK_CEDAR_METADATA_TEMPLATE } from '@testing/mocks/cedar-metadata-domain.mock';
 import { provideOSFCore } from '@testing/osf.testing.provider';
 import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
 
@@ -15,7 +15,8 @@ describe('CedarTemplateFormComponent', () => {
   let component: CedarTemplateFormComponent;
   let fixture: ComponentFixture<CedarTemplateFormComponent>;
 
-  const mockTemplate = CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK;
+  const mockTemplate = MOCK_CEDAR_METADATA_TEMPLATE;
+  const mockRecord = MOCK_CEDAR_METADATA_RECORD;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -43,10 +44,10 @@ describe('CedarTemplateFormComponent', () => {
   });
 
   it('should set existingRecord input', () => {
-    fixture.componentRef.setInput('existingRecord', mockTemplate);
+    fixture.componentRef.setInput('existingRecord', mockRecord);
     fixture.detectChanges();
 
-    expect(component.existingRecord()).toEqual(mockTemplate);
+    expect(component.existingRecord()).toEqual(mockRecord);
   });
 
   it('should set readonly input', () => {
diff --git a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts
index 76bbf33ed..3072ae81d 100644
--- a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts
+++ b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts
@@ -30,8 +30,8 @@ import { CEDAR_CONFIG, CEDAR_VIEWER_CONFIG } from '../../constants';
 import { CedarMetadataHelper } from '../../helpers';
 import {
   CedarEditorElement,
-  CedarMetadataDataTemplateJsonApi,
-  CedarMetadataRecordData,
+  CedarMetadataRecordModel,
+  CedarMetadataTemplateModel,
   CedarRecordDataBinding,
 } from '../../models';
 
@@ -49,8 +49,8 @@ export class CedarTemplateFormComponent {
   changeTemplate = output<void>();
   toggleEditMode = output<void>();
 
-  template = input.required<CedarMetadataDataTemplateJsonApi>();
-  existingRecord = input<CedarMetadataRecordData | null>(null);
+  template = input.required<CedarMetadataTemplateModel>();
+  existingRecord = input<CedarMetadataRecordModel | null>(null);
   readonly = input<boolean>(false);
   showEditButton = input<boolean>(false);
 
@@ -91,14 +91,14 @@ export class CedarTemplateFormComponent {
   constructor() {
     effect(() => {
       const tpl = this.template();
-      if (tpl?.attributes?.template) {
+      if (tpl?.template) {
         this.initializeCedar();
       }
     });
 
     effect(() => {
       const record = this.existingRecord();
-      this.schemaName.set(record?.embeds?.template.data.attributes.schema_name || '');
+      this.schemaName.set(record?.schemaName || '');
       if (record) {
         this.initializeCedar();
       }
@@ -106,7 +106,7 @@ export class CedarTemplateFormComponent {
   }
 
   private initializeCedar(): void {
-    const metadata = this.existingRecord()?.attributes?.metadata;
+    const metadata = this.existingRecord()?.metadata;
     const editor = this.cedarEditor()?.nativeElement;
     const viewer = this.cedarViewer()?.nativeElement;
 
@@ -126,9 +126,9 @@ export class CedarTemplateFormComponent {
   }
 
   private initializeFormData(): void {
-    const template = this.template()?.attributes?.template;
+    const template = this.template()?.template;
     if (!template) return;
-    const metadata = this.existingRecord()?.attributes?.metadata;
+    const metadata = this.existingRecord()?.metadata;
     if (this.existingRecord()) {
       const structuredMetadata = CedarMetadataHelper.buildStructuredMetadata(metadata);
       this.formData.set(structuredMetadata);
diff --git a/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.html b/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.html
index 67e98e8f0..8332fca90 100644
--- a/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.html
+++ b/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.html
@@ -26,7 +26,7 @@
   <div class="mt-2">
     <cedar-artifact-viewer
       [config]="cedarViewerConfig"
-      [templateObject]="cedarTemplate()!.attributes.template"
+      [templateObject]="cedarTemplate()!.template"
       [instanceObject]="cedarMetadata()"
     ></cedar-artifact-viewer>
   </div>
diff --git a/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.spec.ts b/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.spec.ts
index 7f0606a4a..8ecd342d8 100644
--- a/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.spec.ts
+++ b/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideRouter } from '@angular/router';
 
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmission } from '@osf/shared/models/collections/collection-submissions.model';
 
 import {
   MOCK_CEDAR_RECORD,
diff --git a/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.ts b/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.ts
index d1d5d0967..7ddc37f58 100644
--- a/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.ts
+++ b/src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.ts
@@ -13,12 +13,13 @@ import {
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
-import { CEDAR_VIEWER_CONFIG } from '@osf/features/metadata/constants';
-import { CedarMetadataDataTemplateJsonApi, CedarMetadataRecordData } from '@osf/features/metadata/models';
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmission } from '@osf/shared/models/collections/collection-submissions.model';
 import { CollectionStatusSeverityPipe } from '@osf/shared/pipes/collection-status-severity.pipe';
 
+import { CEDAR_VIEWER_CONFIG } from '../../constants';
+import { CedarMetadataRecordModel, CedarMetadataTemplateModel } from '../../models';
+
 @Component({
   selector: 'osf-metadata-collection-item',
   imports: [TranslatePipe, Tag, Button, RouterLink, CollectionStatusSeverityPipe],
@@ -32,8 +33,8 @@ export class MetadataCollectionItemComponent {
   readonly CollectionSubmissionReviewState = CollectionSubmissionReviewState;
 
   submission = input.required<CollectionSubmission>();
-  cedarRecord = input<CedarMetadataRecordData | null>(null);
-  cedarTemplate = input<CedarMetadataDataTemplateJsonApi | null>(null);
+  cedarRecord = input<CedarMetadataRecordModel | null>(null);
+  cedarTemplate = input<CedarMetadataTemplateModel | null>(null);
 
   cedarViewerConfig = CEDAR_VIEWER_CONFIG;
 
@@ -48,12 +49,12 @@ export class MetadataCollectionItemComponent {
   showCedarViewer = computed(
     () =>
       !!this.cedarRecord() &&
-      !!this.cedarTemplate()?.attributes?.template &&
+      !!this.cedarTemplate()?.template &&
       this.submission().reviewsState !== CollectionSubmissionReviewState.Removed
   );
 
   cedarMetadata = computed(() => {
     const record = this.cedarRecord();
-    return record?.attributes?.metadata ? (record.attributes.metadata as Record<string, unknown>) : {};
+    return record?.metadata ? (record.metadata as Record<string, unknown>) : {};
   });
 }
diff --git a/src/app/features/metadata/components/metadata-collections/metadata-collections.component.ts b/src/app/features/metadata/components/metadata-collections/metadata-collections.component.ts
index eb46f0dda..8102cef73 100644
--- a/src/app/features/metadata/components/metadata-collections/metadata-collections.component.ts
+++ b/src/app/features/metadata/components/metadata-collections/metadata-collections.component.ts
@@ -5,9 +5,9 @@ import { Skeleton } from 'primeng/skeleton';
 
 import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
 
-import { CedarMetadataDataTemplateJsonApi, CedarMetadataRecordData } from '@osf/features/metadata/models';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmission } from '@osf/shared/models/collections/collection-submissions.model';
 
+import { CedarMetadataRecordModel, CedarMetadataTemplateModel } from '../../models';
 import { MetadataCollectionItemComponent } from '../metadata-collection-item/metadata-collection-item.component';
 
 @Component({
@@ -20,14 +20,14 @@ import { MetadataCollectionItemComponent } from '../metadata-collection-item/met
 export class MetadataCollectionsComponent {
   projectSubmissions = input<CollectionSubmission[] | null>(null);
   isProjectSubmissionsLoading = input<boolean>(false);
-  cedarRecords = input<CedarMetadataRecordData[] | null>(null);
-  cedarTemplates = input<CedarMetadataDataTemplateJsonApi[] | null>(null);
+  cedarRecords = input<CedarMetadataRecordModel[] | null>(null);
+  cedarTemplates = input<CedarMetadataTemplateModel[] | null>(null);
 
   cedarRecordByTemplateId = computed(() => {
     const records = this.cedarRecords();
     return new Map(
       records?.flatMap((record) => {
-        const templateId = record.relationships?.template?.data?.id;
+        const templateId = record.templateId;
         return templateId ? [[templateId, record] as const] : [];
       }) ?? []
     );
diff --git a/src/app/features/metadata/mappers/cedar-metadata.mapper.ts b/src/app/features/metadata/mappers/cedar-metadata.mapper.ts
new file mode 100644
index 000000000..62541da8b
--- /dev/null
+++ b/src/app/features/metadata/mappers/cedar-metadata.mapper.ts
@@ -0,0 +1,42 @@
+import { CedarMetadataRecordModel } from '../models/cedar-metadata-record.model';
+import { CedarMetadataRecordDataJsonApi } from '../models/cedar-metadata-record-json-api.model';
+import { CedarMetadataTemplateModel, PaginatedCedarTemplatesModel } from '../models/cedar-metadata-template.model';
+import {
+  CedarMetadataDataTemplateJsonApi,
+  CedarMetadataTemplateJsonApi,
+} from '../models/cedar-metadata-template-json-api.model';
+
+export class CedarMetadataMapper {
+  static fromTemplate(data: CedarMetadataDataTemplateJsonApi): CedarMetadataTemplateModel {
+    return {
+      id: data.id,
+      schemaName: data.attributes.schema_name,
+      isForCollections: data.attributes.is_for_collections,
+      active: data.attributes.active,
+      cedarId: data.attributes.cedar_id,
+      template: data.attributes.template,
+    };
+  }
+
+  static fromTemplatesResponse(response: CedarMetadataTemplateJsonApi): PaginatedCedarTemplatesModel {
+    return {
+      data: response.data.map((item) => this.fromTemplate(item)),
+      links: {
+        first: response.links?.first,
+        next: response.links?.next,
+        last: response.links?.last,
+      },
+    };
+  }
+
+  static fromRecord(data: CedarMetadataRecordDataJsonApi): CedarMetadataRecordModel {
+    return {
+      id: data.id ?? '',
+      metadata: data.attributes.metadata,
+      isPublished: data.attributes.is_published,
+      templateId: data.relationships.template.data.id,
+      targetId: data.relationships.target.data.id,
+      schemaName: data.embeds?.template?.data?.attributes?.schema_name ?? '',
+    };
+  }
+}
diff --git a/src/app/features/metadata/mappers/cedar-records.mapper.ts b/src/app/features/metadata/mappers/cedar-records.mapper.ts
index afe093d10..164b4e7dd 100644
--- a/src/app/features/metadata/mappers/cedar-records.mapper.ts
+++ b/src/app/features/metadata/mappers/cedar-records.mapper.ts
@@ -1,11 +1,11 @@
-import { CedarMetadataRecord, CedarRecordDataBinding } from '../models';
+import { CedarMetadataRecordResponseJsonApi, CedarRecordDataBinding } from '../models';
 
 export class CedarRecordsMapper {
   static toCedarRecordsPayload(
     data: CedarRecordDataBinding,
     resourceId: string,
     resourceType: string
-  ): CedarMetadataRecord {
+  ): CedarMetadataRecordResponseJsonApi {
     return {
       data: {
         type: 'cedar_metadata_records',
diff --git a/src/app/features/metadata/mappers/index.ts b/src/app/features/metadata/mappers/index.ts
index 5c0905874..7e6b2ee61 100644
--- a/src/app/features/metadata/mappers/index.ts
+++ b/src/app/features/metadata/mappers/index.ts
@@ -1,3 +1,4 @@
+export * from './cedar-metadata.mapper';
 export * from './cedar-records.mapper';
 export * from './metadata.mapper';
 export * from './ror.mapper';
diff --git a/src/app/features/metadata/mappers/metadata.mapper.ts b/src/app/features/metadata/mappers/metadata.mapper.ts
index eb6044cb3..8aeeb95d0 100644
--- a/src/app/features/metadata/mappers/metadata.mapper.ts
+++ b/src/app/features/metadata/mappers/metadata.mapper.ts
@@ -2,10 +2,10 @@ import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper';
 import { LicensesMapper } from '@osf/shared/mappers/licenses.mapper';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
-import { CustomItemMetadataRecord, CustomMetadataJsonApi, MetadataJsonApi, MetadataModel } from '../models';
+import { CustomItemMetadataRecord, CustomMetadataDataJsonApi, MetadataDataJsonApi, MetadataModel } from '../models';
 
 export class MetadataMapper {
-  static fromMetadataApiResponse(response: MetadataJsonApi): MetadataModel {
+  static fromMetadataApiResponse(response: MetadataDataJsonApi): MetadataModel {
     return {
       id: response.id,
       title: replaceBadEncodedChars(response.attributes.title),
@@ -14,7 +14,9 @@ export class MetadataMapper {
       dateCreated: response.attributes.date_created,
       dateModified: response.attributes.date_modified,
       publicationDoi: response.attributes.article_doi,
-      license: LicensesMapper.fromLicenseDataJsonApi(response.embeds?.license?.data),
+      license: response.embeds?.license?.data
+        ? LicensesMapper.fromLicenseDataJsonApi(response.embeds?.license?.data)
+        : null,
       nodeLicense: response.attributes.node_license
         ? {
             copyrightHolders: response.attributes.node_license.copyright_holders || [],
@@ -22,14 +24,14 @@ export class MetadataMapper {
           }
         : undefined,
       identifiers: IdentifiersMapper.fromJsonApi(response.embeds?.identifiers),
-      provider: response.embeds?.provider?.data.id,
+      provider: response.relationships?.provider?.data?.id,
       public: response.attributes.public,
       currentUserPermissions: response.attributes.current_user_permissions,
       registrationSupplement: response.attributes.registration_supplement,
     };
   }
 
-  static fromCustomMetadataApiResponse(response: CustomMetadataJsonApi): Partial<CustomItemMetadataRecord> {
+  static fromCustomMetadataApiResponse(response: CustomMetadataDataJsonApi): Partial<CustomItemMetadataRecord> {
     return {
       language: response.attributes.language,
       resourceTypeGeneral: response.attributes.resource_type_general,
diff --git a/src/app/features/metadata/metadata.component.ts b/src/app/features/metadata/metadata.component.ts
index f82c3fec4..f5f77f5db 100644
--- a/src/app/features/metadata/metadata.component.ts
+++ b/src/app/features/metadata/metadata.component.ts
@@ -74,8 +74,8 @@ import { PublicationDoiDialogComponent } from './dialogs/publication-doi-dialog/
 import { ResourceInformationDialogComponent } from './dialogs/resource-information-dialog/resource-information-dialog.component';
 import { ResourceInfoTooltipComponent } from './dialogs/resource-tooltip-info/resource-tooltip-info.component';
 import {
-  CedarMetadataDataTemplateJsonApi,
-  CedarMetadataRecordData,
+  CedarMetadataRecordModel,
+  CedarMetadataTemplateModel,
   CedarRecordDataBinding,
   DialogValueModel,
 } from './models';
@@ -133,8 +133,8 @@ export class MetadataComponent implements OnInit, OnDestroy {
   tabs = signal<MetadataTabsModel[]>([]);
   selectedTab = signal('osf');
 
-  selectedCedarRecord = signal<CedarMetadataRecordData | null>(null);
-  selectedCedarTemplate = signal<CedarMetadataDataTemplateJsonApi | null>(null);
+  selectedCedarRecord = signal<CedarMetadataRecordModel | null>(null);
+  selectedCedarTemplate = signal<CedarMetadataTemplateModel | null>(null);
   cedarFormReadonly = signal<boolean>(true);
   resourceType = signal<ResourceType>(this.activeRoute.parent?.snapshot.data['resourceType'] || ResourceType.Project);
 
@@ -219,7 +219,7 @@ export class MetadataComponent implements OnInit, OnDestroy {
       const cedarTabs =
         records?.map((record) => ({
           id: record.id || '',
-          label: record.embeds?.template?.data?.attributes?.schema_name || `Record ${record.id}`,
+          label: record.schemaName || `Record ${record.id}`,
           type: MetadataResourceEnum.CEDAR,
         })) || [];
 
@@ -232,7 +232,7 @@ export class MetadataComponent implements OnInit, OnDestroy {
       const selectedRecord = this.selectedCedarRecord();
 
       if (selectedRecord && templates?.data && !this.selectedCedarTemplate()) {
-        const templateId = selectedRecord.relationships?.template?.data?.id;
+        const templateId = selectedRecord.templateId;
         if (templateId) {
           const template = templates.data.find((t) => t.id === templateId);
           if (template) {
@@ -574,7 +574,7 @@ export class MetadataComponent implements OnInit, OnDestroy {
     this.selectedCedarRecord.set(record);
     this.cedarFormReadonly.set(true);
 
-    const templateId = record.relationships?.template?.data?.id;
+    const templateId = record.templateId;
 
     if (templateId && templates?.data) {
       const template = templates.data.find((t) => t.id === templateId);
diff --git a/src/app/features/metadata/models/cedar-metadata-attributes.model.ts b/src/app/features/metadata/models/cedar-metadata-attributes.model.ts
new file mode 100644
index 000000000..6d2398d0b
--- /dev/null
+++ b/src/app/features/metadata/models/cedar-metadata-attributes.model.ts
@@ -0,0 +1,4 @@
+export interface CedarMetadataAttributes {
+  '@context': Record<string, unknown>;
+  [field: string]: unknown;
+}
diff --git a/src/app/features/metadata/models/cedar-metadata-record-json-api.model.ts b/src/app/features/metadata/models/cedar-metadata-record-json-api.model.ts
new file mode 100644
index 000000000..785f0fc26
--- /dev/null
+++ b/src/app/features/metadata/models/cedar-metadata-record-json-api.model.ts
@@ -0,0 +1,27 @@
+import { Embed } from '@osf/shared/models/common/json-api/embeds.model';
+import { ToOneRelData } from '@osf/shared/models/common/json-api/relationships.model';
+import { DataResponse, ListResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+import { CedarMetadataAttributes } from './cedar-metadata-attributes.model';
+import { CedarMetadataDataTemplateJsonApi } from './cedar-metadata-template-json-api.model';
+
+export type CedarMetadataRecordJsonApi = ListResponse<CedarMetadataRecordDataJsonApi>;
+export type CedarMetadataRecordResponseJsonApi = DataResponse<CedarMetadataRecordDataJsonApi>;
+
+export interface CedarMetadataRecordDataJsonApi {
+  id?: string;
+  type?: string;
+  attributes: CedarMetadataRecordAttributesJsonApi;
+  embeds?: {
+    template: Embed<CedarMetadataDataTemplateJsonApi>;
+  };
+  relationships: {
+    template: ToOneRelData;
+    target: ToOneRelData;
+  };
+}
+
+interface CedarMetadataRecordAttributesJsonApi {
+  metadata: CedarMetadataAttributes;
+  is_published: boolean;
+}
diff --git a/src/app/features/metadata/models/cedar-metadata-record.model.ts b/src/app/features/metadata/models/cedar-metadata-record.model.ts
new file mode 100644
index 000000000..c3cf894de
--- /dev/null
+++ b/src/app/features/metadata/models/cedar-metadata-record.model.ts
@@ -0,0 +1,16 @@
+import { CedarMetadataAttributes } from './cedar-metadata-attributes.model';
+
+export interface CedarMetadataRecordModel {
+  id: string;
+  metadata: CedarMetadataAttributes;
+  isPublished: boolean;
+  templateId: string;
+  targetId: string;
+  schemaName: string;
+}
+
+export interface CedarRecordDataBinding {
+  id: string;
+  data: CedarMetadataAttributes;
+  isPublished: boolean;
+}
diff --git a/src/app/features/metadata/models/cedar-metadata-template-json-api.model.ts b/src/app/features/metadata/models/cedar-metadata-template-json-api.model.ts
new file mode 100644
index 000000000..b14b5f5b6
--- /dev/null
+++ b/src/app/features/metadata/models/cedar-metadata-template-json-api.model.ts
@@ -0,0 +1,19 @@
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+import { CedarTemplate } from './cedar-template.model';
+
+export type CedarMetadataTemplateJsonApi = ListResponse<CedarMetadataDataTemplateJsonApi>;
+
+export type CedarMetadataDataTemplateJsonApi = JsonApiResource<
+  'cedar-metadata-templates',
+  CedarMetadataTemplateAttributesJsonApi
+>;
+
+interface CedarMetadataTemplateAttributesJsonApi {
+  active: boolean;
+  cedar_id: string;
+  schema_name: string;
+  template: CedarTemplate;
+  is_for_collections: boolean;
+}
diff --git a/src/app/features/metadata/models/cedar-metadata-template.model.ts b/src/app/features/metadata/models/cedar-metadata-template.model.ts
index 7b904d7ea..f385f479e 100644
--- a/src/app/features/metadata/models/cedar-metadata-template.model.ts
+++ b/src/app/features/metadata/models/cedar-metadata-template.model.ts
@@ -1,254 +1,17 @@
-import { MetaJsonApi, PaginationLinksJsonApi } from '@osf/shared/models/common/json-api.model';
+import { PaginationLinks } from '@osf/shared/models/common/json-api/links.model';
 
-export interface CedarMetadataDataTemplateJsonApi {
-  id: string;
-  type: 'cedar-metadata-templates';
-  attributes: {
-    schema_name: string;
-    cedar_id: string;
-    template: CedarTemplate;
-    is_for_collections: boolean;
-  };
-}
-
-export const CEDAR_TEMPLATE_FIELD_TYPE = 'https://schema.metadatacenter.org/core/TemplateField';
-export const CEDAR_PROPERTIES_BASE_IRI = 'https://schema.metadatacenter.org/properties/';
-
-export interface CedarTemplateField {
-  '@type': string;
-  _valueConstraints?: {
-    literals?: { label: string }[];
-    multipleChoice?: boolean;
-    requiredValue?: boolean;
-  };
-}
-
-export interface CedarTemplateContextSchema {
-  properties: Record<string, { enum?: string[] }>;
-}
-
-export interface CedarTemplate {
-  '@id': string;
-  '@type': string;
-  type: string;
-  title: string;
-  description: string;
-  $schema: string;
-  '@context': CedarTemplateContext;
-  required: string[];
-  properties: Record<string, unknown>;
-  _ui: {
-    order: string[];
-    propertyLabels: Record<string, string>;
-    propertyDescriptions: Record<string, string>;
-  };
-}
-
-export interface CedarTemplateContext {
-  pav: string;
-  xsd: string;
-  bibo: string;
-  oslc: string;
-  schema: string;
-  'schema:name': {
-    '@type': string;
-  };
-  'pav:createdBy': {
-    '@type': string;
-  };
-  'pav:createdOn': {
-    '@type': string;
-  };
-  'oslc:modifiedBy': {
-    '@type': string;
-  };
-  'pav:lastUpdatedOn': {
-    '@type': string;
-  };
-  'schema:description': {
-    '@type': string;
-  };
-}
-
-export interface CedarMetadataTemplate {
-  id: string;
-  type: 'cedar-metadata-templates';
-  attributes: {
-    schema_name: string;
-    cedar_id: string;
-    template: CedarTemplate;
-    is_for_collections: boolean;
-  };
-}
-
-export interface CedarTemplate {
-  '@id': string;
-  '@type': string;
-  type: string;
-  title: string;
-  $schema: string;
-  '@context': CedarTemplateContext;
-  required: string[];
-  properties: Record<string, unknown>;
-  _ui: {
-    order: string[];
-    propertyLabels: Record<string, string>;
-    propertyDescriptions: Record<string, string>;
-  };
-}
-
-export interface CedarTemplateContext {
-  pav: string;
-  xsd: string;
-  bibo: string;
-  oslc: string;
-  schema: string;
-  'schema:name': {
-    '@type': string;
-  };
-  'pav:createdBy': {
-    '@type': string;
-  };
-  'pav:createdOn': {
-    '@type': string;
-  };
-  'oslc:modifiedBy': {
-    '@type': string;
-  };
-  'pav:lastUpdatedOn': {
-    '@type': string;
-  };
-  'schema:description': {
-    '@type': string;
-  };
-}
-
-export interface CedarMetadataTemplateJsonApi {
-  data: CedarMetadataDataTemplateJsonApi[];
-  links: PaginationLinksJsonApi;
-}
-
-export interface FieldSchema {
-  type?: string;
-  format?: string;
-  title?: string;
-  description?: string;
-  maxLength?: number;
-  items?: FieldSchema;
-  properties?: Record<string, FieldSchema>;
-  required?: string[];
-  _ui?: {
-    inputType?: string;
-    order?: string[];
-    propertyLabels?: Record<string, string>;
-    propertyDescriptions?: Record<string, string>;
-  };
-  'schema:name'?: string;
-  'schema:description'?: string;
-  '@id': string;
-}
-
-export interface CedarFieldItem extends Record<string, unknown> {
-  '@id'?: string;
-  '@type'?: string;
-  'rdfs:label'?: string | null;
-  '@value'?: string;
-}
-
-export interface CedarMetadataAttributes {
-  '@context': Record<string, unknown>;
-  Constructs: CedarFieldItem[];
-  Assessments: CedarFieldItem[];
-  Organization: {
-    '@id': string;
-    '@context': {
-      OrganizationID: string;
-      OrganizationName: string;
-    };
-    OrganizationID: Record<string, unknown>;
-    OrganizationName: {
-      '@value': string;
-    };
-  }[];
-  'Project Name': {
-    '@value': string;
-  };
-  LDbaseWebsite: Record<string, unknown>;
-  'Project Methods': CedarFieldItem[];
-  'Participant Types': CedarFieldItem[];
-  'Special Populations': CedarFieldItem[];
-  'Developmental Design': Record<string, unknown>;
-  LDbaseProjectEndDate: {
-    '@type': string;
-    '@value': string;
-  };
-  'Educational Curricula': CedarFieldItem[];
-  LDbaseInvestigatorORCID: CedarFieldItem[];
-  LDbaseProjectStartDates: {
-    '@type': string;
-    '@value': string;
-  };
-  'Educational Environments': Record<string, unknown>;
-  LDbaseProjectDescription: {
-    '@value': string;
-  };
-
-  [key: string]: unknown;
+import { CedarTemplate } from './cedar-template.model';
 
-  LDbaseProjectContributors: {
-    '@value': string;
-  }[];
-}
-
-export interface CedarMetadataRecord {
-  data: CedarMetadataRecordData;
-}
-
-export interface CedarRecordDataBinding {
-  data: CedarMetadataAttributes;
+export interface CedarMetadataTemplateModel {
   id: string;
-  isPublished: boolean;
-}
-
-export interface CedarMetadataRecordJsonApi {
-  data: CedarMetadataRecordData[];
-  links: PaginationLinksJsonApi;
-  meta: MetaJsonApi;
-}
-
-export interface CedarMetadataRecordData {
-  id?: string;
-  attributes: CedarMetadataRecordAttributes;
-  embeds?: {
-    template: {
-      data: {
-        attributes: {
-          active: boolean;
-          cedar_id: string;
-          schema_name: string;
-        };
-        id: string;
-      };
-    };
-  };
-  relationships: {
-    template: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    target: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-  };
-  type?: string;
+  schemaName: string;
+  isForCollections: boolean;
+  active: boolean;
+  cedarId: string;
+  template: CedarTemplate;
 }
 
-export interface CedarMetadataRecordAttributes {
-  metadata: CedarMetadataAttributes;
-  is_published: boolean;
+export interface PaginatedCedarTemplatesModel {
+  data: CedarMetadataTemplateModel[];
+  links: PaginationLinks;
 }
diff --git a/src/app/features/metadata/models/cedar-template.model.ts b/src/app/features/metadata/models/cedar-template.model.ts
new file mode 100644
index 000000000..af6ad9619
--- /dev/null
+++ b/src/app/features/metadata/models/cedar-template.model.ts
@@ -0,0 +1,78 @@
+export const CEDAR_TEMPLATE_FIELD_TYPE = 'https://schema.metadatacenter.org/core/TemplateField';
+export const CEDAR_PROPERTIES_BASE_IRI = 'https://schema.metadatacenter.org/properties/';
+
+export interface CedarTemplateField {
+  '@type': string;
+  _valueConstraints?: {
+    literals?: { label: string }[];
+    multipleChoice?: boolean;
+    requiredValue?: boolean;
+  };
+}
+
+export interface CedarTemplateContextSchema {
+  properties: Record<string, { enum?: string[] }>;
+}
+
+export interface CedarTemplate {
+  '@id': string;
+  '@type': string;
+  type: string;
+  title: string;
+  description: string;
+  $schema: string;
+  '@context': CedarTemplateContext;
+  required: string[];
+  properties: Record<string, unknown>;
+  _ui: {
+    order: string[];
+    propertyLabels: Record<string, string>;
+    propertyDescriptions: Record<string, string>;
+  };
+}
+
+interface CedarTemplateContext {
+  pav: string;
+  xsd: string;
+  bibo: string;
+  oslc: string;
+  schema: string;
+  'schema:name': {
+    '@type': string;
+  };
+  'pav:createdBy': {
+    '@type': string;
+  };
+  'pav:createdOn': {
+    '@type': string;
+  };
+  'oslc:modifiedBy': {
+    '@type': string;
+  };
+  'pav:lastUpdatedOn': {
+    '@type': string;
+  };
+  'schema:description': {
+    '@type': string;
+  };
+}
+
+export interface FieldSchema {
+  type?: string;
+  format?: string;
+  title?: string;
+  description?: string;
+  maxLength?: number;
+  items?: FieldSchema;
+  properties?: Record<string, FieldSchema>;
+  required?: string[];
+  _ui?: {
+    inputType?: string;
+    order?: string[];
+    propertyLabels?: Record<string, string>;
+    propertyDescriptions?: Record<string, string>;
+  };
+  'schema:name'?: string;
+  'schema:description'?: string;
+  '@id': string;
+}
diff --git a/src/app/features/metadata/models/index.ts b/src/app/features/metadata/models/index.ts
index 30e978c95..f7cc29849 100644
--- a/src/app/features/metadata/models/index.ts
+++ b/src/app/features/metadata/models/index.ts
@@ -1,5 +1,10 @@
 export * from './cedar-editor-element.model';
+export * from './cedar-metadata-attributes.model';
+export * from './cedar-metadata-record.model';
+export * from './cedar-metadata-record-json-api.model';
 export * from './cedar-metadata-template.model';
+export * from './cedar-metadata-template-json-api.model';
+export * from './cedar-template.model';
 export * from './dialog-value.model';
 export * from './funding-dialog.model';
 export * from './metadata.model';
diff --git a/src/app/features/metadata/models/metadata-json-api.model.ts b/src/app/features/metadata/models/metadata-json-api.model.ts
index 802777461..ce91803fb 100644
--- a/src/app/features/metadata/models/metadata-json-api.model.ts
+++ b/src/app/features/metadata/models/metadata-json-api.model.ts
@@ -1,58 +1,59 @@
+import { ToOneRel } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
 import { UserPermissions } from '@shared/enums/user-permissions.enum';
-import { ApiData } from '@shared/models/common/json-api.model';
+import { Embed } from '@shared/models/common/json-api/embeds.model';
+import { ItemResponse } from '@shared/models/common/json-api/responses.model';
 import { IdentifiersResponseJsonApi } from '@shared/models/identifiers/identifier-json-api.model';
-import { InstitutionsJsonApiResponse } from '@shared/models/institutions/institution-json-api.model';
 import { LicenseDataJsonApi, LicenseRecordJsonApi } from '@shared/models/license/licenses-json-api.model';
 
-export interface MetadataJsonApiResponse {
-  data: MetadataJsonApi;
+export type MetadataResponseJsonApi = ItemResponse<MetadataDataJsonApi>;
+export type CustomMetadataResponseJsonApi = ItemResponse<CustomMetadataDataJsonApi>;
+
+export interface MetadataDataJsonApi extends JsonApiResource<'metadata', MetadataAttributesJsonApi> {
+  relationships: MetadataRelationshipsJsonApi;
+  embeds?: MetadataEmbedsJsonApi;
 }
 
-export type MetadataJsonApi = ApiData<MetadataAttributesJsonApi, MetadataEmbedsJsonApi, null, null>;
+export type CustomMetadataDataJsonApi = JsonApiResource<
+  'custom-item-metadata-records',
+  CustomMetadataAttributesJsonApi
+>;
 
 export interface MetadataAttributesJsonApi {
-  title: string;
-  description: string;
-  tags: string[];
+  article_doi?: string;
+  category?: string;
+  current_user_permissions: UserPermissions[];
   date_created: string;
   date_modified: string;
-  article_doi?: string;
+  description: string;
   doi?: boolean;
-  category?: string;
   node_license?: LicenseRecordJsonApi;
   public?: boolean;
   registration_supplement?: string;
-  current_user_permissions: UserPermissions[];
-}
-
-interface MetadataEmbedsJsonApi {
-  affiliated_institutions: InstitutionsJsonApiResponse;
-  identifiers: IdentifiersResponseJsonApi;
-  license: {
-    data: LicenseDataJsonApi;
-  };
-  provider?: {
-    data: { id: string; type: string; attributes: { name: string } };
-  };
-}
-
-export interface CustomMetadataJsonApiResponse {
-  data: CustomMetadataJsonApi;
+  tags: string[];
+  title: string;
 }
 
-export type CustomMetadataJsonApi = ApiData<CustomMetadataAttributesJsonApi, MetadataEmbedsJsonApi, null, null>;
-
-export interface CustomMetadataAttributesJsonApi {
+interface CustomMetadataAttributesJsonApi {
+  funders?: FunderJsonApi[];
   language?: string;
   resource_type_general?: string;
-  funders?: FunderJsonApi[];
 }
 
-export interface FunderJsonApi {
-  funder_name: string;
-  funder_identifier: string;
-  funder_identifier_type: string;
+interface FunderJsonApi {
   award_number: string;
-  award_uri: string;
   award_title: string;
+  award_uri: string;
+  funder_identifier: string;
+  funder_identifier_type: string;
+  funder_name: string;
+}
+
+interface MetadataEmbedsJsonApi {
+  identifiers: IdentifiersResponseJsonApi;
+  license: Embed<LicenseDataJsonApi>;
+}
+
+interface MetadataRelationshipsJsonApi {
+  provider: ToOneRel;
 }
diff --git a/src/app/features/metadata/models/ror.model.ts b/src/app/features/metadata/models/ror.model.ts
index 5775df7e4..a4ddede3a 100644
--- a/src/app/features/metadata/models/ror.model.ts
+++ b/src/app/features/metadata/models/ror.model.ts
@@ -1,4 +1,40 @@
-export interface RorAdmin {
+export interface RorSearchResponse {
+  items: RorOrganization[];
+  meta: RorMeta;
+  number_of_results: number;
+  time_taken: number;
+}
+
+export interface RorFunderOption {
+  id: string;
+  name: string;
+}
+
+export interface RorOrganization {
+  id: string;
+  admin: RorAdmin;
+  domains: string[];
+  established: number | null;
+  external_ids: RorExternalId[];
+  links: RorLink[];
+  locations: RorLocation[];
+  names: RorName[];
+  relationships: RorRelationship[];
+  status: 'active' | 'inactive' | 'withdrawn';
+  types: (
+    | 'education'
+    | 'healthcare'
+    | 'company'
+    | 'archive'
+    | 'nonprofit'
+    | 'government'
+    | 'facility'
+    | 'other'
+    | 'funder'
+  )[];
+}
+
+interface RorAdmin {
   created: {
     date: string;
     schema_version: string;
@@ -9,18 +45,18 @@ export interface RorAdmin {
   };
 }
 
-export interface RorExternalId {
+interface RorExternalId {
   all: string[];
   preferred: string | null;
   type: 'grid' | 'fundref' | 'isni' | 'wikidata';
 }
 
-export interface RorLink {
+interface RorLink {
   type: 'website' | 'wikipedia';
   value: string;
 }
 
-export interface RorGeonamesDetails {
+interface RorGeonamesDetails {
   continent_code: string;
   continent_name: string;
   country_code: string;
@@ -32,80 +68,32 @@ export interface RorGeonamesDetails {
   name: string;
 }
 
-export interface RorLocation {
+interface RorLocation {
   geonames_details: RorGeonamesDetails;
   geonames_id: number;
 }
 
-export interface RorName {
+interface RorName {
   lang: string | null;
   types: ('ror_display' | 'label' | 'alias' | 'acronym')[];
   value: string;
 }
 
-export interface RorRelationship {
+interface RorRelationship {
   type: string;
   id: string;
   label: string;
 }
 
-export interface RorOrganization {
-  id: string;
-  admin: RorAdmin;
-  domains: string[];
-  established: number | null;
-  external_ids: RorExternalId[];
-  links: RorLink[];
-  locations: RorLocation[];
-  names: RorName[];
-  relationships: RorRelationship[];
-  status: 'active' | 'inactive' | 'withdrawn';
-  types: (
-    | 'education'
-    | 'healthcare'
-    | 'company'
-    | 'archive'
-    | 'nonprofit'
-    | 'government'
-    | 'facility'
-    | 'other'
-    | 'funder'
-  )[];
-}
-
-export interface RorMetaCount {
+interface RorMetaCount {
   id: string;
   title: string;
   count: number;
 }
 
-export interface RorMeta {
+interface RorMeta {
   types: RorMetaCount[];
   countries: RorMetaCount[];
   continents: RorMetaCount[];
   statuses: RorMetaCount[];
 }
-
-export interface RorSearchResponse {
-  items: RorOrganization[];
-  meta: RorMeta;
-  number_of_results: number;
-  time_taken: number;
-}
-
-export interface RorFunderOption {
-  id: string;
-  name: string;
-}
-
-export interface RorDisplayData {
-  id: string;
-  displayName: string;
-  acronym?: string;
-  type: string;
-  country: string;
-  city: string;
-  established?: number;
-  website?: string;
-  status: string;
-}
diff --git a/src/app/features/metadata/pages/add-metadata/add-metadata.component.html b/src/app/features/metadata/pages/add-metadata/add-metadata.component.html
index 21d47d7c1..ffffe2a3c 100644
--- a/src/app/features/metadata/pages/add-metadata/add-metadata.component.html
+++ b/src/app/features/metadata/pages/add-metadata/add-metadata.component.html
@@ -20,15 +20,16 @@ <h2>{{ 'project.metadata.addMetadata.selectTemplate' | translate }}</h2>
               [class.metadata-item]="isMedium()"
             >
               <div class="flex flex-row gap-4">
-                <h2>{{ meta.attributes.template.title }}</h2>
+                <h2>{{ meta.template.title }}</h2>
               </div>
 
               <div class="flex flex-column">
-                <p>{{ meta.attributes.template.description }}</p>
+                <p>{{ meta.template.description }}</p>
               </div>
 
               @if (hasExistingRecord(meta.id)) {
                 <p-button
+                  class="mt-auto"
                   severity="secondary"
                   [pTooltip]="'project.metadata.addMetadata.youAlreadyAddedText' | translate"
                   [label]="'project.metadata.addMetadata.youAlreadyAdded' | translate"
@@ -36,6 +37,7 @@ <h2>{{ meta.attributes.template.title }}</h2>
                 ></p-button>
               } @else {
                 <p-button
+                  class="mt-auto"
                   severity="secondary"
                   [label]="'common.buttons.select' | translate"
                   (onClick)="onSelect(meta)"
diff --git a/src/app/features/metadata/pages/add-metadata/add-metadata.component.spec.ts b/src/app/features/metadata/pages/add-metadata/add-metadata.component.spec.ts
index d7cdfcf2e..a8b87bf79 100644
--- a/src/app/features/metadata/pages/add-metadata/add-metadata.component.spec.ts
+++ b/src/app/features/metadata/pages/add-metadata/add-metadata.component.spec.ts
@@ -8,8 +8,7 @@ import { SubHeaderComponent } from '@osf/shared/components/sub-header/sub-header
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { ToastService } from '@osf/shared/services/toast.service';
 
-import { CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK } from '@testing/mocks/cedar-metadata-data-template-json-api.mock';
-import { MOCK_CEDAR_METADATA_RECORD_DATA } from '@testing/mocks/cedar-metadata-record.mock';
+import { MOCK_CEDAR_METADATA_RECORD, MOCK_CEDAR_METADATA_TEMPLATE } from '@testing/mocks/cedar-metadata-domain.mock';
 import { provideOSFCore } from '@testing/osf.testing.provider';
 import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
 import { provideMockStore } from '@testing/providers/store-provider.mock';
@@ -27,8 +26,8 @@ describe('AddMetadataComponent', () => {
   let activatedRoute: Partial<ActivatedRoute>;
   let toastService: ReturnType<ToastServiceMockBuilder['build']>;
 
-  const mockTemplate = CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK;
-  const mockRecord = MOCK_CEDAR_METADATA_RECORD_DATA;
+  const mockTemplate = MOCK_CEDAR_METADATA_TEMPLATE;
+  const mockRecord = MOCK_CEDAR_METADATA_RECORD;
 
   const mockCedarTemplates = {
     data: [mockTemplate],
@@ -81,7 +80,7 @@ describe('AddMetadataComponent', () => {
             { selector: MetadataSelectors.getCedarTemplatesExcludingCollections, value: mockCedarTemplates },
             { selector: MetadataSelectors.getCedarRecords, value: mockCedarRecords },
             { selector: MetadataSelectors.getCedarTemplatesLoading, value: false },
-            { selector: MetadataSelectors.getCedarRecord, value: { data: mockRecord } },
+            { selector: MetadataSelectors.getCedarRecord, value: mockRecord },
           ],
         }),
       ],
diff --git a/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts b/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts
index 20b1d67ef..ab9a7818d 100644
--- a/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts
+++ b/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts
@@ -25,7 +25,7 @@ import { IS_MEDIUM } from '@osf/shared/helpers/breakpoints.tokens';
 import { ToastService } from '@osf/shared/services/toast.service';
 
 import { CedarTemplateFormComponent } from '../../components/cedar-template-form/cedar-template-form.component';
-import { CedarMetadataDataTemplateJsonApi, CedarMetadataRecordData, CedarRecordDataBinding } from '../../models';
+import { CedarMetadataRecordModel, CedarMetadataTemplateModel, CedarRecordDataBinding } from '../../models';
 import {
   CreateCedarMetadataRecord,
   GetCedarMetadataRecords,
@@ -53,8 +53,8 @@ export class AddMetadataComponent implements OnInit {
 
   private resourceId = '';
   isEditMode = true;
-  selectedTemplate: CedarMetadataDataTemplateJsonApi | null = null;
-  existingRecord: CedarMetadataRecordData | null = null;
+  selectedTemplate: CedarMetadataTemplateModel | null = null;
+  existingRecord: CedarMetadataRecordModel | null = null;
 
   readonly cedarTemplates = select(MetadataSelectors.getCedarTemplatesExcludingCollections);
   readonly cedarRecords = select(MetadataSelectors.getCedarRecords);
@@ -84,7 +84,7 @@ export class AddMetadataComponent implements OnInit {
           return record.id === recordId;
         });
         if (existingRecord) {
-          const templateId = existingRecord.relationships.template.data.id;
+          const templateId = existingRecord.templateId;
           const matchingTemplate = cedarTemplatesData.find((template) => template.id === templateId);
 
           if (matchingTemplate) {
@@ -111,7 +111,7 @@ export class AddMetadataComponent implements OnInit {
     this.actions.getCedarTemplates();
   }
 
-  onSelect(template: CedarMetadataDataTemplateJsonApi): void {
+  onSelect(template: CedarMetadataTemplateModel): void {
     if (this.hasExistingRecord(template.id)) {
       return;
     }
@@ -157,7 +157,7 @@ export class AddMetadataComponent implements OnInit {
     const records = this.cedarRecords();
     if (!records) return false;
 
-    return records.some((record) => record.relationships.template.data.id === templateId);
+    return records.some((record) => record.templateId === templateId);
   }
 
   createRecordMetadata(data: CedarRecordDataBinding): void {
@@ -192,7 +192,7 @@ export class AddMetadataComponent implements OnInit {
   }
 
   private navigateToRecord(resourceId: string, resourceType: ResourceType): void {
-    const recordId = this.cedarRecord()?.data.id;
+    const recordId = this.cedarRecord()?.id;
     if (resourceType === ResourceType.File) {
       this.router.navigate([resourceId]);
     } else {
diff --git a/src/app/features/metadata/store/metadata.actions.ts b/src/app/features/metadata/store/metadata.actions.ts
index cc3301bca..7755da809 100644
--- a/src/app/features/metadata/store/metadata.actions.ts
+++ b/src/app/features/metadata/store/metadata.actions.ts
@@ -2,7 +2,7 @@ import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { LicenseOptions } from '@shared/models/license/license.model';
 
 import {
-  CedarMetadataRecordData,
+  CedarMetadataRecordModel,
   CedarRecordDataBinding,
   CustomItemMetadataRecord,
   MetadataAttributesJsonApi,
@@ -98,5 +98,5 @@ export class UpdateCedarMetadataRecord {
 
 export class AddCedarMetadataRecordToState {
   static readonly type = '[Metadata] Add Cedar Metadata Record To State';
-  constructor(public record: CedarMetadataRecordData) {}
+  constructor(public record: CedarMetadataRecordModel) {}
 }
diff --git a/src/app/features/metadata/store/metadata.model.ts b/src/app/features/metadata/store/metadata.model.ts
index a5e05dc5b..b7f614030 100644
--- a/src/app/features/metadata/store/metadata.model.ts
+++ b/src/app/features/metadata/store/metadata.model.ts
@@ -1,21 +1,19 @@
 import {
-  CedarMetadataRecord,
-  CedarMetadataRecordData,
-  CedarMetadataTemplateJsonApi,
+  CedarMetadataRecordModel,
   CustomItemMetadataRecord,
+  MetadataModel,
+  PaginatedCedarTemplatesModel,
+  RorFunderOption,
 } from '@osf/features/metadata/models';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 
-import { MetadataModel } from '../models';
-import { RorFunderOption } from '../models/ror.model';
-
 export interface MetadataStateModel {
   metadata: AsyncStateModel<MetadataModel | null>;
   customMetadata: AsyncStateModel<CustomItemMetadataRecord | null>;
   fundersList: AsyncStateModel<RorFunderOption[]>;
-  cedarTemplates: AsyncStateModel<CedarMetadataTemplateJsonApi | null>;
-  cedarRecord: AsyncStateModel<CedarMetadataRecord | null>;
-  cedarRecords: AsyncStateModel<CedarMetadataRecordData[]>;
+  cedarTemplates: AsyncStateModel<PaginatedCedarTemplatesModel | null>;
+  cedarRecord: AsyncStateModel<CedarMetadataRecordModel | null>;
+  cedarRecords: AsyncStateModel<CedarMetadataRecordModel[]>;
 }
 
 export const METADATA_STATE_DEFAULTS: MetadataStateModel = {
diff --git a/src/app/features/metadata/store/metadata.selectors.ts b/src/app/features/metadata/store/metadata.selectors.ts
index ba86d6cf3..d21ce781b 100644
--- a/src/app/features/metadata/store/metadata.selectors.ts
+++ b/src/app/features/metadata/store/metadata.selectors.ts
@@ -52,7 +52,7 @@ export class MetadataSelectors {
     if (!templates) return null;
     return {
       ...templates,
-      data: templates.data.filter((t) => !t.attributes.is_for_collections),
+      data: templates.data.filter((t) => !t.isForCollections),
     };
   }
 
diff --git a/src/app/features/metadata/store/metadata.state.ts b/src/app/features/metadata/store/metadata.state.ts
index 88ac11b71..d0079627c 100644
--- a/src/app/features/metadata/store/metadata.state.ts
+++ b/src/app/features/metadata/store/metadata.state.ts
@@ -7,7 +7,7 @@ import { inject, Injectable } from '@angular/core';
 import { handleSectionError } from '@osf/shared/helpers/state-error.handler';
 import { MetadataService } from '@osf/shared/services/metadata.service';
 
-import { CedarMetadataRecord, CedarMetadataRecordJsonApi, MetadataModel } from '../models';
+import { CedarMetadataRecordModel, MetadataModel } from '../models';
 
 import {
   AddCedarMetadataRecordToState,
@@ -179,10 +179,10 @@ export class MetadataState {
       },
     });
     return this.metadataService.getMetadataCedarRecords(action.resourceId, action.resourceType, action.url).pipe(
-      tap((response: CedarMetadataRecordJsonApi) => {
+      tap((records: CedarMetadataRecordModel[]) => {
         ctx.patchState({
           cedarRecords: {
-            data: response.data,
+            data: records,
             error: null,
             isLoading: false,
           },
@@ -194,15 +194,15 @@ export class MetadataState {
   @Action(CreateCedarMetadataRecord)
   createCedarMetadataRecord(ctx: StateContext<MetadataStateModel>, action: CreateCedarMetadataRecord) {
     return this.metadataService.createMetadataCedarRecord(action.record, action.resourceId, action.resourceType).pipe(
-      tap((response: CedarMetadataRecord) => {
+      tap((record: CedarMetadataRecordModel) => {
         ctx.patchState({
           cedarRecord: {
-            data: response,
+            data: record,
             error: null,
             isLoading: false,
           },
         });
-        ctx.dispatch(new AddCedarMetadataRecordToState(response.data));
+        ctx.dispatch(new AddCedarMetadataRecordToState(record));
       })
     );
   }
@@ -212,10 +212,10 @@ export class MetadataState {
     return this.metadataService
       .updateMetadataCedarRecord(action.record, action.recordId, action.resourceId, action.resourceType)
       .pipe(
-        tap((response: CedarMetadataRecord) => {
+        tap((updatedRecord: CedarMetadataRecordModel) => {
           const state = ctx.getState();
           const updatedRecords = state.cedarRecords.data.map((record) =>
-            record.id === action.recordId ? response.data : record
+            record.id === action.recordId ? updatedRecord : record
           );
           ctx.patchState({
             cedarRecords: {
diff --git a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.spec.ts b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.spec.ts
index 9d6f23010..1c9574854 100644
--- a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.spec.ts
+++ b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.spec.ts
@@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 import { CollectionsSelectors } from '@osf/shared/stores/collections';
 import { DateAgoPipe } from '@shared/pipes/date-ago.pipe';
 
@@ -24,7 +23,7 @@ describe('CollectionSubmissionItemComponent', () => {
   let mockRouter: ReturnType<RouterMockBuilder['build']>;
   let mockActivatedRoute: ReturnType<ActivatedRouteMockBuilder['build']>;
 
-  const mockSubmission: CollectionSubmissionWithGuid = MOCK_COLLECTION_SUBMISSION_WITH_GUID;
+  const mockSubmission = MOCK_COLLECTION_SUBMISSION_WITH_GUID;
 
   const mockCollectionProvider = {
     id: 'provider-123',
diff --git a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts
index 013686142..6d57c01a2 100644
--- a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts
+++ b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts
@@ -11,7 +11,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
 import { TruncatedTextComponent } from '@osf/shared/components/truncated-text/truncated-text.component';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collection-submissions.model';
 import { DateAgoPipe } from '@osf/shared/pipes/date-ago.pipe';
 import { CollectionsSelectors } from '@osf/shared/stores/collections';
 
diff --git a/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts b/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts
index b98c947df..4d45defc7 100644
--- a/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts
+++ b/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts
@@ -8,7 +8,7 @@ import {
   GetCollectionSubmissionContributors,
   LoadMoreCollectionSubmissionContributors,
 } from '@osf/features/moderation/store/collections-moderation';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collection-submissions.model';
 
 import { CollectionsModerationSelectors } from '../../store/collections-moderation';
 import { CollectionSubmissionItemComponent } from '../collection-submission-item/collection-submission-item.component';
diff --git a/src/app/features/moderation/mappers/moderation.mapper.ts b/src/app/features/moderation/mappers/moderation.mapper.ts
index 18af21c2e..160ae8844 100644
--- a/src/app/features/moderation/mappers/moderation.mapper.ts
+++ b/src/app/features/moderation/mappers/moderation.mapper.ts
@@ -1,7 +1,3 @@
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
-import { PaginatedData } from '@osf/shared/models/paginated-data.model';
-import { UserDataJsonApi } from '@osf/shared/models/user/user-json-api.model';
-
 import { AddModeratorType, ModeratorPermission } from '../enums';
 import { ModeratorAddModel, ModeratorAddRequestModel, ModeratorDataJsonApi, ModeratorModel } from '../models';
 
@@ -25,23 +21,6 @@ export class ModerationMapper {
     };
   }
 
-  static fromUsersWithPaginationGetResponse(
-    response: ResponseJsonApi<UserDataJsonApi[]>
-  ): PaginatedData<ModeratorAddModel[]> {
-    return {
-      data: response.data.map(
-        (user) =>
-          ({
-            id: user.id,
-            fullName: user.attributes.full_name,
-            permission: ModeratorPermission.Moderator,
-          }) as ModeratorAddModel
-      ),
-      totalCount: response.meta.total,
-      pageSize: response.meta.per_page,
-    };
-  }
-
   static toModeratorAddRequest(model: ModeratorAddModel, type = AddModeratorType.Search): ModeratorAddRequestModel {
     if (type === AddModeratorType.Search) {
       return {
diff --git a/src/app/features/moderation/mappers/preprint-moderation.mapper.ts b/src/app/features/moderation/mappers/preprint-moderation.mapper.ts
index 621d929c1..455b11257 100644
--- a/src/app/features/moderation/mappers/preprint-moderation.mapper.ts
+++ b/src/app/features/moderation/mappers/preprint-moderation.mapper.ts
@@ -1,11 +1,12 @@
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { UserMapper } from '@osf/shared/mappers/user';
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import {
   PreprintProviderModerationInfo,
   PreprintRelatedCountJsonApi,
+  PreprintReviewActionListResponseJsonApi,
   PreprintSubmissionResponseJsonApi,
   PreprintSubmissionWithdrawalResponseJsonApi,
   PreprintWithdrawalPaginatedData,
@@ -39,12 +40,12 @@ export class PreprintModerationMapper {
   }
 
   static fromResponseWithPagination(
-    response: ResponseJsonApi<ReviewActionJsonApi[]>
+    response: PreprintReviewActionListResponseJsonApi
   ): PaginatedData<PreprintReviewActionModel[]> {
     return {
       data: response.data.map((x) => this.fromResponse(x)),
       totalCount: response.meta.total,
-      pageSize: response.meta.per_page,
+      pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
     };
   }
 
@@ -73,7 +74,7 @@ export class PreprintModerationMapper {
         totalContributors: 0,
       })),
       totalCount: response.meta.total,
-      pageSize: response.meta.per_page,
+      pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
       pendingCount: response.meta?.reviews_state_counts?.pending || 0,
       acceptedCount: response.meta?.reviews_state_counts?.accepted || 0,
       rejectedCount: response.meta?.reviews_state_counts?.rejected || 0,
@@ -87,14 +88,14 @@ export class PreprintModerationMapper {
     return {
       data: response.data.map((x) => ({
         id: x.id,
-        title: replaceBadEncodedChars(x.embeds.target.data.attributes.title),
-        preprintId: x.embeds.target.data.id,
+        title: replaceBadEncodedChars(x.embeds.target?.data?.attributes?.title),
+        preprintId: x.embeds.target?.data?.id,
         actions: [],
         contributors: [],
         totalContributors: 0,
       })),
       totalCount: response.meta.total,
-      pageSize: response.meta.per_page,
+      pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
       pendingCount: response.meta.requests_state_counts.pending,
       acceptedCount: response.meta.requests_state_counts.accepted,
       rejectedCount: response.meta.requests_state_counts.rejected,
diff --git a/src/app/features/moderation/mappers/registry-moderation.mapper.ts b/src/app/features/moderation/mappers/registry-moderation.mapper.ts
index 70ab5fdb4..bab234290 100644
--- a/src/app/features/moderation/mappers/registry-moderation.mapper.ts
+++ b/src/app/features/moderation/mappers/registry-moderation.mapper.ts
@@ -1,3 +1,4 @@
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { UserMapper } from '@osf/shared/mappers/user';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
@@ -7,7 +8,7 @@ import {
   RegistryModeration,
   RegistryResponseJsonApi,
   ReviewAction,
-  ReviewActionsDataJsonApi,
+  ReviewActionDataJsonApi,
 } from '../models';
 
 export class RegistryModerationMapper {
@@ -29,11 +30,11 @@ export class RegistryModerationMapper {
     return {
       data: response.data.map((x) => this.fromResponse(x)),
       totalCount: response.meta.total,
-      pageSize: response.meta.per_page,
+      pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
     };
   }
 
-  static fromActionResponse(response: ReviewActionsDataJsonApi): ReviewAction {
+  static fromActionResponse(response: ReviewActionDataJsonApi): ReviewAction {
     const creator = UserMapper.getUserInfo(response.embeds?.creator);
 
     return {
diff --git a/src/app/features/moderation/models/collection-submission-review-action-json-api.model.ts b/src/app/features/moderation/models/collection-submission-review-action-json-api.model.ts
index cca102865..9374bcf29 100644
--- a/src/app/features/moderation/models/collection-submission-review-action-json-api.model.ts
+++ b/src/app/features/moderation/models/collection-submission-review-action-json-api.model.ts
@@ -1,25 +1,32 @@
+import { ToOneRelData } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { UserDataErrorResponseJsonApi } from '@osf/shared/models/user/user-json-api.model';
 
-export interface CollectionSubmissionReviewActionJsonApi {
-  id: string;
-  type: 'collection-submission-actions';
-  attributes: {
-    trigger: string;
-    comment: string;
-    from_state: string;
-    to_state: string;
-    date_created: string;
-    date_modified: string;
-  };
-  embeds: {
-    creator: UserDataErrorResponseJsonApi;
-  };
-  relationships: {
-    target: {
-      data: {
-        id: string;
-        type: 'collection-submission';
-      };
-    };
-  };
+export type CollectionSubmissionReviewActionsListResponseJsonApi =
+  ListResponse<CollectionSubmissionReviewActionJsonApi>;
+
+export interface CollectionSubmissionReviewActionJsonApi extends JsonApiResource<
+  'collection-submission-actions',
+  CollectionSubmissionReviewActionAttributesJsonApi
+> {
+  embeds: CollectionSubmissionReviewActionEmbedsJsonApi;
+  relationships: CollectionSubmissionReviewActionRelationshipsJsonApi;
+}
+
+interface CollectionSubmissionReviewActionAttributesJsonApi {
+  comment: string;
+  date_created: string;
+  date_modified: string;
+  from_state: string;
+  to_state: string;
+  trigger: string;
+}
+
+interface CollectionSubmissionReviewActionEmbedsJsonApi {
+  creator: UserDataErrorResponseJsonApi;
+}
+
+interface CollectionSubmissionReviewActionRelationshipsJsonApi {
+  target: ToOneRelData<'collection-submission'>;
 }
diff --git a/src/app/features/moderation/models/moderator-json-api.model.ts b/src/app/features/moderation/models/moderator-json-api.model.ts
index 24449f115..fe2637360 100644
--- a/src/app/features/moderation/models/moderator-json-api.model.ts
+++ b/src/app/features/moderation/models/moderator-json-api.model.ts
@@ -1,31 +1,32 @@
-import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '@osf/shared/models/common/json-api.model';
+import { Embed } from '@osf/shared/models/common/json-api/embeds.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { UserDataJsonApi } from '@osf/shared/models/user/user-json-api.model';
 
-export interface ModeratorResponseJsonApi {
-  data: ModeratorDataJsonApi[];
-  meta: MetaJsonApi;
-  links: PaginationLinksJsonApi;
+export type ModeratorResponseJsonApi = ListResponse<ModeratorDataJsonApi>;
+export type ModeratorItemResponseJsonApi = ItemResponse<ModeratorDataJsonApi>;
+
+export interface ModeratorDataJsonApi extends JsonApiResource<'moderators', ModeratorAttributesJsonApi> {
+  embeds: ModeratorEmbedsJsonApi;
+}
+
+export interface ModeratorAddRequestModel {
+  attributes: ModeratorAddAttributesJsonApi;
+  type: 'moderators';
 }
 
-export type ModeratorDataJsonApi = ApiData<ModeratorAttributesJsonApi, ModeratorEmbedsJsonApi, null, null>;
+interface ModeratorAddAttributesJsonApi {
+  email?: string;
+  full_name?: string;
+  id?: string;
+  permission_group: string;
+}
 
 interface ModeratorAttributesJsonApi {
   full_name: string;
-  permission_group: 'moderator' | 'admin';
+  permission_group: 'admin' | 'moderator';
 }
 
 interface ModeratorEmbedsJsonApi {
-  user: {
-    data: UserDataJsonApi;
-  };
-}
-
-export interface ModeratorAddRequestModel {
-  type: 'moderators';
-  attributes: {
-    id?: string;
-    permission_group: string;
-    full_name?: string;
-    email?: string;
-  };
+  user: Embed<UserDataJsonApi>;
 }
diff --git a/src/app/features/moderation/models/preprint-related-count-json-api.model.ts b/src/app/features/moderation/models/preprint-related-count-json-api.model.ts
index 7b78a3871..6acc16e83 100644
--- a/src/app/features/moderation/models/preprint-related-count-json-api.model.ts
+++ b/src/app/features/moderation/models/preprint-related-count-json-api.model.ts
@@ -1,21 +1,31 @@
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { PreprintProviderAttributesJsonApi } from '@osf/shared/models/provider/preprints-provider-json-api.model';
 
-export interface PreprintRelatedCountJsonApi {
-  id: string;
-  attributes: PreprintProviderAttributesJsonApi;
-  relationships: {
-    preprints: {
-      links: {
-        related: {
-          meta: {
-            accepted: number;
-            initial: number;
-            pending: number;
-            rejected: number;
-            withdrawn: number;
-          };
-        };
+export type PreprintRelatedCountListResponseJsonApi = ListResponse<PreprintRelatedCountJsonApi>;
+export type PreprintRelatedCountItemResponseJsonApi = ItemResponse<PreprintRelatedCountJsonApi>;
+
+export interface PreprintRelatedCountJsonApi extends JsonApiResource<
+  'preprint-providers',
+  PreprintProviderAttributesJsonApi
+> {
+  relationships: PreprintRelatedCountRelationshipsJsonApi;
+}
+
+interface PreprintRelatedCountRelationshipsJsonApi {
+  preprints: {
+    links: {
+      related: {
+        meta: PreprintRelationshipMetaJsonApi;
       };
     };
   };
 }
+
+interface PreprintRelationshipMetaJsonApi {
+  accepted: number;
+  initial: number;
+  pending: number;
+  rejected: number;
+  withdrawn: number;
+}
diff --git a/src/app/features/moderation/models/preprint-review-action-json-api.model.ts b/src/app/features/moderation/models/preprint-review-action-json-api.model.ts
index ef2ce5fbf..552394353 100644
--- a/src/app/features/moderation/models/preprint-review-action-json-api.model.ts
+++ b/src/app/features/moderation/models/preprint-review-action-json-api.model.ts
@@ -1,49 +1,28 @@
-import { UserAttributesJsonApi, UserDataErrorResponseJsonApi } from '@osf/shared/models/user/user-json-api.model';
+import { Embed } from '@osf/shared/models/common/json-api/embeds.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
+import { PreprintDataJsonApi } from '@osf/shared/models/preprints/preprint-json-api.model';
+import { PreprintProviderAttributesJsonApi } from '@osf/shared/models/provider/preprints-provider-json-api.model';
+import { UserDataErrorResponseJsonApi } from '@osf/shared/models/user/user-json-api.model';
 
-export interface ReviewActionJsonApi {
-  id: string;
-  type: 'review-actions';
-  attributes: ReviewActionAttributesJsonApi;
-  embeds: {
-    creator: UserDataErrorResponseJsonApi;
-    target: {
-      data: PreprintModelJsonApi;
-    };
-    provider: {
-      data: ProviderModelJsonApi;
-    };
-  };
+export type PreprintReviewActionListResponseJsonApi = ListResponse<ReviewActionJsonApi>;
+
+export interface ReviewActionJsonApi extends JsonApiResource<'review-actions', ReviewActionAttributesJsonApi> {
+  embeds: ReviewActionEmbedsJsonApi;
 }
 
-export interface ReviewActionAttributesJsonApi {
-  trigger: string;
+interface ReviewActionAttributesJsonApi {
+  auto: boolean;
   comment: string;
-  from_state: string;
-  to_state: string;
   date_created: string;
   date_modified: string;
-  auto: boolean;
-}
-
-export interface UserModelJsonApi {
-  id: string;
-  type: 'users';
-  attributes: UserAttributesJsonApi;
-}
-
-export interface PreprintModelJsonApi {
-  id: string;
-  type: 'preprints';
-  attributes: PreprintAttributesJsonApi;
-}
-
-export interface PreprintAttributesJsonApi {
-  title: string;
+  from_state: string;
+  to_state: string;
+  trigger: string;
 }
 
-export interface ProviderModelJsonApi {
-  id: string;
-  attributes: {
-    name: string;
-  };
+interface ReviewActionEmbedsJsonApi {
+  creator: UserDataErrorResponseJsonApi;
+  provider: Embed<JsonApiResource<'preprint-providers', PreprintProviderAttributesJsonApi>>;
+  target: Embed<PreprintDataJsonApi>;
 }
diff --git a/src/app/features/moderation/models/preprint-submission-json-api.model.ts b/src/app/features/moderation/models/preprint-submission-json-api.model.ts
index d18b87089..51509db33 100644
--- a/src/app/features/moderation/models/preprint-submission-json-api.model.ts
+++ b/src/app/features/moderation/models/preprint-submission-json-api.model.ts
@@ -1,30 +1,27 @@
-import { JsonApiResponseWithMeta, MetaJsonApi } from '@osf/shared/models/common/json-api.model';
+import { ListMetaJsonApi } from '@osf/shared/models/common/json-api/meta.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export type PreprintSubmissionResponseJsonApi = JsonApiResponseWithMeta<
-  PreprintSubmissionDataJsonApi[],
-  PreprintSubmissionMetaJsonApi,
-  null
->;
+export type PreprintSubmissionResponseJsonApi = ListResponse<PreprintSubmissionDataJsonApi> & {
+  meta: PreprintSubmissionMetaJsonApi;
+};
 
-export interface PreprintSubmissionDataJsonApi {
-  id: string;
-  attributes: PreprintSubmissionAttributesJsonApi;
-}
+export type PreprintSubmissionDataJsonApi = JsonApiResource<'preprints', PreprintSubmissionAttributesJsonApi>;
 
-interface PreprintSubmissionMetaJsonApi extends MetaJsonApi {
+interface PreprintSubmissionMetaJsonApi extends ListMetaJsonApi {
   reviews_state_counts: {
-    pending: number;
     accepted: number;
+    pending: number;
     rejected: number;
     withdrawn: number;
   };
 }
 
 interface PreprintSubmissionAttributesJsonApi {
+  embargo_end_date: string;
+  embargoed: boolean;
   id: string;
-  title: string;
-  reviews_state: string;
   public: boolean;
-  embargoed: boolean;
-  embargo_end_date: string;
+  reviews_state: string;
+  title: string;
 }
diff --git a/src/app/features/moderation/models/preprint-withdrawal-submission-json-api.model.ts b/src/app/features/moderation/models/preprint-withdrawal-submission-json-api.model.ts
index c68a0c336..5430734b3 100644
--- a/src/app/features/moderation/models/preprint-withdrawal-submission-json-api.model.ts
+++ b/src/app/features/moderation/models/preprint-withdrawal-submission-json-api.model.ts
@@ -1,40 +1,36 @@
-import { JsonApiResponseWithMeta, MetaJsonApi } from '@osf/shared/models/common/json-api.model';
+import { Embed } from '@osf/shared/models/common/json-api/embeds.model';
+import { ListMetaJsonApi } from '@osf/shared/models/common/json-api/meta.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
+import { PreprintAttributesJsonApi } from '@osf/shared/models/preprints/preprint-json-api.model';
 import { UserDataErrorResponseJsonApi } from '@osf/shared/models/user/user-json-api.model';
 
-export type PreprintSubmissionWithdrawalResponseJsonApi = JsonApiResponseWithMeta<
-  PreprintWithdrawalSubmissionDataJsonApi[],
-  PreprintWithdrawalSubmissionMetaJsonApi,
-  null
->;
+export type PreprintSubmissionWithdrawalResponseJsonApi = ListResponse<PreprintWithdrawalSubmissionDataJsonApi> & {
+  meta: PreprintWithdrawalSubmissionMetaJsonApi;
+};
 
-export interface PreprintWithdrawalSubmissionDataJsonApi {
-  id: string;
-  attributes: PreprintWithdrawalSubmissionAttributesJsonApi;
+export interface PreprintWithdrawalSubmissionDataJsonApi extends JsonApiResource<
+  'preprint-withdrawal-submissions',
+  PreprintWithdrawalSubmissionAttributesJsonApi
+> {
   embeds: PreprintWithdrawalSubmissionEmbedsJsonApi;
 }
 
-interface PreprintWithdrawalSubmissionMetaJsonApi extends MetaJsonApi {
+interface PreprintWithdrawalSubmissionMetaJsonApi extends ListMetaJsonApi {
   requests_state_counts: {
-    pending: number;
     accepted: number;
+    pending: number;
     rejected: number;
   };
 }
 
 interface PreprintWithdrawalSubmissionAttributesJsonApi {
   comment: string;
-  machine_state: string;
   date_last_transitioned: string;
+  machine_state: string;
 }
 
 interface PreprintWithdrawalSubmissionEmbedsJsonApi {
-  target: {
-    data: {
-      id: string;
-      attributes: {
-        title: string;
-      };
-    };
-  };
   creator: UserDataErrorResponseJsonApi;
+  target: Embed<JsonApiResource<'preprints', PreprintAttributesJsonApi>>;
 }
diff --git a/src/app/features/moderation/models/registry-json-api.model.ts b/src/app/features/moderation/models/registry-json-api.model.ts
index e8dd6c41e..1fbf11e9d 100644
--- a/src/app/features/moderation/models/registry-json-api.model.ts
+++ b/src/app/features/moderation/models/registry-json-api.model.ts
@@ -1,16 +1,14 @@
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
+import { ToManyRel } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { RegistrationNodeAttributesJsonApi } from '@osf/shared/models/registration/registration-node-json-api.model';
 
-export type RegistryResponseJsonApi = ResponseJsonApi<RegistryDataJsonApi[]>;
+export type RegistryResponseJsonApi = ListResponse<RegistryDataJsonApi>;
 
-export interface RegistryDataJsonApi {
-  id: string;
-  attributes: RegistrationNodeAttributesJsonApi;
+export interface RegistryDataJsonApi extends JsonApiResource<'registrations', RegistrationNodeAttributesJsonApi> {
   embeds: RegistryEmbedsJsonApi;
 }
 
-export interface RegistryEmbedsJsonApi {
-  schema_responses: {
-    data: { id: string }[];
-  };
+interface RegistryEmbedsJsonApi {
+  schema_responses: ToManyRel<'schema-responses'>;
 }
diff --git a/src/app/features/moderation/models/review-action-json-api.model.ts b/src/app/features/moderation/models/review-action-json-api.model.ts
index a8d5be563..0384b3046 100644
--- a/src/app/features/moderation/models/review-action-json-api.model.ts
+++ b/src/app/features/moderation/models/review-action-json-api.model.ts
@@ -1,11 +1,10 @@
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { UserDataErrorResponseJsonApi } from '@osf/shared/models/user/user-json-api.model';
 
-export type ReviewActionsResponseJsonApi = JsonApiResponse<ReviewActionsDataJsonApi[], null>;
+export type ReviewActionsResponseJsonApi = ListResponse<ReviewActionDataJsonApi>;
 
-export interface ReviewActionsDataJsonApi {
-  id: string;
-  attributes: ReviewActionAttributesJsonApi;
+export interface ReviewActionDataJsonApi extends JsonApiResource<'review-actions', ReviewActionAttributesJsonApi> {
   embeds: ReviewActionEmbedsJsonApi;
 }
 
diff --git a/src/app/features/moderation/services/moderators.service.ts b/src/app/features/moderation/services/moderators.service.ts
index 3a184913f..3e201bdb6 100644
--- a/src/app/features/moderation/services/moderators.service.ts
+++ b/src/app/features/moderation/services/moderators.service.ts
@@ -3,10 +3,10 @@ import { forkJoin, map, Observable } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { parseSearchTotalCount } from '@osf/shared/helpers/search-total-count.helper';
 import { MapResources } from '@osf/shared/mappers/search';
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { IndexCardSearchResponseJsonApi } from '@osf/shared/models/search/index-card-search-json-api.model';
 import { SearchUserDataModel } from '@osf/shared/models/user/search-user-data.model';
@@ -15,7 +15,13 @@ import { StringOrNull } from '@shared/helpers/types.helper';
 
 import { AddModeratorType, ModeratorPermission } from '../enums';
 import { ModerationMapper } from '../mappers';
-import { ModeratorAddModel, ModeratorDataJsonApi, ModeratorModel, ModeratorResponseJsonApi } from '../models';
+import {
+  ModeratorAddModel,
+  ModeratorDataJsonApi,
+  ModeratorItemResponseJsonApi,
+  ModeratorModel,
+  ModeratorResponseJsonApi,
+} from '../models';
 
 @Injectable({
   providedIn: 'root',
@@ -64,7 +70,7 @@ export class ModeratorsService {
       map((response) => ({
         data: ModerationMapper.getModerators(response.data),
         totalCount: response.meta.total,
-        pageSize: response.meta.per_page,
+        pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
       }))
     );
   }
@@ -76,7 +82,7 @@ export class ModeratorsService {
     const moderatorData = { data: ModerationMapper.toModeratorAddRequest(data, type) };
 
     return this.jsonApiService
-      .post<JsonApiResponse<ModeratorDataJsonApi, null>>(baseUrl, moderatorData)
+      .post<ModeratorItemResponseJsonApi>(baseUrl, moderatorData)
       .pipe(map((moderator) => ModerationMapper.fromModeratorResponse(moderator.data)));
   }
 
diff --git a/src/app/features/moderation/services/preprint-moderation.service.ts b/src/app/features/moderation/services/preprint-moderation.service.ts
index a41c9906f..61672912a 100644
--- a/src/app/features/moderation/services/preprint-moderation.service.ts
+++ b/src/app/features/moderation/services/preprint-moderation.service.ts
@@ -3,7 +3,6 @@ import { catchError, forkJoin, map, Observable, of, switchMap } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
@@ -11,13 +10,14 @@ import { PreprintSubmissionsSort } from '../enums';
 import { PreprintModerationMapper, RegistryModerationMapper } from '../mappers';
 import {
   PreprintProviderModerationInfo,
-  PreprintRelatedCountJsonApi,
+  PreprintRelatedCountItemResponseJsonApi,
+  PreprintRelatedCountListResponseJsonApi,
+  PreprintReviewActionListResponseJsonApi,
   PreprintReviewActionModel,
   PreprintSubmissionResponseJsonApi,
   PreprintSubmissionWithdrawalResponseJsonApi,
   PreprintWithdrawalPaginatedData,
   ReviewAction,
-  ReviewActionJsonApi,
   ReviewActionsResponseJsonApi,
 } from '../models';
 import { PreprintSubmissionPaginatedData } from '../models/preprint-submission.model';
@@ -37,7 +37,7 @@ export class PreprintModerationService {
     const baseUrl = `${this.apiUrl}/providers/preprints/?filter[permissions]=view_actions,set_up_moderation`;
 
     return this.jsonApiService
-      .get<ResponseJsonApi<PreprintRelatedCountJsonApi[]>>(baseUrl)
+      .get<PreprintRelatedCountListResponseJsonApi>(baseUrl)
       .pipe(map((response) => response.data.map((x) => PreprintModerationMapper.fromPreprintRelatedCounts(x))));
   }
 
@@ -45,7 +45,7 @@ export class PreprintModerationService {
     const baseUrl = `${this.apiUrl}/providers/preprints/${id}/?related_counts=true`;
 
     return this.jsonApiService
-      .get<ResponseJsonApi<PreprintRelatedCountJsonApi>>(baseUrl)
+      .get<PreprintRelatedCountItemResponseJsonApi>(baseUrl)
       .pipe(map((response) => PreprintModerationMapper.fromPreprintRelatedCounts(response.data)));
   }
 
@@ -53,7 +53,7 @@ export class PreprintModerationService {
     const baseUrl = `${this.apiUrl}/actions/reviews/?embed=provider&embed=target&page=${page}`;
 
     return this.jsonApiService
-      .get<ResponseJsonApi<ReviewActionJsonApi[]>>(baseUrl)
+      .get<PreprintReviewActionListResponseJsonApi>(baseUrl)
       .pipe(map((response) => PreprintModerationMapper.fromResponseWithPagination(response)));
   }
 
diff --git a/src/app/features/moderation/services/provider-subscription.service.ts b/src/app/features/moderation/services/provider-subscription.service.ts
index 21277c50b..378022180 100644
--- a/src/app/features/moderation/services/provider-subscription.service.ts
+++ b/src/app/features/moderation/services/provider-subscription.service.ts
@@ -6,9 +6,11 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { SubscriptionFrequency } from '@osf/shared/enums/subscriptions/subscription-frequency.enum';
 import { SubscriptionType } from '@osf/shared/enums/subscriptions/subscription-type.enum';
 import { NotificationSubscriptionMapper } from '@osf/shared/mappers/notification-subscription.mapper';
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
 import { NotificationSubscription } from '@osf/shared/models/notifications/notification-subscription.model';
-import { NotificationSubscriptionGetResponseJsonApi } from '@osf/shared/models/notifications/notification-subscription-json-api.model';
+import {
+  NotificationSubscriptionDataJsonApi,
+  NotificationSubscriptionsListResponseJsonApi,
+} from '@osf/shared/models/notifications/notification-subscription-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 @Injectable({
@@ -24,9 +26,7 @@ export class ProviderSubscriptionService {
 
   getProviderSubscriptions(providerType: string, providerId: string): Observable<NotificationSubscription[]> {
     return this.jsonApiService
-      .get<
-        JsonApiResponse<NotificationSubscriptionGetResponseJsonApi[], null>
-      >(this.providerUrl(providerType, providerId))
+      .get<NotificationSubscriptionsListResponseJsonApi>(this.providerUrl(providerType, providerId))
       .pipe(
         map((responses) => responses.data.map((response) => NotificationSubscriptionMapper.fromGetResponse(response)))
       );
@@ -47,7 +47,7 @@ export class ProviderSubscriptionService {
     };
 
     return this.jsonApiService
-      .patch<NotificationSubscriptionGetResponseJsonApi>(
+      .patch<NotificationSubscriptionDataJsonApi>(
         `${this.providerUrl(providerType, providerId)}${subscriptionId}/`,
         request
       )
diff --git a/src/app/features/moderation/store/collections-moderation/collections-moderation.model.ts b/src/app/features/moderation/store/collections-moderation/collections-moderation.model.ts
index daa7cb0af..e5ab11a96 100644
--- a/src/app/features/moderation/store/collections-moderation/collections-moderation.model.ts
+++ b/src/app/features/moderation/store/collections-moderation/collections-moderation.model.ts
@@ -1,5 +1,5 @@
 import { CollectionSubmissionReviewAction } from '@osf/features/moderation/models';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collection-submissions.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 import { AsyncStateWithTotalCount } from '@osf/shared/models/store/async-state-with-total-count.model';
 
diff --git a/src/app/features/my-projects/my-projects.component.ts b/src/app/features/my-projects/my-projects.component.ts
index 8fd1df271..d541a1d69 100644
--- a/src/app/features/my-projects/my-projects.component.ts
+++ b/src/app/features/my-projects/my-projects.component.ts
@@ -32,7 +32,7 @@ import { SubHeaderComponent } from '@osf/shared/components/sub-header/sub-header
 import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { SortOrder } from '@osf/shared/enums/sort-order.enum';
 import { IS_MEDIUM } from '@osf/shared/helpers/breakpoints.tokens';
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { MyResourcesSearchFilters } from '@osf/shared/models/my-resources/my-resources-search-filters.model';
 import { CustomDialogService } from '@osf/shared/services/custom-dialog.service';
 import { ProjectRedirectDialogService } from '@osf/shared/services/project-redirect-dialog.service';
diff --git a/src/app/features/my-projects/services/project-download-options.service.spec.ts b/src/app/features/my-projects/services/project-download-options.service.spec.ts
index 6b86d22c6..f04ceb8f4 100644
--- a/src/app/features/my-projects/services/project-download-options.service.spec.ts
+++ b/src/app/features/my-projects/services/project-download-options.service.spec.ts
@@ -53,7 +53,9 @@ describe('ProjectDownloadOptionsService', () => {
 
   beforeEach(() => {
     filesService = FilesServiceMock.simple();
-    filesService.getRootFolders.mockReturnValue(of({ files: [osfFolder, googleDriveFolder] }));
+    filesService.getRootFolders.mockReturnValue(
+      of({ data: [osfFolder, googleDriveFolder], totalCount: 2, pageSize: 10 })
+    );
     filesService.getConfiguredStorageAddons.mockReturnValue(of([googleDriveAddon]));
     filesService.getFilesWithoutFiltering.mockReturnValue(of({ data: [], totalCount: 2, pageSize: 10 }));
 
@@ -111,7 +113,9 @@ describe('ProjectDownloadOptionsService', () => {
       ...osfFolder,
       links: osfLinksWithoutFilesLink,
     } as FileFolderModel;
-    filesService.getRootFolders.mockReturnValue(of({ files: [osfFolderWithoutFilesLink, googleDriveFolder] }));
+    filesService.getRootFolders.mockReturnValue(
+      of({ data: [osfFolderWithoutFilesLink, googleDriveFolder], totalCount: 2, pageSize: 10 })
+    );
 
     await firstValueFrom(service.loadOptions('project-1'));
 
diff --git a/src/app/features/my-projects/services/project-download-options.service.ts b/src/app/features/my-projects/services/project-download-options.service.ts
index a170e4563..555bb70a3 100644
--- a/src/app/features/my-projects/services/project-download-options.service.ts
+++ b/src/app/features/my-projects/services/project-download-options.service.ts
@@ -61,7 +61,7 @@ export class ProjectDownloadOptionsService {
       configuredAddons: this.filesService.getConfiguredStorageAddons(projectId),
     }).pipe(
       switchMap(({ rootFoldersResponse, configuredAddons }) =>
-        this.buildOptions(rootFoldersResponse.files, configuredAddons)
+        this.buildOptions(rootFoldersResponse.data, configuredAddons)
       ),
       map((options) => {
         this.optionsCache.set(projectId, options);
diff --git a/src/app/features/preprints/mappers/preprint-providers.mapper.ts b/src/app/features/preprints/mappers/preprint-providers.mapper.ts
index c9fa25ac2..bbb1eb94d 100644
--- a/src/app/features/preprints/mappers/preprint-providers.mapper.ts
+++ b/src/app/features/preprints/mappers/preprint-providers.mapper.ts
@@ -1,6 +1,6 @@
 import { replaceBadEncodedChars } from '@osf/shared/helpers/format-bad-encoding.helper';
-import { BrandDataJsonApi } from '@osf/shared/models/brand/brand.json-api.model';
 import { BrandModel } from '@osf/shared/models/brand/brand.model';
+import { BrandDataJsonApi } from '@osf/shared/models/brand/brand-json-api.model';
 import { SubjectModel } from '@osf/shared/models/subject/subject.model';
 import { SubjectDataJsonApi } from '@osf/shared/models/subject/subjects-json-api.model';
 
@@ -8,7 +8,7 @@ import { PreprintProviderDetails, PreprintProviderDetailsJsonApi, PreprintProvid
 
 export class PreprintProvidersMapper {
   static fromPreprintProviderDetailsGetResponse(response: PreprintProviderDetailsJsonApi): PreprintProviderDetails {
-    const brandRaw = response.embeds!.brand?.data;
+    const brandRaw = response.embeds?.brand?.data;
     return {
       id: response.id,
       name: replaceBadEncodedChars(response.attributes.name),
@@ -32,7 +32,7 @@ export class PreprintProvidersMapper {
     };
   }
 
-  static parseBrand(brandRaw: BrandDataJsonApi): BrandModel {
+  static parseBrand(brandRaw: BrandDataJsonApi | undefined): BrandModel {
     if (!brandRaw) {
       return {
         primaryColor: 'var(--osf-provider-primary-color)',
diff --git a/src/app/features/preprints/mappers/preprints.mapper.ts b/src/app/features/preprints/mappers/preprints.mapper.ts
index ed01f2be9..952817c24 100644
--- a/src/app/features/preprints/mappers/preprints.mapper.ts
+++ b/src/app/features/preprints/mappers/preprints.mapper.ts
@@ -2,18 +2,14 @@ import { StringOrNull } from '@osf/shared/helpers/types.helper';
 import { ContributorsMapper } from '@osf/shared/mappers/contributors';
 import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper';
 import { LicensesMapper } from '@osf/shared/mappers/licenses.mapper';
-import { ApiData, JsonApiResponseWithMeta, ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
+import {
+  PreprintDataJsonApi,
+  PreprintResponseJsonApi,
+  PreprintsListResponseJsonApi,
+} from '@osf/shared/models/preprints/preprint-json-api.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
-import {
-  PreprintAttributesJsonApi,
-  PreprintEmbedsJsonApi,
-  PreprintLinksJsonApi,
-  PreprintMetaJsonApi,
-  PreprintModel,
-  PreprintRelationshipsJsonApi,
-  PreprintShortInfoWithTotalCount,
-} from '../models';
+import { PreprintModel, PreprintShortInfoWithTotalCount } from '../models';
 
 export class PreprintsMapper {
   static toCreatePayload(title: string, abstract: string, providerId: string) {
@@ -36,9 +32,7 @@ export class PreprintsMapper {
     };
   }
 
-  static fromPreprintJsonApi(
-    response: ApiData<PreprintAttributesJsonApi, null, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>
-  ): PreprintModel {
+  static fromPreprintJsonApi(response: PreprintDataJsonApi): PreprintModel {
     return {
       id: response.id,
       dateCreated: response.attributes.date_created,
@@ -81,21 +75,15 @@ export class PreprintsMapper {
       whyNoPrereg: response.attributes.why_no_prereg ? replaceBadEncodedChars(response.attributes.why_no_prereg) : null,
       preregLinks: response.attributes.prereg_links,
       preregLinkInfo: response.attributes.prereg_link_info,
-      preprintDoiLink: response.links.preprint_doi,
-      articleDoiLink: response.links.doi,
+      preprintDoiLink: response.links?.preprint_doi ?? '',
+      articleDoiLink: response.links?.doi ?? '',
       embeddedLicense: null,
       providerId: response.relationships?.provider?.data?.id,
       defaultLicenseId: response.attributes.default_license_id,
     };
   }
 
-  static fromPreprintWithEmbedsJsonApi(
-    response: JsonApiResponseWithMeta<
-      ApiData<PreprintAttributesJsonApi, PreprintEmbedsJsonApi, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>,
-      PreprintMetaJsonApi,
-      null
-    >
-  ): PreprintModel {
+  static fromPreprintWithEmbedsJsonApi(response: PreprintResponseJsonApi): PreprintModel {
     const data = response.data;
     const links = response.data.links;
     const relationships = response?.data?.relationships;
@@ -142,10 +130,12 @@ export class PreprintsMapper {
       whyNoPrereg: data.attributes.why_no_prereg ? replaceBadEncodedChars(data.attributes.why_no_prereg) : null,
       preregLinks: data.attributes.prereg_links,
       preregLinkInfo: data.attributes.prereg_link_info,
-      embeddedLicense: LicensesMapper.fromLicenseDataJsonApi(data.embeds?.license?.data),
+      embeddedLicense: data.embeds?.license?.data
+        ? LicensesMapper.fromLicenseDataJsonApi(data.embeds?.license?.data)
+        : null,
       identifiers: IdentifiersMapper.fromJsonApi(data.embeds?.identifiers),
-      preprintDoiLink: links.preprint_doi,
-      articleDoiLink: links.doi,
+      preprintDoiLink: links?.preprint_doi ?? '',
+      articleDoiLink: links?.doi ?? '',
       providerId: relationships?.provider?.data?.id,
     };
   }
@@ -170,11 +160,7 @@ export class PreprintsMapper {
     };
   }
 
-  static fromMyPreprintJsonApi(
-    response: ResponseJsonApi<
-      ApiData<PreprintAttributesJsonApi, PreprintEmbedsJsonApi, PreprintRelationshipsJsonApi, null>[]
-    >
-  ): PreprintShortInfoWithTotalCount {
+  static fromMyPreprintJsonApi(response: PreprintsListResponseJsonApi): PreprintShortInfoWithTotalCount {
     return {
       data: response.data.map((preprintData) => ({
         id: preprintData.id,
diff --git a/src/app/features/preprints/models/index.ts b/src/app/features/preprints/models/index.ts
index 5c556d995..e831133e1 100644
--- a/src/app/features/preprints/models/index.ts
+++ b/src/app/features/preprints/models/index.ts
@@ -1,5 +1,4 @@
 export * from './preprint.model';
-export * from './preprint-json-api.model';
 export * from './preprint-licenses-json-api.model';
 export * from './preprint-provider.model';
 export * from './preprint-provider-json-api.model';
diff --git a/src/app/features/preprints/models/preprint-licenses-json-api.model.ts b/src/app/features/preprints/models/preprint-licenses-json-api.model.ts
index b1b1ba6f8..ae507a659 100644
--- a/src/app/features/preprints/models/preprint-licenses-json-api.model.ts
+++ b/src/app/features/preprints/models/preprint-licenses-json-api.model.ts
@@ -1,21 +1,18 @@
+import { ToOneRelData } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { DataResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { LicenseRecordJsonApi } from '@osf/shared/models/license/licenses-json-api.model';
 
-export interface PreprintLicenseRelationshipJsonApi {
-  id: string;
-  type: 'licenses';
+export type PreprintLicensePayloadJsonApi = DataResponse<PreprintLicenseDataJsonApi>;
+
+interface PreprintLicenseDataJsonApi extends JsonApiResource<'preprints', PreprintLicenseAttributesJsonApi> {
+  relationships: PreprintLicenseRelationshipsJsonApi;
+}
+
+interface PreprintLicenseAttributesJsonApi {
+  license_record?: LicenseRecordJsonApi;
 }
 
-export interface PreprintLicensePayloadJsonApi {
-  data: {
-    type: 'preprints';
-    id: string;
-    relationships: {
-      license: {
-        data: PreprintLicenseRelationshipJsonApi;
-      };
-    };
-    attributes: {
-      license_record?: LicenseRecordJsonApi;
-    };
-  };
+interface PreprintLicenseRelationshipsJsonApi {
+  license: ToOneRelData<'licenses'>;
 }
diff --git a/src/app/features/preprints/models/preprint-provider-json-api.model.ts b/src/app/features/preprints/models/preprint-provider-json-api.model.ts
index e71cc5ee2..0ed0cb67f 100644
--- a/src/app/features/preprints/models/preprint-provider-json-api.model.ts
+++ b/src/app/features/preprints/models/preprint-provider-json-api.model.ts
@@ -1,41 +1,50 @@
 import { ReviewPermissions } from '@osf/shared/enums/review-permissions.enum';
 import { StringOrNull } from '@osf/shared/helpers/types.helper';
-import { BrandDataJsonApi } from '@osf/shared/models/brand/brand.json-api.model';
+import { BrandDataJsonApi } from '@osf/shared/models/brand/brand-json-api.model';
+import { Embed } from '@osf/shared/models/common/json-api/embeds.model';
+import { ResourceLinksJsonApi } from '@osf/shared/models/common/json-api/links.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 
 import { ProviderReviewsWorkflow } from '../enums';
 
 import { PreprintWord } from './preprint-provider.model';
 
-export interface PreprintProviderDetailsJsonApi {
-  id: string;
-  type: 'preprint-providers';
-  attributes: {
-    name: string;
-    description: string;
-    advisory_board: StringOrNull;
-    example: string;
-    domain: string;
-    footer_links: string;
-    preprint_word: PreprintWord;
-    permissions: ReviewPermissions[];
-    assets: {
-      wide_white: string;
-      square_color_no_transparent: string;
-      favicon: string;
-    };
-    allow_submissions: boolean;
-    assertions_enabled: boolean;
-    reviews_workflow: ProviderReviewsWorkflow | null;
-    facebook_app_id: StringOrNull;
-    reviews_comments_private: StringOrNull;
-    reviews_comments_anonymous: StringOrNull;
-  };
-  embeds?: {
-    brand: {
-      data: BrandDataJsonApi;
-    };
-  };
-  links: {
-    iri: string;
-  };
+export type PreprintProviderResponseJsonApi = ItemResponse<PreprintProviderDetailsJsonApi>;
+export type PreprintProvidersListResponseJsonApi = ListResponse<PreprintProviderDetailsJsonApi>;
+
+export interface PreprintProviderDetailsJsonApi extends JsonApiResource<
+  'preprint-providers',
+  PreprintProviderAttributesJsonApi
+> {
+  embeds?: PreprintProviderEmbedsJsonApi;
+  links: ResourceLinksJsonApi;
+}
+
+interface PreprintProviderAttributesJsonApi {
+  advisory_board: StringOrNull;
+  allow_submissions: boolean;
+  assertions_enabled: boolean;
+  assets: PreprintProviderAssetsJsonApi;
+  description: string;
+  domain: string;
+  example: string;
+  facebook_app_id: StringOrNull;
+  footer_links: string;
+  name: string;
+  permissions: ReviewPermissions[];
+  preprint_word: PreprintWord;
+  reviews_comments_anonymous: StringOrNull;
+  reviews_comments_private: StringOrNull;
+  reviews_workflow: ProviderReviewsWorkflow | null;
+}
+
+interface PreprintProviderAssetsJsonApi {
+  favicon: string;
+  square_color_no_transparent: string;
+  wide_white: string;
+}
+
+interface PreprintProviderEmbedsJsonApi {
+  brand?: Embed<BrandDataJsonApi>;
 }
diff --git a/src/app/features/preprints/models/preprint-request-action-json-api.model.ts b/src/app/features/preprints/models/preprint-request-action-json-api.model.ts
index 4c9e53bef..777fbb899 100644
--- a/src/app/features/preprints/models/preprint-request-action-json-api.model.ts
+++ b/src/app/features/preprints/models/preprint-request-action-json-api.model.ts
@@ -1,24 +1,25 @@
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { UserDataErrorResponseJsonApi } from '@osf/shared/models/user/user-json-api.model';
 
-export type PreprintRequestActionsJsonApiResponse = JsonApiResponse<PreprintRequestActionDataJsonApi[], null>;
+export type PreprintRequestActionsJsonApiResponse = ListResponse<PreprintRequestActionDataJsonApi>;
 
-export interface PreprintRequestActionDataJsonApi {
-  id: string;
-  type: 'preprint_request_actions';
-  attributes: PreprintRequestActionsAttributesJsonApi;
-  embeds: PreprintRequestEmbedsJsonApi;
+export interface PreprintRequestActionDataJsonApi extends JsonApiResource<
+  'preprint_request_actions',
+  PreprintRequestActionAttributesJsonApi
+> {
+  embeds: PreprintRequestActionEmbedsJsonApi;
 }
 
-interface PreprintRequestActionsAttributesJsonApi {
-  trigger: string;
+interface PreprintRequestActionAttributesJsonApi {
   comment: string;
-  from_state: string;
-  to_state: string;
   date_created: Date;
   date_modified: Date;
+  from_state: string;
+  to_state: string;
+  trigger: string;
 }
 
-interface PreprintRequestEmbedsJsonApi {
+interface PreprintRequestActionEmbedsJsonApi {
   creator: UserDataErrorResponseJsonApi;
 }
diff --git a/src/app/features/preprints/models/preprint-request-json-api.model.ts b/src/app/features/preprints/models/preprint-request-json-api.model.ts
index fca82bcde..0d406799b 100644
--- a/src/app/features/preprints/models/preprint-request-json-api.model.ts
+++ b/src/app/features/preprints/models/preprint-request-json-api.model.ts
@@ -1,23 +1,25 @@
-import { PreprintRequestMachineState, PreprintRequestType } from '@osf/features/preprints/enums';
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { UserDataErrorResponseJsonApi } from '@osf/shared/models/user/user-json-api.model';
 
-export type PreprintRequestsJsonApiResponse = JsonApiResponse<PreprintRequestDataJsonApi[], null>;
+import { PreprintRequestMachineState, PreprintRequestType } from '../enums';
 
-export interface PreprintRequestDataJsonApi {
-  id: string;
-  type: 'preprint_requests';
-  attributes: PreprintRequestAttributesJsonApi;
+export type PreprintRequestsJsonApiResponse = ListResponse<PreprintRequestDataJsonApi>;
+
+export interface PreprintRequestDataJsonApi extends JsonApiResource<
+  'preprint_requests',
+  PreprintRequestAttributesJsonApi
+> {
   embeds: PreprintRequestEmbedsJsonApi;
 }
 
 interface PreprintRequestAttributesJsonApi {
-  request_type: PreprintRequestType;
-  machine_state: PreprintRequestMachineState;
   comment: string;
   created: Date;
-  modified: Date;
   date_last_transitioned: Date;
+  machine_state: PreprintRequestMachineState;
+  modified: Date;
+  request_type: PreprintRequestType;
 }
 
 interface PreprintRequestEmbedsJsonApi {
diff --git a/src/app/features/preprints/services/preprint-files.service.ts b/src/app/features/preprints/services/preprint-files.service.ts
index 0f0de7945..804f32e47 100644
--- a/src/app/features/preprints/services/preprint-files.service.ts
+++ b/src/app/features/preprints/services/preprint-files.service.ts
@@ -4,22 +4,17 @@ import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { PreprintsMapper } from '@osf/features/preprints/mappers';
-import {
-  PreprintAttributesJsonApi,
-  PreprintFilesLinks,
-  PreprintLinksJsonApi,
-  PreprintModel,
-  PreprintRelationshipsJsonApi,
-} from '@osf/features/preprints/models';
-import { ApiData } from '@osf/shared/models/common/json-api.model';
 import { FileFolderModel } from '@osf/shared/models/files/file-folder.model';
 import {
   FileFolderResponseJsonApi,
   FileFoldersResponseJsonApi,
 } from '@osf/shared/models/files/file-folder-json-api.model';
+import { PreprintDataJsonApi } from '@osf/shared/models/preprints/preprint-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { FilesMapper } from '@shared/mappers/files/files.mapper';
 
+import { PreprintFilesLinks, PreprintModel } from '../models';
+
 @Injectable({
   providedIn: 'root',
 })
@@ -33,24 +28,21 @@ export class PreprintFilesService {
 
   updateFileRelationship(preprintId: string, fileId: string): Observable<PreprintModel> {
     return this.jsonApiService
-      .patch<ApiData<PreprintAttributesJsonApi, null, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>>(
-        `${this.apiUrl}/preprints/${preprintId}/`,
-        {
-          data: {
-            type: 'preprints',
-            id: preprintId,
-            attributes: {},
-            relationships: {
-              primary_file: {
-                data: {
-                  type: 'files',
-                  id: fileId,
-                },
+      .patch<PreprintDataJsonApi>(`${this.apiUrl}/preprints/${preprintId}/`, {
+        data: {
+          type: 'preprints',
+          id: preprintId,
+          attributes: {},
+          relationships: {
+            primary_file: {
+              data: {
+                type: 'files',
+                id: fileId,
               },
             },
           },
-        }
-      )
+        },
+      })
       .pipe(map((response) => PreprintsMapper.fromPreprintJsonApi(response)));
   }
 
diff --git a/src/app/features/preprints/services/preprint-licenses.service.ts b/src/app/features/preprints/services/preprint-licenses.service.ts
index 5d8a3a5f8..6f8de72cf 100644
--- a/src/app/features/preprints/services/preprint-licenses.service.ts
+++ b/src/app/features/preprints/services/preprint-licenses.service.ts
@@ -4,18 +4,14 @@ import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { PreprintsMapper } from '@osf/features/preprints/mappers';
-import {
-  PreprintAttributesJsonApi,
-  PreprintLicensePayloadJsonApi,
-  PreprintLinksJsonApi,
-  PreprintRelationshipsJsonApi,
-} from '@osf/features/preprints/models';
+import { PreprintDataJsonApi } from '@osf/shared/models/preprints/preprint-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { LicensesMapper } from '@shared/mappers/licenses.mapper';
-import { ApiData } from '@shared/models/common/json-api.model';
 import { LicenseModel, LicenseOptions } from '@shared/models/license/license.model';
 import { LicensesResponseJsonApi } from '@shared/models/license/licenses-json-api.model';
 
+import { PreprintLicensePayloadJsonApi } from '../models';
+
 @Injectable({
   providedIn: 'root',
 })
@@ -61,9 +57,7 @@ export class PreprintLicensesService {
     };
 
     return this.jsonApiService
-      .patch<
-        ApiData<PreprintAttributesJsonApi, null, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>
-      >(`${this.apiUrl}/preprints/${preprintId}/`, payload)
+      .patch<PreprintDataJsonApi>(`${this.apiUrl}/preprints/${preprintId}/`, payload)
       .pipe(map((response) => PreprintsMapper.fromPreprintJsonApi(response)));
   }
 }
diff --git a/src/app/features/preprints/services/preprint-providers.service.ts b/src/app/features/preprints/services/preprint-providers.service.ts
index 3463e59ed..9e2f18f61 100644
--- a/src/app/features/preprints/services/preprint-providers.service.ts
+++ b/src/app/features/preprints/services/preprint-providers.service.ts
@@ -6,11 +6,11 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { PreprintProvidersMapper } from '@osf/features/preprints/mappers';
 import {
   PreprintProviderDetails,
-  PreprintProviderDetailsJsonApi,
+  PreprintProviderResponseJsonApi,
   PreprintProviderShortInfo,
+  PreprintProvidersListResponseJsonApi,
 } from '@osf/features/preprints/models';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
-import { JsonApiResponse } from '@shared/models/common/json-api.model';
 import { SubjectModel } from '@shared/models/subject/subject.model';
 import { SubjectsResponseJsonApi } from '@shared/models/subject/subjects-json-api.model';
 
@@ -27,15 +27,13 @@ export class PreprintProvidersService {
 
   getPreprintProviderById(id: string): Observable<PreprintProviderDetails> {
     return this.jsonApiService
-      .get<JsonApiResponse<PreprintProviderDetailsJsonApi, null>>(`${this.apiUrl}${id}/?embed=brand`)
+      .get<PreprintProviderResponseJsonApi>(`${this.apiUrl}${id}/?embed=brand`)
       .pipe(map((response) => PreprintProvidersMapper.fromPreprintProviderDetailsGetResponse(response.data)));
   }
 
   getPreprintProvidersToAdvertise(): Observable<PreprintProviderShortInfo[]> {
     return this.jsonApiService
-      .get<
-        JsonApiResponse<PreprintProviderDetailsJsonApi[], null>
-      >(`${this.apiUrl}?filter[advertise_on_discover_page]=true&reload=true`)
+      .get<PreprintProvidersListResponseJsonApi>(`${this.apiUrl}?filter[advertise_on_discover_page]=true&reload=true`)
       .pipe(
         map((response) =>
           PreprintProvidersMapper.toPreprintProviderShortInfoFromGetResponse(
@@ -47,7 +45,7 @@ export class PreprintProvidersService {
 
   getPreprintProvidersAllowingSubmissions(): Observable<PreprintProviderShortInfo[]> {
     return this.jsonApiService
-      .get<JsonApiResponse<PreprintProviderDetailsJsonApi[], null>>(`${this.apiUrl}?filter[allow_submissions]=true`)
+      .get<PreprintProvidersListResponseJsonApi>(`${this.apiUrl}?filter[allow_submissions]=true`)
       .pipe(map((response) => PreprintProvidersMapper.toPreprintProviderShortInfoFromGetResponse(response.data)));
   }
 
diff --git a/src/app/features/preprints/services/preprints-projects.service.ts b/src/app/features/preprints/services/preprints-projects.service.ts
index 1f1eed57b..a228863a2 100644
--- a/src/app/features/preprints/services/preprints-projects.service.ts
+++ b/src/app/features/preprints/services/preprints-projects.service.ts
@@ -5,22 +5,17 @@ import { inject, Injectable } from '@angular/core';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { Primitive, StringOrNull } from '@osf/shared/helpers/types.helper';
 import { IdNameModel } from '@osf/shared/models/common/id-name.model';
-import { ApiData } from '@osf/shared/models/common/json-api.model';
 import {
   CreateProjectPayloadJsoApi,
   NodeResponseJsonApi,
   NodesResponseJsonApi,
 } from '@osf/shared/models/nodes/nodes-json-api.model';
+import { PreprintDataJsonApi } from '@osf/shared/models/preprints/preprint-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { PreprintsMapper } from '../mappers';
-import {
-  PreprintAttributesJsonApi,
-  PreprintLinksJsonApi,
-  PreprintModel,
-  PreprintRelationshipsJsonApi,
-} from '../models';
+import { PreprintModel } from '../models';
 
 @Injectable({
   providedIn: 'root',
@@ -70,24 +65,21 @@ export class PreprintsProjectsService {
 
   updatePreprintProjectRelationship(preprintId: string, projectId: string): Observable<PreprintModel> {
     return this.jsonApiService
-      .patch<ApiData<PreprintAttributesJsonApi, null, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>>(
-        `${this.apiUrl}/preprints/${preprintId}/`,
-        {
-          data: {
-            type: 'preprints',
-            id: preprintId,
-            attributes: {},
-            relationships: {
-              node: {
-                data: {
-                  type: 'nodes',
-                  id: projectId,
-                },
+      .patch<PreprintDataJsonApi>(`${this.apiUrl}/preprints/${preprintId}/`, {
+        data: {
+          type: 'preprints',
+          id: preprintId,
+          attributes: {},
+          relationships: {
+            node: {
+              data: {
+                type: 'nodes',
+                id: projectId,
               },
             },
           },
-        }
-      )
+        },
+      })
       .pipe(map((response) => PreprintsMapper.fromPreprintJsonApi(response)));
   }
 
diff --git a/src/app/features/preprints/services/preprints.service.ts b/src/app/features/preprints/services/preprints.service.ts
index 5216bf12d..d065f23d0 100644
--- a/src/app/features/preprints/services/preprints.service.ts
+++ b/src/app/features/preprints/services/preprints.service.ts
@@ -5,29 +5,25 @@ import { Router } from '@angular/router';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { RegistryModerationMapper } from '@osf/features/moderation/mappers';
-import { ReviewActionsResponseJsonApi } from '@osf/features/moderation/models';
+import { ReviewActionsResponseJsonApi } from '@osf/features/moderation/models/review-action-json-api.model';
 import { PreprintRequestActionsMapper } from '@osf/features/preprints/mappers/preprint-request-actions.mapper';
 import { PreprintRequestAction } from '@osf/features/preprints/models/preprint-request-action.model';
 import { searchPreferencesToJsonApiQueryParams } from '@osf/shared/helpers/search-pref-to-json-api-query-params.helper';
 import { StringOrNull } from '@osf/shared/helpers/types.helper';
 import {
-  ApiData,
-  JsonApiResponse,
-  JsonApiResponseWithMeta,
-  ResponseJsonApi,
-} from '@osf/shared/models/common/json-api.model';
+  PreprintAttributesJsonApi,
+  PreprintDataJsonApi,
+  PreprintMetricsResponseJsonApi,
+  PreprintResponseJsonApi,
+  PreprintsListResponseJsonApi,
+} from '@osf/shared/models/preprints/preprint-json-api.model';
 import { SearchFilters } from '@osf/shared/models/search-filters.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 import { preprintSortFieldMap } from '../constants';
 import { PreprintRequestMapper, PreprintsMapper } from '../mappers';
 import {
-  PreprintAttributesJsonApi,
-  PreprintEmbedsJsonApi,
-  PreprintLinksJsonApi,
-  PreprintMetaJsonApi,
   PreprintModel,
-  PreprintRelationshipsJsonApi,
   PreprintRequest,
   PreprintRequestActionsJsonApiResponse,
   PreprintRequestsJsonApiResponse,
@@ -67,76 +63,52 @@ export class PreprintsService {
   createPreprint(title: string, abstract: string, providerId: string) {
     const payload = PreprintsMapper.toCreatePayload(title, abstract, providerId);
     return this.jsonApiService
-      .post<
-        JsonApiResponse<
-          ApiData<PreprintAttributesJsonApi, null, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>,
-          null
-        >
-      >(`${this.apiUrl}/preprints/`, payload)
+      .post<PreprintResponseJsonApi>(`${this.apiUrl}/preprints/`, payload)
       .pipe(map((response) => PreprintsMapper.fromPreprintJsonApi(response.data)));
   }
 
   getById(id: string) {
     return this.jsonApiService
-      .get<
-        JsonApiResponse<
-          ApiData<PreprintAttributesJsonApi, null, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>,
-          null
-        >
-      >(`${this.apiUrl}/preprints/${id}/`)
+      .get<PreprintResponseJsonApi>(`${this.apiUrl}/preprints/${id}/`)
       .pipe(map((response) => PreprintsMapper.fromPreprintJsonApi(response.data)));
   }
 
   getByIdWithEmbeds(id: string) {
     const params = { 'embed[]': ['license', 'identifiers'] };
-    return this.jsonApiService
-      .get<
-        JsonApiResponseWithMeta<
-          ApiData<PreprintAttributesJsonApi, PreprintEmbedsJsonApi, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>,
-          PreprintMetaJsonApi,
-          null
-        >
-      >(`${this.apiUrl}/preprints/${id}/`, params)
-      .pipe(
-        map((response) => PreprintsMapper.fromPreprintWithEmbedsJsonApi(response)),
-        catchError((error) => {
-          if (error.error?.errors?.[0]?.meta?.flagged_content) {
-            this.router.navigate(['/spam-content']);
-          }
-          return throwError(() => error);
-        })
-      );
+
+    return this.jsonApiService.get<PreprintResponseJsonApi>(`${this.apiUrl}/preprints/${id}/`, params).pipe(
+      map((response) => PreprintsMapper.fromPreprintWithEmbedsJsonApi(response)),
+      catchError((error) => {
+        if (error.error?.errors?.[0]?.meta?.flagged_content) {
+          this.router.navigate(['/spam-content']);
+        }
+        return throwError(() => error);
+      })
+    );
   }
 
   getPreprintMetrics(id: string) {
     const params = { 'metrics[views]': 'total', 'metrics[downloads]': 'total' };
 
-    return this.jsonApiService
-      .get<
-        JsonApiResponseWithMeta<ApiData<PreprintAttributesJsonApi, null, null, null>, PreprintMetaJsonApi, null>
-      >(`${this.apiUrl}/preprints/${id}/`, params)
-      .pipe(
-        map((response) => ({
-          downloads: response.meta.metrics.downloads,
-          views: response.meta.metrics.views,
-        }))
-      );
+    return this.jsonApiService.get<PreprintMetricsResponseJsonApi>(`${this.apiUrl}/preprints/${id}/`, params).pipe(
+      map((response) => ({
+        downloads: response.meta.metrics.downloads,
+        views: response.meta.metrics.views,
+      }))
+    );
   }
 
   updatePreprint(id: string, payload: Partial<PreprintModel>): Observable<PreprintModel> {
     const apiPayload = this.mapPreprintDomainToApiPayload(payload);
 
     return this.jsonApiService
-      .patch<ApiData<PreprintAttributesJsonApi, null, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>>(
-        `${this.apiUrl}/preprints/${id}/`,
-        {
-          data: {
-            type: 'preprints',
-            id,
-            attributes: apiPayload,
-          },
-        }
-      )
+      .patch<PreprintDataJsonApi>(`${this.apiUrl}/preprints/${id}/`, {
+        data: {
+          type: 'preprints',
+          id,
+          attributes: apiPayload,
+        },
+      })
       .pipe(map((response) => PreprintsMapper.fromPreprintJsonApi(response)));
   }
 
@@ -147,12 +119,7 @@ export class PreprintsService {
 
   createNewVersion(prevVersionPreprintId: string) {
     return this.jsonApiService
-      .post<
-        JsonApiResponse<
-          ApiData<PreprintAttributesJsonApi, null, PreprintRelationshipsJsonApi, PreprintLinksJsonApi>,
-          null
-        >
-      >(`${this.apiUrl}/preprints/${prevVersionPreprintId}/versions/`)
+      .post<PreprintResponseJsonApi>(`${this.apiUrl}/preprints/${prevVersionPreprintId}/versions/`)
       .pipe(map((response) => PreprintsMapper.fromPreprintJsonApi(response.data)));
   }
 
@@ -168,9 +135,7 @@ export class PreprintsService {
 
   getPreprintVersionIds(preprintId: string): Observable<string[]> {
     return this.jsonApiService
-      .get<
-        ResponseJsonApi<ApiData<PreprintAttributesJsonApi, null, null, null>[]>
-      >(`${this.apiUrl}/preprints/${preprintId}/versions/`)
+      .get<PreprintsListResponseJsonApi>(`${this.apiUrl}/preprints/${preprintId}/versions/`)
       .pipe(map((response) => response.data.map((data) => data.id)));
   }
 
@@ -184,9 +149,7 @@ export class PreprintsService {
     searchPreferencesToJsonApiQueryParams(params, pageNumber, pageSize, filters, preprintSortFieldMap);
 
     return this.jsonApiService
-      .get<
-        ResponseJsonApi<ApiData<PreprintAttributesJsonApi, PreprintEmbedsJsonApi, PreprintRelationshipsJsonApi, null>[]>
-      >(`${this.apiUrl}/users/me/preprints/`, params)
+      .get<PreprintsListResponseJsonApi>(`${this.apiUrl}/users/me/preprints/`, params)
       .pipe(map((response) => PreprintsMapper.fromMyPreprintJsonApi(response)));
   }
 
diff --git a/src/app/features/profile/components/profile-information/profile-information.component.spec.ts b/src/app/features/profile/components/profile-information/profile-information.component.spec.ts
index f8ec5857e..9718289a4 100644
--- a/src/app/features/profile/components/profile-information/profile-information.component.spec.ts
+++ b/src/app/features/profile/components/profile-information/profile-information.component.spec.ts
@@ -92,7 +92,7 @@ describe('ProfileInformationComponent', () => {
   it('should expose ORCID id only when verified', () => {
     setup({
       ...MOCK_USER,
-      external_identity: {
+      externalIdentity: {
         ORCID: {
           id: '0000-0002-1825-0097',
           status: ExternalIdentityStatus.VERIFIED,
@@ -106,7 +106,7 @@ describe('ProfileInformationComponent', () => {
   it('should return undefined ORCID when status is not verified', () => {
     setup({
       ...MOCK_USER,
-      external_identity: {
+      externalIdentity: {
         ORCID: {
           id: '0000-0002-1825-0097',
           status: ExternalIdentityStatus.LINK,
diff --git a/src/app/features/profile/components/profile-information/profile-information.component.ts b/src/app/features/profile/components/profile-information/profile-information.component.ts
index 68b9edf81..e74d23b08 100644
--- a/src/app/features/profile/components/profile-information/profile-information.component.ts
+++ b/src/app/features/profile/components/profile-information/profile-information.component.ts
@@ -50,7 +50,7 @@ export class ProfileInformationComponent {
   userSocials = computed(() => mapUserSocials(this.currentUser()?.social, SOCIAL_LINKS));
 
   orcidId = computed(() => {
-    const orcid = this.currentUser()?.external_identity?.ORCID;
+    const orcid = this.currentUser()?.externalIdentity?.ORCID;
     return orcid?.status?.toUpperCase() === ExternalIdentityStatus.VERIFIED ? orcid.id : undefined;
   });
 
diff --git a/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.spec.ts b/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.spec.ts
index eef31eabb..9ee681704 100644
--- a/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.spec.ts
+++ b/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.spec.ts
@@ -10,7 +10,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { SearchInputComponent } from '@osf/shared/components/search-input/search-input.component';
 import { ResourceSearchMode } from '@osf/shared/enums/resource-search-mode.enum';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { MyResourcesSelectors } from '@osf/shared/stores/my-resources';
 import { NodeLinksSelectors } from '@osf/shared/stores/node-links';
 
diff --git a/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.ts b/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.ts
index 279a2bc55..4760056f0 100644
--- a/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.ts
+++ b/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.ts
@@ -29,7 +29,7 @@ import { SearchInputComponent } from '@osf/shared/components/search-input/search
 import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { ResourceSearchMode } from '@osf/shared/enums/resource-search-mode.enum';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { MyResourcesSearchFilters } from '@osf/shared/models/my-resources/my-resources-search-filters.model';
 import { GetMyProjects, GetMyRegistrations, MyResourcesSelectors } from '@osf/shared/stores/my-resources';
 import { CreateNodeLink, DeleteNodeLink, NodeLinksSelectors } from '@osf/shared/stores/node-links';
diff --git a/src/app/features/project/overview/components/overview-collections/overview-collections.component.html b/src/app/features/project/overview/components/overview-collections/overview-collections.component.html
index ad246257a..cfbe47a3b 100644
--- a/src/app/features/project/overview/components/overview-collections/overview-collections.component.html
+++ b/src/app/features/project/overview/components/overview-collections/overview-collections.component.html
@@ -34,9 +34,7 @@ <h3 class="mb-2">{{ 'project.overview.metadata.collection' | translate }}</h3>
                 @let cedarTemplate = cedarTemplateById().get(templateId) ?? null;
 
                 @let attributes =
-                  cedarRecord && cedarTemplate?.attributes?.template
-                    ? getCedarAttributes(cedarRecord, cedarTemplate!)
-                    : [];
+                  cedarRecord && cedarTemplate?.template ? getCedarAttributes(cedarRecord, cedarTemplate!) : [];
 
                 @if (attributes.length) {
                   <div class="flex flex-column gap-2 mt-2">
diff --git a/src/app/features/project/overview/components/overview-collections/overview-collections.component.spec.ts b/src/app/features/project/overview/components/overview-collections/overview-collections.component.spec.ts
index e0e8ec058..5a855273c 100644
--- a/src/app/features/project/overview/components/overview-collections/overview-collections.component.spec.ts
+++ b/src/app/features/project/overview/components/overview-collections/overview-collections.component.spec.ts
@@ -1,11 +1,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideRouter } from '@angular/router';
 
-import { CedarMetadataDataTemplateJsonApi } from '@osf/features/metadata/models';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
+import { CedarMetadataTemplateModel } from '@osf/features/metadata/models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collection-submissions.model';
 
-import { CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK } from '@testing/mocks/cedar-metadata-data-template-json-api.mock';
-import { MOCK_CEDAR_METADATA_RECORD_DATA } from '@testing/mocks/cedar-metadata-record.mock';
+import { MOCK_CEDAR_METADATA_RECORD, MOCK_CEDAR_METADATA_TEMPLATE } from '@testing/mocks/cedar-metadata-domain.mock';
 import {
   MOCK_COLLECTION_SUBMISSION_BASE,
   MOCK_COLLECTION_SUBMISSIONS,
@@ -43,7 +42,7 @@ describe('OverviewCollectionsComponent', () => {
       ...s,
       collectionTitle: s.title,
       collectionId: `col-${s.id}`,
-    })) as CollectionSubmission[];
+    }));
     fixture.componentRef.setInput('projectSubmissions', submissions);
     fixture.componentRef.setInput('isProjectSubmissionsLoading', true);
     fixture.detectChanges();
@@ -56,11 +55,10 @@ describe('OverviewCollectionsComponent', () => {
       ...MOCK_COLLECTION_SUBMISSION_BASE,
       requiredMetadataTemplateId: 'template-1',
     };
-    const cedarTemplate: CedarMetadataDataTemplateJsonApi =
-      CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK as CedarMetadataDataTemplateJsonApi;
+    const cedarTemplate: CedarMetadataTemplateModel = MOCK_CEDAR_METADATA_TEMPLATE;
 
     fixture.componentRef.setInput('projectSubmissions', [cedarSubmission]);
-    fixture.componentRef.setInput('cedarRecords', [MOCK_CEDAR_METADATA_RECORD_DATA]);
+    fixture.componentRef.setInput('cedarRecords', [MOCK_CEDAR_METADATA_RECORD]);
     fixture.componentRef.setInput('cedarTemplates', [cedarTemplate]);
     fixture.detectChanges();
     await fixture.whenStable();
@@ -88,10 +86,9 @@ describe('OverviewCollectionsComponent', () => {
   });
 
   it('should extract key-value pairs from a cedar record using template field order and labels', () => {
-    const cedarTemplate: CedarMetadataDataTemplateJsonApi =
-      CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK as CedarMetadataDataTemplateJsonApi;
+    const cedarTemplate: CedarMetadataTemplateModel = MOCK_CEDAR_METADATA_TEMPLATE;
 
-    const result = component.getCedarAttributes(MOCK_CEDAR_METADATA_RECORD_DATA, cedarTemplate);
+    const result = component.getCedarAttributes(MOCK_CEDAR_METADATA_RECORD, cedarTemplate);
 
     expect(result).toContainEqual({ key: 'Project Name', label: 'Project Name', value: 'Test Project Name' });
   });
diff --git a/src/app/features/project/overview/components/overview-collections/overview-collections.component.ts b/src/app/features/project/overview/components/overview-collections/overview-collections.component.ts
index e07dc4016..7cd71d5c1 100644
--- a/src/app/features/project/overview/components/overview-collections/overview-collections.component.ts
+++ b/src/app/features/project/overview/components/overview-collections/overview-collections.component.ts
@@ -8,9 +8,9 @@ import { Tag } from 'primeng/tag';
 import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
-import { CedarMetadataDataTemplateJsonApi, CedarMetadataRecordData } from '@osf/features/metadata/models';
+import { CedarMetadataRecordModel, CedarMetadataTemplateModel } from '@osf/features/metadata/models';
 import { StopPropagationDirective } from '@osf/shared/directives/stop-propagation.directive';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmission } from '@osf/shared/models/collections/collection-submissions.model';
 import { KeyValueModel } from '@osf/shared/models/common/key-value.model';
 import { CollectionStatusSeverityPipe } from '@osf/shared/pipes/collection-status-severity.pipe';
 
@@ -36,14 +36,14 @@ import { CollectionStatusSeverityPipe } from '@osf/shared/pipes/collection-statu
 export class OverviewCollectionsComponent {
   projectSubmissions = input<CollectionSubmission[] | null>(null);
   isProjectSubmissionsLoading = input<boolean>(false);
-  cedarRecords = input<CedarMetadataRecordData[] | null>(null);
-  cedarTemplates = input<CedarMetadataDataTemplateJsonApi[] | null>(null);
+  cedarRecords = input<CedarMetadataRecordModel[] | null>(null);
+  cedarTemplates = input<CedarMetadataTemplateModel[] | null>(null);
 
   cedarRecordByTemplateId = computed(() => {
     const records = this.cedarRecords();
     return new Map(
       records?.flatMap((record) => {
-        const templateId = record.relationships?.template?.data?.id;
+        const templateId = record.templateId;
         return templateId ? [[templateId, record] as const] : [];
       }) ?? []
     );
@@ -54,9 +54,9 @@ export class OverviewCollectionsComponent {
     return new Map(templates?.map((t) => [t.id, t] as const) ?? []);
   });
 
-  getCedarAttributes(record: CedarMetadataRecordData, template: CedarMetadataDataTemplateJsonApi): KeyValueModel[] {
-    const { order, propertyLabels } = template.attributes.template._ui;
-    const metadata = record.attributes.metadata as Record<string, unknown>;
+  getCedarAttributes(record: CedarMetadataRecordModel, template: CedarMetadataTemplateModel): KeyValueModel[] {
+    const { order, propertyLabels } = template.template._ui;
+    const metadata = record.metadata as Record<string, unknown>;
     const attributes: KeyValueModel[] = [];
 
     for (const key of order) {
diff --git a/src/app/features/project/overview/mappers/project-overview.mapper.ts b/src/app/features/project/overview/mappers/project-overview.mapper.ts
index c6fabdfe8..186b39b44 100644
--- a/src/app/features/project/overview/mappers/project-overview.mapper.ts
+++ b/src/app/features/project/overview/mappers/project-overview.mapper.ts
@@ -12,16 +12,13 @@ export class ProjectOverviewMapper {
       ...nodeAttributes,
       rootParentId: relationships?.root?.data?.id,
       parentId: relationships?.parent?.data?.id,
-      forksCount: relationships.forks?.links?.related?.meta
-        ? (relationships.forks?.links?.related?.meta['count'] as number)
+      forksCount: relationships?.forks?.links?.related?.meta
+        ? (relationships?.forks?.links?.related?.meta['count'] as number)
         : 0,
-      viewOnlyLinksCount: relationships.view_only_links?.links?.related?.meta
-        ? (relationships.view_only_links?.links?.related?.meta['count'] as number)
+      viewOnlyLinksCount: relationships?.view_only_links?.links?.related?.meta
+        ? (relationships?.view_only_links?.links?.related?.meta['count'] as number)
         : 0,
-      links: {
-        iri: data.links?.iri,
-      },
-      licenseId: relationships.license?.data?.id,
+      licenseId: relationships?.license?.data?.id,
     };
   }
 }
diff --git a/src/app/features/project/overview/models/project-overview.model.ts b/src/app/features/project/overview/models/project-overview.model.ts
index 2c155b330..f1bd65c38 100644
--- a/src/app/features/project/overview/models/project-overview.model.ts
+++ b/src/app/features/project/overview/models/project-overview.model.ts
@@ -1,12 +1,6 @@
-import { MetaJsonApi } from '@osf/shared/models/common/json-api.model';
 import { ContributorModel } from '@osf/shared/models/contributors/contributor.model';
 import { BaseNodeModel } from '@osf/shared/models/nodes/base-node.model';
 
-export interface ProjectOverviewWithMeta {
-  project: ProjectOverviewModel;
-  meta?: MetaJsonApi;
-}
-
 export interface ProjectOverviewModel extends BaseNodeModel {
   forksCount: number;
   viewOnlyLinksCount: number;
@@ -14,9 +8,4 @@ export interface ProjectOverviewModel extends BaseNodeModel {
   rootParentId?: string;
   licenseId?: string;
   contributors?: ContributorModel[];
-  links: ProjectOverviewLinksModel;
-}
-
-interface ProjectOverviewLinksModel {
-  iri: string;
 }
diff --git a/src/app/features/project/overview/services/project-overview.service.ts b/src/app/features/project/overview/services/project-overview.service.ts
index 7133193be..5a0caba1e 100644
--- a/src/app/features/project/overview/services/project-overview.service.ts
+++ b/src/app/features/project/overview/services/project-overview.service.ts
@@ -12,7 +12,6 @@ import { LicensesMapper } from '@osf/shared/mappers/licenses.mapper';
 import { BaseNodeMapper } from '@osf/shared/mappers/nodes';
 import { NodePreprintMapper } from '@osf/shared/mappers/nodes/node-preprint.mapper';
 import { NodeStorageMapper } from '@osf/shared/mappers/nodes/node-storage.mapper';
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
 import { IdentifiersResponseJsonApi } from '@osf/shared/models/identifiers/identifier-json-api.model';
 import { InstitutionsJsonApiResponse } from '@osf/shared/models/institutions/institution-json-api.model';
 import { Institution } from '@osf/shared/models/institutions/institutions.model';
@@ -30,7 +29,7 @@ import { IdentifierModel } from '@shared/models/identifiers/identifier.model';
 import { LicenseModel } from '@shared/models/license/license.model';
 
 import { ProjectOverviewMapper } from '../mappers';
-import { PrivacyStatusModel, ProjectOverviewWithMeta } from '../models';
+import { PrivacyStatusModel, ProjectOverviewModel } from '../models';
 
 @Injectable({
   providedIn: 'root',
@@ -43,13 +42,15 @@ export class ProjectOverviewService {
     return `${this.environment.apiDomainUrl}/v2`;
   }
 
-  getProjectById(projectId: string): Observable<ProjectOverviewWithMeta> {
+  getProjectById(projectId: string): Observable<PaginatedData<ProjectOverviewModel>> {
     const params: Record<string, unknown> = { related_counts: 'forks,view_only_links' };
 
     return this.jsonApiService.get<NodeResponseJsonApi>(`${this.apiUrl}/nodes/${projectId}/`, params).pipe(
       map((response) => ({
-        project: ProjectOverviewMapper.getProjectOverview(response.data),
-        meta: response.meta,
+        data: ProjectOverviewMapper.getProjectOverview(response.data),
+        totalCount: 1,
+        pageSize: 1,
+        isAnonymous: response.meta?.anonymous ?? false,
       }))
     );
   }
@@ -123,7 +124,7 @@ export class ProjectOverviewService {
     };
 
     return this.jsonApiService
-      .post<JsonApiResponse<BaseNodeDataJsonApi, null>>(`${this.apiUrl}/nodes/`, payload)
+      .post<NodeResponseJsonApi>(`${this.apiUrl}/nodes/`, payload)
       .pipe(map((response) => BaseNodeMapper.getNodeData(response.data)));
   }
 
@@ -157,7 +158,7 @@ export class ProjectOverviewService {
     }
 
     return this.jsonApiService
-      .post<JsonApiResponse<BaseNodeDataJsonApi, null>>(`${this.apiUrl}/nodes/${projectId}/children/`, payload, params)
+      .post<NodeResponseJsonApi>(`${this.apiUrl}/nodes/${projectId}/children/`, payload, params)
       .pipe(
         switchMap((response) => {
           const componentId = response.data.id;
diff --git a/src/app/features/project/overview/store/project-overview.state.ts b/src/app/features/project/overview/store/project-overview.state.ts
index 16a944ac1..e8799ccd1 100644
--- a/src/app/features/project/overview/store/project-overview.state.ts
+++ b/src/app/features/project/overview/store/project-overview.state.ts
@@ -58,11 +58,11 @@ export class ProjectOverviewState {
       tap((response) => {
         ctx.patchState({
           project: {
-            data: response.project,
+            data: response.data,
             isLoading: false,
             error: null,
           },
-          isAnonymous: response.meta?.anonymous ?? false,
+          isAnonymous: response.isAnonymous,
         });
       }),
       catchError((error) => handleSectionError(ctx, 'project', error))
diff --git a/src/app/features/project/project-addons/components/connect-configured-addon/connect-configured-addon.component.ts b/src/app/features/project/project-addons/components/connect-configured-addon/connect-configured-addon.component.ts
index 61af24cc2..b7907d439 100644
--- a/src/app/features/project/project-addons/components/connect-configured-addon/connect-configured-addon.component.ts
+++ b/src/app/features/project/project-addons/components/connect-configured-addon/connect-configured-addon.component.ts
@@ -25,9 +25,9 @@ import { OperationNames } from '@osf/shared/enums/operation-names.enum';
 import { ProjectAddonsStepperValue } from '@osf/shared/enums/profile-addons-stepper.enum';
 import { getAddonTypeString } from '@osf/shared/helpers/addon-type.helper';
 import { AddonModel } from '@osf/shared/models/addons/addon.model';
-import { AuthorizedAddonRequestJsonApi } from '@osf/shared/models/addons/addon-json-api.model';
 import { AddonTerm } from '@osf/shared/models/addons/addon-utils.model';
 import { AuthorizedAccountModel } from '@osf/shared/models/addons/authorized-account.model';
+import { AuthorizedAddonRequestJsonApi } from '@osf/shared/models/addons/authorized-addon-json-api.model';
 import { AddonFormService } from '@osf/shared/services/addons/addon-form.service';
 import { AddonOAuthService } from '@osf/shared/services/addons/addon-oauth.service';
 import { AddonOperationInvocationService } from '@osf/shared/services/addons/addon-operation-invocation.service';
@@ -156,7 +156,7 @@ export class ConnectConfiguredAddonComponent {
     }
     const openURL = new URL(addon.redirectUrl);
     openURL.searchParams.set('nodeIri', this.resourceUri());
-    openURL.searchParams.set('userIri', this.addonsUserReference()[0]?.attributes.user_uri);
+    openURL.searchParams.set('userIri', this.addonsUserReference()[0]?.userUri);
     return openURL.toString();
   });
 
diff --git a/src/app/features/project/project-addons/project-addons.component.html b/src/app/features/project/project-addons/project-addons.component.html
index 3fcf71ec0..4d4691b15 100644
--- a/src/app/features/project/project-addons/project-addons.component.html
+++ b/src/app/features/project/project-addons/project-addons.component.html
@@ -1,4 +1,4 @@
-<osf-sub-header [title]="'settings.addons.header.title' | translate" />
+<osf-sub-header [title]="'settings.addons.header' | translate" />
 <section class="flex-column flex flex-1">
   <p-tabs [(value)]="selectedTab" class="flex flex-1">
     <p-tablist class="pr-5 pl-5 hidden md:flex md:flex-column">
diff --git a/src/app/features/project/project-addons/project-addons.component.ts b/src/app/features/project/project-addons/project-addons.component.ts
index 100cbfb15..ac657c4fa 100644
--- a/src/app/features/project/project-addons/project-addons.component.ts
+++ b/src/app/features/project/project-addons/project-addons.component.ts
@@ -192,9 +192,7 @@ export class ProjectAddonsComponent implements OnInit {
     clearConfiguredAddons: ClearConfiguredAddons,
   });
 
-  readonly userReferenceId = computed(() => {
-    return this.addonsUserReference()[0]?.id;
-  });
+  readonly userReferenceId = computed(() => this.addonsUserReference()[0]?.id);
 
   allConfiguredAddons = computed(() => {
     let authorizedAddons;
diff --git a/src/app/features/project/registrations/services/registrations.service.ts b/src/app/features/project/registrations/services/registrations.service.ts
index c1945dd94..bdd7f41ad 100644
--- a/src/app/features/project/registrations/services/registrations.service.ts
+++ b/src/app/features/project/registrations/services/registrations.service.ts
@@ -3,11 +3,14 @@ import { map, Observable } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { RegistrationMapper } from '@osf/shared/mappers/registration';
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { RegistrationCard } from '@osf/shared/models/registration/registration-card.model';
-import { RegistrationDataJsonApi } from '@osf/shared/models/registration/registration-json-api.model';
+import {
+  RegistrationDataJsonApi,
+  RegistrationListResponseJsonApi,
+} from '@osf/shared/models/registration/registration-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 @Injectable({
@@ -30,7 +33,7 @@ export class RegistrationsService {
 
     const url = `${this.apiUrl}/nodes/${projectId}/registrations/`;
 
-    return this.jsonApiService.get<ResponseJsonApi<RegistrationDataJsonApi[]>>(url, params).pipe(
+    return this.jsonApiService.get<RegistrationListResponseJsonApi>(url, params).pipe(
       map((response) => {
         const data = response.data.map((registration: RegistrationDataJsonApi) =>
           RegistrationMapper.fromRegistrationToRegistrationCard(registration)
@@ -38,7 +41,7 @@ export class RegistrationsService {
         return {
           data,
           totalCount: response.meta?.total,
-          pageSize: response.meta.per_page,
+          pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
         };
       })
     );
diff --git a/src/app/features/project/settings/mappers/settings.mapper.ts b/src/app/features/project/settings/mappers/settings.mapper.ts
index d2eef0d1d..348f0d212 100644
--- a/src/app/features/project/settings/mappers/settings.mapper.ts
+++ b/src/app/features/project/settings/mappers/settings.mapper.ts
@@ -39,8 +39,8 @@ export class SettingsMapper {
         ? InstitutionsMapper.fromInstitutionsResponse(data.embeds.affiliated_institutions)
         : [],
       currentUserPermissions: data.attributes.current_user_permissions as UserPermissions[],
-      rootId: data.relationships.root?.data?.id,
-      parentId: data.relationships.parent?.data?.id,
+      rootId: data.relationships?.root?.data?.id,
+      parentId: data.relationships?.parent?.data?.id,
       lastFetched: Date.now(),
     };
   }
diff --git a/src/app/features/project/settings/models/project-settings-response.model.ts b/src/app/features/project/settings/models/project-settings-response.model.ts
index 9afbd99fa..cb53fa43c 100644
--- a/src/app/features/project/settings/models/project-settings-response.model.ts
+++ b/src/app/features/project/settings/models/project-settings-response.model.ts
@@ -1,36 +1,12 @@
-export interface ProjectSettingsResponseJsonApi {
-  data: ProjectSettingsDataJsonApi;
-  meta: {
-    version: string;
-  };
-}
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export interface ProjectSettingsDataJsonApi {
-  id: string;
-  type: 'node-settings';
-  attributes: ProjectSettingsAttributesJsonApi;
-  relationships: ProjectSettingsRelationshipsJsonApi;
-  links: {
-    self: string;
-    iri: string;
-  };
-}
+export type ProjectSettingsResponseJsonApi = ItemResponse<ProjectSettingsDataJsonApi>;
+
+export type ProjectSettingsDataJsonApi = JsonApiResource<'node-settings', ProjectSettingsAttributesJsonApi>;
 
 export interface ProjectSettingsAttributesJsonApi {
   access_requests_enabled: boolean;
   anyone_can_edit_wiki: boolean;
   wiki_enabled: boolean;
 }
-
-interface ProjectSettingsRelationshipsJsonApi {
-  view_only_links: {
-    links: {
-      related: RelatedLinkJsonApi;
-    };
-  };
-}
-
-interface RelatedLinkJsonApi {
-  href: string;
-  meta: Record<string, unknown>;
-}
diff --git a/src/app/features/project/settings/models/project-settings.model.ts b/src/app/features/project/settings/models/project-settings.model.ts
index 8b565e6bc..8053de8c7 100644
--- a/src/app/features/project/settings/models/project-settings.model.ts
+++ b/src/app/features/project/settings/models/project-settings.model.ts
@@ -1,10 +1,12 @@
 export interface ProjectSettingsModel {
   id: string;
-  attributes: {
-    accessRequestsEnabled: boolean;
-    anyoneCanComment: boolean;
-    anyoneCanEditWiki: boolean;
-    wikiEnabled: boolean;
-  };
+  attributes: ProjectSettingsAttributes;
   lastFetched?: number;
 }
+
+interface ProjectSettingsAttributes {
+  accessRequestsEnabled: boolean;
+  anyoneCanComment: boolean;
+  anyoneCanEditWiki: boolean;
+  wikiEnabled: boolean;
+}
diff --git a/src/app/features/project/settings/services/settings.service.ts b/src/app/features/project/settings/services/settings.service.ts
index 07e03d6e4..fcdb82acb 100644
--- a/src/app/features/project/settings/services/settings.service.ts
+++ b/src/app/features/project/settings/services/settings.service.ts
@@ -5,12 +5,14 @@ import { inject, Injectable } from '@angular/core';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { SubscriptionFrequency } from '@osf/shared/enums/subscriptions/subscription-frequency.enum';
 import { NotificationSubscriptionMapper } from '@osf/shared/mappers/notification-subscription.mapper';
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { BaseNodeDataJsonApi } from '@osf/shared/models/nodes/base-node-data-json-api.model';
 import { NodeShortInfoModel } from '@osf/shared/models/nodes/node-with-children.model';
 import { NodeResponseJsonApi, UpdateNodeRequestModel } from '@osf/shared/models/nodes/nodes-json-api.model';
 import { NotificationSubscription } from '@osf/shared/models/notifications/notification-subscription.model';
-import { NotificationSubscriptionGetResponseJsonApi } from '@osf/shared/models/notifications/notification-subscription-json-api.model';
+import {
+  NotificationSubscriptionDataJsonApi,
+  NotificationSubscriptionsListResponseJsonApi,
+} from '@osf/shared/models/notifications/notification-subscription-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 import { SettingsMapper } from '../mappers';
@@ -40,7 +42,7 @@ export class SettingsService {
 
   updateProjectSettings(model: ProjectSettingsDataJsonApi): Observable<ProjectSettingsModel> {
     return this.jsonApiService
-      .patch<ProjectSettingsResponseJsonApi>(`${this.apiUrl}/nodes/${model.id}/settings/`, { data: model })
+      .patch<ProjectSettingsDataJsonApi>(`${this.apiUrl}/nodes/${model.id}/settings/`, { data: model })
       .pipe(map((response) => SettingsMapper.fromResponse(response, model.id)));
   }
 
@@ -50,7 +52,7 @@ export class SettingsService {
     };
 
     return this.jsonApiService
-      .get<ResponseJsonApi<NotificationSubscriptionGetResponseJsonApi[]>>(`${this.apiUrl}/subscriptions/`, params)
+      .get<NotificationSubscriptionsListResponseJsonApi>(`${this.apiUrl}/subscriptions/`, params)
       .pipe(
         map((responses) => responses.data.map((response) => NotificationSubscriptionMapper.fromGetResponse(response)))
       );
@@ -60,7 +62,7 @@ export class SettingsService {
     const request = NotificationSubscriptionMapper.toUpdateRequest(id, frequency, false);
 
     return this.jsonApiService
-      .patch<NotificationSubscriptionGetResponseJsonApi>(`${this.apiUrl}/subscriptions/${id}/`, request)
+      .patch<NotificationSubscriptionDataJsonApi>(`${this.apiUrl}/subscriptions/${id}/`, request)
       .pipe(map((response) => NotificationSubscriptionMapper.fromGetResponse(response)));
   }
 
diff --git a/src/app/features/project/wiki/wiki.component.spec.ts b/src/app/features/project/wiki/wiki.component.spec.ts
index c75b1b6dd..4acc2a67b 100644
--- a/src/app/features/project/wiki/wiki.component.spec.ts
+++ b/src/app/features/project/wiki/wiki.component.spec.ts
@@ -17,7 +17,8 @@ import { EditSectionComponent } from '@osf/shared/components/wiki/edit-section/e
 import { ViewSectionComponent } from '@osf/shared/components/wiki/view-section/view-section.component';
 import { WikiListComponent } from '@osf/shared/components/wiki/wiki-list/wiki-list.component';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { WikiModel, WikiModes } from '@osf/shared/models/wiki/wiki.model';
+import { WikiModes } from '@osf/shared/enums/wiki-modes.enum';
+import { WikiModel } from '@osf/shared/models/wiki/wiki.model';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
 import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource';
diff --git a/src/app/features/project/wiki/wiki.component.ts b/src/app/features/project/wiki/wiki.component.ts
index ea96d56c0..31b8635cf 100644
--- a/src/app/features/project/wiki/wiki.component.ts
+++ b/src/app/features/project/wiki/wiki.component.ts
@@ -18,7 +18,7 @@ import { EditSectionComponent } from '@osf/shared/components/wiki/edit-section/e
 import { ViewSectionComponent } from '@osf/shared/components/wiki/view-section/view-section.component';
 import { WikiListComponent } from '@osf/shared/components/wiki/wiki-list/wiki-list.component';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { WikiModes } from '@osf/shared/models/wiki/wiki.model';
+import { WikiModes } from '@osf/shared/enums/wiki-modes.enum';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
 import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource';
diff --git a/src/app/features/registries/services/registries.service.ts b/src/app/features/registries/services/registries.service.ts
index ba29bd3d8..3c275b86c 100644
--- a/src/app/features/registries/services/registries.service.ts
+++ b/src/app/features/registries/services/registries.service.ts
@@ -3,8 +3,8 @@ import { map, Observable } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { PageSchemaMapper, RegistrationMapper } from '@osf/shared/mappers/registration';
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { DraftRegistrationModel } from '@osf/shared/models/registration/draft-registration.model';
 import { PageSchema } from '@osf/shared/models/registration/page-schema.model';
@@ -12,17 +12,21 @@ import { RegistrationModel } from '@osf/shared/models/registration/registration.
 import { RegistrationCard } from '@osf/shared/models/registration/registration-card.model';
 import {
   DraftRegistrationDataJsonApi,
-  DraftRegistrationRelationshipsJsonApi,
+  DraftRegistrationListResponseJsonApi,
+  DraftRegistrationRelationshipPayloadJsonApi,
   DraftRegistrationResponseJsonApi,
   RegistrationAttributesJsonApi,
   RegistrationDataJsonApi,
+  RegistrationListResponseJsonApi,
   RegistrationResponseJsonApi,
-  SchemaResponseDataJsonApi,
-  SchemaResponseJsonApi,
-  SchemaResponsesJsonApi,
 } from '@osf/shared/models/registration/registration-json-api.model';
 import { SchemaBlocksResponseJsonApi } from '@osf/shared/models/registration/schema-blocks-json-api.model';
 import { SchemaResponse } from '@osf/shared/models/registration/schema-response.model';
+import {
+  SchemaResponseDataJsonApi,
+  SchemaResponseJsonApi,
+  SchemaResponsesJsonApi,
+} from '@osf/shared/models/registration/schema-response-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 import { SchemaActionTrigger } from '../enums';
@@ -76,9 +80,8 @@ export class RegistriesService {
   }
 
   getDraft(draftId: string): Observable<DraftRegistrationModel> {
-    const params = {
-      embed: ['branched_from'],
-    };
+    const params = { embed: ['branched_from'] };
+
     return this.jsonApiService
       .get<DraftRegistrationResponseJsonApi>(`${this.apiUrl}/draft_registrations/${draftId}/`, params)
       .pipe(map((response) => RegistrationMapper.fromDraftRegistrationResponse(response.data)));
@@ -87,7 +90,7 @@ export class RegistriesService {
   updateDraft(
     id: string,
     attributes: Partial<RegistrationAttributesJsonApi>,
-    relationships?: Partial<DraftRegistrationRelationshipsJsonApi>
+    relationships?: DraftRegistrationRelationshipPayloadJsonApi
   ): Observable<DraftRegistrationModel> {
     const payload = {
       data: {
@@ -97,9 +100,7 @@ export class RegistriesService {
         type: 'draft_registrations',
       },
     };
-    const params = {
-      embed: ['branched_from'],
-    };
+    const params = { embed: ['branched_from'] };
 
     return this.jsonApiService
       .patch<DraftRegistrationDataJsonApi>(`${this.apiUrl}/draft_registrations/${id}/`, payload, params)
@@ -136,7 +137,7 @@ export class RegistriesService {
       embed: ['bibliographic_contributors', 'registration_schema', 'provider'],
     };
     return this.jsonApiService
-      .get<ResponseJsonApi<DraftRegistrationDataJsonApi[]>>(`${this.apiUrl}/draft_registrations/`, params)
+      .get<DraftRegistrationListResponseJsonApi>(`${this.apiUrl}/draft_registrations/`, params)
       .pipe(
         map((response) => {
           const data = response.data.map((registration: DraftRegistrationDataJsonApi) =>
@@ -145,7 +146,7 @@ export class RegistriesService {
           return {
             data,
             totalCount: response.meta?.total,
-            pageSize: response.meta.per_page,
+            pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
           };
         })
       );
@@ -164,7 +165,7 @@ export class RegistriesService {
     };
 
     return this.jsonApiService
-      .get<ResponseJsonApi<RegistrationDataJsonApi[]>>(`${this.apiUrl}/users/${userId}/registrations/`, params)
+      .get<RegistrationListResponseJsonApi>(`${this.apiUrl}/users/${userId}/registrations/`, params)
       .pipe(
         map((response) => {
           const data = response.data.map((registration: RegistrationDataJsonApi) =>
@@ -173,25 +174,23 @@ export class RegistriesService {
           return {
             data,
             totalCount: response.meta?.total,
-            pageSize: response.meta.per_page,
+            pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
           };
         })
       );
   }
 
   getAllSchemaResponse(registrationId: string): Observable<SchemaResponse[]> {
-    const params = {
-      embed: ['registration'],
-    };
+    const params = { embed: ['registration'] };
+
     return this.jsonApiService
       .get<SchemaResponsesJsonApi>(`${this.apiUrl}/registrations/${registrationId}/schema_responses/`, params)
       .pipe(map((response) => response.data.map((item) => RegistrationMapper.fromSchemaResponse(item))));
   }
 
   getSchemaResponse(schemaResponseId: string): Observable<SchemaResponse> {
-    const params = {
-      embed: ['registration'],
-    };
+    const params = { embed: ['registration'] };
+
     return this.jsonApiService
       .get<SchemaResponseJsonApi>(`${this.apiUrl}/schema_responses/${schemaResponseId}/`, params)
       .pipe(map((response) => RegistrationMapper.fromSchemaResponse(response.data)));
@@ -211,9 +210,8 @@ export class RegistriesService {
         },
       },
     };
-    const params = {
-      embed: ['registration'],
-    };
+    const params = { embed: ['registration'] };
+
     return this.jsonApiService
       .post<SchemaResponseJsonApi>(`${this.apiUrl}/schema_responses/`, payload, params)
       .pipe(map((response) => RegistrationMapper.fromSchemaResponse(response.data)));
@@ -235,9 +233,8 @@ export class RegistriesService {
         },
       },
     };
-    const params = {
-      embed: ['registration'],
-    };
+    const params = { embed: ['registration'] };
+
     return this.jsonApiService
       .patch<SchemaResponseDataJsonApi>(`${this.apiUrl}/schema_responses/${schemaResponseId}/`, payload, params)
       .pipe(map((response) => RegistrationMapper.fromSchemaResponse(response)));
diff --git a/src/app/features/registries/store/handlers/files.handlers.ts b/src/app/features/registries/store/handlers/files.handlers.ts
index 615386a72..dc47cafc9 100644
--- a/src/app/features/registries/store/handlers/files.handlers.ts
+++ b/src/app/features/registries/store/handlers/files.handlers.ts
@@ -23,11 +23,11 @@ export class FilesHandlers {
         next: (response) =>
           ctx.patchState({
             rootFolders: {
-              data: response.files,
+              data: response.data,
               isLoading: false,
               error: null,
             },
-            currentFolder: response.files.length > 0 ? response.files[0] : null,
+            currentFolder: response.data.length > 0 ? response.data[0] : null,
           }),
       }),
       catchError((error) => handleSectionError(ctx, 'rootFolders', error))
diff --git a/src/app/features/registry/constants/resource-type-options.constant.ts b/src/app/features/registry/constants/resource-type-options.constant.ts
index 388e68fdd..3da23acee 100644
--- a/src/app/features/registry/constants/resource-type-options.constant.ts
+++ b/src/app/features/registry/constants/resource-type-options.constant.ts
@@ -7,7 +7,7 @@ export const resourceTypeOptions: SelectOption[] = [
     value: RegistryResourceType.Data,
   },
   {
-    label: 'resourceCard.resources.code',
+    label: 'resourceCard.resources.analyticCode',
     value: RegistryResourceType.Code,
   },
   {
diff --git a/src/app/features/registry/mappers/linked-nodes.mapper.ts b/src/app/features/registry/mappers/linked-nodes.mapper.ts
index 372257e1e..6eb7941fd 100644
--- a/src/app/features/registry/mappers/linked-nodes.mapper.ts
+++ b/src/app/features/registry/mappers/linked-nodes.mapper.ts
@@ -1,10 +1,11 @@
 import { ContributorsMapper } from '@osf/shared/mappers/contributors';
+import { BaseNodeDataJsonApi } from '@osf/shared/models/nodes/base-node-data-json-api.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
-import { LinkedNode, LinkedNodeJsonApi } from '../models';
+import { LinkedNode } from '../models';
 
 export class LinkedNodesMapper {
-  static fromApiResponse(apiNode: LinkedNodeJsonApi): LinkedNode {
+  static fromApiResponse(apiNode: BaseNodeDataJsonApi): LinkedNode {
     return {
       id: apiNode.id,
       title: replaceBadEncodedChars(apiNode.attributes.title),
@@ -14,9 +15,7 @@ export class LinkedNodesMapper {
       dateModified: apiNode.attributes.date_modified,
       tags: apiNode.attributes.tags || [],
       isPublic: apiNode.attributes.public,
-      htmlUrl: apiNode.links.html,
-      apiUrl: apiNode.links.self,
-      contributors: ContributorsMapper.getContributors(apiNode.embeds.bibliographic_contributors.data) || [],
+      contributors: ContributorsMapper.getContributors(apiNode.embeds?.bibliographic_contributors?.data) || [],
     };
   }
 }
diff --git a/src/app/features/registry/models/index.ts b/src/app/features/registry/models/index.ts
index af2646b36..92d91a4cf 100644
--- a/src/app/features/registry/models/index.ts
+++ b/src/app/features/registry/models/index.ts
@@ -1,7 +1,5 @@
 export * from './linked-nodes.model';
-export * from './linked-nodes-json-api.model';
 export * from './linked-registrations-json-api.model';
-export * from './linked-response.model';
 export * from './registration-overview-json-api.model';
 export * from './registry-components.model';
 export * from './registry-components-json-api.model';
diff --git a/src/app/features/registry/models/linked-nodes-json-api.model.ts b/src/app/features/registry/models/linked-nodes-json-api.model.ts
deleted file mode 100644
index ce77cfc30..000000000
--- a/src/app/features/registry/models/linked-nodes-json-api.model.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { MetaJsonApi } from '@osf/shared/models/common/json-api.model';
-import { ContributorDataJsonApi } from '@osf/shared/models/contributors/contributor-response-json-api.model';
-import { BaseNodeAttributesJsonApi } from '@osf/shared/models/nodes/base-node-attributes-json-api.model';
-
-export interface LinkedNodeJsonApi {
-  id: string;
-  type: 'nodes';
-  attributes: BaseNodeAttributesJsonApi;
-  embeds: {
-    bibliographic_contributors: {
-      data: ContributorDataJsonApi[];
-    };
-  };
-  links: {
-    html: string;
-    self: string;
-    iri: string;
-  };
-}
-
-export interface LinkedNodesJsonApiResponse {
-  data: LinkedNodeJsonApi[];
-  meta: MetaJsonApi;
-  links: {
-    self: string;
-    first: string | null;
-    last: string | null;
-    prev: string | null;
-    next: string | null;
-  };
-}
diff --git a/src/app/features/registry/models/linked-nodes.model.ts b/src/app/features/registry/models/linked-nodes.model.ts
index f7795e9b4..189814b70 100644
--- a/src/app/features/registry/models/linked-nodes.model.ts
+++ b/src/app/features/registry/models/linked-nodes.model.ts
@@ -11,8 +11,6 @@ export interface LinkedNode {
   tags: string[];
   isPublic: boolean;
   contributors: ContributorModel[];
-  htmlUrl: string;
-  apiUrl: string;
 }
 
 export interface LinkedRegistration {
diff --git a/src/app/features/registry/models/linked-registrations-json-api.model.ts b/src/app/features/registry/models/linked-registrations-json-api.model.ts
index 5e00b1a11..73cee2d4c 100644
--- a/src/app/features/registry/models/linked-registrations-json-api.model.ts
+++ b/src/app/features/registry/models/linked-registrations-json-api.model.ts
@@ -1,26 +1,15 @@
-import { MetaJsonApi } from '@osf/shared/models/common/json-api.model';
+import { EmbedList } from '@osf/shared/models/common/json-api/embeds.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { ContributorDataJsonApi } from '@osf/shared/models/contributors/contributor-response-json-api.model';
 import { RegistrationNodeAttributesJsonApi } from '@osf/shared/models/registration/registration-node-json-api.model';
 
-export interface LinkedRegistrationJsonApi {
-  id: string;
-  type: 'registrations';
-  attributes: RegistrationNodeAttributesJsonApi;
-  embeds: {
-    bibliographic_contributors: {
-      data: ContributorDataJsonApi[];
-    };
-  };
+export type LinkedRegistrationsJsonApiResponse = ListResponse<LinkedRegistrationJsonApi>;
+
+export interface LinkedRegistrationJsonApi extends JsonApiResource<'registrations', RegistrationNodeAttributesJsonApi> {
+  embeds: LinkedRegistrationEmbedsJsonApi;
 }
 
-export interface LinkedRegistrationsJsonApiResponse {
-  data: LinkedRegistrationJsonApi[];
-  meta: MetaJsonApi;
-  links: {
-    self: string;
-    first: string | null;
-    last: string | null;
-    prev: string | null;
-    next: string | null;
-  };
+interface LinkedRegistrationEmbedsJsonApi {
+  bibliographic_contributors: EmbedList<ContributorDataJsonApi>;
 }
diff --git a/src/app/features/registry/models/linked-response.model.ts b/src/app/features/registry/models/linked-response.model.ts
deleted file mode 100644
index e689f15f5..000000000
--- a/src/app/features/registry/models/linked-response.model.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { MetaJsonApi } from '@osf/shared/models/common/json-api.model';
-
-import { LinkedNode, LinkedRegistration } from './linked-nodes.model';
-
-export interface LinkedNodesResponseJsonApi {
-  data: LinkedNode[];
-  meta: MetaJsonApi;
-  links: {
-    self: string;
-    first: string | null;
-    last: string | null;
-    prev: string | null;
-    next: string | null;
-  };
-}
-
-export interface LinkedRegistrationsResponseJsonApi {
-  data: LinkedRegistration[];
-  meta: MetaJsonApi;
-  links: {
-    self: string;
-    first: string | null;
-    last: string | null;
-    prev: string | null;
-    next: string | null;
-  };
-}
diff --git a/src/app/features/registry/models/registration-overview-json-api.model.ts b/src/app/features/registry/models/registration-overview-json-api.model.ts
index 710c9f8d4..4ea2531dc 100644
--- a/src/app/features/registry/models/registration-overview-json-api.model.ts
+++ b/src/app/features/registry/models/registration-overview-json-api.model.ts
@@ -1,41 +1,23 @@
-import { ResponseJsonApi } from '@shared/models/common/json-api.model';
+import { RelationshipLinks, ToOneRelData } from '@osf/shared/models/common/json-api/relationships.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@shared/models/common/json-api/responses.model';
 import { RegistrationNodeAttributesJsonApi } from '@shared/models/registration/registration-node-json-api.model';
 
-export type RegistrationOverviewResponse = ResponseJsonApi<RegistrationOverviewDataJsonApi>;
+export type RegistrationOverviewResponse = ItemResponse<RegistrationOverviewDataJsonApi>;
 
-export interface RegistrationOverviewDataJsonApi {
-  id: string;
-  attributes: RegistrationNodeAttributesJsonApi;
-  relationships: RegistryOverviewJsonApiRelationships;
+export interface RegistrationOverviewDataJsonApi extends JsonApiResource<
+  'registrations',
+  RegistrationNodeAttributesJsonApi
+> {
+  relationships: RegistryOverviewRelationshipsJsonApi;
 }
 
-export interface RegistryOverviewJsonApiRelationships {
-  registered_from: {
-    data: {
-      id: string;
-    };
-  };
+interface RegistryOverviewRelationshipsJsonApi {
+  license: ToOneRelData<'licenses'>;
+  provider: ToOneRelData<'registration-providers'>;
+  registered_from: ToOneRelData<'nodes'>;
   registration_schema: {
-    links: {
-      related: {
-        href: string;
-      };
-    };
-  };
-  root: {
-    data: {
-      id: string;
-      type: string;
-    };
-  };
-  license: {
-    data: {
-      id: string;
-    };
-  };
-  provider: {
-    data: {
-      id: string;
-    };
+    links: RelationshipLinks;
   };
+  root: ToOneRelData<'registrations'>;
 }
diff --git a/src/app/features/registry/models/registry-components-json-api.model.ts b/src/app/features/registry/models/registry-components-json-api.model.ts
index 12f05b6dc..def4a6206 100644
--- a/src/app/features/registry/models/registry-components-json-api.model.ts
+++ b/src/app/features/registry/models/registry-components-json-api.model.ts
@@ -1,26 +1,15 @@
-import { MetaJsonApi } from '@osf/shared/models/common/json-api.model';
+import { EmbedList } from '@osf/shared/models/common/json-api/embeds.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { ContributorDataJsonApi } from '@osf/shared/models/contributors/contributor-response-json-api.model';
 import { RegistrationNodeAttributesJsonApi } from '@osf/shared/models/registration/registration-node-json-api.model';
 
-import { RegistryComponentModel } from './registry-components.model';
+export type RegistryComponentsJsonApiResponse = ListResponse<RegistryComponentJsonApi>;
 
-export interface RegistryComponentJsonApi {
-  id: string;
-  type: string;
-  attributes: RegistrationNodeAttributesJsonApi;
-  embeds: {
-    bibliographic_contributors: {
-      data: ContributorDataJsonApi[];
-    };
-  };
+export interface RegistryComponentJsonApi extends JsonApiResource<'registrations', RegistrationNodeAttributesJsonApi> {
+  embeds: RegistryComponentEmbedsJsonApi;
 }
 
-export interface RegistryComponentsJsonApiResponse {
-  data: RegistryComponentJsonApi[];
-  meta: MetaJsonApi;
-}
-
-export interface RegistryComponentsResponseJsonApi {
-  data: RegistryComponentModel[];
-  meta: MetaJsonApi;
+interface RegistryComponentEmbedsJsonApi {
+  bibliographic_contributors: EmbedList<ContributorDataJsonApi>;
 }
diff --git a/src/app/features/registry/models/registry-overview.model.ts b/src/app/features/registry/models/registry-overview.model.ts
index 957feafb5..dac396c35 100644
--- a/src/app/features/registry/models/registry-overview.model.ts
+++ b/src/app/features/registry/models/registry-overview.model.ts
@@ -1,18 +1,17 @@
 import { RegistryStatus } from '@osf/shared/enums/registry-status.enum';
-import { MetaJsonApi } from '@shared/models/common/json-api.model';
 import { RegistrationNodeModel } from '@shared/models/registration/registration-node.model';
 
 export interface RegistrationOverviewModel extends RegistrationNodeModel {
-  registrationSchemaLink: string;
-  licenseId: string;
   associatedProjectId: string;
-  providerId: string;
-  status: RegistryStatus;
   forksCount: number;
+  licenseId: string;
+  providerId: string;
+  registrationSchemaLink: string;
   rootParentId?: string;
+  status: RegistryStatus;
 }
 
 export interface RegistryOverviewWithMeta {
   registry: RegistrationOverviewModel;
-  meta?: MetaJsonApi;
+  isAnonymous: boolean;
 }
diff --git a/src/app/features/registry/models/resources/add-resource-response-json-api.model.ts b/src/app/features/registry/models/resources/add-resource-response-json-api.model.ts
deleted file mode 100644
index 436599c9e..000000000
--- a/src/app/features/registry/models/resources/add-resource-response-json-api.model.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { RegistryResourceType } from '@shared/enums/registry-resource.enum';
-import { ApiData, JsonApiResponse } from '@shared/models/common/json-api.model';
-
-export type AddResourceJsonApi = JsonApiResponse<RegistryResourceDataJsonApi, null>;
-
-export type RegistryResourceDataJsonApi = ApiData<
-  {
-    description: string;
-    finalized: true;
-    resource_type: RegistryResourceType;
-    pid: string;
-  },
-  null,
-  null,
-  null
->;
diff --git a/src/app/features/registry/models/resources/get-registry-resources-json-api.model.ts b/src/app/features/registry/models/resources/get-registry-resources-json-api.model.ts
deleted file mode 100644
index 56045739f..000000000
--- a/src/app/features/registry/models/resources/get-registry-resources-json-api.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { RegistryResourceDataJsonApi } from '@osf/features/registry/models/resources/add-resource-response-json-api.model';
-import { JsonApiResponse } from '@shared/models/common/json-api.model';
-
-export type GetRegistryResourcesJsonApi = JsonApiResponse<RegistryResourceDataJsonApi[], null>;
diff --git a/src/app/features/registry/models/resources/index.ts b/src/app/features/registry/models/resources/index.ts
index a75d9c33b..10d6141b8 100644
--- a/src/app/features/registry/models/resources/index.ts
+++ b/src/app/features/registry/models/resources/index.ts
@@ -1,7 +1,6 @@
 export * from './add-resource.model';
 export * from './add-resource-request.model';
-export * from './add-resource-response-json-api.model';
 export * from './confirm-add-resource.model';
-export * from './get-registry-resources-json-api.model';
 export * from './registry-resource.model';
 export * from './registry-resource-form.model';
+export * from './resource-response-json-api.model';
diff --git a/src/app/features/registry/models/resources/resource-response-json-api.model.ts b/src/app/features/registry/models/resources/resource-response-json-api.model.ts
new file mode 100644
index 000000000..5a3807102
--- /dev/null
+++ b/src/app/features/registry/models/resources/resource-response-json-api.model.ts
@@ -0,0 +1,15 @@
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { RegistryResourceType } from '@shared/enums/registry-resource.enum';
+import { ItemResponse, ListResponse } from '@shared/models/common/json-api/responses.model';
+
+export type GetRegistryResourcesJsonApi = ListResponse<RegistryResourceDataJsonApi>;
+export type AddResourceJsonApi = ItemResponse<RegistryResourceDataJsonApi>;
+
+export type RegistryResourceDataJsonApi = JsonApiResource<'resources', RegistryResourceAttributesJsonApi>;
+
+interface RegistryResourceAttributesJsonApi {
+  description: string;
+  finalized: true;
+  pid: string;
+  resource_type: RegistryResourceType;
+}
diff --git a/src/app/features/registry/pages/registry-resources/registry-resources.component.spec.ts b/src/app/features/registry/pages/registry-resources/registry-resources.component.spec.ts
index a76761ec1..bcccca4b6 100644
--- a/src/app/features/registry/pages/registry-resources/registry-resources.component.spec.ts
+++ b/src/app/features/registry/pages/registry-resources/registry-resources.component.spec.ts
@@ -274,7 +274,9 @@ describe('RegistryResourcesComponent', () => {
     const { component } = setup();
 
     expect(component.getResourceTypeTranslationKey(RegistryResourceType.Data)).toBe('resourceCard.resources.data');
-    expect(component.getResourceTypeTranslationKey(RegistryResourceType.Code)).toBe('resourceCard.resources.code');
+    expect(component.getResourceTypeTranslationKey(RegistryResourceType.Code)).toBe(
+      'resourceCard.resources.analyticCode'
+    );
   });
 
   it('should return empty string for unknown resource type', () => {
diff --git a/src/app/features/registry/pages/registry-wiki/registry-wiki.component.spec.ts b/src/app/features/registry/pages/registry-wiki/registry-wiki.component.spec.ts
index 4d6fa3909..27dec5ef5 100644
--- a/src/app/features/registry/pages/registry-wiki/registry-wiki.component.spec.ts
+++ b/src/app/features/registry/pages/registry-wiki/registry-wiki.component.spec.ts
@@ -13,7 +13,7 @@ import { CompareSectionComponent } from '@osf/shared/components/wiki/compare-sec
 import { ViewSectionComponent } from '@osf/shared/components/wiki/view-section/view-section.component';
 import { WikiListComponent } from '@osf/shared/components/wiki/wiki-list/wiki-list.component';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { WikiModes } from '@osf/shared/models/wiki/wiki.model';
+import { WikiModes } from '@osf/shared/enums/wiki-modes.enum';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
 import {
   ClearWiki,
diff --git a/src/app/features/registry/pages/registry-wiki/registry-wiki.component.ts b/src/app/features/registry/pages/registry-wiki/registry-wiki.component.ts
index 732f4f8e5..17b89bab7 100644
--- a/src/app/features/registry/pages/registry-wiki/registry-wiki.component.ts
+++ b/src/app/features/registry/pages/registry-wiki/registry-wiki.component.ts
@@ -18,7 +18,7 @@ import { CompareSectionComponent } from '@osf/shared/components/wiki/compare-sec
 import { ViewSectionComponent } from '@osf/shared/components/wiki/view-section/view-section.component';
 import { WikiListComponent } from '@osf/shared/components/wiki/wiki-list/wiki-list.component';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { WikiModes } from '@osf/shared/models/wiki/wiki.model';
+import { WikiModes } from '@osf/shared/enums/wiki-modes.enum';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
 import {
   ClearWiki,
diff --git a/src/app/features/registry/services/registry-components.service.ts b/src/app/features/registry/services/registry-components.service.ts
index c91e7e26a..56e9344f8 100644
--- a/src/app/features/registry/services/registry-components.service.ts
+++ b/src/app/features/registry/services/registry-components.service.ts
@@ -4,10 +4,12 @@ import { map } from 'rxjs/operators';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
+import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 import { RegistryComponentsMapper } from '../mappers';
-import { RegistryComponentsJsonApiResponse, RegistryComponentsResponseJsonApi } from '../models';
+import { RegistryComponentModel, RegistryComponentsJsonApiResponse } from '../models';
 
 @Injectable({
   providedIn: 'root',
@@ -20,7 +22,11 @@ export class RegistryComponentsService {
     return `${this.environment.apiDomainUrl}/v2`;
   }
 
-  getRegistryComponents(registryId: string, page = 1, pageSize = 10): Observable<RegistryComponentsResponseJsonApi> {
+  getRegistryComponents(
+    registryId: string,
+    page = 1,
+    pageSize = DEFAULT_TABLE_PARAMS.rows
+  ): Observable<PaginatedData<RegistryComponentModel[]>> {
     const params: Record<string, unknown> = {
       'embed[]': 'bibliographic_contributors',
       page: page,
@@ -32,7 +38,8 @@ export class RegistryComponentsService {
       .pipe(
         map((response) => ({
           data: response.data.map(RegistryComponentsMapper.fromApiResponse),
-          meta: response.meta,
+          totalCount: response.meta.total,
+          pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
         }))
       );
   }
diff --git a/src/app/features/registry/services/registry-links.service.ts b/src/app/features/registry/services/registry-links.service.ts
index 64880d6ea..8872d0d63 100644
--- a/src/app/features/registry/services/registry-links.service.ts
+++ b/src/app/features/registry/services/registry-links.service.ts
@@ -4,15 +4,13 @@ import { map } from 'rxjs/operators';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
+import { NodesResponseJsonApi } from '@osf/shared/models/nodes/nodes-json-api.model';
+import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 import { LinkedNodesMapper, LinkedRegistrationsMapper } from '../mappers';
-import {
-  LinkedNodesJsonApiResponse,
-  LinkedNodesResponseJsonApi,
-  LinkedRegistrationsJsonApiResponse,
-  LinkedRegistrationsResponseJsonApi,
-} from '../models';
+import { LinkedNode, LinkedRegistration, LinkedRegistrationsJsonApiResponse } from '../models';
 
 @Injectable({
   providedIn: 'root',
@@ -25,7 +23,11 @@ export class RegistryLinksService {
     return `${this.environment.apiDomainUrl}/v2`;
   }
 
-  getLinkedNodes(registryId: string, page = 1, pageSize = 10): Observable<LinkedNodesResponseJsonApi> {
+  getLinkedNodes(
+    registryId: string,
+    page = 1,
+    pageSize = DEFAULT_TABLE_PARAMS.rows
+  ): Observable<PaginatedData<LinkedNode[]>> {
     const params: Record<string, unknown> = {
       'embed[]': 'bibliographic_contributors',
       page: page,
@@ -33,17 +35,21 @@ export class RegistryLinksService {
     };
 
     return this.jsonApiService
-      .get<LinkedNodesJsonApiResponse>(`${this.apiUrl}/registrations/${registryId}/linked_nodes/`, params)
+      .get<NodesResponseJsonApi>(`${this.apiUrl}/registrations/${registryId}/linked_nodes/`, params)
       .pipe(
         map((response) => ({
           data: response.data.map(LinkedNodesMapper.fromApiResponse),
-          meta: response.meta,
-          links: response.links,
+          totalCount: response.meta.total,
+          pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
         }))
       );
   }
 
-  getLinkedRegistrations(registryId: string, page = 1, pageSize = 10): Observable<LinkedRegistrationsResponseJsonApi> {
+  getLinkedRegistrations(
+    registryId: string,
+    page = 1,
+    pageSize = DEFAULT_TABLE_PARAMS.rows
+  ): Observable<PaginatedData<LinkedRegistration[]>> {
     const params: Record<string, unknown> = {
       'embed[]': 'bibliographic_contributors',
       page: page,
@@ -58,8 +64,8 @@ export class RegistryLinksService {
       .pipe(
         map((response) => ({
           data: response.data.map(LinkedRegistrationsMapper.fromApiResponse),
-          meta: response.meta,
-          links: response.links,
+          totalCount: response.meta.total,
+          pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
         }))
       );
   }
diff --git a/src/app/features/registry/services/registry-overview.service.ts b/src/app/features/registry/services/registry-overview.service.ts
index 50c4d6454..2d69607af 100644
--- a/src/app/features/registry/services/registry-overview.service.ts
+++ b/src/app/features/registry/services/registry-overview.service.ts
@@ -17,12 +17,12 @@ import { Institution } from '@osf/shared/models/institutions/institutions.model'
 import { LicenseModel } from '@osf/shared/models/license/license.model';
 import { LicenseResponseJsonApi } from '@osf/shared/models/license/licenses-json-api.model';
 import { PageSchema } from '@osf/shared/models/registration/page-schema.model';
+import { SchemaBlocksResponseJsonApi } from '@osf/shared/models/registration/schema-blocks-json-api.model';
+import { SchemaResponse } from '@osf/shared/models/registration/schema-response.model';
 import {
   SchemaResponseJsonApi,
   SchemaResponsesJsonApi,
-} from '@osf/shared/models/registration/registration-json-api.model';
-import { SchemaBlocksResponseJsonApi } from '@osf/shared/models/registration/schema-blocks-json-api.model';
-import { SchemaResponse } from '@osf/shared/models/registration/schema-response.model';
+} from '@osf/shared/models/registration/schema-response-json-api.model';
 import { ReviewActionPayload } from '@osf/shared/models/review-action/review-action-payload.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
@@ -46,9 +46,12 @@ export class RegistryOverviewService {
   }
 
   getRegistrationById(id: string): Observable<RegistryOverviewWithMeta> {
-    return this.jsonApiService
-      .get<RegistrationOverviewResponse>(`${this.apiUrl}/registrations/${id}/`)
-      .pipe(map((response) => ({ registry: MapRegistrationOverview(response.data), meta: response.meta })));
+    return this.jsonApiService.get<RegistrationOverviewResponse>(`${this.apiUrl}/registrations/${id}/`).pipe(
+      map((response) => ({
+        registry: MapRegistrationOverview(response.data),
+        isAnonymous: response.meta?.anonymous ?? false,
+      }))
+    );
   }
 
   getInstitutions(registryId: string): Observable<Institution[]> {
diff --git a/src/app/features/registry/store/registry-components/registry-components.state.ts b/src/app/features/registry/store/registry-components/registry-components.state.ts
index 007289f5f..26253d71e 100644
--- a/src/app/features/registry/store/registry-components/registry-components.state.ts
+++ b/src/app/features/registry/store/registry-components/registry-components.state.ts
@@ -33,7 +33,7 @@ export class RegistryComponentsState {
             data: response.data,
             isLoading: false,
             error: null,
-            totalCount: response.meta.total,
+            totalCount: response.totalCount,
           },
         });
       }),
diff --git a/src/app/features/registry/store/registry-links/registry-links.model.ts b/src/app/features/registry/store/registry-links/registry-links.model.ts
index 554fb15c8..5b9e10452 100644
--- a/src/app/features/registry/store/registry-links/registry-links.model.ts
+++ b/src/app/features/registry/store/registry-links/registry-links.model.ts
@@ -1,17 +1,13 @@
-import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
+import { AsyncStateWithTotalCount } from '@osf/shared/models/store/async-state-with-total-count.model';
 
 import { LinkedNode, LinkedRegistration } from '../../models';
 
 export interface RegistryLinksStateModel {
-  linkedNodes: AsyncStateModel<LinkedNode[]> & {
-    meta?: { total: number; per_page: number };
-  };
-  linkedRegistrations: AsyncStateModel<LinkedRegistration[]> & {
-    meta?: { total: number; per_page: number };
-  };
+  linkedNodes: AsyncStateWithTotalCount<LinkedNode[]>;
+  linkedRegistrations: AsyncStateWithTotalCount<LinkedRegistration[]>;
 }
 
 export const REGISTRY_LINKS_STATE_DEFAULTS: RegistryLinksStateModel = {
-  linkedNodes: { data: [], isLoading: false, error: null },
-  linkedRegistrations: { data: [], isLoading: false, error: null },
+  linkedNodes: { data: [], isLoading: false, error: null, totalCount: 0 },
+  linkedRegistrations: { data: [], isLoading: false, error: null, totalCount: 0 },
 };
diff --git a/src/app/features/registry/store/registry-links/registry-links.state.ts b/src/app/features/registry/store/registry-links/registry-links.state.ts
index 71ed14cbd..35d4fe4c3 100644
--- a/src/app/features/registry/store/registry-links/registry-links.state.ts
+++ b/src/app/features/registry/store/registry-links/registry-links.state.ts
@@ -33,7 +33,7 @@ export class RegistryLinksState {
             data: response.data,
             isLoading: false,
             error: null,
-            meta: response.meta,
+            totalCount: response.totalCount,
           },
         });
       }),
@@ -55,7 +55,7 @@ export class RegistryLinksState {
             data: response.data,
             isLoading: false,
             error: null,
-            meta: response.meta,
+            totalCount: response.totalCount,
           },
         });
       }),
diff --git a/src/app/features/registry/store/registry/registry.state.ts b/src/app/features/registry/store/registry/registry.state.ts
index 0540bcff8..bceed584d 100644
--- a/src/app/features/registry/store/registry/registry.state.ts
+++ b/src/app/features/registry/store/registry/registry.state.ts
@@ -57,7 +57,7 @@ export class RegistryState {
             isLoading: false,
             error: null,
           },
-          isAnonymous: response.meta?.anonymous ?? false,
+          isAnonymous: response.isAnonymous,
         });
       }),
       catchError((error) => handleSectionError(ctx, 'registry', error))
@@ -85,7 +85,7 @@ export class RegistryState {
             isLoading: false,
             error: null,
           },
-          isAnonymous: response.meta?.anonymous ?? false,
+          isAnonymous: response.isAnonymous,
         });
 
         if (registryOverview.providerId) {
diff --git a/src/app/features/settings/account-settings/mappers/external-identities.mapper.ts b/src/app/features/settings/account-settings/mappers/external-identities.mapper.ts
index c9764c97e..06a5e553d 100644
--- a/src/app/features/settings/account-settings/mappers/external-identities.mapper.ts
+++ b/src/app/features/settings/account-settings/mappers/external-identities.mapper.ts
@@ -1,10 +1,6 @@
-import { ApiData } from '@osf/shared/models/common/json-api.model';
+import { ExternalIdentity, ListIdentitiesDataJsonApi } from '../models';
 
-import { ExternalIdentity, ExternalIdentityResponseJsonApi } from '../models';
-
-export function MapExternalIdentities(
-  data: ApiData<ExternalIdentityResponseJsonApi, null, null, null>[]
-): ExternalIdentity[] {
+export function MapExternalIdentities(data: ListIdentitiesDataJsonApi[]): ExternalIdentity[] {
   const identities: ExternalIdentity[] = [];
   for (const item of data) {
     identities.push({
diff --git a/src/app/features/settings/account-settings/models/account.settings.model.ts b/src/app/features/settings/account-settings/models/account-settings.model.ts
similarity index 100%
rename from src/app/features/settings/account-settings/models/account.settings.model.ts
rename to src/app/features/settings/account-settings/models/account-settings.model.ts
diff --git a/src/app/features/settings/account-settings/models/index.ts b/src/app/features/settings/account-settings/models/index.ts
index 262415527..34c715413 100644
--- a/src/app/features/settings/account-settings/models/index.ts
+++ b/src/app/features/settings/account-settings/models/index.ts
@@ -1,3 +1,3 @@
-export * from './account.settings.model';
+export * from './account-settings.model';
 export * from './osf-models';
 export * from './responses';
diff --git a/src/app/features/settings/account-settings/models/responses/account-settings-response-json-api.model.ts b/src/app/features/settings/account-settings/models/responses/account-settings-response-json-api.model.ts
index 378c155c0..3b75bcb8e 100644
--- a/src/app/features/settings/account-settings/models/responses/account-settings-response-json-api.model.ts
+++ b/src/app/features/settings/account-settings/models/responses/account-settings-response-json-api.model.ts
@@ -1,14 +1,11 @@
-import { ResponseDataJsonApi } from '@osf/shared/models/common/json-api.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export type AccountSettingsResponseJsonApi = ResponseDataJsonApi<AccountSettingsDataJsonApi>;
+export type AccountSettingsResponseJsonApi = ItemResponse<AccountSettingsDataJsonApi>;
 
-export interface AccountSettingsDataJsonApi {
-  id: string;
-  type: 'user-settings';
-  attributes: AccountSettingsAttributesJsonApi;
-}
+export type AccountSettingsDataJsonApi = JsonApiResource<'user-settings', AccountSettingsAttributesJsonApi>;
 
-export interface AccountSettingsAttributesJsonApi {
+interface AccountSettingsAttributesJsonApi {
   contacted_deactivation: boolean;
   deactivation_requested: boolean;
   secret: string;
diff --git a/src/app/features/settings/account-settings/models/responses/list-identities-response.model.ts b/src/app/features/settings/account-settings/models/responses/list-identities-response.model.ts
index db2130601..89b3119b0 100644
--- a/src/app/features/settings/account-settings/models/responses/list-identities-response.model.ts
+++ b/src/app/features/settings/account-settings/models/responses/list-identities-response.model.ts
@@ -1,11 +1,11 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models/common/json-api.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export type ListIdentitiesResponseJsonApi = JsonApiResponse<
-  ApiData<ExternalIdentityResponseJsonApi, null, null, null>[],
-  null
->;
+export type ListIdentitiesResponseJsonApi = ListResponse<ListIdentitiesDataJsonApi>;
 
-export interface ExternalIdentityResponseJsonApi {
+export type ListIdentitiesDataJsonApi = JsonApiResource<string, ExternalIdentityResponseJsonApi>;
+
+interface ExternalIdentityResponseJsonApi {
   external_id: string;
   status: string;
 }
diff --git a/src/app/features/settings/developer-apps/mappers/developer-app.mapper.ts b/src/app/features/settings/developer-apps/mappers/developer-app.mapper.ts
index 14c7139a9..d8c9c8e35 100644
--- a/src/app/features/settings/developer-apps/mappers/developer-app.mapper.ts
+++ b/src/app/features/settings/developer-apps/mappers/developer-app.mapper.ts
@@ -2,7 +2,7 @@ import {
   DeveloperApp,
   DeveloperAppCreateRequestJsonApi,
   DeveloperAppCreateUpdate,
-  DeveloperAppGetResponseJsonApi,
+  DeveloperAppDataJsonApi,
   DeveloperAppUpdateRequestJsonApi,
 } from '../models';
 
@@ -48,7 +48,7 @@ export class DeveloperAppMapper {
     };
   }
 
-  static fromGetResponse(response: DeveloperAppGetResponseJsonApi): DeveloperApp {
+  static fromGetResponse(response: DeveloperAppDataJsonApi): DeveloperApp {
     return {
       id: response.id,
       name: response.attributes.name,
diff --git a/src/app/features/settings/developer-apps/models/developer-app-json-api.model.ts b/src/app/features/settings/developer-apps/models/developer-app-json-api.model.ts
index 9b6d0ba48..8b2eef5f3 100644
--- a/src/app/features/settings/developer-apps/models/developer-app-json-api.model.ts
+++ b/src/app/features/settings/developer-apps/models/developer-app-json-api.model.ts
@@ -1,39 +1,35 @@
 import { StringOrNull } from '@osf/shared/helpers/types.helper';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { DataResponse, ItemResponse, ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 
-export interface DeveloperAppCreateRequestJsonApi {
-  data: {
-    type: 'applications';
-    attributes: {
-      name: string;
-      description: StringOrNull;
-      home_url: string;
-      callback_url: string;
-    };
-  };
-}
+export type DeveloperAppsListResponseJsonApi = ListResponse<DeveloperAppDataJsonApi>;
+export type DeveloperAppResponseJsonApi = ItemResponse<DeveloperAppDataJsonApi>;
+
+export type DeveloperAppDataJsonApi = JsonApiResource<'applications', DeveloperAppAttributesJsonApi>;
+
+export type DeveloperAppCreateRequestJsonApi = DataResponse<DeveloperAppCreateDataJsonApi>;
 
 export interface DeveloperAppUpdateRequestJsonApi {
-  data: {
-    id: string;
-    type: 'applications';
-    attributes: {
-      name: string;
-      description: StringOrNull;
-      home_url: string;
-      callback_url: string;
-    };
-  };
+  data: DeveloperAppCreateRequestJsonApi['data'] & { id: string };
 }
 
-export interface DeveloperAppGetResponseJsonApi {
-  id: string;
+interface DeveloperAppCreateDataJsonApi {
+  attributes: DeveloperAppChangeAttributesJsonApi;
   type: 'applications';
-  attributes: {
-    name: string;
-    description: string;
-    home_url: string;
-    callback_url: string;
-    client_id: string;
-    client_secret: string;
-  };
+}
+
+interface DeveloperAppChangeAttributesJsonApi {
+  callback_url: string;
+  description: StringOrNull;
+  home_url: string;
+  name: string;
+}
+
+interface DeveloperAppAttributesJsonApi {
+  callback_url: string;
+  client_id: string;
+  client_secret: string;
+  description: string;
+  home_url: string;
+  name: string;
 }
diff --git a/src/app/features/settings/developer-apps/services/developer-apps.service.ts b/src/app/features/settings/developer-apps/services/developer-apps.service.ts
index 55da7ae38..4f70a3962 100644
--- a/src/app/features/settings/developer-apps/services/developer-apps.service.ts
+++ b/src/app/features/settings/developer-apps/services/developer-apps.service.ts
@@ -3,11 +3,16 @@ import { map, Observable } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 import { DeveloperAppMapper } from '../mappers';
-import { DeveloperApp, DeveloperAppCreateUpdate, DeveloperAppGetResponseJsonApi } from '../models';
+import {
+  DeveloperApp,
+  DeveloperAppCreateUpdate,
+  DeveloperAppDataJsonApi,
+  DeveloperAppResponseJsonApi,
+  DeveloperAppsListResponseJsonApi,
+} from '../models';
 
 @Injectable({
   providedIn: 'root',
@@ -22,13 +27,13 @@ export class DeveloperApplicationsService {
 
   getApplications(): Observable<DeveloperApp[]> {
     return this.jsonApiService
-      .get<JsonApiResponse<DeveloperAppGetResponseJsonApi[], null>>(this.apiUrl)
+      .get<DeveloperAppsListResponseJsonApi>(this.apiUrl)
       .pipe(map((responses) => responses.data.map((response) => DeveloperAppMapper.fromGetResponse(response))));
   }
 
   getApplicationDetails(clientId: string): Observable<DeveloperApp> {
     return this.jsonApiService
-      .get<JsonApiResponse<DeveloperAppGetResponseJsonApi, null>>(`${this.apiUrl}${clientId}/`)
+      .get<DeveloperAppResponseJsonApi>(`${this.apiUrl}${clientId}/`)
       .pipe(map((response) => DeveloperAppMapper.fromGetResponse(response.data)));
   }
 
@@ -36,7 +41,7 @@ export class DeveloperApplicationsService {
     const request = DeveloperAppMapper.toCreateRequest(developerAppCreate);
 
     return this.jsonApiService
-      .post<JsonApiResponse<DeveloperAppGetResponseJsonApi, null>>(this.apiUrl, request)
+      .post<DeveloperAppResponseJsonApi>(this.apiUrl, request)
       .pipe(map((response) => DeveloperAppMapper.fromGetResponse(response.data)));
   }
 
@@ -44,7 +49,7 @@ export class DeveloperApplicationsService {
     const request = DeveloperAppMapper.toUpdateRequest(developerAppUpdate);
 
     return this.jsonApiService
-      .patch<DeveloperAppGetResponseJsonApi>(`${this.apiUrl}${clientId}/`, request)
+      .patch<DeveloperAppDataJsonApi>(`${this.apiUrl}${clientId}/`, request)
       .pipe(map((response) => DeveloperAppMapper.fromGetResponse(response)));
   }
 
@@ -52,7 +57,7 @@ export class DeveloperApplicationsService {
     const request = DeveloperAppMapper.toResetSecretRequest(clientId);
 
     return this.jsonApiService
-      .patch<DeveloperAppGetResponseJsonApi>(`${this.apiUrl}${clientId}/`, request)
+      .patch<DeveloperAppDataJsonApi>(`${this.apiUrl}${clientId}/`, request)
       .pipe(map((response) => DeveloperAppMapper.fromGetResponse(response)));
   }
 
diff --git a/src/app/features/settings/notifications/services/notification-subscription.service.ts b/src/app/features/settings/notifications/services/notification-subscription.service.ts
index 061856ef4..cced9fd61 100644
--- a/src/app/features/settings/notifications/services/notification-subscription.service.ts
+++ b/src/app/features/settings/notifications/services/notification-subscription.service.ts
@@ -5,9 +5,11 @@ import { inject, Injectable } from '@angular/core';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { SubscriptionFrequency } from '@osf/shared/enums/subscriptions/subscription-frequency.enum';
 import { NotificationSubscriptionMapper } from '@osf/shared/mappers/notification-subscription.mapper';
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
 import { NotificationSubscription } from '@osf/shared/models/notifications/notification-subscription.model';
-import { NotificationSubscriptionGetResponseJsonApi } from '@osf/shared/models/notifications/notification-subscription-json-api.model';
+import {
+  NotificationSubscriptionDataJsonApi,
+  NotificationSubscriptionsListResponseJsonApi,
+} from '@osf/shared/models/notifications/notification-subscription-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 @Injectable({
@@ -27,7 +29,7 @@ export class NotificationSubscriptionService {
     };
 
     return this.jsonApiService
-      .get<JsonApiResponse<NotificationSubscriptionGetResponseJsonApi[], null>>(this.apiUrl, params)
+      .get<NotificationSubscriptionsListResponseJsonApi>(this.apiUrl, params)
       .pipe(
         map((responses) => responses.data.map((response) => NotificationSubscriptionMapper.fromGetResponse(response)))
       );
@@ -37,7 +39,7 @@ export class NotificationSubscriptionService {
     const request = NotificationSubscriptionMapper.toUpdateRequest(id, frequency);
 
     return this.jsonApiService
-      .patch<NotificationSubscriptionGetResponseJsonApi>(`${this.apiUrl}${id}/`, request)
+      .patch<NotificationSubscriptionDataJsonApi>(`${this.apiUrl}${id}/`, request)
       .pipe(map((response) => NotificationSubscriptionMapper.fromGetResponse(response)));
   }
 }
diff --git a/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.ts b/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.ts
index 928882d39..95d65c98a 100644
--- a/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.ts
+++ b/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.ts
@@ -18,8 +18,8 @@ import { AddonServiceNames } from '@osf/shared/enums/addon-service-names.enum';
 import { AddonType } from '@osf/shared/enums/addon-type.enum';
 import { ProjectAddonsStepperValue } from '@osf/shared/enums/profile-addons-stepper.enum';
 import { getAddonTypeString, isAuthorizedAddon } from '@osf/shared/helpers/addon-type.helper';
-import { AuthorizedAddonRequestJsonApi } from '@osf/shared/models/addons/addon-json-api.model';
 import { AddonTerm } from '@osf/shared/models/addons/addon-utils.model';
+import { AuthorizedAddonRequestJsonApi } from '@osf/shared/models/addons/authorized-addon-json-api.model';
 import { AddonOAuthService } from '@osf/shared/services/addons/addon-oauth.service';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { AddonModel } from '@shared/models/addons/addon.model';
@@ -81,7 +81,7 @@ export class ConnectAddonComponent {
       return null;
     }
     const openURL = new URL(addon.redirectUrl);
-    openURL.searchParams.set('userIri', this.addonsUserReference()[0]?.attributes.user_uri);
+    openURL.searchParams.set('userIri', this.addonsUserReference()[0]?.userUri);
     return openURL.toString();
   });
 
diff --git a/src/app/features/settings/tokens/mappers/scope.mapper.ts b/src/app/features/settings/tokens/mappers/scope.mapper.ts
index 998650bb6..fa5ae510d 100644
--- a/src/app/features/settings/tokens/mappers/scope.mapper.ts
+++ b/src/app/features/settings/tokens/mappers/scope.mapper.ts
@@ -1,7 +1,7 @@
-import { ScopeJsonApi, ScopeModel } from '../models';
+import { ScopeDataJsonApi, ScopeModel } from '../models';
 
 export class ScopeMapper {
-  static fromResponse(response: ScopeJsonApi[]): ScopeModel[] {
+  static fromResponse(response: ScopeDataJsonApi[]): ScopeModel[] {
     return response.map((scope) => ({
       id: scope.id,
       description: scope.attributes.description,
diff --git a/src/app/features/settings/tokens/mappers/token.mapper.ts b/src/app/features/settings/tokens/mappers/token.mapper.ts
index 00a23d80c..63266ca8b 100644
--- a/src/app/features/settings/tokens/mappers/token.mapper.ts
+++ b/src/app/features/settings/tokens/mappers/token.mapper.ts
@@ -1,4 +1,4 @@
-import { TokenCreateRequestJsonApi, TokenGetResponseJsonApi, TokenModel } from '../models';
+import { TokenCreateRequestJsonApi, TokenDataJsonApi, TokenModel } from '../models';
 
 export class TokenMapper {
   static toRequest(name: string, scopes: string[]): TokenCreateRequestJsonApi {
@@ -13,7 +13,7 @@ export class TokenMapper {
     };
   }
 
-  static fromGetResponse(response: TokenGetResponseJsonApi): TokenModel {
+  static fromGetResponse(response: TokenDataJsonApi): TokenModel {
     return {
       id: response.id,
       tokenId: response.attributes.token_id,
diff --git a/src/app/features/settings/tokens/models/scope-json-api.model.ts b/src/app/features/settings/tokens/models/scope-json-api.model.ts
index 8933a7ce3..a93d94cd0 100644
--- a/src/app/features/settings/tokens/models/scope-json-api.model.ts
+++ b/src/app/features/settings/tokens/models/scope-json-api.model.ts
@@ -1,7 +1,10 @@
-export interface ScopeJsonApi {
-  id: string;
-  type: string;
-  attributes: {
-    description: string;
-  };
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ListResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+export type ScopeJsonApiResponse = ListResponse<ScopeDataJsonApi>;
+
+export type ScopeDataJsonApi = JsonApiResource<'scopes', ScopeAttributesJsonApi>;
+
+interface ScopeAttributesJsonApi {
+  description: string;
 }
diff --git a/src/app/features/settings/tokens/models/token-json-api.model.ts b/src/app/features/settings/tokens/models/token-json-api.model.ts
index c2875fe9b..c56d729a0 100644
--- a/src/app/features/settings/tokens/models/token-json-api.model.ts
+++ b/src/app/features/settings/tokens/models/token-json-api.model.ts
@@ -1,30 +1,32 @@
-export interface TokenCreateRequestJsonApi {
-  data: {
-    attributes: {
-      name: string;
-      scopes: string;
-    };
-    type: 'tokens';
-  };
-}
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { DataResponse, ItemResponse, ListResponse } from '@osf/shared/models/common/json-api/responses.model';
+
+import { ScopeJsonApiResponse } from './scope-json-api.model';
+
+export type TokensListResponseJsonApi = ListResponse<TokenDataJsonApi>;
+export type TokenResponseJsonApi = ItemResponse<TokenDataJsonApi>;
 
-export interface TokenGetResponseJsonApi {
-  id: string;
-  attributes: TokenAttributesJsonApi;
+export interface TokenDataJsonApi extends JsonApiResource<'tokens', TokenAttributesJsonApi> {
   embeds: TokenEmbedsJsonApi;
 }
 
+export type TokenCreateRequestJsonApi = DataResponse<TokenCreateDataJsonApi>;
+
+interface TokenCreateDataJsonApi {
+  attributes: TokenCreateAttributesJsonApi;
+  type: 'tokens';
+}
+
+interface TokenCreateAttributesJsonApi {
+  name: string;
+  scopes: string;
+}
+
 interface TokenAttributesJsonApi {
   name: string;
   token_id: string;
 }
 
 interface TokenEmbedsJsonApi {
-  scopes: {
-    data: TokenEmbedsDataItemJsonApi[];
-  };
-}
-
-interface TokenEmbedsDataItemJsonApi {
-  id: string;
+  scopes: ScopeJsonApiResponse;
 }
diff --git a/src/app/features/settings/tokens/services/tokens.service.spec.ts b/src/app/features/settings/tokens/services/tokens.service.spec.ts
index 163cf340a..612cbe4a8 100644
--- a/src/app/features/settings/tokens/services/tokens.service.spec.ts
+++ b/src/app/features/settings/tokens/services/tokens.service.spec.ts
@@ -1,15 +1,26 @@
 import { HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
-
 import { provideOSFCore, provideOSFHttp } from '@testing/osf.testing.provider';
 import { EnvironmentTokenMock } from '@testing/providers/environment.token.mock';
 
-import { ScopeJsonApi, ScopeModel, TokenGetResponseJsonApi, TokenModel } from '../models';
+import {
+  ScopeDataJsonApi,
+  ScopeJsonApiResponse,
+  ScopeModel,
+  TokenModel,
+  TokenResponseJsonApi,
+  TokensListResponseJsonApi,
+} from '../models';
 
 import { TokensService } from './tokens.service';
 
+const scopeFixture = (id: string): ScopeDataJsonApi => ({
+  id,
+  type: 'scopes',
+  attributes: { description: '' },
+});
+
 describe('TokensService', () => {
   let service: TokensService;
   const apiBase = `${EnvironmentTokenMock.useValue.apiDomainUrl}/v2`;
@@ -26,7 +37,7 @@ describe('TokensService', () => {
   });
 
   it('should getScopes and map response', inject([HttpTestingController], (httpMock: HttpTestingController) => {
-    const response: JsonApiResponse<ScopeJsonApi[], null> = {
+    const response: ScopeJsonApiResponse = {
       data: [
         {
           id: 'osf.full_read',
@@ -34,6 +45,7 @@ describe('TokensService', () => {
           attributes: { description: 'Read access' },
         },
       ],
+      meta: { total: 1 },
     };
     let result: ScopeModel[] = [];
 
@@ -48,18 +60,21 @@ describe('TokensService', () => {
   }));
 
   it('should getTokens and map response', inject([HttpTestingController], (httpMock: HttpTestingController) => {
-    const response: JsonApiResponse<TokenGetResponseJsonApi[], null> = {
+    const response: TokensListResponseJsonApi = {
       data: [
         {
           id: 'token-1',
+          type: 'tokens',
           attributes: { name: 'Token One', token_id: 'token-value-1' },
           embeds: {
             scopes: {
-              data: [{ id: 'osf.full_read' }, { id: 'osf.full_write' }],
+              data: [scopeFixture('osf.full_read'), scopeFixture('osf.full_write')],
+              meta: { total: 2 },
             },
           },
         },
       ],
+      meta: { total: 1 },
     };
     let result: TokenModel[] = [];
 
@@ -81,13 +96,15 @@ describe('TokensService', () => {
   }));
 
   it('should getTokenById and map response', inject([HttpTestingController], (httpMock: HttpTestingController) => {
-    const response: JsonApiResponse<TokenGetResponseJsonApi, null> = {
+    const response: TokenResponseJsonApi = {
       data: {
         id: 'token-2',
+        type: 'tokens',
         attributes: { name: 'Token Two', token_id: 'token-value-2' },
         embeds: {
           scopes: {
-            data: [{ id: 'osf.full_read' }],
+            data: [scopeFixture('osf.full_read')],
+            meta: { total: 1 },
           },
         },
       },
@@ -112,13 +129,15 @@ describe('TokensService', () => {
   it('should createToken with mapped request and mapped response', inject(
     [HttpTestingController],
     (httpMock: HttpTestingController) => {
-      const response: JsonApiResponse<TokenGetResponseJsonApi, null> = {
+      const response: TokenResponseJsonApi = {
         data: {
           id: 'token-3',
+          type: 'tokens',
           attributes: { name: 'Created Token', token_id: 'token-value-3' },
           embeds: {
             scopes: {
-              data: [{ id: 'osf.full_read' }, { id: 'osf.full_write' }],
+              data: [scopeFixture('osf.full_read'), scopeFixture('osf.full_write')],
+              meta: { total: 2 },
             },
           },
         },
@@ -153,16 +172,18 @@ describe('TokensService', () => {
   it('should updateToken with mapped request and mapped response', inject(
     [HttpTestingController],
     (httpMock: HttpTestingController) => {
-      const response = {
+      const response: TokenResponseJsonApi = {
         data: {
           id: 'token-4',
+          type: 'tokens',
           attributes: { name: 'Updated Token', token_id: 'token-value-4' },
           embeds: {
             scopes: {
-              data: [{ id: 'osf.full_write' }],
+              data: [scopeFixture('osf.full_write')],
+              meta: { total: 1 },
             },
           },
-        } as TokenGetResponseJsonApi,
+        },
       };
       let result: TokenModel | undefined;
 
diff --git a/src/app/features/settings/tokens/services/tokens.service.ts b/src/app/features/settings/tokens/services/tokens.service.ts
index 78701d9ef..99e4d7256 100644
--- a/src/app/features/settings/tokens/services/tokens.service.ts
+++ b/src/app/features/settings/tokens/services/tokens.service.ts
@@ -4,11 +4,17 @@ import { map } from 'rxjs/operators';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
 import { ScopeMapper, TokenMapper } from '../mappers';
-import { ScopeJsonApi, ScopeModel, TokenGetResponseJsonApi, TokenModel } from '../models';
+import {
+  ScopeJsonApiResponse,
+  ScopeModel,
+  TokenDataJsonApi,
+  TokenModel,
+  TokenResponseJsonApi,
+  TokensListResponseJsonApi,
+} from '../models';
 
 @Injectable({
   providedIn: 'root',
@@ -23,19 +29,19 @@ export class TokensService {
 
   getScopes(): Observable<ScopeModel[]> {
     return this.jsonApiService
-      .get<JsonApiResponse<ScopeJsonApi[], null>>(`${this.apiUrl}/scopes/`)
+      .get<ScopeJsonApiResponse>(`${this.apiUrl}/scopes/`)
       .pipe(map((responses) => ScopeMapper.fromResponse(responses.data)));
   }
 
   getTokens(): Observable<TokenModel[]> {
     return this.jsonApiService
-      .get<JsonApiResponse<TokenGetResponseJsonApi[], null>>(`${this.apiUrl}/tokens/`)
+      .get<TokensListResponseJsonApi>(`${this.apiUrl}/tokens/`)
       .pipe(map((responses) => responses.data.map((response) => TokenMapper.fromGetResponse(response))));
   }
 
   getTokenById(tokenId: string): Observable<TokenModel> {
     return this.jsonApiService
-      .get<JsonApiResponse<TokenGetResponseJsonApi, null>>(`${this.apiUrl}/tokens/${tokenId}/`)
+      .get<TokenResponseJsonApi>(`${this.apiUrl}/tokens/${tokenId}/`)
       .pipe(map((response) => TokenMapper.fromGetResponse(response.data)));
   }
 
@@ -43,7 +49,7 @@ export class TokensService {
     const request = TokenMapper.toRequest(name, scopes);
 
     return this.jsonApiService
-      .post<JsonApiResponse<TokenGetResponseJsonApi, null>>(`${this.apiUrl}/tokens/`, request)
+      .post<TokenResponseJsonApi>(`${this.apiUrl}/tokens/`, request)
       .pipe(map((response) => TokenMapper.fromGetResponse(response.data)));
   }
 
@@ -51,7 +57,7 @@ export class TokensService {
     const request = TokenMapper.toRequest(name, scopes);
 
     return this.jsonApiService
-      .patch<TokenGetResponseJsonApi>(`${this.apiUrl}/tokens/${tokenId}/`, request)
+      .patch<TokenDataJsonApi>(`${this.apiUrl}/tokens/${tokenId}/`, request)
       .pipe(map((response) => TokenMapper.fromGetResponse(response)));
   }
 
diff --git a/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts b/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts
index 1941cbaa7..61dd13622 100644
--- a/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts
+++ b/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts
@@ -11,8 +11,8 @@ import { RouterLink } from '@angular/router';
 
 import { AddonFormControls } from '@osf/shared/enums/addon-form-controls.enum';
 import { CredentialsFormat } from '@osf/shared/enums/addons-credentials-format.enum';
-import { AuthorizedAddonRequestJsonApi } from '@osf/shared/models/addons/addon-json-api.model';
 import { AddonForm } from '@osf/shared/models/addons/addon-utils.model';
+import { AuthorizedAddonRequestJsonApi } from '@osf/shared/models/addons/authorized-addon-json-api.model';
 import { AddonModel } from '@shared/models/addons/addon.model';
 import { AuthorizedAccountModel } from '@shared/models/addons/authorized-account.model';
 import { AddonFormService } from '@shared/services/addons/addon-form.service';
diff --git a/src/app/shared/components/filter-chips/filter-chips.component.ts b/src/app/shared/components/filter-chips/filter-chips.component.ts
index f976a9967..d81845894 100644
--- a/src/app/shared/components/filter-chips/filter-chips.component.ts
+++ b/src/app/shared/components/filter-chips/filter-chips.component.ts
@@ -3,7 +3,7 @@ import { Chip } from 'primeng/chip';
 import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
 
 import { DiscoverableFilter, FilterOption } from '@osf/shared/models/search/discoverable-filter.model';
-import { FilterOptionRemoved } from '@osf/shared/models/search/filter-option-removed';
+import { FilterOptionRemoved } from '@osf/shared/models/search/filter-option-removed.model';
 
 @Component({
   selector: 'osf-filter-chips',
diff --git a/src/app/shared/components/global-search/global-search.component.ts b/src/app/shared/components/global-search/global-search.component.ts
index af1ca34e8..05f5c7ddd 100644
--- a/src/app/shared/components/global-search/global-search.component.ts
+++ b/src/app/shared/components/global-search/global-search.component.ts
@@ -23,7 +23,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { PreprintProviderDetails } from '@osf/features/preprints/models';
 import { normalizeQuotes } from '@osf/shared/helpers/normalize-quotes';
 import { DiscoverableFilter, FilterOption } from '@osf/shared/models/search/discoverable-filter.model';
-import { FilterOptionRemoved } from '@osf/shared/models/search/filter-option-removed';
+import { FilterOptionRemoved } from '@osf/shared/models/search/filter-option-removed.model';
 import { FilterOptionSelected } from '@osf/shared/models/search/filter-option-selected.model';
 import { FilterOptionsSearchText } from '@osf/shared/models/search/filter-options-search-text.model';
 import { SearchFiltersComponent } from '@shared/components/search-filters/search-filters.component';
diff --git a/src/app/shared/components/google-file-picker/google-file-picker.component.spec.ts b/src/app/shared/components/google-file-picker/google-file-picker.component.spec.ts
index 697a9a419..07dccc811 100644
--- a/src/app/shared/components/google-file-picker/google-file-picker.component.spec.ts
+++ b/src/app/shared/components/google-file-picker/google-file-picker.component.spec.ts
@@ -10,7 +10,7 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { SENTRY_TOKEN } from '@core/provider/sentry.provider';
 import { AddonType } from '@shared/enums/addon-type.enum';
 import { StorageItem } from '@shared/models/addons/storage-item.model';
-import { GoogleFileDataModel } from '@shared/models/files/google-file.data.model';
+import { GoogleFileDataModel } from '@shared/models/files/google-file-data.model';
 import { GoogleFilePickerDownloadService } from '@shared/services/google-file-picker.download.service';
 import { GetAuthorizedStorageOauthToken } from '@shared/stores/addons';
 
diff --git a/src/app/shared/components/google-file-picker/google-file-picker.component.ts b/src/app/shared/components/google-file-picker/google-file-picker.component.ts
index beb361473..04fd0a080 100644
--- a/src/app/shared/components/google-file-picker/google-file-picker.component.ts
+++ b/src/app/shared/components/google-file-picker/google-file-picker.component.ts
@@ -11,8 +11,8 @@ import { SENTRY_TOKEN } from '@core/provider/sentry.provider';
 import { AddonType } from '@osf/shared/enums/addon-type.enum';
 import { GoogleFilePickerDownloadService } from '@osf/shared/services/google-file-picker.download.service';
 import { StorageItem } from '@shared/models/addons/storage-item.model';
-import { GoogleFileDataModel } from '@shared/models/files/google-file.data.model';
-import { GoogleFilePickerModel } from '@shared/models/files/google-file.picker.model';
+import { GoogleFileDataModel } from '@shared/models/files/google-file-data.model';
+import { GoogleFilePickerModel } from '@shared/models/files/google-file-picker.model';
 import { AddonsSelectors, GetAuthorizedStorageOauthToken } from '@shared/stores/addons';
 
 @Component({
diff --git a/src/app/shared/components/metadata-tabs/metadata-tabs.component.spec.ts b/src/app/shared/components/metadata-tabs/metadata-tabs.component.spec.ts
index 8e19eaccf..20676021e 100644
--- a/src/app/shared/components/metadata-tabs/metadata-tabs.component.spec.ts
+++ b/src/app/shared/components/metadata-tabs/metadata-tabs.component.spec.ts
@@ -5,12 +5,11 @@ import { TabsModule } from 'primeng/tabs';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CedarTemplateFormComponent } from '@osf/features/metadata/components/cedar-template-form/cedar-template-form.component';
-import { CedarMetadataDataTemplateJsonApi, CedarRecordDataBinding } from '@osf/features/metadata/models';
+import { CedarMetadataTemplateModel, CedarRecordDataBinding } from '@osf/features/metadata/models';
 import { MetadataResourceEnum } from '@osf/shared/enums/metadata-resource.enum';
 import { MetadataTabsModel } from '@shared/models/metadata-tabs.model';
 
-import { CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK } from '@testing/mocks/cedar-metadata-data-template-json-api.mock';
-import { MOCK_CEDAR_METADATA_RECORD_DATA } from '@testing/mocks/cedar-metadata-record.mock';
+import { MOCK_CEDAR_METADATA_RECORD, MOCK_CEDAR_METADATA_TEMPLATE } from '@testing/mocks/cedar-metadata-domain.mock';
 import { provideOSFCore } from '@testing/osf.testing.provider';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
@@ -27,9 +26,9 @@ describe('MetadataTabsComponent', () => {
     { id: 'tab3', label: 'Tab 3', type: MetadataResourceEnum.REGISTRY },
   ];
 
-  const mockCedarTemplate: CedarMetadataDataTemplateJsonApi = CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK;
+  const mockCedarTemplate: CedarMetadataTemplateModel = MOCK_CEDAR_METADATA_TEMPLATE;
 
-  const mockCedarRecord = MOCK_CEDAR_METADATA_RECORD_DATA;
+  const mockCedarRecord = MOCK_CEDAR_METADATA_RECORD;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
diff --git a/src/app/shared/components/metadata-tabs/metadata-tabs.component.ts b/src/app/shared/components/metadata-tabs/metadata-tabs.component.ts
index 1df0908ff..676167921 100644
--- a/src/app/shared/components/metadata-tabs/metadata-tabs.component.ts
+++ b/src/app/shared/components/metadata-tabs/metadata-tabs.component.ts
@@ -6,8 +6,8 @@ import { ChangeDetectionStrategy, Component, input, output } from '@angular/core
 
 import { CedarTemplateFormComponent } from '@osf/features/metadata/components/cedar-template-form/cedar-template-form.component';
 import {
-  CedarMetadataDataTemplateJsonApi,
-  CedarMetadataRecordData,
+  CedarMetadataRecordModel,
+  CedarMetadataTemplateModel,
   CedarRecordDataBinding,
 } from '@osf/features/metadata/models';
 import { MetadataTabsModel } from '@osf/shared/models/metadata-tabs.model';
@@ -25,8 +25,8 @@ export class MetadataTabsComponent {
   loading = input<boolean>(false);
   tabs = input.required<MetadataTabsModel[]>();
   selectedTab = input.required<string>();
-  selectedCedarTemplate = input.required<CedarMetadataDataTemplateJsonApi>();
-  selectedCedarRecord = input.required<CedarMetadataRecordData | null>();
+  selectedCedarTemplate = input.required<CedarMetadataTemplateModel>();
+  selectedCedarRecord = input.required<CedarMetadataRecordModel | null>();
   cedarFormReadonly = input<boolean>(true);
   canEdit = input<boolean>(true);
   changeTab = output<string | number>();
diff --git a/src/app/shared/components/my-projects-table/my-projects-table.component.spec.ts b/src/app/shared/components/my-projects-table/my-projects-table.component.spec.ts
index 2b5fb77c7..6dcaddc1d 100644
--- a/src/app/shared/components/my-projects-table/my-projects-table.component.spec.ts
+++ b/src/app/shared/components/my-projects-table/my-projects-table.component.spec.ts
@@ -7,7 +7,7 @@ import { TemplateRef } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { SortOrder } from '@osf/shared/enums/sort-order.enum';
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { TableParameters } from '@osf/shared/models/table-parameters.model';
 
 import { MOCK_CONTRIBUTOR } from '@testing/mocks/contributors.mock';
diff --git a/src/app/shared/components/my-projects-table/my-projects-table.component.ts b/src/app/shared/components/my-projects-table/my-projects-table.component.ts
index b68017026..1f9020c3b 100644
--- a/src/app/shared/components/my-projects-table/my-projects-table.component.ts
+++ b/src/app/shared/components/my-projects-table/my-projects-table.component.ts
@@ -8,7 +8,7 @@ import { DatePipe, NgTemplateOutlet } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input, output, TemplateRef } from '@angular/core';
 
 import { SortOrder } from '@osf/shared/enums/sort-order.enum';
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { TableParameters } from '@osf/shared/models/table-parameters.model';
 
 import { ContributorsListShortenerComponent } from '../contributors-list-shortener/contributors-list-shortener.component';
diff --git a/src/app/shared/components/recent-activity/recent-activity-list.component.ts b/src/app/shared/components/recent-activity/recent-activity-list.component.ts
index 78f20fb1f..de45364aa 100644
--- a/src/app/shared/components/recent-activity/recent-activity-list.component.ts
+++ b/src/app/shared/components/recent-activity/recent-activity-list.component.ts
@@ -7,7 +7,7 @@ import { DatePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
 import { CustomPaginatorComponent } from '@osf/shared/components/custom-paginator/custom-paginator.component';
-import { ActivityLogWithDisplay } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
+import { ActivityLogWithDisplayModel } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
 
 @Component({
   selector: 'osf-recent-activity-list',
@@ -17,7 +17,7 @@ import { ActivityLogWithDisplay } from '@osf/shared/models/activity-logs/activit
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RecentActivityListComponent {
-  activityLogs = input.required<ActivityLogWithDisplay[]>();
+  activityLogs = input.required<ActivityLogWithDisplayModel[]>();
   isLoading = input.required<boolean>();
   totalCount = input.required<number>();
   pageSize = input.required<number>();
diff --git a/src/app/shared/components/wiki/wiki-list/wiki-list.component.spec.ts b/src/app/shared/components/wiki/wiki-list/wiki-list.component.spec.ts
index 0a9ac2f66..2d2f592ae 100644
--- a/src/app/shared/components/wiki/wiki-list/wiki-list.component.spec.ts
+++ b/src/app/shared/components/wiki/wiki-list/wiki-list.component.spec.ts
@@ -5,8 +5,8 @@ import { MenuItem } from 'primeng/api';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
 
+import { WikiItemType } from '@osf/shared/enums/wiki-type.enum';
 import { WikiModel } from '@osf/shared/models/wiki/wiki.model';
-import { WikiItemType } from '@osf/shared/models/wiki/wiki-type.model';
 import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
 import { CustomDialogService } from '@osf/shared/services/custom-dialog.service';
 import { ComponentWiki } from '@osf/shared/stores/wiki';
diff --git a/src/app/shared/components/wiki/wiki-list/wiki-list.component.ts b/src/app/shared/components/wiki/wiki-list/wiki-list.component.ts
index d353a9893..fb7ac5227 100644
--- a/src/app/shared/components/wiki/wiki-list/wiki-list.component.ts
+++ b/src/app/shared/components/wiki/wiki-list/wiki-list.component.ts
@@ -10,9 +10,9 @@ import { ChangeDetectionStrategy, Component, computed, DestroyRef, inject, input
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { Router } from '@angular/router';
 
+import { WikiItemType } from '@osf/shared/enums/wiki-type.enum';
 import { WikiModel } from '@osf/shared/models/wiki/wiki.model';
 import { WikiMenuItem } from '@osf/shared/models/wiki/wiki-menu.model';
-import { WikiItemType } from '@osf/shared/models/wiki/wiki-type.model';
 import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
 import { CustomDialogService } from '@osf/shared/services/custom-dialog.service';
 import { ComponentWiki } from '@osf/shared/stores/wiki';
diff --git a/src/app/shared/enums/wiki-modes.enum.ts b/src/app/shared/enums/wiki-modes.enum.ts
new file mode 100644
index 000000000..0d1f635ed
--- /dev/null
+++ b/src/app/shared/enums/wiki-modes.enum.ts
@@ -0,0 +1,5 @@
+export enum WikiModes {
+  View = 'view',
+  Edit = 'edit',
+  Compare = 'compare',
+}
diff --git a/src/app/shared/models/wiki/wiki-type.model.ts b/src/app/shared/enums/wiki-type.enum.ts
similarity index 100%
rename from src/app/shared/models/wiki/wiki-type.model.ts
rename to src/app/shared/enums/wiki-type.enum.ts
diff --git a/src/app/shared/mappers/activity-logs.mapper.ts b/src/app/shared/mappers/activity-logs.mapper.ts
index ec75f8b44..8399cc363 100644
--- a/src/app/shared/mappers/activity-logs.mapper.ts
+++ b/src/app/shared/mappers/activity-logs.mapper.ts
@@ -1,13 +1,19 @@
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { DEFAULT_TABLE_PARAMS } from '../constants/default-table-params.constants';
-import { ActivityLog, LogContributor } from '../models/activity-logs/activity-logs.model';
-import { ActivityLogJsonApi, LogContributorJsonApi } from '../models/activity-logs/activity-logs-json-api.model';
-import { ResponseJsonApi } from '../models/common/json-api.model';
+import { ActivityLogModel, LogContributorModel } from '../models/activity-logs/activity-logs.model';
+import {
+  ActivityLogDataJsonApi,
+  ActivityLogsResponseJsonApi,
+  LogContributorJsonApi,
+} from '../models/activity-logs/activity-logs-json-api.model';
 import { PaginatedData } from '../models/paginated-data.model';
 
+import { BaseNodeMapper } from './nodes';
+import { UserMapper } from './user';
+
 export class ActivityLogsMapper {
-  static fromActivityLogJsonApi(log: ActivityLogJsonApi, isAnonymous?: boolean): ActivityLog {
+  static fromActivityLogJsonApi(log: ActivityLogDataJsonApi, isAnonymous?: boolean): ActivityLogModel {
     const params = log.attributes.params ?? {};
     const contributors = params.contributors ?? [];
 
@@ -18,12 +24,21 @@ export class ActivityLogsMapper {
       date: log.attributes.date,
       foreignUser: log.attributes.foreign_user,
       params: {
+        addon: params.addon,
+        anonymousLink: params.anonymous_link,
         contributors: contributors.length
           ? contributors.map((contributor) => this.fromContributorJsonApi(contributor))
           : [],
-        license: params.license,
-        tag: params.tag,
+        destination: params.destination,
+        file: params.file,
+        githubUser: params.github_user,
+        identifiers: params.identifiers,
         institution: params.institution,
+        kind: params.kind,
+        license: params.license,
+        oldPage: params.old_page,
+        page: params.page,
+        pageId: params.page_id,
         paramsNode: params.params_node
           ? {
               id: params.params_node.id,
@@ -31,13 +46,6 @@ export class ActivityLogsMapper {
             }
           : { id: '', title: '' },
         paramsProject: params.params_project,
-        template_node: params.template_node
-          ? {
-              id: params.template_node.id,
-              url: params.template_node.url,
-              title: replaceBadEncodedChars(params.template_node.title),
-            }
-          : null,
         pointer: params.pointer
           ? {
               category: params.pointer.category,
@@ -46,116 +54,41 @@ export class ActivityLogsMapper {
               url: params.pointer.url,
             }
           : null,
-        preprintProvider: params.preprint_provider,
-        addon: params.addon,
-        anonymousLink: params.anonymous_link,
-        file: params.file,
-        wiki: params.wiki,
-        destination: params.destination,
-        identifiers: params.identifiers,
-        kind: params.kind,
-        oldPage: params.old_page,
-        page: params.page,
-        pageId: params.page_id,
-        path: params.path,
-        urls: params.urls,
         preprint: params.preprint,
+        preprintProvider: params.preprint_provider,
         source: params.source,
+        tag: params.tag,
+        templateNode: params.template_node
+          ? {
+              id: params.template_node.id,
+              url: params.template_node.url,
+              title: replaceBadEncodedChars(params.template_node.title),
+            }
+          : null,
         titleNew: params.title_new,
         titleOriginal: params.title_original,
         updatedFields: params.updated_fields,
+        urls: params.urls,
         value: params.value,
         version: params.version,
-        githubUser: params.github_user,
+        wiki: params.wiki,
       },
       isAnonymous,
       embeds: log.embeds
         ? {
             originalNode: log.embeds.original_node?.data
-              ? {
-                  id: log.embeds.original_node.data.id,
-                  type: log.embeds.original_node.data.type,
-                  title: replaceBadEncodedChars(log.embeds.original_node.data.attributes.title),
-                  description: replaceBadEncodedChars(log.embeds.original_node.data.attributes.description),
-                  category: log.embeds.original_node.data.attributes.category,
-                  customCitation: log.embeds.original_node.data.attributes.custom_citation,
-                  dateCreated: log.embeds.original_node.data.attributes.date_created,
-                  dateModified: log.embeds.original_node.data.attributes.date_modified,
-                  registration: log.embeds.original_node.data.attributes.registration,
-                  preprint: log.embeds.original_node.data.attributes.preprint,
-                  fork: log.embeds.original_node.data.attributes.fork,
-                  collection: log.embeds.original_node.data.attributes.collection,
-                  tags: log.embeds.original_node.data.attributes.tags,
-                  accessRequestsEnabled: log.embeds.original_node.data.attributes.access_requests_enabled,
-                  nodeLicense: log.embeds.original_node.data.attributes.node_license
-                    ? {
-                        copyrightHolders: log.embeds.original_node.data.attributes.node_license.copyright_holders,
-                        year: log.embeds.original_node.data.attributes.node_license.year,
-                      }
-                    : { copyrightHolders: [], year: null },
-                  currentUserCanComment: log.embeds.original_node.data.attributes.current_user_can_comment,
-                  currentUserPermissions: log.embeds.original_node.data.attributes.current_user_permissions,
-                  currentUserIsContributor: log.embeds.original_node.data.attributes.current_user_is_contributor,
-                  currentUserIsContributorOrGroupMember:
-                    log.embeds.original_node.data.attributes.current_user_is_contributor_or_group_member,
-                  wikiEnabled: log.embeds.original_node.data.attributes.wiki_enabled,
-                  public: log.embeds.original_node.data.attributes.public,
-                  subjects: log.embeds.original_node.data.attributes.subjects,
-                }
-              : undefined,
-            user: log.embeds.user?.data
-              ? {
-                  id: log.embeds.user.data.id,
-                  type: log.embeds.user.data.type,
-                  fullName: log.embeds.user.data.attributes.full_name,
-                  givenName: log.embeds.user.data.attributes.given_name,
-                  middleNames: log.embeds.user.data.attributes.middle_names,
-                  familyName: log.embeds.user.data.attributes.family_name,
-                  suffix: log.embeds.user.data.attributes.suffix,
-                  dateRegistered: log.embeds.user.data.attributes.date_registered,
-                  active: log.embeds.user.data.attributes.active,
-                  timezone: log.embeds.user.data.attributes.timezone,
-                  locale: log.embeds.user.data.attributes.locale,
-                }
+              ? BaseNodeMapper.getNodeData(log.embeds.original_node.data)
               : undefined,
+            user: log.embeds.user?.data ? UserMapper.fromUserGetResponse(log.embeds.user.data) : undefined,
             linkedNode: log.embeds.linked_node?.data
-              ? {
-                  id: log.embeds.linked_node.data.id,
-                  type: log.embeds.linked_node.data.type,
-                  title: replaceBadEncodedChars(log.embeds.linked_node.data.attributes.title),
-                  description: replaceBadEncodedChars(log.embeds.linked_node.data.attributes.description),
-                  category: log.embeds.linked_node.data.attributes.category,
-                  customCitation: log.embeds.linked_node.data.attributes.custom_citation,
-                  dateCreated: log.embeds.linked_node.data.attributes.date_created,
-                  dateModified: log.embeds.linked_node.data.attributes.date_modified,
-                  registration: log.embeds.linked_node.data.attributes.registration,
-                  preprint: log.embeds.linked_node.data.attributes.preprint,
-                  fork: log.embeds.linked_node.data.attributes.fork,
-                  collection: log.embeds.linked_node.data.attributes.collection,
-                  tags: log.embeds.linked_node.data.attributes.tags,
-                  accessRequestsEnabled: log.embeds.linked_node.data.attributes.access_requests_enabled,
-                  nodeLicense: log.embeds.linked_node.data.attributes.node_license
-                    ? {
-                        copyrightHolders: log.embeds.linked_node.data.attributes.node_license.copyright_holders,
-                        year: log.embeds.linked_node.data.attributes.node_license.year,
-                      }
-                    : { copyrightHolders: [], year: null },
-                  currentUserCanComment: log.embeds.linked_node.data.attributes.current_user_can_comment,
-                  currentUserPermissions: log.embeds.linked_node.data.attributes.current_user_permissions,
-                  currentUserIsContributor: log.embeds.linked_node.data.attributes.current_user_is_contributor,
-                  currentUserIsContributorOrGroupMember:
-                    log.embeds.linked_node.data.attributes.current_user_is_contributor_or_group_member,
-                  wikiEnabled: log.embeds.linked_node.data.attributes.wiki_enabled,
-                  public: log.embeds.linked_node.data.attributes.public,
-                  subjects: log.embeds.linked_node.data.attributes.subjects,
-                }
+              ? BaseNodeMapper.getNodeData(log.embeds.linked_node.data)
               : undefined,
           }
         : undefined,
     };
   }
 
-  static fromGetActivityLogsResponse(logs: ResponseJsonApi<ActivityLogJsonApi[]>): PaginatedData<ActivityLog[]> {
+  static fromGetActivityLogsResponse(logs: ActivityLogsResponseJsonApi): PaginatedData<ActivityLogModel[]> {
     const isAnonymous = logs.meta.anonymous ?? false;
     return {
       data: logs.data.map((log) => this.fromActivityLogJsonApi(log, isAnonymous)),
@@ -165,7 +98,7 @@ export class ActivityLogsMapper {
     };
   }
 
-  private static fromContributorJsonApi(contributor: LogContributorJsonApi): LogContributor {
+  private static fromContributorJsonApi(contributor: LogContributorJsonApi): LogContributorModel {
     return {
       id: contributor.id,
       fullName: contributor.full_name,
diff --git a/src/app/shared/mappers/addon.mapper.ts b/src/app/shared/mappers/addon.mapper.ts
index 65d90eece..3038872d4 100644
--- a/src/app/shared/mappers/addon.mapper.ts
+++ b/src/app/shared/mappers/addon.mapper.ts
@@ -1,22 +1,37 @@
 import { AuthorizedAccountType, ConfiguredAddonType } from '../enums/addon-type.enum';
 import { AddonCategory } from '../enums/addons-category.enum';
 import { AddonModel } from '../models/addons/addon.model';
+import { IncludedAddonData } from '../models/addons/addon-included-json-api.model';
 import {
-  AddonGetResponseJsonApi,
-  AuthorizedAddonGetResponseJsonApi,
-  ConfiguredAddonGetResponseJsonApi,
-  IncludedAddonData,
-} from '../models/addons/addon-json-api.model';
-import {
-  OperationInvocationResponseJsonApi,
+  OperationInvocationDataJsonApi,
   StorageItemResponseJsonApi,
 } from '../models/addons/addon-operations-json-api.model';
+import { ResourceReferenceJsonApi, UserReferenceJsonApi } from '../models/addons/addon-reference-json-api.model';
 import { AuthorizedAccountModel } from '../models/addons/authorized-account.model';
+import { AuthorizedAddonDataJsonApi } from '../models/addons/authorized-addon-json-api.model';
 import { ConfiguredAddonModel } from '../models/addons/configured-addon.model';
+import { ConfiguredAddonDataJsonApi } from '../models/addons/configured-addon-json-api.model';
+import { AddonGetDataJsonApi } from '../models/addons/external-addon-json-api.model';
 import { OperationInvocation } from '../models/addons/operation-invocation.model';
+import { ResourceReferenceModel } from '../models/addons/resource-reference.model';
+import { UserReferenceModel } from '../models/addons/user-reference.model';
 
 export class AddonMapper {
-  static fromResponse(response: AddonGetResponseJsonApi): AddonModel {
+  static fromUserReferenceResponse(response: UserReferenceJsonApi): UserReferenceModel {
+    return {
+      id: response.id,
+      userUri: response.attributes.user_uri,
+    };
+  }
+
+  static fromResourceReferenceResponse(response: ResourceReferenceJsonApi): ResourceReferenceModel {
+    return {
+      id: response.id,
+      resourceUri: response.attributes.resource_uri,
+    };
+  }
+
+  static fromResponse(response: AddonGetDataJsonApi): AddonModel {
     return {
       type: response.type,
       id: response.id,
@@ -35,7 +50,7 @@ export class AddonMapper {
   }
 
   static fromAuthorizedAddonResponse(
-    response: AuthorizedAddonGetResponseJsonApi,
+    response: AuthorizedAddonDataJsonApi,
     included?: IncludedAddonData[]
   ): AuthorizedAccountModel {
     const externalServiceData =
@@ -81,7 +96,7 @@ export class AddonMapper {
   }
 
   static fromConfiguredAddonResponse(
-    response: ConfiguredAddonGetResponseJsonApi,
+    response: ConfiguredAddonDataJsonApi,
     included?: IncludedAddonData[]
   ): ConfiguredAddonModel {
     const isLinkAddon = response.type === ConfiguredAddonType.LINK;
@@ -120,7 +135,7 @@ export class AddonMapper {
     };
   }
 
-  static fromOperationInvocationResponse(response: OperationInvocationResponseJsonApi): OperationInvocation {
+  static fromOperationInvocationResponse(response: OperationInvocationDataJsonApi): OperationInvocation {
     const operationResult = response.attributes.operation_result;
     // [NM] TODO: Double check this condition
     // const isOperationResult = 'items' in operationResult && 'total_count' in operationResult;
diff --git a/src/app/shared/mappers/banner.mapper.ts b/src/app/shared/mappers/banner.mapper.ts
index c852da082..32532069c 100644
--- a/src/app/shared/mappers/banner.mapper.ts
+++ b/src/app/shared/mappers/banner.mapper.ts
@@ -1,5 +1,5 @@
 import { BannerModel } from '../../core/components/osf-banners/models/banner.model';
-import { BannerJsonApi } from '../models/banner.json-api.model';
+import { BannerJsonApi } from '../models/banner-json-api.model';
 
 /**
  * A utility class for transforming banner data from a JSON:API format
diff --git a/src/app/shared/mappers/citations.mapper.ts b/src/app/shared/mappers/citations.mapper.ts
index 5ae176049..529567bfe 100644
--- a/src/app/shared/mappers/citations.mapper.ts
+++ b/src/app/shared/mappers/citations.mapper.ts
@@ -1,14 +1,14 @@
 import { CITATION_TITLES } from '../constants/default-citation-titles.const';
 import { CitationTypes } from '../enums/citation-types.enum';
 import { CitationStyle } from '../models/citations/citation-style.model';
-import { CitationStyleJsonApi } from '../models/citations/citation-style-json-api.model';
+import { CitationStyleDataJsonApi } from '../models/citations/citation-style-json-api.model';
 import { CustomCitationPayload } from '../models/citations/custom-citation-payload.model';
 import { CustomCitationPayloadJsonApi } from '../models/citations/custom-citation-payload-json-api.model';
 import { StyledCitation } from '../models/citations/styled-citation.model';
-import { StyledCitationJsonApi } from '../models/citations/styled-citation-json-api.model';
+import { StyledCitationDataJsonApi } from '../models/citations/styled-citation-json-api.model';
 
 export class CitationsMapper {
-  static fromGetCitationStylesResponse(response: CitationStyleJsonApi[]): CitationStyle[] {
+  static fromGetCitationStylesResponse(response: CitationStyleDataJsonApi[]): CitationStyle[] {
     return response.map((style) => ({
       id: style.id,
       type: style.type,
@@ -19,7 +19,7 @@ export class CitationsMapper {
     }));
   }
 
-  static fromGetStyledCitationResponse(response: StyledCitationJsonApi): StyledCitation {
+  static fromGetStyledCitationResponse(response: StyledCitationDataJsonApi): StyledCitation {
     return {
       id: response.id,
       type: response.type,
diff --git a/src/app/shared/mappers/collections/collections.mapper.ts b/src/app/shared/mappers/collections/collections.mapper.ts
index fb6191df9..3b79793ca 100644
--- a/src/app/shared/mappers/collections/collections.mapper.ts
+++ b/src/app/shared/mappers/collections/collections.mapper.ts
@@ -1,32 +1,34 @@
+import { CedarMetadataMapper } from '@osf/features/metadata/mappers';
 import {
   CollectionSubmissionReviewAction,
   CollectionSubmissionReviewActionJsonApi,
 } from '@osf/features/moderation/models';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
+import { replaceBadEncodedChars } from '@osf/shared/helpers/format-bad-encoding.helper';
+import { CollectionDetails } from '@osf/shared/models/collections/collection-details.model';
+import { CollectionDetailsDataJsonApi } from '@osf/shared/models/collections/collection-details-json-api.model';
+import { CollectionProvider } from '@osf/shared/models/collections/collection-provider.model';
+import { CollectionProviderDataJsonApi } from '@osf/shared/models/collections/collection-provider-json-api.model';
 import { CollectionSubmissionPayload } from '@osf/shared/models/collections/collection-submission-payload.model';
 import { CollectionSubmissionPayloadJsonApi } from '@osf/shared/models/collections/collection-submission-payload-json-api.model';
 import {
-  CollectionDetails,
   CollectionProjectSubmission,
-  CollectionProvider,
   CollectionSubmission,
   CollectionSubmissionWithGuid,
-} from '@osf/shared/models/collections/collections.model';
+} from '@osf/shared/models/collections/collection-submissions.model';
 import {
-  CollectionDetailsResponseJsonApi,
-  CollectionProviderResponseJsonApi,
-  CollectionSubmissionJsonApi,
-  CollectionSubmissionWithGuidJsonApi,
-} from '@osf/shared/models/collections/collections-json-api.model';
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
+  CollectionSubmissionDataJsonApi,
+  CollectionSubmissionWithGuidDataJsonApi,
+  CollectionSubmissionWithGuidListResponseJsonApi,
+} from '@osf/shared/models/collections/collection-submissions-json-api.model';
 import { ContributorModel } from '@osf/shared/models/contributors/contributor.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
-import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { ProjectsMapper } from '../projects';
 import { UserMapper } from '../user';
 
 export class CollectionsMapper {
-  static fromGetCollectionProviderResponse(response: CollectionProviderResponseJsonApi): CollectionProvider {
+  static fromGetCollectionProviderResponse(response: CollectionProviderDataJsonApi): CollectionProvider {
     return {
       id: response.id,
       type: response.type,
@@ -55,8 +57,8 @@ export class CollectionsMapper {
       permissions: response.attributes.permissions,
       reviewsWorkflow: response.attributes.reviews_workflow,
       primaryCollection: {
-        id: response.relationships.primary_collection.data.id,
-        type: response.relationships.primary_collection.data.type,
+        id: response.relationships.primary_collection.data!.id,
+        type: response.relationships.primary_collection.data!.type,
       },
       defaultLicenseId: response.attributes?.default_license_id,
       brand: response.embeds.brand.data
@@ -71,11 +73,13 @@ export class CollectionsMapper {
             backgroundColor: response.embeds.brand.data.attributes.background_color,
           }
         : null,
-      requiredMetadataTemplate: response.embeds.required_metadata_template?.data ?? null,
+      requiredMetadataTemplate: response.embeds.required_metadata_template?.data
+        ? CedarMetadataMapper.fromTemplate(response.embeds.required_metadata_template.data)
+        : null,
     };
   }
 
-  static fromGetCollectionDetailsResponse(response: CollectionDetailsResponseJsonApi): CollectionDetails {
+  static fromGetCollectionDetailsResponse(response: CollectionDetailsDataJsonApi): CollectionDetails {
     return {
       id: response.id,
       type: response.type,
@@ -89,7 +93,7 @@ export class CollectionsMapper {
     };
   }
 
-  static fromCurrentSubmissionResponse(submission: CollectionSubmissionJsonApi): CollectionSubmission {
+  static fromCurrentSubmissionResponse(submission: CollectionSubmissionDataJsonApi): CollectionSubmission {
     return {
       id: submission.id,
       type: submission.type,
@@ -102,7 +106,7 @@ export class CollectionsMapper {
   }
 
   static fromGetCollectionSubmissionsResponse(
-    response: ResponseJsonApi<CollectionSubmissionWithGuidJsonApi[]>
+    response: CollectionSubmissionWithGuidListResponseJsonApi
   ): PaginatedData<CollectionSubmissionWithGuid[]> {
     return {
       data: response.data.map((submission) => {
@@ -129,7 +133,7 @@ export class CollectionsMapper {
         } as CollectionSubmissionWithGuid;
       }),
       totalCount: response.meta.total,
-      pageSize: response.meta.per_page,
+      pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
     };
   }
 
@@ -151,7 +155,7 @@ export class CollectionsMapper {
     }));
   }
 
-  static getProjectSubmission(data: CollectionSubmissionWithGuidJsonApi): CollectionProjectSubmission {
+  static getProjectSubmission(data: CollectionSubmissionWithGuidDataJsonApi): CollectionProjectSubmission {
     const project = ProjectsMapper.fromProjectResponse(data.embeds.guid.data);
     const submission: CollectionSubmissionWithGuid = {
       id: data.id,
diff --git a/src/app/shared/mappers/contributors/contributors.mapper.ts b/src/app/shared/mappers/contributors/contributors.mapper.ts
index 97f400f7d..72ed07061 100644
--- a/src/app/shared/mappers/contributors/contributors.mapper.ts
+++ b/src/app/shared/mappers/contributors/contributors.mapper.ts
@@ -1,14 +1,8 @@
 import { AddContributorType } from '@osf/shared/enums/contributors/add-contributor-type.enum';
-import { ContributorPermission } from '@osf/shared/enums/contributors/contributor-permission.enum';
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { ContributorModel, ContributorShortInfoModel } from '@osf/shared/models/contributors/contributor.model';
 import { ContributorAddModel } from '@osf/shared/models/contributors/contributor-add.model';
-import {
-  ContributorAddRequestModel,
-  ContributorDataJsonApi,
-} from '@osf/shared/models/contributors/contributor-response-json-api.model';
-import { PaginatedData } from '@osf/shared/models/paginated-data.model';
-import { UserDataJsonApi } from '@osf/shared/models/user/user-json-api.model';
+import { ContributorAddRequestModel } from '@osf/shared/models/contributors/contributor-add-request.model';
+import { ContributorDataJsonApi } from '@osf/shared/models/contributors/contributor-response-json-api.model';
 
 export class ContributorsMapper {
   static getContributors(response: ContributorDataJsonApi[] | undefined): ContributorModel[] {
@@ -57,22 +51,6 @@ export class ContributorsMapper {
     }));
   }
 
-  static getPaginatedUsers(response: ResponseJsonApi<UserDataJsonApi[]>): PaginatedData<ContributorAddModel[]> {
-    return {
-      data: response.data.map(
-        (user) =>
-          ({
-            id: user.id,
-            fullName: user.attributes.full_name,
-            isBibliographic: true,
-            permission: ContributorPermission.Write,
-          }) as ContributorAddModel
-      ),
-      totalCount: response.meta.total,
-      pageSize: response.meta.per_page,
-    };
-  }
-
   static toContributorAddRequest(
     model: ContributorAddModel,
     type = AddContributorType.Registered,
diff --git a/src/app/shared/mappers/institutions/institutions.mapper.ts b/src/app/shared/mappers/institutions/institutions.mapper.ts
index 172faacf8..531086f0c 100644
--- a/src/app/shared/mappers/institutions/institutions.mapper.ts
+++ b/src/app/shared/mappers/institutions/institutions.mapper.ts
@@ -1,13 +1,15 @@
+import { Embed } from '@osf/shared/models/common/json-api/embeds.model';
 import {
   InstitutionDataJsonApi,
   InstitutionsJsonApiResponse,
-  InstitutionsWithMetaJsonApiResponse,
 } from '@osf/shared/models/institutions/institution-json-api.model';
 import { Institution, InstitutionsWithTotalCount } from '@osf/shared/models/institutions/institutions.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 export class InstitutionsMapper {
-  static fromInstitutionsResponse(response: InstitutionsJsonApiResponse): Institution[] {
+  static fromInstitutionsResponse(
+    response: InstitutionsJsonApiResponse | Embed<InstitutionDataJsonApi[]>
+  ): Institution[] {
     return response.data.map((data) => this.fromInstitutionData(data));
   }
 
@@ -29,7 +31,7 @@ export class InstitutionsMapper {
     };
   }
 
-  static fromResponseWithMeta(response: InstitutionsWithMetaJsonApiResponse): InstitutionsWithTotalCount {
+  static fromResponseWithMeta(response: InstitutionsJsonApiResponse): InstitutionsWithTotalCount {
     return {
       data: this.fromInstitutionsResponse(response),
       total: response.meta.total,
diff --git a/src/app/shared/mappers/my-resources.mapper.ts b/src/app/shared/mappers/my-resources.mapper.ts
index d7caf4a08..b28f4241b 100644
--- a/src/app/shared/mappers/my-resources.mapper.ts
+++ b/src/app/shared/mappers/my-resources.mapper.ts
@@ -1,6 +1,7 @@
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
-import { MyResourcesItem, MyResourcesItemGetResponseJsonApi } from '../models/my-resources/my-resources.model';
+import { MyResourcesItem } from '../models/my-resources/my-resources-item.model';
+import { MyResourcesItemGetResponseJsonApi } from '../models/my-resources/my-resources-json-api.model';
 
 import { ContributorsMapper } from './contributors';
 
diff --git a/src/app/shared/mappers/nodes/base-node.mapper.ts b/src/app/shared/mappers/nodes/base-node.mapper.ts
index 24dd37b15..4480bff6f 100644
--- a/src/app/shared/mappers/nodes/base-node.mapper.ts
+++ b/src/app/shared/mappers/nodes/base-node.mapper.ts
@@ -1,7 +1,8 @@
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { BaseNodeModel, NodeModel } from '@osf/shared/models/nodes/base-node.model';
 import { BaseNodeDataJsonApi } from '@osf/shared/models/nodes/base-node-data-json-api.model';
 import { NodeShortInfoModel } from '@osf/shared/models/nodes/node-with-children.model';
+import { NodesResponseJsonApi } from '@osf/shared/models/nodes/nodes-json-api.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
@@ -12,11 +13,11 @@ export class BaseNodeMapper {
     return data.map((item) => this.getNodeData(item));
   }
 
-  static getNodesWithEmbedsAndTotalData(response: ResponseJsonApi<BaseNodeDataJsonApi[]>): PaginatedData<NodeModel[]> {
+  static getNodesWithEmbedsAndTotalData(response: NodesResponseJsonApi): PaginatedData<NodeModel[]> {
     return {
       data: BaseNodeMapper.getNodesWithEmbedContributors(response.data),
       totalCount: response.meta.total,
-      pageSize: response.meta.per_page,
+      pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
     };
   }
 
@@ -34,7 +35,7 @@ export class BaseNodeMapper {
       title: replaceBadEncodedChars(item.attributes.title),
       isPublic: item.attributes.public,
       permissions: item.attributes.current_user_permissions,
-      parentId: item.relationships.parent?.data?.id,
+      parentId: item.relationships?.parent?.data?.id,
     }));
   }
 
@@ -62,7 +63,7 @@ export class BaseNodeMapper {
       currentUserIsContributor: data.attributes.current_user_is_contributor,
       wikiEnabled: data.attributes.wiki_enabled,
       customCitation: data.attributes.custom_citation || undefined,
-      rootParentId: data.relationships.root?.data?.id,
+      rootParentId: data.relationships?.root?.data?.id,
       parent: data.embeds?.parent?.data ? this.getNodeData(data.embeds?.parent.data) : undefined,
     };
   }
@@ -84,7 +85,7 @@ export class BaseNodeMapper {
     const parent = allNodes.find((n) => n.id === parentId);
     if (!parent) return [];
 
-    const directChildren = allNodes.filter((node) => node.relationships.parent?.data?.id === parentId);
+    const directChildren = allNodes.filter((node) => node.relationships?.parent?.data?.id === parentId);
 
     const descendants = directChildren.flatMap((child) => this.getAllDescendants(allNodes, child.id));
 
@@ -95,7 +96,7 @@ export class BaseNodeMapper {
     const node = allNodes.find((n) => n.id === nodeId);
     if (!node) return [];
 
-    const parentId = node.relationships.parent?.data?.id;
+    const parentId = node.relationships?.parent?.data?.id;
     if (!parentId) return [node];
 
     const ancestors = this.getAllAncestors(allNodes, parentId);
diff --git a/src/app/shared/mappers/regions/regions-mapper.ts b/src/app/shared/mappers/regions/regions-mapper.ts
index a06e609a8..05f2be4d0 100644
--- a/src/app/shared/mappers/regions/regions-mapper.ts
+++ b/src/app/shared/mappers/regions/regions-mapper.ts
@@ -1,5 +1,5 @@
 import { IdNameModel } from '@osf/shared/models/common/id-name.model';
-import { RegionDataJsonApi, RegionsResponseJsonApi } from '@osf/shared/models/regions/regions.json-api.model';
+import { RegionDataJsonApi, RegionsResponseJsonApi } from '@osf/shared/models/regions/regions-json-api.model';
 
 export class RegionsMapper {
   static fromRegionsResponseJsonApi(response: RegionsResponseJsonApi): IdNameModel[] {
diff --git a/src/app/shared/mappers/registration/registration.mapper.ts b/src/app/shared/mappers/registration/registration.mapper.ts
index 740b6f8b1..b35f2133f 100644
--- a/src/app/shared/mappers/registration/registration.mapper.ts
+++ b/src/app/shared/mappers/registration/registration.mapper.ts
@@ -1,4 +1,5 @@
 import { RegistryStatus } from '@osf/shared/enums/registry-status.enum';
+import { SchemaResponseDataJsonApi } from '@osf/shared/models/registration/schema-response-json-api.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 import { DraftRegistrationModel } from '@shared/models/registration/draft-registration.model';
 import { RegistrationModel } from '@shared/models/registration/registration.model';
@@ -6,7 +7,6 @@ import { RegistrationCard } from '@shared/models/registration/registration-card.
 import {
   DraftRegistrationDataJsonApi,
   RegistrationDataJsonApi,
-  SchemaResponseDataJsonApi,
 } from '@shared/models/registration/registration-json-api.model';
 import { SchemaResponse } from '@shared/models/registration/schema-response.model';
 
diff --git a/src/app/shared/mappers/user/user.mapper.ts b/src/app/shared/mappers/user/user.mapper.ts
index f3df82497..7b39e2b14 100644
--- a/src/app/shared/mappers/user/user.mapper.ts
+++ b/src/app/shared/mappers/user/user.mapper.ts
@@ -32,7 +32,7 @@ export class UserMapper {
       employment: user.attributes.employment,
       iri: user.links.iri,
       social: user.attributes.social,
-      external_identity: user.attributes.external_identity,
+      externalIdentity: user.attributes.external_identity,
       defaultRegionId: user.relationships?.default_region?.data?.id,
       canViewReviews: user.attributes.can_view_reviews === true, // [NS] Do not simplify it
       timezone: user.attributes.timezone,
diff --git a/src/app/shared/mappers/view-only-links.mapper.ts b/src/app/shared/mappers/view-only-links.mapper.ts
index bbd57b0cc..feac69f65 100644
--- a/src/app/shared/mappers/view-only-links.mapper.ts
+++ b/src/app/shared/mappers/view-only-links.mapper.ts
@@ -1,3 +1,4 @@
+import { DEFAULT_TABLE_PARAMS } from '../constants/default-table-params.constants';
 import { replaceBadEncodedChars } from '../helpers/format-bad-encoding.helper';
 import {
   PaginatedViewOnlyLinksModel,
@@ -45,9 +46,9 @@ export class ViewOnlyLinksMapper {
     return {
       items,
       total: response.meta.total,
-      perPage: response.meta.per_page,
-      next: response.links.next,
-      prev: response.links.prev,
+      perPage: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
+      next: response?.links?.next,
+      prev: response?.links?.prev,
     };
   }
 
diff --git a/src/app/shared/mappers/wiki/wiki.mapper.ts b/src/app/shared/mappers/wiki/wiki.mapper.ts
index 63b8a7f73..a522efcec 100644
--- a/src/app/shared/mappers/wiki/wiki.mapper.ts
+++ b/src/app/shared/mappers/wiki/wiki.mapper.ts
@@ -1,30 +1,12 @@
-import { TranslateService } from '@ngx-translate/core';
-
 import { UserMapper } from '@osf/shared/mappers/user/user.mapper';
-import {
-  ComponentsWikiGetResponse,
-  HomeWiki,
-  HomeWikiGetResponse,
-  WikiGetResponse,
-  WikiModel,
-  WikiVersion,
-  WikiVersionJsonApi,
-} from '@osf/shared/models/wiki/wiki.model';
+import { BaseNodeDataJsonApi } from '@osf/shared/models/nodes/base-node-data-json-api.model';
+import { HomeWiki, WikiModel, WikiVersion } from '@osf/shared/models/wiki/wiki.model';
+import { WikiDataJsonApi, WikiVersionJsonApi } from '@osf/shared/models/wiki/wiki-json-api.model';
 import { ComponentWiki } from '@osf/shared/stores/wiki';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 export class WikiMapper {
-  private static translate: TranslateService;
-
-  static fromCreateWikiResponse(response: WikiGetResponse): WikiModel {
-    return {
-      id: response.id,
-      name: response.attributes.name,
-      kind: response.attributes.kind,
-    };
-  }
-
-  static fromGetHomeWikiResponse(response: HomeWikiGetResponse): HomeWiki {
+  static fromGetHomeWikiResponse(response: WikiDataJsonApi): HomeWiki {
     return {
       id: response.id,
       name: response.attributes.name,
@@ -33,7 +15,7 @@ export class WikiMapper {
     };
   }
 
-  static fromGetWikiResponse(response: WikiGetResponse): WikiModel {
+  static fromGetWikiResponse(response: WikiDataJsonApi): WikiModel {
     return {
       id: response.id,
       name: response.attributes.name,
@@ -41,7 +23,7 @@ export class WikiMapper {
     };
   }
 
-  static fromGetComponentsWikiResponse(response: ComponentsWikiGetResponse): ComponentWiki {
+  static fromGetComponentsWikiResponse(response: BaseNodeDataJsonApi): ComponentWiki {
     return {
       id: response.id,
       title: replaceBadEncodedChars(response.attributes.title),
@@ -57,7 +39,7 @@ export class WikiMapper {
     };
   }
 
-  static fromCreateWikiVersionResponse(response: WikiGetResponse): WikiModel {
+  static fromCreateWikiVersionResponse(response: WikiDataJsonApi): WikiModel {
     return {
       id: response.id,
       name: response.attributes.name,
diff --git a/src/app/shared/models/activity-logs/activity-log-with-display.model.ts b/src/app/shared/models/activity-logs/activity-log-with-display.model.ts
index 153591fbe..ddf3fd6e2 100644
--- a/src/app/shared/models/activity-logs/activity-log-with-display.model.ts
+++ b/src/app/shared/models/activity-logs/activity-log-with-display.model.ts
@@ -1,7 +1,7 @@
 import { SafeHtml } from '@angular/platform-browser';
 
-import { ActivityLog } from './activity-logs.model';
+import { ActivityLogModel } from './activity-logs.model';
 
-export interface ActivityLogWithDisplay extends ActivityLog {
+export interface ActivityLogWithDisplayModel extends ActivityLogModel {
   formattedActivity?: SafeHtml;
 }
diff --git a/src/app/shared/models/activity-logs/activity-logs-json-api.model.ts b/src/app/shared/models/activity-logs/activity-logs-json-api.model.ts
index 6265ba8ee..0792556f5 100644
--- a/src/app/shared/models/activity-logs/activity-logs-json-api.model.ts
+++ b/src/app/shared/models/activity-logs/activity-logs-json-api.model.ts
@@ -1,191 +1,128 @@
-export interface ActivityLogJsonApi {
+import { Embed } from '../common/json-api/embeds.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
+import { BaseNodeDataJsonApi } from '../nodes/base-node-data-json-api.model';
+import { UserDataJsonApi } from '../user/user-json-api.model';
+
+export type ActivityLogsResponseJsonApi = ListResponse<ActivityLogDataJsonApi>;
+
+export interface ActivityLogDataJsonApi extends JsonApiResource<'activity-logs', ActivityLogAttributesJsonApi> {
+  embeds?: ActivityLogEmbedsJsonApi;
+}
+
+interface ActivityLogAttributesJsonApi {
+  action: string;
+  date: string;
+  foreign_user: string | null;
+  params: ActivityLogParamsJsonApi;
+}
+
+interface ActivityLogParamsJsonApi {
+  addon?: string;
+  anonymous_link?: boolean;
+  contributors?: LogContributorJsonApi[];
+  destination?: ActivityLogDestinationJsonApi;
+  file?: ActivityLogFileJsonApi;
+  github_user?: string;
+  identifiers?: ActivityLogIdentifiersJsonApi;
+  institution?: ActivityLogInstitutionJsonApi;
+  kind?: string;
+  license?: string;
+  old_page?: string;
+  page?: string;
+  page_id?: string;
+  params_node: ActivityLogParamsNodeJsonApi;
+  params_project: null;
+  pointer: PointerJsonApi | null;
+  preprint?: string;
+  preprint_provider?: string | ActivityLogPreprintProviderJsonApi | null;
+  source?: ActivityLogSourceJsonApi;
+  tag?: string;
+  template_node?: ActivityLogTemplateNodeJsonApi;
+  title_new?: string;
+  title_original?: string;
+  updated_fields?: Record<string, ActivityLogUpdatedFieldJsonApi>;
+  urls?: ActivityLogUrlsJsonApi;
+  value?: string;
+  version?: string;
+  wiki?: ActivityLogWikiJsonApi;
+}
+
+interface ActivityLogEmbedsJsonApi {
+  linked_node?: Embed<BaseNodeDataJsonApi>;
+  original_node?: Embed<BaseNodeDataJsonApi>;
+  user?: Embed<UserDataJsonApi>;
+}
+
+interface ActivityLogDestinationJsonApi {
+  addon: string;
+  materialized: string;
+  url: string;
+}
+
+interface ActivityLogFileJsonApi {
+  name: string;
+  url: string;
+}
+
+interface ActivityLogIdentifiersJsonApi {
+  ark?: string;
+  doi?: string;
+}
+
+interface ActivityLogInstitutionJsonApi {
   id: string;
-  type: string;
-  attributes: {
-    action: string;
-    date: string;
-    foreign_user: string | null;
-    params: {
-      contributors?: LogContributorJsonApi[];
-      license?: string;
-      tag?: string;
-      institution?: {
-        id: string;
-        name: string;
-      };
-      params_node: {
-        id: string;
-        title: string;
-      };
-      params_project: null;
-      pointer: PointerJsonApi | null;
-      template_node?: {
-        id: string;
-        url: string;
-        title: string;
-      };
-      preprint_provider?:
-        | string
-        | {
-            url: string;
-            name: string;
-          }
-        | null;
-      addon?: string;
-      anonymous_link?: boolean;
-      file?: {
-        name: string;
-        url: string;
-      };
-      wiki?: {
-        name: string;
-        url: string;
-      };
-      destination?: {
-        materialized: string;
-        addon: string;
-        url: string;
-      };
-      identifiers?: {
-        doi?: string;
-        ark?: string;
-      };
-      kind?: string;
-      old_page?: string;
-      page?: string;
-      page_id?: string;
-      path?: string;
-      urls?: {
-        view: string;
-      };
-      preprint?: string;
-      source?: {
-        materialized: string;
-        addon: string;
-      };
-      title_new?: string;
-      title_original?: string;
-      updated_fields?: Record<
-        string,
-        {
-          new: string;
-          old: string;
-        }
-      >;
-      value?: string;
-      version?: string;
-      github_user?: string;
-    };
-  };
-  embeds?: {
-    original_node?: {
-      data: OriginalNodeEmbedsData;
-    };
-    user?: {
-      data: UserEmbedsData;
-    };
-    linked_node?: {
-      data: LinkedNodeEmbedsData;
-    };
-  };
-  meta: {
-    total: number;
-    anonymous: boolean;
-  };
+  name: string;
 }
 
-interface PointerJsonApi {
-  category: string;
+interface ActivityLogParamsNodeJsonApi {
   id: string;
   title: string;
+}
+
+interface ActivityLogPreprintProviderJsonApi {
+  name: string;
   url: string;
 }
 
-interface OriginalNodeEmbedsData {
-  id: string;
-  type: string;
-  attributes: {
-    title: string;
-    description: string;
-    category: string;
-    custom_citation: string | null;
-    date_created: string;
-    date_modified: string;
-    registration: boolean;
-    preprint: boolean;
-    fork: boolean;
-    collection: boolean;
-    tags: string[];
-    access_requests_enabled: boolean;
-    node_license: {
-      copyright_holders: string[];
-      year: string | null;
-    } | null;
-    current_user_can_comment: boolean;
-    current_user_permissions: string[];
-    current_user_is_contributor: boolean;
-    current_user_is_contributor_or_group_member: boolean;
-    wiki_enabled: boolean;
-    public: boolean;
-    subjects: { id: string; text: string }[][];
-  };
-}
-
-interface UserEmbedsData {
-  id: string;
-  type: string;
-  attributes: {
-    full_name: string;
-    given_name: string;
-    middle_names: string;
-    family_name: string;
-    suffix: string;
-    date_registered: string;
-    active: boolean;
-    timezone: string;
-    locale: string;
-  };
-}
-
-interface LinkedNodeEmbedsData {
+interface ActivityLogSourceJsonApi {
+  addon: string;
+  materialized: string;
+}
+
+interface ActivityLogTemplateNodeJsonApi {
   id: string;
-  type: string;
-  attributes: {
-    title: string;
-    description: string;
-    category: string;
-    custom_citation: string | null;
-    date_created: string;
-    date_modified: string;
-    registration: boolean;
-    preprint: boolean;
-    fork: boolean;
-    collection: boolean;
-    tags: string[];
-    access_requests_enabled: boolean;
-    node_license: {
-      copyright_holders: string[];
-      year: string | null;
-    } | null;
-    current_user_can_comment: boolean;
-    current_user_permissions: string[];
-    current_user_is_contributor: boolean;
-    current_user_is_contributor_or_group_member: boolean;
-    wiki_enabled: boolean;
-    public: boolean;
-    subjects: {
-      id: string;
-      text: string;
-    }[][];
-  };
+  title: string;
+  url: string;
+}
+
+interface ActivityLogUpdatedFieldJsonApi {
+  new: string;
+  old: string;
+}
+
+interface ActivityLogUrlsJsonApi {
+  view: string;
+}
+
+interface ActivityLogWikiJsonApi {
+  name: string;
+  url: string;
 }
 
 export interface LogContributorJsonApi {
-  id: string;
+  active: boolean;
+  family_name: string;
   full_name: string;
   given_name: string;
+  id: string;
   middle_names: string;
-  family_name: string;
   unregistered_name: string | null;
-  active: boolean;
+}
+
+interface PointerJsonApi {
+  category: string;
+  id: string;
+  title: string;
+  url: string;
 }
diff --git a/src/app/shared/models/activity-logs/activity-logs.model.ts b/src/app/shared/models/activity-logs/activity-logs.model.ts
index 1de7efa46..133b1d5e2 100644
--- a/src/app/shared/models/activity-logs/activity-logs.model.ts
+++ b/src/app/shared/models/activity-logs/activity-logs.model.ts
@@ -1,123 +1,115 @@
 import { IdNameModel } from '../common/id-name.model';
-import { LicensesOption } from '../license/license.model';
+import { BaseNodeModel } from '../nodes/base-node.model';
+import { UserModel } from '../user/user.model';
 
-export interface ActivityLog {
+export interface ActivityLogModel {
   id: string;
   type: string;
   action: string;
   date: string;
   foreignUser: string | null;
-  params: {
-    contributors: LogContributor[];
-    license?: string;
-    tag?: string;
-    institution?: IdNameModel;
-    paramsNode: { id: string; title: string };
-    paramsProject: null;
-    pointer: Pointer | null;
-    template_node?: { id: string; url: string; title: string } | null;
-    preprintProvider?: string | { url: string; name: string } | null;
-    addon?: string;
-    anonymousLink?: boolean;
-    file?: { name: string; url: string };
-    wiki?: { name: string; url: string };
-    destination?: { materialized: string; addon: string; url: string };
-    identifiers?: { doi?: string; ark?: string };
-    kind?: string;
-    oldPage?: string;
-    page?: string;
-    pageId?: string;
-    path?: string;
-    urls?: { view: string };
-    preprint?: string;
-    source?: { materialized: string; addon: string };
-    titleNew?: string;
-    titleOriginal?: string;
-    updatedFields?: Record<string, { new: string; old: string }>;
-    value?: string;
-    version?: string;
-    githubUser?: string;
-  };
-  embeds?: {
-    originalNode?: OriginalNode;
-    user?: User;
-    linkedNode?: LinkedNode;
-  };
+  params: ActivityLogParamsModel;
+  embeds?: ActivityLogEmbedsModel;
   isAnonymous?: boolean;
 }
 
-interface Pointer {
-  category: string;
-  id: string;
-  title: string;
+interface ActivityLogEmbedsModel {
+  linkedNode?: BaseNodeModel;
+  originalNode?: BaseNodeModel;
+  user?: UserModel;
+}
+
+interface ActivityLogParamsModel {
+  addon?: string;
+  anonymousLink?: boolean;
+  contributors: LogContributorModel[];
+  destination?: ActivityLogDestinationModel;
+  file?: ActivityLogFileModel;
+  githubUser?: string;
+  identifiers?: ActivityLogIdentifiersModel;
+  institution?: IdNameModel;
+  kind?: string;
+  license?: string;
+  oldPage?: string;
+  page?: string;
+  pageId?: string;
+  paramsNode: ActivityLogParamsNodeModel;
+  paramsProject: null;
+  path?: string;
+  pointer: ActivityLogPointerModel | null;
+  preprint?: string;
+  preprintProvider?: string | ActivityLogPreprintProviderModel | null;
+  source?: ActivityLogSourceModel;
+  tag?: string;
+  templateNode?: ActivityLogTemplateNodeModel | null;
+  titleNew?: string;
+  titleOriginal?: string;
+  updatedFields?: Record<string, ActivityLogUpdatedFieldModel>;
+  urls?: ActivityLogUrlsModel;
+  value?: string;
+  version?: string;
+  wiki?: ActivityLogWikiModel;
+}
+
+interface ActivityLogDestinationModel {
+  addon: string;
+  materialized: string;
+  url: string;
+}
+
+interface ActivityLogFileModel {
+  name: string;
   url: string;
 }
 
-interface OriginalNode {
+interface ActivityLogIdentifiersModel {
+  ark?: string;
+  doi?: string;
+}
+
+interface ActivityLogParamsNodeModel {
   id: string;
-  type: string;
   title: string;
-  description: string;
-  category: string;
-  customCitation: string | null;
-  dateCreated: string;
-  dateModified: string;
-  registration: boolean;
-  preprint: boolean;
-  fork: boolean;
-  collection: boolean;
-  tags: string[];
-  accessRequestsEnabled: boolean;
-  nodeLicense: LicensesOption;
-  currentUserCanComment: boolean;
-  currentUserPermissions: string[];
-  currentUserIsContributor: boolean;
-  currentUserIsContributorOrGroupMember: boolean;
-  wikiEnabled: boolean;
-  public: boolean;
-  subjects: { id: string; text: string }[][];
 }
 
-interface User {
+interface ActivityLogPointerModel {
+  category: string;
   id: string;
-  type: string;
-  fullName: string;
-  givenName: string;
-  middleNames: string;
-  familyName: string;
-  suffix: string;
-  dateRegistered: string;
-  active: boolean;
-  timezone: string;
-  locale: string;
+  title: string;
+  url: string;
+}
+
+interface ActivityLogPreprintProviderModel {
+  name: string;
+  url: string;
 }
 
-interface LinkedNode {
+interface ActivityLogSourceModel {
+  addon: string;
+  materialized: string;
+}
+
+interface ActivityLogTemplateNodeModel {
   id: string;
-  type: string;
   title: string;
-  description: string;
-  category: string;
-  customCitation: string | null;
-  dateCreated: string;
-  dateModified: string;
-  registration: boolean;
-  preprint: boolean;
-  fork: boolean;
-  collection: boolean;
-  tags: string[];
-  accessRequestsEnabled: boolean;
-  nodeLicense: LicensesOption;
-  currentUserCanComment: boolean;
-  currentUserPermissions: string[];
-  currentUserIsContributor: boolean;
-  currentUserIsContributorOrGroupMember: boolean;
-  wikiEnabled: boolean;
-  public: boolean;
-  subjects: { id: string; text: string }[][];
+  url: string;
+}
+
+interface ActivityLogUpdatedFieldModel {
+  new: string;
+  old: string;
+}
+
+interface ActivityLogUrlsModel {
+  view: string;
+}
+
+interface ActivityLogWikiModel {
+  name: string;
+  url: string;
 }
 
-export interface LogContributor {
+export interface LogContributorModel {
   id: string;
   fullName: string;
   givenName: string;
diff --git a/src/app/shared/models/addons/addon-included-json-api.model.ts b/src/app/shared/models/addons/addon-included-json-api.model.ts
new file mode 100644
index 000000000..cd04fed30
--- /dev/null
+++ b/src/app/shared/models/addons/addon-included-json-api.model.ts
@@ -0,0 +1,5 @@
+export interface IncludedAddonData {
+  id: string;
+  type: string;
+  attributes: Record<string, unknown>;
+}
diff --git a/src/app/shared/models/addons/addon-json-api.model.ts b/src/app/shared/models/addons/addon-json-api.model.ts
deleted file mode 100644
index 37ebdebd7..000000000
--- a/src/app/shared/models/addons/addon-json-api.model.ts
+++ /dev/null
@@ -1,311 +0,0 @@
-export interface AddonGetResponseJsonApi {
-  type: string;
-  id: string;
-  attributes: {
-    auth_uri: string;
-    display_name: string;
-    supported_features: string[];
-    supported_resource_types?: string[];
-    external_service_name: string;
-    credentials_format: string;
-    wb_key: string;
-    icon_url: string;
-    redirect_url?: string;
-    configurable_api_root: boolean;
-    [key: string]: unknown;
-  };
-  relationships: {
-    addon_imp: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-  };
-}
-
-export interface AuthorizedAddonGetResponseJsonApi {
-  type: string;
-  id: string;
-  attributes: {
-    display_name: string;
-    api_base_url: string;
-    auth_url: string | null;
-    authorized_capabilities: string[];
-    authorized_operation_names: string[];
-    default_root_folder: string;
-    credentials_available: boolean;
-    oauth_token?: string;
-  };
-  relationships: {
-    account_owner: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    external_storage_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    external_citation_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    external_link_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-  };
-}
-
-export interface ConfiguredAddonGetResponseJsonApi {
-  type: string;
-  id: string;
-  attributes: {
-    display_name: string;
-    external_service_name: string;
-    root_folder?: string;
-    resource_type?: string;
-    target_id?: string;
-    target_url?: string;
-    connected_capabilities: string[];
-    connected_operation_names: string[];
-    current_user_is_owner: boolean;
-  };
-  relationships: {
-    base_account: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    external_storage_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    external_citation_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    external_link_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-  };
-}
-
-export interface IncludedAddonData {
-  type: string;
-  id: string;
-  attributes: Record<string, unknown>;
-  relationships?: Record<
-    string,
-    {
-      data?: {
-        type: string;
-        id: string;
-      };
-    }
-  >;
-}
-
-export interface UserReferenceJsonApi {
-  type: string;
-  id: string;
-  attributes: {
-    user_uri: string;
-  };
-}
-
-export interface ResourceReferenceJsonApi {
-  type: string;
-  id: string;
-  attributes: {
-    resource_uri: string;
-  };
-}
-
-export interface AuthorizedAddonRequestJsonApi {
-  data: {
-    id?: string;
-    attributes: {
-      display_name: string;
-      authorized_capabilities: string[];
-      api_base_url: string;
-      credentials: Record<string, unknown>;
-      initiate_oauth: boolean;
-      auth_url: string | null;
-      credentials_available: boolean;
-    };
-    relationships: {
-      account_owner: {
-        data: {
-          type: 'user-references';
-          id: string;
-        };
-      };
-      external_storage_service?: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      external_citation_service?: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      external_link_service?: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-    };
-    type: string;
-  };
-}
-
-export interface AuthorizedAddonResponseJsonApi {
-  type: string;
-  id: string;
-  attributes: {
-    display_name: string;
-    api_base_url: string;
-    auth_url: string;
-    authorized_capabilities: string[];
-    authorized_operation_names: string[];
-    default_root_folder: string;
-    credentials_available: boolean;
-  };
-  relationships: {
-    account_owner: {
-      data: {
-        type: 'user-references';
-        id: string;
-      };
-    };
-    external_storage_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    external_citation_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    external_link_service?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-  };
-}
-
-export interface ConfiguredAddonRequestJsonApi {
-  data: {
-    attributes: {
-      authorized_resource_uri: string;
-      display_name: string;
-      connected_capabilities: string[];
-      connected_operation_names: string[];
-      root_folder?: string | null;
-      target_id?: string | null;
-      target_url?: string | null;
-      external_service_name: string;
-    };
-    relationships: {
-      external_storage_service?: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      external_citation_service?: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      base_account: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      authorized_resource?: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      account_owner: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-    };
-    type: string;
-    id?: string;
-  };
-}
-
-export interface ConfiguredAddonResponseJsonApi {
-  data: {
-    type: string;
-    id: string;
-    attributes: {
-      display_name: string;
-      root_folder: string;
-      resource_type?: string;
-      target_id?: string;
-      target_url?: string;
-      connected_capabilities: string[];
-      connected_operation_names: string[];
-      current_user_is_owner: boolean;
-      external_service_name: string;
-    };
-    relationships: {
-      base_account: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      authorized_resource: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      external_storage_service: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-    };
-    links: {
-      self: string;
-    };
-  };
-}
diff --git a/src/app/shared/models/addons/addon-operations-json-api.model.ts b/src/app/shared/models/addons/addon-operations-json-api.model.ts
index bc979d21e..49ee50361 100644
--- a/src/app/shared/models/addons/addon-operations-json-api.model.ts
+++ b/src/app/shared/models/addons/addon-operations-json-api.model.ts
@@ -1,3 +1,43 @@
+import { ToOneRelData } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { DataResponse, ItemResponse } from '../common/json-api/responses.model';
+
+export type OperationInvocationResponseJsonApi = ItemResponse<OperationInvocationDataJsonApi>;
+
+export interface OperationInvocationDataJsonApi extends JsonApiResource<string, OperationInvocationAttributesJsonApi> {
+  relationships?: OperationInvocationRelationshipsJsonApi;
+}
+
+interface OperationInvocationAttributesJsonApi {
+  invocation_status: string;
+  operation_kwargs: StorageItemResponseJsonApi;
+  operation_result: OperationResultJsonApi | StorageItemResponseJsonApi;
+  created: string;
+  modified: string;
+  operation_name: string;
+}
+
+interface OperationInvocationRelationshipsJsonApi {
+  thru_account?: ToOneRelData;
+  thru_addon?: ToOneRelData;
+}
+
+export type OperationInvocationRequestJsonApi = DataResponse<OperationInvocationRequestDataJsonApi>;
+interface OperationInvocationRequestDataJsonApi {
+  type: string;
+  attributes: OperationInvocationRequestAttributesJsonApi;
+  relationships: OperationInvocationRelationshipsJsonApi;
+}
+
+interface OperationInvocationRequestAttributesJsonApi {
+  invocation_status: string | null;
+  operation_name: string;
+  operation_kwargs: Record<string, unknown>;
+  operation_result: Record<string, unknown>;
+  created: string | null;
+  modified: string | null;
+}
+
 export interface StorageItemResponseJsonApi {
   item_id?: string;
   item_name?: string;
@@ -15,61 +55,3 @@ export interface OperationResultJsonApi {
   first_sample_cursor?: string;
   next_sample_cursor?: string;
 }
-
-export interface OperationInvocationRequestJsonApi {
-  data: {
-    attributes: {
-      invocation_status: string | null;
-      operation_name: string;
-      operation_kwargs: Record<string, unknown>;
-      operation_result: Record<string, unknown>;
-      created: string | null;
-      modified: string | null;
-    };
-    relationships: {
-      thru_account?: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-      thru_addon?: {
-        data: {
-          type: string;
-          id: string;
-        };
-      };
-    };
-    type: string;
-  };
-}
-
-export interface OperationInvocationResponseJsonApi {
-  type: string;
-  id: string;
-  attributes: {
-    invocation_status: string;
-    operation_kwargs: StorageItemResponseJsonApi;
-    operation_result: OperationResultJsonApi | StorageItemResponseJsonApi;
-    created: string;
-    modified: string;
-    operation_name: string;
-  };
-  relationships?: {
-    thru_account?: {
-      data: {
-        type: string;
-        id: string;
-      };
-    };
-    thru_addon?: {
-      data: {
-        type: string;
-        id: string;
-      } | null;
-    };
-  };
-  links: {
-    self: string;
-  };
-}
diff --git a/src/app/shared/models/addons/addon-reference-json-api.model.ts b/src/app/shared/models/addons/addon-reference-json-api.model.ts
new file mode 100644
index 000000000..3eaedb862
--- /dev/null
+++ b/src/app/shared/models/addons/addon-reference-json-api.model.ts
@@ -0,0 +1,23 @@
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { DataResponse } from '../common/json-api/responses.model';
+
+export type ResourceReferenceResponseJsonApi = DataResponse<ResourceReferenceJsonApi[]>;
+export type UserReferenceResponseJsonApi = DataResponse<UserReferenceJsonApi[]>;
+
+export type UserReferenceJsonApi = JsonApiResource<'user-references', UserReferenceAttributesJsonApi>;
+
+export interface ResourceReferenceJsonApi extends JsonApiResource<
+  'resource-references',
+  ResourceReferenceAttributesJsonApi
+> {
+  links: Pick<ResourceLinksJsonApi, 'self'>;
+}
+
+interface UserReferenceAttributesJsonApi {
+  user_uri: string;
+}
+
+interface ResourceReferenceAttributesJsonApi {
+  resource_uri: string;
+}
diff --git a/src/app/shared/models/addons/authorized-addon-json-api.model.ts b/src/app/shared/models/addons/authorized-addon-json-api.model.ts
new file mode 100644
index 000000000..a20db9bf7
--- /dev/null
+++ b/src/app/shared/models/addons/authorized-addon-json-api.model.ts
@@ -0,0 +1,49 @@
+import { ToOneRelData } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { DataResponse, JsonApiResponse } from '../common/json-api/responses.model';
+
+import { IncludedAddonData } from './addon-included-json-api.model';
+
+export type AuthorizedAddonResponseJsonApi = JsonApiResponse<AuthorizedAddonDataJsonApi, IncludedAddonData[]>;
+export type AuthorizedAddonListResponseJsonApi = JsonApiResponse<AuthorizedAddonDataJsonApi[], IncludedAddonData[]>;
+
+export interface AuthorizedAddonDataJsonApi extends JsonApiResource<string, AuthorizedAddonAttributesJsonApi> {
+  relationships: AuthorizedAddonRelationshipsJsonApi;
+}
+
+export type AuthorizedAddonRequestJsonApi = DataResponse<AuthorizedAddonRequestDataJsonApi>;
+
+interface AuthorizedAddonRequestDataJsonApi {
+  id?: string;
+  type: string;
+  attributes: AuthorizedAddonRequestAttributesJsonApi;
+  relationships: AuthorizedAddonRelationshipsJsonApi;
+}
+
+interface AuthorizedAddonRequestAttributesJsonApi {
+  api_base_url: string;
+  auth_url: string | null;
+  authorized_capabilities: string[];
+  credentials: Record<string, unknown>;
+  credentials_available: boolean;
+  display_name: string;
+  initiate_oauth: boolean;
+}
+
+interface AuthorizedAddonAttributesJsonApi {
+  api_base_url: string;
+  auth_url: string | null;
+  authorized_capabilities: string[];
+  authorized_operation_names: string[];
+  credentials_available: boolean;
+  default_root_folder: string;
+  display_name: string;
+  oauth_token?: string;
+}
+
+interface AuthorizedAddonRelationshipsJsonApi {
+  account_owner: ToOneRelData<'user-references'>;
+  external_citation_service?: ToOneRelData<'external-citation-services'>;
+  external_link_service?: ToOneRelData<'external-link-services'>;
+  external_storage_service?: ToOneRelData<'external-storage-services'>;
+}
diff --git a/src/app/shared/models/addons/configured-addon-json-api.model.ts b/src/app/shared/models/addons/configured-addon-json-api.model.ts
new file mode 100644
index 000000000..6af5e284b
--- /dev/null
+++ b/src/app/shared/models/addons/configured-addon-json-api.model.ts
@@ -0,0 +1,77 @@
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { ToOneRelData } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { DataResponse, ItemResponse, JsonApiResponse } from '../common/json-api/responses.model';
+
+import { IncludedAddonData } from './addon-included-json-api.model';
+
+export type ConfiguredAddonListResponseWithIncludeJsonApi = JsonApiResponse<
+  ConfiguredAddonDataJsonApi[],
+  IncludedAddonData[]
+>;
+export type ConfiguredAddonItemResponseJsonApi = ItemResponse<ConfiguredAddonDataJsonApi>;
+export type ConfiguredAddonDataListResponseJsonApi = DataResponse<ConfiguredAddonDataJsonApi[]>;
+
+export interface ConfiguredAddonDataJsonApi extends JsonApiResource<string, ConfiguredAddonAttributesJsonApi> {
+  relationships: ConfiguredAddonRelationshipsJsonApi;
+}
+
+export interface ConfiguredAddonResponseDataJsonApi extends JsonApiResource<string, ConfiguredAddonAttributesJsonApi> {
+  links: Pick<ResourceLinksJsonApi, 'self'>;
+  relationships: ConfiguredAddonResponseRelationshipsJsonApi;
+}
+
+export type ConfiguredAddonRequestJsonApi = DataResponse<ConfiguredAddonRequestDataJsonApi>;
+
+interface ConfiguredAddonRequestDataJsonApi {
+  id?: string;
+  attributes: ConfiguredAddonRequestAttributesJsonApi;
+  relationships: ConfiguredAddonRequestRelationshipsJsonApi;
+  type: string;
+}
+
+interface ConfiguredAddonAttributesJsonApi {
+  connected_capabilities: string[];
+  connected_operation_names: string[];
+  current_user_is_owner: boolean;
+  display_name: string;
+  external_service_name: string;
+  resource_type?: string;
+  root_folder?: string;
+  target_id?: string;
+  target_url?: string;
+}
+
+interface ConfiguredAddonRequestAttributesJsonApi {
+  authorized_resource_uri: string;
+  connected_capabilities: string[];
+  connected_operation_names: string[];
+  display_name: string;
+  external_service_name: string;
+  root_folder?: string | null;
+  target_id?: string | null;
+  target_url?: string | null;
+}
+
+interface ConfiguredAddonRelationshipsJsonApi {
+  base_account: ToOneRelData;
+  external_citation_service?: ToOneRelData<'external-citation-services'>;
+  external_link_service?: ToOneRelData<'external-link-services'>;
+  external_storage_service?: ToOneRelData;
+}
+
+interface ConfiguredAddonResponseRelationshipsJsonApi {
+  base_account: ToOneRelData;
+  authorized_resource?: ToOneRelData;
+  external_citation_service?: ToOneRelData;
+  external_link_service?: ToOneRelData;
+  external_storage_service?: ToOneRelData;
+}
+
+interface ConfiguredAddonRequestRelationshipsJsonApi {
+  account_owner: ToOneRelData;
+  authorized_resource?: ToOneRelData;
+  base_account: ToOneRelData;
+  external_citation_service?: ToOneRelData;
+  external_storage_service?: ToOneRelData;
+}
diff --git a/src/app/shared/models/addons/external-addon-json-api.model.ts b/src/app/shared/models/addons/external-addon-json-api.model.ts
new file mode 100644
index 000000000..afe97f93e
--- /dev/null
+++ b/src/app/shared/models/addons/external-addon-json-api.model.ts
@@ -0,0 +1,21 @@
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
+
+export type AddonGetListResponseJsonApi = ListResponse<AddonGetDataJsonApi>;
+export type AddonGetItemResponseJsonApi = ItemResponse<AddonGetDataJsonApi>;
+
+export type AddonGetDataJsonApi = JsonApiResource<string, AddonGetAttributesJsonApi>;
+
+interface AddonGetAttributesJsonApi {
+  auth_uri: string;
+  configurable_api_root: boolean;
+  credentials_format: string;
+  display_name: string;
+  external_service_name: string;
+  icon_url: string;
+  redirect_url?: string;
+  supported_features: string[];
+  supported_resource_types?: string[];
+  wb_key: string;
+  [key: string]: unknown;
+}
diff --git a/src/app/shared/models/addons/operation-invocation.model.ts b/src/app/shared/models/addons/operation-invocation.model.ts
index 395ab68b1..9709792a4 100644
--- a/src/app/shared/models/addons/operation-invocation.model.ts
+++ b/src/app/shared/models/addons/operation-invocation.model.ts
@@ -5,13 +5,15 @@ export interface OperationInvocation {
   type: string;
   invocationStatus: string;
   operationName: string;
-  operationKwargs: {
-    itemId?: string;
-    itemType?: string;
-  };
+  operationKwargs: OperationKwargs;
   operationResult: StorageItem[];
   itemCount: number;
   thisSampleCursor?: string;
   firstSampleCursor?: string;
   nextSampleCursor?: string;
 }
+
+interface OperationKwargs {
+  itemId?: string;
+  itemType?: string;
+}
diff --git a/src/app/shared/models/addons/resource-reference.model.ts b/src/app/shared/models/addons/resource-reference.model.ts
new file mode 100644
index 000000000..ac543bd03
--- /dev/null
+++ b/src/app/shared/models/addons/resource-reference.model.ts
@@ -0,0 +1,4 @@
+export interface ResourceReferenceModel {
+  id: string;
+  resourceUri: string;
+}
diff --git a/src/app/shared/models/addons/user-reference.model.ts b/src/app/shared/models/addons/user-reference.model.ts
new file mode 100644
index 000000000..4b15aad9c
--- /dev/null
+++ b/src/app/shared/models/addons/user-reference.model.ts
@@ -0,0 +1,4 @@
+export interface UserReferenceModel {
+  id: string;
+  userUri: string;
+}
diff --git a/src/app/shared/models/banner-json-api.model.ts b/src/app/shared/models/banner-json-api.model.ts
new file mode 100644
index 000000000..cf38a059a
--- /dev/null
+++ b/src/app/shared/models/banner-json-api.model.ts
@@ -0,0 +1,24 @@
+import { JsonApiResource } from './common/json-api/resource.model';
+import { ItemResponse } from './common/json-api/responses.model';
+
+export type BannerCurrentResponseJsonApi = ItemResponse<BannerJsonApi>;
+
+export interface BannerJsonApi extends JsonApiResource<string, BannerAttributesJsonApi> {
+  links: BannerLinksJsonApi;
+}
+
+interface BannerAttributesJsonApi {
+  color: string;
+  default_alt_text: string;
+  end_date: string;
+  license: string;
+  link: string;
+  mobile_alt_text: string;
+  name: string;
+  start_date: string;
+}
+
+interface BannerLinksJsonApi {
+  default_photo: string;
+  mobile_photo: string;
+}
diff --git a/src/app/shared/models/banner.json-api.model.ts b/src/app/shared/models/banner.json-api.model.ts
deleted file mode 100644
index 707c896e3..000000000
--- a/src/app/shared/models/banner.json-api.model.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export interface BannerJsonApi {
-  id: string;
-  attributes: {
-    start_date: string;
-    end_date: string;
-    color: string;
-    license: string;
-    name: string;
-    default_alt_text: string;
-    mobile_alt_text: string;
-    link: string;
-  };
-  links: {
-    default_photo: string;
-    mobile_photo: string;
-  };
-  type: string;
-}
diff --git a/src/app/shared/models/brand/brand-json-api.model.ts b/src/app/shared/models/brand/brand-json-api.model.ts
new file mode 100644
index 000000000..acd02642c
--- /dev/null
+++ b/src/app/shared/models/brand/brand-json-api.model.ts
@@ -0,0 +1,13 @@
+import { JsonApiResource } from '../common/json-api/resource.model';
+
+export type BrandDataJsonApi = JsonApiResource<'brands', BrandAttributesJsonApi>;
+
+interface BrandAttributesJsonApi {
+  name: string;
+  hero_logo_image: string;
+  hero_background_image: string;
+  topnav_logo_image: string;
+  primary_color: string;
+  secondary_color: string;
+  background_color: string;
+}
diff --git a/src/app/shared/models/brand/brand.json-api.model.ts b/src/app/shared/models/brand/brand.json-api.model.ts
deleted file mode 100644
index cadfea6a6..000000000
--- a/src/app/shared/models/brand/brand.json-api.model.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface BrandDataJsonApi {
-  id: string;
-  type: 'brands';
-  attributes: {
-    name: string;
-    hero_logo_image: string;
-    hero_background_image: string;
-    topnav_logo_image: string;
-    primary_color: string;
-    secondary_color: string;
-    background_color: string;
-  };
-}
diff --git a/src/app/shared/models/citations/citation-style-json-api.model.ts b/src/app/shared/models/citations/citation-style-json-api.model.ts
index 4f31268aa..fa7cca4b8 100644
--- a/src/app/shared/models/citations/citation-style-json-api.model.ts
+++ b/src/app/shared/models/citations/citation-style-json-api.model.ts
@@ -1,11 +1,13 @@
-export interface CitationStyleJsonApi {
-  id: string;
-  type: string;
-  attributes: {
-    title: string;
-    short_title: string | null;
-    summary: string | null;
-    date_parsed: string;
-  };
-  links: Record<string, string>;
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
+
+export type CitationStyleResponseJsonApi = ListResponse<CitationStyleDataJsonApi>;
+
+export type CitationStyleDataJsonApi = JsonApiResource<'citation-styles', CitationStyleAttributesJsonApi>;
+
+interface CitationStyleAttributesJsonApi {
+  title: string;
+  short_title: string | null;
+  summary: string | null;
+  date_parsed: string;
 }
diff --git a/src/app/shared/models/citations/custom-citation-payload-json-api.model.ts b/src/app/shared/models/citations/custom-citation-payload-json-api.model.ts
index 34e043fbc..d0f1b9fe8 100644
--- a/src/app/shared/models/citations/custom-citation-payload-json-api.model.ts
+++ b/src/app/shared/models/citations/custom-citation-payload-json-api.model.ts
@@ -1,7 +1,10 @@
-export interface CustomCitationPayloadJsonApi {
-  data: {
-    id: string;
-    type: string;
-    attributes: { custom_citation: string };
-  };
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { DataResponse } from '../common/json-api/responses.model';
+
+export type CustomCitationPayloadJsonApi = DataResponse<
+  JsonApiResource<string, CustomCitationPayloadJsonApiAttributes>
+>;
+
+interface CustomCitationPayloadJsonApiAttributes {
+  custom_citation: string;
 }
diff --git a/src/app/shared/models/citations/styled-citation-json-api.model.ts b/src/app/shared/models/citations/styled-citation-json-api.model.ts
index 6b6113311..d073c0eea 100644
--- a/src/app/shared/models/citations/styled-citation-json-api.model.ts
+++ b/src/app/shared/models/citations/styled-citation-json-api.model.ts
@@ -1,7 +1,10 @@
-export interface StyledCitationJsonApi {
-  id: string;
-  type: string;
-  attributes: {
-    citation: string;
-  };
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse } from '../common/json-api/responses.model';
+
+export type StyledCitationResponseJsonApi = ItemResponse<StyledCitationDataJsonApi>;
+
+export type StyledCitationDataJsonApi = JsonApiResource<string, StyledCitationJsonApiAttributes>;
+
+interface StyledCitationJsonApiAttributes {
+  citation: string;
 }
diff --git a/src/app/shared/models/collections/collection-details-json-api.model.ts b/src/app/shared/models/collections/collection-details-json-api.model.ts
new file mode 100644
index 000000000..4b82d121a
--- /dev/null
+++ b/src/app/shared/models/collections/collection-details-json-api.model.ts
@@ -0,0 +1,39 @@
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
+
+export type CollectionDetailsItemResponseJsonApi = ItemResponse<CollectionDetailsDataJsonApi>;
+export type CollectionDetailsListResponseJsonApi = ListResponse<CollectionDetailsDataJsonApi>;
+export type SparseCollectionsResponseJsonApi = ListResponse<SparseCollectionDataJsonApi>;
+
+export interface CollectionDetailsDataJsonApi extends JsonApiResource<
+  'collections',
+  CollectionDetailsAttributesJsonApi
+> {
+  links?: Pick<ResourceLinksJsonApi, 'iri'>;
+}
+export type SparseCollectionDataJsonApi = JsonApiResource<'collections', SparseCollectionAttributesJsonApi>;
+
+interface CollectionDetailsAttributesJsonApi {
+  bookmarks: boolean;
+  collected_type_choices: string[];
+  data_type_choices: string[];
+  date_created: string;
+  date_modified: string;
+  disease_choices: string[];
+  grade_levels_choices: string[];
+  is_promoted: boolean;
+  is_public: boolean;
+  issue_choices: string[];
+  program_area_choices: string[];
+  school_type_choices: string[];
+  status_choices: string[];
+  study_design_choices: string[];
+  title: string;
+  volume_choices: string[];
+}
+
+interface SparseCollectionAttributesJsonApi {
+  bookmarks: boolean;
+  title: string;
+}
diff --git a/src/app/shared/models/collections/collection-details.model.ts b/src/app/shared/models/collections/collection-details.model.ts
new file mode 100644
index 000000000..6919f65f7
--- /dev/null
+++ b/src/app/shared/models/collections/collection-details.model.ts
@@ -0,0 +1,11 @@
+export interface CollectionDetails {
+  id: string;
+  type: string;
+  title: string;
+  dateCreated: string;
+  dateModified: string;
+  bookmarks: boolean;
+  isPromoted: boolean;
+  isPublic: boolean;
+  iri?: string;
+}
diff --git a/src/app/shared/models/collections/collection-provider-json-api.model.ts b/src/app/shared/models/collections/collection-provider-json-api.model.ts
new file mode 100644
index 000000000..797df8dbe
--- /dev/null
+++ b/src/app/shared/models/collections/collection-provider-json-api.model.ts
@@ -0,0 +1,29 @@
+import { CedarMetadataDataTemplateJsonApi } from '@osf/features/metadata/models/cedar-metadata-template-json-api.model';
+
+import { BrandDataJsonApi } from '../brand/brand-json-api.model';
+import { Embed } from '../common/json-api/embeds.model';
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { ToOneRel } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse } from '../common/json-api/responses.model';
+import { CollectionsProviderAttributesJsonApi } from '../provider/collections-provider-json-api.model';
+
+export type CollectionProviderGetResponseJsonApi = ItemResponse<CollectionProviderDataJsonApi>;
+
+export interface CollectionProviderDataJsonApi extends JsonApiResource<
+  'collection-providers',
+  CollectionsProviderAttributesJsonApi
+> {
+  embeds: CollectionProviderEmbedsJsonApi;
+  relationships: CollectionProviderRelationshipsJsonApi;
+  links?: Pick<ResourceLinksJsonApi, 'iri'>;
+}
+
+interface CollectionProviderEmbedsJsonApi {
+  brand: Embed<BrandDataJsonApi>;
+  required_metadata_template: Embed<CedarMetadataDataTemplateJsonApi>;
+}
+
+interface CollectionProviderRelationshipsJsonApi {
+  primary_collection: ToOneRel<'collections'>;
+}
diff --git a/src/app/shared/models/collections/collection-provider.model.ts b/src/app/shared/models/collections/collection-provider.model.ts
new file mode 100644
index 000000000..0a1f24408
--- /dev/null
+++ b/src/app/shared/models/collections/collection-provider.model.ts
@@ -0,0 +1,25 @@
+import { CedarMetadataTemplateModel } from '@osf/features/metadata/models/cedar-metadata-template.model';
+
+import { BrandModel } from '../brand/brand.model';
+import { BaseProviderModel } from '../provider/provider.model';
+
+export interface CollectionProvider extends BaseProviderModel {
+  assets: CollectionProviderAssets;
+  primaryCollection: CollectionProviderPrimaryCollection;
+  brand: BrandModel | null;
+  defaultLicenseId?: string | null;
+  requiredMetadataTemplate?: CedarMetadataTemplateModel | null;
+  iri?: string;
+}
+
+interface CollectionProviderAssets {
+  style?: string;
+  squareColorTransparent?: string;
+  squareColorNoTransparent?: string;
+  favicon?: string;
+}
+
+interface CollectionProviderPrimaryCollection {
+  id: string;
+  type: string;
+}
diff --git a/src/app/shared/models/collections/collection-submission-payload-json-api.model.ts b/src/app/shared/models/collections/collection-submission-payload-json-api.model.ts
index c45136263..825a77237 100644
--- a/src/app/shared/models/collections/collection-submission-payload-json-api.model.ts
+++ b/src/app/shared/models/collections/collection-submission-payload-json-api.model.ts
@@ -1,22 +1,21 @@
-export interface CollectionSubmissionPayloadJsonApi {
-  data: {
-    type: 'collection-submissions';
-    attributes: {
-      guid: string;
-    };
-    relationships: {
-      collection: {
-        data: {
-          id: string;
-          type: 'collections';
-        };
-      };
-      creator: {
-        data: {
-          type: 'users';
-          id: string;
-        };
-      };
-    };
-  };
+import { ToOneRelData } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { DataResponse } from '../common/json-api/responses.model';
+
+export type CollectionSubmissionPayloadJsonApi = DataResponse<CollectionSubmissionDataJsonApi>;
+
+interface CollectionSubmissionDataJsonApi extends Omit<
+  JsonApiResource<'collection-submissions', CollectionSubmissionAttributesJsonApi>,
+  'id'
+> {
+  relationships: CollectionSubmissionRelationshipsJsonApi;
+}
+
+interface CollectionSubmissionAttributesJsonApi {
+  guid: string;
+}
+
+interface CollectionSubmissionRelationshipsJsonApi {
+  collection: ToOneRelData<'collections'>;
+  creator: ToOneRelData<'users'>;
 }
diff --git a/src/app/shared/models/collections/collection-submissions-json-api.model.ts b/src/app/shared/models/collections/collection-submissions-json-api.model.ts
new file mode 100644
index 000000000..8863a67fa
--- /dev/null
+++ b/src/app/shared/models/collections/collection-submissions-json-api.model.ts
@@ -0,0 +1,82 @@
+import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
+
+import { Embed } from '../common/json-api/embeds.model';
+import { ToOneRelData } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { DataResponse, ItemResponse, ListResponse } from '../common/json-api/responses.model';
+import { BaseNodeDataJsonApi } from '../nodes/base-node-data-json-api.model';
+import { UserDataErrorResponseJsonApi } from '../user/user-json-api.model';
+
+export type CollectionSubmissionWithGuidResponseJsonApi = ItemResponse<CollectionSubmissionWithGuidDataJsonApi>;
+export type CollectionSubmissionWithGuidListResponseJsonApi = ListResponse<CollectionSubmissionWithGuidDataJsonApi>;
+export type CollectionSubmissionJsonApi = ItemResponse<CollectionSubmissionDataJsonApi>;
+
+export interface CollectionSubmissionDataJsonApi extends JsonApiResource<
+  'collection-submissions',
+  CollectionSubmissionAttributesJsonApi
+> {
+  embeds: CollectionSubmissionEmbedsJsonApi;
+}
+
+export interface CollectionSubmissionWithGuidDataJsonApi extends JsonApiResource<
+  'collection-submissions',
+  CollectionSubmissionAttributesJsonApi
+> {
+  embeds: CollectionSubmissionWithGuidEmbedsJsonApi;
+}
+
+export type CollectionSubmissionsSearchPayloadJsonApi = DataResponse<CollectionSubmissionsSearchPayloadDataJsonApi> & {
+  type: 'search';
+};
+
+interface CollectionSubmissionsSearchPayloadDataJsonApi {
+  attributes: CollectionSubmissionsSearchPayloadAttributesJsonApi;
+}
+
+interface CollectionSubmissionsSearchPayloadAttributesJsonApi {
+  provider: string[];
+  studyDesign?: string[];
+  schoolType?: string[];
+  status?: string[];
+  collectedType?: string[];
+  volume?: string[];
+  issue?: string[];
+  programArea?: string[];
+  dataType?: string[];
+  disease?: string[];
+  gradeLevels?: string[];
+  q?: string;
+}
+
+interface CollectionSubmissionAttributesJsonApi {
+  collected_type: string;
+  data_type: string;
+  disease: string;
+  grade_levels: string;
+  issue: string;
+  program_area: string;
+  reviews_state: CollectionSubmissionReviewState;
+  school_type: string;
+  status: string;
+  study_design: string;
+  volume: string;
+}
+
+interface CollectionSubmissionEmbedsJsonApi {
+  collection: Embed<CollectionSubmissionCollectionEmbedDataJsonApi>;
+}
+
+interface CollectionSubmissionWithGuidEmbedsJsonApi {
+  guid: Embed<BaseNodeDataJsonApi>;
+  creator?: UserDataErrorResponseJsonApi;
+}
+
+interface CollectionSubmissionCollectionEmbedDataJsonApi {
+  attributes: {
+    title: string;
+  };
+  relationships: {
+    provider: ToOneRelData;
+    required_metadata_template?: ToOneRelData;
+  };
+}
diff --git a/src/app/shared/models/collections/collections.model.ts b/src/app/shared/models/collections/collection-submissions.model.ts
similarity index 59%
rename from src/app/shared/models/collections/collections.model.ts
rename to src/app/shared/models/collections/collection-submissions.model.ts
index 7faa5113e..273313d13 100644
--- a/src/app/shared/models/collections/collections.model.ts
+++ b/src/app/shared/models/collections/collection-submissions.model.ts
@@ -1,40 +1,12 @@
-import { CedarMetadataDataTemplateJsonApi } from '@osf/features/metadata/models';
 import { CollectionSubmissionReviewAction } from '@osf/features/moderation/models';
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
 
-import { BrandModel } from '../brand/brand.model';
 import { ContributorModel } from '../contributors/contributor.model';
 import { ProjectModel } from '../projects/projects.model';
-import { BaseProviderModel } from '../provider/provider.model';
+import { CreatorModel } from '../user/creator.model';
 
-export interface CollectionProvider extends BaseProviderModel {
-  iri?: string;
-  assets: {
-    style?: string;
-    squareColorTransparent?: string;
-    squareColorNoTransparent?: string;
-    favicon?: string;
-  };
-  primaryCollection: {
-    id: string;
-    type: string;
-  };
-  brand: BrandModel | null;
-  defaultLicenseId?: string | null;
-  requiredMetadataTemplate?: CedarMetadataDataTemplateJsonApi | null;
-}
-
-export interface CollectionDetails {
-  id: string;
-  type: string;
-  iri?: string;
-  title: string;
-  dateCreated: string;
-  dateModified: string;
-  bookmarks: boolean;
-  isPromoted: boolean;
-  isPublic: boolean;
-}
+export type CollectionSubmissionActionType = 'collection_submission_actions';
+export type CollectionSubmissionTargetType = 'collection-submissions';
 
 export interface CollectionSubmission {
   id: string;
@@ -58,10 +30,7 @@ export interface CollectionSubmissionWithGuid {
   public: boolean;
   reviewsState: CollectionSubmissionReviewState;
   contributors?: ContributorModel[];
-  creator?: {
-    id: string;
-    fullName: string;
-  };
+  creator?: CreatorModel;
   actions?: CollectionSubmissionReviewAction[];
   totalContributors?: number;
   contributorsLoading?: boolean;
@@ -72,7 +41,3 @@ export interface CollectionProjectSubmission {
   submission: CollectionSubmissionWithGuid;
   project: ProjectModel;
 }
-
-export type CollectionSubmissionActionType = 'collection_submission_actions';
-
-export type CollectionSubmissionTargetType = 'collection-submissions';
diff --git a/src/app/shared/models/collections/collections-json-api.model.ts b/src/app/shared/models/collections/collections-json-api.model.ts
deleted file mode 100644
index c2a0b456e..000000000
--- a/src/app/shared/models/collections/collections-json-api.model.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { CedarMetadataDataTemplateJsonApi } from '@osf/features/metadata/models';
-import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-
-import { BrandDataJsonApi } from '../brand/brand.json-api.model';
-import { JsonApiResponse } from '../common/json-api.model';
-import { BaseNodeDataJsonApi } from '../nodes/base-node-data-json-api.model';
-import { CollectionsProviderAttributesJsonApi } from '../provider/collections-provider-json-api.model';
-import { UserDataErrorResponseJsonApi } from '../user/user-json-api.model';
-
-export interface CollectionProviderResponseJsonApi {
-  id: string;
-  type: string;
-  links?: {
-    iri?: string;
-  };
-  attributes: CollectionsProviderAttributesJsonApi;
-  embeds: {
-    brand: {
-      data?: BrandDataJsonApi;
-    };
-    required_metadata_template?: {
-      data?: CedarMetadataDataTemplateJsonApi | null;
-    };
-  };
-  relationships: {
-    primary_collection: {
-      data: {
-        id: string;
-        type: string;
-      };
-    };
-  };
-}
-
-export interface CollectionDetailsResponseJsonApi {
-  id: string;
-  type: string;
-  links?: {
-    iri?: string;
-  };
-  attributes: {
-    title: string;
-    date_created: string;
-    date_modified: string;
-    bookmarks: boolean;
-    is_promoted: boolean;
-    is_public: boolean;
-  };
-}
-
-export interface CollectionSubmissionJsonApi {
-  id: string;
-  type: string;
-  attributes: {
-    reviews_state: CollectionSubmissionReviewState;
-  };
-  embeds: {
-    collection: {
-      data: {
-        attributes: {
-          title: string;
-        };
-        relationships: {
-          provider: {
-            data: {
-              id: string;
-            };
-          };
-          required_metadata_template?: {
-            data?: {
-              id: string;
-              type: string;
-            } | null;
-          };
-        };
-      };
-    };
-  };
-}
-
-export interface CollectionSubmissionWithGuidJsonApi {
-  id: string;
-  type: string;
-  attributes: {
-    reviews_state: CollectionSubmissionReviewState;
-  };
-  embeds: {
-    guid: {
-      data: BaseNodeDataJsonApi;
-    };
-    creator?: UserDataErrorResponseJsonApi;
-  };
-}
-
-export interface SparseCollectionAttributesJsonApi {
-  title: string;
-  bookmarks: boolean;
-}
-
-export interface SparseCollectionJsonAi {
-  id: string;
-  attributes: SparseCollectionAttributesJsonApi;
-}
-
-export interface SparseCollectionsResponseJsonApi {
-  data: SparseCollectionJsonAi[];
-}
-
-export interface CollectionDetailsGetResponseJsonApi extends JsonApiResponse<CollectionDetailsResponseJsonApi, null> {
-  data: CollectionDetailsResponseJsonApi;
-}
diff --git a/src/app/shared/models/common/json-api.model.ts b/src/app/shared/models/common/json-api.model.ts
deleted file mode 100644
index 8a72e1445..000000000
--- a/src/app/shared/models/common/json-api.model.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-export interface JsonApiResponse<Data, Included> {
-  data: Data;
-  included?: Included;
-}
-
-export interface JsonApiResponseWithMeta<Data, Meta, Included> extends JsonApiResponse<Data, Included> {
-  meta: Meta;
-}
-
-export interface ResponseJsonApi<Data> {
-  data: Data;
-  links: PaginationLinksJsonApi;
-  meta: MetaJsonApi;
-}
-
-export interface ResponseDataJsonApi<Data> {
-  data: Data;
-  meta: MetaJsonApi;
-}
-
-export interface ApiData<Attributes, Embeds, Relationships, Links> {
-  id: string;
-  attributes: Attributes;
-  embeds: Embeds;
-  type: string;
-  relationships: Relationships;
-  links: Links;
-}
-
-export interface MetaJsonApi {
-  total: number;
-  per_page: number;
-  version: string;
-  anonymous?: boolean;
-}
-
-export interface MetaAnonymousJsonApi {
-  total?: number;
-  per_page?: number;
-  anonymous: boolean;
-}
-
-export interface PaginationLinksJsonApi {
-  self?: string;
-  first?: string | null;
-  last?: string | null;
-  prev?: string | null;
-  next?: string | null;
-}
diff --git a/src/app/shared/models/common/json-api/embeds.model.ts b/src/app/shared/models/common/json-api/embeds.model.ts
new file mode 100644
index 000000000..cd79dda6b
--- /dev/null
+++ b/src/app/shared/models/common/json-api/embeds.model.ts
@@ -0,0 +1,9 @@
+export interface Embed<TResource> {
+  data: TResource;
+  errors?: unknown[];
+}
+
+export interface EmbedList<TResource> {
+  data: TResource[];
+  errors?: unknown[];
+}
diff --git a/src/app/shared/models/common/json-api/links.model.ts b/src/app/shared/models/common/json-api/links.model.ts
new file mode 100644
index 000000000..9ff520626
--- /dev/null
+++ b/src/app/shared/models/common/json-api/links.model.ts
@@ -0,0 +1,13 @@
+export interface ResourceLinksJsonApi {
+  html: string;
+  self: string;
+  iri: string;
+}
+
+export interface PaginationLinks {
+  self?: string;
+  first?: string | null;
+  last?: string | null;
+  prev?: string | null;
+  next?: string | null;
+}
diff --git a/src/app/shared/models/common/json-api/meta.model.ts b/src/app/shared/models/common/json-api/meta.model.ts
new file mode 100644
index 000000000..09960f8db
--- /dev/null
+++ b/src/app/shared/models/common/json-api/meta.model.ts
@@ -0,0 +1,11 @@
+export interface ListMetaJsonApi {
+  total: number;
+  anonymous?: boolean;
+  per_page?: number;
+  version?: string;
+}
+
+export interface ItemMetaJsonApi {
+  anonymous?: boolean;
+  version?: string;
+}
diff --git a/src/app/shared/models/common/json-api/relationships.model.ts b/src/app/shared/models/common/json-api/relationships.model.ts
new file mode 100644
index 000000000..6ad684ac2
--- /dev/null
+++ b/src/app/shared/models/common/json-api/relationships.model.ts
@@ -0,0 +1,42 @@
+import { JsonApiResourceRef } from './resource.model';
+
+export interface RelatedCountRel {
+  links: {
+    related: {
+      href?: string;
+      meta: RelatedCountMeta;
+    };
+  };
+}
+
+export interface RelatedCountMeta {
+  count: number;
+}
+
+export interface ToOneRel<TType extends string = string> {
+  data: JsonApiResourceRef<TType> | null;
+  links: RelationshipLinks;
+}
+
+export interface ToManyRel<TType extends string = string> {
+  data: JsonApiResourceRef<TType>[] | null;
+  links: RelationshipLinks;
+}
+
+export interface ToOneRelData<TType extends string = string> {
+  data: JsonApiResourceRef<TType>;
+}
+
+export interface ToManyRelData<TType extends string = string> {
+  data: JsonApiResourceRef<TType>[];
+}
+
+export interface RelationshipLinks {
+  related: RelationshipLink;
+  self?: RelationshipLink;
+}
+
+interface RelationshipLink {
+  href: string;
+  meta?: Record<string, unknown>;
+}
diff --git a/src/app/shared/models/common/json-api/resource.model.ts b/src/app/shared/models/common/json-api/resource.model.ts
new file mode 100644
index 000000000..336b88567
--- /dev/null
+++ b/src/app/shared/models/common/json-api/resource.model.ts
@@ -0,0 +1,10 @@
+export interface JsonApiResourceRef<TType extends string = string> {
+  id: string;
+  type: TType;
+}
+
+export interface JsonApiResource<TType extends string, TAttributes = Record<string, never>> {
+  id: string;
+  type: TType;
+  attributes: TAttributes;
+}
diff --git a/src/app/shared/models/common/json-api/responses.model.ts b/src/app/shared/models/common/json-api/responses.model.ts
new file mode 100644
index 000000000..95a33ccba
--- /dev/null
+++ b/src/app/shared/models/common/json-api/responses.model.ts
@@ -0,0 +1,22 @@
+import { PaginationLinks } from './links.model';
+import { ItemMetaJsonApi, ListMetaJsonApi } from './meta.model';
+
+export interface DataResponse<TData> {
+  data: TData;
+}
+
+export interface ItemResponse<TData, TMeta extends ItemMetaJsonApi = ItemMetaJsonApi> {
+  data: TData;
+  meta?: TMeta;
+}
+
+export interface ListResponse<TData, TMeta extends ListMetaJsonApi = ListMetaJsonApi> {
+  data: TData[];
+  meta: TMeta;
+  links?: PaginationLinks;
+}
+
+export interface JsonApiResponse<Data, Included> {
+  data: Data;
+  included?: Included;
+}
diff --git a/src/app/shared/models/contributors/contributor-add-request.model.ts b/src/app/shared/models/contributors/contributor-add-request.model.ts
new file mode 100644
index 000000000..3b6656d43
--- /dev/null
+++ b/src/app/shared/models/contributors/contributor-add-request.model.ts
@@ -0,0 +1,25 @@
+import { JsonApiResource, JsonApiResourceRef } from '../common/json-api/resource.model';
+
+export interface ContributorAddRequestModel extends Omit<
+  JsonApiResource<'contributors', ContributorAddRequestAttributesModel>,
+  'id'
+> {
+  id?: string;
+  relationships?: ContributorAddRequestRelationshipsModel;
+}
+
+interface ContributorAddRequestAttributesModel {
+  bibliographic: boolean;
+  child_nodes?: string[];
+  email?: string;
+  full_name?: string;
+  id?: string;
+  index?: number;
+  permission: string;
+}
+
+interface ContributorAddRequestRelationshipsModel {
+  users?: {
+    data: Partial<JsonApiResourceRef<'users'>>;
+  };
+}
diff --git a/src/app/shared/models/contributors/contributor-response-json-api.model.ts b/src/app/shared/models/contributors/contributor-response-json-api.model.ts
index 72f5fc024..153ae97d9 100644
--- a/src/app/shared/models/contributors/contributor-response-json-api.model.ts
+++ b/src/app/shared/models/contributors/contributor-response-json-api.model.ts
@@ -1,20 +1,16 @@
 import { ContributorPermission } from '@osf/shared/enums/contributors/contributor-permission.enum';
 
-import { ResponseJsonApi } from '../common/json-api.model';
-import { UserDataJsonApi, UserErrorResponseJsonApi } from '../user/user-json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
+import { UserDataErrorResponseJsonApi } from '../user/user-json-api.model';
 
-export type ContributorResponseJsonApi = ResponseJsonApi<ContributorDataJsonApi>;
-export type ContributorsResponseJsonApi = ResponseJsonApi<ContributorDataJsonApi[]>;
+export type ContributorsResponseJsonApi = ListResponse<ContributorDataJsonApi>;
 
-export interface ContributorDataJsonApi {
-  id: string;
-  type: string;
-  attributes: ContributorAttributesJsonApi;
-  relationships: ContributorRelationshipsJsonApi;
-  embeds: ContributorEmbedsJsonApi;
+export interface ContributorDataJsonApi extends JsonApiResource<'contributors', ContributorAttributesJsonApi> {
+  embeds?: ContributorEmbedsJsonApi;
 }
 
-export interface ContributorAttributesJsonApi {
+interface ContributorAttributesJsonApi {
   bibliographic: boolean;
   index: number;
   is_curator: boolean;
@@ -22,63 +18,6 @@ export interface ContributorAttributesJsonApi {
   unregistered_contributor: string | null;
 }
 
-export interface ContributorRelationshipsJsonApi {
-  users: RelationshipJsonApi<UserRelationshipDataJsonApi>;
-  node: RelationshipJsonApi<NodeRelationshipDataJsonApi>;
-}
-
-export interface ContributorEmbedsJsonApi {
-  users: EmbeddedUsersJsonApi;
-}
-
-export interface ContributorAddRequestModel {
-  type: 'contributors';
-  id?: string;
-  attributes: {
-    bibliographic: boolean;
-    permission: string;
-    id?: string;
-    index?: number;
-    full_name?: string;
-    email?: string;
-    child_nodes?: string[];
-  };
-  relationships: {
-    users?: {
-      data?: RelationshipUsersDataJsonApi;
-    };
-  };
-}
-
-interface RelationshipUsersDataJsonApi {
-  id?: string;
-  type?: 'users';
-}
-
-export interface EmbeddedUsersJsonApi {
-  data: UserDataJsonApi;
-  errors?: UserErrorResponseJsonApi[];
-}
-
-interface RelationshipJsonApi<T> {
-  links: {
-    related: LinkWithMetaJsonApi;
-    self?: LinkWithMetaJsonApi;
-  };
-  data?: T | null;
-}
-
-interface LinkWithMetaJsonApi {
-  href: string;
-  meta: Record<string, unknown>;
-}
-
-interface UserRelationshipDataJsonApi {
-  id: string;
-  type: string;
-}
-
-interface NodeRelationshipDataJsonApi {
-  id: string;
-  type: string;
+interface ContributorEmbedsJsonApi {
+  users: UserDataErrorResponseJsonApi;
 }
diff --git a/src/app/shared/models/emails/account-emails-json-api.model.ts b/src/app/shared/models/emails/account-emails-json-api.model.ts
index 9abfca42d..18804e186 100644
--- a/src/app/shared/models/emails/account-emails-json-api.model.ts
+++ b/src/app/shared/models/emails/account-emails-json-api.model.ts
@@ -1,18 +1,15 @@
-import { ResponseDataJsonApi, ResponseJsonApi } from '../common/json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
 
-export type EmailsResponseJsonApi = ResponseJsonApi<EmailsDataJsonApi[]>;
+export type EmailsResponseJsonApi = ListResponse<EmailsDataJsonApi>;
+export type EmailResponseJsonApi = ItemResponse<EmailsDataJsonApi>;
 
-export type EmailResponseJsonApi = ResponseDataJsonApi<EmailsDataJsonApi>;
-
-export interface EmailsDataJsonApi {
-  id: string;
-  attributes: EmailsAttributesJsonApi;
-}
+export type EmailsDataJsonApi = JsonApiResource<'user_emails', EmailsAttributesJsonApi>;
 
 interface EmailsAttributesJsonApi {
-  email_address: string;
   confirmed: boolean;
-  verified: boolean;
-  primary: boolean;
+  email_address: string;
   is_merge: boolean;
+  primary: boolean;
+  verified: boolean;
 }
diff --git a/src/app/shared/models/files/file-folder-json-api.model.ts b/src/app/shared/models/files/file-folder-json-api.model.ts
index ce00e4671..f43832f52 100644
--- a/src/app/shared/models/files/file-folder-json-api.model.ts
+++ b/src/app/shared/models/files/file-folder-json-api.model.ts
@@ -1,14 +1,13 @@
 import { FileKind } from '@osf/shared/enums/file-kind.enum';
 
-import { ResponseJsonApi } from '../common/json-api.model';
+import { ToManyRel, ToOneRel } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
 
-export type FileFolderResponseJsonApi = ResponseJsonApi<FileFolderDataJsonApi>;
-export type FileFoldersResponseJsonApi = ResponseJsonApi<FileFolderDataJsonApi[]>;
+export type FileFolderResponseJsonApi = ItemResponse<FileFolderDataJsonApi>;
+export type FileFoldersResponseJsonApi = ListResponse<FileFolderDataJsonApi>;
 
-export interface FileFolderDataJsonApi {
-  id: string;
-  type: 'files';
-  attributes: FileFolderAttributesJsonApi;
+export interface FileFolderDataJsonApi extends JsonApiResource<'files', FileFolderAttributesJsonApi> {
   relationships: FileFolderRelationshipsJsonApi;
   links: FileFolderLinksJsonApi;
 }
@@ -16,41 +15,20 @@ export interface FileFolderDataJsonApi {
 export interface FileFolderAttributesJsonApi {
   kind: FileKind.Folder;
   name: string;
-  path: string;
   node: string;
+  path: string;
   provider: string;
 }
 
 interface FileFolderRelationshipsJsonApi {
-  files: RelationshipLinksOnlyJsonApi;
-  root_folder: RelationshipWithDataJsonApi<'files'>;
-  target: RelationshipWithDataJsonApi<'nodes'>;
-}
-
-interface RelationshipLinksOnlyJsonApi {
-  links: {
-    related: RelatedLinkJsonApi;
-  };
-}
-
-interface RelationshipWithDataJsonApi<T extends string> {
-  links: {
-    related: RelatedLinkJsonApi;
-  };
-  data: {
-    id: string;
-    type: T;
-  };
-}
-
-interface RelatedLinkJsonApi {
-  href: string;
-  meta: Record<string, unknown>;
+  files: ToManyRel<'files'>;
+  root_folder: ToOneRel<'files'>;
+  target: ToOneRel<'nodes'>;
 }
 
 interface FileFolderLinksJsonApi {
-  upload: string;
+  download?: string;
   new_folder: string;
   storage_addons: string;
-  download?: string;
+  upload: string;
 }
diff --git a/src/app/shared/models/files/file-json-api.model.ts b/src/app/shared/models/files/file-json-api.model.ts
index e49c428b6..c85598e8a 100644
--- a/src/app/shared/models/files/file-json-api.model.ts
+++ b/src/app/shared/models/files/file-json-api.model.ts
@@ -1,55 +1,52 @@
 import { FileKind } from '@osf/shared/enums/file-kind.enum';
 
-import { ResponseJsonApi } from '../common/json-api.model';
+import { Embed } from '../common/json-api/embeds.model';
+import { RelatedCountRel, ToOneRel } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
 import { BaseNodeDataJsonApi } from '../nodes/base-node-data-json-api.model';
 
-export type FileResponseJsonApi = ResponseJsonApi<FileDataJsonApi>;
-export type FilesResponseJsonApi = ResponseJsonApi<FileDataJsonApi[]>;
-export type FileDetailsResponseJsonApi = ResponseJsonApi<FileDetailsDataJsonApi>;
+export type FileResponseJsonApi = ItemResponse<FileDataJsonApi>;
+export type FilesResponseJsonApi = ListResponse<FileDataJsonApi>;
+export type FileDetailsResponseJsonApi = ItemResponse<FileDetailsDataJsonApi>;
 
-export interface FileDataJsonApi {
-  id: string;
-  type: 'files';
-  attributes: BaseFileAttributesJsonApi;
+export interface FileDataJsonApi extends JsonApiResource<'files', BaseFileAttributesJsonApi> {
   relationships: FileRelationshipsJsonApi;
   links: FileLinksJsonApi;
   embeds?: FileEmbedsJsonApi;
 }
 
-export interface FileDetailsDataJsonApi {
-  id: string;
-  type: 'files';
-  attributes: FileDetailsAttributesJsonApi;
+export interface FileDetailsDataJsonApi extends JsonApiResource<'files', FileDetailsAttributesJsonApi> {
   relationships: FileRelationshipsJsonApi;
   links: FileLinksJsonApi;
   embeds?: FileEmbedsJsonApi;
 }
 
 export interface BaseFileAttributesJsonApi {
+  date_modified: string;
+  extra: FileExtraJsonApi;
   guid: string | null;
-  name: string;
   kind: FileKind;
-  path: string;
-  size: number;
   materialized_path: string;
-  date_modified: string;
-  extra: FileExtraJsonApi;
+  name: string;
+  path: string;
   provider: string;
+  size: number;
 }
 
 export interface FileDetailsAttributesJsonApi extends BaseFileAttributesJsonApi {
   checkout: string | null;
-  last_touched: string | null;
-  date_created: string;
-  tags: string[];
   current_user_can_comment: boolean;
   current_version: number;
+  date_created: string;
+  last_touched: string | null;
   show_as_unviewed: boolean;
+  tags: string[];
 }
 
 export interface FileExtraJsonApi {
-  hashes: FileHashesJsonApi;
   downloads: number;
+  hashes: FileHashesJsonApi;
 }
 
 interface FileHashesJsonApi {
@@ -58,44 +55,21 @@ interface FileHashesJsonApi {
 }
 
 interface FileRelationshipsJsonApi {
-  parent_folder: ParentFolderJsonApi;
-  files?: FilesRelationshipsJsonApi;
-}
-
-interface ParentFolderJsonApi {
-  links: {
-    related: RelatedLinkJsonApi;
-  };
-  data: {
-    id: string;
-    type: 'files';
-  };
-}
-
-interface FilesRelationshipsJsonApi {
-  links: {
-    related: RelatedLinkJsonApi;
-  };
-}
-
-interface RelatedLinkJsonApi {
-  href: string;
-  meta: Record<string, unknown>;
+  files?: RelatedCountRel;
+  parent_folder: ToOneRel<'files'>;
 }
 
 export interface FileLinksJsonApi {
-  info: string;
-  move: string;
-  upload: string;
   delete: string;
   download: string;
-  render: string;
   html: string;
+  info: string;
+  move: string;
+  render: string;
   self: string;
+  upload: string;
 }
 
 interface FileEmbedsJsonApi {
-  target: {
-    data: BaseNodeDataJsonApi;
-  };
+  target: Embed<BaseNodeDataJsonApi>;
 }
diff --git a/src/app/shared/models/files/file-payload-json-api.model.ts b/src/app/shared/models/files/file-payload-json-api.model.ts
index 4d35e6ea3..0a54a3227 100644
--- a/src/app/shared/models/files/file-payload-json-api.model.ts
+++ b/src/app/shared/models/files/file-payload-json-api.model.ts
@@ -1,11 +1,15 @@
 export interface FilePayloadJsonApi {
   file_id: string;
   file_name: string;
-  file_urls: {
-    html: string;
-    download: string;
-  };
-  file_hashes: {
-    sha256: string;
-  };
+  file_urls: FilePayloadUrlsJsonApi;
+  file_hashes: FilePayloadHashesJsonApi;
+}
+
+interface FilePayloadUrlsJsonApi {
+  html: string;
+  download: string;
+}
+
+interface FilePayloadHashesJsonApi {
+  sha256: string;
 }
diff --git a/src/app/shared/models/files/file-version-json-api.model.ts b/src/app/shared/models/files/file-version-json-api.model.ts
index ba0ded78a..6ba5abe25 100644
--- a/src/app/shared/models/files/file-version-json-api.model.ts
+++ b/src/app/shared/models/files/file-version-json-api.model.ts
@@ -1,17 +1,21 @@
-import { ApiData, JsonApiResponse } from '../common/json-api.model';
+import { ListResponse } from '../common/json-api/responses.model';
 
-export type FileVersionsResponseJsonApi = JsonApiResponse<
-  ApiData<FileVersionAttributesJsonApi, null, null, FileVersionLinksJsonApi>[],
-  null
->;
+export type FileVersionsResponseJsonApi = ListResponse<FileVersionDataJsonApi>;
 
-export interface FileVersionAttributesJsonApi {
-  size: number;
+export interface FileVersionDataJsonApi {
+  id: string;
+  type: string;
+  attributes: FileVersionAttributesJsonApi;
+  links: FileVersionLinksJsonApi;
+}
+
+interface FileVersionAttributesJsonApi {
   content_type: string;
   date_created: Date;
   name: string;
+  size: number;
 }
 
-export interface FileVersionLinksJsonApi {
+interface FileVersionLinksJsonApi {
   download: string;
 }
diff --git a/src/app/shared/models/files/file.model.ts b/src/app/shared/models/files/file.model.ts
index 602165a68..3fbc2742e 100644
--- a/src/app/shared/models/files/file.model.ts
+++ b/src/app/shared/models/files/file.model.ts
@@ -1,4 +1,3 @@
-import { MetaJsonApi } from '../common/json-api.model';
 import { BaseNodeModel } from '../nodes/base-node.model';
 
 import { FileKind } from './../../enums/file-kind.enum';
@@ -33,9 +32,9 @@ export interface FileDetailsModel extends BaseFileModel {
   target: BaseNodeModel | null;
 }
 
-export interface FileDetailsWithMeta {
+export interface FileDetailsResult {
   file: FileDetailsModel;
-  meta?: MetaJsonApi;
+  isAnonymous: boolean;
 }
 
 export interface FileExtraModel {
diff --git a/src/app/shared/models/files/google-file.data.model.ts b/src/app/shared/models/files/google-file-data.model.ts
similarity index 100%
rename from src/app/shared/models/files/google-file.data.model.ts
rename to src/app/shared/models/files/google-file-data.model.ts
diff --git a/src/app/shared/models/files/google-file.picker.model.ts b/src/app/shared/models/files/google-file-picker.model.ts
similarity index 86%
rename from src/app/shared/models/files/google-file.picker.model.ts
rename to src/app/shared/models/files/google-file-picker.model.ts
index 4618e0354..53727b169 100644
--- a/src/app/shared/models/files/google-file.picker.model.ts
+++ b/src/app/shared/models/files/google-file-picker.model.ts
@@ -1,4 +1,4 @@
-import { GoogleFileDataModel } from './google-file.data.model';
+import { GoogleFileDataModel } from './google-file-data.model';
 
 /**
  * Represents the data returned by the Google File Picker integration.
diff --git a/src/app/shared/models/files/resource-files-links.model.ts b/src/app/shared/models/files/resource-files-links.model.ts
deleted file mode 100644
index 640cd2ea2..000000000
--- a/src/app/shared/models/files/resource-files-links.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface ResourceFilesLinks {
-  rootFolder: string;
-  iri: string;
-}
diff --git a/src/app/shared/models/google-drive-folder.model.ts b/src/app/shared/models/google-drive-folder.model.ts
deleted file mode 100644
index 21900cc26..000000000
--- a/src/app/shared/models/google-drive-folder.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface GoogleDriveFolder {
-  name: string;
-  selected: boolean;
-}
diff --git a/src/app/shared/models/guid-response-json-api.model.ts b/src/app/shared/models/guid-response-json-api.model.ts
index 451eb9ece..b9b376d96 100644
--- a/src/app/shared/models/guid-response-json-api.model.ts
+++ b/src/app/shared/models/guid-response-json-api.model.ts
@@ -1,32 +1,24 @@
 import { UserPermissions } from '../enums/user-permissions.enum';
 
-import { JsonApiResponse } from './common/json-api.model';
+import { ToOneRel } from './common/json-api/relationships.model';
+import { JsonApiResource } from './common/json-api/resource.model';
+import { ItemResponse } from './common/json-api/responses.model';
 
-export type GuidedResponseJsonApi = JsonApiResponse<GuidDataJsonApi, null>;
+export type GuidedResponseJsonApi = ItemResponse<GuidDataJsonApi>;
 
-interface GuidDataJsonApi {
-  id: string;
-  type: string;
-  attributes: {
-    guid: string;
-    wiki_enabled: boolean;
-    current_user_permissions: UserPermissions[];
-    title?: string;
-  };
-  relationships: {
-    target?: {
-      data: IdType;
-    };
-    provider?: {
-      data: IdType;
-    };
-    root?: {
-      data: IdType;
-    };
-  };
+export interface GuidDataJsonApi extends JsonApiResource<string, GuidAttributesJsonApi> {
+  relationships: GuidRelationshipsJsonApi;
 }
 
-interface IdType {
-  id: string;
-  type: string;
+interface GuidAttributesJsonApi {
+  current_user_permissions: UserPermissions[];
+  guid: string;
+  title?: string;
+  wiki_enabled: boolean;
+}
+
+interface GuidRelationshipsJsonApi {
+  provider?: ToOneRel;
+  root?: ToOneRel;
+  target?: ToOneRel;
 }
diff --git a/src/app/shared/models/identifiers/identifier-json-api.model.ts b/src/app/shared/models/identifiers/identifier-json-api.model.ts
index c62a4d9b5..b84249322 100644
--- a/src/app/shared/models/identifiers/identifier-json-api.model.ts
+++ b/src/app/shared/models/identifiers/identifier-json-api.model.ts
@@ -1,9 +1,11 @@
-import { ApiData, ResponseJsonApi } from '../common/json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
 
-export type IdentifiersResponseJsonApi = ResponseJsonApi<IdentifiersJsonApiData[]>;
-export type IdentifiersJsonApiData = ApiData<IdentifierAttributes, null, null, null>;
+export type IdentifiersResponseJsonApi = ListResponse<IdentifiersJsonApiData>;
 
-export interface IdentifierAttributes {
+export type IdentifiersJsonApiData = JsonApiResource<'identifiers', IdentifierAttributesJsonApi>;
+
+interface IdentifierAttributesJsonApi {
   category: string;
   value: string;
 }
diff --git a/src/app/shared/models/institutions/institution-json-api.model.ts b/src/app/shared/models/institutions/institution-json-api.model.ts
index 63a7f7a3c..e7812de8f 100644
--- a/src/app/shared/models/institutions/institution-json-api.model.ts
+++ b/src/app/shared/models/institutions/institution-json-api.model.ts
@@ -1,17 +1,17 @@
-import { ApiData, JsonApiResponse, ResponseJsonApi } from '../common/json-api.model';
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { RelatedCountRel } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
 
 import { InstitutionAssets } from './institutions.model';
 
-export type InstitutionsJsonApiResponse = JsonApiResponse<InstitutionDataJsonApi[], null>;
-export type InstitutionsWithMetaJsonApiResponse = ResponseJsonApi<InstitutionDataJsonApi[]>;
-export type InstitutionJsonApiResponse = JsonApiResponse<InstitutionDataJsonApi, null>;
+export type InstitutionsJsonApiResponse = ListResponse<InstitutionDataJsonApi>;
+export type InstitutionJsonApiResponse = ItemResponse<InstitutionDataJsonApi>;
 
-export type InstitutionDataJsonApi = ApiData<
-  InstitutionAttributesJsonApi,
-  null,
-  InstitutionRelationshipsJsonApi,
-  InstitutionLinksJsonApi
->;
+export interface InstitutionDataJsonApi extends JsonApiResource<'institutions', InstitutionAttributesJsonApi> {
+  relationships: InstitutionRelationshipsJsonApi;
+  links: ResourceLinksJsonApi;
+}
 
 interface InstitutionAttributesJsonApi {
   name: string;
@@ -26,43 +26,6 @@ interface InstitutionAttributesJsonApi {
   sso_availability: string;
 }
 
-interface InstitutionLinksJsonApi {
-  self: string;
-  html: string;
-  iri: string;
-}
-
 interface InstitutionRelationshipsJsonApi {
-  nodes: {
-    links: {
-      related: {
-        href: string;
-        meta: Record<string, unknown>;
-      };
-    };
-  };
-  registrations: {
-    links: {
-      related: {
-        href: string;
-        meta: Record<string, unknown>;
-      };
-    };
-  };
-  users: {
-    links: {
-      related: {
-        href: string;
-        meta: Record<string, unknown>;
-      };
-    };
-  };
-  user_metrics: {
-    links: {
-      related: {
-        href: string;
-        meta: Record<string, unknown>;
-      };
-    };
-  };
+  user_metrics: RelatedCountRel;
 }
diff --git a/src/app/shared/models/language-code.model.ts b/src/app/shared/models/language-code.model.ts
deleted file mode 100644
index 217881366..000000000
--- a/src/app/shared/models/language-code.model.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface LanguageCodeModel {
-  code: string;
-  name: string;
-}
diff --git a/src/app/shared/models/license/licenses-json-api.model.ts b/src/app/shared/models/license/licenses-json-api.model.ts
index 62dac41ce..d43ef6433 100644
--- a/src/app/shared/models/license/licenses-json-api.model.ts
+++ b/src/app/shared/models/license/licenses-json-api.model.ts
@@ -1,22 +1,16 @@
-import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '../common/json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
 
-export interface LicensesResponseJsonApi {
-  data: LicenseDataJsonApi[];
-  meta: MetaJsonApi;
-  links: PaginationLinksJsonApi;
-}
-
-export interface LicenseResponseJsonApi {
-  data: LicenseDataJsonApi;
-}
+export type LicensesResponseJsonApi = ListResponse<LicenseDataJsonApi>;
+export type LicenseResponseJsonApi = ItemResponse<LicenseDataJsonApi>;
 
-export type LicenseDataJsonApi = ApiData<LicenseAttributesJsonApi, null, null, null>;
+export type LicenseDataJsonApi = JsonApiResource<'licenses', LicenseAttributesJsonApi>;
 
-export interface LicenseAttributesJsonApi {
+interface LicenseAttributesJsonApi {
   name: string;
   required_fields: string[];
-  url: string;
   text: string;
+  url: string;
 }
 
 export interface LicenseRecordJsonApi {
diff --git a/src/app/shared/models/my-resources/my-resources-item.model.ts b/src/app/shared/models/my-resources/my-resources-item.model.ts
new file mode 100644
index 000000000..935d5bfed
--- /dev/null
+++ b/src/app/shared/models/my-resources/my-resources-item.model.ts
@@ -0,0 +1,11 @@
+import { ContributorModel } from '../contributors/contributor.model';
+
+export interface MyResourcesItem {
+  id: string;
+  dateCreated: string;
+  dateModified: string;
+  isPublic: boolean;
+  contributors: ContributorModel[];
+  title: string;
+  type: string;
+}
diff --git a/src/app/shared/models/my-resources/my-resources-json-api.model.ts b/src/app/shared/models/my-resources/my-resources-json-api.model.ts
new file mode 100644
index 000000000..0d112941a
--- /dev/null
+++ b/src/app/shared/models/my-resources/my-resources-json-api.model.ts
@@ -0,0 +1,22 @@
+import { EmbedList } from '../common/json-api/embeds.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
+import { ContributorDataJsonApi } from '../contributors/contributor-response-json-api.model';
+
+export type MyResourcesResponseJsonApi = ListResponse<MyResourcesItemGetResponseJsonApi>;
+export type MyResourcesItemResponseJsonApi = ItemResponse<MyResourcesItemGetResponseJsonApi>;
+
+export interface MyResourcesItemGetResponseJsonApi extends JsonApiResource<string, MyResourcesItemAttributesJsonApi> {
+  embeds: MyResourcesItemEmbedsJsonApi;
+}
+
+interface MyResourcesItemAttributesJsonApi {
+  date_created: string;
+  date_modified: string;
+  public: boolean;
+  title: string;
+}
+
+interface MyResourcesItemEmbedsJsonApi {
+  bibliographic_contributors: EmbedList<ContributorDataJsonApi>;
+}
diff --git a/src/app/shared/models/my-resources/my-resources.model.ts b/src/app/shared/models/my-resources/my-resources.model.ts
deleted file mode 100644
index 6503e5fe2..000000000
--- a/src/app/shared/models/my-resources/my-resources.model.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { ResponseJsonApi } from '../common/json-api.model';
-import { ContributorModel } from '../contributors/contributor.model';
-import { ContributorDataJsonApi } from '../contributors/contributor-response-json-api.model';
-
-export type MyResourcesItemResponseJsonApi = ResponseJsonApi<MyResourcesItem[]>;
-
-export type MyResourcesResponseJsonApi = ResponseJsonApi<MyResourcesItemGetResponseJsonApi[]>;
-
-export interface MyResourcesItemGetResponseJsonApi {
-  id: string;
-  type: string;
-  attributes: {
-    title: string;
-    date_created: string;
-    date_modified: string;
-    public: boolean;
-  };
-  embeds: {
-    bibliographic_contributors: {
-      data: ContributorDataJsonApi[];
-    };
-  };
-}
-
-export interface MyResourcesItem {
-  id: string;
-  type: string;
-  title: string;
-  dateCreated: string;
-  dateModified: string;
-  isPublic: boolean;
-  contributors: ContributorModel[];
-}
diff --git a/src/app/shared/models/node-links/node-link-json-api.model.ts b/src/app/shared/models/node-links/node-link-json-api.model.ts
index bb0936009..ac280f28e 100644
--- a/src/app/shared/models/node-links/node-link-json-api.model.ts
+++ b/src/app/shared/models/node-links/node-link-json-api.model.ts
@@ -1,12 +1,11 @@
-export interface NodeLinkJsonApi {
-  relationships: {
-    target_node: {
-      data: {
-        id: string;
-        type: string;
-      };
-    };
-  };
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse } from '../common/json-api/responses.model';
+
+export type NodeLinkResponseJsonApi = ItemResponse<NodeLinkDataJsonApi>;
+
+type NodeLinkDataJsonApi = JsonApiResource<'node-links', NodeLinkAttributesJsonApi>;
+
+interface NodeLinkAttributesJsonApi {
   id: string;
-  type: string;
+  type: 'nodes';
 }
diff --git a/src/app/shared/models/node-links/node-link.model.ts b/src/app/shared/models/node-links/node-link.model.ts
deleted file mode 100644
index e3cc18684..000000000
--- a/src/app/shared/models/node-links/node-link.model.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface NodeLink {
-  type: string;
-  id: string;
-  targetNode: {
-    id: string;
-    type: string;
-  };
-}
diff --git a/src/app/shared/models/nodes/base-node-attributes-json-api.model.ts b/src/app/shared/models/nodes/base-node-attributes-json-api.model.ts
index 416cf0b6c..8a3665ab4 100644
--- a/src/app/shared/models/nodes/base-node-attributes-json-api.model.ts
+++ b/src/app/shared/models/nodes/base-node-attributes-json-api.model.ts
@@ -1,5 +1,7 @@
 import { UserPermissions } from '@osf/shared/enums/user-permissions.enum';
 
+import { LicenseRecordJsonApi } from '../license/licenses-json-api.model';
+
 export interface BaseNodeAttributesJsonApi {
   access_requests_enabled: boolean;
   analytics_key: string;
@@ -14,7 +16,7 @@ export interface BaseNodeAttributesJsonApi {
   date_modified: string;
   description: string;
   fork: boolean;
-  node_license: NodeLicenseJsonApi | null;
+  node_license: LicenseRecordJsonApi | null;
   preprint: boolean;
   public: boolean;
   registration: boolean;
@@ -22,8 +24,3 @@ export interface BaseNodeAttributesJsonApi {
   title: string;
   wiki_enabled: boolean;
 }
-
-export interface NodeLicenseJsonApi {
-  copyright_holders: string[];
-  year: string;
-}
diff --git a/src/app/shared/models/nodes/base-node-data-json-api.model.ts b/src/app/shared/models/nodes/base-node-data-json-api.model.ts
index 2c245943a..92cb6ea2d 100644
--- a/src/app/shared/models/nodes/base-node-data-json-api.model.ts
+++ b/src/app/shared/models/nodes/base-node-data-json-api.model.ts
@@ -1,13 +1,14 @@
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+
 import { BaseNodeAttributesJsonApi } from './base-node-attributes-json-api.model';
 import { BaseNodeEmbedsJsonApi } from './base-node-embeds-json-api.model';
-import { BaseNodeLinksJsonApi } from './base-node-links-json-api.model';
 import { BaseNodeRelationships } from './base-node-relationships-json-api.model';
 
 export interface BaseNodeDataJsonApi {
   id: string;
   type: 'nodes';
   attributes: BaseNodeAttributesJsonApi;
-  links: BaseNodeLinksJsonApi;
+  links: ResourceLinksJsonApi;
   relationships: BaseNodeRelationships;
   embeds?: BaseNodeEmbedsJsonApi;
 }
diff --git a/src/app/shared/models/nodes/base-node-embeds-json-api.model.ts b/src/app/shared/models/nodes/base-node-embeds-json-api.model.ts
index 9d669401c..028a535fa 100644
--- a/src/app/shared/models/nodes/base-node-embeds-json-api.model.ts
+++ b/src/app/shared/models/nodes/base-node-embeds-json-api.model.ts
@@ -1,80 +1,19 @@
+import { Embed, EmbedList } from '../common/json-api/embeds.model';
 import { ContributorDataJsonApi } from '../contributors/contributor-response-json-api.model';
-import { IdentifierAttributes, IdentifiersJsonApiData } from '../identifiers/identifier-json-api.model';
+import { IdentifiersJsonApiData } from '../identifiers/identifier-json-api.model';
 import { InstitutionDataJsonApi } from '../institutions/institution-json-api.model';
 import { LicenseDataJsonApi } from '../license/licenses-json-api.model';
-import { RegionDataJsonApi } from '../regions/regions.json-api.model';
+import { RegionDataJsonApi } from '../regions/regions-json-api.model';
+import { WikiDataJsonApi } from '../wiki/wiki-json-api.model';
 
 import { BaseNodeDataJsonApi } from './base-node-data-json-api.model';
 
 export interface BaseNodeEmbedsJsonApi {
-  affiliated_institutions?: {
-    data: InstitutionDataJsonApi[];
-  };
-  bibliographic_contributors?: {
-    data: ContributorDataJsonApi[];
-  };
-  identifiers?: {
-    data: IdentifiersJsonApiData[];
-  };
-  license?: {
-    data: LicenseDataJsonApi;
-  };
-  region?: {
-    data: RegionDataJsonApi;
-  };
-  parent?: {
-    data: BaseNodeDataJsonApi;
-  };
+  affiliated_institutions?: EmbedList<InstitutionDataJsonApi>;
+  bibliographic_contributors?: EmbedList<ContributorDataJsonApi>;
+  identifiers?: EmbedList<IdentifiersJsonApiData>;
+  license?: Embed<LicenseDataJsonApi>;
+  region?: Embed<RegionDataJsonApi>;
+  parent?: Embed<BaseNodeDataJsonApi>;
+  wikis?: EmbedList<WikiDataJsonApi>;
 }
-
-export interface JsonApiResource<T extends string, A> {
-  id: string;
-  type: T;
-  attributes: A;
-}
-
-export interface UserAttributes {
-  full_name: string;
-  given_name: string;
-  middle_names?: string;
-  middle_name?: string;
-  family_name: string;
-  suffix?: string;
-}
-
-export interface UserLinks {
-  html: string;
-  profile_image?: string;
-  self: string;
-  iri: string;
-}
-
-export interface UserResource extends JsonApiResource<'users', UserAttributes> {
-  links: UserLinks;
-}
-
-export interface ContributorResource extends JsonApiResource<'contributors', Record<string, unknown>> {
-  embeds?: {
-    users: {
-      data: UserResource;
-    };
-  };
-}
-
-export interface LicenseAttributes {
-  name: string;
-  text: string;
-  url: string;
-}
-
-export type LicenseResource = JsonApiResource<'licenses', LicenseAttributes>;
-
-export type IdentifierResource = JsonApiResource<'identifiers', IdentifierAttributes>;
-
-export interface InstitutionAttributes {
-  name: string;
-  iri?: string;
-  ror_uri?: string;
-}
-
-export type InstitutionResource = JsonApiResource<'institutions', InstitutionAttributes>;
diff --git a/src/app/shared/models/nodes/base-node-links-json-api.model.ts b/src/app/shared/models/nodes/base-node-links-json-api.model.ts
deleted file mode 100644
index 06e6dc9dd..000000000
--- a/src/app/shared/models/nodes/base-node-links-json-api.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface BaseNodeLinksJsonApi {
-  html: string;
-  self: string;
-  iri: string;
-}
diff --git a/src/app/shared/models/nodes/base-node-relationships-json-api.model.ts b/src/app/shared/models/nodes/base-node-relationships-json-api.model.ts
index 3cc72d45c..9c007cc4e 100644
--- a/src/app/shared/models/nodes/base-node-relationships-json-api.model.ts
+++ b/src/app/shared/models/nodes/base-node-relationships-json-api.model.ts
@@ -1,50 +1,34 @@
-export interface BaseNodeRelationships {
-  affiliated_institutions?: RelationshipWithLinks<'institutions'>;
-  bibliographic_contributors?: RelationshipWithLinks<'contributors'>;
-  cedar_metadata_records?: RelationshipWithLinks<'cedar-metadata-records'>;
-  children?: RelationshipWithLinks<'nodes'>;
-  citation?: RelationshipWithLinks<'citations'>;
-  comments?: RelationshipWithLinks<'comments'>;
-  contributors?: RelationshipWithLinks<'contributors'>;
-  draft_registrations?: RelationshipWithLinks<'draft-registrations'>;
-  files?: RelationshipWithLinks<'files'>;
-  forks?: RelationshipWithLinks<'nodes'>;
-  groups?: RelationshipWithLinks<'groups'>;
-  identifiers?: RelationshipWithLinks<'identifiers'>;
-  implicit_contributors?: RelationshipWithLinks<'contributors'>;
-  license?: RelationshipWithLinks<'licenses'>;
-  linked_by_nodes?: RelationshipWithLinks<'nodes'>;
-  linked_by_registrations?: RelationshipWithLinks<'registrations'>;
-  linked_nodes?: RelationshipWithLinks<'nodes'>;
-  linked_registrations?: RelationshipWithLinks<'registrations'>;
-  logs?: RelationshipWithLinks<'logs'>;
-  node_links?: RelationshipWithLinks<'node-links'>;
-  parent?: RelationshipWithLinks<'nodes'>;
-  preprints?: RelationshipWithLinks<'preprints'>;
-  region?: RelationshipWithLinks<'regions'>;
-  registrations?: RelationshipWithLinks<'registrations'>;
-  root?: RelationshipWithLinks<'nodes'>;
-  settings?: RelationshipWithLinks<'node-settings'>;
-  storage?: RelationshipWithLinks<'node-storage'>;
-  subjects_acceptable?: RelationshipWithLinks<'subjects'>;
-  view_only_links?: RelationshipWithLinks<'view-only-links'>;
-  wikis?: RelationshipWithLinks<'wikis'>;
-}
-
-export interface RelationshipData<T = string> {
-  id: string;
-  type: T;
-}
+import { ToManyRel, ToOneRel } from '../common/json-api/relationships.model';
 
-export interface RelationshipLink {
-  href: string;
-  meta?: Record<string, unknown>;
-}
-
-export interface RelationshipWithLinks<T = string> {
-  links: {
-    related: RelationshipLink;
-    self?: RelationshipLink;
-  };
-  data?: RelationshipData<T>;
+export interface BaseNodeRelationships {
+  affiliated_institutions?: ToManyRel<'institutions'>;
+  bibliographic_contributors?: ToManyRel<'contributors'>;
+  cedar_metadata_records?: ToManyRel<'cedar-metadata-records'>;
+  children?: ToManyRel<'nodes'>;
+  citation?: ToManyRel<'citations'>;
+  comments?: ToManyRel<'comments'>;
+  contributors?: ToManyRel<'contributors'>;
+  draft_registrations?: ToManyRel<'draft-registrations'>;
+  files?: ToManyRel<'files'>;
+  forks?: ToManyRel<'nodes'>;
+  groups?: ToManyRel<'groups'>;
+  identifiers?: ToManyRel<'identifiers'>;
+  implicit_contributors?: ToManyRel<'contributors'>;
+  license?: ToOneRel<'licenses'>;
+  linked_by_nodes?: ToManyRel<'nodes'>;
+  linked_by_registrations?: ToManyRel<'registrations'>;
+  linked_nodes?: ToManyRel<'nodes'>;
+  linked_registrations?: ToManyRel<'registrations'>;
+  logs?: ToManyRel<'logs'>;
+  node_links?: ToManyRel<'node-links'>;
+  parent?: ToOneRel<'nodes'>;
+  preprints?: ToManyRel<'preprints'>;
+  region?: ToOneRel<'regions'>;
+  registrations?: ToManyRel<'registrations'>;
+  root?: ToOneRel<'nodes'>;
+  settings?: ToOneRel<'node-settings'>;
+  storage?: ToOneRel<'node-storage'>;
+  subjects_acceptable?: ToManyRel<'subjects'>;
+  view_only_links?: ToManyRel<'view-only-links'>;
+  wikis?: ToManyRel<'wikis'>;
 }
diff --git a/src/app/shared/models/nodes/node-preprint-json-api.model.ts b/src/app/shared/models/nodes/node-preprint-json-api.model.ts
index ec3832e2f..5cfd2b805 100644
--- a/src/app/shared/models/nodes/node-preprint-json-api.model.ts
+++ b/src/app/shared/models/nodes/node-preprint-json-api.model.ts
@@ -1,12 +1,12 @@
-import { ResponseJsonApi } from '../common/json-api.model';
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
 
-export type NodePreprintResponseJsonApi = ResponseJsonApi<NodePreprintDataJsonApi>;
-export type NodePreprintsResponseJsonApi = ResponseJsonApi<NodePreprintDataJsonApi[]>;
+export type NodePreprintResponseJsonApi = ItemResponse<NodePreprintDataJsonApi>;
+export type NodePreprintsResponseJsonApi = ListResponse<NodePreprintDataJsonApi>;
 
-export interface NodePreprintDataJsonApi {
-  id: string;
-  attributes: NodePreprintAttributesJsonApi;
-  links: NodePreprintLinksJsonApi;
+export interface NodePreprintDataJsonApi extends JsonApiResource<string, NodePreprintAttributesJsonApi> {
+  links: ResourceLinksJsonApi;
 }
 
 export interface NodePreprintAttributesJsonApi {
@@ -19,9 +19,3 @@ export interface NodePreprintAttributesJsonApi {
   is_published: boolean;
   license_record: string;
 }
-
-export interface NodePreprintLinksJsonApi {
-  html: string;
-  iri: string;
-  self: string;
-}
diff --git a/src/app/shared/models/nodes/node-storage-json-api.model.ts b/src/app/shared/models/nodes/node-storage-json-api.model.ts
index 9a04e95f4..b38931fd9 100644
--- a/src/app/shared/models/nodes/node-storage-json-api.model.ts
+++ b/src/app/shared/models/nodes/node-storage-json-api.model.ts
@@ -1,20 +1,11 @@
-import { ResponseJsonApi } from '../common/json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse } from '../common/json-api/responses.model';
 
-export type NodeStorageResponseJsonApi = ResponseJsonApi<NodeStorageDataJsonApi>;
+export type NodeStorageResponseJsonApi = ItemResponse<NodeStorageDataJsonApi>;
 
-export interface NodeStorageDataJsonApi {
-  id: string;
-  type: 'node-storage';
-  attributes: NodeStorageAttributesJsonApi;
-  links: NodeStorageLinksJsonApi;
-}
+export type NodeStorageDataJsonApi = JsonApiResource<'node-storage', NodeStorageAttributesJsonApi>;
 
-export interface NodeStorageAttributesJsonApi {
+interface NodeStorageAttributesJsonApi {
   storage_limit_status: string;
   storage_usage: string;
 }
-
-export interface NodeStorageLinksJsonApi {
-  self: string;
-  iri: string;
-}
diff --git a/src/app/shared/models/nodes/nodes-json-api.model.ts b/src/app/shared/models/nodes/nodes-json-api.model.ts
index a991acf70..4f35108f8 100644
--- a/src/app/shared/models/nodes/nodes-json-api.model.ts
+++ b/src/app/shared/models/nodes/nodes-json-api.model.ts
@@ -1,45 +1,19 @@
-import { ResponseJsonApi } from '../common/json-api.model';
+import { ToManyRelData, ToOneRelData } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { DataResponse, ItemResponse, ListResponse } from '../common/json-api/responses.model';
 
 import { BaseNodeDataJsonApi } from './base-node-data-json-api.model';
 
-export type NodesResponseJsonApi = ResponseJsonApi<BaseNodeDataJsonApi[]>;
-export type NodeResponseJsonApi = ResponseJsonApi<BaseNodeDataJsonApi>;
+export type NodesResponseJsonApi = ListResponse<BaseNodeDataJsonApi>;
+export type NodeResponseJsonApi = ItemResponse<BaseNodeDataJsonApi>;
 
-export interface UpdateNodeRequestModel {
-  data: UpdateNodeDataJsonApi;
-}
+export type UpdateNodeRequestModel = DataResponse<UpdateNodeDataJsonApi>;
+export type CreateProjectPayloadJsoApi = DataResponse<CreateProjectDataJsonApi>;
 
-export interface CreateProjectPayloadJsoApi {
-  data: {
-    type: 'nodes';
-    attributes: {
-      title: string;
-      description?: string;
-      category: 'project';
-      template_from?: string;
-      public: boolean;
-    };
-    relationships: {
-      region: {
-        data: {
-          type: 'regions';
-          id: string;
-        };
-      };
-      affiliated_institutions?: {
-        data: {
-          type: 'institutions';
-          id: string;
-        }[];
-      };
-    };
-  };
-}
+type UpdateNodeDataJsonApi = JsonApiResource<'nodes', UpdateNodeAttributesJsonApi>;
 
-interface UpdateNodeDataJsonApi {
-  id: string;
-  type: 'nodes';
-  attributes: UpdateNodeAttributesJsonApi;
+interface CreateProjectDataJsonApi extends Omit<JsonApiResource<'nodes', CreateProjectAttributesJsonApi>, 'id'> {
+  relationships: CreateProjectRelationshipsJsonApi;
 }
 
 interface UpdateNodeAttributesJsonApi {
@@ -48,3 +22,16 @@ interface UpdateNodeAttributesJsonApi {
   public?: boolean;
   title?: string;
 }
+
+interface CreateProjectAttributesJsonApi {
+  title: string;
+  description?: string;
+  category: 'project';
+  template_from?: string;
+  public: boolean;
+}
+
+interface CreateProjectRelationshipsJsonApi {
+  region: ToOneRelData<'regions'>;
+  affiliated_institutions?: ToManyRelData<'institutions'>;
+}
diff --git a/src/app/shared/models/notifications/notification-subscription-json-api.model.ts b/src/app/shared/models/notifications/notification-subscription-json-api.model.ts
index 61bc1781b..d38c851c6 100644
--- a/src/app/shared/models/notifications/notification-subscription-json-api.model.ts
+++ b/src/app/shared/models/notifications/notification-subscription-json-api.model.ts
@@ -1,20 +1,35 @@
 import { SubscriptionFrequency } from '@osf/shared/enums/subscriptions/subscription-frequency.enum';
 
-export interface NotificationSubscriptionGetResponseJsonApi {
-  id: string;
-  type: 'subscription' | 'user-provider-subscription';
-  attributes: {
-    event_name: string;
-    frequency: string;
-  };
-}
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
+
+export type NotificationSubscriptionsListResponseJsonApi = ListResponse<NotificationSubscriptionDataJsonApi>;
+
+export type NotificationSubscriptionDataJsonApi = JsonApiResource<
+  NotificationSubscriptionTypeJsonApi,
+  NotificationSubscriptionAttributesJsonApi
+>;
+
+export type NotificationSubscriptionGetResponseJsonApi = NotificationSubscriptionDataJsonApi;
 
 export interface NotificationSubscriptionUpdateRequestJsonApi {
-  data: {
-    id?: string;
-    type: 'subscription' | 'user-provider-subscription';
-    attributes: {
-      frequency: SubscriptionFrequency;
-    };
-  };
+  data: NotificationSubscriptionUpdateDataJsonApi;
+}
+
+interface NotificationSubscriptionUpdateDataJsonApi extends Omit<
+  JsonApiResource<NotificationSubscriptionTypeJsonApi, NotificationSubscriptionUpdateAttributesJsonApi>,
+  'id'
+> {
+  id?: string;
+}
+
+type NotificationSubscriptionTypeJsonApi = 'subscription' | 'user-provider-subscription';
+
+interface NotificationSubscriptionAttributesJsonApi {
+  event_name: string;
+  frequency: string;
+}
+
+interface NotificationSubscriptionUpdateAttributesJsonApi {
+  frequency: SubscriptionFrequency;
 }
diff --git a/src/app/shared/models/pagination-links.model.ts b/src/app/shared/models/pagination-links.model.ts
index 055dc3918..40f47c3b5 100644
--- a/src/app/shared/models/pagination-links.model.ts
+++ b/src/app/shared/models/pagination-links.model.ts
@@ -4,6 +4,6 @@ export interface PaginationLinksModel {
   prev?: LinkModel;
 }
 
-export interface LinkModel {
+interface LinkModel {
   href: string;
 }
diff --git a/src/app/features/preprints/models/preprint-json-api.model.ts b/src/app/shared/models/preprints/preprint-json-api.model.ts
similarity index 53%
rename from src/app/features/preprints/models/preprint-json-api.model.ts
rename to src/app/shared/models/preprints/preprint-json-api.model.ts
index 3fa417f48..84e760499 100644
--- a/src/app/features/preprints/models/preprint-json-api.model.ts
+++ b/src/app/shared/models/preprints/preprint-json-api.model.ts
@@ -1,88 +1,83 @@
+import { ApplicabilityStatus, PreregLinkInfo, ReviewsState } from '@osf/features/preprints/enums';
 import { UserPermissions } from '@osf/shared/enums/user-permissions.enum';
 import { BooleanOrNull, StringOrNull } from '@osf/shared/helpers/types.helper';
+import { EmbedList } from '@osf/shared/models/common/json-api/embeds.model';
+import { JsonApiResource } from '@osf/shared/models/common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '@osf/shared/models/common/json-api/responses.model';
 import { ContributorDataJsonApi } from '@shared/models/contributors/contributor-response-json-api.model';
 import { IdentifiersResponseJsonApi } from '@shared/models/identifiers/identifier-json-api.model';
-import { LicenseRecordJsonApi, LicenseResponseJsonApi } from '@shared/models/license/licenses-json-api.model';
+import { LicenseDataJsonApi, LicenseRecordJsonApi } from '@shared/models/license/licenses-json-api.model';
 
-import { ApplicabilityStatus, PreregLinkInfo, ReviewsState } from '../enums';
+import { ToOneRelData } from '../common/json-api/relationships.model';
+
+export type PreprintResponseJsonApi = ItemResponse<PreprintDataJsonApi>;
+export type PreprintsListResponseJsonApi = ListResponse<PreprintDataJsonApi>;
+
+export type PreprintMetricsResponseJsonApi = PreprintResponseJsonApi & {
+  meta: PreprintMetaJsonApi;
+};
+
+export interface PreprintDataJsonApi extends JsonApiResource<'preprints', PreprintAttributesJsonApi> {
+  relationships: PreprintRelationshipsJsonApi;
+  embeds?: PreprintEmbedsJsonApi;
+  links?: PreprintLinksJsonApi;
+}
 
 export interface PreprintAttributesJsonApi {
+  conflict_of_interest_statement: StringOrNull;
+  current_user_permissions: UserPermissions[];
+  custom_publication_citation: StringOrNull;
+  data_links: string[];
   date_created: string;
+  date_last_transitioned: Date | null;
   date_modified: string;
   date_published: Date | null;
-  original_publication_date: Date | null;
-  date_last_transitioned: Date | null;
   date_withdrawn: Date | null;
-  withdrawal_justification: StringOrNull;
-  custom_publication_citation: StringOrNull;
-  doi: StringOrNull;
-  preprint_doi_created: Date | null;
-  title: string;
+  default_license_id: string;
   description: string;
-  is_published: boolean;
+  doi: StringOrNull;
+  has_coi: BooleanOrNull;
+  has_data_links: ApplicabilityStatus | null;
+  has_prereg_links: ApplicabilityStatus | null;
+  is_latest_version: boolean;
   is_preprint_orphan: boolean;
+  is_published: boolean;
   license_record: LicenseRecordJsonApi | null;
-  tags: string[];
-  current_user_permissions: UserPermissions[];
+  original_publication_date: Date | null;
+  prereg_link_info: PreregLinkInfo | null;
+  prereg_links: string[];
+  preprint_doi_created: Date | null;
   public: boolean;
   reviews_state: ReviewsState;
+  tags: string[];
+  title: string;
   version: number;
-  is_latest_version: boolean;
-  has_coi: BooleanOrNull;
-  conflict_of_interest_statement: StringOrNull;
-  has_data_links: ApplicabilityStatus | null;
-  data_links: string[];
   why_no_data: StringOrNull;
-  has_prereg_links: ApplicabilityStatus | null;
   why_no_prereg: StringOrNull;
-  prereg_links: string[];
-  prereg_link_info: PreregLinkInfo | null;
-  default_license_id: string;
+  withdrawal_justification: StringOrNull;
 }
 
-export interface PreprintRelationshipsJsonApi {
-  primary_file: {
-    data: {
-      id: string;
-      type: 'files';
-    };
-  };
-  license: {
-    data: {
-      id: string;
-      type: 'licenses';
-    };
-  };
-  node: {
-    data: {
-      id: string;
-      type: 'nodes';
-    };
-  };
-  provider: {
-    data: {
-      id: string;
-      type: 'preprint-providers';
-    };
-  };
+interface PreprintRelationshipsJsonApi {
+  license: ToOneRelData<'licenses'>;
+  node: ToOneRelData<'nodes'>;
+  primary_file: ToOneRelData<'files'>;
+  provider: ToOneRelData<'preprint-providers'>;
 }
 
-export interface PreprintEmbedsJsonApi {
-  bibliographic_contributors: {
-    data: ContributorDataJsonApi[];
-  };
-  license: LicenseResponseJsonApi;
-  identifiers: IdentifiersResponseJsonApi;
+interface PreprintEmbedsJsonApi {
+  bibliographic_contributors?: EmbedList<ContributorDataJsonApi>;
+  identifiers?: IdentifiersResponseJsonApi;
+  license?: ItemResponse<LicenseDataJsonApi>;
 }
 
-export interface PreprintMetaJsonApi {
+interface PreprintMetaJsonApi {
   metrics: {
     downloads: number;
     views: number;
   };
 }
 
-export interface PreprintLinksJsonApi {
-  preprint_doi: string;
+interface PreprintLinksJsonApi {
   doi: string;
+  preprint_doi: string;
 }
diff --git a/src/app/shared/models/provider/preprints-provider-json-api.model.ts b/src/app/shared/models/provider/preprints-provider-json-api.model.ts
index e49d23559..a7e07003f 100644
--- a/src/app/shared/models/provider/preprints-provider-json-api.model.ts
+++ b/src/app/shared/models/provider/preprints-provider-json-api.model.ts
@@ -10,7 +10,7 @@ export interface PreprintProviderAttributesJsonApi extends BaseProviderAttribute
   reviews_comments_private: boolean;
 }
 
-export interface PreprintProviderAssetsJsonApi {
+interface PreprintProviderAssetsJsonApi {
   favicon: string;
   square_color_no_transparent: string;
   wide_white: string;
diff --git a/src/app/shared/models/provider/providers-json-api.model.ts b/src/app/shared/models/provider/providers-json-api.model.ts
index 7ed7a2ac5..698aab773 100644
--- a/src/app/shared/models/provider/providers-json-api.model.ts
+++ b/src/app/shared/models/provider/providers-json-api.model.ts
@@ -1,14 +1,11 @@
 import { ReviewPermissions } from '@osf/shared/enums/review-permissions.enum';
 
-import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '../common/json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
 
-export interface ProvidersResponseJsonApi {
-  data: ProviderDataJsonApi[];
-  meta: MetaJsonApi;
-  links: PaginationLinksJsonApi;
-}
+export type ProvidersResponseJsonApi = ListResponse<ProviderDataJsonApi>;
 
-export type ProviderDataJsonApi = ApiData<ProviderAttributesJsonApi, null, null, null>;
+export type ProviderDataJsonApi = JsonApiResource<string, ProviderAttributesJsonApi>;
 
 interface ProviderAttributesJsonApi {
   name: string;
diff --git a/src/app/shared/models/provider/registration-provider-json-api.model.ts b/src/app/shared/models/provider/registration-provider-json-api.model.ts
index 7135381b3..2fd111347 100644
--- a/src/app/shared/models/provider/registration-provider-json-api.model.ts
+++ b/src/app/shared/models/provider/registration-provider-json-api.model.ts
@@ -1,7 +1,23 @@
-import { BrandDataJsonApi } from '../brand/brand.json-api.model';
+import { BrandDataJsonApi } from '../brand/brand-json-api.model';
+import { Embed } from '../common/json-api/embeds.model';
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse } from '../common/json-api/responses.model';
 
 import { BaseProviderAttributesJsonApi } from './base-provider-json-api.model';
 
+export type RegistrationProviderResponseJsonApi = ItemResponse<RegistryProviderDetailsJsonApi>;
+
+export interface RegistryProviderDetailsJsonApi extends JsonApiResource<
+  'registration-providers',
+  RegistrationProviderAttributesJsonApi
+> {
+  embeds?: {
+    brand: Embed<BrandDataJsonApi>;
+  };
+  links: ResourceLinksJsonApi;
+}
+
 export interface RegistrationProviderAttributesJsonApi extends BaseProviderAttributesJsonApi {
   allow_bulk_uploads: boolean;
   allow_updates: boolean;
@@ -11,22 +27,8 @@ export interface RegistrationProviderAttributesJsonApi extends BaseProviderAttri
   reviews_comments_anonymous: boolean | null;
 }
 
-export interface RegistrationAssetsJsonApi {
+interface RegistrationAssetsJsonApi {
   square_color_no_transparent: string;
   square_color_transparent: string;
   wide_color: string;
 }
-
-export interface RegistryProviderDetailsJsonApi {
-  id: string;
-  type: 'registration-providers';
-  attributes: RegistrationProviderAttributesJsonApi;
-  embeds?: {
-    brand: {
-      data: BrandDataJsonApi;
-    };
-  };
-  links: {
-    iri: string;
-  };
-}
diff --git a/src/app/shared/models/regions/regions-json-api.model.ts b/src/app/shared/models/regions/regions-json-api.model.ts
new file mode 100644
index 000000000..9116442dd
--- /dev/null
+++ b/src/app/shared/models/regions/regions-json-api.model.ts
@@ -0,0 +1,10 @@
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
+
+export type RegionsResponseJsonApi = ListResponse<RegionDataJsonApi>;
+
+export type RegionDataJsonApi = JsonApiResource<'regions', RegionAttributesJsonApi>;
+
+interface RegionAttributesJsonApi {
+  name: string;
+}
diff --git a/src/app/shared/models/regions/regions.json-api.model.ts b/src/app/shared/models/regions/regions.json-api.model.ts
deleted file mode 100644
index 87645a2ae..000000000
--- a/src/app/shared/models/regions/regions.json-api.model.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ResponseJsonApi } from '../common/json-api.model';
-
-export type RegionsResponseJsonApi = ResponseJsonApi<RegionDataJsonApi[]>;
-
-export interface RegionDataJsonApi {
-  id: string;
-  type: 'regions';
-  attributes: RegionAttributesJsonApi;
-  links: RegionLinksJsonApi;
-}
-
-export interface RegionAttributesJsonApi {
-  name: string;
-}
-
-export interface RegionLinksJsonApi {
-  self: string;
-}
diff --git a/src/app/shared/models/registration/registration-json-api.model.ts b/src/app/shared/models/registration/registration-json-api.model.ts
index db3e46f74..6b6c4f299 100644
--- a/src/app/shared/models/registration/registration-json-api.model.ts
+++ b/src/app/shared/models/registration/registration-json-api.model.ts
@@ -2,240 +2,134 @@ import { RegistrationReviewStates } from '@osf/shared/enums/registration-review-
 import { RevisionReviewStates } from '@osf/shared/enums/revision-review-states.enum';
 import { UserPermissions } from '@osf/shared/enums/user-permissions.enum';
 
-import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '../common/json-api.model';
+import { EmbedList } from '../common/json-api/embeds.model';
+import { RelatedCountRel, ToOneRel, ToOneRelData } from '../common/json-api/relationships.model';
+import { JsonApiResource, JsonApiResourceRef } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
 import { ContributorDataJsonApi } from '../contributors/contributor-response-json-api.model';
 import { LicenseRecordJsonApi } from '../license/licenses-json-api.model';
-import { RegistrationProviderAttributesJsonApi } from '../provider/registration-provider-json-api.model';
+import { RegistryProviderDetailsJsonApi } from '../provider/registration-provider-json-api.model';
 
-export interface DraftRegistrationResponseJsonApi {
-  data: DraftRegistrationDataJsonApi;
-  meta: MetaJsonApi;
-  links: PaginationLinksJsonApi;
+import { RegistrationNodeAttributesJsonApi } from './registration-node-json-api.model';
+
+export type DraftRegistrationResponseJsonApi = ItemResponse<DraftRegistrationDataJsonApi>;
+export type DraftRegistrationListResponseJsonApi = ListResponse<DraftRegistrationDataJsonApi>;
+export type RegistrationResponseJsonApi = ItemResponse<RegistrationDataJsonApi>;
+export type RegistrationListResponseJsonApi = ListResponse<RegistrationDataJsonApi>;
+
+export interface DraftRegistrationDataJsonApi extends JsonApiResource<
+  'draft_registrations',
+  DraftRegistrationAttributesJsonApi
+> {
+  relationships: DraftRegistrationRelationshipsJsonApi;
+  embeds?: DraftRegistrationEmbedsJsonApi;
 }
 
-export interface RegistrationResponseJsonApi {
-  data: RegistrationDataJsonApi;
-  meta: MetaJsonApi;
-  links: PaginationLinksJsonApi;
+export interface RegistrationDataJsonApi extends JsonApiResource<'registrations', RegistrationNodeAttributesJsonApi> {
+  relationships: RegistrationRelationshipsJsonApi;
+  embeds?: RegistrationEmbedsJsonApi;
 }
 
-export type DraftRegistrationDataJsonApi = ApiData<
-  DraftRegistrationAttributesJsonApi,
-  DraftRegistrationEmbedsJsonApi,
-  DraftRegistrationRelationshipsJsonApi,
-  null
->;
+export interface CreateRegistrationPayloadJsonApi {
+  data: {
+    id: string;
+    type: 'draft_registrations';
+    relationships?: DraftRegistrationRelationshipPayloadJsonApi;
+    attributes?: Partial<DraftRegistrationAttributesJsonApi>;
+  };
+}
 
-export type RegistrationDataJsonApi = ApiData<
-  RegistrationAttributesJsonApi,
-  RegistrationEmbedsJsonApi,
-  RegistrationRelationshipsJsonApi,
-  null
->;
+export interface DraftRegistrationRelationshipPayloadJsonApi {
+  branched_from?: { data: JsonApiResourceRef<'nodes'> | null };
+  license?: { data: JsonApiResourceRef<'licenses'> | null };
+  provider?: { data: JsonApiResourceRef<'providers'> | null };
+  registration_schema?: { data: JsonApiResourceRef<'registration-schemas'> | null };
+}
 
 export interface DraftRegistrationAttributesJsonApi {
   category: string;
+  current_user_permissions: UserPermissions[];
   date_created: string;
   datetime_initiated: string;
   datetime_updated: string;
+  default_license_id?: string;
   description: string;
   has_project: boolean;
-  default_license_id?: string;
   node_license: LicenseRecordJsonApi;
+  public?: boolean;
   registration_metadata: Record<string, unknown>;
   registration_responses: Record<string, unknown>;
   tags: string[];
   title: string;
-  public?: boolean;
-  current_user_permissions: UserPermissions[];
+}
+
+export interface DraftRegistrationRelationshipsJsonApi {
+  branched_from?: ToOneRel<'nodes'>;
+  license?: ToOneRel<'licenses'>;
+  provider?: ToOneRel<'providers'>;
+  registration_schema?: ToOneRel<'registration-schemas'>;
 }
 
 export interface RegistrationAttributesJsonApi {
   access_requests_enabled: boolean;
+  archiving: boolean;
+  current_user_permissions: UserPermissions[];
   date_created: string;
   date_modified: string;
   description: string;
   embargoed: boolean;
-  archiving: boolean;
-  public: boolean;
-  title: string;
   has_analytic_code: boolean;
   has_data: boolean;
   has_materials: boolean;
   has_papers: boolean;
   has_project: boolean;
   has_supplements: boolean;
-  revision_state: RevisionReviewStates;
-  reviews_state: RegistrationReviewStates;
-  pending_registration_approval: boolean;
   pending_embargo_approval: boolean;
   pending_embargo_termination_approval: boolean;
-  current_user_permissions: UserPermissions[];
-}
-
-export interface DraftRegistrationRelationshipsJsonApi {
-  registration_schema?: {
-    data: {
-      id: string;
-      type: 'registration-schemas';
-    };
-  };
-  provider?: {
-    data: {
-      id: string;
-      type: 'providers';
-    };
-  };
-  license?: {
-    data: {
-      id: string;
-      type: 'licenses';
-    };
-  };
-  branched_from?: {
-    data: {
-      id: string;
-      type: 'nodes';
-    };
-    links?: {
-      related: {
-        href: string;
-      };
-    };
-  };
+  pending_registration_approval: boolean;
+  public: boolean;
+  revision_state: RevisionReviewStates;
+  reviews_state: RegistrationReviewStates;
+  title: string;
 }
 
-export interface RegistrationRelationshipsJsonApi {
-  registration_schema?: {
-    data: {
-      id: string;
-      type: 'registration-schemas';
-    };
-  };
-  license?: {
-    data: {
-      id: string;
-      type: 'licenses';
-    };
-  };
-  root: {
-    data: {
-      id: string;
-      type: string;
-    };
-  };
+interface RegistrationRelationshipsJsonApi {
+  license?: ToOneRel<'licenses'>;
+  registration_schema?: ToOneRel<'registration-schemas'>;
+  root: ToOneRelData;
 }
 
-export interface RegistrationEmbedsJsonApi {
-  registration_schema?: {
-    data: {
-      attributes: {
-        name: string;
-      };
-    };
-  };
-  bibliographic_contributors?: {
-    data: ContributorDataJsonApi[];
-  };
-  provider?: {
-    data: {
-      attributes: RegistrationProviderAttributesJsonApi;
-    };
-  };
+interface RegistrationEmbedsJsonApi {
+  bibliographic_contributors?: EmbedList<ContributorDataJsonApi>;
+  provider?: RegistrationProviderEmbedJsonApi;
+  registration_schema?: RegistrationSchemaNameEmbedJsonApi;
 }
 
-export interface DraftRegistrationEmbedsJsonApi extends RegistrationEmbedsJsonApi {
-  branched_from?: {
-    data: {
-      id: string;
-      type: 'nodes';
-      attributes: {
-        title: string;
-      };
-      relationships?: {
-        files?: {
-          links: {
-            related: {
-              href: string;
-            };
-          };
-        };
-      };
-    };
-  };
+interface DraftRegistrationEmbedsJsonApi extends RegistrationEmbedsJsonApi {
+  branched_from?: BranchedFromEmbedJsonApi;
 }
 
-export interface CreateRegistrationPayloadJsonApi {
+interface RegistrationSchemaNameEmbedJsonApi {
   data: {
-    type: 'draft_registrations';
-    id: string;
-    relationships?: DraftRegistrationRelationshipsJsonApi;
-    attributes?: Partial<DraftRegistrationAttributesJsonApi>;
+    attributes: {
+      name: string;
+    };
   };
 }
 
-export interface SchemaResponsesJsonApi {
-  data: SchemaResponseDataJsonApi[];
-  meta: MetaJsonApi;
-  links: PaginationLinksJsonApi;
+interface RegistrationProviderEmbedJsonApi {
+  data: RegistryProviderDetailsJsonApi;
 }
 
-export interface SchemaResponseJsonApi {
-  data: SchemaResponseDataJsonApi;
-}
-
-export type SchemaResponseDataJsonApi = ApiData<
-  SchemaResponseAttributesJsonApi,
-  SchemaResponseEmbedsJsonApi,
-  SchemaResponseRelationshipsJsonApi,
-  null
->;
-
-export interface SchemaResponseAttributesJsonApi {
-  id: string;
-  date_created: string;
-  date_submitted: string | null;
-  date_modified: string;
-  revision_justification: string;
-  revision_responses: Record<string, unknown>;
-  updated_response_keys: string[];
-  reviews_state: RevisionReviewStates;
-  is_pending_current_user_approval: boolean;
-  is_original_response: boolean;
-}
-
-export interface SchemaResponseRelationshipsJsonApi {
-  registration_schema: {
-    data: {
-      id: string;
-      type: 'registration-schemas';
-    };
-  };
-  registration: {
-    data: {
-      id: string;
-      type: 'registrations';
+interface BranchedFromEmbedJsonApi {
+  data: {
+    id: string;
+    type: string;
+    attributes: {
+      title: string;
     };
-  };
-}
-
-export interface SchemaResponseEmbedsJsonApi {
-  registration: {
-    data: {
-      id: string;
-      type: 'registrations';
-      attributes: {
-        title: string;
-      };
-      relationships: {
-        files: {
-          links: {
-            related: {
-              href: string;
-            };
-          };
-        };
-      };
+    relationships?: {
+      files?: RelatedCountRel;
     };
   };
 }
diff --git a/src/app/shared/models/registration/registration-node-json-api.model.ts b/src/app/shared/models/registration/registration-node-json-api.model.ts
index f8402b799..44187ec72 100644
--- a/src/app/shared/models/registration/registration-node-json-api.model.ts
+++ b/src/app/shared/models/registration/registration-node-json-api.model.ts
@@ -31,7 +31,7 @@ export interface RegistrationNodeAttributesJsonApi extends BaseNodeAttributesJso
   withdrawn: boolean;
 }
 
-export interface RegisteredMetaExtraJsonApi {
+interface RegisteredMetaExtraJsonApi {
   data: { name: string };
   nodeId: string;
   sha256: string;
@@ -39,33 +39,33 @@ export interface RegisteredMetaExtraJsonApi {
   selectedFileName: string;
 }
 
-export interface RegisteredMetaFieldJsonApi {
+interface RegisteredMetaFieldJsonApi {
   extra: RegisteredMetaExtraJsonApi[];
   value: string;
 }
 
-export interface RegisteredMetaJsonApi {
+interface RegisteredMetaJsonApi {
   summary: { extra: string[]; value: string };
   uploader: RegisteredMetaFieldJsonApi;
 }
 
-export interface FileUrlsJsonApi {
+interface FileUrlsJsonApi {
   html: string;
   download: string;
 }
 
-export interface FileHashesJsonApi {
+interface FileHashesJsonApi {
   sha256: string;
 }
 
-export interface RegistrationUploaderJsonApi {
+interface RegistrationUploaderJsonApi {
   file_id: string;
   file_name: string;
   file_urls: FileUrlsJsonApi;
   file_hashes: FileHashesJsonApi;
 }
 
-export interface RegistrationResponsesJsonApi {
+interface RegistrationResponsesJsonApi {
   summary: string;
   uploader: RegistrationUploaderJsonApi[];
 }
diff --git a/src/app/shared/models/registration/registration-node.model.ts b/src/app/shared/models/registration/registration-node.model.ts
index fe861c23d..c6c307ddd 100644
--- a/src/app/shared/models/registration/registration-node.model.ts
+++ b/src/app/shared/models/registration/registration-node.model.ts
@@ -47,12 +47,3 @@ export interface RegisteredMeta {
   summary: { extra: string[]; value: string };
   uploader: RegisteredMetaField;
 }
-
-export interface FileUrls {
-  html: string;
-  download: string;
-}
-
-export interface FileHashes {
-  sha256: string;
-}
diff --git a/src/app/shared/models/registration/registration.model.ts b/src/app/shared/models/registration/registration.model.ts
index 5178078b8..9d328eed1 100644
--- a/src/app/shared/models/registration/registration.model.ts
+++ b/src/app/shared/models/registration/registration.model.ts
@@ -3,6 +3,7 @@ import { RevisionReviewStates } from '@osf/shared/enums/revision-review-states.e
 
 import { IdTypeModel } from '../common/id-type.model';
 import { ContributorModel } from '../contributors/contributor.model';
+import { IdentifierModel } from '../identifiers/identifier.model';
 import { LicensesOption } from '../license/license.model';
 import { SubjectModel } from '../subject/subject.model';
 
@@ -32,12 +33,7 @@ export interface RegistrationModel {
     text: string;
     url: string;
   };
-  identifiers?: {
-    id: string;
-    type: string;
-    category: string;
-    value: string;
-  }[];
+  identifiers?: IdentifierModel[];
   analyticsKey: string;
   currentUserCanComment: boolean;
   currentUserPermissions: string[];
diff --git a/src/app/shared/models/registration/schema-blocks-json-api.model.ts b/src/app/shared/models/registration/schema-blocks-json-api.model.ts
index f9c03177b..239625721 100644
--- a/src/app/shared/models/registration/schema-blocks-json-api.model.ts
+++ b/src/app/shared/models/registration/schema-blocks-json-api.model.ts
@@ -1,14 +1,11 @@
 import { BlockType } from '@osf/shared/enums/block-type.enum';
 
-import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '../common/json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
 
-export interface SchemaBlocksResponseJsonApi {
-  data: SchemaBlockJsonApi[];
-  meta: MetaJsonApi;
-  links: PaginationLinksJsonApi;
-}
+export type SchemaBlocksResponseJsonApi = ListResponse<SchemaBlockJsonApi>;
 
-export type SchemaBlockJsonApi = ApiData<SchemaBlockAttributesJsonApi, null, null, null>;
+type SchemaBlockJsonApi = JsonApiResource<'schema-blocks', SchemaBlockAttributesJsonApi>;
 
 interface SchemaBlockAttributesJsonApi {
   block_type: BlockType;
diff --git a/src/app/shared/models/registration/schema-response-json-api.model.ts b/src/app/shared/models/registration/schema-response-json-api.model.ts
new file mode 100644
index 000000000..ec3d054fb
--- /dev/null
+++ b/src/app/shared/models/registration/schema-response-json-api.model.ts
@@ -0,0 +1,46 @@
+import { RevisionReviewStates } from '@osf/shared/enums/revision-review-states.enum';
+
+import { RelatedCountRel, ToOneRel } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
+
+export type SchemaResponsesJsonApi = ListResponse<SchemaResponseDataJsonApi>;
+export type SchemaResponseJsonApi = ItemResponse<SchemaResponseDataJsonApi>;
+
+export interface SchemaResponseDataJsonApi extends JsonApiResource<
+  'schema_responses',
+  SchemaResponseAttributesJsonApi
+> {
+  relationships: SchemaResponseRelationshipsJsonApi;
+  embeds?: SchemaResponseEmbedsJsonApi;
+}
+
+interface SchemaResponseAttributesJsonApi {
+  date_created: string;
+  date_modified: string;
+  date_submitted: string | null;
+  id: string;
+  is_original_response: boolean;
+  is_pending_current_user_approval: boolean;
+  revision_justification: string;
+  revision_responses: Record<string, unknown>;
+  reviews_state: RevisionReviewStates;
+  updated_response_keys: string[];
+}
+
+interface SchemaResponseRelationshipsJsonApi {
+  registration: ToOneRel<'registrations'>;
+  registration_schema?: ToOneRel<'registration-schemas'>;
+}
+
+interface SchemaResponseEmbedsJsonApi {
+  registration: SchemaResponseRegistrationEmbedJsonApi;
+}
+
+interface SchemaResponseRegistrationEmbedJsonApi {
+  data: {
+    relationships: {
+      files: RelatedCountRel;
+    };
+  };
+}
diff --git a/src/app/shared/models/request-access/request-access-json-api.model.ts b/src/app/shared/models/request-access/request-access-json-api.model.ts
index 83765b57e..e9d5926fa 100644
--- a/src/app/shared/models/request-access/request-access-json-api.model.ts
+++ b/src/app/shared/models/request-access/request-access-json-api.model.ts
@@ -1,27 +1,25 @@
 import { ContributorPermission } from '@osf/shared/enums/contributors/contributor-permission.enum';
 
-import { ResponseJsonApi } from '../common/json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
 import { UserDataErrorResponseJsonApi } from '../user/user-json-api.model';
 
-export type RequestAccessResponseJsonApi = ResponseJsonApi<RequestAccessDataJsonApi[]>;
+export type RequestAccessResponseJsonApi = ListResponse<RequestAccessDataJsonApi>;
 
-export interface RequestAccessDataJsonApi {
-  id: string;
-  type: 'node-requests';
-  attributes: RequestAccessAttributesJsonApi;
+export interface RequestAccessDataJsonApi extends JsonApiResource<'node-requests', RequestAccessAttributesJsonApi> {
   embeds: RequestAccessEmbedsJsonApi;
 }
 
-export interface RequestAccessAttributesJsonApi {
-  request_type: string;
-  machine_state: string;
+interface RequestAccessAttributesJsonApi {
   comment: string;
   created: string;
-  modified: string;
   date_last_transitioned: string;
+  machine_state: string;
+  modified: string;
+  request_type: string;
   requested_permissions: ContributorPermission | null;
 }
 
-export interface RequestAccessEmbedsJsonApi {
+interface RequestAccessEmbedsJsonApi {
   creator: UserDataErrorResponseJsonApi;
 }
diff --git a/src/app/shared/models/resource-metadata.model.ts b/src/app/shared/models/resource-metadata.model.ts
index b187fdb9a..bed1636b3 100644
--- a/src/app/shared/models/resource-metadata.model.ts
+++ b/src/app/shared/models/resource-metadata.model.ts
@@ -8,12 +8,14 @@ export interface ResourceMetadata {
   language: string;
   resourceTypeGeneral: string;
   identifiers: IdentifierModel[];
-  funders: {
-    funderName: string;
-    funderIdentifier: string;
-    funderIdentifierType: string;
-    awardNumber: string;
-    awardUri: string;
-    awardTitle: string;
-  }[];
+  funders: ResourceFunderModel[];
+}
+
+interface ResourceFunderModel {
+  funderName: string;
+  funderIdentifier: string;
+  funderIdentifierType: string;
+  awardNumber: string;
+  awardUri: string;
+  awardTitle: string;
 }
diff --git a/src/app/shared/models/review-action/review-action-payload-json-api.model.ts b/src/app/shared/models/review-action/review-action-payload-json-api.model.ts
index 4b13022dd..47b638a0c 100644
--- a/src/app/shared/models/review-action/review-action-payload-json-api.model.ts
+++ b/src/app/shared/models/review-action/review-action-payload-json-api.model.ts
@@ -1,19 +1,20 @@
 import { ReviewActionTrigger } from '@osf/shared/enums/trigger-action.enum';
 
-export interface ReviewActionPayloadJsonApi<ActionType, TargetType> {
+import { ToOneRelData } from '../common/json-api/relationships.model';
+
+export interface ReviewActionPayloadJsonApi<TActionType extends string, TTargetType extends string> {
   data: {
-    type: ActionType;
-    attributes: {
-      trigger: ReviewActionTrigger | string;
-      comment: string;
-    };
-    relationships: {
-      target: {
-        data: {
-          type: TargetType;
-          id: string;
-        };
-      };
-    };
+    type: TActionType;
+    attributes: ReviewActionPayloadAttributesJsonApi;
+    relationships: ReviewActionPayloadRelationshipsJsonApi<TTargetType>;
   };
 }
+
+interface ReviewActionPayloadAttributesJsonApi {
+  comment: string;
+  trigger: ReviewActionTrigger | string;
+}
+
+interface ReviewActionPayloadRelationshipsJsonApi<TTargetType extends string> {
+  target: ToOneRelData<TTargetType>;
+}
diff --git a/src/app/shared/models/search/filter-option-removed.ts b/src/app/shared/models/search/filter-option-removed.model.ts
similarity index 100%
rename from src/app/shared/models/search/filter-option-removed.ts
rename to src/app/shared/models/search/filter-option-removed.model.ts
diff --git a/src/app/shared/models/search/filter-options-json-api.model.ts b/src/app/shared/models/search/filter-options-json-api.model.ts
index dbcf6ba9a..fb4dbde9e 100644
--- a/src/app/shared/models/search/filter-options-json-api.model.ts
+++ b/src/app/shared/models/search/filter-options-json-api.model.ts
@@ -1,31 +1,20 @@
-import { ApiData } from '../common/json-api.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
 
 import { SearchResultDataJsonApi } from './index-card-search-json-api.model';
 
 export interface FilterOptionsResponseJsonApi {
   data: FilterOptionsResponseData;
   included?: (FilterOptionItem | SearchResultDataJsonApi)[];
-  links?: {
-    first?: string;
-    next?: string;
-    prev?: string;
-    last?: string;
-  };
-  meta?: {
-    total?: number;
-    page?: number;
-    'per-page'?: number;
-  };
 }
 
 interface FilterOptionsResponseData {
-  type: string;
-  id: string;
   attributes: Record<string, unknown>;
+  id: string;
   relationships?: Record<string, unknown>;
+  type: string;
 }
 
-export type FilterOptionItem = ApiData<FilterOptionAttributes, null, null, null>;
+export type FilterOptionItem = JsonApiResource<string, FilterOptionAttributes>;
 
 export interface FilterOptionAttributes {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/app/shared/models/search/index-card-search-included-json-api.model.ts b/src/app/shared/models/search/index-card-search-included-json-api.model.ts
new file mode 100644
index 000000000..28904b485
--- /dev/null
+++ b/src/app/shared/models/search/index-card-search-included-json-api.model.ts
@@ -0,0 +1,64 @@
+import { ToOneRelData } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+
+import {
+  MatchEvidencePropertyPathJsonApi,
+  RelatedPropertyPathJsonApi,
+  ResourceMetadataJsonApi,
+} from './index-card-search-metadata-json-api.model';
+
+export type IndexCardSearchIncludedJsonApi =
+  | IndexCardDataJsonApi
+  | RelatedPropertyPathDataJsonApi
+  | SearchResultDataJsonApi;
+
+export type RelatedPropertyPathDataJsonApi = JsonApiResource<
+  'related-property-path',
+  RelatedPropertyPathAttributesJsonApi
+>;
+
+export type IndexCardDataJsonApi = JsonApiResource<'index-card', IndexCardAttributesJsonApi>;
+
+export interface SearchResultDataJsonApi extends Omit<
+  JsonApiResource<'search-result', SearchResultAttributesJsonApi>,
+  'attributes'
+> {
+  relationships: SearchResultRelationshipsJsonApi;
+  attributes?: SearchResultAttributesJsonApi;
+}
+
+interface RelatedPropertyPathAttributesJsonApi {
+  propertyPathKey: string;
+  propertyPath: RelatedPropertyPathJsonApi[];
+  suggestedFilterOperator: string;
+  cardSearchResultCount: number;
+  osfmapPropertyPath: string[];
+}
+
+interface IndexCardAttributesJsonApi {
+  resourceIdentifier: string[];
+  resourceMetadata: ResourceMetadataJsonApi;
+}
+
+interface SearchResultRelationshipsJsonApi {
+  indexCard: ToOneRelData<'index-card'>;
+}
+
+interface SearchResultAttributesJsonApi {
+  matchEvidence: (IriMatchEvidence | TextMatchEvidence)[];
+  cardSearchResultCount: number;
+}
+
+interface IriMatchEvidence {
+  matchingIri: string;
+  osfmapPropertyPath: string[];
+  propertyPathKey: string;
+  propertyPath: MatchEvidencePropertyPathJsonApi[];
+}
+
+interface TextMatchEvidence {
+  matchingHighlight: string;
+  osfmapPropertyPath: string[];
+  propertyPathKey: string;
+  propertyPath: MatchEvidencePropertyPathJsonApi[];
+}
diff --git a/src/app/shared/models/search/index-card-search-json-api.model.ts b/src/app/shared/models/search/index-card-search-json-api.model.ts
index 331f98d75..33053e357 100644
--- a/src/app/shared/models/search/index-card-search-json-api.model.ts
+++ b/src/app/shared/models/search/index-card-search-json-api.model.ts
@@ -1,196 +1,37 @@
-import { ApiData, JsonApiResponse } from '../common/json-api.model';
+import { ToManyRelData } from '../common/json-api/relationships.model';
+import { JsonApiResourceRef } from '../common/json-api/resource.model';
+import { PaginationLinksModel } from '../pagination-links.model';
 
-export type IndexCardSearchResponseJsonApi = JsonApiResponse<
-  {
-    attributes: {
-      totalResultCount: number | { '@id': string };
-    };
-    relationships: {
-      searchResultPage: SearchResultPageJsonApi;
-      relatedProperties: RelatedPropertiesJsonApi;
-    };
-    links: {
-      self: string;
-    };
-  },
-  (IndexCardDataJsonApi | RelatedPropertyPathDataJsonApi | SearchResultDataJsonApi)[]
->;
+import { IndexCardSearchIncludedJsonApi } from './index-card-search-included-json-api.model';
+import { IdNodeJsonApi } from './index-card-search-metadata-json-api.model';
 
-export type RelatedPropertyPathDataJsonApi = ApiData<RelatedPropertyPathAttributesJsonApi, null, null, null>;
-export type IndexCardDataJsonApi = ApiData<IndexCardAttributesJsonApi, null, null, null>;
+export type {
+  IndexCardDataJsonApi,
+  IndexCardSearchIncludedJsonApi,
+  RelatedPropertyPathDataJsonApi,
+  SearchResultDataJsonApi,
+} from './index-card-search-included-json-api.model';
 
-interface SearchResultPageJsonApi {
-  data: { id: string }[];
-  links: {
-    first: {
-      href: string;
-    };
-    next: {
-      href: string;
-    };
-    prev?: {
-      href: string;
-    };
-  };
-}
-
-interface RelatedPropertiesJsonApi {
-  data: { id: string }[];
-}
-
-export interface RelatedPropertyPathAttributesJsonApi {
-  propertyPathKey: string;
-  propertyPath: {
-    '@id': string;
-    displayLabel: {
-      '@language': string;
-      '@value': string;
-    }[];
-    description?: {
-      '@language': string;
-      '@value': string;
-    }[];
-    link?: {
-      '@language': string;
-      '@value': string;
-    }[];
-    linkText?: {
-      '@language': string;
-      '@value': string;
-    }[];
-    resourceType: {
-      '@id': string;
-    }[];
-    shortFormLabel: {
-      '@language': string;
-      '@value': string;
-    }[];
-  }[];
-  suggestedFilterOperator: string;
-  cardSearchResultCount: number;
-  osfmapPropertyPath: string[];
-}
-
-export interface SearchResultDataJsonApi {
-  id: string;
-  type: 'search-result';
-  relationships: {
-    indexCard: {
-      data: {
-        id: string;
-        type: 'index-card';
-      };
-    };
-  };
-  attributes?: {
-    matchEvidence: (IriMatchEvidence | TextMatchEvidence)[];
-    cardSearchResultCount: number;
-  };
-}
-
-interface IndexCardAttributesJsonApi {
-  resourceIdentifier: string[];
-  resourceMetadata: ResourceMetadataJsonApi;
-}
-
-interface ResourceMetadataJsonApi {
-  '@id': string;
-  resourceType: { '@id': string }[];
-  name: { '@value': string }[];
-  title: { '@value': string }[];
-  fileName: { '@value': string }[];
-  description: { '@value': string }[];
-
-  dateCreated: { '@value': string }[];
-  dateModified: { '@value': string }[];
-  dateWithdrawn: { '@value': string }[];
-
-  creator: Creator[];
-  hasVersion: MetadataField[];
-  identifier: { '@value': string }[];
-  publisher: MetadataField[];
-  rights: MetadataField[];
-  language: { '@value': string }[];
-  statedConflictOfInterest: { '@value': string }[];
-  resourceNature: ResourceNature[];
-  isPartOfCollection: MetadataField[];
-  storageByteCount: { '@value': string }[];
-  storageRegion: { prefLabel: { '@value': string }[] }[];
-  usage: Usage;
-  hasOsfAddon: { prefLabel: { '@value': string }[] }[];
-  funder: MetadataField[];
-  affiliation: MetadataField[];
-  qualifiedAttribution: QualifiedAttribution[];
-  isPartOf: MetadataField[];
-  isContainedBy: IsContainedBy[];
-  conformsTo: MetadataField[];
-  hasPreregisteredAnalysisPlan: { '@id': string }[];
-  hasPreregisteredStudyDesign: { '@id': string }[];
-  hasDataResource: MetadataField[];
-  hasAnalyticCodeResource: MetadataField[];
-  hasMaterialsResource: MetadataField[];
-  hasPapersResource: MetadataField[];
-  hasSupplementalResource: MetadataField[];
-}
-
-interface MetadataField {
-  '@id': string;
-  identifier: { '@value': string }[];
-  name: { '@value': string }[];
-  resourceType: { '@id': string }[];
-  title: { '@value': string }[];
-}
-
-interface QualifiedAttribution {
-  agent: { '@id': string }[];
-  hadRole: { '@id': string }[];
-  'osf:order': { '@value': string }[];
+export interface IndexCardSearchResponseJsonApi {
+  data: IndexCardSearchDataJsonApi;
+  included?: IndexCardSearchIncludedJsonApi[];
 }
 
-interface Usage {
-  viewCount: { '@value': string }[];
-  downloadCount: { '@value': string }[];
+interface IndexCardSearchDataJsonApi {
+  attributes: IndexCardSearchAttributesJsonApi;
+  relationships: IndexCardSearchRelationshipsJsonApi;
 }
 
-interface Creator extends MetadataField {
-  affiliation: MetadataField[];
+interface IndexCardSearchAttributesJsonApi {
+  totalResultCount: number | IdNodeJsonApi;
 }
 
-interface IriMatchEvidence {
-  matchingIri: string;
-  osfmapPropertyPath: string[];
-  propertyPathKey: string;
-  propertyPath: {
-    displayLabel: {
-      '@language': string;
-      '@value': string;
-    }[];
-  }[];
+interface IndexCardSearchRelationshipsJsonApi {
+  relatedProperties: ToManyRelData;
+  searchResultPage: SearchResultPageJsonApi;
 }
 
-interface TextMatchEvidence {
-  matchingHighlight: string;
-  osfmapPropertyPath: string[];
-  propertyPathKey: string;
-  propertyPath: {
-    displayLabel: {
-      '@language': string;
-      '@value': string;
-    }[];
-  }[];
-}
-
-interface IsContainedBy extends MetadataField {
-  funder: MetadataField[];
-  creator: Creator[];
-  rights: MetadataField[];
-  qualifiedAttribution: QualifiedAttribution[];
-}
-
-interface ResourceNature {
-  '@id': string;
-  displayLabel: {
-    '@language': string;
-    '@value': string;
-  }[];
+interface SearchResultPageJsonApi {
+  data: JsonApiResourceRef[];
+  links: PaginationLinksModel;
 }
diff --git a/src/app/shared/models/search/index-card-search-metadata-json-api.model.ts b/src/app/shared/models/search/index-card-search-metadata-json-api.model.ts
new file mode 100644
index 000000000..320abbb3b
--- /dev/null
+++ b/src/app/shared/models/search/index-card-search-metadata-json-api.model.ts
@@ -0,0 +1,98 @@
+export interface ResourceMetadataJsonApi {
+  '@id': string;
+  resourceType: IdNodeJsonApi[];
+  name: ValueNodeJsonApi[];
+  title: ValueNodeJsonApi[];
+  fileName: ValueNodeJsonApi[];
+  description: ValueNodeJsonApi[];
+  dateCreated: ValueNodeJsonApi[];
+  dateModified: ValueNodeJsonApi[];
+  dateWithdrawn: ValueNodeJsonApi[];
+  creator: CreatorJsonApi[];
+  hasVersion: MetadataFieldJsonApi[];
+  identifier: ValueNodeJsonApi[];
+  publisher: MetadataFieldJsonApi[];
+  rights: MetadataFieldJsonApi[];
+  language: ValueNodeJsonApi[];
+  statedConflictOfInterest: ValueNodeJsonApi[];
+  resourceNature: ResourceNatureJsonApi[];
+  isPartOfCollection: MetadataFieldJsonApi[];
+  storageByteCount: ValueNodeJsonApi[];
+  storageRegion: { prefLabel: ValueNodeJsonApi[] }[];
+  usage: UsageJsonApi;
+  hasOsfAddon: { prefLabel: ValueNodeJsonApi[] }[];
+  funder: MetadataFieldJsonApi[];
+  affiliation: MetadataFieldJsonApi[];
+  qualifiedAttribution: QualifiedAttributionJsonApi[];
+  isPartOf: MetadataFieldJsonApi[];
+  isContainedBy: IsContainedByJsonApi[];
+  conformsTo: MetadataFieldJsonApi[];
+  hasPreregisteredAnalysisPlan: IdNodeJsonApi[];
+  hasPreregisteredStudyDesign: IdNodeJsonApi[];
+  hasDataResource: MetadataFieldJsonApi[];
+  hasAnalyticCodeResource: MetadataFieldJsonApi[];
+  hasMaterialsResource: MetadataFieldJsonApi[];
+  hasPapersResource: MetadataFieldJsonApi[];
+  hasSupplementalResource: MetadataFieldJsonApi[];
+}
+
+export interface RelatedPropertyPathJsonApi {
+  '@id': string;
+  displayLabel: LanguageValueNodeJsonApi[];
+  description?: LanguageValueNodeJsonApi[];
+  link?: LanguageValueNodeJsonApi[];
+  linkText?: LanguageValueNodeJsonApi[];
+  resourceType: IdNodeJsonApi[];
+  shortFormLabel: LanguageValueNodeJsonApi[];
+}
+
+export interface MatchEvidencePropertyPathJsonApi {
+  displayLabel: LanguageValueNodeJsonApi[];
+}
+
+interface ValueNodeJsonApi {
+  '@value': string;
+}
+
+interface LanguageValueNodeJsonApi extends ValueNodeJsonApi {
+  '@language': string;
+}
+
+export interface IdNodeJsonApi {
+  '@id': string;
+}
+
+interface MetadataFieldJsonApi {
+  '@id': string;
+  identifier: ValueNodeJsonApi[];
+  name: ValueNodeJsonApi[];
+  resourceType: IdNodeJsonApi[];
+  title: ValueNodeJsonApi[];
+}
+
+interface QualifiedAttributionJsonApi {
+  agent: IdNodeJsonApi[];
+  hadRole: IdNodeJsonApi[];
+  'osf:order': ValueNodeJsonApi[];
+}
+
+interface UsageJsonApi {
+  viewCount: ValueNodeJsonApi[];
+  downloadCount: ValueNodeJsonApi[];
+}
+
+interface CreatorJsonApi extends MetadataFieldJsonApi {
+  affiliation: MetadataFieldJsonApi[];
+}
+
+interface IsContainedByJsonApi extends MetadataFieldJsonApi {
+  funder: MetadataFieldJsonApi[];
+  creator: CreatorJsonApi[];
+  rights: MetadataFieldJsonApi[];
+  qualifiedAttribution: QualifiedAttributionJsonApi[];
+}
+
+interface ResourceNatureJsonApi {
+  '@id': string;
+  displayLabel: LanguageValueNodeJsonApi[];
+}
diff --git a/src/app/shared/models/search/resource.model.ts b/src/app/shared/models/search/resource.model.ts
index a1a8dc2ef..b5ae72a4a 100644
--- a/src/app/shared/models/search/resource.model.ts
+++ b/src/app/shared/models/search/resource.model.ts
@@ -72,7 +72,6 @@ export interface ResourcesData {
   resources: ResourceModel[];
   filters: DiscoverableFilter[];
   count: number;
-  self: string;
   first: StringOrNull;
   next: StringOrNull;
   previous: StringOrNull;
diff --git a/src/app/shared/models/subject/subjects-json-api.model.ts b/src/app/shared/models/subject/subjects-json-api.model.ts
index 4e181fa38..9890634f9 100644
--- a/src/app/shared/models/subject/subjects-json-api.model.ts
+++ b/src/app/shared/models/subject/subjects-json-api.model.ts
@@ -1,54 +1,27 @@
-import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '../common/json-api.model';
+import { Embed } from '../common/json-api/embeds.model';
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { RelatedCountRel, ToOneRel } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ListResponse } from '../common/json-api/responses.model';
 
-export interface SubjectsResponseJsonApi {
-  data: SubjectDataJsonApi[];
-  meta: MetaJsonApi;
-  links: PaginationLinksJsonApi;
-}
+export type SubjectsResponseJsonApi = ListResponse<SubjectDataJsonApi>;
 
-export type SubjectDataJsonApi = ApiData<
-  SubjectAttributesJsonApi,
-  SubjectEmbedsJsonApi,
-  SubjectRelationshipsJsonApi,
-  SubjectLinksJsonApi
->;
+export interface SubjectDataJsonApi extends JsonApiResource<string, SubjectAttributesJsonApi> {
+  relationships: SubjectRelationshipsJsonApi;
+  embeds?: SubjectEmbedsJsonApi;
+  links: ResourceLinksJsonApi;
+}
 
 interface SubjectAttributesJsonApi {
-  text: string;
   taxonomy_name: string;
-}
-
-interface SubjectLinksJsonApi {
-  iri: string;
+  text: string;
 }
 
 interface SubjectRelationshipsJsonApi {
-  parent?: {
-    links: {
-      related: {
-        href: string;
-        meta: Record<string, unknown>;
-      };
-    };
-    data?: {
-      id: string;
-      type: 'subjects';
-    };
-  };
-  children: {
-    links: {
-      related: {
-        href: string;
-        meta: {
-          count: number;
-        };
-      };
-    };
-  };
+  children: RelatedCountRel;
+  parent?: ToOneRel<'subjects'>;
 }
 
 interface SubjectEmbedsJsonApi {
-  parent?: {
-    data: SubjectDataJsonApi;
-  };
+  parent?: Embed<SubjectDataJsonApi>;
 }
diff --git a/src/app/shared/models/user-related-counts/user-related-counts-json-api.model.ts b/src/app/shared/models/user-related-counts/user-related-counts-json-api.model.ts
index 4aa5586be..4ab9944e5 100644
--- a/src/app/shared/models/user-related-counts/user-related-counts-json-api.model.ts
+++ b/src/app/shared/models/user-related-counts/user-related-counts-json-api.model.ts
@@ -1,42 +1,18 @@
-import { ApiData, JsonApiResponse } from '../common/json-api.model';
+import { RelatedCountRel } from '../common/json-api/relationships.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse } from '../common/json-api/responses.model';
+import { UserAttributesJsonApi } from '../user/user-json-api.model';
 
-export type UserRelatedCountsResponseJsonApi = JsonApiResponse<
-  ApiData<
-    {
-      employment: { institution: string }[];
-      education: { institution: string }[];
-    },
-    null,
-    {
-      registrations: {
-        links: {
-          related: {
-            meta: {
-              count: number;
-            };
-          };
-        };
-      };
-      preprints: {
-        links: {
-          related: {
-            meta: {
-              count: number;
-            };
-          };
-        };
-      };
-      nodes: {
-        links: {
-          related: {
-            meta: {
-              count: number;
-            };
-          };
-        };
-      };
-    },
-    null
-  >,
-  null
->;
+export type UserRelatedCountsResponseJsonApi = ItemResponse<UserRelatedCountsDataJsonApi>;
+
+export interface UserRelatedCountsDataJsonApi extends JsonApiResource<'users', UserAttributesJsonApi> {
+  relationships: UserRelatedCountsRelationshipsJsonApi;
+}
+
+interface UserRelatedCountsRelationshipsJsonApi {
+  draft_preprints: RelatedCountRel;
+  institutions: RelatedCountRel;
+  nodes: RelatedCountRel;
+  preprints: RelatedCountRel;
+  registrations: RelatedCountRel;
+}
diff --git a/src/app/shared/models/user/creator.model.ts b/src/app/shared/models/user/creator.model.ts
new file mode 100644
index 000000000..3ebe8961d
--- /dev/null
+++ b/src/app/shared/models/user/creator.model.ts
@@ -0,0 +1,4 @@
+export interface CreatorModel {
+  id: string;
+  fullName: string;
+}
diff --git a/src/app/shared/models/user/user-json-api.model.ts b/src/app/shared/models/user/user-json-api.model.ts
index 0d3848e77..9416761e2 100644
--- a/src/app/shared/models/user/user-json-api.model.ts
+++ b/src/app/shared/models/user/user-json-api.model.ts
@@ -1,11 +1,13 @@
-import { ResponseDataJsonApi } from '../common/json-api.model';
+import { ResourceLinksJsonApi } from '../common/json-api/links.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse } from '../common/json-api/responses.model';
 
 import { Education } from './education.model';
 import { Employment } from './employment.model';
 import { ExternalIdentityModel } from './external-identity.model';
 import { SocialModel } from './social.model';
 
-export type UserResponseJsonApi = ResponseDataJsonApi<UserDataJsonApi>;
+export type UserResponseJsonApi = ItemResponse<UserDataJsonApi>;
 
 export interface UserDataResponseJsonApi {
   meta: {
@@ -25,10 +27,7 @@ export interface UserDataErrorResponseJsonApi {
   errors?: UserErrorResponseJsonApi[];
 }
 
-export interface UserDataJsonApi {
-  id: string;
-  type: string;
-  attributes: UserAttributesJsonApi;
+export interface UserDataJsonApi extends JsonApiResource<string, UserAttributesJsonApi> {
   relationships: UserRelationshipsJsonApi;
   links: UserLinksJsonApi;
 }
@@ -52,14 +51,14 @@ export interface UserAttributesJsonApi {
   timezone: string;
 }
 
-export interface UserErrorResponseJsonApi {
+interface UserErrorResponseJsonApi {
   source: Record<string, unknown>;
   detail: string;
   meta: UserErrorMetaJsonApi;
   status: string;
 }
 
-export interface UserErrorMetaJsonApi {
+interface UserErrorMetaJsonApi {
   full_name: string;
   family_name: string;
   given_name: string;
@@ -67,12 +66,9 @@ export interface UserErrorMetaJsonApi {
   profile_image: string;
 }
 
-interface UserLinksJsonApi {
-  html: string;
-  iri: string;
-  profile_image: string;
-  self: string;
+interface UserLinksJsonApi extends ResourceLinksJsonApi {
   merged_by?: string;
+  profile_image: string;
 }
 
 interface UserRelationshipsJsonApi {
@@ -80,8 +76,5 @@ interface UserRelationshipsJsonApi {
 }
 
 interface DefaultRegionJsonApi {
-  data: {
-    id: string;
-    type: 'regions';
-  };
+  data: JsonApiResource<'regions'>;
 }
diff --git a/src/app/shared/models/user/user.model.ts b/src/app/shared/models/user/user.model.ts
index 8371e46e7..873557b0b 100644
--- a/src/app/shared/models/user/user.model.ts
+++ b/src/app/shared/models/user/user.model.ts
@@ -25,7 +25,7 @@ export interface UserModel {
   timezone: string;
   locale: string;
   social: SocialModel;
-  external_identity: ExternalIdentityModel;
+  externalIdentity: ExternalIdentityModel;
   defaultRegionId: string;
   link?: string;
   iri?: string;
diff --git a/src/app/shared/models/view-only-links/view-only-link-response.model.ts b/src/app/shared/models/view-only-links/view-only-link-response.model.ts
index 75567f68d..cac596412 100644
--- a/src/app/shared/models/view-only-links/view-only-link-response.model.ts
+++ b/src/app/shared/models/view-only-links/view-only-link-response.model.ts
@@ -1,23 +1,24 @@
-import { ResponseJsonApi } from '../common/json-api.model';
+import { EmbedList } from '../common/json-api/embeds.model';
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
 import { BaseNodeDataJsonApi } from '../nodes/base-node-data-json-api.model';
 import { UserDataErrorResponseJsonApi } from '../user/user-json-api.model';
 
-export type ViewOnlyLinksResponsesJsonApi = ResponseJsonApi<ViewOnlyLinkJsonApi[]>;
-export type ViewOnlyLinksResponseJsonApi = ResponseJsonApi<ViewOnlyLinkJsonApi>;
+export type ViewOnlyLinksResponsesJsonApi = ListResponse<ViewOnlyLinkJsonApi>;
+export type ViewOnlyLinksResponseJsonApi = ItemResponse<ViewOnlyLinkJsonApi>;
 
-export interface ViewOnlyLinkJsonApi {
-  id: string;
-  type: 'view_only_links';
-  attributes: {
-    key: string;
-    date_created: string;
-    anonymous: boolean;
-    name: string;
-  };
-  embeds: {
-    creator: UserDataErrorResponseJsonApi;
-    nodes: {
-      data: BaseNodeDataJsonApi[];
-    };
-  };
+export interface ViewOnlyLinkJsonApi extends JsonApiResource<'view_only_links', ViewOnlyLinkAttributesJsonApi> {
+  embeds: ViewOnlyLinkEmbedsJsonApi;
+}
+
+interface ViewOnlyLinkEmbedsJsonApi {
+  creator: UserDataErrorResponseJsonApi;
+  nodes: EmbedList<BaseNodeDataJsonApi>;
+}
+
+interface ViewOnlyLinkAttributesJsonApi {
+  anonymous: boolean;
+  date_created: string;
+  key: string;
+  name: string;
 }
diff --git a/src/app/shared/models/view-only-links/view-only-link.model.ts b/src/app/shared/models/view-only-links/view-only-link.model.ts
index 85aa100b8..a3c9baacb 100644
--- a/src/app/shared/models/view-only-links/view-only-link.model.ts
+++ b/src/app/shared/models/view-only-links/view-only-link.model.ts
@@ -1,7 +1,4 @@
-export interface ViewOnlyLinkCreatorModel {
-  id: string;
-  fullName: string;
-}
+import { CreatorModel } from '../user/creator.model';
 
 export interface ViewOnlyLinkNodeModel {
   id: string;
@@ -15,7 +12,7 @@ export interface ViewOnlyLinkModel {
   key: string;
   name: string;
   link: string;
-  creator: ViewOnlyLinkCreatorModel;
+  creator: CreatorModel;
   nodes: ViewOnlyLinkNodeModel[];
   anonymous: boolean;
 }
diff --git a/src/app/shared/models/wiki/wiki-json-api.model.ts b/src/app/shared/models/wiki/wiki-json-api.model.ts
new file mode 100644
index 000000000..19950715b
--- /dev/null
+++ b/src/app/shared/models/wiki/wiki-json-api.model.ts
@@ -0,0 +1,36 @@
+import { UserDataErrorResponseJsonApi } from '@shared/models/user/user-json-api.model';
+
+import { JsonApiResource } from '../common/json-api/resource.model';
+import { ItemResponse, ListResponse } from '../common/json-api/responses.model';
+
+export type WikiResponseJsonApi = ListResponse<WikiDataJsonApi>;
+export type WikiItemResponseJsonApi = ItemResponse<WikiDataJsonApi>;
+export type WikiVersionResponseJsonApi = ListResponse<WikiVersionJsonApi>;
+export type WikiVersionItemResponseJsonApi = ItemResponse<WikiVersionJsonApi>;
+
+export interface WikiDataJsonApi extends JsonApiResource<'wikis', WikiAttributesJsonApi> {
+  links: WikiLinksJsonApi;
+}
+
+export interface WikiVersionJsonApi extends JsonApiResource<'wiki-versions', WikiVersionAttributesJsonApi> {
+  embeds: WikiVersionEmbedsJsonApi;
+}
+
+interface WikiAttributesJsonApi {
+  name: string;
+  kind: string;
+  content_type: string;
+  date_modified: string;
+}
+
+interface WikiLinksJsonApi {
+  download: string;
+}
+
+interface WikiVersionAttributesJsonApi {
+  date_created: string;
+}
+
+interface WikiVersionEmbedsJsonApi {
+  user: UserDataErrorResponseJsonApi;
+}
diff --git a/src/app/shared/models/wiki/wiki-menu.model.ts b/src/app/shared/models/wiki/wiki-menu.model.ts
index 4a0524a00..159650c39 100644
--- a/src/app/shared/models/wiki/wiki-menu.model.ts
+++ b/src/app/shared/models/wiki/wiki-menu.model.ts
@@ -1,6 +1,6 @@
 import { MenuItem } from 'primeng/api';
 
-import { WikiItemType } from './wiki-type.model';
+import { WikiItemType } from '../../enums/wiki-type.enum';
 
 export interface WikiMenuItem extends MenuItem {
   type?: WikiItemType;
diff --git a/src/app/shared/models/wiki/wiki.model.ts b/src/app/shared/models/wiki/wiki.model.ts
index 3b11d1cc1..b534e9d65 100644
--- a/src/app/shared/models/wiki/wiki.model.ts
+++ b/src/app/shared/models/wiki/wiki.model.ts
@@ -1,24 +1,9 @@
-import { UserDataErrorResponseJsonApi } from '@shared/models/user/user-json-api.model';
-
-import { JsonApiResponse, JsonApiResponseWithMeta, MetaAnonymousJsonApi } from '../common/json-api.model';
-
-export enum WikiModes {
-  View = 'view',
-  Edit = 'edit',
-  Compare = 'compare',
-}
-
 export interface WikiModel {
   id: string;
   name: string;
   kind: string;
 }
 
-export interface WikisWithMeta {
-  wikis: WikiModel[];
-  meta: MetaAnonymousJsonApi;
-}
-
 export interface WikiVersion {
   id: string;
   createdAt: string;
@@ -38,72 +23,3 @@ export interface HomeWiki {
   downloadLink: string;
   content?: string;
 }
-
-export interface HomeWikiGetResponse {
-  id: string;
-  type: string;
-  attributes: {
-    name: string;
-    content_type: string;
-  };
-  links: {
-    download: string;
-  };
-}
-
-export interface WikiGetResponse {
-  id: string;
-  type: string;
-  attributes: {
-    name: string;
-    kind: string;
-  };
-}
-
-export interface ComponentsWikiGetResponse {
-  id: string;
-  type: string;
-  attributes: {
-    title: string;
-  };
-  embeds: {
-    wikis: {
-      data: WikiGetResponse[];
-    };
-  };
-}
-
-export interface WikiVersionJsonApi {
-  id: string;
-  type: string;
-  attributes: {
-    date_created: string;
-  };
-  embeds: {
-    user: UserDataErrorResponseJsonApi;
-  };
-}
-
-export interface HomeWikiJsonApiResponse extends JsonApiResponse<HomeWikiGetResponse[], null> {
-  data: HomeWikiGetResponse[];
-}
-
-export interface WikiJsonApiResponse extends JsonApiResponse<WikiGetResponse[], null> {
-  data: WikiGetResponse[];
-}
-
-export interface WikiJsonApiResponseWithMeta extends JsonApiResponseWithMeta<
-  WikiGetResponse[],
-  MetaAnonymousJsonApi,
-  null
-> {
-  data: WikiGetResponse[];
-}
-
-export interface ComponentsWikiJsonApiResponse extends JsonApiResponse<ComponentsWikiGetResponse[], null> {
-  data: ComponentsWikiGetResponse[];
-}
-
-export interface WikiVersionJsonApiResponse extends JsonApiResponse<WikiVersionJsonApi[], null> {
-  data: WikiVersionJsonApi[];
-}
diff --git a/src/app/shared/services/activity-logs/activity-log-display.service.ts b/src/app/shared/services/activity-logs/activity-log-display.service.ts
index c1ebff194..071e97ea7 100644
--- a/src/app/shared/services/activity-logs/activity-log-display.service.ts
+++ b/src/app/shared/services/activity-logs/activity-log-display.service.ts
@@ -3,7 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { inject, Injectable } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 
-import { ActivityLog } from '@osf/shared/models/activity-logs/activity-logs.model';
+import { ActivityLogModel } from '@osf/shared/models/activity-logs/activity-logs.model';
 
 import { ActivityLogFormatterService } from './activity-log-formatter.service';
 
@@ -15,7 +15,7 @@ export class ActivityLogDisplayService {
   private readonly sanitizer = inject(DomSanitizer);
   private readonly formatter = inject(ActivityLogFormatterService);
 
-  getActivityDisplay(log: ActivityLog): SafeHtml {
+  getActivityDisplay(log: ActivityLogModel): SafeHtml {
     const translationKey = `activityLog.activities.${log.action}`;
     const translationParams = this.buildTranslationParams(log);
 
@@ -26,7 +26,7 @@ export class ActivityLogDisplayService {
     return this.sanitizer.bypassSecurityTrustHtml(htmlContent);
   }
 
-  private buildTranslationParams(log: ActivityLog): Record<string, unknown> {
+  private buildTranslationParams(log: ActivityLogModel): Record<string, unknown> {
     return {
       addon: log.params.addon || '',
       anonymousLink: this.formatter.buildAnonymous(log),
diff --git a/src/app/shared/services/activity-logs/activity-log-formatter.service.spec.ts b/src/app/shared/services/activity-logs/activity-log-formatter.service.spec.ts
index d0f9d1204..7f5ab69a8 100644
--- a/src/app/shared/services/activity-logs/activity-log-formatter.service.spec.ts
+++ b/src/app/shared/services/activity-logs/activity-log-formatter.service.spec.ts
@@ -3,6 +3,8 @@ import { TranslateService } from '@ngx-translate/core';
 import { TestBed } from '@angular/core/testing';
 
 import { makeActivityLog } from '@testing/mocks/activity-log.mock';
+import { testNode } from '@testing/mocks/base-node.mock';
+import { MOCK_USER } from '@testing/mocks/data.mock';
 import { provideOSFCore } from '@testing/osf.testing.provider';
 
 import { ActivityLogFormatterService } from './activity-log-formatter.service';
@@ -41,17 +43,9 @@ describe('ActivityLogFormatterService', () => {
     const log = makeActivityLog({
       embeds: {
         user: {
+          ...MOCK_USER,
           id: 'user-1',
-          type: 'users',
           fullName: 'Jane Doe',
-          givenName: 'Jane',
-          middleNames: '',
-          familyName: 'Doe',
-          suffix: '',
-          dateRegistered: '2024-01-01T00:00:00Z',
-          active: true,
-          timezone: 'UTC',
-          locale: 'en',
         },
       },
     });
@@ -252,28 +246,10 @@ describe('ActivityLogFormatterService', () => {
     const log = makeActivityLog({
       embeds: {
         linkedNode: {
+          ...testNode,
           id: 'node-1',
-          type: 'nodes',
           title: 'Linked',
-          description: '',
           category: 'project',
-          customCitation: null,
-          dateCreated: '2024-01-01T00:00:00Z',
-          dateModified: '2024-01-01T00:00:00Z',
-          registration: false,
-          preprint: false,
-          fork: false,
-          collection: false,
-          tags: [],
-          accessRequestsEnabled: false,
-          nodeLicense: { copyrightHolders: [], year: null },
-          currentUserCanComment: false,
-          currentUserPermissions: [],
-          currentUserIsContributor: false,
-          currentUserIsContributorOrGroupMember: false,
-          wikiEnabled: false,
-          public: true,
-          subjects: [],
         },
       },
     });
diff --git a/src/app/shared/services/activity-logs/activity-log-formatter.service.ts b/src/app/shared/services/activity-logs/activity-log-formatter.service.ts
index f7f0d5f01..2a0e63e6e 100644
--- a/src/app/shared/services/activity-logs/activity-log-formatter.service.ts
+++ b/src/app/shared/services/activity-logs/activity-log-formatter.service.ts
@@ -2,7 +2,7 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { inject, Injectable } from '@angular/core';
 
-import { ActivityLog } from '@osf/shared/models/activity-logs/activity-logs.model';
+import { ActivityLogModel } from '@osf/shared/models/activity-logs/activity-logs.model';
 
 import { ActivityLogUrlBuilderService } from './activity-log-url-builder.service';
 
@@ -26,13 +26,13 @@ export class ActivityLogFormatterService {
     'other',
   ];
 
-  buildAnonymous(log: ActivityLog): string {
+  buildAnonymous(log: ActivityLogModel): string {
     return log.params.anonymousLink
       ? this.translateService.instant('activityLog.defaults.anonymousAn')
       : this.translateService.instant('activityLog.defaults.anonymousA');
   }
 
-  buildCommentLocation(log: ActivityLog): string {
+  buildCommentLocation(log: ActivityLogModel): string {
     const file = log.params.file;
     const wiki = log.params.wiki;
 
@@ -51,7 +51,7 @@ export class ActivityLogFormatterService {
     return '';
   }
 
-  buildContributorsList(log: ActivityLog): string {
+  buildContributorsList(log: ActivityLogModel): string {
     if (!log.params.contributors || log.params.contributors.length === 0) {
       return this.translateService.instant('activityLog.defaults.someUsers');
     }
@@ -89,7 +89,7 @@ export class ActivityLogFormatterService {
     return contribList.join(' ');
   }
 
-  buildDestination(log: ActivityLog): string {
+  buildDestination(log: ActivityLogModel): string {
     if (!log.params.destination) {
       return this.translateService.instant('activityLog.defaults.aNewNameLocation');
     }
@@ -111,7 +111,7 @@ export class ActivityLogFormatterService {
     }
   }
 
-  buildIdentifiers(log: ActivityLog): string {
+  buildIdentifiers(log: ActivityLogModel): string {
     if (!log.params.identifiers) {
       return '';
     }
@@ -130,11 +130,11 @@ export class ActivityLogFormatterService {
     return '';
   }
 
-  buildOldPage(log: ActivityLog): string {
+  buildOldPage(log: ActivityLogModel): string {
     return log.params.oldPage ? log.params.oldPage : this.translateService.instant('activityLog.defaults.pageTitle');
   }
 
-  buildPage(log: ActivityLog): string {
+  buildPage(log: ActivityLogModel): string {
     if (!log.params.page) {
       return this.translateService.instant('activityLog.defaults.pageTitle');
     }
@@ -142,7 +142,7 @@ export class ActivityLogFormatterService {
     return this.urlBuilder.buildPageUrl(log, log.params.page);
   }
 
-  buildPath(log: ActivityLog): string {
+  buildPath(log: ActivityLogModel): string {
     if (!log.params.path) {
       return this.translateService.instant('activityLog.defaults.aFile');
     }
@@ -151,7 +151,7 @@ export class ActivityLogFormatterService {
     return this.urlBuilder.buildFileUrl(log, path);
   }
 
-  buildPathType(log: ActivityLog): string {
+  buildPathType(log: ActivityLogModel): string {
     if (!log.params.path) {
       return '';
     }
@@ -161,7 +161,7 @@ export class ActivityLogFormatterService {
       : this.translateService.instant('activityLog.defaults.file');
   }
 
-  buildSource(log: ActivityLog): string {
+  buildSource(log: ActivityLogModel): string {
     if (!log.params.source) {
       return this.translateService.instant('activityLog.defaults.aNameLocation');
     }
@@ -175,17 +175,17 @@ export class ActivityLogFormatterService {
     });
   }
 
-  buildTitleNew(log: ActivityLog): string {
+  buildTitleNew(log: ActivityLogModel): string {
     const url = this.urlBuilder.buildTitleUrl(log, log.params.titleNew);
     return url || this.translateService.instant('activityLog.defaults.aTitle');
   }
 
-  buildTitleOriginal(log: ActivityLog): string {
+  buildTitleOriginal(log: ActivityLogModel): string {
     const url = this.urlBuilder.buildTitleUrl(log, log.params.titleOriginal);
     return url || this.translateService.instant('activityLog.defaults.aTitle');
   }
 
-  buildUpdatedFields(log: ActivityLog): string {
+  buildUpdatedFields(log: ActivityLogModel): string {
     if (!log.params.updatedFields) {
       return this.translateService.instant('activityLog.defaults.field');
     }
@@ -211,16 +211,16 @@ export class ActivityLogFormatterService {
     });
   }
 
-  buildVersion(log: ActivityLog): string {
+  buildVersion(log: ActivityLogModel): string {
     return log.params.version || '#';
   }
 
-  getPointerCategory(log: ActivityLog): string {
+  getPointerCategory(log: ActivityLogModel): string {
     const linkedNode = log.embeds?.linkedNode;
     return linkedNode?.category || '';
   }
 
-  buildUser(log: ActivityLog): string {
+  buildUser(log: ActivityLogModel): string {
     const userUrl = this.urlBuilder.buildUserUrl(log);
 
     if (userUrl) {
@@ -234,39 +234,39 @@ export class ActivityLogFormatterService {
     return this.translateService.instant('activityLog.defaults.aUser');
   }
 
-  buildNode(log: ActivityLog): string {
+  buildNode(log: ActivityLogModel): string {
     const nodeUrl = this.urlBuilder.buildNodeUrl(log);
     return nodeUrl || this.translateService.instant('activityLog.defaults.aProject');
   }
 
-  buildEmbeddedNode(log: ActivityLog): string {
+  buildEmbeddedNode(log: ActivityLogModel): string {
     const url = this.urlBuilder.buildEmbeddedUrl(log);
     return url || this.translateService.instant('activityLog.defaults.aTitle');
   }
 
-  buildTemplate(log: ActivityLog): string {
+  buildTemplate(log: ActivityLogModel): string {
     const url = this.urlBuilder.buildTemplateUrl(log);
     return url || this.translateService.instant('activityLog.defaults.aTitle');
   }
 
-  buildInstitution(log: ActivityLog): string {
+  buildInstitution(log: ActivityLogModel): string {
     return this.urlBuilder.buildInstitutionUrl(log);
   }
 
-  buildTag(log: ActivityLog): string {
+  buildTag(log: ActivityLogModel): string {
     return this.urlBuilder.buildTagUrl(log);
   }
 
-  buildPreprint(log: ActivityLog): string {
+  buildPreprint(log: ActivityLogModel): string {
     const preprintWord = this.translateService.instant('activityLog.defaults.preprint');
     return this.urlBuilder.buildPreprintUrl(log, preprintWord);
   }
 
-  buildPreprintProvider(log: ActivityLog): string {
+  buildPreprintProvider(log: ActivityLogModel): string {
     return this.urlBuilder.buildPreprintProviderUrl(log);
   }
 
-  buildFallbackMessage(log: ActivityLog): string {
+  buildFallbackMessage(log: ActivityLogModel): string {
     const user = this.buildUser(log);
     const node = this.buildNode(log);
     const action = log.action.replace(/_/g, ' ');
diff --git a/src/app/shared/services/activity-logs/activity-log-url-builder.service.ts b/src/app/shared/services/activity-logs/activity-log-url-builder.service.ts
index e13408b3e..878cde66a 100644
--- a/src/app/shared/services/activity-logs/activity-log-url-builder.service.ts
+++ b/src/app/shared/services/activity-logs/activity-log-url-builder.service.ts
@@ -1,7 +1,7 @@
 import { isPlatformBrowser } from '@angular/common';
 import { inject, Injectable, PLATFORM_ID } from '@angular/core';
 
-import { ActivityLog } from '@osf/shared/models/activity-logs/activity-logs.model';
+import { ActivityLogModel } from '@osf/shared/models/activity-logs/activity-logs.model';
 
 @Injectable({
   providedIn: 'root',
@@ -15,7 +15,7 @@ export class ActivityLogUrlBuilderService {
     return `<a href="${relativeUrl}">${value}</a>`;
   }
 
-  buildUserUrl(log: ActivityLog): string {
+  buildUserUrl(log: ActivityLogModel): string {
     const user = log.embeds?.user;
     const githubUser = log.params.githubUser;
 
@@ -30,7 +30,7 @@ export class ActivityLogUrlBuilderService {
     return '';
   }
 
-  buildNodeUrl(log: ActivityLog): string {
+  buildNodeUrl(log: ActivityLogModel): string {
     if (!log.params.paramsNode) {
       return '';
     }
@@ -42,7 +42,7 @@ export class ActivityLogUrlBuilderService {
     return this.buildAHrefElement(`/${log.params.paramsNode.id}`, log.params.paramsNode.title);
   }
 
-  buildInstitutionUrl(log: ActivityLog): string {
+  buildInstitutionUrl(log: ActivityLogModel): string {
     if (!log.params.institution) {
       return '';
     }
@@ -50,7 +50,7 @@ export class ActivityLogUrlBuilderService {
     return this.buildAHrefElement(`/institutions/${log.params.institution.id}`, log.params.institution.name);
   }
 
-  buildTagUrl(log: ActivityLog): string {
+  buildTagUrl(log: ActivityLogModel): string {
     if (!log.params.tag) {
       return '';
     }
@@ -58,7 +58,7 @@ export class ActivityLogUrlBuilderService {
     return this.buildAHrefElement(`/search?search=%22${log.params.tag}%22`, log.params.tag);
   }
 
-  buildPreprintUrl(log: ActivityLog, preprintWord: string): string {
+  buildPreprintUrl(log: ActivityLogModel, preprintWord: string): string {
     if (!log.params.preprint) {
       return '';
     }
@@ -66,7 +66,7 @@ export class ActivityLogUrlBuilderService {
     return this.buildAHrefElement(`preprints/${log.params.preprint}`, preprintWord);
   }
 
-  buildPreprintProviderUrl(log: ActivityLog): string {
+  buildPreprintProviderUrl(log: ActivityLogModel): string {
     if (!log.params.preprintProvider) {
       return '';
     }
@@ -81,7 +81,7 @@ export class ActivityLogUrlBuilderService {
     );
   }
 
-  buildTitleUrl(log: ActivityLog, title: string | undefined): string {
+  buildTitleUrl(log: ActivityLogModel, title: string | undefined): string {
     const originalNode = log.embeds?.originalNode;
     if (originalNode?.id && title) {
       return this.buildAHrefElement(`/${originalNode.id}`, title);
@@ -89,7 +89,7 @@ export class ActivityLogUrlBuilderService {
     return '';
   }
 
-  buildEmbeddedUrl(log: ActivityLog): string {
+  buildEmbeddedUrl(log: ActivityLogModel): string {
     const linkedNode = log.embeds?.linkedNode;
     const originalNode = log.embeds?.originalNode;
 
@@ -101,8 +101,8 @@ export class ActivityLogUrlBuilderService {
     return '';
   }
 
-  buildTemplateUrl(log: ActivityLog): string {
-    const templateNode = log.params.template_node;
+  buildTemplateUrl(log: ActivityLogModel): string {
+    const templateNode = log.params.templateNode;
 
     if (templateNode?.id) {
       return this.buildAHrefElement(`/${templateNode.id}`, templateNode.title);
@@ -110,7 +110,7 @@ export class ActivityLogUrlBuilderService {
     return '';
   }
 
-  buildFileUrl(log: ActivityLog, path: string): string {
+  buildFileUrl(log: ActivityLogModel, path: string): string {
     const acceptableLinkedItems = [
       'osf_storage_file_added',
       'osf_storage_file_updated',
@@ -137,7 +137,7 @@ export class ActivityLogUrlBuilderService {
     return path;
   }
 
-  buildPageUrl(log: ActivityLog, page: string): string {
+  buildPageUrl(log: ActivityLogModel, page: string): string {
     const acceptableLinkedItems = ['wiki_updated', 'wiki_renamed'];
     const projectId = log.embeds?.originalNode?.id;
     if (acceptableLinkedItems.includes(log.action) && log.params.pageId && projectId) {
diff --git a/src/app/shared/services/activity-logs/activity-logs.service.ts b/src/app/shared/services/activity-logs/activity-logs.service.ts
index 5f50ed5a0..5ad1ad817 100644
--- a/src/app/shared/services/activity-logs/activity-logs.service.ts
+++ b/src/app/shared/services/activity-logs/activity-logs.service.ts
@@ -6,9 +6,8 @@ import { inject, Injectable } from '@angular/core';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { CurrentResourceType } from '@osf/shared/enums/resource-type.enum';
 import { ActivityLogsMapper } from '@osf/shared/mappers/activity-logs.mapper';
-import { ActivityLogWithDisplay } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
-import { ActivityLogJsonApi } from '@osf/shared/models/activity-logs/activity-logs-json-api.model';
-import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
+import { ActivityLogWithDisplayModel } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
+import { ActivityLogsResponseJsonApi } from '@osf/shared/models/activity-logs/activity-logs-json-api.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 
 import { JsonApiService } from '../json-api.service';
@@ -17,17 +16,20 @@ import { ActivityLogDisplayService } from './activity-log-display.service';
 
 @Injectable({ providedIn: 'root' })
 export class ActivityLogsService {
-  private jsonApiService = inject(JsonApiService);
-  private activityDisplayService = inject(ActivityLogDisplayService);
+  private readonly jsonApiService = inject(JsonApiService);
+  private readonly activityDisplayService = inject(ActivityLogDisplayService);
   private readonly environment = inject(ENVIRONMENT);
-  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
+
+  get apiUrl() {
+    return `${this.environment.apiDomainUrl}/v2`;
+  }
 
   fetchLogs(
     resourceType: CurrentResourceType.Projects | CurrentResourceType.Registrations,
     resourceId: string,
     page = 1,
     pageSize: number
-  ): Observable<PaginatedData<ActivityLogWithDisplay[]>> {
+  ): Observable<PaginatedData<ActivityLogWithDisplayModel[]>> {
     const url = `${this.apiUrl}/${resourceType}/${resourceId}/logs/`;
     const params: Record<string, unknown> = {
       'embed[]': ['original_node', 'user', 'linked_node', 'linked_registration', 'template_node'],
@@ -36,11 +38,11 @@ export class ActivityLogsService {
     };
 
     return this.jsonApiService
-      .get<ResponseJsonApi<ActivityLogJsonApi[]>>(url, params)
+      .get<ActivityLogsResponseJsonApi>(url, params)
       .pipe(map((res) => this.formatActivities(res)));
   }
 
-  private formatActivities(response: ResponseJsonApi<ActivityLogJsonApi[]>): PaginatedData<ActivityLogWithDisplay[]> {
+  private formatActivities(response: ActivityLogsResponseJsonApi): PaginatedData<ActivityLogWithDisplayModel[]> {
     const mapped = ActivityLogsMapper.fromGetActivityLogsResponse(response);
 
     return {
diff --git a/src/app/shared/services/addons/addon-form.service.ts b/src/app/shared/services/addons/addon-form.service.ts
index e02cf926b..b0004df3f 100644
--- a/src/app/shared/services/addons/addon-form.service.ts
+++ b/src/app/shared/services/addons/addon-form.service.ts
@@ -5,11 +5,9 @@ import { AddonFormControls } from '@osf/shared/enums/addon-form-controls.enum';
 import { AddonType } from '@osf/shared/enums/addon-type.enum';
 import { CredentialsFormat } from '@osf/shared/enums/addons-credentials-format.enum';
 import { isAuthorizedAddon } from '@osf/shared/helpers/addon-type.helper';
-import {
-  AuthorizedAddonRequestJsonApi,
-  ConfiguredAddonRequestJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.model';
 import { AddonForm } from '@osf/shared/models/addons/addon-utils.model';
+import { AuthorizedAddonRequestJsonApi } from '@osf/shared/models/addons/authorized-addon-json-api.model';
+import { ConfiguredAddonRequestJsonApi } from '@osf/shared/models/addons/configured-addon-json-api.model';
 import { AddonModel } from '@shared/models/addons/addon.model';
 import { AuthorizedAccountModel } from '@shared/models/addons/authorized-account.model';
 import { ConfiguredAddonModel } from '@shared/models/addons/configured-addon.model';
diff --git a/src/app/shared/services/addons/addons.service.ts b/src/app/shared/services/addons/addons.service.ts
index fb574b5fb..cf12e1983 100644
--- a/src/app/shared/services/addons/addons.service.ts
+++ b/src/app/shared/services/addons/addons.service.ts
@@ -10,26 +10,32 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { UserSelectors } from '@core/store/user';
 import { AddonMapper } from '@osf/shared/mappers/addon.mapper';
 import { AddonModel } from '@osf/shared/models/addons/addon.model';
-import {
-  AddonGetResponseJsonApi,
-  AuthorizedAddonGetResponseJsonApi,
-  AuthorizedAddonRequestJsonApi,
-  AuthorizedAddonResponseJsonApi,
-  ConfiguredAddonGetResponseJsonApi,
-  ConfiguredAddonRequestJsonApi,
-  ConfiguredAddonResponseJsonApi,
-  IncludedAddonData,
-  ResourceReferenceJsonApi,
-  UserReferenceJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.model';
 import {
   OperationInvocationRequestJsonApi,
   OperationInvocationResponseJsonApi,
 } from '@osf/shared/models/addons/addon-operations-json-api.model';
+import {
+  ResourceReferenceResponseJsonApi,
+  UserReferenceResponseJsonApi,
+} from '@osf/shared/models/addons/addon-reference-json-api.model';
 import { AuthorizedAccountModel } from '@osf/shared/models/addons/authorized-account.model';
+import {
+  AuthorizedAddonDataJsonApi,
+  AuthorizedAddonListResponseJsonApi,
+  AuthorizedAddonRequestJsonApi,
+  AuthorizedAddonResponseJsonApi,
+} from '@osf/shared/models/addons/authorized-addon-json-api.model';
 import { ConfiguredAddonModel } from '@osf/shared/models/addons/configured-addon.model';
+import {
+  ConfiguredAddonDataJsonApi,
+  ConfiguredAddonItemResponseJsonApi,
+  ConfiguredAddonListResponseWithIncludeJsonApi,
+  ConfiguredAddonRequestJsonApi,
+} from '@osf/shared/models/addons/configured-addon-json-api.model';
+import { AddonGetListResponseJsonApi } from '@osf/shared/models/addons/external-addon-json-api.model';
 import { OperationInvocation } from '@osf/shared/models/addons/operation-invocation.model';
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
+import { ResourceReferenceModel } from '@osf/shared/models/addons/resource-reference.model';
+import { UserReferenceModel } from '@osf/shared/models/addons/user-reference.model';
 
 import { JsonApiService } from '../json-api.service';
 
@@ -52,11 +58,11 @@ export class AddonsService {
 
   getAddons(addonType: string): Observable<AddonModel[]> {
     return this.jsonApiService
-      .get<JsonApiResponse<AddonGetResponseJsonApi[], null>>(`${this.apiUrl}/external-${addonType}-services`)
+      .get<AddonGetListResponseJsonApi>(`${this.apiUrl}/external-${addonType}-services`)
       .pipe(map((response) => response.data.map((item) => AddonMapper.fromResponse(item))));
   }
 
-  getAddonsUserReference(): Observable<UserReferenceJsonApi[]> {
+  getAddonsUserReference(): Observable<UserReferenceModel[]> {
     const currentUser = this.currentUser();
     if (!currentUser) throw new Error('Current user not found');
 
@@ -64,17 +70,17 @@ export class AddonsService {
     const params = { 'filter[user_uri]': userUri };
 
     return this.jsonApiService
-      .get<JsonApiResponse<UserReferenceJsonApi[], null>>(this.apiUrl + '/user-references/', params)
-      .pipe(map((response) => response.data));
+      .get<UserReferenceResponseJsonApi>(this.apiUrl + '/user-references/', params)
+      .pipe(map((response) => response.data.map((item) => AddonMapper.fromUserReferenceResponse(item))));
   }
 
-  getAddonsResourceReference(resourceId: string): Observable<ResourceReferenceJsonApi[]> {
+  getAddonsResourceReference(resourceId: string): Observable<ResourceReferenceModel[]> {
     const resourceUri = `${this.webUrl}/${resourceId}`;
     const params = { 'filter[resource_uri]': resourceUri };
 
     return this.jsonApiService
-      .get<JsonApiResponse<ResourceReferenceJsonApi[], null>>(this.apiUrl + '/resource-references/', params)
-      .pipe(map((response) => response.data));
+      .get<ResourceReferenceResponseJsonApi>(this.apiUrl + '/resource-references/', params)
+      .pipe(map((response) => response.data.map((item) => AddonMapper.fromResourceReferenceResponse(item))));
   }
 
   getAuthorizedAddons(addonType: string, referenceId: string): Observable<AuthorizedAccountModel[]> {
@@ -82,9 +88,10 @@ export class AddonsService {
       [`fields[external-${addonType}-services]`]: 'external_service_name,credentials_format,icon_url',
     };
     return this.jsonApiService
-      .get<
-        JsonApiResponse<AuthorizedAddonGetResponseJsonApi[], IncludedAddonData[]>
-      >(`${this.apiUrl}/user-references/${referenceId}/authorized_${addonType}_accounts/?include=external-${addonType}-service`, params)
+      .get<AuthorizedAddonListResponseJsonApi>(
+        `${this.apiUrl}/user-references/${referenceId}/authorized_${addonType}_accounts/?include=external-${addonType}-service`,
+        params
+      )
       .pipe(
         map((response) => response.data.map((item) => AddonMapper.fromAuthorizedAddonResponse(item, response.included)))
       );
@@ -95,7 +102,7 @@ export class AddonsService {
     context.set(BYPASS_ERROR_INTERCEPTOR, true);
 
     return this.jsonApiService
-      .patch<AuthorizedAddonGetResponseJsonApi>(
+      .patch<AuthorizedAddonDataJsonApi>(
         `${this.apiUrl}/authorized-${addonType}-accounts/${accountId}`,
         {
           data: {
@@ -108,7 +115,7 @@ export class AddonsService {
         {},
         context
       )
-      .pipe(map((response) => AddonMapper.fromAuthorizedAddonResponse(response as AuthorizedAddonGetResponseJsonApi)));
+      .pipe(map((response) => AddonMapper.fromAuthorizedAddonResponse(response as AuthorizedAddonDataJsonApi)));
   }
 
   getConfiguredAddons(addonType: string, referenceId: string): Observable<ConfiguredAddonModel[]> {
@@ -116,9 +123,10 @@ export class AddonsService {
       [`fields[external-${addonType}-services]`]: 'external_service_name,credentials_format,icon_url',
     };
     return this.jsonApiService
-      .get<
-        JsonApiResponse<ConfiguredAddonGetResponseJsonApi[], IncludedAddonData[]>
-      >(`${this.apiUrl}/resource-references/${referenceId}/configured_${addonType}_addons/?include=external-${addonType}-service`, params)
+      .get<ConfiguredAddonListResponseWithIncludeJsonApi>(
+        `${this.apiUrl}/resource-references/${referenceId}/configured_${addonType}_addons/?include=external-${addonType}-service`,
+        params
+      )
       .pipe(
         map((response) => response.data.map((item) => AddonMapper.fromConfiguredAddonResponse(item, response.included)))
       );
@@ -129,9 +137,10 @@ export class AddonsService {
     addonType: string
   ): Observable<AuthorizedAccountModel> {
     return this.jsonApiService
-      .post<
-        JsonApiResponse<AuthorizedAddonResponseJsonApi, IncludedAddonData[]>
-      >(`${this.apiUrl}/authorized-${addonType}-accounts/?include=external-${addonType}-service`, addonRequestPayload)
+      .post<AuthorizedAddonResponseJsonApi>(
+        `${this.apiUrl}/authorized-${addonType}-accounts/?include=external-${addonType}-service`,
+        addonRequestPayload
+      )
       .pipe(map((response) => AddonMapper.fromAuthorizedAddonResponse(response.data, response.included)));
   }
 
@@ -141,41 +150,40 @@ export class AddonsService {
     addonId: string
   ): Observable<AuthorizedAccountModel> {
     return this.jsonApiService.http
-      .patch<
-        JsonApiResponse<AuthorizedAddonResponseJsonApi, IncludedAddonData[]>
-      >(`${this.apiUrl}/authorized-${addonType}-accounts/${addonId}/?include=external-${addonType}-service`, addonRequestPayload)
+      .patch<AuthorizedAddonResponseJsonApi>(
+        `${this.apiUrl}/authorized-${addonType}-accounts/${addonId}/?include=external-${addonType}-service`,
+        addonRequestPayload
+      )
       .pipe(map((response) => AddonMapper.fromAuthorizedAddonResponse(response.data, response.included)));
   }
 
   createConfiguredAddon(
     addonRequestPayload: ConfiguredAddonRequestJsonApi,
     addonType: string
-  ): Observable<ConfiguredAddonResponseJsonApi> {
+  ): Observable<ConfiguredAddonModel> {
     return this.jsonApiService
-      .post<
-        JsonApiResponse<ConfiguredAddonResponseJsonApi, null>
-      >(`${this.apiUrl}/configured-${addonType}-addons/`, addonRequestPayload)
-      .pipe(map((response) => response.data));
+      .post<ConfiguredAddonItemResponseJsonApi>(`${this.apiUrl}/configured-${addonType}-addons/`, addonRequestPayload)
+      .pipe(map((response) => AddonMapper.fromConfiguredAddonResponse(response.data)));
   }
 
   updateConfiguredAddon(
     addonRequestPayload: ConfiguredAddonRequestJsonApi,
     addonType: string,
     addonId: string
-  ): Observable<ConfiguredAddonResponseJsonApi> {
-    return this.jsonApiService.patch<ConfiguredAddonResponseJsonApi>(
-      `${this.apiUrl}/configured-${addonType}-addons/${addonId}/`,
-      addonRequestPayload
-    );
+  ): Observable<ConfiguredAddonModel> {
+    return this.jsonApiService
+      .patch<ConfiguredAddonDataJsonApi>(
+        `${this.apiUrl}/configured-${addonType}-addons/${addonId}/`,
+        addonRequestPayload
+      )
+      .pipe(map((response) => AddonMapper.fromConfiguredAddonResponse(response)));
   }
 
   createAddonOperationInvocation(
     invocationRequestPayload: OperationInvocationRequestJsonApi
   ): Observable<OperationInvocation> {
     return this.jsonApiService
-      .post<
-        JsonApiResponse<OperationInvocationResponseJsonApi, null>
-      >(`${this.apiUrl}/addon-operation-invocations/`, invocationRequestPayload)
+      .post<OperationInvocationResponseJsonApi>(`${this.apiUrl}/addon-operation-invocations/`, invocationRequestPayload)
       .pipe(map((response) => AddonMapper.fromOperationInvocationResponse(response.data)));
   }
 
diff --git a/src/app/shared/services/banners.service.ts b/src/app/shared/services/banners.service.ts
index 5589094b4..0ba192026 100644
--- a/src/app/shared/services/banners.service.ts
+++ b/src/app/shared/services/banners.service.ts
@@ -6,8 +6,7 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 
 import { BannerModel } from '../../core/components/osf-banners/models/banner.model';
 import { BannerMapper } from '../mappers/banner.mapper';
-import { BannerJsonApi } from '../models/banner.json-api.model';
-import { JsonApiResponse } from '../models/common/json-api.model';
+import { BannerCurrentResponseJsonApi } from '../models/banner-json-api.model';
 
 import { JsonApiService } from './json-api.service';
 
@@ -37,7 +36,7 @@ export class BannersService {
    */
   getCurrentBanner(): Observable<BannerModel> {
     return this.jsonApiService
-      .get<JsonApiResponse<BannerJsonApi, null>>(`${this.apiDomainUrl}/_/banners/current/`)
+      .get<BannerCurrentResponseJsonApi>(`${this.apiDomainUrl}/_/banners/current/`)
       .pipe(map((response) => BannerMapper.fromResponse(response.data)));
   }
 }
diff --git a/src/app/shared/services/bookmarks.service.ts b/src/app/shared/services/bookmarks.service.ts
index be8b29daf..6095724f6 100644
--- a/src/app/shared/services/bookmarks.service.ts
+++ b/src/app/shared/services/bookmarks.service.ts
@@ -3,16 +3,17 @@ import { forkJoin, map, Observable } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 
 import { ResourceType } from '../enums/resource-type.enum';
 import { SortOrder } from '../enums/sort-order.enum';
 import { MyResourcesMapper } from '../mappers/my-resources.mapper';
-import { SparseCollectionsResponseJsonApi } from '../models/collections/collections-json-api.model';
+import { SparseCollectionsResponseJsonApi } from '../models/collections/collection-details-json-api.model';
+import { MyResourcesItem } from '../models/my-resources/my-resources-item.model';
 import {
-  MyResourcesItem,
   MyResourcesItemGetResponseJsonApi,
   MyResourcesResponseJsonApi,
-} from '../models/my-resources/my-resources.model';
+} from '../models/my-resources/my-resources-json-api.model';
 import { MyResourcesSearchFilters } from '../models/my-resources/my-resources-search-filters.model';
 import { PaginatedData } from '../models/paginated-data.model';
 
@@ -71,7 +72,11 @@ export class BookmarksService {
         const data = this.sortBookmarks(items, filters?.sortColumn, filters?.sortOrder);
         const totalCount = projects.meta.total + registrations.meta.total;
 
-        return { data, totalCount, pageSize: projects.meta.per_page } as PaginatedData<MyResourcesItem[]>;
+        return {
+          data,
+          totalCount,
+          pageSize: projects.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
+        } as PaginatedData<MyResourcesItem[]>;
       })
     );
   }
diff --git a/src/app/shared/services/citations.service.ts b/src/app/shared/services/citations.service.ts
index 85c24c95b..7a1ca0229 100644
--- a/src/app/shared/services/citations.service.ts
+++ b/src/app/shared/services/citations.service.ts
@@ -8,11 +8,10 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { ResourceType } from '../enums/resource-type.enum';
 import { CitationsMapper } from '../mappers/citations.mapper';
 import { CitationStyle } from '../models/citations/citation-style.model';
-import { CitationStyleJsonApi } from '../models/citations/citation-style-json-api.model';
+import { CitationStyleResponseJsonApi } from '../models/citations/citation-style-json-api.model';
 import { CustomCitationPayload } from '../models/citations/custom-citation-payload.model';
 import { StyledCitation } from '../models/citations/styled-citation.model';
-import { StyledCitationJsonApi } from '../models/citations/styled-citation-json-api.model';
-import { JsonApiResponse } from '../models/common/json-api.model';
+import { StyledCitationResponseJsonApi } from '../models/citations/styled-citation-json-api.model';
 
 import { JsonApiService } from './json-api.service';
 
@@ -37,7 +36,7 @@ export class CitationsService {
   ): Observable<StyledCitation> {
     const baseUrl = this.getBaseCitationUrl(resourceType, resourceId);
     return this.jsonApiService
-      .get<JsonApiResponse<StyledCitationJsonApi, null>>(`${baseUrl}/${citationId}/`)
+      .get<StyledCitationResponseJsonApi>(`${baseUrl}/${citationId}/`)
       .pipe(map((response) => CitationsMapper.fromGetStyledCitationResponse(response.data)));
   }
 
@@ -48,7 +47,7 @@ export class CitationsService {
     };
 
     return this.jsonApiService
-      .get<JsonApiResponse<CitationStyleJsonApi[], null>>(`${this.apiUrl}/citations/styles/`, params)
+      .get<CitationStyleResponseJsonApi>(`${this.apiUrl}/citations/styles/`, params)
       .pipe(map((response) => CitationsMapper.fromGetCitationStylesResponse(response.data)));
   }
 
@@ -77,9 +76,9 @@ export class CitationsService {
 
   fetchCitationStylesFromProvider(resourceType: ResourceType, providerId: string) {
     return this.jsonApiService
-      .get<
-        JsonApiResponse<CitationStyleJsonApi[], null>
-      >(`${this.apiUrl}/providers/${this.urlMap.get(resourceType)}/${providerId}/citation_styles/`)
+      .get<CitationStyleResponseJsonApi>(
+        `${this.apiUrl}/providers/${this.urlMap.get(resourceType)}/${providerId}/citation_styles/`
+      )
       .pipe(map((response) => CitationsMapper.fromGetCitationStylesResponse(response.data)));
   }
 }
diff --git a/src/app/shared/services/collections.service.ts b/src/app/shared/services/collections.service.ts
index 5ab6156fb..e8c0ec3d8 100644
--- a/src/app/shared/services/collections.service.ts
+++ b/src/app/shared/services/collections.service.ts
@@ -2,30 +2,30 @@ import { forkJoin, map, Observable } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
-import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { ENVIRONMENT } from '@osf/core/provider/environment.provider';
 import {
   CollectionSubmissionReviewAction,
-  CollectionSubmissionReviewActionJsonApi,
+  CollectionSubmissionReviewActionsListResponseJsonApi,
 } from '@osf/features/moderation/models';
 
 import { CollectionsMapper } from '../mappers/collections';
 import { ReviewActionsMapper } from '../mappers/review-actions.mapper';
+import { CollectionDetails } from '../models/collections/collection-details.model';
+import { CollectionDetailsListResponseJsonApi } from '../models/collections/collection-details-json-api.model';
+import { CollectionProvider } from '../models/collections/collection-provider.model';
+import { CollectionProviderGetResponseJsonApi } from '../models/collections/collection-provider-json-api.model';
 import {
-  CollectionDetails,
   CollectionProjectSubmission,
-  CollectionProvider,
   CollectionSubmission,
   CollectionSubmissionActionType,
   CollectionSubmissionTargetType,
   CollectionSubmissionWithGuid,
-} from '../models/collections/collections.model';
+} from '../models/collections/collection-submissions.model';
 import {
-  CollectionDetailsResponseJsonApi,
-  CollectionProviderResponseJsonApi,
   CollectionSubmissionJsonApi,
-  CollectionSubmissionWithGuidJsonApi,
-} from '../models/collections/collections-json-api.model';
-import { JsonApiResponse, ResponseJsonApi } from '../models/common/json-api.model';
+  CollectionSubmissionWithGuidListResponseJsonApi,
+  CollectionSubmissionWithGuidResponseJsonApi,
+} from '../models/collections/collection-submissions-json-api.model';
 import { PaginatedData } from '../models/paginated-data.model';
 import { ReviewActionPayload } from '../models/review-action/review-action-payload.model';
 import { ReviewActionPayloadJsonApi } from '../models/review-action/review-action-payload-json-api.model';
@@ -47,7 +47,7 @@ export class CollectionsService {
     const url = `${this.apiUrl}/providers/collections/${collectionName}/?embed=brand&embed=required_metadata_template`;
 
     return this.jsonApiService
-      .get<JsonApiResponse<CollectionProviderResponseJsonApi, null>>(url)
+      .get<CollectionProviderGetResponseJsonApi>(url)
       .pipe(map((response) => CollectionsMapper.fromGetCollectionProviderResponse(response.data)));
   }
 
@@ -66,9 +66,10 @@ export class CollectionsService {
     };
 
     return this.jsonApiService
-      .get<
-        ResponseJsonApi<CollectionSubmissionWithGuidJsonApi[]>
-      >(`${this.apiUrl}/collections/${collectionId}/collection_submissions/`, params)
+      .get<CollectionSubmissionWithGuidListResponseJsonApi>(
+        `${this.apiUrl}/collections/${collectionId}/collection_submissions/`,
+        params
+      )
       .pipe(map((response) => CollectionsMapper.fromGetCollectionSubmissionsResponse(response)));
   }
 
@@ -79,9 +80,7 @@ export class CollectionsService {
     };
 
     return this.jsonApiService
-      .get<
-        ResponseJsonApi<CollectionDetailsResponseJsonApi[]>
-      >(`${this.apiUrl}/nodes/${projectId}/collections/`, params)
+      .get<CollectionDetailsListResponseJsonApi>(`${this.apiUrl}/nodes/${projectId}/collections/`, params)
       .pipe(
         map((response) =>
           response.data.map((collection) => CollectionsMapper.fromGetCollectionDetailsResponse(collection))
@@ -93,17 +92,18 @@ export class CollectionsService {
     const params: Record<string, string> = { embed: 'collection' };
 
     return this.jsonApiService
-      .get<
-        ResponseJsonApi<CollectionSubmissionJsonApi>
-      >(`${this.apiUrl}/collections/${collectionId}/collection_submissions/${projectId}/`, params)
+      .get<CollectionSubmissionJsonApi>(
+        `${this.apiUrl}/collections/${collectionId}/collection_submissions/${projectId}/`,
+        params
+      )
       .pipe(map((response) => CollectionsMapper.fromCurrentSubmissionResponse(response.data)));
   }
 
   fetchProjectSubmission(collectionId: string, projectId: string): Observable<CollectionProjectSubmission> {
     return this.jsonApiService
-      .get<
-        ResponseJsonApi<CollectionSubmissionWithGuidJsonApi>
-      >(`${this.apiUrl}/collections/${collectionId}/collection_submissions/${projectId}/`)
+      .get<CollectionSubmissionWithGuidResponseJsonApi>(
+        `${this.apiUrl}/collections/${collectionId}/collection_submissions/${projectId}/`
+      )
       .pipe(map((response) => CollectionsMapper.getProjectSubmission(response.data)));
   }
 
@@ -116,9 +116,10 @@ export class CollectionsService {
     };
 
     return this.jsonApiService
-      .get<
-        JsonApiResponse<CollectionSubmissionReviewActionJsonApi[], null>
-      >(`${this.apiUrl}/collection_submissions/${projectId}-${collectionId}/actions/?sort=-date_modified`, params)
+      .get<CollectionSubmissionReviewActionsListResponseJsonApi>(
+        `${this.apiUrl}/collection_submissions/${projectId}-${collectionId}/actions/?sort=-date_modified`,
+        params
+      )
       .pipe(map((response) => CollectionsMapper.fromGetCollectionSubmissionsActionsResponse(response.data)));
   }
 
@@ -159,9 +160,10 @@ export class CollectionsService {
     };
 
     return this.jsonApiService
-      .get<
-        ResponseJsonApi<CollectionSubmissionWithGuidJsonApi[]>
-      >(`${this.apiUrl}/collections/${providerId}/collection_submissions/`, params)
+      .get<CollectionSubmissionWithGuidListResponseJsonApi>(
+        `${this.apiUrl}/collections/${providerId}/collection_submissions/`,
+        params
+      )
       .pipe(map((response) => CollectionsMapper.fromGetCollectionSubmissionsResponse(response)));
   }
 }
diff --git a/src/app/shared/services/contributors.service.ts b/src/app/shared/services/contributors.service.ts
index 96c3754d8..094c3beee 100644
--- a/src/app/shared/services/contributors.service.ts
+++ b/src/app/shared/services/contributors.service.ts
@@ -3,6 +3,7 @@ import { forkJoin, map, Observable, of } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 
 import { AddContributorType } from '../enums/contributors/add-contributor-type.enum';
 import { ContributorPermission } from '../enums/contributors/contributor-permission.enum';
@@ -74,7 +75,7 @@ export class ContributorsService {
       map((response) => ({
         data: ContributorsMapper.getContributors(response.data),
         totalCount: response.meta.total,
-        pageSize: response.meta.per_page,
+        pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
       }))
     );
   }
@@ -96,7 +97,7 @@ export class ContributorsService {
       map((response) => ({
         data: ContributorsMapper.getContributors(response.data),
         totalCount: response.meta.total,
-        pageSize: response.meta.per_page,
+        pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
       }))
     );
   }
diff --git a/src/app/shared/services/datacite/datacite.service.spec.ts b/src/app/shared/services/datacite/datacite.service.spec.ts
index 6b190a768..9baa74f82 100644
--- a/src/app/shared/services/datacite/datacite.service.spec.ts
+++ b/src/app/shared/services/datacite/datacite.service.spec.ts
@@ -154,9 +154,6 @@ describe('Service: Datacite', () => {
           id: 'id-1',
           type: 'identifiers',
           attributes: { category: 'doi', value: doi },
-          embeds: null,
-          relationships: null,
-          links: null,
         },
       ],
       links: {},
diff --git a/src/app/shared/services/files.service.spec.ts b/src/app/shared/services/files.service.spec.ts
index 6f8a355ab..f096634e9 100644
--- a/src/app/shared/services/files.service.spec.ts
+++ b/src/app/shared/services/files.service.spec.ts
@@ -67,7 +67,9 @@ describe('FilesService', () => {
 
   it('should map resource type to root folders url', () => {
     setup();
-    const getFoldersSpy = vi.spyOn(service, 'getFolders').mockReturnValue(of({ files: [] }));
+    const getFoldersSpy = vi
+      .spyOn(service, 'getFolders')
+      .mockReturnValue(of({ data: [], totalCount: 0, pageSize: 10 }));
 
     service.getRootFolders('abc', ResourceType.Project).subscribe();
     service.getRootFolders('abc', ResourceType.Registration).subscribe();
diff --git a/src/app/shared/services/files.service.ts b/src/app/shared/services/files.service.ts
index 4958da928..e5bd9a7a7 100644
--- a/src/app/shared/services/files.service.ts
+++ b/src/app/shared/services/files.service.ts
@@ -4,33 +4,36 @@ import { map } from 'rxjs/operators';
 import { HttpEvent } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
 
-import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { ENVIRONMENT } from '@osf/core/provider/environment.provider';
 import { MapFileCustomMetadata } from '@osf/features/files/mappers/file-custom-metadata.mapper';
 import { MapFileRevision } from '@osf/features/files/mappers/file-revision.mapper';
 import { OsfFileCustomMetadata } from '@osf/features/files/models/file-custom-metadata.model';
-import { OsfFileRevision } from '@osf/features/files/models/file-revisions.model';
-import { GetCustomMetadataResponse } from '@osf/features/files/models/get-custom-metadata-response.model';
 import {
-  FileCustomMetadata,
-  GetFileMetadataResponse,
-} from '@osf/features/files/models/get-file-metadata-response.model';
-import { GetFileRevisionsResponse } from '@osf/features/files/models/get-file-revisions-response.model';
-import { GetShortInfoResponse } from '@osf/features/files/models/get-short-info-response.model';
+  FileCustomMetadataDataJsonApi,
+  FileMetadataResponse,
+} from '@osf/features/files/models/file-metadata-response.model';
+import { OsfFileRevision } from '@osf/features/files/models/file-revisions.model';
+import { FileRevisionsResponse } from '@osf/features/files/models/file-revisions-response.model';
+import { NodeShortInfoResponse } from '@osf/features/files/models/node-short-info-response.model';
 import { PatchFileMetadata } from '@osf/features/files/models/patch-file-metadata.model';
-import { PaginatedData } from '@osf/shared/models/paginated-data.model';
+import { ResourceCustomMetadataResponse } from '@osf/features/files/models/resource-custom-metadata-response.model';
 
+import { DEFAULT_TABLE_PARAMS } from '../constants/default-table-params.constants';
 import { FileKind } from '../enums/file-kind.enum';
 import { ResourceType } from '../enums/resource-type.enum';
 import { AddonMapper } from '../mappers/addon.mapper';
 import { ContributorsMapper } from '../mappers/contributors';
 import { FilesMapper } from '../mappers/files/files.mapper';
 import { AddonModel } from '../models/addons/addon.model';
-import { AddonGetResponseJsonApi, ConfiguredAddonGetResponseJsonApi } from '../models/addons/addon-json-api.model';
+import { ResourceReferenceResponseJsonApi } from '../models/addons/addon-reference-json-api.model';
 import { ConfiguredAddonModel } from '../models/addons/configured-addon.model';
-import { ApiData, JsonApiResponse, MetaJsonApi } from '../models/common/json-api.model';
+import { ConfiguredAddonDataListResponseJsonApi } from '../models/addons/configured-addon-json-api.model';
+import { AddonGetItemResponseJsonApi } from '../models/addons/external-addon-json-api.model';
+import { ListMetaJsonApi } from '../models/common/json-api/meta.model';
+import { JsonApiResponse } from '../models/common/json-api/responses.model';
 import { ContributorModel } from '../models/contributors/contributor.model';
 import { ContributorsResponseJsonApi } from '../models/contributors/contributor-response-json-api.model';
-import { FileDetailsModel, FileDetailsWithMeta, FileModel } from '../models/files/file.model';
+import { FileDetailsModel, FileDetailsResult, FileModel } from '../models/files/file.model';
 import { FileFolderModel } from '../models/files/file-folder.model';
 import {
   FileFolderDataJsonApi,
@@ -45,6 +48,7 @@ import {
 } from '../models/files/file-json-api.model';
 import { FileVersionModel } from '../models/files/file-version.model';
 import { FileVersionsResponseJsonApi } from '../models/files/file-version-json-api.model';
+import { PaginatedData } from '../models/paginated-data.model';
 
 import { JsonApiService } from './json-api.service';
 
@@ -76,7 +80,7 @@ export class FilesService {
     search: string,
     sort: string,
     page = 1
-  ): Observable<{ files: FileModel[]; meta?: MetaJsonApi }> {
+  ): Observable<{ files: FileModel[]; meta?: ListMetaJsonApi }> {
     const params: Record<string, string> = {
       sort: sort,
       page: page.toString(),
@@ -89,16 +93,18 @@ export class FilesService {
       .pipe(map((response) => ({ files: FilesMapper.getFiles(response.data), meta: response.meta })));
   }
 
-  getFolders(folderLink: string): Observable<{ files: FileFolderModel[]; meta?: MetaJsonApi }> {
-    return this.jsonApiService
-      .get<FileFoldersResponseJsonApi>(`${folderLink}`)
-      .pipe(map((response) => ({ files: FilesMapper.getFileFolders(response.data), meta: response.meta })));
+  getFolders(folderLink: string): Observable<PaginatedData<FileFolderModel[]>> {
+    return this.jsonApiService.get<FileFoldersResponseJsonApi>(`${folderLink}`).pipe(
+      map((response) => ({
+        data: FilesMapper.getFileFolders(response.data),
+        totalCount: response.meta.total,
+        pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
+        isAnonymous: response.meta.anonymous ?? false,
+      }))
+    );
   }
 
-  getRootFolders(
-    resourceId: string,
-    resourceType: ResourceType
-  ): Observable<{ files: FileFolderModel[]; meta?: MetaJsonApi }> {
+  getRootFolders(resourceId: string, resourceType: ResourceType): Observable<PaginatedData<FileFolderModel[]>> {
     const resourcePath = this.resourcePathMap[resourceType];
     return this.getFolders(`${this.apiUrl}/${resourcePath}/${resourceId}/files/`);
   }
@@ -110,7 +116,7 @@ export class FilesService {
       map((response) => ({
         data: FilesMapper.getFiles(response.data),
         totalCount: response.meta.total,
-        pageSize: response.meta.per_page,
+        pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
       }))
     );
   }
@@ -178,10 +184,13 @@ export class FilesService {
     return `${link}${separator}zip=`;
   }
 
-  getFileTarget(fileGuid: string): Observable<FileDetailsWithMeta> {
-    return this.jsonApiService
-      .get<FileDetailsResponseJsonApi>(`${this.apiUrl}/files/${fileGuid}/?embed=target`)
-      .pipe(map((response) => ({ file: FilesMapper.getFileDetails(response.data), meta: response.meta })));
+  getFileTarget(fileGuid: string): Observable<FileDetailsResult> {
+    return this.jsonApiService.get<FileDetailsResponseJsonApi>(`${this.apiUrl}/files/${fileGuid}/?embed=target`).pipe(
+      map((response) => ({
+        file: FilesMapper.getFileDetails(response.data),
+        isAnonymous: response.meta?.anonymous ?? false,
+      }))
+    );
   }
 
   getFileGuid(id: string): Observable<FileModel> {
@@ -211,20 +220,20 @@ export class FilesService {
 
   getFileMetadata(fileGuid: string): Observable<OsfFileCustomMetadata> {
     return this.jsonApiService
-      .get<GetFileMetadataResponse>(`${this.apiUrl}/custom_file_metadata_records/${fileGuid}/`)
+      .get<FileMetadataResponse>(`${this.apiUrl}/custom_file_metadata_records/${fileGuid}/`)
       .pipe(map((response) => MapFileCustomMetadata(response.data)));
   }
 
-  getResourceShortInfo(resourceId: string, resourceType: string): Observable<GetShortInfoResponse> {
+  getResourceShortInfo(resourceId: string, resourceType: string): Observable<NodeShortInfoResponse> {
     const params = {
       'fields[nodes]': 'title,description,date_created,date_modified,identifiers',
       embed: 'identifiers',
     };
-    return this.jsonApiService.get<GetShortInfoResponse>(`${this.apiUrl}/${resourceType}/${resourceId}/`, params);
+    return this.jsonApiService.get<NodeShortInfoResponse>(`${this.apiUrl}/${resourceType}/${resourceId}/`, params);
   }
 
-  getCustomMetadata(resourceId: string): Observable<GetCustomMetadataResponse> {
-    return this.jsonApiService.get<GetCustomMetadataResponse>(
+  getCustomMetadata(resourceId: string): Observable<ResourceCustomMetadataResponse> {
+    return this.jsonApiService.get<ResourceCustomMetadataResponse>(
       `${this.apiUrl}/guids/${resourceId}/?embed=custom_metadata&resolve=false`
     );
   }
@@ -245,9 +254,7 @@ export class FilesService {
     };
 
     return this.jsonApiService
-      .patch<
-        ApiData<FileCustomMetadata, null, null, null>
-      >(`${this.apiUrl}/custom_file_metadata_records/${fileGuid}/`, payload)
+      .patch<FileCustomMetadataDataJsonApi>(`${this.apiUrl}/custom_file_metadata_records/${fileGuid}/`, payload)
       .pipe(map((response) => MapFileCustomMetadata(response)));
   }
 
@@ -256,7 +263,7 @@ export class FilesService {
     const urlWithRevisions = `${link}${separator}revisions=`;
 
     return this.jsonApiService
-      .get<GetFileRevisionsResponse>(urlWithRevisions)
+      .get<FileRevisionsResponse>(urlWithRevisions)
       .pipe(map((response) => MapFileRevision(response.data)));
   }
 
@@ -293,9 +300,7 @@ export class FilesService {
     const params = { 'filter[resource_uri]': resourceUri };
 
     return this.jsonApiService
-      .get<
-        JsonApiResponse<ApiData<null, null, null, { self: string }>[], null>
-      >(`${this.addonsApiUrl}/resource-references`, params)
+      .get<ResourceReferenceResponseJsonApi>(`${this.addonsApiUrl}/resource-references`, params)
       .pipe(map((response) => response.data?.[0]?.links?.self ?? ''));
   }
 
@@ -306,7 +311,7 @@ export class FilesService {
       switchMap((referenceUrl: string) => {
         if (!referenceUrl) return of([]);
         return this.jsonApiService
-          .get<JsonApiResponse<ConfiguredAddonGetResponseJsonApi[], null>>(`${referenceUrl}/configured_storage_addons`)
+          .get<ConfiguredAddonDataListResponseJsonApi>(`${referenceUrl}/configured_storage_addons`)
           .pipe(map((response) => response.data.map((item) => AddonMapper.fromConfiguredAddonResponse(item))));
       })
     );
@@ -314,9 +319,9 @@ export class FilesService {
 
   getExternalStorageService(serviceId: string): Observable<AddonModel> {
     return this.jsonApiService
-      .get<
-        JsonApiResponse<AddonGetResponseJsonApi, null>
-      >(`${this.addonsApiUrl}/configured-storage-addons/${serviceId}/external_storage_service/`)
+      .get<AddonGetItemResponseJsonApi>(
+        `${this.addonsApiUrl}/configured-storage-addons/${serviceId}/external_storage_service/`
+      )
       .pipe(map((response) => AddonMapper.fromResponse(response.data)));
   }
 }
diff --git a/src/app/shared/services/global-search.service.ts b/src/app/shared/services/global-search.service.ts
index 0b62d6178..19ae065f1 100644
--- a/src/app/shared/services/global-search.service.ts
+++ b/src/app/shared/services/global-search.service.ts
@@ -82,7 +82,6 @@ export class GlobalSearchService {
       resources: MapResources(response),
       filters: MapFilters(response),
       count: parseSearchTotalCount(response),
-      self: response.data.links.self,
       first: response.data?.relationships?.searchResultPage.links?.first?.href ?? null,
       next: response.data?.relationships?.searchResultPage.links?.next?.href ?? null,
       previous: response.data?.relationships?.searchResultPage.links?.prev?.href ?? null,
diff --git a/src/app/shared/services/institutions.service.ts b/src/app/shared/services/institutions.service.ts
index 9fa886e97..4ab2e5796 100644
--- a/src/app/shared/services/institutions.service.ts
+++ b/src/app/shared/services/institutions.service.ts
@@ -10,7 +10,6 @@ import { InstitutionsMapper } from '../mappers/institutions';
 import {
   InstitutionJsonApiResponse,
   InstitutionsJsonApiResponse,
-  InstitutionsWithMetaJsonApiResponse,
 } from '../models/institutions/institution-json-api.model';
 import { Institution, InstitutionsWithTotalCount } from '../models/institutions/institutions.model';
 
@@ -43,7 +42,7 @@ export class InstitutionsService {
     }
 
     return this.jsonApiService
-      .get<InstitutionsWithMetaJsonApiResponse>(`${this.apiUrl}/institutions/`, params)
+      .get<InstitutionsJsonApiResponse>(`${this.apiUrl}/institutions/`, params)
       .pipe(map((response) => InstitutionsMapper.fromResponseWithMeta(response)));
   }
 
diff --git a/src/app/shared/services/json-api.service.ts b/src/app/shared/services/json-api.service.ts
index 41fec68ee..0b5cc1520 100644
--- a/src/app/shared/services/json-api.service.ts
+++ b/src/app/shared/services/json-api.service.ts
@@ -3,7 +3,7 @@ import { map, Observable } from 'rxjs';
 import { HttpClient, HttpContext, HttpEvent, HttpParams } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
 
-import { JsonApiResponse } from '@osf/shared/models/common/json-api.model';
+import { JsonApiResponse } from '../models/common/json-api/responses.model';
 
 @Injectable({
   providedIn: 'root',
diff --git a/src/app/shared/services/metadata.service.ts b/src/app/shared/services/metadata.service.ts
index 97eb40f2b..ace5eccb2 100644
--- a/src/app/shared/services/metadata.service.ts
+++ b/src/app/shared/services/metadata.service.ts
@@ -4,18 +4,21 @@ import { map } from 'rxjs/operators';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
-import { CedarRecordsMapper, MetadataMapper, RorMapper } from '@osf/features/metadata/mappers';
+import { CedarMetadataMapper, CedarRecordsMapper, MetadataMapper, RorMapper } from '@osf/features/metadata/mappers';
 import {
-  CedarMetadataRecord,
+  CedarMetadataRecordDataJsonApi,
   CedarMetadataRecordJsonApi,
+  CedarMetadataRecordModel,
+  CedarMetadataRecordResponseJsonApi,
   CedarMetadataTemplateJsonApi,
   CedarRecordDataBinding,
   CustomItemMetadataRecord,
-  CustomMetadataJsonApi,
-  CustomMetadataJsonApiResponse,
-  MetadataJsonApi,
-  MetadataJsonApiResponse,
+  CustomMetadataDataJsonApi,
+  CustomMetadataResponseJsonApi,
+  MetadataDataJsonApi,
   MetadataModel,
+  MetadataResponseJsonApi,
+  PaginatedCedarTemplatesModel,
   RorFunderOption,
   RorSearchResponse,
 } from '@osf/features/metadata/models';
@@ -54,7 +57,7 @@ export class MetadataService {
 
   getCustomItemMetadata(guid: string): Observable<CustomItemMetadataRecord> {
     return this.jsonApiService
-      .get<CustomMetadataJsonApiResponse>(`${this.apiUrl}/custom_item_metadata_records/${guid}/`)
+      .get<CustomMetadataResponseJsonApi>(`${this.apiUrl}/custom_item_metadata_records/${guid}/`)
       .pipe(map((response) => MetadataMapper.fromCustomMetadataApiResponse(response.data)));
   }
 
@@ -62,7 +65,7 @@ export class MetadataService {
     const payload = MetadataMapper.toCustomMetadataApiRequest(guid, metadata);
 
     return this.jsonApiService
-      .put<CustomMetadataJsonApi>(`${this.apiUrl}/custom_item_metadata_records/${guid}/`, payload)
+      .put<CustomMetadataDataJsonApi>(`${this.apiUrl}/custom_item_metadata_records/${guid}/`, payload)
       .pipe(map((response) => MetadataMapper.fromCustomMetadataApiResponse(response)));
   }
 
@@ -96,40 +99,44 @@ export class MetadataService {
       .pipe(map((response) => RorMapper.toFunderOptions(response)));
   }
 
-  getMetadataCedarTemplates(url?: string): Observable<CedarMetadataTemplateJsonApi> {
-    return this.jsonApiService.get<CedarMetadataTemplateJsonApi>(
-      url || `${this.apiDomainUrl}/_/cedar_metadata_templates/`,
-      { 'page[size]': 100 }
-    );
+  getMetadataCedarTemplates(url?: string): Observable<PaginatedCedarTemplatesModel> {
+    return this.jsonApiService
+      .get<CedarMetadataTemplateJsonApi>(url || `${this.apiDomainUrl}/_/cedar_metadata_templates/`, {
+        'page[size]': 100,
+      })
+      .pipe(map((response) => CedarMetadataMapper.fromTemplatesResponse(response)));
   }
 
   getMetadataCedarRecords(
     resourceId: string,
     resourceType: ResourceType,
     url?: string
-  ): Observable<CedarMetadataRecordJsonApi> {
+  ): Observable<CedarMetadataRecordModel[]> {
     const params: Record<string, unknown> = {
       embed: 'template',
       'page[size]': 20,
     };
 
-    // [NS] TODO: Check if it can be simplified
     let cedarUrl = `${this.apiUrl}/${this.urlMap.get(resourceType)}/${resourceId}/cedar_metadata_records/`;
 
     if (url) {
       cedarUrl = this.getMetadataUrl(url);
     }
 
-    return this.jsonApiService.get<CedarMetadataRecordJsonApi>(cedarUrl, params);
+    return this.jsonApiService
+      .get<CedarMetadataRecordJsonApi>(cedarUrl, params)
+      .pipe(map((response) => response.data.map((item) => CedarMetadataMapper.fromRecord(item))));
   }
 
   createMetadataCedarRecord(
     data: CedarRecordDataBinding,
     resourceId: string,
     resourceType: ResourceType
-  ): Observable<CedarMetadataRecord> {
+  ): Observable<CedarMetadataRecordModel> {
     const payload = CedarRecordsMapper.toCedarRecordsPayload(data, resourceId, this.urlMap.get(resourceType) as string);
-    return this.jsonApiService.post<CedarMetadataRecord>(`${this.apiDomainUrl}/_/cedar_metadata_records/`, payload);
+    return this.jsonApiService
+      .post<CedarMetadataRecordResponseJsonApi>(`${this.apiDomainUrl}/_/cedar_metadata_records/`, payload)
+      .pipe(map((response) => CedarMetadataMapper.fromRecord(response.data)));
   }
 
   updateMetadataCedarRecord(
@@ -137,13 +144,12 @@ export class MetadataService {
     recordId: string,
     resourceId: string,
     resourceType: ResourceType
-  ): Observable<CedarMetadataRecord> {
+  ): Observable<CedarMetadataRecordModel> {
     const payload = CedarRecordsMapper.toCedarRecordsPayload(data, resourceId, this.urlMap.get(resourceType) as string);
 
-    return this.jsonApiService.patch<CedarMetadataRecord>(
-      `${this.apiDomainUrl}/_/cedar_metadata_records/${recordId}/`,
-      payload
-    );
+    return this.jsonApiService
+      .patch<CedarMetadataRecordDataJsonApi>(`${this.apiDomainUrl}/_/cedar_metadata_records/${recordId}/`, payload)
+      .pipe(map((response) => CedarMetadataMapper.fromRecord(response)));
   }
 
   getResourceMetadata(resourceId: string, resourceType: ResourceType): Observable<Partial<MetadataModel>> {
@@ -152,7 +158,7 @@ export class MetadataService {
     const baseUrl = `${this.apiUrl}/${this.urlMap.get(resourceType)}/${resourceId}/`;
 
     return this.jsonApiService
-      .get<MetadataJsonApiResponse>(baseUrl, params)
+      .get<MetadataResponseJsonApi>(baseUrl, params)
       .pipe(map((response) => MetadataMapper.fromMetadataApiResponse(response.data)));
   }
 
@@ -173,7 +179,7 @@ export class MetadataService {
     const params = this.getMetadataParams(resourceType);
 
     return this.jsonApiService
-      .patch<MetadataJsonApi>(baseUrl, payload, params)
+      .patch<MetadataDataJsonApi>(baseUrl, payload, params)
       .pipe(map((response) => MetadataMapper.fromMetadataApiResponse(response)));
   }
 
@@ -210,7 +216,7 @@ export class MetadataService {
     const params = this.getMetadataParams(resourceType);
 
     return this.jsonApiService
-      .patch<MetadataJsonApi>(baseUrl, payload, params)
+      .patch<MetadataDataJsonApi>(baseUrl, payload, params)
       .pipe(map((response) => MetadataMapper.fromMetadataApiResponse(response)));
   }
 
diff --git a/src/app/shared/services/my-resources.service.spec.ts b/src/app/shared/services/my-resources.service.spec.ts
index 735b00299..d145ef5f6 100644
--- a/src/app/shared/services/my-resources.service.spec.ts
+++ b/src/app/shared/services/my-resources.service.spec.ts
@@ -9,11 +9,12 @@ import { ResourceSearchMode } from '@osf/shared/enums/resource-search-mode.enum'
 import { ResourceVisibilityFilter } from '@osf/shared/enums/resource-visibility-filter.enum';
 import { SortOrder } from '@osf/shared/enums/sort-order.enum';
 import { MyResourcesMapper } from '@osf/shared/mappers/my-resources.mapper';
-import { MyResourcesResponseJsonApi } from '@osf/shared/models/my-resources/my-resources.model';
 
 import { MOCK_MY_RESOURCES_ITEM_PROJECT } from '@testing/mocks/my-resources.mock';
 import { JsonApiServiceMock, JsonApiServiceMockType } from '@testing/providers/json-api.service.mock';
 
+import { MyResourcesResponseJsonApi } from '../models/my-resources/my-resources-json-api.model';
+
 import { JsonApiService } from './json-api.service';
 import { MyResourcesService } from './my-resources.service';
 
@@ -91,7 +92,6 @@ describe('MyResourcesService', () => {
     });
     expect(mapperSpy).toHaveBeenCalled();
     expect(response.data).toEqual([MOCK_MY_RESOURCES_ITEM_PROJECT]);
-    expect(response.meta.total).toBe(1);
   });
 
   it('getMyProjects should include search, pagination, and sort params', async () => {
diff --git a/src/app/shared/services/my-resources.service.ts b/src/app/shared/services/my-resources.service.ts
index 9a7152ab8..f434c5e85 100644
--- a/src/app/shared/services/my-resources.service.ts
+++ b/src/app/shared/services/my-resources.service.ts
@@ -5,20 +5,20 @@ import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 
+import { DEFAULT_TABLE_PARAMS } from '../constants/default-table-params.constants';
 import { ResourceSearchMode } from '../enums/resource-search-mode.enum';
 import { ResourceVisibilityFilter } from '../enums/resource-visibility-filter.enum';
 import { SortOrder } from '../enums/sort-order.enum';
 import { MyResourcesMapper } from '../mappers/my-resources.mapper';
-import { JsonApiResponse } from '../models/common/json-api.model';
+import { EndpointType } from '../models/my-resources/my-resources-endpoint.type';
+import { MyResourcesItem } from '../models/my-resources/my-resources-item.model';
 import {
-  MyResourcesItem,
-  MyResourcesItemGetResponseJsonApi,
   MyResourcesItemResponseJsonApi,
   MyResourcesResponseJsonApi,
-} from '../models/my-resources/my-resources.model';
-import { EndpointType } from '../models/my-resources/my-resources-endpoint.type';
+} from '../models/my-resources/my-resources-json-api.model';
 import { MyResourcesSearchFilters } from '../models/my-resources/my-resources-search-filters.model';
 import { CreateProjectPayloadJsoApi } from '../models/nodes/nodes-json-api.model';
+import { PaginatedData } from '../models/paginated-data.model';
 
 import { JsonApiService } from './json-api.service';
 
@@ -77,7 +77,7 @@ export class MyResourcesService {
     searchMode?: ResourceSearchMode,
     rootProjectId?: string,
     visibilityFilter?: ResourceVisibilityFilter
-  ): Observable<MyResourcesItemResponseJsonApi> {
+  ): Observable<PaginatedData<MyResourcesItem[]>> {
     const params = this.buildCommonParams(filters, pageNumber, pageSize, resourceType);
 
     if (searchMode !== ResourceSearchMode.All) {
@@ -113,9 +113,9 @@ export class MyResourcesService {
 
     return this.jsonApiService.get<MyResourcesResponseJsonApi>(url, params).pipe(
       map((response: MyResourcesResponseJsonApi) => ({
-        data: response.data.map((item: MyResourcesItemGetResponseJsonApi) => MyResourcesMapper.fromResponse(item)),
-        links: response.links,
-        meta: response.meta,
+        data: response.data.map((item) => MyResourcesMapper.fromResponse(item)),
+        totalCount: response.meta.total,
+        pageSize: response.meta.per_page ?? DEFAULT_TABLE_PARAMS.rows,
       }))
     );
   }
@@ -127,7 +127,7 @@ export class MyResourcesService {
     searchMode?: ResourceSearchMode,
     rootProjectId?: string,
     visibilityFilter?: ResourceVisibilityFilter
-  ): Observable<MyResourcesItemResponseJsonApi> {
+  ): Observable<PaginatedData<MyResourcesItem[]>> {
     return this.getResources(
       'nodes/',
       filters,
@@ -146,7 +146,7 @@ export class MyResourcesService {
     pageSize?: number,
     searchMode?: ResourceSearchMode,
     rootProjectId?: string
-  ): Observable<MyResourcesItemResponseJsonApi> {
+  ): Observable<PaginatedData<MyResourcesItem[]>> {
     return this.getResources(
       'registrations/',
       filters,
@@ -162,7 +162,7 @@ export class MyResourcesService {
     filters?: MyResourcesSearchFilters,
     pageNumber?: number,
     pageSize?: number
-  ): Observable<MyResourcesItemResponseJsonApi> {
+  ): Observable<PaginatedData<MyResourcesItem[]>> {
     return this.getResources('preprints/', filters, pageNumber, pageSize, 'preprints');
   }
 
@@ -209,7 +209,7 @@ export class MyResourcesService {
     };
 
     return this.jsonApiService
-      .post<JsonApiResponse<MyResourcesItemGetResponseJsonApi, null>>(`${this.apiUrl}/nodes/`, payload, params)
+      .post<MyResourcesItemResponseJsonApi>(`${this.apiUrl}/nodes/`, payload, params)
       .pipe(map((response) => MyResourcesMapper.fromResponse(response.data)));
   }
 }
diff --git a/src/app/shared/services/node-links.service.ts b/src/app/shared/services/node-links.service.ts
index 99fd68de1..d44c374cc 100644
--- a/src/app/shared/services/node-links.service.ts
+++ b/src/app/shared/services/node-links.service.ts
@@ -6,9 +6,8 @@ import { inject, Injectable } from '@angular/core';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 
 import { BaseNodeMapper } from '../mappers/nodes';
-import { JsonApiResponse } from '../models/common/json-api.model';
-import { MyResourcesItem } from '../models/my-resources/my-resources.model';
-import { NodeLinkJsonApi } from '../models/node-links/node-link-json-api.model';
+import { MyResourcesItem } from '../models/my-resources/my-resources-item.model';
+import { NodeLinkResponseJsonApi } from '../models/node-links/node-link-json-api.model';
 import { NodeModel } from '../models/nodes/base-node.model';
 import { NodesResponseJsonApi } from '../models/nodes/nodes-json-api.model';
 import { PaginatedData } from '../models/paginated-data.model';
@@ -26,10 +25,7 @@ export class NodeLinksService {
     return `${this.environment.apiDomainUrl}/v2`;
   }
 
-  createNodeLink(
-    currentProjectId: string,
-    resource: MyResourcesItem
-  ): Observable<JsonApiResponse<NodeLinkJsonApi, null>> {
+  createNodeLink(currentProjectId: string, resource: MyResourcesItem): Observable<NodeLinkResponseJsonApi> {
     const payload = {
       data: [
         {
@@ -39,7 +35,7 @@ export class NodeLinksService {
       ],
     };
 
-    return this.jsonApiService.post<JsonApiResponse<NodeLinkJsonApi, null>>(
+    return this.jsonApiService.post<NodeLinkResponseJsonApi>(
       `${this.apiUrl}/nodes/${currentProjectId}/relationships/linked_${resource.type}/`,
       payload
     );
diff --git a/src/app/shared/services/regions.service.ts b/src/app/shared/services/regions.service.ts
index 0ab2b0ced..84d401bb0 100644
--- a/src/app/shared/services/regions.service.ts
+++ b/src/app/shared/services/regions.service.ts
@@ -7,7 +7,7 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 
 import { RegionsMapper } from '../mappers/regions';
 import { IdNameModel } from '../models/common/id-name.model';
-import { RegionsResponseJsonApi } from '../models/regions/regions.json-api.model';
+import { RegionsResponseJsonApi } from '../models/regions/regions-json-api.model';
 
 @Injectable({
   providedIn: 'root',
diff --git a/src/app/shared/services/registration-provider.service.ts b/src/app/shared/services/registration-provider.service.ts
index d7ee487b9..9c0a25ed0 100644
--- a/src/app/shared/services/registration-provider.service.ts
+++ b/src/app/shared/services/registration-provider.service.ts
@@ -5,9 +5,8 @@ import { inject, Injectable } from '@angular/core';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 
 import { RegistrationProviderMapper } from '../mappers/registration-provider.mapper';
-import { JsonApiResponse } from '../models/common/json-api.model';
 import { ProvidersResponseJsonApi } from '../models/provider/providers-json-api.model';
-import { RegistryProviderDetailsJsonApi } from '../models/provider/registration-provider-json-api.model';
+import { RegistrationProviderResponseJsonApi } from '../models/provider/registration-provider-json-api.model';
 import { RegistryProviderDetails } from '../models/provider/registry-provider.model';
 import { ProviderSchema } from '../models/registration/provider-schema.model';
 
@@ -35,9 +34,7 @@ export class RegistrationProviderService {
 
   getProviderBrand(providerName: string): Observable<RegistryProviderDetails> {
     return this.jsonApiService
-      .get<
-        JsonApiResponse<RegistryProviderDetailsJsonApi, null>
-      >(`${this.apiUrl}/providers/registrations/${providerName}/?embed=brand`)
+      .get<RegistrationProviderResponseJsonApi>(`${this.apiUrl}/providers/registrations/${providerName}/?embed=brand`)
       .pipe(map((response) => RegistrationProviderMapper.fromRegistryProvider(response.data)));
   }
 }
diff --git a/src/app/shared/services/resource.service.ts b/src/app/shared/services/resource.service.ts
index 76fda4a0b..c2cf91099 100644
--- a/src/app/shared/services/resource.service.ts
+++ b/src/app/shared/services/resource.service.ts
@@ -7,13 +7,11 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 
 import { CurrentResourceType, ResourceType } from '../enums/resource-type.enum';
 import { BaseNodeMapper } from '../mappers/nodes';
-import { ResponseDataJsonApi } from '../models/common/json-api.model';
 import { CurrentResource } from '../models/current-resource.model';
 import { GuidedResponseJsonApi } from '../models/guid-response-json-api.model';
 import { BaseNodeModel } from '../models/nodes/base-node.model';
-import { BaseNodeDataJsonApi } from '../models/nodes/base-node-data-json-api.model';
 import { NodeShortInfoModel } from '../models/nodes/node-with-children.model';
-import { NodesResponseJsonApi } from '../models/nodes/nodes-json-api.model';
+import { NodeResponseJsonApi, NodesResponseJsonApi } from '../models/nodes/nodes-json-api.model';
 
 import { JsonApiService } from './json-api.service';
 import { LoaderService } from './loader.service';
@@ -49,12 +47,12 @@ export class ResourceGuidService {
             type: res.data.type,
             parentId:
               res.data.type === CurrentResourceType.Preprints
-                ? res.data.relationships.provider?.data.id
-                : res.data.relationships.target?.data.id,
+                ? res.data.relationships.provider?.data?.id
+                : res.data.relationships.target?.data?.id,
             parentType:
               res.data.type === CurrentResourceType.Preprints
-                ? res.data.relationships.provider?.data.type
-                : res.data.relationships.target?.data.type,
+                ? res.data.relationships.provider?.data?.type
+                : res.data.relationships.target?.data?.type,
             wikiEnabled: res.data.attributes.wiki_enabled,
             permissions: res.data.attributes.current_user_permissions,
             rootResourceId: res.data.relationships.root?.data?.id,
@@ -73,11 +71,10 @@ export class ResourceGuidService {
 
   getResourceDetails(resourceId: string, resourceType: ResourceType): Observable<BaseNodeModel> {
     const resourcePath = this.urlMap.get(resourceType);
-    const params: Record<string, unknown> = {
-      embed: 'parent',
-    };
+    const params: Record<string, unknown> = { embed: 'parent' };
+
     return this.jsonApiService
-      .get<ResponseDataJsonApi<BaseNodeDataJsonApi>>(`${this.apiUrl}/${resourcePath}/${resourceId}/`, params)
+      .get<NodeResponseJsonApi>(`${this.apiUrl}/${resourcePath}/${resourceId}/`, params)
       .pipe(map((response) => BaseNodeMapper.getNodeData(response.data)));
   }
 
diff --git a/src/app/shared/services/wiki.service.ts b/src/app/shared/services/wiki.service.ts
index 0909d7d96..4bd4997b1 100644
--- a/src/app/shared/services/wiki.service.ts
+++ b/src/app/shared/services/wiki.service.ts
@@ -5,21 +5,20 @@ import { HttpClient } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
-import { JsonApiResponse } from '@shared/models/common/json-api.model';
-import {
-  ComponentsWikiJsonApiResponse,
-  ComponentWiki,
-  HomeWikiJsonApiResponse,
-  WikiGetResponse,
-  WikiJsonApiResponseWithMeta,
-  WikiModel,
-  WikisWithMeta,
-  WikiVersion,
-  WikiVersionJsonApiResponse,
-} from '@shared/models/wiki/wiki.model';
 
 import { ResourceType } from '../enums/resource-type.enum';
 import { WikiMapper } from '../mappers/wiki';
+import { NodesResponseJsonApi } from '../models/nodes/nodes-json-api.model';
+import { PaginatedData } from '../models/paginated-data.model';
+import { WikiModel, WikiVersion } from '../models/wiki/wiki.model';
+import {
+  WikiDataJsonApi,
+  WikiItemResponseJsonApi,
+  WikiResponseJsonApi,
+  WikiVersionItemResponseJsonApi,
+  WikiVersionResponseJsonApi,
+} from '../models/wiki/wiki-json-api.model';
+import { ComponentWiki } from '../stores/wiki';
 
 import { JsonApiService } from './json-api.service';
 
@@ -51,32 +50,19 @@ export class WikiService {
   }
 
   createWiki(projectId: string, name: string): Observable<WikiModel> {
-    const body = {
-      data: {
-        type: 'wikis',
-        attributes: {
-          name,
-        },
-      },
-    };
+    const body = { data: { type: 'wikis', attributes: { name } } };
+
     return this.jsonApiService
-      .post<JsonApiResponse<WikiGetResponse, null>>(`${this.apiUrl}/nodes/${projectId}/wikis/`, body)
-      .pipe(map((response) => WikiMapper.fromCreateWikiResponse(response.data)));
+      .post<WikiItemResponseJsonApi>(`${this.apiUrl}/nodes/${projectId}/wikis/`, body)
+      .pipe(map((response) => WikiMapper.fromGetWikiResponse(response.data)));
   }
 
   renameWiki(id: string, name: string): Observable<WikiModel> {
-    const body = {
-      data: {
-        type: 'wikis',
-        attributes: {
-          id,
-          name,
-        },
-      },
-    };
+    const body = { data: { type: 'wikis', attributes: { id, name } } };
+
     return this.jsonApiService
-      .patch<WikiGetResponse>(`${this.apiUrl}/wikis/${id}/`, body)
-      .pipe(map((response) => WikiMapper.fromCreateWikiResponse(response)));
+      .patch<WikiDataJsonApi>(`${this.apiUrl}/wikis/${id}/`, body)
+      .pipe(map((response) => WikiMapper.fromGetWikiResponse(response)));
   }
 
   deleteWiki(wikiId: string): Observable<void> {
@@ -85,11 +71,9 @@ export class WikiService {
 
   getHomeWiki(resourceType: ResourceType, resourceId: string): Observable<string> {
     const baseUrl = this.getBaseUrl(resourceType, resourceId);
-    const params: Record<string, unknown> = {
-      'filter[name]': 'home',
-    };
+    const params: Record<string, unknown> = { 'filter[name]': 'home' };
 
-    return this.jsonApiService.get<HomeWikiJsonApiResponse>(baseUrl, params).pipe(
+    return this.jsonApiService.get<WikiResponseJsonApi>(baseUrl, params).pipe(
       map((response) => {
         const homeWiki = response.data.find((wiki) => wiki.attributes.name.toLocaleLowerCase() === 'home');
         if (!homeWiki) {
@@ -107,29 +91,29 @@ export class WikiService {
     );
   }
 
-  getWikiList(resourceType: ResourceType, resourceId: string): Observable<WikisWithMeta> {
+  getWikiList(resourceType: ResourceType, resourceId: string): Observable<PaginatedData<WikiModel[]>> {
     const params: Record<string, unknown> = {
       'page[size]': 100,
     };
 
     const baseUrl = this.getBaseUrl(resourceType, resourceId);
 
-    return this.jsonApiService.get<WikiJsonApiResponseWithMeta>(baseUrl, params).pipe(
+    return this.jsonApiService.get<WikiResponseJsonApi>(baseUrl, params).pipe(
       map((response) => ({
-        wikis: response.data.map((wiki) => WikiMapper.fromGetWikiResponse(wiki)),
-        meta: response.meta,
+        data: response.data.map((wiki) => WikiMapper.fromGetWikiResponse(wiki)),
+        totalCount: response.meta.total,
+        pageSize: response.meta.per_page ?? 100,
+        isAnonymous: response.meta.anonymous ?? false,
       }))
     );
   }
 
   getComponentsWikiList(resourceType: ResourceType, resourceId: string): Observable<ComponentWiki[]> {
     const resourcePath = this.urlMap.get(resourceType);
-    const params: Record<string, unknown> = {
-      embed: 'wikis',
-      'page[size]': 100,
-    };
+    const params: Record<string, unknown> = { embed: 'wikis', 'page[size]': 100 };
+
     return this.jsonApiService
-      .get<ComponentsWikiJsonApiResponse>(`${this.apiUrl}/${resourcePath}/${resourceId}/children/`, params)
+      .get<NodesResponseJsonApi>(`${this.apiUrl}/${resourcePath}/${resourceId}/children/`, params)
       .pipe(map((response) => response.data.map((component) => WikiMapper.fromGetComponentsWikiResponse(component))));
   }
 
@@ -141,23 +125,16 @@ export class WikiService {
     };
 
     return this.jsonApiService
-      .get<WikiVersionJsonApiResponse>(`${this.apiUrl}/wikis/${wikiId}/versions/`, params)
+      .get<WikiVersionResponseJsonApi>(`${this.apiUrl}/wikis/${wikiId}/versions/`, params)
       .pipe(map((response) => response.data.map((version) => WikiMapper.fromGetWikiVersionResponse(version))));
   }
 
   createWikiVersion(wikiId: string, content: string): Observable<unknown> {
-    const body = {
-      data: {
-        type: 'wiki-versions',
-        attributes: {
-          content,
-        },
-      },
-    };
+    const body = { data: { type: 'wiki-versions', attributes: { content } } };
 
     return this.jsonApiService
-      .post<JsonApiResponse<WikiGetResponse, null>>(`${this.apiUrl}/wikis/${wikiId}/versions/`, body)
-      .pipe(map((response) => WikiMapper.fromCreateWikiResponse(response.data)));
+      .post<WikiVersionItemResponseJsonApi>(`${this.apiUrl}/wikis/${wikiId}/versions/`, body)
+      .pipe(map((response) => WikiMapper.fromGetWikiVersionResponse(response.data)));
   }
 
   getWikiVersionContent(wikiId: string, versionId: string): Observable<string> {
diff --git a/src/app/shared/stores/activity-logs/activity-logs.model.ts b/src/app/shared/stores/activity-logs/activity-logs.model.ts
index 8f0f9f6e9..c8333739a 100644
--- a/src/app/shared/stores/activity-logs/activity-logs.model.ts
+++ b/src/app/shared/stores/activity-logs/activity-logs.model.ts
@@ -1,8 +1,8 @@
-import { ActivityLogWithDisplay } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
+import { ActivityLogWithDisplayModel } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
 import { AsyncStateWithTotalCount } from '@osf/shared/models/store/async-state-with-total-count.model';
 
 export interface ActivityLogsStateModel {
-  activityLogs: AsyncStateWithTotalCount<ActivityLogWithDisplay[]>;
+  activityLogs: AsyncStateWithTotalCount<ActivityLogWithDisplayModel[]>;
 }
 
 export const ACTIVITY_LOGS_STATE_DEFAULT: ActivityLogsStateModel = {
diff --git a/src/app/shared/stores/activity-logs/activity-logs.selectors.ts b/src/app/shared/stores/activity-logs/activity-logs.selectors.ts
index 3e93b7da0..68008f33d 100644
--- a/src/app/shared/stores/activity-logs/activity-logs.selectors.ts
+++ b/src/app/shared/stores/activity-logs/activity-logs.selectors.ts
@@ -1,13 +1,13 @@
 import { Selector } from '@ngxs/store';
 
-import { ActivityLogWithDisplay } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
+import { ActivityLogWithDisplayModel } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
 
 import { ActivityLogsStateModel } from './activity-logs.model';
 import { ActivityLogsState } from './activity-logs.state';
 
 export class ActivityLogsSelectors {
   @Selector([ActivityLogsState])
-  static getActivityLogs(state: ActivityLogsStateModel): ActivityLogWithDisplay[] {
+  static getActivityLogs(state: ActivityLogsStateModel): ActivityLogWithDisplayModel[] {
     return state.activityLogs.data;
   }
 
diff --git a/src/app/shared/stores/addons/addons.actions.ts b/src/app/shared/stores/addons/addons.actions.ts
index 05b79735f..04f3b02b1 100644
--- a/src/app/shared/stores/addons/addons.actions.ts
+++ b/src/app/shared/stores/addons/addons.actions.ts
@@ -1,8 +1,6 @@
-import {
-  AuthorizedAddonRequestJsonApi,
-  ConfiguredAddonRequestJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.model';
 import { OperationInvocationRequestJsonApi } from '@osf/shared/models/addons/addon-operations-json-api.model';
+import { AuthorizedAddonRequestJsonApi } from '@osf/shared/models/addons/authorized-addon-json-api.model';
+import { ConfiguredAddonRequestJsonApi } from '@osf/shared/models/addons/configured-addon-json-api.model';
 
 export class GetStorageAddons {
   static readonly type = '[Addons] Get Storage Addons';
diff --git a/src/app/shared/stores/addons/addons.model.ts b/src/app/shared/stores/addons/addons.model.ts
index a5ce2675c..a9c4e3269 100644
--- a/src/app/shared/stores/addons/addons.model.ts
+++ b/src/app/shared/stores/addons/addons.model.ts
@@ -1,12 +1,9 @@
 import { AddonModel } from '@osf/shared/models/addons/addon.model';
-import {
-  ConfiguredAddonResponseJsonApi,
-  ResourceReferenceJsonApi,
-  UserReferenceJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.model';
 import { AuthorizedAccountModel } from '@osf/shared/models/addons/authorized-account.model';
 import { ConfiguredAddonModel } from '@osf/shared/models/addons/configured-addon.model';
 import { OperationInvocation } from '@osf/shared/models/addons/operation-invocation.model';
+import { ResourceReferenceModel } from '@osf/shared/models/addons/resource-reference.model';
+import { UserReferenceModel } from '@osf/shared/models/addons/user-reference.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 
 export interface AddonsStateModel {
@@ -20,10 +17,10 @@ export interface AddonsStateModel {
   configuredStorageAddons: AsyncStateModel<ConfiguredAddonModel[]>;
   configuredCitationAddons: AsyncStateModel<ConfiguredAddonModel[]>;
   configuredLinkAddons: AsyncStateModel<ConfiguredAddonModel[]>;
-  addonsUserReference: AsyncStateModel<UserReferenceJsonApi[]>;
-  addonsResourceReference: AsyncStateModel<ResourceReferenceJsonApi[]>;
+  addonsUserReference: AsyncStateModel<UserReferenceModel[]>;
+  addonsResourceReference: AsyncStateModel<ResourceReferenceModel[]>;
   createdUpdatedAuthorizedAddon: AsyncStateModel<AuthorizedAccountModel | null>;
-  createdUpdatedConfiguredAddon: AsyncStateModel<ConfiguredAddonResponseJsonApi | null>;
+  createdUpdatedConfiguredAddon: AsyncStateModel<ConfiguredAddonModel | null>;
   operationInvocation: AsyncStateModel<OperationInvocation | null>;
   selectedItemOperationInvocation: AsyncStateModel<OperationInvocation | null>;
   citationOperationInvocations: Record<string, AsyncStateModel<OperationInvocation | null>>;
diff --git a/src/app/shared/stores/addons/addons.selectors.ts b/src/app/shared/stores/addons/addons.selectors.ts
index 0aa79d276..b4e9b07d5 100644
--- a/src/app/shared/stores/addons/addons.selectors.ts
+++ b/src/app/shared/stores/addons/addons.selectors.ts
@@ -1,15 +1,12 @@
 import { createSelector, Selector } from '@ngxs/store';
 
 import { AddonModel } from '@osf/shared/models/addons/addon.model';
-import {
-  ConfiguredAddonResponseJsonApi,
-  ResourceReferenceJsonApi,
-  UserReferenceJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.model';
 import { AuthorizedAccountModel } from '@osf/shared/models/addons/authorized-account.model';
 import { ConfiguredAddonModel } from '@osf/shared/models/addons/configured-addon.model';
 import { OperationInvocation } from '@osf/shared/models/addons/operation-invocation.model';
+import { ResourceReferenceModel } from '@osf/shared/models/addons/resource-reference.model';
 import { StorageItem } from '@osf/shared/models/addons/storage-item.model';
+import { UserReferenceModel } from '@osf/shared/models/addons/user-reference.model';
 
 import { AddonsStateModel } from './addons.model';
 import { AddonsState } from './addons.state';
@@ -130,7 +127,7 @@ export class AddonsSelectors {
   }
 
   @Selector([AddonsState])
-  static getAddonsUserReference(state: AddonsStateModel): UserReferenceJsonApi[] {
+  static getAddonsUserReference(state: AddonsStateModel): UserReferenceModel[] {
     return state.addonsUserReference.data;
   }
 
@@ -140,7 +137,7 @@ export class AddonsSelectors {
   }
 
   @Selector([AddonsState])
-  static getAddonsResourceReference(state: AddonsStateModel): ResourceReferenceJsonApi[] {
+  static getAddonsResourceReference(state: AddonsStateModel): ResourceReferenceModel[] {
     return state.addonsResourceReference.data;
   }
 
@@ -160,7 +157,7 @@ export class AddonsSelectors {
   }
 
   @Selector([AddonsState])
-  static getCreatedOrUpdatedConfiguredAddon(state: AddonsStateModel): ConfiguredAddonResponseJsonApi | null {
+  static getCreatedOrUpdatedConfiguredAddon(state: AddonsStateModel): ConfiguredAddonModel | null {
     return state.createdUpdatedConfiguredAddon.data;
   }
 
diff --git a/src/app/shared/stores/bookmarks/bookmarks.model.ts b/src/app/shared/stores/bookmarks/bookmarks.model.ts
index 66a469992..b0f3b8cda 100644
--- a/src/app/shared/stores/bookmarks/bookmarks.model.ts
+++ b/src/app/shared/stores/bookmarks/bookmarks.model.ts
@@ -1,4 +1,4 @@
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 import { AsyncStateWithTotalCount } from '@osf/shared/models/store/async-state-with-total-count.model';
 
diff --git a/src/app/shared/stores/collections/collections.model.ts b/src/app/shared/stores/collections/collections.model.ts
index 59bbe7cda..b2e9bf3a5 100644
--- a/src/app/shared/stores/collections/collections.model.ts
+++ b/src/app/shared/stores/collections/collections.model.ts
@@ -1,8 +1,8 @@
+import { CollectionProvider } from '@osf/shared/models/collections/collection-provider.model';
 import {
-  CollectionProvider,
   CollectionSubmission,
   CollectionSubmissionWithGuid,
-} from '@osf/shared/models/collections/collections.model';
+} from '@osf/shared/models/collections/collection-submissions.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 
 export interface CollectionsStateModel {
diff --git a/src/app/shared/stores/global-search/global-search.state.spec.ts b/src/app/shared/stores/global-search/global-search.state.spec.ts
index e204398a9..164409ca6 100644
--- a/src/app/shared/stores/global-search/global-search.state.spec.ts
+++ b/src/app/shared/stores/global-search/global-search.state.spec.ts
@@ -1,19 +1,21 @@
 import { provideStore, Store } from '@ngxs/store';
 
+import { MockProvider } from 'ng-mocks';
+
 import { EMPTY, of } from 'rxjs';
 
-import { vi } from 'vitest';
+import { Mock, vi } from 'vitest';
 
 import { TestBed } from '@angular/core/testing';
 
-import {
-  DiscoverableFilter,
-  FilterOperatorOption,
-  FilterOption,
-} from '@osf/shared/models/search/discoverable-filter.model';
+import { FilterOption } from '@osf/shared/models/search/discoverable-filter.model';
 import { GlobalSearchService } from '@osf/shared/services/global-search.service';
-import { ResourcesData } from '@shared/models/search/resource.model';
 
+import {
+  MOCK_CEDAR_FILTER,
+  MOCK_REGULAR_FILTER,
+  MOCK_RESOURCES_DATA,
+} from '@testing/data/global-search/global-search.data';
 import { provideOSFCore } from '@testing/osf.testing.provider';
 
 import {
@@ -27,105 +29,67 @@ import {
 import { GlobalSearchSelectors } from './global-search.selectors';
 import { GlobalSearchState } from './global-search.state';
 
-const MOCK_RESOURCES_DATA: ResourcesData = {
-  resources: [],
-  filters: [],
-  count: 0,
-  self: '',
-  first: null,
-  next: null,
-  previous: null,
-};
-
-const CEDAR_FILTER: DiscoverableFilter = {
-  key: 'School Type',
-  label: 'School Type',
-  operator: FilterOperatorOption.AnyOf,
-  cedarPropertyIri: 'uuid-school-type',
-  options: [
-    { label: 'High School', value: 'High School', cardSearchResultCount: null },
-    { label: 'Middle School', value: 'Middle School', cardSearchResultCount: null },
-  ],
-};
-
-const REGULAR_FILTER: DiscoverableFilter = {
-  key: 'subject',
-  label: 'Subject',
-  operator: FilterOperatorOption.AnyOf,
-  resultCount: 10,
-};
-
-function setup() {
-  const mockGetResources = vi.fn().mockReturnValue(of(MOCK_RESOURCES_DATA));
-  const mockGetFilterOptions = vi.fn().mockReturnValue(of({ options: [], nextUrl: undefined }));
-
-  TestBed.configureTestingModule({
-    providers: [
-      provideOSFCore(),
-      provideStore([GlobalSearchState]),
-      {
-        provide: GlobalSearchService,
-        useValue: {
+describe('State: GlobalSearch', () => {
+  let store: Store;
+  let mockGetResources: Mock;
+  let mockGetFilterOptions: Mock;
+
+  beforeEach(() => {
+    mockGetResources = vi.fn().mockReturnValue(of(MOCK_RESOURCES_DATA));
+    mockGetFilterOptions = vi.fn().mockReturnValue(of({ options: [], nextUrl: undefined }));
+
+    TestBed.configureTestingModule({
+      providers: [
+        provideOSFCore(),
+        provideStore([GlobalSearchState]),
+        MockProvider(GlobalSearchService, {
           getResources: mockGetResources,
           getFilterOptions: mockGetFilterOptions,
           getResourcesByLink: vi.fn().mockReturnValue(EMPTY),
           getFilterOptionsFromPaginationUrl: vi.fn().mockReturnValue(EMPTY),
-        },
-      },
-    ],
-  });
+        }),
+      ],
+    });
 
-  return {
-    store: TestBed.inject(Store),
-    mockGetResources,
-    mockGetFilterOptions,
-  };
-}
+    store = TestBed.inject(Store);
+  });
 
-describe('GlobalSearchState', () => {
   describe('LoadFilterOptions', () => {
     it('should skip the API call for a CEDAR filter (cedarPropertyIri set)', () => {
-      const { store, mockGetFilterOptions } = setup();
-
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
       store.dispatch(new FetchResources());
-      store.dispatch(new LoadFilterOptions(CEDAR_FILTER.key));
+      store.dispatch(new LoadFilterOptions(MOCK_CEDAR_FILTER.key));
 
       expect(mockGetFilterOptions).not.toHaveBeenCalled();
     });
 
     it('should set isLoaded to true for a CEDAR filter when short-circuiting', () => {
-      const { store } = setup();
-
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
       store.dispatch(new FetchResources());
-      store.dispatch(new LoadFilterOptions(CEDAR_FILTER.key));
+      store.dispatch(new LoadFilterOptions(MOCK_CEDAR_FILTER.key));
 
       const filters = store.selectSnapshot(GlobalSearchSelectors.getFilters);
-      const cedarFilterState = filters.find((f) => f.key === CEDAR_FILTER.key);
+      const cedarFilterState = filters.find((f) => f.key === MOCK_CEDAR_FILTER.key);
       expect(cedarFilterState?.isLoaded).toBe(true);
     });
 
     it('should call the API for a regular filter', () => {
-      const { store, mockGetFilterOptions } = setup();
-
       store.dispatch(new FetchResources());
-      store.dispatch(new LoadFilterOptions(REGULAR_FILTER.key));
+      store.dispatch(new LoadFilterOptions(MOCK_REGULAR_FILTER.key));
 
       expect(mockGetFilterOptions).toHaveBeenCalled();
       const params = mockGetFilterOptions.mock.calls[0][0];
-      expect(params['valueSearchPropertyPath']).toBe(REGULAR_FILTER.key);
+      expect(params['valueSearchPropertyPath']).toBe(MOCK_REGULAR_FILTER.key);
     });
   });
 
   describe('LoadFilterOptionsAndSetValues', () => {
     it('should not call the API for CEDAR filter keys', () => {
-      const { store, mockGetFilterOptions } = setup();
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
 
       store.dispatch(
         new LoadFilterOptionsAndSetValues({
-          [CEDAR_FILTER.key]: [{ label: 'High School', value: 'High School', cardSearchResultCount: null }],
+          [MOCK_CEDAR_FILTER.key]: [{ label: 'High School', value: 'High School', cardSearchResultCount: null }],
         })
       );
 
@@ -133,38 +97,34 @@ describe('GlobalSearchState', () => {
     });
 
     it('should still set selectedFilterOptions for CEDAR keys', () => {
-      const { store } = setup();
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
 
       const selectedOption: FilterOption = { label: 'High School', value: 'High School', cardSearchResultCount: null };
-      store.dispatch(new LoadFilterOptionsAndSetValues({ [CEDAR_FILTER.key]: [selectedOption] }));
+      store.dispatch(new LoadFilterOptionsAndSetValues({ [MOCK_CEDAR_FILTER.key]: [selectedOption] }));
 
       const selected = store.selectSnapshot(GlobalSearchSelectors.getSelectedOptions);
-      expect(selected[CEDAR_FILTER.key]).toEqual([selectedOption]);
+      expect(selected[MOCK_CEDAR_FILTER.key]).toEqual([selectedOption]);
     });
 
     it('should only call the API for non-CEDAR keys in a mixed payload', () => {
-      const { store, mockGetFilterOptions } = setup();
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
 
       store.dispatch(
         new LoadFilterOptionsAndSetValues({
-          [CEDAR_FILTER.key]: [{ label: 'High School', value: 'High School', cardSearchResultCount: null }],
-          [REGULAR_FILTER.key]: [{ label: 'Biology', value: 'biology', cardSearchResultCount: 5 }],
+          [MOCK_CEDAR_FILTER.key]: [{ label: 'High School', value: 'High School', cardSearchResultCount: null }],
+          [MOCK_REGULAR_FILTER.key]: [{ label: 'Biology', value: 'biology', cardSearchResultCount: 5 }],
         })
       );
 
       expect(mockGetFilterOptions).toHaveBeenCalledTimes(1);
       const params = mockGetFilterOptions.mock.calls[0][0];
-      expect(params['valueSearchPropertyPath']).toBe(REGULAR_FILTER.key);
+      expect(params['valueSearchPropertyPath']).toBe(MOCK_REGULAR_FILTER.key);
     });
   });
 
   describe('FetchResources (CEDAR filter params)', () => {
     it('should add iriShorthand[cedar] when extraFilters are present', () => {
-      const { store, mockGetResources } = setup();
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
-
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
       store.dispatch(new FetchResources());
 
       const params = mockGetResources.mock.calls[0][0];
@@ -172,8 +132,6 @@ describe('GlobalSearchState', () => {
     });
 
     it('should not add iriShorthand[cedar] when no extraFilters are present', () => {
-      const { store, mockGetResources } = setup();
-
       store.dispatch(new FetchResources());
 
       const params = mockGetResources.mock.calls[0][0];
@@ -181,34 +139,32 @@ describe('GlobalSearchState', () => {
     });
 
     it('should use cardSearchText for a selected CEDAR filter value', () => {
-      const { store, mockGetResources } = setup();
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
-      store.dispatch(new FetchResources()); // populates state.filters via updateResourcesState
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
+      store.dispatch(new FetchResources());
       mockGetResources.mockClear();
 
       store.dispatch(
         new LoadFilterOptionsAndSetValues({
-          [CEDAR_FILTER.key]: [{ label: 'High School', value: 'High School', cardSearchResultCount: null }],
+          [MOCK_CEDAR_FILTER.key]: [{ label: 'High School', value: 'High School', cardSearchResultCount: null }],
         })
       );
       store.dispatch(new FetchResources());
 
       const params = mockGetResources.mock.calls[0][0];
-      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
+      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${MOCK_CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
         '"High School"',
       ]);
-      expect(params[`cardSearchFilter[${CEDAR_FILTER.key}][]`]).toBeUndefined();
+      expect(params[`cardSearchFilter[${MOCK_CEDAR_FILTER.key}][]`]).toBeUndefined();
     });
 
     it('should include all selected values for a CEDAR filter', () => {
-      const { store, mockGetResources } = setup();
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
       store.dispatch(new FetchResources());
       mockGetResources.mockClear();
 
       store.dispatch(
         new LoadFilterOptionsAndSetValues({
-          [CEDAR_FILTER.key]: [
+          [MOCK_CEDAR_FILTER.key]: [
             { label: 'High School', value: 'High School', cardSearchResultCount: null },
             { label: 'Middle School', value: 'Middle School', cardSearchResultCount: null },
           ],
@@ -217,26 +173,24 @@ describe('GlobalSearchState', () => {
       store.dispatch(new FetchResources());
 
       const params = mockGetResources.mock.calls[0][0];
-      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
+      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${MOCK_CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
         '"High School"',
         '"Middle School"',
       ]);
     });
 
     it('should use extraFilters as fallback for CEDAR lookup before state.filters is populated', () => {
-      const { store, mockGetResources } = setup();
-      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new SetExtraFilters([MOCK_CEDAR_FILTER]));
 
       store.dispatch(
         new LoadFilterOptionsAndSetValues({
-          [CEDAR_FILTER.key]: [{ label: 'High School', value: 'High School', cardSearchResultCount: null }],
+          [MOCK_CEDAR_FILTER.key]: [{ label: 'High School', value: 'High School', cardSearchResultCount: null }],
         })
       );
-      // First FetchResources — state.filters is still empty at this point
       store.dispatch(new FetchResources());
 
       const params = mockGetResources.mock.calls[0][0];
-      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
+      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${MOCK_CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
         '"High School"',
       ]);
     });
@@ -244,8 +198,6 @@ describe('GlobalSearchState', () => {
 
   describe('SetDefaultFilterValue', () => {
     it('should include the default filter in the API call', () => {
-      const { store, mockGetResources } = setup();
-
       store.dispatch(new SetDefaultFilterValue('defaultKey', 'default-value'));
       store.dispatch(new FetchResources());
 
@@ -254,8 +206,6 @@ describe('GlobalSearchState', () => {
     });
 
     it('should not be overridden when a selected filter for the same key is cleared', () => {
-      const { store, mockGetResources } = setup();
-
       store.dispatch(new SetDefaultFilterValue('defaultKey', 'default-value'));
       store.dispatch(new UpdateSelectedFilterOption('defaultKey', []));
       store.dispatch(new FetchResources());
@@ -266,8 +216,6 @@ describe('GlobalSearchState', () => {
     });
 
     it('should AND the default value with an any-of clause for an explicitly selected value', () => {
-      const { store, mockGetResources } = setup();
-
       store.dispatch(new SetDefaultFilterValue('defaultKey', 'default-value'));
       store.dispatch(
         new UpdateSelectedFilterOption('defaultKey', [
@@ -282,8 +230,6 @@ describe('GlobalSearchState', () => {
     });
 
     it('should OR multiple selected values together via a single any-of clause', () => {
-      const { store, mockGetResources } = setup();
-
       store.dispatch(new SetDefaultFilterValue('defaultKey', 'default-value'));
       store.dispatch(
         new UpdateSelectedFilterOption('defaultKey', [
diff --git a/src/app/shared/stores/institutions-search/institutions-search.model.ts b/src/app/shared/stores/institutions-search/institutions-search.model.ts
index 383f424d8..4b2e77f38 100644
--- a/src/app/shared/stores/institutions-search/institutions-search.model.ts
+++ b/src/app/shared/stores/institutions-search/institutions-search.model.ts
@@ -1,11 +1,11 @@
 import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 
-export interface InstitutionsSearchModel {
+export interface InstitutionsSearchStateModel {
   institution: AsyncStateModel<Institution>;
 }
 
-export const INSTITUTIONS_SEARCH_STATE_DEFAULTS: InstitutionsSearchModel = {
+export const INSTITUTIONS_SEARCH_STATE_DEFAULTS: InstitutionsSearchStateModel = {
   institution: {
     data: {} as Institution,
     isLoading: false,
diff --git a/src/app/shared/stores/institutions-search/institutions-search.selectors.ts b/src/app/shared/stores/institutions-search/institutions-search.selectors.ts
index 3303c7e8b..b7d329363 100644
--- a/src/app/shared/stores/institutions-search/institutions-search.selectors.ts
+++ b/src/app/shared/stores/institutions-search/institutions-search.selectors.ts
@@ -1,16 +1,16 @@
 import { Selector } from '@ngxs/store';
 
-import { InstitutionsSearchModel } from './institutions-search.model';
+import { InstitutionsSearchStateModel } from './institutions-search.model';
 import { InstitutionsSearchState } from './institutions-search.state';
 
 export class InstitutionsSearchSelectors {
   @Selector([InstitutionsSearchState])
-  static getInstitution(state: InstitutionsSearchModel) {
+  static getInstitution(state: InstitutionsSearchStateModel) {
     return state.institution.data;
   }
 
   @Selector([InstitutionsSearchState])
-  static getInstitutionLoading(state: InstitutionsSearchModel) {
+  static getInstitutionLoading(state: InstitutionsSearchStateModel) {
     return state.institution.isLoading;
   }
 }
diff --git a/src/app/shared/stores/institutions-search/institutions-search.state.ts b/src/app/shared/stores/institutions-search/institutions-search.state.ts
index 192df7d87..f9c83ba22 100644
--- a/src/app/shared/stores/institutions-search/institutions-search.state.ts
+++ b/src/app/shared/stores/institutions-search/institutions-search.state.ts
@@ -10,9 +10,9 @@ import { Institution } from '@osf/shared/models/institutions/institutions.model'
 import { InstitutionsService } from '@osf/shared/services/institutions.service';
 
 import { FetchInstitutionById } from './institutions-search.actions';
-import { INSTITUTIONS_SEARCH_STATE_DEFAULTS, InstitutionsSearchModel } from './institutions-search.model';
+import { INSTITUTIONS_SEARCH_STATE_DEFAULTS, InstitutionsSearchStateModel } from './institutions-search.model';
 
-@State<InstitutionsSearchModel>({
+@State<InstitutionsSearchStateModel>({
   name: 'institutionsSearch',
   defaults: INSTITUTIONS_SEARCH_STATE_DEFAULTS,
 })
@@ -21,7 +21,7 @@ export class InstitutionsSearchState {
   private readonly institutionsService = inject(InstitutionsService);
 
   @Action(FetchInstitutionById)
-  fetchInstitutionById(ctx: StateContext<InstitutionsSearchModel>, action: FetchInstitutionById) {
+  fetchInstitutionById(ctx: StateContext<InstitutionsSearchStateModel>, action: FetchInstitutionById) {
     ctx.patchState({ institution: { data: {} as Institution, isLoading: true, error: null } });
 
     return this.institutionsService.getInstitutionById(action.institutionId).pipe(
diff --git a/src/app/shared/stores/my-resources/my-resources.model.ts b/src/app/shared/stores/my-resources/my-resources.model.ts
index cfc32a040..5b7009587 100644
--- a/src/app/shared/stores/my-resources/my-resources.model.ts
+++ b/src/app/shared/stores/my-resources/my-resources.model.ts
@@ -1,4 +1,4 @@
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { AsyncStateWithTotalCount } from '@osf/shared/models/store/async-state-with-total-count.model';
 
 export interface MyResourcesStateModel {
diff --git a/src/app/shared/stores/my-resources/my-resources.selectors.ts b/src/app/shared/stores/my-resources/my-resources.selectors.ts
index f3da50129..3c43564ff 100644
--- a/src/app/shared/stores/my-resources/my-resources.selectors.ts
+++ b/src/app/shared/stores/my-resources/my-resources.selectors.ts
@@ -1,6 +1,6 @@
 import { Selector } from '@ngxs/store';
 
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 
 import { MyResourcesStateModel } from './my-resources.model';
 import { MyResourcesState } from './my-resources.state';
diff --git a/src/app/shared/stores/my-resources/my-resources.state.ts b/src/app/shared/stores/my-resources/my-resources.state.ts
index 913d51fa6..8809ac1ad 100644
--- a/src/app/shared/stores/my-resources/my-resources.state.ts
+++ b/src/app/shared/stores/my-resources/my-resources.state.ts
@@ -50,7 +50,7 @@ export class MyResourcesState {
               data: res.data,
               isLoading: false,
               error: null,
-              totalCount: res.meta.total,
+              totalCount: res.totalCount,
             },
           });
         }),
@@ -83,7 +83,7 @@ export class MyResourcesState {
               data: res.data,
               isLoading: false,
               error: null,
-              totalCount: res.meta.total,
+              totalCount: res.totalCount,
             },
           });
         }),
@@ -108,7 +108,7 @@ export class MyResourcesState {
             data: res.data,
             isLoading: false,
             error: null,
-            totalCount: res.meta.total,
+            totalCount: res.totalCount,
           },
         });
       }),
diff --git a/src/app/shared/stores/node-links/node-links.actions.ts b/src/app/shared/stores/node-links/node-links.actions.ts
index 52e21e0df..413ebb7d9 100644
--- a/src/app/shared/stores/node-links/node-links.actions.ts
+++ b/src/app/shared/stores/node-links/node-links.actions.ts
@@ -1,5 +1,5 @@
 import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 import { NodeModel } from '@osf/shared/models/nodes/base-node.model';
 
 export class CreateNodeLink {
diff --git a/src/app/shared/stores/subjects/subjects.model.ts b/src/app/shared/stores/subjects/subjects.model.ts
index e4f450880..d9b073015 100644
--- a/src/app/shared/stores/subjects/subjects.model.ts
+++ b/src/app/shared/stores/subjects/subjects.model.ts
@@ -1,13 +1,13 @@
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 import { SubjectModel } from '@osf/shared/models/subject/subject.model';
 
-export interface SubjectsModel {
+export interface SubjectsStateModel {
   subjects: AsyncStateModel<SubjectModel[]>;
   searchedSubjects: AsyncStateModel<SubjectModel[]>;
   selectedSubjects: AsyncStateModel<SubjectModel[]>;
 }
 
-export const SUBJECT_STATE_DEFAULTS: SubjectsModel = {
+export const SUBJECT_STATE_DEFAULTS: SubjectsStateModel = {
   subjects: {
     data: [],
     isLoading: false,
diff --git a/src/app/shared/stores/subjects/subjects.selectors.ts b/src/app/shared/stores/subjects/subjects.selectors.ts
index 9a8809130..20e682edf 100644
--- a/src/app/shared/stores/subjects/subjects.selectors.ts
+++ b/src/app/shared/stores/subjects/subjects.selectors.ts
@@ -2,37 +2,37 @@ import { Selector } from '@ngxs/store';
 
 import { SubjectModel } from '@osf/shared/models/subject/subject.model';
 
-import { SubjectsModel } from './subjects.model';
+import { SubjectsStateModel } from './subjects.model';
 import { SubjectsState } from './subjects.state';
 
 export class SubjectsSelectors {
   @Selector([SubjectsState])
-  static getSubjects(state: SubjectsModel): SubjectModel[] {
+  static getSubjects(state: SubjectsStateModel): SubjectModel[] {
     return state.subjects.data;
   }
 
   @Selector([SubjectsState])
-  static getSubjectsLoading(state: SubjectsModel): boolean {
+  static getSubjectsLoading(state: SubjectsStateModel): boolean {
     return state.subjects.isLoading;
   }
 
   @Selector([SubjectsState])
-  static getSearchedSubjects(state: SubjectsModel): SubjectModel[] {
+  static getSearchedSubjects(state: SubjectsStateModel): SubjectModel[] {
     return state.searchedSubjects.data;
   }
 
   @Selector([SubjectsState])
-  static getSearchedSubjectsLoading(state: SubjectsModel): boolean {
+  static getSearchedSubjectsLoading(state: SubjectsStateModel): boolean {
     return state.searchedSubjects.isLoading;
   }
 
   @Selector([SubjectsState])
-  static getSelectedSubjects(state: SubjectsModel): SubjectModel[] {
+  static getSelectedSubjects(state: SubjectsStateModel): SubjectModel[] {
     return state.selectedSubjects.data;
   }
 
   @Selector([SubjectsState])
-  static areSelectedSubjectsLoading(state: SubjectsModel): boolean {
+  static areSelectedSubjectsLoading(state: SubjectsStateModel): boolean {
     return state.selectedSubjects.isLoading;
   }
 }
diff --git a/src/app/shared/stores/subjects/subjects.state.ts b/src/app/shared/stores/subjects/subjects.state.ts
index 0ea1ed7c5..75c8d68d0 100644
--- a/src/app/shared/stores/subjects/subjects.state.ts
+++ b/src/app/shared/stores/subjects/subjects.state.ts
@@ -14,9 +14,9 @@ import {
   FetchSubjects,
   UpdateResourceSubjects,
 } from './subjects.actions';
-import { SUBJECT_STATE_DEFAULTS, SubjectsModel } from './subjects.model';
+import { SUBJECT_STATE_DEFAULTS, SubjectsStateModel } from './subjects.model';
 
-@State<SubjectsModel>({
+@State<SubjectsStateModel>({
   name: 'subjects',
   defaults: SUBJECT_STATE_DEFAULTS,
 })
@@ -25,7 +25,7 @@ export class SubjectsState {
   private readonly subjectsService = inject(SubjectsService);
 
   @Action(FetchSubjects)
-  fetchSubjects(ctx: StateContext<SubjectsModel>, { providerId, resourceType, search }: FetchSubjects) {
+  fetchSubjects(ctx: StateContext<SubjectsStateModel>, { providerId, resourceType, search }: FetchSubjects) {
     if (!resourceType) {
       return;
     }
@@ -55,7 +55,7 @@ export class SubjectsState {
   }
 
   @Action(FetchChildrenSubjects)
-  fetchSubjectsChildren(ctx: StateContext<SubjectsModel>, { parentId }: FetchChildrenSubjects) {
+  fetchSubjectsChildren(ctx: StateContext<SubjectsStateModel>, { parentId }: FetchChildrenSubjects) {
     ctx.patchState({
       subjects: {
         ...ctx.getState().subjects,
@@ -81,7 +81,7 @@ export class SubjectsState {
   }
 
   @Action(FetchSelectedSubjects)
-  fetchSelectedSubjects(ctx: StateContext<SubjectsModel>, { resourceId, resourceType }: FetchSelectedSubjects) {
+  fetchSelectedSubjects(ctx: StateContext<SubjectsStateModel>, { resourceId, resourceType }: FetchSelectedSubjects) {
     if (!resourceType) {
       return;
     }
@@ -110,7 +110,7 @@ export class SubjectsState {
 
   @Action(UpdateResourceSubjects)
   updateResourceSubjects(
-    ctx: StateContext<SubjectsModel>,
+    ctx: StateContext<SubjectsStateModel>,
     { resourceId, resourceType, subjects }: UpdateResourceSubjects
   ) {
     if (!resourceType) {
diff --git a/src/app/shared/stores/wiki/wiki.actions.ts b/src/app/shared/stores/wiki/wiki.actions.ts
index 3d0ec159d..baa28d712 100644
--- a/src/app/shared/stores/wiki/wiki.actions.ts
+++ b/src/app/shared/stores/wiki/wiki.actions.ts
@@ -1,5 +1,5 @@
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { WikiModes } from '@shared/models/wiki/wiki.model';
+import { WikiModes } from '@osf/shared/enums/wiki-modes.enum';
 
 export class CreateWiki {
   static readonly type = '[Wiki] Create Wiki';
diff --git a/src/app/shared/stores/wiki/wiki.state.ts b/src/app/shared/stores/wiki/wiki.state.ts
index 050308677..d82b5961c 100644
--- a/src/app/shared/stores/wiki/wiki.state.ts
+++ b/src/app/shared/stores/wiki/wiki.state.ts
@@ -167,7 +167,7 @@ export class WikiState {
 
     return this.wikiService.getWikiList(action.resourceType, action.resourceId).pipe(
       tap((response) => {
-        const wiki = response.wikis.sort((a, b) => {
+        const wiki = response.data.sort((a, b) => {
           if (a.name === 'Home') return -1;
           if (b.name === 'Home') return 1;
           return a.name.localeCompare(b.name);
@@ -179,7 +179,7 @@ export class WikiState {
             isLoading: false,
             error: null,
           },
-          isAnonymous: response.meta?.anonymous ?? false,
+          isAnonymous: response.isAnonymous,
         });
       }),
       map((wiki) => wiki),
diff --git a/src/testing/data/addons/addons.configured.data.ts b/src/testing/data/addons/addons.configured.data.ts
index 97f535fde..8863f08b6 100644
--- a/src/testing/data/addons/addons.configured.data.ts
+++ b/src/testing/data/addons/addons.configured.data.ts
@@ -1,6 +1,7 @@
 import { AddonMapper } from '@osf/shared/mappers/addon.mapper';
+import { ConfiguredAddonListResponseWithIncludeJsonApi } from '@osf/shared/models/addons/configured-addon-json-api.model';
 
-const ConfiguredAddons = {
+const ConfiguredAddons: ConfiguredAddonListResponseWithIncludeJsonApi = {
   data: [
     {
       type: 'configured-storage-addons',
@@ -15,45 +16,18 @@ const ConfiguredAddons = {
       },
       relationships: {
         base_account: {
-          links: {
-            related:
-              'https://addons.staging4.osf.io/v1/configured-storage-addons/756579dc-3a24-4849-8866-698a60846ac3/base_account',
-          },
           data: {
             type: 'authorized-storage-accounts',
             id: '62ed6dd7-f7b7-4003-b7b4-855789c1f991',
           },
         },
-        authorized_resource: {
-          links: {
-            related:
-              'https://addons.staging4.osf.io/v1/configured-storage-addons/756579dc-3a24-4849-8866-698a60846ac3/authorized_resource',
-          },
-          data: {
-            type: 'resource-references',
-            id: '3193f97c-e6d8-41a4-8312-b73483442086',
-          },
-        },
-        connected_operations: {
-          links: {
-            related:
-              'https://addons.staging4.osf.io/v1/configured-storage-addons/756579dc-3a24-4849-8866-698a60846ac3/connected_operations',
-          },
-        },
         external_storage_service: {
-          links: {
-            related:
-              'https://addons.staging4.osf.io/v1/configured-storage-addons/756579dc-3a24-4849-8866-698a60846ac3/external_storage_service',
-          },
           data: {
             type: 'external-storage-services',
             id: '8aeb85e9-3a73-426f-a89b-5624b4b9d418',
           },
         },
       },
-      links: {
-        self: 'https://addons.staging4.osf.io/v1/configured-storage-addons/756579dc-3a24-4849-8866-698a60846ac3',
-      },
     },
   ],
   included: [
@@ -65,9 +39,6 @@ const ConfiguredAddons = {
         credentials_format: 'OAUTH2',
         icon_url: 'https://osf.io/assets/images/logo.svg',
       },
-      links: {
-        self: 'https://addons.staging4.osf.io/v1/external-storage-services/8aeb85e9-3a73-426f-a89b-5624b4b9d418',
-      },
     },
   ],
 };
@@ -87,9 +58,9 @@ export function getConfiguredAddonsData(index?: number, asArray?: boolean) {
 export function getConfiguredAddonsMappedData(index?: number, asArray?: boolean) {
   if (index || index === 0) {
     if (asArray) {
-      return [structuredClone(AddonMapper.fromConfiguredAddonResponse(ConfiguredAddons.data[index] as any))];
+      return [structuredClone(AddonMapper.fromConfiguredAddonResponse(ConfiguredAddons.data[index]))];
     } else {
-      return structuredClone(AddonMapper.fromConfiguredAddonResponse(ConfiguredAddons.data[index] as any));
+      return structuredClone(AddonMapper.fromConfiguredAddonResponse(ConfiguredAddons.data[index]));
     }
   } else {
     return structuredClone(ConfiguredAddons.data.map((item) => AddonMapper.fromConfiguredAddonResponse(item)));
diff --git a/src/testing/data/collections/cedar-metadata.mock.ts b/src/testing/data/collections/cedar-metadata.mock.ts
index 9439b6aac..307d3915a 100644
--- a/src/testing/data/collections/cedar-metadata.mock.ts
+++ b/src/testing/data/collections/cedar-metadata.mock.ts
@@ -1,11 +1,19 @@
-import { CedarMetadataDataTemplateJsonApi, CedarMetadataRecordData } from '@osf/features/metadata/models';
+import { CedarMetadataMapper } from '@osf/features/metadata/mappers';
+import {
+  CedarMetadataAttributes,
+  CedarMetadataDataTemplateJsonApi,
+  CedarMetadataRecordDataJsonApi,
+  CedarMetadataRecordModel,
+  CedarMetadataTemplateModel,
+} from '@osf/features/metadata/models';
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmission } from '@osf/shared/models/collections/collection-submissions.model';
 
-export const MOCK_CEDAR_TEMPLATE: CedarMetadataDataTemplateJsonApi = {
+const MOCK_CEDAR_TEMPLATE_JSON_API: CedarMetadataDataTemplateJsonApi = {
   id: 'template-1',
   type: 'cedar-metadata-templates',
   attributes: {
+    active: true,
     schema_name: 'Test Template',
     cedar_id: 'cedar-1',
     template: {
@@ -36,18 +44,28 @@ export const MOCK_CEDAR_TEMPLATE: CedarMetadataDataTemplateJsonApi = {
   },
 };
 
-export const MOCK_CEDAR_RECORD: CedarMetadataRecordData = {
+const MOCK_CEDAR_RECORD_JSON_API: CedarMetadataRecordDataJsonApi = {
   id: 'record-1',
   attributes: {
-    metadata: { field: 'value' } as unknown as CedarMetadataRecordData['attributes']['metadata'],
+    metadata: { field: 'value' } as unknown as CedarMetadataAttributes,
     is_published: true,
   },
   relationships: {
     template: { data: { type: 'cedar-metadata-templates', id: 'template-1' } },
     target: { data: { type: 'nodes', id: 'node-1' } },
   },
+  embeds: {
+    template: {
+      data: MOCK_CEDAR_TEMPLATE_JSON_API,
+    },
+  },
 };
 
+export const MOCK_CEDAR_TEMPLATE: CedarMetadataTemplateModel =
+  CedarMetadataMapper.fromTemplate(MOCK_CEDAR_TEMPLATE_JSON_API);
+
+export const MOCK_CEDAR_RECORD: CedarMetadataRecordModel = CedarMetadataMapper.fromRecord(MOCK_CEDAR_RECORD_JSON_API);
+
 export const MOCK_CEDAR_SUBMISSION: CollectionSubmission = {
   id: '1',
   type: 'collection-submission',
diff --git a/src/testing/data/collections/collection-submissions.mock.ts b/src/testing/data/collections/collection-submissions.mock.ts
index b36456937..c7e71680b 100644
--- a/src/testing/data/collections/collection-submissions.mock.ts
+++ b/src/testing/data/collections/collection-submissions.mock.ts
@@ -1,5 +1,5 @@
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmission } from '@osf/shared/models/collections/collection-submissions.model';
 
 export const MOCK_PROJECT_COLLECTION_SUBMISSIONS: CollectionSubmission[] = [
   {
diff --git a/src/testing/data/dashboard/dasboard.data.ts b/src/testing/data/dashboard/dasboard.data.ts
deleted file mode 100644
index e296f94e2..000000000
--- a/src/testing/data/dashboard/dasboard.data.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
-
-const ProjectsMock = {
-  data: [
-    {
-      type: 'my-resources-items',
-      id: '1',
-      attributes: {
-        title: 'Deep Learning for Image Recognition',
-        date_created: '2025-01-15T10:30:00Z',
-        date_modified: '2025-02-01T14:45:00Z',
-        is_public: true,
-      },
-      relationships: {
-        contributors: {
-          data: [
-            {
-              type: 'my-resources-contributors',
-              id: 'c1',
-            },
-          ],
-        },
-      },
-      links: {
-        self: 'https://api.staging.osf.io/v1/my-resources-items/1',
-      },
-    },
-  ],
-  included: [
-    {
-      type: 'my-resources-contributors',
-      id: 'c1',
-      attributes: {
-        family_name: 'Smith',
-        full_name: 'John Michael Smith',
-        given_name: 'John',
-        middle_name: 'Michael',
-      },
-      links: {
-        self: 'https://api.staging.osf.io/v1/my-resources-contributors/c1',
-      },
-    },
-  ],
-};
-
-export function getProjectsMockData(index?: number, asArray?: boolean) {
-  if (index || index === 0) {
-    if (asArray) {
-      return Object({
-        data: [structuredClone(ProjectsMock.data[index])],
-      });
-    } else {
-      return structuredClone({
-        data: ProjectsMock.data[index],
-      });
-    }
-  } else {
-    return structuredClone(ProjectsMock);
-  }
-}
-
-export function getProjectsMockForComponent(): MyResourcesItem[] {
-  return getProjectsMockData().data.map((item: any) => ({
-    id: item.id,
-    type: item.type,
-    title: item.attributes.title,
-    dateCreated: item.attributes.date_created,
-    dateModified: item.attributes.date_modified,
-    isPublic: item.attributes.is_public,
-    contributors: [],
-  }));
-}
diff --git a/src/testing/data/global-search/global-search.data.ts b/src/testing/data/global-search/global-search.data.ts
new file mode 100644
index 000000000..b17cdb361
--- /dev/null
+++ b/src/testing/data/global-search/global-search.data.ts
@@ -0,0 +1,29 @@
+import { DiscoverableFilter, FilterOperatorOption } from '@osf/shared/models/search/discoverable-filter.model';
+import { ResourcesData } from '@shared/models/search/resource.model';
+
+export const MOCK_RESOURCES_DATA: ResourcesData = {
+  resources: [],
+  filters: [],
+  count: 0,
+  first: null,
+  next: null,
+  previous: null,
+};
+
+export const MOCK_CEDAR_FILTER: DiscoverableFilter = {
+  key: 'School Type',
+  label: 'School Type',
+  operator: FilterOperatorOption.AnyOf,
+  cedarPropertyIri: 'uuid-school-type',
+  options: [
+    { label: 'High School', value: 'High School', cardSearchResultCount: null },
+    { label: 'Middle School', value: 'Middle School', cardSearchResultCount: null },
+  ],
+};
+
+export const MOCK_REGULAR_FILTER: DiscoverableFilter = {
+  key: 'subject',
+  label: 'Subject',
+  operator: FilterOperatorOption.AnyOf,
+  resultCount: 10,
+};
diff --git a/src/testing/mocks/activity-log.mock.ts b/src/testing/mocks/activity-log.mock.ts
index 8388183c3..64161c950 100644
--- a/src/testing/mocks/activity-log.mock.ts
+++ b/src/testing/mocks/activity-log.mock.ts
@@ -1,5 +1,5 @@
-import { ActivityLogWithDisplay } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
-import { ActivityLog } from '@osf/shared/models/activity-logs/activity-logs.model';
+import { ActivityLogWithDisplayModel } from '@osf/shared/models/activity-logs/activity-log-with-display.model';
+import { ActivityLogModel } from '@osf/shared/models/activity-logs/activity-logs.model';
 
 export const ACTIVITY_LOGS_EMBEDS_QS =
   'embed%5B%5D=original_node&embed%5B%5D=user&embed%5B%5D=linked_node&embed%5B%5D=linked_registration&embed%5B%5D=template_node';
@@ -53,11 +53,11 @@ export function getActivityLogsResponse() {
   return makeActivityLogsResponse();
 }
 
-export type ActivityLogOverrides = Partial<Omit<ActivityLog, 'params'>> & {
-  params?: Partial<ActivityLog['params']>;
+export type ActivityLogOverrides = Partial<Omit<ActivityLogModel, 'params'>> & {
+  params?: Partial<ActivityLogModel['params']>;
 };
 
-export function makeActivityLog(overrides: ActivityLogOverrides = {}): ActivityLog {
+export function makeActivityLog(overrides: ActivityLogOverrides = {}): ActivityLogModel {
   const { params: paramsOverrides, ...restOverrides } = overrides;
 
   return structuredClone({
@@ -78,10 +78,12 @@ export function makeActivityLog(overrides: ActivityLogOverrides = {}): ActivityL
 }
 
 export type ActivityLogWithDisplayOverrides = ActivityLogOverrides & {
-  formattedActivity?: ActivityLogWithDisplay['formattedActivity'];
+  formattedActivity?: ActivityLogWithDisplayModel['formattedActivity'];
 };
 
-export function makeActivityLogWithDisplay(overrides: ActivityLogWithDisplayOverrides = {}): ActivityLogWithDisplay {
+export function makeActivityLogWithDisplay(
+  overrides: ActivityLogWithDisplayOverrides = {}
+): ActivityLogWithDisplayModel {
   const { params: paramsOverrides, ...restOverrides } = overrides;
   const formattedActivity = 'formattedActivity' in overrides ? overrides.formattedActivity : 'Test activity';
 
@@ -99,7 +101,7 @@ export function makeActivityLogWithDisplay(overrides: ActivityLogWithDisplayOver
   };
 }
 
-export const MOCK_ACTIVITY_LOGS_WITH_DISPLAY: ActivityLogWithDisplay[] = [
+export const MOCK_ACTIVITY_LOGS_WITH_DISPLAY: ActivityLogWithDisplayModel[] = [
   makeActivityLogWithDisplay({
     id: 'log1',
     action: 'update',
diff --git a/src/testing/mocks/admin-institutions.mock.ts b/src/testing/mocks/admin-institutions.mock.ts
index 0306cf368..8654fe46c 100644
--- a/src/testing/mocks/admin-institutions.mock.ts
+++ b/src/testing/mocks/admin-institutions.mock.ts
@@ -102,8 +102,8 @@ export const MOCK_ADMIN_INSTITUTIONS_SUMMARY_METRICS: InstitutionSummaryMetrics
 };
 
 export const MOCK_ADMIN_INSTITUTIONS_DEPARTMENTS: InstitutionDepartment[] = [
-  { id: 'dept-1', name: 'Computer Science', numberOfUsers: 45, selfLink: '/departments/cs' },
-  { id: 'dept-2', name: 'Biology', numberOfUsers: 30, selfLink: '/departments/bio' },
+  { id: 'dept-1', name: 'Computer Science', numberOfUsers: 45 },
+  { id: 'dept-2', name: 'Biology', numberOfUsers: 30 },
 ];
 
 export const MOCK_ADMIN_INSTITUTIONS_SEARCH_FILTERS: InstitutionSearchFilter[] = [
diff --git a/src/testing/mocks/cedar-metadata-data-template-json-api.mock.ts b/src/testing/mocks/cedar-metadata-data-template-json-api.mock.ts
index 15e29a2d0..03052dc0f 100644
--- a/src/testing/mocks/cedar-metadata-data-template-json-api.mock.ts
+++ b/src/testing/mocks/cedar-metadata-data-template-json-api.mock.ts
@@ -1,9 +1,10 @@
-import { CedarMetadataTemplate } from '@osf/features/metadata/models';
+import { CedarMetadataDataTemplateJsonApi } from '@osf/features/metadata/models/cedar-metadata-template-json-api.model';
 
-export const CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK: CedarMetadataTemplate = {
+export const CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK: CedarMetadataDataTemplateJsonApi = {
   id: 'template-1',
   type: 'cedar-metadata-templates',
   attributes: {
+    active: true,
     schema_name: 'Test Schema',
     cedar_id: 'test-cedar-id',
     template: {
diff --git a/src/testing/mocks/cedar-metadata-domain.mock.ts b/src/testing/mocks/cedar-metadata-domain.mock.ts
new file mode 100644
index 000000000..e3fb57975
--- /dev/null
+++ b/src/testing/mocks/cedar-metadata-domain.mock.ts
@@ -0,0 +1,13 @@
+import { CedarMetadataMapper } from '@osf/features/metadata/mappers';
+import { CedarMetadataRecordModel, CedarMetadataTemplateModel } from '@osf/features/metadata/models';
+
+import { CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK } from './cedar-metadata-data-template-json-api.mock';
+import { MOCK_CEDAR_METADATA_RECORD_DATA } from './cedar-metadata-record.mock';
+
+export const MOCK_CEDAR_METADATA_TEMPLATE: CedarMetadataTemplateModel = CedarMetadataMapper.fromTemplate(
+  CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK
+);
+
+export const MOCK_CEDAR_METADATA_RECORD: CedarMetadataRecordModel = CedarMetadataMapper.fromRecord(
+  MOCK_CEDAR_METADATA_RECORD_DATA
+);
diff --git a/src/testing/mocks/cedar-metadata-record.mock.ts b/src/testing/mocks/cedar-metadata-record.mock.ts
index 52aa65fc5..fb96f10aa 100644
--- a/src/testing/mocks/cedar-metadata-record.mock.ts
+++ b/src/testing/mocks/cedar-metadata-record.mock.ts
@@ -1,4 +1,6 @@
-import { CedarMetadataAttributes, CedarMetadataRecordData } from '@osf/features/metadata/models';
+import { CedarMetadataAttributes, CedarMetadataRecordDataJsonApi } from '@osf/features/metadata/models';
+
+import { CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK } from './cedar-metadata-data-template-json-api.mock';
 
 export const MOCK_CEDAR_METADATA_ATTRIBUTES: CedarMetadataAttributes = {
   '@context': {
@@ -108,7 +110,7 @@ export const MOCK_CEDAR_METADATA_ATTRIBUTES: CedarMetadataAttributes = {
   ],
 };
 
-export const MOCK_CEDAR_METADATA_RECORD_DATA: CedarMetadataRecordData = {
+export const MOCK_CEDAR_METADATA_RECORD_DATA: CedarMetadataRecordDataJsonApi = {
   id: 'record-1',
   type: 'cedar-metadata-records',
   attributes: {
@@ -117,14 +119,7 @@ export const MOCK_CEDAR_METADATA_RECORD_DATA: CedarMetadataRecordData = {
   },
   embeds: {
     template: {
-      data: {
-        attributes: {
-          active: true,
-          cedar_id: 'cedar-template-123',
-          schema_name: 'LDbase Project Metadata Schema',
-        },
-        id: 'template-1',
-      },
+      data: CEDAR_METADATA_DATA_TEMPLATE_JSON_API_MOCK,
     },
   },
   relationships: {
diff --git a/src/testing/mocks/collections-submissions.mock.ts b/src/testing/mocks/collections-submissions.mock.ts
index 720f33ce6..6758be836 100644
--- a/src/testing/mocks/collections-submissions.mock.ts
+++ b/src/testing/mocks/collections-submissions.mock.ts
@@ -1,5 +1,8 @@
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission, CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
+import {
+  CollectionSubmission,
+  CollectionSubmissionWithGuid,
+} from '@osf/shared/models/collections/collection-submissions.model';
 
 export const MOCK_COLLECTION_SUBMISSION_1: CollectionSubmissionWithGuid = {
   id: '1',
diff --git a/src/testing/mocks/data.mock.ts b/src/testing/mocks/data.mock.ts
index f8503e40b..1662bde2f 100644
--- a/src/testing/mocks/data.mock.ts
+++ b/src/testing/mocks/data.mock.ts
@@ -58,7 +58,7 @@ export const MOCK_USER: UserModel = {
   allowIndexing: true,
   canViewReviews: true,
   mergedBy: undefined,
-  external_identity: {},
+  externalIdentity: {},
 };
 
 export const MOCK_USER_RELATED_COUNTS: UserRelatedCounts = {
diff --git a/src/testing/mocks/linked-node.mock.ts b/src/testing/mocks/linked-node.mock.ts
index be3285ff1..b564944dc 100644
--- a/src/testing/mocks/linked-node.mock.ts
+++ b/src/testing/mocks/linked-node.mock.ts
@@ -10,7 +10,5 @@ export const createMockLinkedNode = (overrides?: Partial<LinkedNode>): LinkedNod
   tags: ['tag1'],
   isPublic: false,
   contributors: [],
-  htmlUrl: 'https://example.com/node',
-  apiUrl: 'https://api.example.com/node',
   ...overrides,
 });
diff --git a/src/testing/mocks/my-resources.mock.ts b/src/testing/mocks/my-resources.mock.ts
index e726eb789..460ef20a6 100644
--- a/src/testing/mocks/my-resources.mock.ts
+++ b/src/testing/mocks/my-resources.mock.ts
@@ -1,4 +1,4 @@
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources-item.model';
 
 import { MOCK_CONTRIBUTOR } from './contributors.mock';
 
diff --git a/src/testing/mocks/project-overview.mock.ts b/src/testing/mocks/project-overview.mock.ts
index 9b2c02a1a..3a6e21045 100644
--- a/src/testing/mocks/project-overview.mock.ts
+++ b/src/testing/mocks/project-overview.mock.ts
@@ -57,7 +57,4 @@ export const MOCK_PROJECT_OVERVIEW: ProjectOverviewModel = {
   contributors: [],
   forksCount: 0,
   viewOnlyLinksCount: 0,
-  links: {
-    iri: 'https://test.com',
-  },
 };
diff --git a/src/testing/mocks/submission.mock.ts b/src/testing/mocks/submission.mock.ts
index 32be4fc3e..8f8c66ae7 100644
--- a/src/testing/mocks/submission.mock.ts
+++ b/src/testing/mocks/submission.mock.ts
@@ -1,6 +1,6 @@
 import { PreprintSubmissionModel } from '@osf/features/moderation/models';
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collection-submissions.model';
 
 import { MOCK_CONTRIBUTOR } from './contributors.mock';
 
diff --git a/src/testing/providers/activity-log-display.service.mock.ts b/src/testing/providers/activity-log-display.service.mock.ts
index 5c6fd1064..5b4a05a36 100644
--- a/src/testing/providers/activity-log-display.service.mock.ts
+++ b/src/testing/providers/activity-log-display.service.mock.ts
@@ -2,10 +2,10 @@ import { Mock } from 'vitest';
 
 import { SafeHtml } from '@angular/platform-browser';
 
-import { ActivityLog } from '@osf/shared/models/activity-logs/activity-logs.model';
+import { ActivityLogModel } from '@osf/shared/models/activity-logs/activity-logs.model';
 import { ActivityLogDisplayService } from '@osf/shared/services/activity-logs/activity-log-display.service';
 
-type GetActivityDisplayFn = (log: ActivityLog) => SafeHtml;
+type GetActivityDisplayFn = (log: ActivityLogModel) => SafeHtml;
 
 export type ActivityLogDisplayServiceMockType = Partial<ActivityLogDisplayService> & {
   getActivityDisplay: Mock<GetActivityDisplayFn>;
diff --git a/src/testing/providers/files-service.mock.ts b/src/testing/providers/files-service.mock.ts
index bf38ca8ee..223350582 100644
--- a/src/testing/providers/files-service.mock.ts
+++ b/src/testing/providers/files-service.mock.ts
@@ -5,8 +5,8 @@ import { Mock, vi } from 'vitest';
 import { HttpEvent } from '@angular/common/http';
 
 import { ConfiguredAddonModel } from '@osf/shared/models/addons/configured-addon.model';
-import { MetaJsonApi } from '@osf/shared/models/common/json-api.model';
-import { FileDetailsModel, FileDetailsWithMeta, FileModel } from '@osf/shared/models/files/file.model';
+import { ListMetaJsonApi } from '@osf/shared/models/common/json-api/meta.model';
+import { FileDetailsModel, FileDetailsResult, FileModel } from '@osf/shared/models/files/file.model';
 import { FileFolderModel } from '@osf/shared/models/files/file-folder.model';
 import { FileVersionModel } from '@osf/shared/models/files/file-version.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
@@ -21,12 +21,9 @@ type GetFilesFn = (
   search: string,
   sort: string,
   page?: number
-) => Observable<{ files: FileModel[]; meta?: MetaJsonApi }>;
-type GetFoldersFn = (folderLink: string) => Observable<{ files: FileFolderModel[]; meta?: MetaJsonApi }>;
-type GetRootFoldersFn = (
-  resourceId: string,
-  resourceType: number
-) => Observable<{ files: FileFolderModel[]; meta?: MetaJsonApi }>;
+) => Observable<{ files: FileModel[]; meta?: ListMetaJsonApi }>;
+type GetFoldersFn = (folderLink: string) => Observable<PaginatedData<FileFolderModel[]>>;
+type GetRootFoldersFn = (resourceId: string, resourceType: number) => Observable<PaginatedData<FileFolderModel[]>>;
 type GetFilesWithoutFilteringFn = (filesLink: string, page?: number) => Observable<PaginatedData<FileModel[]>>;
 type UploadFileFn = (file: File, uploadLink: string, isUpdate?: boolean) => Observable<HttpEvent<any>>;
 type GetFolderFn = (link: string) => Observable<FileFolderModel>;
@@ -41,7 +38,7 @@ type MoveFileFn = (
   replace?: boolean
 ) => Observable<unknown>;
 type GetFolderDownloadLinkFn = (link: string) => string;
-type GetFileTargetFn = (fileGuid: string) => Observable<FileDetailsWithMeta>;
+type GetFileTargetFn = (fileGuid: string) => Observable<FileDetailsResult>;
 type GetFileGuidFn = (id: string) => Observable<FileModel>;
 type GetFileByIdFn = (fileGuid: string) => Observable<FileModel>;
 type GetFileVersionsFn = (fileGuid: string) => Observable<FileVersionModel[]>;
@@ -105,9 +102,13 @@ export const FilesServiceMock = {
     };
 
     return {
-      getFiles: vi.fn().mockReturnValue(of({ files: [file], meta: { total: 1, per_page: 10 } as MetaJsonApi })),
-      getFolders: vi.fn().mockReturnValue(of({ files: [folder], meta: { total: 1, per_page: 10 } as MetaJsonApi })),
-      getRootFolders: vi.fn().mockReturnValue(of({ files: [folder], meta: { total: 1, per_page: 10 } as MetaJsonApi })),
+      getFiles: vi.fn().mockReturnValue(of({ files: [file], meta: { total: 1, per_page: 10 } as ListMetaJsonApi })),
+      getFolders: vi
+        .fn()
+        .mockReturnValue(of({ data: [folder], totalCount: 1, pageSize: 10 } as PaginatedData<FileFolderModel[]>)),
+      getRootFolders: vi
+        .fn()
+        .mockReturnValue(of({ data: [folder], totalCount: 1, pageSize: 10 } as PaginatedData<FileFolderModel[]>)),
       getConfiguredStorageAddons: vi.fn().mockReturnValue(of([])),
       getFilesWithoutFiltering: vi
         .fn()
@@ -118,7 +119,7 @@ export const FilesServiceMock = {
       renameEntry: vi.fn().mockReturnValue(of(file)),
       moveFile: vi.fn().mockReturnValue(of({})),
       getFolderDownloadLink: vi.fn().mockImplementation((link: string) => `${link}?zip=`),
-      getFileTarget: vi.fn().mockReturnValue(of({ file: fileDetails })),
+      getFileTarget: vi.fn().mockReturnValue(of({ file: fileDetails, isAnonymous: false })),
       getFileGuid: vi.fn().mockReturnValue(of(file)),
       getFileById: vi.fn().mockReturnValue(of(file)),
       getFileVersions: vi.fn().mockReturnValue(of([])),