diff --git a/src/app/core/animations/fade.in-out.animation.ts b/src/app/core/animations/fade.in-out.animation.ts
deleted file mode 100644
index 7befb072b..000000000
--- a/src/app/core/animations/fade.in-out.animation.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { animate, style, transition, trigger } from '@angular/animations';
-
-/**
- * Angular animation trigger for fading elements in and out.
- *
- * This trigger can be used with Angular structural directives like `*ngIf` or `@if`
- * to smoothly animate the appearance and disappearance of components or elements.
- *
- * ## Usage:
- *
- * In the component decorator:
- * ```ts
- * @Component({
- *   selector: 'my-component',
- *   templateUrl: './my.component.html',
- *   animations: [fadeInOut]
- * })
- * export class MyComponent {}
- * ```
- *
- * In the template:
- * ```html
- * @if (show) {
- *   <div @fadeInOut>
- *     Fades in and out!
- *   </div>
- * }
- * ```
- *
- * ## Transitions:
- * - **:enter** — Fades in from opacity `0` to `1` over `200ms`.
- * - **:leave** — Fades out from opacity `1` to `0` over `200ms`.
- *
- * @returns An Angular `AnimationTriggerMetadata` object used for component animations.
- */
-export const fadeInOutAnimation = trigger('fadeInOut', [
-  transition(':enter', [style({ opacity: 0 }), animate('200ms', style({ opacity: 1 }))]),
-  transition(':leave', [animate('200ms', style({ opacity: 0 }))]),
-]);
diff --git a/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.ts b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.ts
index c40290217..e6eefb1a9 100644
--- a/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.ts
+++ b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.ts
@@ -20,7 +20,7 @@ describe('Component: Cookie Consent Banner', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [OSFTestingModule, CookieConsentBannerComponent, MockComponent(IconComponent)],
+      imports: [CookieConsentBannerComponent, OSFTestingModule, MockComponent(IconComponent)],
       providers: [{ provide: CookieService, useValue: cookieServiceMock }],
     });
 
diff --git a/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.ts b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.ts
index 30f039af9..c593da853 100644
--- a/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.ts
+++ b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.ts
@@ -7,7 +7,6 @@ import { Message } from 'primeng/message';
 import { isPlatformBrowser } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject, PLATFORM_ID, signal } from '@angular/core';
 
