diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
index 20a0ef6e4279..9fb90151552b 100644
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
@@ -154,7 +154,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
 
     if (r.serviceAccountId) {
       return {
-        name: this.i18nService.t("serviceAccount") + " " + this.getShortId(r.serviceAccountId),
+        name: this.i18nService.t("machineAccount") + " " + this.getShortId(r.serviceAccountId),
       };
     }
 
diff --git a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html
index c10ef9af2866..4c8ea282849b 100644
--- a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html
+++ b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html
@@ -33,7 +33,7 @@
     </bit-hint>
   </bit-form-field>
   <bit-form-field class="tw-w-2/3">
-    <bit-label>{{ "additionalServiceAccounts" | i18n }}</bit-label>
+    <bit-label>{{ "additionalMachineAccounts" | i18n }}</bit-label>
     <input
       bitInput
       id="additionalServiceAccountCount"
@@ -44,8 +44,8 @@
     />
     <bit-hint>
       <div>
-        {{ "includedServiceAccounts" | i18n: options.baseServiceAccountCount }}
-        {{ "addAdditionalServiceAccounts" | i18n: (monthlyServiceAccountPrice | currency: "$") }}
+        {{ "includedMachineAccounts" | i18n: options.baseServiceAccountCount }}
+        {{ "addAdditionalMachineAccounts" | i18n: (monthlyServiceAccountPrice | currency: "$") }}
       </div>
       <div>
         <strong>{{ "total" | i18n }}:</strong>
@@ -56,7 +56,7 @@
     </bit-hint>
   </bit-form-field>
   <bit-form-control>
-    <bit-label>{{ "limitServiceAccounts" | i18n }}</bit-label>
+    <bit-label>{{ "limitMachineAccounts" | i18n }}</bit-label>
     <input
       type="checkbox"
       bitCheckbox
@@ -64,11 +64,11 @@
       formControlName="limitServiceAccounts"
     />
     <bit-hint>
-      {{ "limitServiceAccountsDesc" | i18n }}
+      {{ "limitMachineAccountsDesc" | i18n }}
     </bit-hint>
   </bit-form-control>
   <bit-form-field class="tw-w-2/3" *ngIf="formGroup.value.limitServiceAccounts">
-    <bit-label>{{ "serviceAccountLimit" | i18n }}</bit-label>
+    <bit-label>{{ "machineAccountLimit" | i18n }}</bit-label>
     <input
       bitInput
       id="additionalServiceAccountLimit"
@@ -79,9 +79,9 @@
     />
     <bit-hint>
       <div>
-        {{ "includedServiceAccounts" | i18n: options.baseServiceAccountCount }}
+        {{ "includedMachineAccounts" | i18n: options.baseServiceAccountCount }}
       </div>
-      <strong>{{ "maxServiceAccountCost" | i18n }}:</strong>
+      <strong>{{ "maxMachineAccountCost" | i18n }}:</strong>
       {{ maxAdditionalServiceAccounts }} &times;
       {{ options.additionalServiceAccountPrice | currency: "$" }} =
       {{ maxServiceAccountTotalCost | currency: "$" }} / {{ options.interval | i18n }}
diff --git a/apps/web/src/app/billing/shared/sm-subscribe.component.html b/apps/web/src/app/billing/shared/sm-subscribe.component.html
index c9243e29a6f6..6cdaeb9476de 100644
--- a/apps/web/src/app/billing/shared/sm-subscribe.component.html
+++ b/apps/web/src/app/billing/shared/sm-subscribe.component.html
@@ -20,10 +20,10 @@ <h4 bitTypography="h4">{{ "secretsManagerForPlan" | i18n: planName }}</h4>
         <ng-template #unlimitedProjects>
           <li>{{ "unlimitedProjects" | i18n }}</li>
         </ng-template>
-        <li>{{ "serviceAccountsIncluded" | i18n: serviceAccountsIncluded }}</li>
+        <li>{{ "machineAccountsIncluded" | i18n: serviceAccountsIncluded }}</li>
         <li *ngIf="product != productTypes.Free">
           {{
-            "additionalServiceAccountCost" | i18n: (monthlyCostPerServiceAccount | currency: "$")
+            "additionalMachineAccountCost" | i18n: (monthlyCostPerServiceAccount | currency: "$")
           }}
         </li>
       </ul>
