diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index e66d321f2..b33808b45 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -74,7 +74,10 @@ export const routes: Routes = [
       {
         path: 'my-registrations',
         canActivate: [authGuard],
-        loadComponent: () => import('@osf/features/registries/pages').then((c) => c.MyRegistrationsComponent),
+        loadComponent: () =>
+          import('@osf/features/registries/pages/my-registrations/my-registrations.component').then(
+            (c) => c.MyRegistrationsComponent
+          ),
         providers: [
           provideStates([RegistriesState]),
           ProvidersHandlers,
diff --git a/src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts b/src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts
index 82667ec46..a57e288d9 100644
--- a/src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts
+++ b/src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts
@@ -19,7 +19,7 @@ import { FileMenuType } from '@shared/enums/file-menu-type.enum';
 import { FileModel } from '@shared/models/files/file.model';
 
 @Component({
-  selector: 'osf-move-file-dialog',
+  selector: 'osf-confirm-move-file-dialog',
   imports: [Button, TranslatePipe],
   templateUrl: './confirm-move-file-dialog.component.html',
   styleUrl: './confirm-move-file-dialog.component.scss',
diff --git a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts
index 4374dade2..b9d5863bb 100644
--- a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts
+++ b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts
@@ -17,7 +17,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import {
   FilesSelectors,
   GetMoveDialogFiles,
-  SetCurrentFolder,
+  SetFilesCurrentFolder,
   SetMoveDialogCurrentFolder,
 } from '@osf/features/files/store';
 import { FileSelectDestinationComponent } from '@osf/shared/components/file-select-destination/file-select-destination.component';
@@ -80,7 +80,7 @@ export class MoveFileDialogComponent {
   readonly actions = createDispatchMap({
     getMoveDialogFiles: GetMoveDialogFiles,
     setMoveDialogCurrentFolder: SetMoveDialogCurrentFolder,
-    setCurrentFolder: SetCurrentFolder,
+    setCurrentFolder: SetFilesCurrentFolder,
     getResourceDetails: GetResourceDetails,
     getComponentsTree: GetResourceWithChildren,
   });
diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts
index 3653caa67..728831377 100644
--- a/src/app/features/files/pages/files/files.component.ts
+++ b/src/app/features/files/pages/files/files.component.ts
@@ -46,9 +46,9 @@ import {
   GetRootFolders,
   GetStorageSupportedFeatures,
   RenameEntry,
-  ResetState,
-  SetCurrentFolder,
+  ResetFilesState,
   SetCurrentProvider,
+  SetFilesCurrentFolder,
   SetMoveDialogCurrentFolder,
   SetSearch,
   SetSort,
@@ -138,14 +138,14 @@ export class FilesComponent {
     getFiles: GetFiles,
     deleteEntry: DeleteEntry,
     renameEntry: RenameEntry,
-    setCurrentFolder: SetCurrentFolder,
+    setCurrentFolder: SetFilesCurrentFolder,
     setMoveDialogCurrentFolder: SetMoveDialogCurrentFolder,
     setSearch: SetSearch,
     setSort: SetSort,
     getRootFolders: GetRootFolders,
     getConfiguredStorageAddons: GetConfiguredStorageAddons,
     setCurrentProvider: SetCurrentProvider,
-    resetState: ResetState,
+    resetState: ResetFilesState,
     getResourceDetails: GetResourceDetails,
     getStorageSupportedFeatures: GetStorageSupportedFeatures,
   });
diff --git a/src/app/features/files/store/files.actions.ts b/src/app/features/files/store/files.actions.ts
index effb868b5..999863b71 100644
--- a/src/app/features/files/store/files.actions.ts
+++ b/src/app/features/files/store/files.actions.ts
@@ -32,8 +32,8 @@ export class SetSort {
   constructor(public sort: string) {}
 }
 
-export class SetCurrentFolder {
-  static readonly type = '[Files] Set Current Folder';
+export class SetFilesCurrentFolder {
+  static readonly type = '[Files] Set Files Current Folder';
 
   constructor(public folder: FileFolderModel | null) {}
 }
@@ -161,6 +161,6 @@ export class GetStorageSupportedFeatures {
   ) {}
 }
 
-export class ResetState {
+export class ResetFilesState {
   static readonly type = '[Files] Reset State';
 }
diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts
index 306c69598..52e6e31a8 100644
--- a/src/app/features/files/store/files.state.ts
+++ b/src/app/features/files/store/files.state.ts
@@ -27,10 +27,10 @@ import {
   GetRootFolders,
   GetStorageSupportedFeatures,
   RenameEntry,
-  ResetState,
-  SetCurrentFolder,
+  ResetFilesState,
   SetCurrentProvider,
   SetFileMetadata,
+  SetFilesCurrentFolder,
   SetMoveDialogCurrentFolder,
   SetSearch,
   SetSort,
@@ -94,8 +94,8 @@ export class FilesState {
     );
   }
 
-  @Action(SetCurrentFolder)
-  setSelectedFolder(ctx: StateContext<FilesStateModel>, action: SetCurrentFolder) {
+  @Action(SetFilesCurrentFolder)
+  setSelectedFolder(ctx: StateContext<FilesStateModel>, action: SetFilesCurrentFolder) {
     ctx.patchState({ currentFolder: action.folder });
   }
 
@@ -360,7 +360,7 @@ export class FilesState {
     );
   }
 
-  @Action(ResetState)
+  @Action(ResetFilesState)
   resetState(ctx: StateContext<FilesStateModel>) {
     ctx.patchState(FILES_STATE_DEFAULTS);
   }
diff --git a/src/app/features/preprints/components/index.ts b/src/app/features/preprints/components/index.ts
index 9d0394975..17ba1617f 100644
--- a/src/app/features/preprints/components/index.ts
+++ b/src/app/features/preprints/components/index.ts
@@ -8,9 +8,9 @@ export { PreprintMakeDecisionComponent } from './preprint-details/preprint-make-
 export { PreprintMetricsInfoComponent } from './preprint-details/preprint-metrics-info/preprint-metrics-info.component';
 export { PreprintTombstoneComponent } from './preprint-details/preprint-tombstone/preprint-tombstone.component';
 export { PreprintWarningBannerComponent } from './preprint-details/preprint-warning-banner/preprint-warning-banner.component';
+export { PreprintWithdrawDialogComponent } from './preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component';
 export { ShareAndDownloadComponent } from './preprint-details/share-and-download/share-and-download.component';
 export { StatusBannerComponent } from './preprint-details/status-banner/status-banner.component';
-export { WithdrawDialogComponent } from './preprint-details/withdraw-dialog/withdraw-dialog.component';
 export { PreprintProviderFooterComponent } from './preprint-provider-footer/preprint-provider-footer.component';
 export { PreprintProviderHeroComponent } from './preprint-provider-hero/preprint-provider-hero.component';
 export { PreprintServicesComponent } from './preprint-services/preprint-services.component';
diff --git a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts
index 608628a48..29eb2571b 100644
--- a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts
+++ b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts
@@ -11,7 +11,7 @@ import { FormsModule } from '@angular/forms';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { ApplicabilityStatus, PreregLinkInfo } from '@osf/features/preprints/enums';
 import { PreprintProviderDetails } from '@osf/features/preprints/models';
-import { FetchPreprintById, PreprintSelectors } from '@osf/features/preprints/store/preprint';
+import { FetchPreprintDetails, PreprintSelectors } from '@osf/features/preprints/store/preprint';
 import { AffiliatedInstitutionsViewComponent } from '@osf/shared/components/affiliated-institutions-view/affiliated-institutions-view.component';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
@@ -55,7 +55,7 @@ export class GeneralInformationComponent implements OnDestroy {
   private actions = createDispatchMap({
     getBibliographicContributors: GetBibliographicContributors,
     resetContributorsState: ResetContributorsState,
-    fetchPreprintById: FetchPreprintById,
+    fetchPreprintById: FetchPreprintDetails,
     fetchResourceInstitutions: FetchResourceInstitutions,
     loadMoreBibliographicContributors: LoadMoreBibliographicContributors,
   });
diff --git a/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts b/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts
index 341290d97..2023c666e 100644
--- a/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts
+++ b/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts
@@ -12,7 +12,7 @@ import { Router } from '@angular/router';
 
 import { ApplicabilityStatus, PreregLinkInfo } from '@osf/features/preprints/enums';
 import { PreprintProviderDetails } from '@osf/features/preprints/models';
-import { FetchPreprintById, PreprintSelectors } from '@osf/features/preprints/store/preprint';
+import { FetchPreprintDetails, PreprintSelectors } from '@osf/features/preprints/store/preprint';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
 import { LicenseDisplayComponent } from '@osf/shared/components/license-display/license-display.component';
 import { TruncatedTextComponent } from '@osf/shared/components/truncated-text/truncated-text.component';
@@ -51,7 +51,7 @@ export class PreprintTombstoneComponent implements OnDestroy {
   private actions = createDispatchMap({
     getBibliographicContributors: GetBibliographicContributors,
     resetContributorsState: ResetContributorsState,
-    fetchPreprintById: FetchPreprintById,
+    fetchPreprintById: FetchPreprintDetails,
     fetchSubjects: FetchSelectedSubjects,
     loadMoreBibliographicContributors: LoadMoreBibliographicContributors,
   });
diff --git a/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.html b/src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.html
similarity index 100%
rename from src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.html
rename to src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.html
diff --git a/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.scss b/src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.scss
similarity index 100%
rename from src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.scss
rename to src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.scss
diff --git a/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.spec.ts b/src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.spec.ts
similarity index 89%
rename from src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.spec.ts
rename to src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.spec.ts
index bfd79e403..315c445c2 100644
--- a/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.spec.ts
+++ b/src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.spec.ts
@@ -9,16 +9,16 @@ import { formInputLimits } from '@osf/features/preprints/constants';
 import { ProviderReviewsWorkflow, ReviewsState } from '@osf/features/preprints/enums';
 import { PreprintModel, PreprintProviderDetails } from '@osf/features/preprints/models';
 
-import { WithdrawDialogComponent } from './withdraw-dialog.component';
+import { PreprintWithdrawDialogComponent } from './preprint-withdraw-dialog.component';
 
 import { PREPRINT_MOCK } from '@testing/mocks/preprint.mock';
 import { PREPRINT_PROVIDER_DETAILS_MOCK } from '@testing/mocks/preprint-provider-details';
 import { OSFTestingModule } from '@testing/osf.testing.module';
 import { provideMockStore } from '@testing/providers/store-provider.mock';
 
-describe('WithdrawDialogComponent', () => {
-  let component: WithdrawDialogComponent;
-  let fixture: ComponentFixture<WithdrawDialogComponent>;
+describe('PreprintWithdrawDialogComponent', () => {
+  let component: PreprintWithdrawDialogComponent;
+  let fixture: ComponentFixture<PreprintWithdrawDialogComponent>;
   let dialogRefMock: any;
   let dialogConfigMock: any;
 
@@ -34,7 +34,7 @@ describe('WithdrawDialogComponent', () => {
     };
 
     await TestBed.configureTestingModule({
-      imports: [WithdrawDialogComponent, OSFTestingModule, MockPipe(TitleCasePipe)],
+      imports: [PreprintWithdrawDialogComponent, OSFTestingModule, MockPipe(TitleCasePipe)],
       providers: [
         MockProvider(DynamicDialogRef, dialogRefMock),
         MockProvider(DynamicDialogConfig, dialogConfigMock),
@@ -44,7 +44,7 @@ describe('WithdrawDialogComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(WithdrawDialogComponent);
+    fixture = TestBed.createComponent(PreprintWithdrawDialogComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
@@ -103,7 +103,7 @@ describe('WithdrawDialogComponent', () => {
     dialogConfigMock.data = { provider: providerWithPreMod, preprint: preprintWithPending };
 
     expect(() => {
-      fixture = TestBed.createComponent(WithdrawDialogComponent);
+      fixture = TestBed.createComponent(PreprintWithdrawDialogComponent);
       component = fixture.componentInstance;
       component.ngOnInit();
     }).not.toThrow();
@@ -116,7 +116,7 @@ describe('WithdrawDialogComponent', () => {
     dialogConfigMock.data = { provider: providerWithPreMod, preprint: preprintWithAccepted };
 
     expect(() => {
-      fixture = TestBed.createComponent(WithdrawDialogComponent);
+      fixture = TestBed.createComponent(PreprintWithdrawDialogComponent);
       component = fixture.componentInstance;
       component.ngOnInit();
     }).not.toThrow();
@@ -128,7 +128,7 @@ describe('WithdrawDialogComponent', () => {
     dialogConfigMock.data = { provider: providerWithPostMod, preprint: mockPreprint };
 
     expect(() => {
-      fixture = TestBed.createComponent(WithdrawDialogComponent);
+      fixture = TestBed.createComponent(PreprintWithdrawDialogComponent);
       component = fixture.componentInstance;
       component.ngOnInit();
     }).not.toThrow();
diff --git a/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.ts b/src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.ts
similarity index 93%
rename from src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.ts
rename to src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.ts
index 1ade9c91a..9b6cfe6c3 100644
--- a/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.ts
+++ b/src/app/features/preprints/components/preprint-details/preprint-withdraw-dialog/preprint-withdraw-dialog.component.ts
@@ -21,13 +21,13 @@ import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants/input-validatio
 import { CustomValidators } from '@osf/shared/helpers/custom-form-validators.helper';
 
 @Component({
-  selector: 'osf-withdraw-dialog',
+  selector: 'osf-preprint-withdraw-dialog',
   imports: [Textarea, ReactiveFormsModule, Message, TranslatePipe, Button, TitleCasePipe],
-  templateUrl: './withdraw-dialog.component.html',
-  styleUrl: './withdraw-dialog.component.scss',
+  templateUrl: './preprint-withdraw-dialog.component.html',
+  styleUrl: './preprint-withdraw-dialog.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class WithdrawDialogComponent implements OnInit {
+export class PreprintWithdrawDialogComponent implements OnInit {
   private readonly config = inject(DynamicDialogConfig);
   private readonly translateService = inject(TranslateService);
   private readonly environment = inject(ENVIRONMENT);
@@ -39,9 +39,7 @@ export class WithdrawDialogComponent implements OnInit {
   private provider!: PreprintProviderDetails;
   private preprint!: PreprintModel;
 
-  private actions = createDispatchMap({
-    withdrawPreprint: WithdrawPreprint,
-  });
+  private actions = createDispatchMap({ withdrawPreprint: WithdrawPreprint });
 
   inputLimits = formInputLimits;
   readonly INPUT_VALIDATION_MESSAGES = INPUT_VALIDATION_MESSAGES;
diff --git a/src/app/features/preprints/components/stepper/file-step/file-step.component.ts b/src/app/features/preprints/components/stepper/file-step/file-step.component.ts
index ed7803353..99b5601fd 100644
--- a/src/app/features/preprints/components/stepper/file-step/file-step.component.ts
+++ b/src/app/features/preprints/components/stepper/file-step/file-step.component.ts
@@ -35,7 +35,7 @@ import {
   FetchProjectFilesByLink,
   PreprintStepperSelectors,
   ReuploadFile,
-  SetCurrentFolder,
+  SetPreprintStepperCurrentFolder,
   SetProjectRootFolder,
   SetSelectedPreprintFileSource,
   UploadFile,
@@ -80,7 +80,7 @@ export class FileStepComponent implements OnInit {
     setProjectRootFolder: SetProjectRootFolder,
     getProjectFilesByLink: FetchProjectFilesByLink,
     copyFileFromProject: CopyFileFromProject,
-    setCurrentFolder: SetCurrentFolder,
+    setCurrentFolder: SetPreprintStepperCurrentFolder,
   });
   private destroyRef = inject(DestroyRef);
 
diff --git a/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts b/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts
index d59bfa609..c3d69bbde 100644
--- a/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts
+++ b/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts
@@ -20,7 +20,6 @@ import {
 import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { ResetState } from '@osf/features/files/store';
 import { StepperComponent } from '@osf/shared/components/stepper/stepper.component';
 import { IS_WEB } from '@osf/shared/helpers/breakpoints.tokens';
 import { BrowserTabHelper } from '@osf/shared/helpers/browser-tab.helper';
@@ -32,9 +31,13 @@ import { BrandService } from '@osf/shared/services/brand.service';
 import { FileStepComponent, ReviewStepComponent } from '../../components';
 import { createNewVersionStepsConst } from '../../constants';
 import { PreprintSteps } from '../../enums';
-import { FetchPreprintById } from '../../store/preprint';
 import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers';
-import { PreprintStepperSelectors, SetSelectedPreprintProviderId } from '../../store/preprint-stepper';
+import {
+  FetchPreprintById,
+  PreprintStepperSelectors,
+  ResetPreprintStepperState,
+  SetSelectedPreprintProviderId,
+} from '../../store/preprint-stepper';
 
 @Component({
   selector: 'osf-create-new-version',
@@ -55,7 +58,7 @@ export class CreateNewVersionComponent implements OnInit, OnDestroy, CanDeactiva
   private actions = createDispatchMap({
     getPreprintProviderById: GetPreprintProviderById,
     setSelectedPreprintProviderId: SetSelectedPreprintProviderId,
-    resetState: ResetState,
+    resetState: ResetPreprintStepperState,
     fetchPreprint: FetchPreprintById,
   });
 
diff --git a/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts b/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts
index 31d8ecb41..908179745 100644
--- a/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts
+++ b/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts
@@ -28,7 +28,6 @@ import { HelpScoutService } from '@core/services/help-scout.service';
 import { PrerenderReadyService } from '@core/services/prerender-ready.service';
 import { ClearCurrentProvider } from '@core/store/provider';
 import { UserSelectors } from '@core/store/user';
-import { ResetState } from '@osf/features/files/store';
 import { ReviewPermissions } from '@osf/shared/enums/review-permissions.enum';
 import { pathJoin } from '@osf/shared/helpers/path-join.helper';
 import { FixSpecialCharPipe } from '@osf/shared/pipes/fix-special-char.pipe';
@@ -48,17 +47,18 @@ import {
   PreprintMetricsInfoComponent,
   PreprintTombstoneComponent,
   PreprintWarningBannerComponent,
+  PreprintWithdrawDialogComponent,
   ShareAndDownloadComponent,
   StatusBannerComponent,
-  WithdrawDialogComponent,
 } from '../../components';
 import { PreprintRequestMachineState, ProviderReviewsWorkflow, ReviewsState } from '../../enums';
 import {
-  FetchPreprintById,
+  FetchPreprintDetails,
   FetchPreprintRequestActions,
   FetchPreprintRequests,
   FetchPreprintReviewActions,
   PreprintSelectors,
+  ResetPreprintState,
 } from '../../store/preprint';
 import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers';
 import { CreateNewVersion, PreprintStepperSelectors } from '../../store/preprint-stepper';
@@ -110,8 +110,8 @@ export class PreprintDetailsComponent implements OnInit, OnDestroy {
 
   private actions = createDispatchMap({
     getPreprintProviderById: GetPreprintProviderById,
-    resetState: ResetState,
-    fetchPreprintById: FetchPreprintById,
+    resetState: ResetPreprintState,
+    fetchPreprintById: FetchPreprintDetails,
     createNewVersion: CreateNewVersion,
     fetchPreprintRequests: FetchPreprintRequests,
     fetchPreprintReviewActions: FetchPreprintReviewActions,
@@ -314,7 +314,7 @@ export class PreprintDetailsComponent implements OnInit, OnDestroy {
 
   handleWithdrawClicked() {
     this.customDialogService
-      .open(WithdrawDialogComponent, {
+      .open(PreprintWithdrawDialogComponent, {
         header: this.translateService.instant('preprints.details.withdrawDialog.title', {
           preprintWord: this.preprintProvider()!.preprintWord,
         }),
diff --git a/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.html b/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.html
index 3bc727057..7db2cdfb8 100644
--- a/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.html
+++ b/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.html
@@ -41,7 +41,7 @@ <h2>{{ 'preprints.selectService.sectionTitle' | translate }}</h2>
               [alt]="'preprints.selectService.providerLogoImageAlt' | translate"
             />
 
-            <h4 class="mt-3">{{ provider.name }}</h4>
+            <h4 class="text-center mt-3">{{ provider.name }}</h4>
             <p-button
               class="mt-4"
               [label]="
diff --git a/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts b/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts
index 63e47a8c8..16d621336 100644
--- a/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts
+++ b/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts
@@ -21,7 +21,6 @@ import {
 import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute } from '@angular/router';
 
-import { ResetState } from '@osf/features/files/store';
 import { StepperComponent } from '@osf/shared/components/stepper/stepper.component';
 import { IS_WEB } from '@osf/shared/helpers/breakpoints.tokens';
 import { BrowserTabHelper } from '@osf/shared/helpers/browser-tab.helper';
@@ -41,7 +40,12 @@ import {
 import { submitPreprintSteps } from '../../constants';
 import { PreprintSteps } from '../../enums';
 import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers';
-import { DeletePreprint, PreprintStepperSelectors, SetSelectedPreprintProviderId } from '../../store/preprint-stepper';
+import {
+  DeletePreprint,
+  PreprintStepperSelectors,
+  ResetPreprintStepperState,
+  SetSelectedPreprintProviderId,
+} from '../../store/preprint-stepper';
 
 @Component({
   selector: 'osf-submit-preprint-stepper',
@@ -71,7 +75,7 @@ export class SubmitPreprintStepperComponent implements OnInit, OnDestroy, CanDea
   private actions = createDispatchMap({
     getPreprintProviderById: GetPreprintProviderById,
     setSelectedPreprintProviderId: SetSelectedPreprintProviderId,
-    resetState: ResetState,
+    resetState: ResetPreprintStepperState,
     deletePreprint: DeletePreprint,
   });
 
diff --git a/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts b/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts
index 1511d13e1..dc068ad76 100644
--- a/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts
+++ b/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts
@@ -21,7 +21,6 @@ import {
 import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute } from '@angular/router';
 
-import { ResetState } from '@osf/features/files/store';
 import { StepperComponent } from '@osf/shared/components/stepper/stepper.component';
 import { UserPermissions } from '@osf/shared/enums/user-permissions.enum';
 import { IS_WEB } from '@osf/shared/helpers/breakpoints.tokens';
@@ -45,6 +44,7 @@ import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store
 import {
   FetchPreprintById,
   PreprintStepperSelectors,
+  ResetPreprintStepperState,
   SetSelectedPreprintProviderId,
 } from '../../store/preprint-stepper';
 
@@ -76,7 +76,7 @@ export class UpdatePreprintStepperComponent implements OnInit, OnDestroy, CanDea
   private actions = createDispatchMap({
     getPreprintProviderById: GetPreprintProviderById,
     setSelectedPreprintProviderId: SetSelectedPreprintProviderId,
-    resetState: ResetState,
+    resetState: ResetPreprintStepperState,
     fetchPreprint: FetchPreprintById,
   });
 
@@ -153,7 +153,7 @@ export class UpdatePreprintStepperComponent implements OnInit, OnDestroy, CanDea
   }
 
   @HostListener('window:beforeunload', ['$event'])
-  public onBeforeUnload($event: BeforeUnloadEvent): boolean {
+  onBeforeUnload($event: BeforeUnloadEvent): boolean {
     $event.preventDefault();
     return false;
   }
diff --git a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts
index 7638e6557..d4bef602e 100644
--- a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts
+++ b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts
@@ -32,7 +32,7 @@ export class UpdatePreprint {
 }
 
 export class FetchPreprintById {
-  static readonly type = '[Preprint Stepper] Get Preprint By Id';
+  static readonly type = '[Preprint Stepper] Fetch Preprint By Id';
 
   constructor(public id: string) {}
 }
@@ -142,7 +142,7 @@ export class CreateNewVersion {
   constructor(public preprintId: string) {}
 }
 
-export class ResetState {
+export class ResetPreprintStepperState {
   static readonly type = '[Preprint Stepper] Reset State';
 }
 
@@ -150,8 +150,8 @@ export class DeletePreprint {
   static readonly type = '[Preprint Stepper]  Delete Preprint';
 }
 
-export class SetCurrentFolder {
-  static readonly type = '[Preprint Stepper] Set Current Folder';
+export class SetPreprintStepperCurrentFolder {
+  static readonly type = '[Preprint Stepper] Set Preprint Stepper Current Folder';
 
   constructor(public folder: FileFolderModel | null) {}
 }
diff --git a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.model.ts b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.model.ts
index 49929ec9f..ec5ab073f 100644
--- a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.model.ts
+++ b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.model.ts
@@ -1,11 +1,12 @@
-import { PreprintFileSource } from '@osf/features/preprints/enums';
-import { PreprintFilesLinks, PreprintModel } from '@osf/features/preprints/models';
+import { StringOrNull } from '@osf/shared/helpers/types.helper';
+import { IdNameModel } from '@osf/shared/models/common/id-name.model';
+import { FileModel } from '@osf/shared/models/files/file.model';
+import { FileFolderModel } from '@osf/shared/models/files/file-folder.model';
 import { LicenseModel } from '@osf/shared/models/license/license.model';
-import { StringOrNull } from '@shared/helpers/types.helper';
-import { IdNameModel } from '@shared/models/common/id-name.model';
-import { FileModel } from '@shared/models/files/file.model';
-import { FileFolderModel } from '@shared/models/files/file-folder.model';
-import { AsyncStateModel } from '@shared/models/store/async-state.model';
+import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
+
+import { PreprintFileSource } from '../../enums';
+import { PreprintFilesLinks, PreprintModel } from '../../models';
 
 export interface PreprintStepperStateModel {
   selectedProviderId: StringOrNull;
@@ -21,3 +22,51 @@ export interface PreprintStepperStateModel {
   hasBeenSubmitted: boolean;
   institutionsChanged: boolean;
 }
+
+export const DEFAULT_PREPRINT_STEPPER_STATE: PreprintStepperStateModel = {
+  selectedProviderId: null,
+  preprint: {
+    data: null,
+    isLoading: false,
+    error: null,
+    isSubmitting: false,
+  },
+  fileSource: PreprintFileSource.None,
+  preprintFilesLinks: {
+    data: null,
+    isLoading: false,
+    error: null,
+  },
+  preprintFile: {
+    data: null,
+    isLoading: false,
+    error: null,
+  },
+  availableProjects: {
+    data: [],
+    isLoading: false,
+    error: null,
+  },
+  projectFiles: {
+    data: [],
+    isLoading: false,
+    error: null,
+  },
+  licenses: {
+    data: [],
+    isLoading: false,
+    error: null,
+  },
+  preprintProject: {
+    data: null,
+    isLoading: false,
+    error: null,
+  },
+  hasBeenSubmitted: false,
+  currentFolder: {
+    data: null,
+    isLoading: false,
+    error: null,
+  },
+  institutionsChanged: false,
+};
diff --git a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts
index bd43281ba..21c685ccd 100644
--- a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts
+++ b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts
@@ -7,7 +7,6 @@ import { catchError } from 'rxjs/operators';
 import { HttpEventType } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
 
-import { PreprintFileSource } from '@osf/features/preprints/enums';
 import { PreprintModel } from '@osf/features/preprints/models';
 import {
   PreprintFilesService,
@@ -35,12 +34,11 @@ import {
   FetchPreprintPrimaryFile,
   FetchPreprintProject,
   FetchProjectFilesByLink,
-  PreprintStepperStateModel,
-  ResetState,
+  ResetPreprintStepperState,
   ReuploadFile,
   SaveLicense,
-  SetCurrentFolder,
   SetInstitutionsChanged,
+  SetPreprintStepperCurrentFolder,
   SetProjectRootFolder,
   SetSelectedPreprintFileSource,
   SetSelectedPreprintProviderId,
@@ -48,59 +46,12 @@ import {
   UpdatePreprint,
   UpdatePrimaryFileRelationship,
   UploadFile,
-} from './';
-
-const DefaultState: PreprintStepperStateModel = {
-  selectedProviderId: null,
-  preprint: {
-    data: null,
-    isLoading: false,
-    error: null,
-    isSubmitting: false,
-  },
-  fileSource: PreprintFileSource.None,
-  preprintFilesLinks: {
-    data: null,
-    isLoading: false,
-    error: null,
-  },
-  preprintFile: {
-    data: null,
-    isLoading: false,
-    error: null,
-  },
-  availableProjects: {
-    data: [],
-    isLoading: false,
-    error: null,
-  },
-  projectFiles: {
-    data: [],
-    isLoading: false,
-    error: null,
-  },
-  licenses: {
-    data: [],
-    isLoading: false,
-    error: null,
-  },
-  preprintProject: {
-    data: null,
-    isLoading: false,
-    error: null,
-  },
-  hasBeenSubmitted: false,
-  currentFolder: {
-    data: null,
-    isLoading: false,
-    error: null,
-  },
-  institutionsChanged: false,
-};
+} from './preprint-stepper.actions';
+import { DEFAULT_PREPRINT_STEPPER_STATE, PreprintStepperStateModel } from './preprint-stepper.model';
 
 @State<PreprintStepperStateModel>({
   name: 'preprintStepper',
-  defaults: { ...DefaultState },
+  defaults: DEFAULT_PREPRINT_STEPPER_STATE,
 })
 @Injectable()
 export class PreprintStepperState {
@@ -112,9 +63,7 @@ export class PreprintStepperState {
 
   @Action(SetSelectedPreprintProviderId)
   setSelectedPreprintProviderId(ctx: StateContext<PreprintStepperStateModel>, action: SetSelectedPreprintProviderId) {
-    ctx.patchState({
-      selectedProviderId: action.id,
-    });
+    ctx.patchState({ selectedProviderId: action.id });
   }
 
   @Action(CreatePreprint)
@@ -523,9 +472,9 @@ export class PreprintStepperState {
     );
   }
 
-  @Action(ResetState)
+  @Action(ResetPreprintStepperState)
   resetState(ctx: StateContext<PreprintStepperStateModel>) {
-    ctx.setState({ ...DefaultState });
+    ctx.setState({ ...DEFAULT_PREPRINT_STEPPER_STATE });
     return EMPTY;
   }
 
@@ -539,8 +488,8 @@ export class PreprintStepperState {
     return EMPTY;
   }
 
-  @Action(SetCurrentFolder)
-  setCurrentFolder(ctx: StateContext<PreprintStepperStateModel>, action: SetCurrentFolder) {
+  @Action(SetPreprintStepperCurrentFolder)
+  setCurrentFolder(ctx: StateContext<PreprintStepperStateModel>, action: SetPreprintStepperCurrentFolder) {
     ctx.setState(
       patch({
         currentFolder: patch({
diff --git a/src/app/features/preprints/store/preprint/preprint.actions.ts b/src/app/features/preprints/store/preprint/preprint.actions.ts
index a3f4a3b02..c8c7870b9 100644
--- a/src/app/features/preprints/store/preprint/preprint.actions.ts
+++ b/src/app/features/preprints/store/preprint/preprint.actions.ts
@@ -1,7 +1,7 @@
 import { StringOrNull } from '@osf/shared/helpers/types.helper';
 
-export class FetchPreprintById {
-  static readonly type = '[Preprint] Fetch Preprint By Id';
+export class FetchPreprintDetails {
+  static readonly type = '[Preprint] Fetch Preprint Details';
 
   constructor(public id: string) {}
 }
@@ -64,6 +64,6 @@ export class SubmitRequestsDecision {
   ) {}
 }
 
-export class ResetState {
+export class ResetPreprintState {
   static readonly type = '[Preprint] Reset State';
 }
diff --git a/src/app/features/preprints/store/preprint/preprint.state.ts b/src/app/features/preprints/store/preprint/preprint.state.ts
index 6f2a3684b..966b95b02 100644
--- a/src/app/features/preprints/store/preprint/preprint.state.ts
+++ b/src/app/features/preprints/store/preprint/preprint.state.ts
@@ -12,7 +12,7 @@ import { FilesService } from '@osf/shared/services/files.service';
 import { PreprintsService } from '../../services';
 
 import {
-  FetchPreprintById,
+  FetchPreprintDetails,
   FetchPreprintFile,
   FetchPreprintFileVersions,
   FetchPreprintMetrics,
@@ -20,7 +20,7 @@ import {
   FetchPreprintRequests,
   FetchPreprintReviewActions,
   FetchPreprintVersionIds,
-  ResetState,
+  ResetPreprintState,
   SubmitRequestsDecision,
   SubmitReviewsDecision,
   WithdrawPreprint,
@@ -36,8 +36,8 @@ export class PreprintState {
   private preprintsService = inject(PreprintsService);
   private fileService = inject(FilesService);
 
-  @Action(FetchPreprintById)
-  fetchPreprintById(ctx: StateContext<PreprintStateModel>, action: FetchPreprintById) {
+  @Action(FetchPreprintDetails)
+  fetchPreprintDetails(ctx: StateContext<PreprintStateModel>, action: FetchPreprintDetails) {
     ctx.setState(
       patch({
         preprint: patch({ isLoading: true, data: null }),
@@ -213,7 +213,7 @@ export class PreprintState {
     return this.preprintsService.submitRequestsDecision(action.requestId, action.trigger, action.comment);
   }
 
-  @Action(ResetState)
+  @Action(ResetPreprintState)
   resetState(ctx: StateContext<PreprintStateModel>) {
     ctx.setState(patch({ ...DefaultState }));
   }
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 be019d008..c86155858 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
@@ -26,8 +26,8 @@ import {
   GetConfiguredStorageAddons,
   GetFiles,
   GetRootFolders,
-  ResetState,
-  SetCurrentFolder,
+  ResetFilesState,
+  SetFilesCurrentFolder,
 } from '@osf/features/files/store';
 import { FilesTreeComponent } from '@osf/shared/components/files-tree/files-tree.component';
 import { SelectComponent } from '@osf/shared/components/select/select.component';
@@ -94,10 +94,10 @@ export class FilesWidgetComponent {
 
   private readonly actions = createDispatchMap({
     getFiles: GetFiles,
-    setCurrentFolder: SetCurrentFolder,
+    setCurrentFolder: SetFilesCurrentFolder,
     getRootFolders: GetRootFolders,
     getConfiguredStorageAddons: GetConfiguredStorageAddons,
-    resetState: ResetState,
+    resetState: ResetFilesState,
   });
 
   get isStorageLoading() {
diff --git a/src/app/features/registries/components/files-control/files-control.component.ts b/src/app/features/registries/components/files-control/files-control.component.ts
index 7536210c1..ba1b578d8 100644
--- a/src/app/features/registries/components/files-control/files-control.component.ts
+++ b/src/app/features/registries/components/files-control/files-control.component.ts
@@ -40,8 +40,8 @@ import {
   GetFiles,
   GetRootFolders,
   RegistriesSelectors,
-  SetCurrentFolder,
   SetFilesIsLoading,
+  SetRegistriesCurrentFolder,
 } from '../../store';
 
 @Component({
@@ -90,7 +90,7 @@ export class FilesControlComponent implements OnDestroy {
     createFolder: CreateFolder,
     getFiles: GetFiles,
     setFilesIsLoading: SetFilesIsLoading,
-    setCurrentFolder: SetCurrentFolder,
+    setCurrentFolder: SetRegistriesCurrentFolder,
     getRootFolders: GetRootFolders,
   });
 
diff --git a/src/app/features/registries/pages/index.ts b/src/app/features/registries/pages/index.ts
deleted file mode 100644
index a5e6a80e0..000000000
--- a/src/app/features/registries/pages/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './my-registrations/my-registrations.component';
-export * from './registries-landing/registries-landing.component';
diff --git a/src/app/features/registries/registries.routes.ts b/src/app/features/registries/registries.routes.ts
index 6ecd937bb..79a6a2291 100644
--- a/src/app/features/registries/registries.routes.ts
+++ b/src/app/features/registries/registries.routes.ts
@@ -11,9 +11,9 @@ import { ContributorsState } from '@osf/shared/stores/contributors';
 import { RegistrationProviderState } from '@osf/shared/stores/registration-provider';
 import { SubjectsState } from '@osf/shared/stores/subjects';
 
+import { RegistrationsLicenseService } from './services/registrations-licenses.service';
 import { LicensesHandlers, ProjectsHandlers, ProvidersHandlers } from './store/handlers';
 import { FilesHandlers } from './store/handlers/files.handlers';
-import { LicensesService } from './services';
 
 export const registriesRoutes: Routes = [
   {
@@ -25,7 +25,7 @@ export const registriesRoutes: Routes = [
       ProjectsHandlers,
       LicensesHandlers,
       FilesHandlers,
-      LicensesService,
+      RegistrationsLicenseService,
     ],
     children: [
       {
@@ -35,7 +35,10 @@ export const registriesRoutes: Routes = [
       },
       {
         path: 'discover',
-        loadComponent: () => import('@osf/features/registries/pages').then((c) => c.RegistriesLandingComponent),
+        loadComponent: () =>
+          import('@osf/features/registries/pages/registries-landing/registries-landing.component').then(
+            (c) => c.RegistriesLandingComponent
+          ),
       },
       {
         path: ':providerId',
diff --git a/src/app/features/registries/services/index.ts b/src/app/features/registries/services/index.ts
deleted file mode 100644
index 0dca62501..000000000
--- a/src/app/features/registries/services/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './licenses.service';
-export * from './registries.service';
-export * from '@osf/shared/services/registration-provider.service';
diff --git a/src/app/features/registries/services/licenses.service.ts b/src/app/features/registries/services/registrations-licenses.service.ts
similarity index 98%
rename from src/app/features/registries/services/licenses.service.ts
rename to src/app/features/registries/services/registrations-licenses.service.ts
index 944637ac0..6d0317db9 100644
--- a/src/app/features/registries/services/licenses.service.ts
+++ b/src/app/features/registries/services/registrations-licenses.service.ts
@@ -18,7 +18,7 @@ import { LicensesMapper } from '../mappers';
 @Injectable({
   providedIn: 'root',
 })
-export class LicensesService {
+export class RegistrationsLicenseService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly environment = inject(ENVIRONMENT);
 
diff --git a/src/app/features/registries/store/handlers/licenses.handlers.ts b/src/app/features/registries/store/handlers/licenses.handlers.ts
index b3cc42dc0..1ba7b8a68 100644
--- a/src/app/features/registries/store/handlers/licenses.handlers.ts
+++ b/src/app/features/registries/store/handlers/licenses.handlers.ts
@@ -6,13 +6,13 @@ import { inject, Injectable } from '@angular/core';
 
 import { handleSectionError } from '@osf/shared/helpers/state-error.handler';
 
-import { LicensesService } from '../../services';
+import { RegistrationsLicenseService } from '../../services/registrations-licenses.service';
 import { SaveLicense } from '../registries.actions';
 import { RegistriesStateModel } from '../registries.model';
 
 @Injectable()
 export class LicensesHandlers {
-  licensesService = inject(LicensesService);
+  registrationsLicenseService = inject(RegistrationsLicenseService);
 
   fetchLicenses(ctx: StateContext<RegistriesStateModel>, providerId: string) {
     ctx.patchState({
@@ -22,7 +22,7 @@ export class LicensesHandlers {
       },
     });
 
-    return this.licensesService.getLicenses(providerId).pipe(
+    return this.registrationsLicenseService.getLicenses(providerId).pipe(
       tap((licenses) => {
         ctx.patchState({
           licenses: {
@@ -45,7 +45,7 @@ export class LicensesHandlers {
       },
     });
 
-    return this.licensesService.updateLicense(registrationId, licenseId, licenseOptions).pipe(
+    return this.registrationsLicenseService.updateLicense(registrationId, licenseId, licenseOptions).pipe(
       tap((response) => {
         ctx.patchState({
           draftRegistration: {
diff --git a/src/app/features/registries/store/handlers/providers.handlers.ts b/src/app/features/registries/store/handlers/providers.handlers.ts
index 424d2286b..7c9c84153 100644
--- a/src/app/features/registries/store/handlers/providers.handlers.ts
+++ b/src/app/features/registries/store/handlers/providers.handlers.ts
@@ -2,7 +2,8 @@ import { StateContext } from '@ngxs/store';
 
 import { inject, Injectable } from '@angular/core';
 
-import { RegistrationProviderService } from '../../services';
+import { RegistrationProviderService } from '@osf/shared/services/registration-provider.service';
+
 import { REGISTRIES_STATE_DEFAULTS, RegistriesStateModel } from '../registries.model';
 
 @Injectable()
diff --git a/src/app/features/registries/store/registries.actions.ts b/src/app/features/registries/store/registries.actions.ts
index 3c410a411..e506d972d 100644
--- a/src/app/features/registries/store/registries.actions.ts
+++ b/src/app/features/registries/store/registries.actions.ts
@@ -157,8 +157,8 @@ export class CreateFolder {
   ) {}
 }
 
-export class SetCurrentFolder {
-  static readonly type = '[Registries] Set Current Folder';
+export class SetRegistriesCurrentFolder {
+  static readonly type = '[Registries] Set Registries Current Folder';
 
   constructor(public folder: FileFolderModel | null) {}
 }
diff --git a/src/app/features/registries/store/registries.state.ts b/src/app/features/registries/store/registries.state.ts
index c2a228be4..85d9f7198 100644
--- a/src/app/features/registries/store/registries.state.ts
+++ b/src/app/features/registries/store/registries.state.ts
@@ -10,7 +10,7 @@ import { getResourceTypeStringFromEnum } from '@osf/shared/helpers/get-resource-
 import { handleSectionError } from '@osf/shared/helpers/state-error.handler';
 import { GlobalSearchService } from '@osf/shared/services/global-search.service';
 
-import { RegistriesService } from '../services';
+import { RegistriesService } from '../services/registries.service';
 
 import { FilesHandlers } from './handlers/files.handlers';
 import { LicensesHandlers } from './handlers/licenses.handlers';
@@ -39,7 +39,7 @@ import {
   HandleSchemaResponse,
   RegisterDraft,
   SaveLicense,
-  SetCurrentFolder,
+  SetRegistriesCurrentFolder,
   SetUpdatedFields,
   UpdateDraft,
   UpdateSchemaResponse,
@@ -357,8 +357,8 @@ export class RegistriesState {
     return this.filesHandlers.createFolder(ctx, action);
   }
 
-  @Action(SetCurrentFolder)
-  setSelectedFolder(ctx: StateContext<RegistriesStateModel>, action: SetCurrentFolder) {
+  @Action(SetRegistriesCurrentFolder)
+  setSelectedFolder(ctx: StateContext<RegistriesStateModel>, action: SetRegistriesCurrentFolder) {
     ctx.patchState({ currentFolder: action.folder });
   }
 
diff --git a/src/app/features/registry/components/index.ts b/src/app/features/registry/components/index.ts
index e999974a2..b10f487e5 100644
--- a/src/app/features/registry/components/index.ts
+++ b/src/app/features/registry/components/index.ts
@@ -2,8 +2,8 @@ export * from './add-resource-dialog/add-resource-dialog.component';
 export * from './archiving-message/archiving-message.component';
 export * from './edit-resource-dialog/edit-resource-dialog.component';
 export * from './registration-links-card/registration-links-card.component';
+export * from './registration-withdraw-dialog/registration-withdraw-dialog.component';
 export * from './registry-blocks-section/registry-blocks-section.component';
 export * from './registry-revisions/registry-revisions.component';
 export * from './registry-statuses/registry-statuses.component';
 export * from './resource-form/resource-form.component';
-export * from './withdraw-dialog/withdraw-dialog.component';
diff --git a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.html b/src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.html
similarity index 100%
rename from src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.html
rename to src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.html
diff --git a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.scss b/src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.scss
similarity index 100%
rename from src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.scss
rename to src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.scss
diff --git a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.spec.ts b/src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.spec.ts
similarity index 80%
rename from src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.spec.ts
rename to src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.spec.ts
index 1d65c6ad3..5e05c64ca 100644
--- a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.spec.ts
+++ b/src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.spec.ts
@@ -6,15 +6,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TextInputComponent } from '@osf/shared/components/text-input/text-input.component';
 
-import { WithdrawDialogComponent } from './withdraw-dialog.component';
+import { RegistrationWithdrawDialogComponent } from './registration-withdraw-dialog.component';
 
 import { DynamicDialogRefMock } from '@testing/mocks/dynamic-dialog-ref.mock';
 import { OSFTestingModule } from '@testing/osf.testing.module';
 import { provideMockStore } from '@testing/providers/store-provider.mock';
 
-describe('WithdrawDialogComponent', () => {
-  let component: WithdrawDialogComponent;
-  let fixture: ComponentFixture<WithdrawDialogComponent>;
+describe('RegistrationWithdrawDialogComponent', () => {
+  let component: RegistrationWithdrawDialogComponent;
+  let fixture: ComponentFixture<RegistrationWithdrawDialogComponent>;
   let mockDialogConfig: jest.Mocked<DynamicDialogConfig>;
 
   beforeEach(async () => {
@@ -23,7 +23,7 @@ describe('WithdrawDialogComponent', () => {
     } as jest.Mocked<DynamicDialogConfig>;
 
     await TestBed.configureTestingModule({
-      imports: [WithdrawDialogComponent, OSFTestingModule, MockComponent(TextInputComponent)],
+      imports: [RegistrationWithdrawDialogComponent, OSFTestingModule, MockComponent(TextInputComponent)],
       providers: [
         DynamicDialogRefMock,
         MockProvider(DynamicDialogConfig, mockDialogConfig),
@@ -33,7 +33,7 @@ describe('WithdrawDialogComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(WithdrawDialogComponent);
+    fixture = TestBed.createComponent(RegistrationWithdrawDialogComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts b/src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.ts
similarity index 88%
rename from src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts
rename to src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.ts
index 2a24717e6..8ace79288 100644
--- a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts
+++ b/src/app/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component.ts
@@ -16,13 +16,13 @@ import { InputLimits } from '@osf/shared/constants/input-limits.const';
 import { CustomValidators } from '@osf/shared/helpers/custom-form-validators.helper';
 
 @Component({
-  selector: 'osf-withdraw-dialog',
+  selector: 'osf-registration-withdraw-dialog',
   imports: [TranslatePipe, TextInputComponent, Button],
-  templateUrl: './withdraw-dialog.component.html',
-  styleUrl: './withdraw-dialog.component.scss',
+  templateUrl: './registration-withdraw-dialog.component.html',
+  styleUrl: './registration-withdraw-dialog.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class WithdrawDialogComponent {
+export class RegistrationWithdrawDialogComponent {
   readonly dialogRef = inject(DynamicDialogRef);
   private readonly config = inject(DynamicDialogConfig);
   private readonly actions = createDispatchMap({ withdrawRegistration: WithdrawRegistration });
diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
index 9e53298fd..269bca972 100644
--- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
+++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
@@ -9,6 +9,7 @@ import { ChangeDetectionStrategy, Component, computed, HostBinding, inject, inpu
 import { RouterLink } from '@angular/router';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
+import { RegistrationWithdrawDialogComponent } from '@osf/features/registry/components/registration-withdraw-dialog/registration-withdraw-dialog.component';
 import { RegistrationReviewStates } from '@osf/shared/enums/registration-review-states.enum';
 import { RegistryStatus } from '@osf/shared/enums/registry-status.enum';
 import { RevisionReviewStates } from '@osf/shared/enums/revision-review-states.enum';
@@ -17,7 +18,6 @@ import { CustomDialogService } from '@osf/shared/services/custom-dialog.service'
 
 import { RegistrationOverviewModel } from '../../models';
 import { MakePublic } from '../../store/registry';
-import { WithdrawDialogComponent } from '../withdraw-dialog/withdraw-dialog.component';
 
 @Component({
   selector: 'osf-registry-statuses',
@@ -61,7 +61,7 @@ export class RegistryStatusesComponent {
     const registry = this.registry();
 
     if (registry) {
-      this.customDialogService.open(WithdrawDialogComponent, {
+      this.customDialogService.open(RegistrationWithdrawDialogComponent, {
         header: 'registry.overview.withdrawRegistration',
         width: '552px',
         data: {
diff --git a/src/app/shared/stores/licenses/licenses.state.ts b/src/app/shared/stores/licenses/licenses.state.ts
index 2a55889fd..a246f0841 100644
--- a/src/app/shared/stores/licenses/licenses.state.ts
+++ b/src/app/shared/stores/licenses/licenses.state.ts
@@ -1,10 +1,10 @@
 import { Action, State, StateContext } from '@ngxs/store';
 
-import { throwError } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
 
 import { inject, Injectable } from '@angular/core';
 
+import { handleSectionError } from '@osf/shared/helpers/state-error.handler';
 import { LicensesService } from '@osf/shared/services/licenses.service';
 
 import { LoadAllLicenses } from './licenses.actions';
@@ -38,17 +38,7 @@ export class LicensesState {
           },
         });
       }),
-      catchError((error) => {
-        const errorMessage = error?.error?.message || error?.message;
-        ctx.patchState({
-          licenses: {
-            data: ctx.getState().licenses.data,
-            isLoading: false,
-            error: errorMessage,
-          },
-        });
-        return throwError(() => error);
-      })
+      catchError((error) => handleSectionError(ctx, 'licenses', error))
     );
   }
 }