-import { fadeInOutAnimation } from '@core/animations/fade.in-out.animation';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
 
 /**
@@ -15,7 +14,6 @@ import { IconComponent } from '@osf/shared/components/icon/icon.component';
  *
  * - Uses `ngx-cookie-service` to persist acceptance across sessions.
  * - Automatically hides the banner if consent is already recorded.
- * - Animates in/out using the `fadeInOutAnimation`.
  * - Supports translation via `TranslatePipe`.
  */
 @Component({
@@ -23,7 +21,6 @@ import { IconComponent } from '@osf/shared/components/icon/icon.component';
   templateUrl: './cookie-consent-banner.component.html',
   styleUrls: ['./cookie-consent-banner.component.scss'],
   imports: [Button, TranslatePipe, IconComponent, Message],
-  animations: [fadeInOutAnimation],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CookieConsentBannerComponent {
diff --git a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.html b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.html
index a936ebefc..9dd9ed582 100644
--- a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.html
+++ b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.html
@@ -1,13 +1,12 @@
 @if (maintenance() && !dismissed()) {
   <p-message
+    class="block p-3"
     styleClass="w-full"
+    icon="pi pi-info-circle"
     [severity]="maintenance()?.severity"
     [text]="maintenance()?.message"
     [closable]="true"
     (onClose)="dismiss()"
-    class="block p-3"
-    icon="pi pi-info-circle"
-    @fadeInOut
   >
   </p-message>
 }
diff --git a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.spec.ts b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.spec.ts
index e617a1333..80d8d59b1 100644
--- a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.spec.ts
+++ b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.spec.ts
@@ -1,16 +1,15 @@
 import { CookieService } from 'ngx-cookie-service';
 
-import { MessageModule } from 'primeng/message';
-
 import { of } from 'rxjs';
 
 import { HttpClient } from '@angular/common/http';
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 import { MaintenanceBannerComponent } from './maintenance-banner.component';
 
+import { OSFTestingModule } from '@testing/osf.testing.module';
+
 describe('Component: Maintenance Banner', () => {
   let fixture: ComponentFixture<MaintenanceBannerComponent>;
   let httpClient: { get: jest.Mock };
@@ -25,7 +24,7 @@ describe('Component: Maintenance Banner', () => {
     httpClient = { get: jest.fn() } as any;
 
     await TestBed.configureTestingModule({
-      imports: [MaintenanceBannerComponent, NoopAnimationsModule, MessageModule],
+      imports: [MaintenanceBannerComponent, OSFTestingModule],
       providers: [
         { provide: CookieService, useValue: cookieService },
         { provide: HttpClient, useValue: httpClient },
diff --git a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts
index 05b269412..71a328e52 100644
--- a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts
+++ b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts
@@ -5,8 +5,6 @@ import { MessageModule } from 'primeng/message';
 import { CommonModule, isPlatformBrowser } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject, OnInit, PLATFORM_ID, signal } from '@angular/core';
 
-import { fadeInOutAnimation } from '@core/animations/fade.in-out.animation';
-
 import { MaintenanceModel } from '../models/maintenance.model';
 import { MaintenanceService } from '../services/maintenance.service';
 
@@ -17,8 +15,6 @@ import { MaintenanceService } from '../services/maintenance.service';
  * the banner. If not, it queries the maintenance status from the server and displays
  * the maintenance message if one is active.
  *
- * The component supports animation via `fadeInOutAnimation` and is optimized with `OnPush` change detection.
- *
  * @example
  * ```html
  * <osf-maintenance-banner />
@@ -29,7 +25,6 @@ import { MaintenanceService } from '../services/maintenance.service';
   imports: [CommonModule, MessageModule],
   templateUrl: './maintenance-banner.component.html',
   styleUrls: ['./maintenance-banner.component.scss'],
-  animations: [fadeInOutAnimation],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MaintenanceBannerComponent implements OnInit {
diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts
index 8de41701d..3506c67cc 100644
--- a/src/app/core/services/user.service.ts
+++ b/src/app/core/services/user.service.ts
@@ -5,9 +5,9 @@ import { inject, Injectable } from '@angular/core';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { ProfileSettingsKey } from '@osf/shared/enums/profile-settings-key.enum';
 import { UserMapper } from '@osf/shared/mappers/user';
+import { UserData, UserModel } from '@osf/shared/models/user/user.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { ProfileSettingsUpdate } from '@shared/models/profile-settings-update.model';
-import { UserData, UserModel } from '@shared/models/user/user.models';
 import {
   UserAcceptedTermsOfServiceJsonApi,
   UserDataJsonApi,
diff --git a/src/app/core/store/user/user.actions.ts b/src/app/core/store/user/user.actions.ts
index c645288df..9219d8847 100644
--- a/src/app/core/store/user/user.actions.ts
+++ b/src/app/core/store/user/user.actions.ts
@@ -1,7 +1,7 @@
 import { Education } from '@osf/shared/models/user/education.model';
 import { Employment } from '@osf/shared/models/user/employment.model';
 import { SocialModel } from '@osf/shared/models/user/social.model';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 export class GetCurrentUser {
   static readonly type = '[User] Get Current User';
diff --git a/src/app/core/store/user/user.model.ts b/src/app/core/store/user/user.model.ts
index 35a18a34b..e006d52c2 100644
--- a/src/app/core/store/user/user.model.ts
+++ b/src/app/core/store/user/user.model.ts
@@ -1,5 +1,5 @@
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 export interface UserStateModel {
   currentUser: AsyncStateModel<UserModel | null>;
diff --git a/src/app/core/store/user/user.selectors.ts b/src/app/core/store/user/user.selectors.ts
index 7b42ca0ad..311d3eec1 100644
--- a/src/app/core/store/user/user.selectors.ts
+++ b/src/app/core/store/user/user.selectors.ts
@@ -3,7 +3,7 @@ import { Selector } from '@ngxs/store';
 import { Education } from '@osf/shared/models/user/education.model';
 import { Employment } from '@osf/shared/models/user/employment.model';
 import { SocialModel } from '@osf/shared/models/user/social.model';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 import { UserStateModel } from './user.model';
 import { UserState } from './user.state';
diff --git a/src/app/core/store/user/user.state.ts b/src/app/core/store/user/user.state.ts
index a5bdb2e88..c3b65d803 100644
--- a/src/app/core/store/user/user.state.ts
+++ b/src/app/core/store/user/user.state.ts
@@ -9,8 +9,8 @@ import { UserService } from '@core/services/user.service';
 import { ProfileSettingsKey } from '@osf/shared/enums/profile-settings-key.enum';
 import { removeNullable } from '@osf/shared/helpers/remove-nullable.helper';
 import { UserMapper } from '@osf/shared/mappers/user';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { SocialModel } from '@shared/models/user/social.model';
-import { UserModel } from '@shared/models/user/user.models';
 
 import {
   AcceptTermsOfServiceByUser,
diff --git a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts
index 500b29f19..03be73487 100644
--- a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts
+++ b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts
@@ -9,7 +9,7 @@ import { ActivatedRoute } from '@angular/router';
 import { BarChartComponent } from '@osf/shared/components/bar-chart/bar-chart.component';
 import { LoadingSpinnerComponent } from '@osf/shared/components/loading-spinner/loading-spinner.component';
 import { StatisticCardComponent } from '@osf/shared/components/statistic-card/statistic-card.component';
-import { DatasetInput } from '@osf/shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 import { SelectOption } from '@osf/shared/models/select-option.model';
 import { DoughnutChartComponent } from '@shared/components/doughnut-chart/doughnut-chart.component';
 
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 d62a6d0eb..239078b99 100644
--- a/src/app/features/admin-institutions/store/institutions-admin.model.ts
+++ b/src/app/features/admin-institutions/store/institutions-admin.model.ts
@@ -1,4 +1,4 @@
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.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/admin-institutions/store/institutions-admin.selectors.ts b/src/app/features/admin-institutions/store/institutions-admin.selectors.ts
index 4211deb98..721901e4d 100644
--- a/src/app/features/admin-institutions/store/institutions-admin.selectors.ts
+++ b/src/app/features/admin-institutions/store/institutions-admin.selectors.ts
@@ -1,6 +1,6 @@
 import { Selector } from '@ngxs/store';
 
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 import { InstitutionDepartment, InstitutionSearchFilter, InstitutionSummaryMetrics, InstitutionUser } from '../models';
 
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 6e2d720cb..8285669a1 100644
--- a/src/app/features/admin-institutions/store/institutions-admin.state.ts
+++ b/src/app/features/admin-institutions/store/institutions-admin.state.ts
@@ -6,7 +6,7 @@ import { catchError, tap, throwError } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { handleSectionError } from '@osf/shared/helpers/state-error.handler';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { InstitutionsService } from '@osf/shared/services/institutions.service';
 
 import { InstitutionsAdminService } from '../services/institutions-admin.service';
diff --git a/src/app/features/analytics/analytics.component.ts b/src/app/features/analytics/analytics.component.ts
index a24a9d66d..5eba9475b 100644
--- a/src/app/features/analytics/analytics.component.ts
+++ b/src/app/features/analytics/analytics.component.ts
@@ -30,7 +30,7 @@ import { ViewOnlyLinkMessageComponent } from '@osf/shared/components/view-only-l
 import { IS_WEB } from '@osf/shared/helpers/breakpoints.tokens';
 import { replaceBadEncodedChars } from '@osf/shared/helpers/format-bad-encoding.helper';
 import { Primitive } from '@osf/shared/helpers/types.helper';
-import { DatasetInput } from '@osf/shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
 
 import { AnalyticsKpiComponent } from './components';
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 8b17c2989..acb6a1d0b 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
@@ -14,7 +14,7 @@ import { collectionFilterTypes } from '@osf/features/collections/constants';
 import { AddToCollectionSteps, CollectionFilterType } from '@osf/features/collections/enums';
 import { CollectionFilterEntry } from '@osf/features/collections/models/collection-filter-entry.model';
 import { AddToCollectionSelectors } from '@osf/features/collections/store/add-to-collection';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 import { CollectionsSelectors, GetCollectionDetails } from '@osf/shared/stores/collections';
 
 @Component({
diff --git a/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts b/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts
index 95913df5c..2fd2b0b4c 100644
--- a/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts
+++ b/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts
@@ -40,7 +40,7 @@ import { TruncatedTextComponent } from '@osf/shared/components/truncated-text/tr
 import { InputLimits } from '@osf/shared/constants/input-limits.const';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { LicenseModel } from '@osf/shared/models/license/license.model';
-import { ProjectModel } from '@osf/shared/models/projects/projects.models';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { InterpolatePipe } from '@osf/shared/pipes/interpolate.pipe';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { GetAllContributors } from '@osf/shared/stores/contributors';
diff --git a/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts b/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts
index 7c610f347..7658ab614 100644
--- a/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts
+++ b/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts
@@ -9,8 +9,8 @@ import { ChangeDetectionStrategy, Component, computed, input, output, signal } f
 
 import { AddToCollectionSteps } from '@osf/features/collections/enums';
 import { ProjectSelectorComponent } from '@osf/shared/components/project-selector/project-selector.component';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { SetSelectedProject } from '@osf/shared/stores/projects';
-import { ProjectModel } from '@shared/models/projects/projects.models';
 import { CollectionsSelectors, GetUserCollectionSubmissions } from '@shared/stores/collections';
 import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';
 
diff --git a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.spec.ts b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.spec.ts
index f4738728c..96895956c 100644
--- a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.spec.ts
+++ b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.spec.ts
@@ -4,7 +4,7 @@ import { ComponentRef } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 
 import { CollectionsSearchResultCardComponent } from './collections-search-result-card.component';
 
diff --git a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts
index 08299c88f..2a7b91117 100644
--- a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts
+++ b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts
@@ -5,7 +5,7 @@ import { ChangeDetectionStrategy, Component, computed, input } from '@angular/co
 
 import { collectionFilterNames } from '@osf/features/collections/constants';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 
 @Component({
   selector: 'osf-collections-search-result-card',
diff --git a/src/app/features/collections/models/collection-license-json-api.models.ts b/src/app/features/collections/models/collection-license-json-api.model.ts
similarity index 100%
rename from src/app/features/collections/models/collection-license-json-api.models.ts
rename to src/app/features/collections/models/collection-license-json-api.model.ts
diff --git a/src/app/features/collections/services/project-metadata-form.service.ts b/src/app/features/collections/services/project-metadata-form.service.ts
index f0204c614..84a563259 100644
--- a/src/app/features/collections/services/project-metadata-form.service.ts
+++ b/src/app/features/collections/services/project-metadata-form.service.ts
@@ -3,9 +3,9 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 
 import { ProjectMetadataFormControls } from '@osf/features/collections/enums';
 import { CustomValidators } from '@osf/shared/helpers/custom-form-validators.helper';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { LicenseModel } from '@shared/models/license/license.model';
 import { ProjectMetadataUpdatePayload } from '@shared/models/project-metadata-update-payload.model';
-import { ProjectModel } from '@shared/models/projects/projects.models';
 
 import { ProjectMetadataForm } from '../models/project-metadata-form.model';
 
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 04ad27492..ba47d319d 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.models';
+import { CollectionProjectSubmission } from '@osf/shared/models/collections/collections.model';
 import { LicenseModel } from '@shared/models/license/license.model';
 import { AsyncStateModel } from '@shared/models/store/async-state.model';
 
diff --git a/src/app/features/contributors/models/index.ts b/src/app/features/contributors/models/index.ts
index 83d6f898d..62aef551e 100644
--- a/src/app/features/contributors/models/index.ts
+++ b/src/app/features/contributors/models/index.ts
@@ -1,2 +1,2 @@
 export * from './resource-info.model';
-export * from './view-only-components.models';
+export * from './view-only-components.model';
diff --git a/src/app/features/contributors/models/view-only-components.models.ts b/src/app/features/contributors/models/view-only-components.model.ts
similarity index 100%
rename from src/app/features/contributors/models/view-only-components.models.ts
rename to src/app/features/contributors/models/view-only-components.model.ts
diff --git a/src/app/features/home/pages/dashboard/dashboard.component.ts b/src/app/features/home/pages/dashboard/dashboard.component.ts
index 17522201b..f9fa9eb5c 100644
--- a/src/app/features/home/pages/dashboard/dashboard.component.ts
+++ b/src/app/features/home/pages/dashboard/dashboard.component.ts
@@ -23,11 +23,11 @@ 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 { 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';
 import { ClearMyResources, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores/my-resources';
-import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models';
-import { MyResourcesSearchFilters } from '@shared/models/my-resources/my-resources-search-filters.models';
 import { TableParameters } from '@shared/models/table-parameters.model';
 
 @Component({
diff --git a/src/app/features/meetings/models/index.ts b/src/app/features/meetings/models/index.ts
index 4ff56dcc5..3f2965a75 100644
--- a/src/app/features/meetings/models/index.ts
+++ b/src/app/features/meetings/models/index.ts
@@ -1,4 +1,4 @@
 export * from './meeting-feature-card.model';
-export * from './meetings.models';
+export * from './meetings.model';
 export * from './meetings-json-api.model';
 export * from './partner-organization.model';
diff --git a/src/app/features/meetings/models/meetings.models.ts b/src/app/features/meetings/models/meetings.model.ts
similarity index 100%
rename from src/app/features/meetings/models/meetings.models.ts
rename to src/app/features/meetings/models/meetings.model.ts
diff --git a/src/app/features/metadata/components/metadata-affiliated-institutions/metadata-affiliated-institutions.component.ts b/src/app/features/metadata/components/metadata-affiliated-institutions/metadata-affiliated-institutions.component.ts
index 36f21d30f..bcf1badf8 100644
--- a/src/app/features/metadata/components/metadata-affiliated-institutions/metadata-affiliated-institutions.component.ts
+++ b/src/app/features/metadata/components/metadata-affiliated-institutions/metadata-affiliated-institutions.component.ts
@@ -6,7 +6,7 @@ import { Card } from 'primeng/card';
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
 import { AffiliatedInstitutionsViewComponent } from '@osf/shared/components/affiliated-institutions-view/affiliated-institutions-view.component';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 @Component({
   selector: 'osf-metadata-affiliated-institutions',
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 af5c251b3..65616f04e 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
@@ -3,7 +3,7 @@ import { MockComponents } from 'ng-mocks';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
 
 import { MetadataCollectionItemComponent } from './metadata-collection-item.component';
 
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 e8ee18b6f..1c023afd9 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
@@ -8,7 +8,7 @@ import { RouterLink } from '@angular/router';
 
 import { collectionFilterNames } from '@osf/features/collections/constants';
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
 import { KeyValueModel } from '@osf/shared/models/common/key-value.model';
 import { CollectionStatusSeverityPipe } from '@osf/shared/pipes/collection-status-severity.pipe';
 
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 daa67530d..affc90e98 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,7 +5,7 @@ import { Skeleton } from 'primeng/skeleton';
 
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
 
 import { MetadataCollectionItemComponent } from '../metadata-collection-item/metadata-collection-item.component';
 
diff --git a/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts b/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts
index 2378c870a..aa55a264f 100644
--- a/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts
+++ b/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts
@@ -5,8 +5,8 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components/affiliated-institution-select/affiliated-institution-select.component';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { InstitutionsSelectors } from '@osf/shared/stores/institutions';
-import { Institution } from '@shared/models/institutions/institutions.models';
 
 import { AffiliatedInstitutionsDialogComponent } from './affiliated-institutions-dialog.component';
 
diff --git a/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts b/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts
index 079629c43..b05fa2e11 100644
--- a/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts
+++ b/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts
@@ -9,7 +9,7 @@ import { ChangeDetectionStrategy, Component, inject, OnInit, signal } from '@ang
 import { ReactiveFormsModule } from '@angular/forms';
 
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components/affiliated-institution-select/affiliated-institution-select.component';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions';
 
 @Component({
diff --git a/src/app/features/metadata/models/metadata.model.ts b/src/app/features/metadata/models/metadata.model.ts
index b8ce8f5cb..675ad53fe 100644
--- a/src/app/features/metadata/models/metadata.model.ts
+++ b/src/app/features/metadata/models/metadata.model.ts
@@ -1,6 +1,6 @@
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { UserPermissions } from '@shared/enums/user-permissions.enum';
 import { IdentifierModel } from '@shared/models/identifiers/identifier.model';
-import { Institution } from '@shared/models/institutions/institutions.models';
 import { LicenseModel } from '@shared/models/license/license.model';
 
 export interface MetadataModel {
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 fd0b7ef0f..81c1c24db 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,8 +4,8 @@ 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 { CollectionSubmissionWithGuid } from '@shared/models/collections/collections.models';
 import { DateAgoPipe } from '@shared/pipes/date-ago.pipe';
 
 import { SubmissionReviewStatus } from '../../enums';
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 0f5d0a3ae..a1d475ac1 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
@@ -12,7 +12,7 @@ import { collectionFilterNames } from '@osf/features/collections/constants';
 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.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.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 e87f597fd..b98c947df 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 '@shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 
 import { CollectionsModerationSelectors } from '../../store/collections-moderation';
 import { CollectionSubmissionItemComponent } from '../collection-submission-item/collection-submission-item.component';
diff --git a/src/app/features/moderation/models/collection-submission-review-action-json.api.ts b/src/app/features/moderation/models/collection-submission-review-action-json-api.model.ts
similarity index 100%
rename from src/app/features/moderation/models/collection-submission-review-action-json.api.ts
rename to src/app/features/moderation/models/collection-submission-review-action-json-api.model.ts
diff --git a/src/app/features/moderation/models/index.ts b/src/app/features/moderation/models/index.ts
index 302a37ead..7d32ef4a3 100644
--- a/src/app/features/moderation/models/index.ts
+++ b/src/app/features/moderation/models/index.ts
@@ -1,5 +1,5 @@
 export * from './collection-submission-review-action.model';
-export * from './collection-submission-review-action-json.api';
+export * from './collection-submission-review-action-json-api.model';
 export * from './invite-moderator-form.model';
 export * from './moderator.model';
 export * from './moderator-add.model';
diff --git a/src/app/features/moderation/services/moderators.service.ts b/src/app/features/moderation/services/moderators.service.ts
index dfb86fca8..3a184913f 100644
--- a/src/app/features/moderation/services/moderators.service.ts
+++ b/src/app/features/moderation/services/moderators.service.ts
@@ -8,7 +8,7 @@ import { parseSearchTotalCount } from '@osf/shared/helpers/search-total-count.he
 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.models';
+import { IndexCardSearchResponseJsonApi } from '@osf/shared/models/search/index-card-search-json-api.model';
 import { SearchUserDataModel } from '@osf/shared/models/user/search-user-data.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { StringOrNull } from '@shared/helpers/types.helper';
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 b685d281e..daa7cb0af 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.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.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 688499d53..8e499b175 100644
--- a/src/app/features/my-projects/my-projects.component.ts
+++ b/src/app/features/my-projects/my-projects.component.ts
@@ -32,6 +32,8 @@ 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 { 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';
 import { BookmarksSelectors, GetAllMyBookmarks, GetBookmarksCollectionId } from '@osf/shared/stores/bookmarks';
@@ -42,8 +44,6 @@ import {
   GetMyRegistrations,
   MyResourcesSelectors,
 } from '@osf/shared/stores/my-resources';
-import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models';
-import { MyResourcesSearchFilters } from '@shared/models/my-resources/my-resources-search-filters.models';
 import { QueryParams } from '@shared/models/query-params.model';
 import { TableParameters } from '@shared/models/table-parameters.model';
 
diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.spec.ts b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.spec.ts
index 8bb817170..68cff07db 100644
--- a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.spec.ts
+++ b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.spec.ts
@@ -6,7 +6,7 @@ import { ReviewsState } from '@osf/features/preprints/enums';
 import { PreprintProviderDetails } from '@osf/features/preprints/models';
 import { PreprintStepperSelectors } from '@osf/features/preprints/store/preprint-stepper';
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components/affiliated-institution-select/affiliated-institution-select.component';
-import { Institution } from '@shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { InstitutionsSelectors } from '@shared/stores/institutions';
 
 import { PreprintsAffiliatedInstitutionsComponent } from './preprints-affiliated-institutions.component';
diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts
index f1a315ce1..fc8444c93 100644
--- a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts
+++ b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts
@@ -11,7 +11,7 @@ import { PreprintModel, PreprintProviderDetails } from '@osf/features/preprints/
 import { PreprintStepperSelectors, SetInstitutionsChanged } from '@osf/features/preprints/store/preprint-stepper';
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components/affiliated-institution-select/affiliated-institution-select.component';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import {
   FetchResourceInstitutions,
   FetchUserInstitutions,
diff --git a/src/app/features/preprints/models/index.ts b/src/app/features/preprints/models/index.ts
index 9131b75cb..5c556d995 100644
--- a/src/app/features/preprints/models/index.ts
+++ b/src/app/features/preprints/models/index.ts
@@ -1,10 +1,10 @@
-export * from './preprint.models';
-export * from './preprint-json-api.models';
-export * from './preprint-licenses-json-api.models';
-export * from './preprint-provider.models';
-export * from './preprint-provider-json-api.models';
-export * from './preprint-request.models';
-export * from './preprint-request-action.models';
-export * from './preprint-request-action-json-api.models';
-export * from './preprint-request-json-api.models';
-export * from './submit-preprint-form.models';
+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';
+export * from './preprint-request.model';
+export * from './preprint-request-action.model';
+export * from './preprint-request-action-json-api.model';
+export * from './preprint-request-json-api.model';
+export * from './submit-preprint-form.model';
diff --git a/src/app/features/preprints/models/preprint-json-api.models.ts b/src/app/features/preprints/models/preprint-json-api.model.ts
similarity index 100%
rename from src/app/features/preprints/models/preprint-json-api.models.ts
rename to src/app/features/preprints/models/preprint-json-api.model.ts
diff --git a/src/app/features/preprints/models/preprint-licenses-json-api.models.ts b/src/app/features/preprints/models/preprint-licenses-json-api.model.ts
similarity index 100%
rename from src/app/features/preprints/models/preprint-licenses-json-api.models.ts
rename to src/app/features/preprints/models/preprint-licenses-json-api.model.ts
diff --git a/src/app/features/preprints/models/preprint-provider-json-api.models.ts b/src/app/features/preprints/models/preprint-provider-json-api.model.ts
similarity index 94%
rename from src/app/features/preprints/models/preprint-provider-json-api.models.ts
rename to src/app/features/preprints/models/preprint-provider-json-api.model.ts
index 0dffb8a70..e71cc5ee2 100644
--- a/src/app/features/preprints/models/preprint-provider-json-api.models.ts
+++ b/src/app/features/preprints/models/preprint-provider-json-api.model.ts
@@ -4,7 +4,7 @@ import { BrandDataJsonApi } from '@osf/shared/models/brand/brand.json-api.model'
 
 import { ProviderReviewsWorkflow } from '../enums';
 
-import { PreprintWord } from './preprint-provider.models';
+import { PreprintWord } from './preprint-provider.model';
 
 export interface PreprintProviderDetailsJsonApi {
   id: string;
diff --git a/src/app/features/preprints/models/preprint-provider.models.ts b/src/app/features/preprints/models/preprint-provider.model.ts
similarity index 100%
rename from src/app/features/preprints/models/preprint-provider.models.ts
rename to src/app/features/preprints/models/preprint-provider.model.ts
diff --git a/src/app/features/preprints/models/preprint-request-action-json-api.models.ts b/src/app/features/preprints/models/preprint-request-action-json-api.model.ts
similarity index 100%
rename from src/app/features/preprints/models/preprint-request-action-json-api.models.ts
rename to src/app/features/preprints/models/preprint-request-action-json-api.model.ts
diff --git a/src/app/features/preprints/models/preprint-request-action.models.ts b/src/app/features/preprints/models/preprint-request-action.model.ts
similarity index 100%
rename from src/app/features/preprints/models/preprint-request-action.models.ts
rename to src/app/features/preprints/models/preprint-request-action.model.ts
diff --git a/src/app/features/preprints/models/preprint-request-json-api.models.ts b/src/app/features/preprints/models/preprint-request-json-api.model.ts
similarity index 100%
rename from src/app/features/preprints/models/preprint-request-json-api.models.ts
rename to src/app/features/preprints/models/preprint-request-json-api.model.ts
diff --git a/src/app/features/preprints/models/preprint-request.models.ts b/src/app/features/preprints/models/preprint-request.model.ts
similarity index 100%
rename from src/app/features/preprints/models/preprint-request.models.ts
rename to src/app/features/preprints/models/preprint-request.model.ts
diff --git a/src/app/features/preprints/models/preprint.models.ts b/src/app/features/preprints/models/preprint.model.ts
similarity index 100%
rename from src/app/features/preprints/models/preprint.models.ts
rename to src/app/features/preprints/models/preprint.model.ts
diff --git a/src/app/features/preprints/models/submit-preprint-form.models.ts b/src/app/features/preprints/models/submit-preprint-form.model.ts
similarity index 100%
rename from src/app/features/preprints/models/submit-preprint-form.models.ts
rename to src/app/features/preprints/models/submit-preprint-form.model.ts
diff --git a/src/app/features/preprints/services/preprints.service.ts b/src/app/features/preprints/services/preprints.service.ts
index 15e11e7bc..6b9b780e1 100644
--- a/src/app/features/preprints/services/preprints.service.ts
+++ b/src/app/features/preprints/services/preprints.service.ts
@@ -6,7 +6,7 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { RegistryModerationMapper } from '@osf/features/moderation/mappers';
 import { ReviewActionsResponseJsonApi } from '@osf/features/moderation/models';
 import { PreprintRequestActionsMapper } from '@osf/features/preprints/mappers/preprint-request-actions.mapper';
-import { PreprintRequestAction } from '@osf/features/preprints/models/preprint-request-action.models';
+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 {
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 52adcbdb4..b209e62d7 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
@@ -7,9 +7,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { EducationHistoryComponent } from '@osf/shared/components/education-history/education-history.component';
 import { EmploymentHistoryComponent } from '@osf/shared/components/employment-history/employment-history.component';
 import { IS_MEDIUM } from '@osf/shared/helpers/breakpoints.tokens';
-import { Institution } from '@shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { SocialModel } from '@shared/models/user/social.model';
-import { UserModel } from '@shared/models/user/user.models';
 
 import { ProfileInformationComponent } from './profile-information.component';
 
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 0740068b0..da555cac9 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
@@ -11,9 +11,9 @@ import { EducationHistoryComponent } from '@osf/shared/components/education-hist
 import { EmploymentHistoryComponent } from '@osf/shared/components/employment-history/employment-history.component';
 import { SOCIAL_LINKS } from '@osf/shared/constants/social-links.const';
 import { IS_MEDIUM } from '@osf/shared/helpers/breakpoints.tokens';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { SortByDatePipe } from '@osf/shared/pipes/sort-by-date.pipe';
-import { Institution } from '@shared/models/institutions/institutions.models';
 
 import { mapUserSocials } from '../../helpers';
 
diff --git a/src/app/features/profile/profile.component.ts b/src/app/features/profile/profile.component.ts
index 86e1afa43..907ca38d7 100644
--- a/src/app/features/profile/profile.component.ts
+++ b/src/app/features/profile/profile.component.ts
@@ -23,7 +23,7 @@ import { GlobalSearchComponent } from '@osf/shared/components/global-search/glob
 import { LoadingSpinnerComponent } from '@osf/shared/components/loading-spinner/loading-spinner.component';
 import { SEARCH_TAB_OPTIONS } from '@osf/shared/constants/search-tab-options.const';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { SetDefaultFilterValue } from '@osf/shared/stores/global-search';
 import { FetchUserInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
 
diff --git a/src/app/features/profile/store/profile.actions.ts b/src/app/features/profile/store/profile.actions.ts
index 61269ae9e..edcdf0d64 100644
--- a/src/app/features/profile/store/profile.actions.ts
+++ b/src/app/features/profile/store/profile.actions.ts
@@ -1,4 +1,4 @@
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 export class FetchUserProfile {
   static readonly type = '[Profile] Fetch User Profile';
diff --git a/src/app/features/profile/store/profile.model.ts b/src/app/features/profile/store/profile.model.ts
index 87d4feee1..3d11d531d 100644
--- a/src/app/features/profile/store/profile.model.ts
+++ b/src/app/features/profile/store/profile.model.ts
@@ -1,5 +1,5 @@
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 export interface ProfileStateModel {
   userProfile: AsyncStateModel<UserModel | null>;
diff --git a/src/app/features/profile/store/profile.selectors.ts b/src/app/features/profile/store/profile.selectors.ts
index 48869e8c3..db39632b9 100644
--- a/src/app/features/profile/store/profile.selectors.ts
+++ b/src/app/features/profile/store/profile.selectors.ts
@@ -1,6 +1,6 @@
 import { Selector } from '@ngxs/store';
 
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 import { ProfileStateModel } from './profile.model';
 import { ProfileState } from '.';
diff --git a/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts b/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts
index 85fc28603..ea91f887f 100644
--- a/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts
+++ b/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts
@@ -17,11 +17,11 @@ import { UserSelectors } from '@core/store/user';
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components/affiliated-institution-select/affiliated-institution-select.component';
 import { ComponentFormControls } from '@osf/shared/enums/create-component-form-controls.enum';
 import { CustomValidators } from '@osf/shared/helpers/custom-form-validators.helper';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions';
 import { FetchRegions, RegionsSelectors } from '@osf/shared/stores/regions';
 import { ComponentForm } from '@shared/models/create-component-form.model';
-import { Institution } from '@shared/models/institutions/institutions.models';
 
 import { CreateComponent, GetComponents, ProjectOverviewSelectors } from '../../store';
 
diff --git a/src/app/features/project/overview/components/files-widget/files-widget.component.ts b/src/app/features/project/overview/components/files-widget/files-widget.component.ts
index c907027ac..535b01a43 100644
--- a/src/app/features/project/overview/components/files-widget/files-widget.component.ts
+++ b/src/app/features/project/overview/components/files-widget/files-widget.component.ts
@@ -38,7 +38,7 @@ import { FileModel } from '@osf/shared/models/files/file.model';
 import { FileFolderModel } from '@osf/shared/models/files/file-folder.model';
 import { FileLabelModel } from '@osf/shared/models/files/file-label.model';
 import { NodeShortInfoModel } from '@osf/shared/models/nodes/node-with-children.model';
-import { ProjectModel } from '@osf/shared/models/projects/projects.models';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { SelectOption } from '@osf/shared/models/select-option.model';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
 
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 f94d9f4c9..b74d844cf 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
@@ -9,9 +9,9 @@ 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 { MyResourcesSelectors } from '@osf/shared/stores/my-resources';
 import { NodeLinksSelectors } from '@osf/shared/stores/node-links';
-import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models';
 
 import { ProjectOverviewSelectors } from '../../store';
 
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 fe5542a89..279a2bc55 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,10 +29,10 @@ 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 { 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';
-import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models';
-import { MyResourcesSearchFilters } from '@shared/models/my-resources/my-resources-search-filters.models';
 import { TableParameters } from '@shared/models/table-parameters.model';
 
 import { ProjectOverviewSelectors } from '../../store';
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 328898474..168a3530b 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
@@ -10,7 +10,7 @@ import { RouterLink } from '@angular/router';
 
 import { collectionFilterNames } from '@osf/features/collections/constants';
 import { StopPropagationDirective } from '@osf/shared/directives/stop-propagation.directive';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
 import { KeyValueModel } from '@osf/shared/models/common/key-value.model';
 import { CollectionStatusSeverityPipe } from '@osf/shared/pipes/collection-status-severity.pipe';
 
diff --git a/src/app/features/project/overview/models/index.ts b/src/app/features/project/overview/models/index.ts
index ffa3996aa..b2f55ace8 100644
--- a/src/app/features/project/overview/models/index.ts
+++ b/src/app/features/project/overview/models/index.ts
@@ -1,4 +1,4 @@
 export * from './addon-tree-item.model';
 export * from './formatted-citation-item.model';
 export * from './privacy-status.model';
-export * from './project-overview.models';
+export * from './project-overview.model';
diff --git a/src/app/features/project/overview/models/project-overview.models.ts b/src/app/features/project/overview/models/project-overview.model.ts
similarity index 100%
rename from src/app/features/project/overview/models/project-overview.models.ts
rename to src/app/features/project/overview/models/project-overview.model.ts
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 f923aa0a1..7133193be 100644
--- a/src/app/features/project/overview/services/project-overview.service.ts
+++ b/src/app/features/project/overview/services/project-overview.service.ts
@@ -15,6 +15,7 @@ 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';
 import { LicenseResponseJsonApi } from '@osf/shared/models/license/licenses-json-api.model';
 import { BaseNodeModel, NodeModel } from '@osf/shared/models/nodes/base-node.model';
 import { BaseNodeDataJsonApi } from '@osf/shared/models/nodes/base-node-data-json-api.model';
@@ -26,7 +27,6 @@ import { NodeResponseJsonApi, NodesResponseJsonApi } from '@osf/shared/models/no
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { IdentifierModel } from '@shared/models/identifiers/identifier.model';
-import { Institution } from '@shared/models/institutions/institutions.models';
 import { LicenseModel } from '@shared/models/license/license.model';
 
 import { ProjectOverviewMapper } from '../mappers';
diff --git a/src/app/features/project/overview/store/project-overview.model.ts b/src/app/features/project/overview/store/project-overview.model.ts
index 8675ce272..51abff1ba 100644
--- a/src/app/features/project/overview/store/project-overview.model.ts
+++ b/src/app/features/project/overview/store/project-overview.model.ts
@@ -1,10 +1,10 @@
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { BaseNodeModel, NodeModel } from '@osf/shared/models/nodes/base-node.model';
 import { NodePreprintModel } from '@osf/shared/models/nodes/node-preprint.model';
 import { NodeStorageModel } from '@osf/shared/models/nodes/node-storage.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 import { AsyncStateWithTotalCount } from '@osf/shared/models/store/async-state-with-total-count.model';
 import { IdentifierModel } from '@shared/models/identifiers/identifier.model';
-import { Institution } from '@shared/models/institutions/institutions.models';
 import { LicenseModel } from '@shared/models/license/license.model';
 
 import { ProjectOverviewModel } from '../models';
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 fa9eaa3cb..2ba414289 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,8 +25,8 @@ 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.models';
-import { AddonTerm } from '@osf/shared/models/addons/addon-utils.models';
+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 { AddonFormService } from '@osf/shared/services/addons/addon-form.service';
 import { AddonOAuthService } from '@osf/shared/services/addons/addon-oauth.service';
diff --git a/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.spec.ts b/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.spec.ts
index 6e12a2741..f13917010 100644
--- a/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.spec.ts
+++ b/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { InstitutionsSelectors } from '@osf/shared/stores/institutions';
-import { Institution } from '@shared/models/institutions/institutions.models';
 
 import { SettingsProjectAffiliationComponent } from './settings-project-affiliation.component';
 
diff --git a/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.ts b/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.ts
index de8f86c66..112511600 100644
--- a/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.ts
+++ b/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.ts
@@ -8,7 +8,7 @@ import { Card } from 'primeng/card';
 import { NgOptimizedImage } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input, OnInit, output } from '@angular/core';
 
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { FetchUserInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
 
 @Component({
diff --git a/src/app/features/project/settings/models/node-details.model.ts b/src/app/features/project/settings/models/node-details.model.ts
index 483791011..2f3e8bc24 100644
--- a/src/app/features/project/settings/models/node-details.model.ts
+++ b/src/app/features/project/settings/models/node-details.model.ts
@@ -1,6 +1,6 @@
 import { UserPermissions } from '@osf/shared/enums/user-permissions.enum';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { IdNameModel } from '@shared/models/common/id-name.model';
-import { Institution } from '@shared/models/institutions/institutions.models';
 
 export interface NodeDetailsModel {
   id: string;
diff --git a/src/app/features/project/settings/settings.component.ts b/src/app/features/project/settings/settings.component.ts
index 5ad55cc42..d697fe844 100644
--- a/src/app/features/project/settings/settings.component.ts
+++ b/src/app/features/project/settings/settings.component.ts
@@ -15,7 +15,7 @@ import { SubHeaderComponent } from '@osf/shared/components/sub-header/sub-header
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { SubscriptionEvent } from '@osf/shared/enums/subscriptions/subscription-event.enum';
 import { SubscriptionFrequency } from '@osf/shared/enums/subscriptions/subscription-frequency.enum';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { UpdateNodeRequestModel } from '@osf/shared/models/nodes/nodes-json-api.model';
 import { ViewOnlyLinkModel } from '@osf/shared/models/view-only-links/view-only-link.model';
 import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
diff --git a/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.ts b/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.ts
index 11741ffba..5fa7e1306 100644
--- a/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.ts
+++ b/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.ts
@@ -9,7 +9,7 @@ import { ActivatedRoute } from '@angular/router';
 
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components/affiliated-institution-select/affiliated-institution-select.component';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import {
   FetchResourceInstitutions,
   FetchUserInstitutions,
diff --git a/src/app/features/registry/services/registry-overview.service.ts b/src/app/features/registry/services/registry-overview.service.ts
index 87d99fbc4..50c4d6454 100644
--- a/src/app/features/registry/services/registry-overview.service.ts
+++ b/src/app/features/registry/services/registry-overview.service.ts
@@ -13,7 +13,7 @@ import { ReviewActionsMapper } from '@osf/shared/mappers/review-actions.mapper';
 import { IdentifierModel } from '@osf/shared/models/identifiers/identifier.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.models';
+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';
diff --git a/src/app/features/registry/store/registry/registry.model.ts b/src/app/features/registry/store/registry/registry.model.ts
index 027992ed3..098aa94cd 100644
--- a/src/app/features/registry/store/registry/registry.model.ts
+++ b/src/app/features/registry/store/registry/registry.model.ts
@@ -1,6 +1,6 @@
 import { ReviewAction } from '@osf/features/moderation/models';
 import { IdentifierModel } from '@osf/shared/models/identifiers/identifier.model';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { LicenseModel } from '@osf/shared/models/license/license.model';
 import { PageSchema } from '@osf/shared/models/registration/page-schema.model';
 import { SchemaResponse } from '@osf/shared/models/registration/schema-response.model';
diff --git a/src/app/features/registry/store/registry/registry.selectors.ts b/src/app/features/registry/store/registry/registry.selectors.ts
index 3f5e6a729..8adc38841 100644
--- a/src/app/features/registry/store/registry/registry.selectors.ts
+++ b/src/app/features/registry/store/registry/registry.selectors.ts
@@ -4,9 +4,9 @@ import { ReviewAction } from '@osf/features/moderation/models';
 import { RegistrationOverviewModel } from '@osf/features/registry/models';
 import { UserPermissions } from '@osf/shared/enums/user-permissions.enum';
 import { IdentifierModel } from '@osf/shared/models/identifiers/identifier.model';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { LicenseModel } from '@osf/shared/models/license/license.model';
 import { SchemaResponse } from '@osf/shared/models/registration/schema-response.model';
-import { Institution } from '@shared/models/institutions/institutions.models';
 import { PageSchema } from '@shared/models/registration/page-schema.model';
 
 import { RegistryStateModel } from './registry.model';
diff --git a/src/app/features/settings/account-settings/components/affiliated-institutions/affiliated-institutions.component.ts b/src/app/features/settings/account-settings/components/affiliated-institutions/affiliated-institutions.component.ts
index 3168e20f1..3075e2606 100644
--- a/src/app/features/settings/account-settings/components/affiliated-institutions/affiliated-institutions.component.ts
+++ b/src/app/features/settings/account-settings/components/affiliated-institutions/affiliated-institutions.component.ts
@@ -10,7 +10,7 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 
 import { UserSelectors } from '@osf/core/store/user';
 import { ReadonlyInputComponent } from '@osf/shared/components/readonly-input/readonly-input.component';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
 import { LoaderService } from '@osf/shared/services/loader.service';
 import { ToastService } from '@osf/shared/services/toast.service';
diff --git a/src/app/features/settings/account-settings/services/account-settings.service.ts b/src/app/features/settings/account-settings/services/account-settings.service.ts
index 227cd29a0..f46142573 100644
--- a/src/app/features/settings/account-settings/services/account-settings.service.ts
+++ b/src/app/features/settings/account-settings/services/account-settings.service.ts
@@ -4,7 +4,7 @@ import { inject, Injectable } from '@angular/core';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { UserMapper } from '@osf/shared/mappers/user';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { UserDataJsonApi } from '@osf/shared/models/user/user-json-api.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 
diff --git a/src/app/features/settings/account-settings/store/account-settings.model.ts b/src/app/features/settings/account-settings/store/account-settings.model.ts
index a81ac14ac..68d2c764b 100644
--- a/src/app/features/settings/account-settings/store/account-settings.model.ts
+++ b/src/app/features/settings/account-settings/store/account-settings.model.ts
@@ -1,4 +1,4 @@
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 
 import { AccountSettings, ExternalIdentity } from '../models';
diff --git a/src/app/features/settings/account-settings/store/account-settings.selectors.ts b/src/app/features/settings/account-settings/store/account-settings.selectors.ts
index bd418f0f0..e0d4e1e1b 100644
--- a/src/app/features/settings/account-settings/store/account-settings.selectors.ts
+++ b/src/app/features/settings/account-settings/store/account-settings.selectors.ts
@@ -1,6 +1,6 @@
 import { Selector } from '@ngxs/store';
 
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 import { AccountSettings, ExternalIdentity } from '../models';
 
diff --git a/src/app/features/settings/profile-settings/components/citation-preview/citation-preview.component.ts b/src/app/features/settings/profile-settings/components/citation-preview/citation-preview.component.ts
index f7b4dde33..1cafd1cc2 100644
--- a/src/app/features/settings/profile-settings/components/citation-preview/citation-preview.component.ts
+++ b/src/app/features/settings/profile-settings/components/citation-preview/citation-preview.component.ts
@@ -2,7 +2,7 @@ import { TranslatePipe } from '@ngx-translate/core';
 
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { CitationFormatPipe } from '@osf/shared/pipes/citation-format.pipe';
 
 @Component({
diff --git a/src/app/features/settings/profile-settings/components/name/name.component.ts b/src/app/features/settings/profile-settings/components/name/name.component.ts
index 4d821b540..cc50b786e 100644
--- a/src/app/features/settings/profile-settings/components/name/name.component.ts
+++ b/src/app/features/settings/profile-settings/components/name/name.component.ts
@@ -11,10 +11,10 @@ import { FormBuilder } from '@angular/forms';
 import { UpdateProfileSettingsUser, UserSelectors } from '@osf/core/store/user';
 import { forbiddenFileNameCharacters } from '@osf/shared/constants/input-limits.const';
 import { CustomValidators } from '@osf/shared/helpers/custom-form-validators.helper';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
 import { LoaderService } from '@osf/shared/services/loader.service';
 import { ToastService } from '@osf/shared/services/toast.service';
-import { UserModel } from '@shared/models/user/user.models';
 
 import { hasNameChanges } from '../../helpers';
 import { NameForm } from '../../models';
diff --git a/src/app/features/settings/profile-settings/helpers/name-comparison.helper.ts b/src/app/features/settings/profile-settings/helpers/name-comparison.helper.ts
index c82d60fc8..dfde09e4f 100644
--- a/src/app/features/settings/profile-settings/helpers/name-comparison.helper.ts
+++ b/src/app/features/settings/profile-settings/helpers/name-comparison.helper.ts
@@ -1,5 +1,5 @@
 import { findChangedFields } from '@osf/shared/helpers/find-changed-fields';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 import { NameForm } from '../models';
 
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 c1a93ab1d..20041a0b1 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,11 +18,11 @@ 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 { 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';
-import { AuthorizedAddonRequestJsonApi } from '@shared/models/addons/addon-json-api.models';
-import { AddonTerm } from '@shared/models/addons/addon-utils.models';
 import { AuthorizedAccountModel } from '@shared/models/addons/authorized-account.model';
 import { AddonsSelectors, CreateAuthorizedAddon, UpdateAuthorizedAddon } from '@shared/stores/addons';
 
diff --git a/src/app/shared/components/add-project-form/add-project-form.component.ts b/src/app/shared/components/add-project-form/add-project-form.component.ts
index fc74e9c01..412038453 100644
--- a/src/app/shared/components/add-project-form/add-project-form.component.ts
+++ b/src/app/shared/components/add-project-form/add-project-form.component.ts
@@ -13,11 +13,11 @@ import { FormGroup, ReactiveFormsModule } from '@angular/forms';
 
 import { UserSelectors } from '@core/store/user';
 import { ProjectFormControls } from '@osf/shared/enums/create-project-form-controls.enum';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions';
 import { FetchRegions, RegionsSelectors } from '@osf/shared/stores/regions';
-import { Institution } from '@shared/models/institutions/institutions.models';
 import { ProjectForm } from '@shared/models/projects/create-project-form.model';
-import { ProjectModel } from '@shared/models/projects/projects.models';
 
 import { AffiliatedInstitutionSelectComponent } from '../affiliated-institution-select/affiliated-institution-select.component';
 import { ProjectSelectorComponent } from '../project-selector/project-selector.component';
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 d2252a038..1941cbaa7 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,9 +11,9 @@ 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 { AddonModel } from '@shared/models/addons/addon.model';
-import { AuthorizedAddonRequestJsonApi } from '@shared/models/addons/addon-json-api.models';
-import { AddonForm } from '@shared/models/addons/addon-utils.models';
 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/addons/addon-terms/addon-terms.component.spec.ts b/src/app/shared/components/addons/addon-terms/addon-terms.component.spec.ts
index 0633723f8..fbfeaea93 100644
--- a/src/app/shared/components/addons/addon-terms/addon-terms.component.spec.ts
+++ b/src/app/shared/components/addons/addon-terms/addon-terms.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ADDON_TERMS } from '@osf/shared/constants/addon-terms.const';
 import { isCitationAddon, isRedirectAddon } from '@osf/shared/helpers/addon-type.helper';
 import { AddonModel } from '@osf/shared/models/addons/addon.model';
-import { AddonTerm } from '@osf/shared/models/addons/addon-utils.models';
+import { AddonTerm } from '@osf/shared/models/addons/addon-utils.model';
 
 import { AddonTermsComponent } from './addon-terms.component';
 
diff --git a/src/app/shared/components/addons/addon-terms/addon-terms.component.ts b/src/app/shared/components/addons/addon-terms/addon-terms.component.ts
index 464a1f5b4..b2273ae26 100644
--- a/src/app/shared/components/addons/addon-terms/addon-terms.component.ts
+++ b/src/app/shared/components/addons/addon-terms/addon-terms.component.ts
@@ -7,8 +7,8 @@ import { Component, computed, input } from '@angular/core';
 
 import { ADDON_TERMS } from '@osf/shared/constants/addon-terms.const';
 import { isCitationAddon, isRedirectAddon } from '@osf/shared/helpers/addon-type.helper';
+import { AddonTerm } from '@osf/shared/models/addons/addon-utils.model';
 import { AddonModel } from '@shared/models/addons/addon.model';
-import { AddonTerm } from '@shared/models/addons/addon-utils.models';
 import { AuthorizedAccountModel } from '@shared/models/addons/authorized-account.model';
 
 @Component({
diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
index 3f8588d07..26291fadc 100644
--- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
@@ -36,9 +36,9 @@ import { OperationNames } from '@osf/shared/enums/operation-names.enum';
 import { StorageItemType } from '@osf/shared/enums/storage-item-type.enum';
 import { IS_XSMALL } from '@osf/shared/helpers/breakpoints.tokens';
 import { convertCamelCaseToNormal } from '@osf/shared/helpers/camel-case-to-normal.helper';
+import { OperationInvokeData } from '@osf/shared/models/addons/addon-utils.model';
 import { CustomDialogService } from '@osf/shared/services/custom-dialog.service';
 import { AddonsSelectors, ClearOperationInvocations } from '@osf/shared/stores/addons';
-import { OperationInvokeData } from '@shared/models/addons/addon-utils.models';
 import { StorageItem } from '@shared/models/addons/storage-item.model';
 
 import { GoogleFilePickerComponent } from '../../google-file-picker/google-file-picker.component';
diff --git a/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.spec.ts b/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.spec.ts
index 91a90646d..cddac3c53 100644
--- a/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.spec.ts
+++ b/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { Institution } from '@shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 import { AffiliatedInstitutionSelectComponent } from './affiliated-institution-select.component';
 
diff --git a/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.ts b/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.ts
index 9f7b0d4e7..4fd7f261d 100644
--- a/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.ts
+++ b/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.ts
@@ -8,7 +8,7 @@ import { NgOptimizedImage } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input, model } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 @Component({
   selector: 'osf-affiliated-institution-select',
diff --git a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.spec.ts b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.spec.ts
index 497468a59..4724ab97a 100644
--- a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.spec.ts
+++ b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { Institution } from '@shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 import { AffiliatedInstitutionsViewComponent } from './affiliated-institutions-view.component';
 
diff --git a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts
index 8edecaf23..9f8d45cce 100644
--- a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts
+++ b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts
@@ -6,7 +6,7 @@ import { Tooltip } from 'primeng/tooltip';
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 @Component({
   selector: 'osf-affiliated-institutions-view',
diff --git a/src/app/shared/components/bar-chart/bar-chart.component.ts b/src/app/shared/components/bar-chart/bar-chart.component.ts
index e1184f9e7..dce54adc1 100644
--- a/src/app/shared/components/bar-chart/bar-chart.component.ts
+++ b/src/app/shared/components/bar-chart/bar-chart.component.ts
@@ -7,7 +7,7 @@ import { isPlatformBrowser } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject, input, OnInit, PLATFORM_ID, signal } from '@angular/core';
 
 import { PIE_CHART_PALETTE } from '@osf/shared/constants/pie-chart-palette';
-import { DatasetInput } from '@shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
 
diff --git a/src/app/shared/components/doughnut-chart/doughnut-chart.component.ts b/src/app/shared/components/doughnut-chart/doughnut-chart.component.ts
index edf3b3123..c22a9cb75 100644
--- a/src/app/shared/components/doughnut-chart/doughnut-chart.component.ts
+++ b/src/app/shared/components/doughnut-chart/doughnut-chart.component.ts
@@ -7,7 +7,7 @@ import { isPlatformBrowser } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject, input, OnInit, PLATFORM_ID, signal } from '@angular/core';
 
 import { PIE_CHART_PALETTE } from '@osf/shared/constants/pie-chart-palette';
-import { DatasetInput } from '@shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
 
diff --git a/src/app/shared/components/license/license.component.ts b/src/app/shared/components/license/license.component.ts
index e81226cfb..6d8823827 100644
--- a/src/app/shared/components/license/license.component.ts
+++ b/src/app/shared/components/license/license.component.ts
@@ -12,8 +12,8 @@ import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angul
 import { InputLimits } from '@osf/shared/constants/input-limits.const';
 import { CustomValidators } from '@osf/shared/helpers/custom-form-validators.helper';
 import { StringOrNullOrUndefined } from '@osf/shared/helpers/types.helper';
+import { LicenseForm } from '@osf/shared/models/license/license-form.model';
 import { LicenseModel, LicenseOptions } from '@shared/models/license/license.model';
-import { LicenseForm } from '@shared/models/license/license-form.models';
 import { InterpolatePipe } from '@shared/pipes/interpolate.pipe';
 
 import { TextInputComponent } from '../text-input/text-input.component';
diff --git a/src/app/shared/components/line-chart/line-chart.component.spec.ts b/src/app/shared/components/line-chart/line-chart.component.spec.ts
index 3d2938fbf..9e148757f 100644
--- a/src/app/shared/components/line-chart/line-chart.component.spec.ts
+++ b/src/app/shared/components/line-chart/line-chart.component.spec.ts
@@ -5,7 +5,7 @@ import { ChartModule } from 'primeng/chart';
 import { PLATFORM_ID } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { DatasetInput } from '@osf/shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
 
diff --git a/src/app/shared/components/line-chart/line-chart.component.ts b/src/app/shared/components/line-chart/line-chart.component.ts
index fac02dab3..7462312b5 100644
--- a/src/app/shared/components/line-chart/line-chart.component.ts
+++ b/src/app/shared/components/line-chart/line-chart.component.ts
@@ -14,7 +14,7 @@ import {
   signal,
 } from '@angular/core';
 
-import { DatasetInput } from '@osf/shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
 
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 5aa148c0e..ffb134af6 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
@@ -3,8 +3,8 @@ import { MockComponents } from 'ng-mocks';
 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 { TableParameters } from '@osf/shared/models/table-parameters.model';
-import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models';
 
 import { ContributorsListShortenerComponent } from '../contributors-list-shortener/contributors-list-shortener.component';
 import { IconComponent } from '../icon/icon.component';
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 22472efb9..0cd62cda7 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 { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
 import { SortOrder } from '@osf/shared/enums/sort-order.enum';
-import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.models';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.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/pie-chart/pie-chart.component.spec.ts b/src/app/shared/components/pie-chart/pie-chart.component.spec.ts
index 9d0f4ef4a..0990a79d6 100644
--- a/src/app/shared/components/pie-chart/pie-chart.component.spec.ts
+++ b/src/app/shared/components/pie-chart/pie-chart.component.spec.ts
@@ -5,7 +5,7 @@ import { ChartModule } from 'primeng/chart';
 import { PLATFORM_ID } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { DatasetInput } from '@shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
 
diff --git a/src/app/shared/components/pie-chart/pie-chart.component.ts b/src/app/shared/components/pie-chart/pie-chart.component.ts
index 2c36e139f..a1c8968a6 100644
--- a/src/app/shared/components/pie-chart/pie-chart.component.ts
+++ b/src/app/shared/components/pie-chart/pie-chart.component.ts
@@ -15,7 +15,7 @@ import {
 } from '@angular/core';
 
 import { PIE_CHART_PALETTE } from '@osf/shared/constants/pie-chart-palette';
-import { DatasetInput } from '@shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
 
diff --git a/src/app/shared/components/project-selector/project-selector.component.ts b/src/app/shared/components/project-selector/project-selector.component.ts
index d150dc205..5cd711e0f 100644
--- a/src/app/shared/components/project-selector/project-selector.component.ts
+++ b/src/app/shared/components/project-selector/project-selector.component.ts
@@ -22,7 +22,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 
 import { UserSelectors } from '@core/store/user';
-import { ProjectModel } from '@shared/models/projects/projects.models';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { CustomOption } from '@shared/models/select-option.model';
 import { GetProjects, ProjectsSelectors } from '@shared/stores/projects';
 
diff --git a/src/app/shared/constants/addon-terms.const.ts b/src/app/shared/constants/addon-terms.const.ts
index 936331982..18eeda651 100644
--- a/src/app/shared/constants/addon-terms.const.ts
+++ b/src/app/shared/constants/addon-terms.const.ts
@@ -1,4 +1,4 @@
-import { Term } from '../models/addons/addon-utils.models';
+import { Term } from '../models/addons/addon-utils.model';
 
 export const ADDON_TERMS: Term[] = [
   {
diff --git a/src/app/shared/helpers/search-total-count.helper.ts b/src/app/shared/helpers/search-total-count.helper.ts
index 49ede8e45..48a236f1f 100644
--- a/src/app/shared/helpers/search-total-count.helper.ts
+++ b/src/app/shared/helpers/search-total-count.helper.ts
@@ -1,4 +1,4 @@
-import { IndexCardSearchResponseJsonApi } from '../models/search/index-card-search-json-api.models';
+import { IndexCardSearchResponseJsonApi } from '../models/search/index-card-search-json-api.model';
 
 export function parseSearchTotalCount(response: IndexCardSearchResponseJsonApi): number {
   let totalCount = 0;
diff --git a/src/app/shared/mappers/addon.mapper.ts b/src/app/shared/mappers/addon.mapper.ts
index 3b6616c39..65d90eece 100644
--- a/src/app/shared/mappers/addon.mapper.ts
+++ b/src/app/shared/mappers/addon.mapper.ts
@@ -6,11 +6,11 @@ import {
   AuthorizedAddonGetResponseJsonApi,
   ConfiguredAddonGetResponseJsonApi,
   IncludedAddonData,
-} from '../models/addons/addon-json-api.models';
+} from '../models/addons/addon-json-api.model';
 import {
   OperationInvocationResponseJsonApi,
   StorageItemResponseJsonApi,
-} from '../models/addons/addon-operations-json-api.models';
+} from '../models/addons/addon-operations-json-api.model';
 import { AuthorizedAccountModel } from '../models/addons/authorized-account.model';
 import { ConfiguredAddonModel } from '../models/addons/configured-addon.model';
 import { OperationInvocation } from '../models/addons/operation-invocation.model';
diff --git a/src/app/shared/mappers/collections/collections.mapper.ts b/src/app/shared/mappers/collections/collections.mapper.ts
index d1fd54ca5..227fbe021 100644
--- a/src/app/shared/mappers/collections/collections.mapper.ts
+++ b/src/app/shared/mappers/collections/collections.mapper.ts
@@ -11,13 +11,13 @@ import {
   CollectionProvider,
   CollectionSubmission,
   CollectionSubmissionWithGuid,
-} from '@osf/shared/models/collections/collections.models';
+} from '@osf/shared/models/collections/collections.model';
 import {
   CollectionDetailsResponseJsonApi,
   CollectionProviderResponseJsonApi,
   CollectionSubmissionJsonApi,
   CollectionSubmissionWithGuidJsonApi,
-} from '@osf/shared/models/collections/collections-json-api.models';
+} from '@osf/shared/models/collections/collections-json-api.model';
 import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { ContributorModel } from '@osf/shared/models/contributors/contributor.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
diff --git a/src/app/shared/mappers/filters/filter-option.mapper.ts b/src/app/shared/mappers/filters/filter-option.mapper.ts
index 21fd54c13..df77250b3 100644
--- a/src/app/shared/mappers/filters/filter-option.mapper.ts
+++ b/src/app/shared/mappers/filters/filter-option.mapper.ts
@@ -1,6 +1,6 @@
 import { FilterOption } from '@osf/shared/models/search/discaverable-filter.model';
-import { FilterOptionItem } from '@osf/shared/models/search/filter-options-json-api.models';
-import { SearchResultDataJsonApi } from '@osf/shared/models/search/index-card-search-json-api.models';
+import { FilterOptionItem } from '@osf/shared/models/search/filter-options-json-api.model';
+import { SearchResultDataJsonApi } from '@osf/shared/models/search/index-card-search-json-api.model';
 
 export function mapFilterOptions(
   searchResultItems: SearchResultDataJsonApi[],
diff --git a/src/app/shared/mappers/filters/filters.mapper.ts b/src/app/shared/mappers/filters/filters.mapper.ts
index dde219558..6cee8c2d6 100644
--- a/src/app/shared/mappers/filters/filters.mapper.ts
+++ b/src/app/shared/mappers/filters/filters.mapper.ts
@@ -2,7 +2,7 @@ import { DiscoverableFilter, FilterOperatorOption } from '@osf/shared/models/sea
 import {
   IndexCardSearchResponseJsonApi,
   RelatedPropertyPathDataJsonApi,
-} from '@osf/shared/models/search/index-card-search-json-api.models';
+} from '@osf/shared/models/search/index-card-search-json-api.model';
 
 export function MapFilters(indexCardSearchResponseJsonApi: IndexCardSearchResponseJsonApi): DiscoverableFilter[] {
   const relatedPropertiesIds = indexCardSearchResponseJsonApi.data.relationships.relatedProperties.data.map(
diff --git a/src/app/shared/mappers/institutions/institutions.mapper.ts b/src/app/shared/mappers/institutions/institutions.mapper.ts
index 66642d805..f3552702a 100644
--- a/src/app/shared/mappers/institutions/institutions.mapper.ts
+++ b/src/app/shared/mappers/institutions/institutions.mapper.ts
@@ -3,7 +3,7 @@ import {
   InstitutionsJsonApiResponse,
   InstitutionsWithMetaJsonApiResponse,
 } from '@osf/shared/models/institutions/institution-json-api.model';
-import { Institution, InstitutionsWithTotalCount } from '@osf/shared/models/institutions/institutions.models';
+import { Institution, InstitutionsWithTotalCount } from '@osf/shared/models/institutions/institutions.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 export class InstitutionsMapper {
diff --git a/src/app/shared/mappers/my-resources.mapper.ts b/src/app/shared/mappers/my-resources.mapper.ts
index 7a2a5d5d2..d7caf4a08 100644
--- a/src/app/shared/mappers/my-resources.mapper.ts
+++ b/src/app/shared/mappers/my-resources.mapper.ts
@@ -1,6 +1,6 @@
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
-import { MyResourcesItem, MyResourcesItemGetResponseJsonApi } from '../models/my-resources/my-resources.models';
+import { MyResourcesItem, MyResourcesItemGetResponseJsonApi } from '../models/my-resources/my-resources.model';
 
 import { ContributorsMapper } from './contributors';
 
diff --git a/src/app/shared/mappers/projects/projects.mapper.ts b/src/app/shared/mappers/projects/projects.mapper.ts
index 26140a3b9..5f6ff0ac5 100644
--- a/src/app/shared/mappers/projects/projects.mapper.ts
+++ b/src/app/shared/mappers/projects/projects.mapper.ts
@@ -1,8 +1,8 @@
-import { CollectionSubmissionMetadataPayloadJsonApi } from '@osf/features/collections/models/collection-license-json-api.models';
+import { CollectionSubmissionMetadataPayloadJsonApi } from '@osf/features/collections/models/collection-license-json-api.model';
 import { BaseNodeDataJsonApi } from '@osf/shared/models/nodes/base-node-data-json-api.model';
 import { NodesResponseJsonApi } from '@osf/shared/models/nodes/nodes-json-api.model';
 import { ProjectMetadataUpdatePayload } from '@osf/shared/models/project-metadata-update-payload.model';
-import { ProjectModel } from '@osf/shared/models/projects/projects.models';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 export class ProjectsMapper {
diff --git a/src/app/shared/mappers/search/search.mapper.ts b/src/app/shared/mappers/search/search.mapper.ts
index e0aad24e9..876048744 100644
--- a/src/app/shared/mappers/search/search.mapper.ts
+++ b/src/app/shared/mappers/search/search.mapper.ts
@@ -1,10 +1,10 @@
-import { ResourceType } from '@shared/enums/resource-type.enum';
-import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 import {
   IndexCardDataJsonApi,
   IndexCardSearchResponseJsonApi,
   SearchResultDataJsonApi,
-} from '@shared/models/search/index-card-search-json-api.models';
+} from '@osf/shared/models/search/index-card-search-json-api.model';
+import { ResourceType } from '@shared/enums/resource-type.enum';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 import { ResourceModel } from '@shared/models/search/resource.model';
 
 export function MapResources(indexCardSearchResponseJsonApi: IndexCardSearchResponseJsonApi): ResourceModel[] {
diff --git a/src/app/shared/mappers/user/user.mapper.ts b/src/app/shared/mappers/user/user.mapper.ts
index 2a735dd38..f3df82497 100644
--- a/src/app/shared/mappers/user/user.mapper.ts
+++ b/src/app/shared/mappers/user/user.mapper.ts
@@ -1,4 +1,4 @@
-import { UserData, UserModel } from '@osf/shared/models/user/user.models';
+import { UserData, UserModel } from '@osf/shared/models/user/user.model';
 import {
   UserAcceptedTermsOfServiceJsonApi,
   UserAttributesJsonApi,
diff --git a/src/app/shared/models/addons/addon-json-api.models.ts b/src/app/shared/models/addons/addon-json-api.model.ts
similarity index 100%
rename from src/app/shared/models/addons/addon-json-api.models.ts
rename to src/app/shared/models/addons/addon-json-api.model.ts
diff --git a/src/app/shared/models/addons/addon-operations-json-api.models.ts b/src/app/shared/models/addons/addon-operations-json-api.model.ts
similarity index 100%
rename from src/app/shared/models/addons/addon-operations-json-api.models.ts
rename to src/app/shared/models/addons/addon-operations-json-api.model.ts
diff --git a/src/app/shared/models/addons/addon-utils.models.ts b/src/app/shared/models/addons/addon-utils.model.ts
similarity index 100%
rename from src/app/shared/models/addons/addon-utils.models.ts
rename to src/app/shared/models/addons/addon-utils.model.ts
diff --git a/src/app/shared/models/charts/dataset-input.ts b/src/app/shared/models/charts/dataset-input.model.ts
similarity index 100%
rename from src/app/shared/models/charts/dataset-input.ts
rename to src/app/shared/models/charts/dataset-input.model.ts
diff --git a/src/app/shared/models/collections/collections-json-api.models.ts b/src/app/shared/models/collections/collections-json-api.model.ts
similarity index 100%
rename from src/app/shared/models/collections/collections-json-api.models.ts
rename to src/app/shared/models/collections/collections-json-api.model.ts
diff --git a/src/app/shared/models/collections/collections.models.ts b/src/app/shared/models/collections/collections.model.ts
similarity index 97%
rename from src/app/shared/models/collections/collections.models.ts
rename to src/app/shared/models/collections/collections.model.ts
index c130c21f1..5b27a3bff 100644
--- a/src/app/shared/models/collections/collections.models.ts
+++ b/src/app/shared/models/collections/collections.model.ts
@@ -3,7 +3,7 @@ import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-su
 
 import { BrandModel } from '../brand/brand.model';
 import { ContributorModel } from '../contributors/contributor.model';
-import { ProjectModel } from '../projects/projects.models';
+import { ProjectModel } from '../projects/projects.model';
 import { BaseProviderModel } from '../provider/provider.model';
 
 export interface CollectionProvider extends BaseProviderModel {
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 16f4b4226..cedc24e36 100644
--- a/src/app/shared/models/institutions/institution-json-api.model.ts
+++ b/src/app/shared/models/institutions/institution-json-api.model.ts
@@ -1,6 +1,6 @@
 import { ApiData, JsonApiResponse, ResponseJsonApi } from '../common/json-api.model';
 
-import { InstitutionAssets } from './institutions.models';
+import { InstitutionAssets } from './institutions.model';
 
 export type InstitutionsJsonApiResponse = JsonApiResponse<InstitutionDataJsonApi[], null>;
 export type InstitutionsWithMetaJsonApiResponse = ResponseJsonApi<InstitutionDataJsonApi[]>;
diff --git a/src/app/shared/models/institutions/institutions.models.ts b/src/app/shared/models/institutions/institutions.model.ts
similarity index 100%
rename from src/app/shared/models/institutions/institutions.models.ts
rename to src/app/shared/models/institutions/institutions.model.ts
diff --git a/src/app/shared/models/license/license-form.models.ts b/src/app/shared/models/license/license-form.model.ts
similarity index 100%
rename from src/app/shared/models/license/license-form.models.ts
rename to src/app/shared/models/license/license-form.model.ts
diff --git a/src/app/shared/models/my-resources/my-resources-search-filters.models.ts b/src/app/shared/models/my-resources/my-resources-search-filters.model.ts
similarity index 100%
rename from src/app/shared/models/my-resources/my-resources-search-filters.models.ts
rename to src/app/shared/models/my-resources/my-resources-search-filters.model.ts
diff --git a/src/app/shared/models/my-resources/my-resources.models.ts b/src/app/shared/models/my-resources/my-resources.model.ts
similarity index 100%
rename from src/app/shared/models/my-resources/my-resources.models.ts
rename to src/app/shared/models/my-resources/my-resources.model.ts
diff --git a/src/app/shared/models/profile-settings-update.model.ts b/src/app/shared/models/profile-settings-update.model.ts
index a80257609..f87f5c7c8 100644
--- a/src/app/shared/models/profile-settings-update.model.ts
+++ b/src/app/shared/models/profile-settings-update.model.ts
@@ -1,7 +1,7 @@
 import { Education } from './user/education.model';
 import { Employment } from './user/employment.model';
 import { SocialModel } from './user/social.model';
-import { UserModel } from './user/user.models';
+import { UserModel } from './user/user.model';
 
 export type ProfileSettingsUpdate =
   | Partial<Employment>[]
diff --git a/src/app/shared/models/projects/projects.models.ts b/src/app/shared/models/projects/projects.model.ts
similarity index 100%
rename from src/app/shared/models/projects/projects.models.ts
rename to src/app/shared/models/projects/projects.model.ts
diff --git a/src/app/shared/models/registration/draft-registration.model.ts b/src/app/shared/models/registration/draft-registration.model.ts
index 4a18222ac..7ae2a5a0a 100644
--- a/src/app/shared/models/registration/draft-registration.model.ts
+++ b/src/app/shared/models/registration/draft-registration.model.ts
@@ -1,7 +1,7 @@
 import { UserPermissions } from '@shared/enums/user-permissions.enum';
 
 import { LicenseOptions } from '../license/license.model';
-import { ProjectModel } from '../projects/projects.models';
+import { ProjectModel } from '../projects/projects.model';
 
 export interface DraftRegistrationModel {
   id: string;
diff --git a/src/app/shared/models/request-access/request-access.model.ts b/src/app/shared/models/request-access/request-access.model.ts
index 0b3b5cf39..cf987ae92 100644
--- a/src/app/shared/models/request-access/request-access.model.ts
+++ b/src/app/shared/models/request-access/request-access.model.ts
@@ -1,6 +1,6 @@
 import { ContributorPermission } from '@osf/shared/enums/contributors/contributor-permission.enum';
 
-import { UserModel } from '../user/user.models';
+import { UserModel } from '../user/user.model';
 
 export interface RequestAccessModel {
   id: string;
diff --git a/src/app/shared/models/search/filter-options-json-api.models.ts b/src/app/shared/models/search/filter-options-json-api.model.ts
similarity index 98%
rename from src/app/shared/models/search/filter-options-json-api.models.ts
rename to src/app/shared/models/search/filter-options-json-api.model.ts
index d9de2d9dd..dbcf6ba9a 100644
--- a/src/app/shared/models/search/filter-options-json-api.models.ts
+++ b/src/app/shared/models/search/filter-options-json-api.model.ts
@@ -1,6 +1,6 @@
 import { ApiData } from '../common/json-api.model';
 
-import { SearchResultDataJsonApi } from './index-card-search-json-api.models';
+import { SearchResultDataJsonApi } from './index-card-search-json-api.model';
 
 export interface FilterOptionsResponseJsonApi {
   data: FilterOptionsResponseData;
diff --git a/src/app/shared/models/search/index-card-search-json-api.models.ts b/src/app/shared/models/search/index-card-search-json-api.model.ts
similarity index 100%
rename from src/app/shared/models/search/index-card-search-json-api.models.ts
rename to src/app/shared/models/search/index-card-search-json-api.model.ts
diff --git a/src/app/shared/models/user/user.models.ts b/src/app/shared/models/user/user.model.ts
similarity index 100%
rename from src/app/shared/models/user/user.models.ts
rename to src/app/shared/models/user/user.model.ts
diff --git a/src/app/shared/pipes/citation-format.pipe.ts b/src/app/shared/pipes/citation-format.pipe.ts
index bee6f5c2f..a9851bb93 100644
--- a/src/app/shared/pipes/citation-format.pipe.ts
+++ b/src/app/shared/pipes/citation-format.pipe.ts
@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 import { GENERATIONAL_SUFFIXES, ORDINAL_SUFFIXES } from '../constants/citation-suffix.const';
 
diff --git a/src/app/shared/services/addons/addon-form.service.ts b/src/app/shared/services/addons/addon-form.service.ts
index ce0fde96a..e02cf926b 100644
--- a/src/app/shared/services/addons/addon-form.service.ts
+++ b/src/app/shared/services/addons/addon-form.service.ts
@@ -5,12 +5,12 @@ 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 { AddonModel } from '@shared/models/addons/addon.model';
 import {
   AuthorizedAddonRequestJsonApi,
   ConfiguredAddonRequestJsonApi,
-} from '@shared/models/addons/addon-json-api.models';
-import { AddonForm } from '@shared/models/addons/addon-utils.models';
+} from '@osf/shared/models/addons/addon-json-api.model';
+import { AddonForm } from '@osf/shared/models/addons/addon-utils.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/addon-oauth.service.ts b/src/app/shared/services/addons/addon-oauth.service.ts
index 3ebfaae3c..f04eb88a3 100644
--- a/src/app/shared/services/addons/addon-oauth.service.ts
+++ b/src/app/shared/services/addons/addon-oauth.service.ts
@@ -4,7 +4,7 @@ import { isPlatformBrowser } from '@angular/common';
 import { DestroyRef, inject, Injectable, PLATFORM_ID, signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
-import { OAuthCallbacks } from '@osf/shared/models/addons/addon-utils.models';
+import { OAuthCallbacks } from '@osf/shared/models/addons/addon-utils.model';
 import { AuthorizedAccountModel } from '@osf/shared/models/addons/authorized-account.model';
 import { AddonsSelectors, DeleteAuthorizedAddon, GetAuthorizedStorageOauthToken } from '@osf/shared/stores/addons';
 
diff --git a/src/app/shared/services/addons/addon-operation-invocation.service.ts b/src/app/shared/services/addons/addon-operation-invocation.service.ts
index 193f3cb57..8b0e3db38 100644
--- a/src/app/shared/services/addons/addon-operation-invocation.service.ts
+++ b/src/app/shared/services/addons/addon-operation-invocation.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { OperationNames } from '@osf/shared/enums/operation-names.enum';
 import { StorageItemType } from '@osf/shared/enums/storage-item-type.enum';
 import { isCitationAddon } from '@osf/shared/helpers/addon-type.helper';
-import { OperationInvocationRequestJsonApi } from '@shared/models/addons/addon-operations-json-api.models';
+import { OperationInvocationRequestJsonApi } from '@osf/shared/models/addons/addon-operations-json-api.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 0ebb3460b..fb574b5fb 100644
--- a/src/app/shared/services/addons/addons.service.ts
+++ b/src/app/shared/services/addons/addons.service.ts
@@ -21,11 +21,11 @@ import {
   IncludedAddonData,
   ResourceReferenceJsonApi,
   UserReferenceJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.models';
+} from '@osf/shared/models/addons/addon-json-api.model';
 import {
   OperationInvocationRequestJsonApi,
   OperationInvocationResponseJsonApi,
-} from '@osf/shared/models/addons/addon-operations-json-api.models';
+} from '@osf/shared/models/addons/addon-operations-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';
diff --git a/src/app/shared/services/bookmarks.service.ts b/src/app/shared/services/bookmarks.service.ts
index 8fa7885a0..be8b29daf 100644
--- a/src/app/shared/services/bookmarks.service.ts
+++ b/src/app/shared/services/bookmarks.service.ts
@@ -7,13 +7,13 @@ import { ENVIRONMENT } from '@core/provider/environment.provider';
 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.models';
+import { SparseCollectionsResponseJsonApi } from '../models/collections/collections-json-api.model';
 import {
   MyResourcesItem,
   MyResourcesItemGetResponseJsonApi,
   MyResourcesResponseJsonApi,
-} from '../models/my-resources/my-resources.models';
-import { MyResourcesSearchFilters } from '../models/my-resources/my-resources-search-filters.models';
+} from '../models/my-resources/my-resources.model';
+import { MyResourcesSearchFilters } from '../models/my-resources/my-resources-search-filters.model';
 import { PaginatedData } from '../models/paginated-data.model';
 
 import { JsonApiService } from './json-api.service';
diff --git a/src/app/shared/services/collections.service.ts b/src/app/shared/services/collections.service.ts
index 6424e0f44..8b13f253a 100644
--- a/src/app/shared/services/collections.service.ts
+++ b/src/app/shared/services/collections.service.ts
@@ -23,7 +23,7 @@ import {
   CollectionSubmissionActionType,
   CollectionSubmissionTargetType,
   CollectionSubmissionWithGuid,
-} from '../models/collections/collections.models';
+} from '../models/collections/collections.model';
 import {
   CollectionDetailsGetResponseJsonApi,
   CollectionDetailsResponseJsonApi,
@@ -31,7 +31,7 @@ import {
   CollectionSubmissionJsonApi,
   CollectionSubmissionsSearchPayloadJsonApi,
   CollectionSubmissionWithGuidJsonApi,
-} from '../models/collections/collections-json-api.models';
+} from '../models/collections/collections-json-api.model';
 import { JsonApiResponse, ResponseJsonApi } from '../models/common/json-api.model';
 import { ContributorModel } from '../models/contributors/contributor.model';
 import { ContributorsResponseJsonApi } from '../models/contributors/contributor-response-json-api.model';
diff --git a/src/app/shared/services/contributors.service.ts b/src/app/shared/services/contributors.service.ts
index 3ab5d6145..80b123dcd 100644
--- a/src/app/shared/services/contributors.service.ts
+++ b/src/app/shared/services/contributors.service.ts
@@ -14,7 +14,7 @@ import { ContributorModel } from '../models/contributors/contributor.model';
 import { ContributorAddModel } from '../models/contributors/contributor-add.model';
 import { ContributorsResponseJsonApi } from '../models/contributors/contributor-response-json-api.model';
 import { PaginatedData } from '../models/paginated-data.model';
-import { IndexCardSearchResponseJsonApi } from '../models/search/index-card-search-json-api.models';
+import { IndexCardSearchResponseJsonApi } from '../models/search/index-card-search-json-api.model';
 import { SearchUserDataModel } from '../models/user/search-user-data.model';
 
 import { JsonApiService } from './json-api.service';
diff --git a/src/app/shared/services/files.service.ts b/src/app/shared/services/files.service.ts
index 0fd3306e0..e980fbe56 100644
--- a/src/app/shared/services/files.service.ts
+++ b/src/app/shared/services/files.service.ts
@@ -23,7 +23,7 @@ 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.models';
+import { AddonGetResponseJsonApi, ConfiguredAddonGetResponseJsonApi } from '../models/addons/addon-json-api.model';
 import { ConfiguredAddonModel } from '../models/addons/configured-addon.model';
 import { ApiData, JsonApiResponse, MetaJsonApi } from '../models/common/json-api.model';
 import { ContributorModel } from '../models/contributors/contributor.model';
diff --git a/src/app/shared/services/global-search.service.ts b/src/app/shared/services/global-search.service.ts
index fa2f73cf0..626609c6e 100644
--- a/src/app/shared/services/global-search.service.ts
+++ b/src/app/shared/services/global-search.service.ts
@@ -9,11 +9,11 @@ import { mapFilterOptions } from '../mappers/filters/filter-option.mapper';
 import { MapFilters } from '../mappers/filters/filters.mapper';
 import { MapResources } from '../mappers/search';
 import { FilterOption } from '../models/search/discaverable-filter.model';
-import { FilterOptionItem, FilterOptionsResponseJsonApi } from '../models/search/filter-options-json-api.models';
+import { FilterOptionItem, FilterOptionsResponseJsonApi } from '../models/search/filter-options-json-api.model';
 import {
   IndexCardSearchResponseJsonApi,
   SearchResultDataJsonApi,
-} from '../models/search/index-card-search-json-api.models';
+} from '../models/search/index-card-search-json-api.model';
 import { ResourcesData } from '../models/search/resource.model';
 
 import { JsonApiService } from './json-api.service';
diff --git a/src/app/shared/services/institutions.service.ts b/src/app/shared/services/institutions.service.ts
index b90fd89ea..9fa886e97 100644
--- a/src/app/shared/services/institutions.service.ts
+++ b/src/app/shared/services/institutions.service.ts
@@ -12,7 +12,7 @@ import {
   InstitutionsJsonApiResponse,
   InstitutionsWithMetaJsonApiResponse,
 } from '../models/institutions/institution-json-api.model';
-import { Institution, InstitutionsWithTotalCount } from '../models/institutions/institutions.models';
+import { Institution, InstitutionsWithTotalCount } from '../models/institutions/institutions.model';
 
 import { JsonApiService } from './json-api.service';
 
diff --git a/src/app/shared/services/my-resources.service.ts b/src/app/shared/services/my-resources.service.ts
index b36e20f37..27b4159cd 100644
--- a/src/app/shared/services/my-resources.service.ts
+++ b/src/app/shared/services/my-resources.service.ts
@@ -14,9 +14,9 @@ import {
   MyResourcesItemGetResponseJsonApi,
   MyResourcesItemResponseJsonApi,
   MyResourcesResponseJsonApi,
-} from '../models/my-resources/my-resources.models';
+} from '../models/my-resources/my-resources.model';
 import { EndpointType } from '../models/my-resources/my-resources-endpoint.type';
-import { MyResourcesSearchFilters } from '../models/my-resources/my-resources-search-filters.models';
+import { MyResourcesSearchFilters } from '../models/my-resources/my-resources-search-filters.model';
 import { CreateProjectPayloadJsoApi } from '../models/nodes/nodes-json-api.model';
 
 import { JsonApiService } from './json-api.service';
diff --git a/src/app/shared/services/node-links.service.ts b/src/app/shared/services/node-links.service.ts
index 870e9b7db..99fd68de1 100644
--- a/src/app/shared/services/node-links.service.ts
+++ b/src/app/shared/services/node-links.service.ts
@@ -7,7 +7,7 @@ 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.models';
+import { MyResourcesItem } from '../models/my-resources/my-resources.model';
 import { NodeLinkJsonApi } 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';
diff --git a/src/app/shared/services/projects.service.ts b/src/app/shared/services/projects.service.ts
index fba349ed6..dffc0054d 100644
--- a/src/app/shared/services/projects.service.ts
+++ b/src/app/shared/services/projects.service.ts
@@ -8,7 +8,7 @@ import { ProjectsMapper } from '../mappers/projects';
 import { BaseNodeDataJsonApi } from '../models/nodes/base-node-data-json-api.model';
 import { NodesResponseJsonApi } from '../models/nodes/nodes-json-api.model';
 import { ProjectMetadataUpdatePayload } from '../models/project-metadata-update-payload.model';
-import { ProjectModel } from '../models/projects/projects.models';
+import { ProjectModel } from '../models/projects/projects.model';
 
 import { JsonApiService } from './json-api.service';
 
diff --git a/src/app/shared/stores/addons/addons.actions.ts b/src/app/shared/stores/addons/addons.actions.ts
index 17a9c852a..05b79735f 100644
--- a/src/app/shared/stores/addons/addons.actions.ts
+++ b/src/app/shared/stores/addons/addons.actions.ts
@@ -1,8 +1,8 @@
 import {
   AuthorizedAddonRequestJsonApi,
   ConfiguredAddonRequestJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.models';
-import { OperationInvocationRequestJsonApi } from '@osf/shared/models/addons/addon-operations-json-api.models';
+} from '@osf/shared/models/addons/addon-json-api.model';
+import { OperationInvocationRequestJsonApi } from '@osf/shared/models/addons/addon-operations-json-api.model';
 
 export class GetStorageAddons {
   static readonly type = '[Addons] Get Storage Addons';
diff --git a/src/app/shared/stores/addons/addons.models.ts b/src/app/shared/stores/addons/addons.models.ts
index 14b4b37f5..a5ce2675c 100644
--- a/src/app/shared/stores/addons/addons.models.ts
+++ b/src/app/shared/stores/addons/addons.models.ts
@@ -3,7 +3,7 @@ import {
   ConfiguredAddonResponseJsonApi,
   ResourceReferenceJsonApi,
   UserReferenceJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.models';
+} 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';
diff --git a/src/app/shared/stores/addons/addons.selectors.ts b/src/app/shared/stores/addons/addons.selectors.ts
index a552ca63a..8cf6d8cad 100644
--- a/src/app/shared/stores/addons/addons.selectors.ts
+++ b/src/app/shared/stores/addons/addons.selectors.ts
@@ -5,7 +5,7 @@ import {
   ConfiguredAddonResponseJsonApi,
   ResourceReferenceJsonApi,
   UserReferenceJsonApi,
-} from '@osf/shared/models/addons/addon-json-api.models';
+} 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';
diff --git a/src/app/shared/stores/bookmarks/bookmarks.actions.ts b/src/app/shared/stores/bookmarks/bookmarks.actions.ts
index 12759a916..3dcd59733 100644
--- a/src/app/shared/stores/bookmarks/bookmarks.actions.ts
+++ b/src/app/shared/stores/bookmarks/bookmarks.actions.ts
@@ -1,5 +1,5 @@
+import { MyResourcesSearchFilters } from '@osf/shared/models/my-resources/my-resources-search-filters.model';
 import { ResourceType } from '@shared/enums/resource-type.enum';
-import { MyResourcesSearchFilters } from '@shared/models/my-resources/my-resources-search-filters.models';
 
 export class GetBookmarksCollectionId {
   static readonly type = '[Bookmarks] Get Bookmarks Collection Id';
diff --git a/src/app/shared/stores/bookmarks/bookmarks.model.ts b/src/app/shared/stores/bookmarks/bookmarks.model.ts
index 919d2b347..66a469992 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.models';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.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 8e17d8581..8ad7f5035 100644
--- a/src/app/shared/stores/collections/collections.model.ts
+++ b/src/app/shared/stores/collections/collections.model.ts
@@ -3,7 +3,7 @@ import {
   CollectionProvider,
   CollectionSubmission,
   CollectionSubmissionWithGuid,
-} from '@osf/shared/models/collections/collections.models';
+} from '@osf/shared/models/collections/collections.model';
 import { CollectionsFilters } from '@osf/shared/models/collections/collections-filters.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 
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 c319194e2..383f424d8 100644
--- a/src/app/shared/stores/institutions-search/institutions-search.model.ts
+++ b/src/app/shared/stores/institutions-search/institutions-search.model.ts
@@ -1,4 +1,4 @@
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 
 export interface InstitutionsSearchModel {
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 0600b0231..192df7d87 100644
--- a/src/app/shared/stores/institutions-search/institutions-search.state.ts
+++ b/src/app/shared/stores/institutions-search/institutions-search.state.ts
@@ -6,7 +6,7 @@ import { catchError, tap } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { handleSectionError } from '@osf/shared/helpers/state-error.handler';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { InstitutionsService } from '@osf/shared/services/institutions.service';
 
 import { FetchInstitutionById } from './institutions-search.actions';
diff --git a/src/app/shared/stores/institutions/institutions.actions.ts b/src/app/shared/stores/institutions/institutions.actions.ts
index 4e7790f79..85b19d02e 100644
--- a/src/app/shared/stores/institutions/institutions.actions.ts
+++ b/src/app/shared/stores/institutions/institutions.actions.ts
@@ -1,5 +1,5 @@
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
-import { Institution } from '@shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 export class FetchUserInstitutions {
   static readonly type = '[Institutions] Fetch User Institutions';
diff --git a/src/app/shared/stores/institutions/institutions.model.ts b/src/app/shared/stores/institutions/institutions.model.ts
index 984d18a5e..939933d39 100644
--- a/src/app/shared/stores/institutions/institutions.model.ts
+++ b/src/app/shared/stores/institutions/institutions.model.ts
@@ -1,4 +1,4 @@
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.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/my-resources/my-resources.actions.ts b/src/app/shared/stores/my-resources/my-resources.actions.ts
index b56720213..195ce94f3 100644
--- a/src/app/shared/stores/my-resources/my-resources.actions.ts
+++ b/src/app/shared/stores/my-resources/my-resources.actions.ts
@@ -1,5 +1,5 @@
 import { ResourceSearchMode } from '@osf/shared/enums/resource-search-mode.enum';
-import { MyResourcesSearchFilters } from '@osf/shared/models/my-resources/my-resources-search-filters.models';
+import { MyResourcesSearchFilters } from '@osf/shared/models/my-resources/my-resources-search-filters.model';
 
 export class GetMyProjects {
   static readonly type = '[My Resources] Get Projects';
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 47d41db9f..cfc32a040 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.models';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.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 344e64d3a..f3da50129 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.models';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
 
 import { MyResourcesStateModel } from './my-resources.model';
 import { MyResourcesState } from './my-resources.state';
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 9515fb1eb..52e21e0df 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.models';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
 import { NodeModel } from '@osf/shared/models/nodes/base-node.model';
 
 export class CreateNodeLink {
diff --git a/src/app/shared/stores/projects/projects.actions.ts b/src/app/shared/stores/projects/projects.actions.ts
index 6896ba6fe..1ce5e0c10 100644
--- a/src/app/shared/stores/projects/projects.actions.ts
+++ b/src/app/shared/stores/projects/projects.actions.ts
@@ -1,5 +1,5 @@
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { ProjectMetadataUpdatePayload } from '@shared/models/project-metadata-update-payload.model';
-import { ProjectModel } from '@shared/models/projects/projects.models';
 
 export class GetProjects {
   static readonly type = '[Projects] Get Projects';
diff --git a/src/app/shared/stores/projects/projects.model.ts b/src/app/shared/stores/projects/projects.model.ts
index 13e2862d0..71cbcc956 100644
--- a/src/app/shared/stores/projects/projects.model.ts
+++ b/src/app/shared/stores/projects/projects.model.ts
@@ -1,4 +1,4 @@
-import { ProjectModel } from '@osf/shared/models/projects/projects.models';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 
 export interface ProjectsStateModel {
diff --git a/src/testing/data/collections/collection-submissions.mock.ts b/src/testing/data/collections/collection-submissions.mock.ts
index cf812f95e..6dbba45b9 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.models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collections.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
index 61ea6275a..c2e133b71 100644
--- a/src/testing/data/dashboard/dasboard.data.ts
+++ b/src/testing/data/dashboard/dasboard.data.ts
@@ -1,4 +1,4 @@
-import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
 
 import structuredClone from 'structured-clone';
 
diff --git a/src/testing/mocks/collections-submissions.mock.ts b/src/testing/mocks/collections-submissions.mock.ts
index db217ecb6..bd04c610e 100644
--- a/src/testing/mocks/collections-submissions.mock.ts
+++ b/src/testing/mocks/collections-submissions.mock.ts
@@ -1,4 +1,4 @@
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.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 6acecbf35..0d24b1261 100644
--- a/src/testing/mocks/data.mock.ts
+++ b/src/testing/mocks/data.mock.ts
@@ -1,4 +1,4 @@
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { UserRelatedCounts } from '@osf/shared/models/user-related-counts/user-related-counts.model';
 
 export const MOCK_USER: UserModel = {
diff --git a/src/testing/mocks/my-resources.mock.ts b/src/testing/mocks/my-resources.mock.ts
index fff22e697..e726eb789 100644
--- a/src/testing/mocks/my-resources.mock.ts
+++ b/src/testing/mocks/my-resources.mock.ts
@@ -1,4 +1,4 @@
-import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
 
 import { MOCK_CONTRIBUTOR } from './contributors.mock';
 
diff --git a/src/testing/mocks/project-metadata.mock.ts b/src/testing/mocks/project-metadata.mock.ts
index 6972fc38a..25413d926 100644
--- a/src/testing/mocks/project-metadata.mock.ts
+++ b/src/testing/mocks/project-metadata.mock.ts
@@ -1,7 +1,7 @@
 import { MetadataModel } from '@osf/features/metadata/models';
 import { UserPermissions } from '@osf/shared/enums/user-permissions.enum';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { IdentifierModel } from '@shared/models/identifiers/identifier.model';
-import { Institution } from '@shared/models/institutions/institutions.models';
 
 export const MOCK_PROJECT_METADATA: MetadataModel = {
   id: 'project-123',
diff --git a/src/testing/mocks/project.mock.ts b/src/testing/mocks/project.mock.ts
index 9f5470f8c..f530cce13 100644
--- a/src/testing/mocks/project.mock.ts
+++ b/src/testing/mocks/project.mock.ts
@@ -1,4 +1,4 @@
-import { ProjectModel } from '@shared/models/projects/projects.models';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 
 export const MOCK_PROJECT: ProjectModel = {
   id: 'project-1',
diff --git a/src/testing/mocks/submission.mock.ts b/src/testing/mocks/submission.mock.ts
index d1f601f46..8c00a91f8 100644
--- a/src/testing/mocks/submission.mock.ts
+++ b/src/testing/mocks/submission.mock.ts
@@ -1,5 +1,5 @@
 import { PreprintSubmissionModel } from '@osf/features/moderation/models';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 
 import { MOCK_CONTRIBUTOR } from './contributors.mock';
 
diff --git a/src/testing/providers/addon-operation-invocation.service.mock.ts b/src/testing/providers/addon-operation-invocation.service.mock.ts
index 293aad2a9..8da6737c7 100644
--- a/src/testing/providers/addon-operation-invocation.service.mock.ts
+++ b/src/testing/providers/addon-operation-invocation.service.mock.ts
@@ -1,5 +1,5 @@
+import { OperationInvocationRequestJsonApi } from '@osf/shared/models/addons/addon-operations-json-api.model';
 import { AddonOperationInvocationService } from '@osf/shared/services/addons/addon-operation-invocation.service';
-import { OperationInvocationRequestJsonApi } from '@shared/models/addons/addon-operations-json-api.models';
 
 export function AddonOperationInvocationServiceMockFactory() {
   return {