diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.html
index e71f520996..c6c7bc6efb 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.html
@@ -19,7 +19,7 @@
   <bit-nav-item
     icon="bwi-wrench"
     [text]="'machineAccounts' | i18n"
-    route="service-accounts"
+    route="machine-accounts"
     [relativeTo]="route.parent"
   ></bit-nav-item>
   <bit-nav-item
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.html
index b399eef8d2..d95f4392eb 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.html
@@ -6,7 +6,7 @@
     <bit-tab-link [route]="['secrets']">{{ "secrets" | i18n }}</bit-tab-link>
     <ng-container *ngIf="project.write">
       <bit-tab-link [route]="['people']">{{ "people" | i18n }}</bit-tab-link>
-      <bit-tab-link [route]="['service-accounts']">{{ "machineAccounts" | i18n }}</bit-tab-link>
+      <bit-tab-link [route]="['machine-accounts']">{{ "machineAccounts" | i18n }}</bit-tab-link>
     </ng-container>
   </bit-tab-nav-bar>
   <sm-new-menu></sm-new-menu>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-routing.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-routing.module.ts
index a5248c509f..6078520989 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-routing.module.ts
@@ -30,7 +30,7 @@ const routes: Routes = [
         component: ProjectPeopleComponent,
       },
       {
-        path: "service-accounts",
+        path: "machine-accounts",
         component: ProjectServiceAccountsComponent,
       },
     ],
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts
index 6258f6f9db..c474ec44d5 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts
@@ -21,8 +21,8 @@ export const serviceAccountAccessGuard: CanActivateFn = async (route: ActivatedR
     return createUrlTreeFromSnapshot(route, [
       "/sm",
       route.params.organizationId,
-      "service-accounts",
+      "machine-accounts",
     ]);
   }
-  return createUrlTreeFromSnapshot(route, ["/sm", route.params.organizationId, "service-accounts"]);
+  return createUrlTreeFromSnapshot(route, ["/sm", route.params.organizationId, "machine-accounts"]);
 };
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts
index 76b5e8928d..aeb124aa6a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts
@@ -43,7 +43,7 @@ export class ServiceAccountPeopleComponent implements OnInit, OnDestroy {
     catchError(() => {
       // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.router.navigate(["/sm", this.organizationId, "service-accounts"]);
+      this.router.navigate(["/sm", this.organizationId, "machine-accounts"]);
       return EMPTY;
     }),
   );
@@ -200,7 +200,7 @@ export class ServiceAccountPeopleComponent implements OnInit, OnDestroy {
     if (showAccessRemovalWarning) {
       // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.router.navigate(["sm", this.organizationId, "service-accounts"]);
+      this.router.navigate(["sm", this.organizationId, "machine-accounts"]);
     } else if (
       this.accessPolicySelectorService.isAccessRemoval(currentAccessPolicies, selectedPolicies)
     ) {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts
index 083ec7aebb..bb687c51c6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts
@@ -45,7 +45,7 @@ export class ServiceAccountComponent implements OnInit, OnDestroy {
     catchError(() => {
       // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.router.navigate(["/sm", this.organizationId, "service-accounts"]).then(() => {
+      this.router.navigate(["/sm", this.organizationId, "machine-accounts"]).then(() => {
         this.platformUtilsService.showToast(
           "error",
           null,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
index 55dc2f8b71..10aa08612f 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
@@ -54,7 +54,7 @@ const routes: Routes = [
                 },
               },
               {
-                path: "service-accounts",
+                path: "machine-accounts",
                 loadChildren: () => ServiceAccountsModule,
                 data: {
                   titleId: "machineAccounts",