@@ -54,12 +54,12 @@ <h4 bitTypography="h4">{{ "secretsManagerForPlan" | i18n: planName }}</h4>
       </div>
       <div *ngIf="selectedPlan.SecretsManager.hasAdditionalServiceAccountOption" class="tw-w-1/2">
         <bit-form-field>
-          <bit-label>{{ "additionalServiceAccounts" | i18n }}</bit-label>
+          <bit-label>{{ "additionalMachineAccounts" | i18n }}</bit-label>
           <input bitInput formControlName="additionalServiceAccounts" type="number" />
           <bit-hint>
-            {{ "includedServiceAccounts" | i18n: serviceAccountsIncluded }}
+            {{ "includedMachineAccounts" | i18n: serviceAccountsIncluded }}
             {{
-              "addAdditionalServiceAccounts" | i18n: (monthlyCostPerServiceAccount | currency: "$")
+              "addAdditionalMachineAccounts" | i18n: (monthlyCostPerServiceAccount | currency: "$")
             }}
           </bit-hint>
         </bit-form-field>
diff --git a/apps/web/src/app/shared/components/onboarding/onboarding.stories.ts b/apps/web/src/app/shared/components/onboarding/onboarding.stories.ts
index c1529dc81e87..4088b7335cdd 100644
--- a/apps/web/src/app/shared/components/onboarding/onboarding.stories.ts
+++ b/apps/web/src/app/shared/components/onboarding/onboarding.stories.ts
@@ -39,7 +39,7 @@ const Template: Story = (args) => ({
   template: `
     <app-onboarding title="Get started">
       <app-onboarding-task
-        [title]="'createServiceAccount' | i18n"
+        [title]="'createMachineAccount' | i18n"
         icon="bwi-cli"
         [completed]="createServiceAccount"
       >
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 05697461a9c2..1604057f70bd 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7730,5 +7730,168 @@
   "cancellationDate": {
     "message": "Cancellation date",
     "description": "The date header used when a subscription is cancelled."
+  },
+  "machineAccountsCannotCreate": {
+    "message": "Machine accounts cannot be created in suspended organizations. Please contact your organization owner for assistance."
+  },
+  "machineAccount": {
+    "message": "Machine account",
+    "description": "A machine user which can be used to automate processes and access secrets in the system."
+  },
+  "machineAccounts": {
+    "message": "Machine accounts",
+    "description": "The title for the section that deals with machine accounts."
+  },
+  "newMachineAccount": {
+    "message": "New machine account",
+    "description": "Title for creating a new machine account."
+  },
+  "machineAccountsNoItemsMessage": {
+    "message": "Create a new machine account to get started automating secret access.",
+    "description": "Message to encourage the user to start creating machine accounts."
+  },
+  "machineAccountsNoItemsTitle": {
+    "message": "Nothing to show yet",
+    "description": "Title to indicate that there are no machine accounts to display."
+  },
+  "deleteMachineAccounts": {
+    "message": "Delete machine accounts",
+    "description": "Title for the action to delete one or multiple machine accounts."
+  },
+  "deleteMachineAccount": {
+    "message": "Delete machine account",
+    "description": "Title for the action to delete a single machine account."
+  },
+  "viewMachineAccount": {
+    "message": "View machine account",
+    "description": "Action to view the details of a machine account."
+  },
+  "deleteMachineAccountDialogMessage": {
+    "message": "Deleting machine account $MACHINE_ACCOUNT$ is permanent and irreversible.",
+    "placeholders": {
+      "machine_account": {
+        "content": "$1",
+        "example": "Machine account name"
+      }
+    }
+  },
+  "deleteMachineAccountsDialogMessage": {
+    "message": "Deleting machine accounts is permanent and irreversible."
+  },
+  "deleteMachineAccountsConfirmMessage": {
+    "message": "Delete $COUNT$ machine accounts",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "deleteMachineAccountToast": {
+    "message": "Machine account deleted"
+  },
+  "deleteMachineAccountsToast": {
+    "message": "Machine accounts deleted"
+  },
+  "searchMachineAccounts": {
+    "message": "Search machine accounts",
+    "description": "Placeholder text for searching machine accounts."
+  },
+  "editMachineAccount": {
+    "message": "Edit machine account",
+    "description": "Title for editing a machine account."
+  },
+  "machineAccountName": {
+    "message": "Machine account name",
+    "description": "Label for the name of a machine account"
+  },
+  "machineAccountCreated": {
+    "message": "Machine account created",
+    "description": "Notifies that a new machine account has been created"
+  },
+  "machineAccountUpdated": {
+    "message": "Machine account updated",
+    "description": "Notifies that a machine account has been updated"
+  },
+  "projectMachineAccountsDescription": {
+    "message": "Grant machine accounts access to this project."
+  },
+  "projectMachineAccountsSelectHint": {
+    "message": "Type or select machine accounts"
+  },
+  "projectEmptyMachineAccountAccessPolicies": {
+    "message": "Add machine accounts to grant access"
+  },
+  "machineAccountPeopleDescription": {
+    "message": "Grant groups or people access to this machine account."
+  },
+  "machineAccountProjectsDescription": {
+    "message": "Assign projects to this machine account. "
+  },
+  "createMachineAccount": {
+    "message": "Create a machine account"
+  },
+  "maPeopleWarningMessage": {
+    "message": "Removing people from a machine account does not remove the access tokens they created. For security best practice, it is recommended to revoke access tokens created by people removed from a machine account."
+  },
+  "smAccessRemovalWarningMaTitle": {
+    "message": "Remove access to this machine account"
+  },
+  "smAccessRemovalWarningMaMessage": {
+    "message": "This action will remove your access to the machine account."
+  },
+  "machineAccountsIncluded": {
+    "message": "$COUNT$ machine accounts included",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "additionalMachineAccountCost": {
+    "message": "$COST$ per month for additional machine accounts",
+    "placeholders": {
+      "cost": {
+        "content": "$1",
+        "example": "$0.50"
+      }
+    }
+  },
+  "additionalMachineAccounts": {
+    "message": "Additional machine accounts"
+  },
+  "includedMachineAccounts": {
+    "message": "Your plan comes with $COUNT$ machine accounts.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "50"
+      }
+    }
+  },
+  "addAdditionalMachineAccounts": {
+    "message": "You can add additional machine accounts for $COST$ per month.",
+    "placeholders": {
+      "cost": {
+        "content": "$1",
+        "example": "$0.50"
+      }
+    }
+  },
+  "limitMachineAccounts": {
+    "message": "Limit machine accounts (optional)"
+  },
+  "limitMachineAccountsDesc": {
+    "message": "Set a limit for your machine accounts. Once this limit is reached, you will not be able to create new machine accounts."
+  },
+  "machineAccountLimit": {
+    "message": "Machine account limit (optional)"
+  },
+  "maxMachineAccountCost": {
+    "message": "Max potential machine account cost"
+  },
+  "machineAccountAccessUpdated": {
+    "message": "Machine account access updated"
   }
 }
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 5ac76a31fc7d..e71f520996ec 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
@@ -18,7 +18,7 @@
   ></bit-nav-item>
   <bit-nav-item
     icon="bwi-wrench"
-    [text]="'serviceAccounts' | i18n"
+    [text]="'machineAccounts' | i18n"
     route="service-accounts"
     [relativeTo]="route.parent"
   ></bit-nav-item>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
index 04d705af2371..255877e4e8d6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
@@ -5,7 +5,7 @@
 <div *ngIf="!loading && view$ | async as view; else spinner">
   <app-onboarding [title]="'getStarted' | i18n" *ngIf="showOnboarding" (dismiss)="hideOnboarding()">
     <app-onboarding-task
-      [title]="'createServiceAccount' | i18n"
+      [title]="'createMachineAccount' | i18n"
       (click)="openServiceAccountDialog()"
       icon="bwi-cli"
       [completed]="view.tasks.createServiceAccount"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.html
index 2755377d2a03..443711fd3663 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-service-accounts.component.html
@@ -1,14 +1,14 @@
 <div class="tw-w-2/5">
   <p class="tw-mt-8">
-    {{ "projectServiceAccountsDescription" | i18n }}
+    {{ "projectMachineAccountsDescription" | i18n }}
   </p>
   <sm-access-selector
     [rows]="rows$ | async"
     granteeType="serviceAccounts"
-    [label]="'serviceAccounts' | i18n"
-    [hint]="'projectServiceAccountsSelectHint' | i18n"
-    [columnTitle]="'serviceAccounts' | i18n"
-    [emptyMessage]="'projectEmptyServiceAccountAccessPolicies' | i18n"
+    [label]="'machineAccounts' | i18n"
+    [hint]="'projectMachineAccountsSelectHint' | i18n"
+    [columnTitle]="'machineAccounts' | i18n"
+    [emptyMessage]="'projectEmptyMachineAccountAccessPolicies' | i18n"
     (onCreateAccessPolicies)="handleCreateAccessPolicies($event)"
     (onDeleteAccessPolicy)="handleDeleteAccessPolicy($event)"
     (onUpdateAccessPolicy)="handleUpdateAccessPolicy($event)"
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 efcbe89f085b..b399eef8d2bd 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']">{{ "serviceAccounts" | i18n }}</bit-tab-link>
+      <bit-tab-link [route]="['service-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/service-accounts/dialog/service-account-delete-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.html
index 9af348370371..5ef2be8ade60 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.html
@@ -8,7 +8,7 @@
         </ng-container>
         <ng-container *ngIf="data.serviceAccounts.length > 1">
           {{ data.serviceAccounts.length }}
-          {{ "serviceAccounts" | i18n }}
+          {{ "machineAccounts" | i18n }}
         </ng-container>
       </span>
     </ng-container>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts
index 3d136aa92aae..b31ef03d12d4 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts
@@ -43,14 +43,14 @@ export class ServiceAccountDeleteDialogComponent {
 
   get title() {
     return this.data.serviceAccounts.length === 1
-      ? this.i18nService.t("deleteServiceAccount")
-      : this.i18nService.t("deleteServiceAccounts");
+      ? this.i18nService.t("deleteMachineAccount")
+      : this.i18nService.t("deleteMachineAccounts");
   }
 
   get dialogContent() {
     return this.data.serviceAccounts.length === 1
-      ? this.i18nService.t("deleteServiceAccountDialogMessage", this.data.serviceAccounts[0].name)
-      : this.i18nService.t("deleteServiceAccountsDialogMessage");
+      ? this.i18nService.t("deleteMachineAccountDialogMessage", this.data.serviceAccounts[0].name)
+      : this.i18nService.t("deleteMachineAccountsDialogMessage");
   }
 
   get dialogConfirmationLabel() {
@@ -79,17 +79,17 @@ export class ServiceAccountDeleteDialogComponent {
 
     const message =
       this.data.serviceAccounts.length === 1
-        ? "deleteServiceAccountToast"
-        : "deleteServiceAccountsToast";
+        ? "deleteMachineAccountToast"
+        : "deleteMachineAccountsToast";
     this.platformUtilsService.showToast("success", null, this.i18nService.t(message));
   }
 
   openBulkStatusDialog(bulkStatusResults: BulkOperationStatus[]) {
     this.dialogService.open<unknown, BulkStatusDetails>(BulkStatusDialogComponent, {
       data: {
-        title: "deleteServiceAccounts",
-        subTitle: "serviceAccounts",
-        columnTitle: "serviceAccountName",
+        title: "deleteMachineAccounts",
+        subTitle: "machineAccounts",
+        columnTitle: "machineAccountName",
         message: "bulkDeleteProjectsErrorMessage",
         details: bulkStatusResults,
       },
@@ -100,7 +100,7 @@ export class ServiceAccountDeleteDialogComponent {
     return this.data.serviceAccounts?.length === 1
       ? this.i18nService.t("deleteProjectConfirmMessage", this.data.serviceAccounts[0].name)
       : this.i18nService.t(
-          "deleteServiceAccountsConfirmMessage",
+          "deleteMachineAccountsConfirmMessage",
           this.data.serviceAccounts?.length.toString(),
         );
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
index 55f6ff4da144..006434153740 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html
@@ -7,7 +7,7 @@
       </div>
       <div *ngIf="!loading">
         <bit-form-field>
-          <bit-label>{{ "serviceAccountName" | i18n }}</bit-label>
+          <bit-label>{{ "machineAccountName" | i18n }}</bit-label>
           <input appAutofocus formControlName="name" bitInput />
         </bit-form-field>
       </div>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
index 9aa7c658f308..105ca59e57f2 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts
@@ -69,7 +69,7 @@ export class ServiceAccountDialogComponent {
       this.platformUtilsService.showToast(
         "error",
         null,
-        this.i18nService.t("serviceAccountsCannotCreate"),
+        this.i18nService.t("machineAccountsCannotCreate"),
       );
       return;
     }
@@ -85,14 +85,14 @@ export class ServiceAccountDialogComponent {
 
     if (this.data.operation == OperationType.Add) {
       await this.serviceAccountService.create(this.data.organizationId, serviceAccountView);
-      serviceAccountMessage = this.i18nService.t("serviceAccountCreated");
+      serviceAccountMessage = this.i18nService.t("machineAccountCreated");
     } else {
       await this.serviceAccountService.update(
         this.data.serviceAccountId,
         this.data.organizationId,
         serviceAccountView,
       );
-      serviceAccountMessage = this.i18nService.t("serviceAccountUpdated");
+      serviceAccountMessage = this.i18nService.t("machineAccountUpdated");
     }
 
     this.platformUtilsService.showToast("success", null, serviceAccountMessage);
@@ -107,6 +107,6 @@ export class ServiceAccountDialogComponent {
   }
 
   get title() {
-    return this.data.operation === OperationType.Add ? "newServiceAccount" : "editServiceAccount";
+    return this.data.operation === OperationType.Add ? "newMachineAccount" : "editMachineAccount";
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
index 1ef71811a16e..554e7fa37d7a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
@@ -65,7 +65,7 @@ export class ServiceAccountEventsComponent extends BaseEventsComponent implement
 
   protected getUserName() {
     return {
-      name: this.i18nService.t("serviceAccount") + " " + this.serviceAccountId,
+      name: this.i18nService.t("machineAccount") + " " + this.serviceAccountId,
       email: "",
     };
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html
index 79c8132bbc35..074fa8ca0046 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <div class="tw-w-2/5">
     <p class="tw-mt-8" *ngIf="!loading">
-      {{ "serviceAccountPeopleDescription" | i18n }}
+      {{ "machineAccountPeopleDescription" | i18n }}
     </p>
     <sm-access-policy-selector
       [loading]="loading"
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 ab6a627fd92b..76b5e8928d13 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
@@ -131,7 +131,7 @@ export class ServiceAccountPeopleComponent implements OnInit, OnDestroy {
       this.platformUtilsService.showToast(
         "success",
         null,
-        this.i18nService.t("serviceAccountAccessUpdated"),
+        this.i18nService.t("machineAccountAccessUpdated"),
       );
     } catch (e) {
       this.validationService.showError(e);
@@ -210,8 +210,8 @@ export class ServiceAccountPeopleComponent implements OnInit, OnDestroy {
 
   private async showWarning(): Promise<boolean> {
     const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "smAccessRemovalWarningSaTitle" },
-      content: { key: "smAccessRemovalWarningSaMessage" },
+      title: { key: "smAccessRemovalWarningMaTitle" },
+      content: { key: "smAccessRemovalWarningMaMessage" },
       acceptButtonText: { key: "removeAccess" },
       cancelButtonText: { key: "cancel" },
       type: "warning",
@@ -222,7 +222,7 @@ export class ServiceAccountPeopleComponent implements OnInit, OnDestroy {
   private async showAccessTokenStillAvailableWarning(): Promise<void> {
     await this.dialogService.openSimpleDialog({
       title: { key: "saPeopleWarningTitle" },
-      content: { key: "saPeopleWarningMessage" },
+      content: { key: "maPeopleWarningMessage" },
       type: "warning",
       acceptButtonText: { key: "close" },
       cancelButtonText: null,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.html
index 368a62a93316..772579426ac5 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.html
@@ -1,6 +1,6 @@
 <div class="tw-mt-4 tw-w-2/5">
   <p class="tw-mt-6">
-    {{ "serviceAccountProjectsDescription" | i18n }}
+    {{ "machineAccountProjectsDescription" | i18n }}
   </p>
   <sm-access-selector
     [rows]="rows$ | async"
@@ -8,7 +8,7 @@
     [label]="'projects' | i18n"
     [hint]="'newSaSelectAccess' | i18n"
     [columnTitle]="'projects' | i18n"
-    [emptyMessage]="'serviceAccountEmptyProjectAccesspolicies' | i18n"
+    [emptyMessage]="'serviceAccountEmptyProjectAccessPolicies' | i18n"
     (onCreateAccessPolicies)="handleCreateAccessPolicies($event)"
     (onDeleteAccessPolicy)="handleDeleteAccessPolicy($event)"
     (onUpdateAccessPolicy)="handleUpdateAccessPolicy($event)"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
index 2cda63c02f02..00b5201a657b 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
@@ -5,7 +5,7 @@
 >
   <bit-breadcrumbs slot="breadcrumbs">
     <bit-breadcrumb [route]="['..']" icon="bwi-angle-left">{{
-      "serviceAccounts" | i18n
+      "machineAccounts" | i18n
     }}</bit-breadcrumb>
   </bit-breadcrumbs>
   <sm-new-menu></sm-new-menu>
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 d352e8a246ba..083ec7aebb00 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
@@ -49,7 +49,7 @@ export class ServiceAccountComponent implements OnInit, OnDestroy {
         this.platformUtilsService.showToast(
           "error",
           null,
-          this.i18nService.t("notFound", this.i18nService.t("serviceAccount")),
+          this.i18nService.t("notFound", this.i18nService.t("machineAccount")),
         );
       });
       return EMPTY;
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
index fb8d953e107b..bfb7b9854235 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
@@ -3,8 +3,8 @@
 </div>
 
 <bit-no-items *ngIf="serviceAccounts?.length == 0">
-  <ng-container slot="title">{{ "serviceAccountsNoItemsTitle" | i18n }}</ng-container>
-  <ng-container slot="description">{{ "serviceAccountsNoItemsMessage" | i18n }}</ng-container>
+  <ng-container slot="title">{{ "machineAccountsNoItemsTitle" | i18n }}</ng-container>
+  <ng-container slot="description">{{ "machineAccountsNoItemsMessage" | i18n }}</ng-container>
   <button
     slot="button"
     type="button"
@@ -13,7 +13,7 @@
     (click)="newServiceAccountEvent.emit()"
   >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
-    {{ "newServiceAccount" | i18n }}
+    {{ "newMachineAccount" | i18n }}
   </button>
 </bit-no-items>
 
@@ -80,16 +80,16 @@
       <bit-menu #serviceAccountMenu>
         <a type="button" bitMenuItem [routerLink]="serviceAccount.id">
           <i class="bwi bwi-fw bwi-eye" aria-hidden="true"></i>
-          {{ "viewServiceAccount" | i18n }}
+          {{ "viewMachineAccount" | i18n }}
         </a>
         <button type="button" bitMenuItem (click)="editServiceAccountEvent.emit(serviceAccount.id)">
           <i class="bwi bwi-fw bwi-pencil" aria-hidden="true"></i>
-          {{ "editServiceAccount" | i18n }}
+          {{ "editMachineAccount" | i18n }}
         </button>
         <button type="button" bitMenuItem (click)="delete(serviceAccount)">
           <i class="bwi bwi-fw bwi-trash tw-text-danger" aria-hidden="true"></i>
           <span class="tw-text-danger">
-            {{ "deleteServiceAccount" | i18n }}
+            {{ "deleteMachineAccount" | i18n }}
           </span>
         </button>
       </bit-menu>
@@ -101,7 +101,7 @@
   <button type="button" bitMenuItem (click)="bulkDeleteServiceAccounts()">
     <i class="bwi bwi-fw bwi-trash tw-text-danger" aria-hidden="true"></i>
     <span class="tw-text-danger">
-      {{ "deleteServiceAccounts" | i18n }}
+      {{ "deleteMachineAccounts" | i18n }}
     </span>
   </button>
 </bit-menu>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.html
index 92ebcdbaac9c..d7a4f2c747dc 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.html
@@ -1,6 +1,6 @@
 <app-header>
   <bit-search
-    [placeholder]="'searchServiceAccounts' | i18n"
+    [placeholder]="'searchMachineAccounts' | i18n"
     [(ngModel)]="search"
     class="tw-w-80"
   ></bit-search>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
index 528514e678a4..457eff37fac5 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
@@ -19,6 +19,6 @@
   </button>
   <button type="button" bitMenuItem (click)="openServiceAccountDialog()">
     <i class="bwi bwi-fw bwi-wrench" aria-hidden="true"></i>
-    {{ "serviceAccount" | i18n }}
+    {{ "machineAccount" | i18n }}
   </button>
 </bit-menu>
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 0cad3129a406..f9ddcdad78d2 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
@@ -58,7 +58,7 @@ const routes: Routes = [
                 path: "service-accounts",
                 loadChildren: () => ServiceAccountsModule,
                 data: {
-                  titleId: "serviceAccounts",
+                  titleId: "machineAccounts",
                 },
               },
               {