improvement: update frontend identity text refrences to explicit state machine identity

2026-09-22 13:39:35 +00:00 · 2025-11-21 15:28:53 -08:00
parent 40ae5c8b3f
commit 27a848a296
22 changed files with 169 additions and 160 deletions
--- a/frontend/src/pages/admin/ResourceOverviewPage/ResourceOverviewPage.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/ResourceOverviewPage.tsx
@@ -29,7 +29,7 @@ export const ResourceOverviewPage = () => {
                Users
              </Tab>
              <Tab variant="instance" value="tab-identities">
-                Identities
+                Machine Identities
              </Tab>
            </TabList>
            <TabPanel value="tab-organizations">
--- a/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import {
  faEllipsisV,
  faMagnifyingGlass,
@@ -8,6 +7,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { ServerCogIcon } from "lucide-react";
+import { useState } from "react";

 import { createNotification } from "@app/components/notifications";
 import {
@@ -90,7 +90,7 @@ const IdentityPanelTable = ({
          value={searchIdentityFilter}
          onChange={(e) => setSearchIdentityFilter(e.target.value)}
          leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-          placeholder="Search identities by name..."
+          placeholder="Search machine identities by name..."
          className="flex-1"
        />
      </div>
--- a/frontend/src/pages/organization/AccessManagementPage/AccessManagementPage.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/AccessManagementPage.tsx
@@ -1,9 +1,9 @@
-import { useState } from "react";
-import { Helmet } from "react-helmet";
-import { useTranslation } from "react-i18next";
 import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate, useSearch } from "@tanstack/react-router";
+import { useState } from "react";
+import { Helmet } from "react-helmet";
+import { useTranslation } from "react-i18next";

 import { OrgPermissionGuardBanner } from "@app/components/permissions/OrgPermissionCan";
 import { Button, PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
@@ -18,8 +18,8 @@ import {
 } from "@app/context";
 import { OrgAccessControlTabSections } from "@app/types/org";

-import { UpgradePrivilegeSystemModal } from "./components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal";
 import { OrgGroupsTab, OrgIdentityTab, OrgMembersTab, OrgRoleTabSection } from "./components";
+import { UpgradePrivilegeSystemModal } from "./components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal";

 export const AccessManagementPage = () => {
  const { t } = useTranslation();
@@ -58,7 +58,7 @@ export const AccessManagementPage = () => {
    },
    {
      key: OrgAccessControlTabSections.Identities,
-      label: "Identities",
+      label: "Machine Identities",
      isHidden: permission.cannot(
        OrgPermissionIdentityActions.Read,
        OrgPermissionSubjects.Identity
@@ -84,7 +84,7 @@ export const AccessManagementPage = () => {
        <PageHeader
          scope={isSubOrganization ? "namespace" : "org"}
          title="Access Control"
-          description="Manage fine-grained access for users, groups, roles, and identities within your organization resources."
+          description="Manage fine-grained access for users, groups, roles, and machine identities within your organization resources."
        />
        {!currentOrg.shouldUseNewPrivilegeSystem && (
          <div className="mt-4 mb-4 flex flex-col rounded-r border-l-2 border-l-primary bg-mineshaft-300/5 px-4 py-2.5">
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
@@ -1,8 +1,8 @@
-import { useState } from "react";
 import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { AnimatePresence, motion } from "framer-motion";
 import { LinkIcon, PlusIcon } from "lucide-react";
+import { useState } from "react";

 import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
@@ -73,7 +73,7 @@ export const IdentitySection = withPermission(
      });

      createNotification({
-        text: "Successfully deleted identity",
+        text: "Successfully deleted machine identity",
        type: "success"
      });

@@ -99,7 +99,7 @@ export const IdentitySection = withPermission(
        <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
          <div className="mb-4 flex flex-wrap items-center justify-between gap-2">
            <div className="flex flex-1 items-center gap-x-2">
-              <p className="text-xl font-medium text-mineshaft-100">Identities</p>
+              <p className="text-xl font-medium text-mineshaft-100">Machine Identities</p>
              <DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/identities/machine-identities" />
            </div>
            <div className="flex items-center">
@@ -116,7 +116,7 @@ export const IdentitySection = withPermission(
                      if (!isMoreIdentitiesAllowed && !isEnterprise) {
                        handlePopUpOpen("upgradePlan", {
                          description:
-                            "You can add more identities if you upgrade your Infisical Pro plan."
+                            "You can add more machine identities if you upgrade your Infisical Pro plan."
                        });
                        return;
                      }
@@ -129,7 +129,7 @@ export const IdentitySection = withPermission(
                    }}
                    isDisabled={!isAllowed}
                  >
-                    Create Identity
+                    Add Machine Identity
                  </Button>
                )}
              </OrgPermissionCan>
@@ -141,7 +141,9 @@ export const IdentitySection = withPermission(
        <div className="mt-4 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
          <div className="mb-4 flex flex-wrap items-center justify-between gap-2">
            <div className="flex items-center gap-x-2">
-              <p className="text-xl font-medium text-mineshaft-100">Identity Auth Templates</p>
+              <p className="text-xl font-medium text-mineshaft-100">
+                Machine Identity Auth Templates
+              </p>
              <DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/identities/auth-templates" />
            </div>
            <OrgPermissionCan
@@ -150,14 +152,14 @@ export const IdentitySection = withPermission(
            >
              {(isAllowed) => (
                <Button
-                  colorSchema="secondary"
+                  variant="outline_bg"
                  type="submit"
                  leftIcon={<FontAwesomeIcon icon={faPlus} />}
                  onClick={() => {
                    if (subscription && !subscription.machineIdentityAuthTemplates) {
                      handlePopUpOpen("upgradePlan", {
                        isEnterpriseFeature: true,
-                        text: "Your current plan does not include access to creating Identity Auth Templates. To unlock this feature, please upgrade to Infisical Enterprise plan."
+                        text: "Your current plan does not include access to creating Machine Identity Auth Templates. To unlock this feature, please upgrade to Infisical Enterprise plan."
                      });
                      return;
                    }
@@ -197,9 +199,11 @@ export const IdentitySection = withPermission(
        >
          <ModalContent
            bodyClassName="overflow-visible"
-            title="Add Identity"
+            title="Add Machine Identity"
            subTitle={
-              isSubOrganization ? "Create a new identity or assign an existing identity" : undefined
+              isSubOrganization
+                ? "Create a new machine identity or assign an existing one"
+                : undefined
            }
          >
            <AnimatePresence mode="wait">
@@ -224,11 +228,11 @@ export const IdentitySection = withPermission(
                  >
                    <div className="flex items-center gap-2">
                      <PlusIcon size="1rem" />
-                      <div>Create New Identity</div>
+                      <div>Create Machine Identity</div>
                    </div>
                    <div className="mt-2 text-xs text-mineshaft-300">
                      Create a new machine identity specifically for this sub-organization. This
-                      identity will be managed at the sub-organization level.
+                      machine identity will be managed at the sub-organization level.
                    </div>
                  </div>
                  <div
@@ -244,11 +248,11 @@ export const IdentitySection = withPermission(
                  >
                    <div className="flex items-center gap-2">
                      <LinkIcon size="1rem" />
-                      <div>Assign Existing Identity</div>
+                      <div>Assign Existing Machine Identity</div>
                    </div>
                    <div className="mt-2 text-xs text-mineshaft-300">
-                      Assign an existing identity from your parent organization. The identity will
-                      continue to be managed at its original scope.
+                      Assign an existing machine identity from your parent organization. The machine
+                      identity will continue to be managed at its original scope.
                    </div>
                  </div>
                </motion.div>
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
@@ -1,4 +1,3 @@
-import { useCallback, useState } from "react";
 import {
  faArrowDown,
  faArrowUp,
@@ -14,6 +13,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
+import { useCallback, useState } from "react";
 import { twMerge } from "tailwind-merge";

 import { createNotification } from "@app/components/notifications";
@@ -152,7 +152,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
    });

    createNotification({
-      text: "Successfully updated identity role",
+      text: "Successfully updated machine identity role",
      type: "success"
    });
  };
@@ -178,7 +178,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
        <DropdownMenu>
          <DropdownMenuTrigger asChild>
            <IconButton
-              ariaLabel="Filter Identities"
+              ariaLabel="Filter Machine Identities"
              variant="plain"
              size="sm"
              className={twMerge(
@@ -200,7 +200,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
              </DropdownSubMenuTrigger>
              <DropdownSubMenuContent className="max-h-80 thin-scrollbar overflow-y-auto rounded-l-none">
                <DropdownMenuLabel className="sticky top-0 bg-mineshaft-900">
-                  Apply Roles to Filter Identities
+                  Filter Machine Identities by Role
                </DropdownMenuLabel>
                {roles?.map(({ id, slug, name }) => (
                  <DropdownMenuItem
@@ -229,7 +229,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
          value={search}
          onChange={(e) => setSearch(e.target.value)}
          leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-          placeholder="Search identities by name..."
+          placeholder="Search machine identities by name..."
        />
      </div>
      <TableContainer>
@@ -407,7 +407,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                                  }}
                                  isDisabled={!isAllowed}
                                >
-                                  Edit Identity {isSubOrgIdentity ? "" : "Membership"}
+                                  Edit Machine Identity {isSubOrgIdentity ? "" : "Membership"}
                                </DropdownMenuItem>
                              )}
                            </OrgPermissionCan>
@@ -428,7 +428,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                                  icon={<FontAwesomeIcon icon={faTrash} />}
                                >
                                  {isSubOrgIdentity
-                                    ? "Delete Identity"
+                                    ? "Delete Machine Identity"
                                    : "Remove From Sub-Organization"}
                                </DropdownMenuItem>
                              )}
@@ -455,8 +455,8 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
          <EmptyState
            title={
              debouncedSearch.trim().length > 0 || filter.roles?.length > 0
-                ? "No identities match search filter"
-                : "No identities have been created in this organization"
+                ? "No machine identities match search filter"
+                : "No machine identities have been created in this organization"
            }
            icon={faServer}
          />
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityLinkForm.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityLinkForm.tsx
@@ -1,7 +1,7 @@
-import { Controller, useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useQuery } from "@tanstack/react-query";
 import { useNavigate } from "@tanstack/react-router";
+import { Controller, useForm } from "react-hook-form";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -78,11 +78,11 @@ export const OrgIdentityLinkForm = ({ onClose }: Props) => {
        control={control}
        name="identity"
        render={({ field: { onChange, value }, fieldState: { error } }) => (
-          <FormControl label="Identity" errorText={error?.message} isError={Boolean(error)}>
+          <FormControl label="Machine Identity" errorText={error?.message} isError={Boolean(error)}>
            <FilterableSelect
              value={value}
              onChange={onChange}
-              placeholder="Select identity..."
+              placeholder="select machine identity..."
              // onInputChange={setSearchValue}
              options={rootOrgIdentities}
              getOptionValue={(option) => option.id}
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityModal.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityModal.tsx
@@ -1,9 +1,9 @@
-import { useEffect } from "react";
-import { Controller, useFieldArray, useForm } from "react-hook-form";
 import { faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useNavigate } from "@tanstack/react-router";
+import { useEffect } from "react";
+import { Controller, useFieldArray, useForm } from "react-hook-form";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -164,7 +164,7 @@ export const OrgIdentityModal = ({ popUp, handlePopUpToggle }: Props) => {
    }

    createNotification({
-      text: `Successfully ${popUp?.identity?.data ? "updated" : "created"} identity`,
+      text: `Successfully ${popUp?.identity?.data ? "updated" : "created"} machine identity`,
      type: "success"
    });

--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
@@ -1,8 +1,8 @@
-import { Helmet } from "react-helmet";
-import { useTranslation } from "react-i18next";
 import { faChevronLeft } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Link, useNavigate, useParams } from "@tanstack/react-router";
+import { Helmet } from "react-helmet";
+import { useTranslation } from "react-i18next";

 import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
@@ -55,7 +55,7 @@ const Page = () => {
    });

    createNotification({
-      text: "Successfully deleted identity",
+      text: "Successfully deleted machine identity",
      type: "success"
    });

@@ -82,11 +82,11 @@ const Page = () => {
            className="mb-4 flex items-center gap-x-2 text-sm text-mineshaft-400"
          >
            <FontAwesomeIcon icon={faChevronLeft} />
-            Identities
+            Machine Identities
          </Link>
          <PageHeader
            scope={isSubOrganization ? "namespace" : "org"}
-            description={`${isSubOrganization ? "Sub-" : ""}Organization Identity`}
+            description={`${isSubOrganization ? "Sub-" : ""}Organization Machine Identity`}
            title={data.identity.name}
          >
            <div className="flex items-center gap-2">
@@ -111,7 +111,7 @@ const Page = () => {
                        })
                      }
                    >
-                      Unlink Identity
+                      Unlink Machine Identity
                    </Button>
                  )}
                </OrgPermissionCan>
@@ -142,7 +142,7 @@ const Page = () => {
      >
        <ModalContent
          bodyClassName="overflow-visible"
-          title={`${popUp?.identity?.data ? "Update" : "Create"} Identity`}
+          title={`${popUp?.identity?.data ? "Update" : "Create"} Machine Identity`}
        >
          <OrgIdentityModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
        </ModalContent>
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityDetailsSection.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityDetailsSection.tsx
@@ -45,7 +45,7 @@ export const IdentityDetailsSection = ({ identityId, handlePopUpOpen, isOrgIdent
  return data ? (
    <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
      <div className="flex items-center justify-between border-b border-mineshaft-400 pb-4">
-        <h3 className="text-lg font-medium text-mineshaft-100">Identity Details</h3>
+        <h3 className="text-lg font-medium text-mineshaft-100">Details</h3>
        <DropdownMenu>
          <DropdownMenuTrigger asChild>
            <Button
@@ -86,7 +86,7 @@ export const IdentityDetailsSection = ({ identityId, handlePopUpOpen, isOrgIdent
                  }}
                  disabled={!isAllowed}
                >
-                  {isOrgIdentity ? "Edit Identity" : "Edit Identity Role"}
+                  {isOrgIdentity ? "Edit Machine Identity" : "Edit Machine Identity Role"}
                </DropdownMenuItem>
              )}
            </OrgPermissionCan>
@@ -110,7 +110,7 @@ export const IdentityDetailsSection = ({ identityId, handlePopUpOpen, isOrgIdent
                  icon={<FontAwesomeIcon icon={faTrash} />}
                  disabled={!isAllowed}
                >
-                  {!isOrgIdentity ? "Remove From Sub-Organization" : "Delete Identity"}
+                  {!isOrgIdentity ? "Remove From Sub-Organization" : "Delete Machine Identity"}
                </DropdownMenuItem>
              )}
            </OrgPermissionCan>
@@ -119,7 +119,7 @@ export const IdentityDetailsSection = ({ identityId, handlePopUpOpen, isOrgIdent
      </div>
      <div className="pt-4">
        <div className="mb-4">
-          <p className="text-sm font-medium text-mineshaft-300">Identity ID</p>
+          <p className="text-sm font-medium text-mineshaft-300">Machine Identity ID</p>
          <div className="group flex align-top">
            <p className="text-sm text-mineshaft-300">{data.identity.id}</p>
            <div className="opacity-0 transition-opacity duration-300 group-hover:opacity-100">
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsTable.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsTable.tsx
@@ -1,4 +1,3 @@
-import { useMemo } from "react";
 import {
  faArrowDown,
  faArrowUp,
@@ -7,6 +6,7 @@ import {
  faSearch
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useMemo } from "react";

 import {
  EmptyState,
@@ -151,7 +151,7 @@ export const IdentityProjectsTable = ({ identityId, handlePopUpOpen }: Props) =>
            title={
              projectMemberships.length
                ? "No projects match search..."
-                : "This identity has not been assigned to any projects"
+                : "This machine identity has not been assigned to any projects"
            }
            icon={projectMemberships.length ? faSearch : faFolder}
          />
--- a/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliDeploymentMethod.tsx
@@ -1,8 +1,8 @@
-import { useMemo, useState } from "react";
-import { SingleValue } from "react-select";
 import { faCopy, faQuestionCircle, faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
+import { useMemo, useState } from "react";
+import { SingleValue } from "react-select";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -275,8 +275,8 @@ export const GatewayCliDeploymentMethod = () => {
      {canCreateToken && autogenerateToken ? (
        <>
          <FormLabel
-            label="Identity"
-            tooltipText="The identity that your gateway will use for authentication."
+            label="Machine Identity"
+            tooltipText="The machine identity that your gateway will use for authentication."
            className="mt-4"
          />
          <FilterableSelect
@@ -290,7 +290,7 @@ export const GatewayCliDeploymentMethod = () => {
              )
            }
            isLoading={isIdentitiesLoading}
-            placeholder="Select identity..."
+            placeholder="select machine identity..."
            options={identityMembershipOrgs.map((membership) => membership.identity)}
            getOptionValue={(option) => option.id}
            getOptionLabel={(option) => option.name}
@@ -300,8 +300,8 @@ export const GatewayCliDeploymentMethod = () => {
      ) : (
        <>
          <FormLabel
-            label="Identity Token"
-            tooltipText="The identity token that your gateway will use for authentication."
+            label="Machine Identity Token"
+            tooltipText="The machine identity token that your gateway will use for authentication."
            className="mt-4"
          />
          <Input
@@ -325,15 +325,15 @@ export const GatewayCliDeploymentMethod = () => {
            className="mr-2"
          >
            <div className="flex items-center">
-              <span>Automatically enable token auth and generate a token for identity</span>
+              <span>Automatically enable token auth and generate a token for machine identity</span>
              <Tooltip
                className="max-w-md"
                content={
                  <>
-                    Token authentication will be automatically enabled for the selected identity if
-                    it isn&apos;t already configured. By default, it will be configured to allow all
-                    IP addresses with a token TTL of 30 days. You can manage these settings in
-                    Access Control.
+                    Token authentication will be automatically enabled for the selected machine
+                    identity if it isn&apos;t already configured. By default, it will be configured
+                    to allow all IP addresses with a token TTL of 30 days. You can manage these
+                    settings in Access Control.
                    <br />
                    <br />A token will automatically be generated to be used with the CLI command.
                  </>
--- a/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliSystemdDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliSystemdDeploymentMethod.tsx
@@ -1,8 +1,8 @@
-import { useMemo, useState } from "react";
-import { SingleValue } from "react-select";
 import { faCopy, faQuestionCircle, faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
+import { useMemo, useState } from "react";
+import { SingleValue } from "react-select";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -297,8 +297,8 @@ export const GatewayCliSystemdDeploymentMethod = () => {
      {canCreateToken && autogenerateToken ? (
        <>
          <FormLabel
-            label="Identity"
-            tooltipText="The identity that your gateway will use for authentication."
+            label="Machine Identity"
+            tooltipText="The machine identity that your gateway will use for authentication."
            className="mt-4"
          />
          <FilterableSelect
@@ -312,7 +312,7 @@ export const GatewayCliSystemdDeploymentMethod = () => {
              )
            }
            isLoading={isIdentitiesLoading}
-            placeholder="Select identity..."
+            placeholder="select machine identity..."
            options={identityMembershipOrgs.map((membership) => membership.identity)}
            getOptionValue={(option) => option.id}
            getOptionLabel={(option) => option.name}
@@ -322,8 +322,8 @@ export const GatewayCliSystemdDeploymentMethod = () => {
      ) : (
        <>
          <FormLabel
-            label="Identity Token"
-            tooltipText="The identity token that your gateway will use for authentication."
+            label="Machine Identity Token"
+            tooltipText="The machine identity token that your gateway will use for authentication."
            className="mt-4"
          />
          <Input
@@ -347,15 +347,15 @@ export const GatewayCliSystemdDeploymentMethod = () => {
            className="mr-2"
          >
            <div className="flex items-center">
-              <span>Automatically enable token auth and generate a token for identity</span>
+              <span>Automatically enable token auth and generate a token for machine identity</span>
              <Tooltip
                className="max-w-md"
                content={
                  <>
-                    Token authentication will be automatically enabled for the selected identity if
-                    it isn&apos;t already configured. By default, it will be configured to allow all
-                    IP addresses with a token TTL of 30 days. You can manage these settings in
-                    Access Control.
+                    Token authentication will be automatically enabled for the selected machine
+                    identity if it isn&apos;t already configured. By default, it will be configured
+                    to allow all IP addresses with a token TTL of 30 days. You can manage these
+                    settings in Access Control.
                    <br />
                    <br />A token will automatically be generated to be used with the CLI command.
                  </>
--- a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliDeploymentMethod.tsx
@@ -1,7 +1,7 @@
-import { useMemo, useState } from "react";
-import { SingleValue } from "react-select";
 import { faCopy, faQuestionCircle, faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useMemo, useState } from "react";
+import { SingleValue } from "react-select";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -229,8 +229,8 @@ export const RelayCliDeploymentMethod = () => {
      {canCreateToken && autogenerateToken ? (
        <>
          <FormLabel
-            label="Identity"
-            tooltipText="The identity that your relay will use for authentication."
+            label="Machine Identity"
+            tooltipText="The machine identity that your relay will use for authentication."
            className="mt-4"
          />
          <FilterableSelect
@@ -244,7 +244,7 @@ export const RelayCliDeploymentMethod = () => {
              )
            }
            isLoading={isIdentitiesLoading}
-            placeholder="Select identity..."
+            placeholder="select machine identity..."
            options={identityMembershipOrgs.map((membership) => membership.identity)}
            getOptionValue={(option) => option.id}
            getOptionLabel={(option) => option.name}
@@ -254,8 +254,8 @@ export const RelayCliDeploymentMethod = () => {
      ) : (
        <>
          <FormLabel
-            label="Identity Token"
-            tooltipText="The identity token that your relay will use for authentication."
+            label="Machine Identity Token"
+            tooltipText="The machine identity token that your relay will use for authentication."
            className="mt-4"
          />
          <Input
@@ -279,15 +279,15 @@ export const RelayCliDeploymentMethod = () => {
            className="mr-2"
          >
            <div className="flex items-center">
-              <span>Automatically enable token auth and generate a token for identity</span>
+              <span>Automatically enable token auth and generate a token for machine identity</span>
              <Tooltip
                className="max-w-md"
                content={
                  <>
-                    Token authentication will be automatically enabled for the selected identity if
-                    it isn&apos;t already configured. By default, it will be configured to allow all
-                    IP addresses with a token TTL of 30 days. You can manage these settings in
-                    Access Control.
+                    Token authentication will be automatically enabled for the selected machine
+                    identity if it isn&apos;t already configured. By default, it will be configured
+                    to allow all IP addresses with a token TTL of 30 days. You can manage these
+                    settings in Access Control.
                    <br />
                    <br />A token will automatically be generated to be used with the CLI command.
                  </>
--- a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliSystemdDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliSystemdDeploymentMethod.tsx
@@ -1,7 +1,7 @@
-import { useMemo, useState } from "react";
-import { SingleValue } from "react-select";
 import { faCopy, faQuestionCircle, faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useMemo, useState } from "react";
+import { SingleValue } from "react-select";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -270,8 +270,8 @@ export const RelayCliSystemdDeploymentMethod = () => {
      {canCreateToken && autogenerateToken ? (
        <>
          <FormLabel
-            label="Identity"
-            tooltipText="The identity that your relay will use for authentication."
+            label="Machine Identity"
+            tooltipText="The machine identity that your relay will use for authentication."
            className="mt-4"
          />
          <FilterableSelect
@@ -285,7 +285,7 @@ export const RelayCliSystemdDeploymentMethod = () => {
              )
            }
            isLoading={isIdentitiesLoading}
-            placeholder="Select identity..."
+            placeholder="select machine identity..."
            options={identityMembershipOrgs.map((membership) => membership.identity)}
            getOptionValue={(option) => option.id}
            getOptionLabel={(option) => option.name}
@@ -295,8 +295,8 @@ export const RelayCliSystemdDeploymentMethod = () => {
      ) : (
        <>
          <FormLabel
-            label="Identity Token"
-            tooltipText="The identity token that your relay will use for authentication."
+            label="Machine Identity Token"
+            tooltipText="The machine identity token that your relay will use for authentication."
            className="mt-4"
          />
          <Input
@@ -320,15 +320,15 @@ export const RelayCliSystemdDeploymentMethod = () => {
            className="mr-2"
          >
            <div className="flex items-center">
-              <span>Automatically enable token auth and generate a token for identity</span>
+              <span>Automatically enable token auth and generate a token for machine identity</span>
              <Tooltip
                className="max-w-md"
                content={
                  <>
-                    Token authentication will be automatically enabled for the selected identity if
-                    it isn&apos;t already configured. By default, it will be configured to allow all
-                    IP addresses with a token TTL of 30 days. You can manage these settings in
-                    Access Control.
+                    Token authentication will be automatically enabled for the selected machine
+                    identity if it isn&apos;t already configured. By default, it will be configured
+                    to allow all IP addresses with a token TTL of 30 days. You can manage these
+                    settings in Access Control.
                    <br />
                    <br />A token will automatically be generated to be used with the CLI command.
                  </>
--- a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayTerraformDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayTerraformDeploymentMethod.tsx
@@ -1,8 +1,8 @@
-import { useMemo, useState } from "react";
-import { SingleValue } from "react-select";
 import { faCopy, faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Tab } from "@headlessui/react";
+import { useMemo, useState } from "react";
+import { SingleValue } from "react-select";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -349,8 +349,8 @@ resource "aws_eip_association" "eip_assoc" {
      {canCreateToken && autogenerateToken ? (
        <>
          <FormLabel
-            label="Identity"
-            tooltipText="The identity that your relay will use for authentication."
+            label="Machine Identity"
+            tooltipText="The machine identity that your relay will use for authentication."
            className="mt-4"
          />
          <FilterableSelect
@@ -364,7 +364,7 @@ resource "aws_eip_association" "eip_assoc" {
              )
            }
            isLoading={isIdentitiesLoading}
-            placeholder="Select identity..."
+            placeholder="select machine identity..."
            options={identityMembershipOrgs.map((membership) => membership.identity)}
            getOptionValue={(option) => option.id}
            getOptionLabel={(option) => option.name}
@@ -374,8 +374,8 @@ resource "aws_eip_association" "eip_assoc" {
      ) : (
        <>
          <FormLabel
-            label="Identity Token"
-            tooltipText="The identity token that your relay will use for authentication."
+            label="Machine Identity Token"
+            tooltipText="The machine identity token that your relay will use for authentication."
            className="mt-4"
          />
          <Input
@@ -399,15 +399,15 @@ resource "aws_eip_association" "eip_assoc" {
            className="mr-2"
          >
            <div className="flex items-center">
-              <span>Automatically enable token auth and generate a token for identity</span>
+              <span>Automatically enable token auth and generate a token for machine identity</span>
              <Tooltip
                className="max-w-md"
                content={
                  <>
-                    Token authentication will be automatically enabled for the selected identity if
-                    it isn&apos;t already configured. By default, it will be configured to allow all
-                    IP addresses with a token TTL of 30 days. You can manage these settings in
-                    Access Control.
+                    Token authentication will be automatically enabled for the selected machine
+                    identity if it isn&apos;t already configured. By default, it will be configured
+                    to allow all IP addresses with a token TTL of 30 days. You can manage these
+                    settings in Access Control.
                    <br />
                    <br />A token will automatically be generated to be used with the CLI command.
                  </>
--- a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx
+++ b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx
@@ -1,6 +1,6 @@
+import { useNavigate, useSearch } from "@tanstack/react-router";
 import { Helmet } from "react-helmet";
 import { useTranslation } from "react-i18next";
-import { useNavigate, useSearch } from "@tanstack/react-router";

 import { PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
 import { useOrganization, useProject } from "@app/context";
@@ -44,7 +44,7 @@ const Page = () => {
        <PageHeader
          scope={currentProject.type}
          title="Access Control"
-          description="Manage fine-grained access for users, groups, roles, and identities within your project resources."
+          description="Manage fine-grained access for users, groups, roles, and machine identities within your project resources."
        />
        <Tabs orientation="vertical" value={selectedTab} onValueChange={updateSelectedTab}>
          <TabList>
@@ -55,7 +55,7 @@ const Page = () => {
              Groups
            </Tab>
            <Tab variant="project" value={ProjectAccessControlTabs.Identities}>
-              Identities
+              Machine Identities
            </Tab>
            {isSecretManager && (
              <Tab variant="project" value={ProjectAccessControlTabs.ServiceTokens}>
--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { subject } from "@casl/ability";
 import {
  faArrowDown,
@@ -14,6 +13,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
 import { AnimatePresence, motion } from "framer-motion";
 import { LinkIcon, PlusIcon } from "lucide-react";
+import { useState } from "react";
 import { twMerge } from "tailwind-merge";

 import { createNotification } from "@app/components/notifications";
@@ -158,7 +158,7 @@ export const IdentityTab = withProjectPermission(
        });

        createNotification({
-          text: "Successfully deleted project identity",
+          text: "Successfully deleted project machine identity",
          type: "success"
        });
      } else {
@@ -168,7 +168,7 @@ export const IdentityTab = withProjectPermission(
        });

        createNotification({
-          text: "Successfully removed identity from project",
+          text: "Successfully removed machine identity from project",
          type: "success"
        });
      }
@@ -197,7 +197,7 @@ export const IdentityTab = withProjectPermission(
      <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
        <div className="mb-4 flex items-center justify-between">
          <div className="flex items-center gap-x-2">
-            <p className="text-xl font-medium text-mineshaft-100">Identities</p>
+            <p className="text-xl font-medium text-mineshaft-100">Machine Identities</p>
            <DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/identities/machine-identities" />
          </div>
          <div className="flex items-center">
@@ -212,7 +212,7 @@ export const IdentityTab = withProjectPermission(
                  onClick={() => handlePopUpOpen("createIdentity")}
                  isDisabled={!isAllowed}
                >
-                  Create Identity
+                  Add Machine Identity
                </Button>
              )}
            </ProjectPermissionCan>
@@ -223,7 +223,7 @@ export const IdentityTab = withProjectPermission(
          value={search}
          onChange={(e) => setSearch(e.target.value)}
          leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-          placeholder="Search identities by name..."
+          placeholder="Search machine identities by name..."
        />
        <TableContainer>
          <Table>
@@ -454,7 +454,9 @@ export const IdentityTab = withProjectPermission(
                                      });
                                    }}
                                  >
-                                    {identityProjectId ? "Delete Identity" : "Remove From Project"}
+                                    {identityProjectId
+                                      ? "Delete Machine Identity"
+                                      : "Remove From Project"}
                                  </DropdownMenuItem>
                                )}
                              </ProjectPermissionCan>
@@ -474,7 +476,7 @@ export const IdentityTab = withProjectPermission(
                    <Td colSpan={3}>
                      <Blur
                        className="w-min"
-                        tooltipText="You do not have permission to read this identity."
+                        tooltipText="You do not have permission to view this machine identity."
                      />
                    </Td>
                  </Tr>
@@ -497,8 +499,8 @@ export const IdentityTab = withProjectPermission(
              <EmptyState
                title={
                  debouncedSearch.trim().length > 0
-                    ? "No identities match search filter"
-                    : "No identities have been added to this project"
+                    ? "No machine identities match search filter"
+                    : "No machine identities have been added to this project"
                }
                icon={faServer}
              />
@@ -513,8 +515,8 @@ export const IdentityTab = withProjectPermission(
        >
          <ModalContent
            bodyClassName="overflow-visible"
-            title="Add Project Identity"
-            subTitle="Create a new identity or assign an existing identity"
+            title="Add Project Machine Identity"
+            subTitle="Create a new machine identity or assign an existing one"
          >
            <AnimatePresence mode="wait">
              {wizardStep === WizardSteps.SelectAction && (
@@ -538,11 +540,11 @@ export const IdentityTab = withProjectPermission(
                  >
                    <div className="flex items-center gap-2">
                      <PlusIcon size="1rem" />
-                      <div>Create New Identity</div>
+                      <div>Create Machine Identity</div>
                    </div>
                    <div className="mt-2 text-xs text-mineshaft-300">
-                      Create a new machine identity specifically for this project. This identity
-                      will be managed at the project-level.
+                      Create a new machine identity specifically for this project. This machine
+                      identity will be managed at the project-level.
                    </div>
                  </div>
                  <div
@@ -558,11 +560,11 @@ export const IdentityTab = withProjectPermission(
                  >
                    <div className="flex items-center gap-2">
                      <LinkIcon size="1rem" />
-                      <div>Assign Existing Identity</div>
+                      <div>Assign Existing Machine Identity</div>
                    </div>
                    <div className="mt-2 text-xs text-mineshaft-300">
-                      Assign an existing identity from your organization. The identity will continue
-                      to be managed at its original scope.
+                      Assign an existing machine identity from your organization. The machine
+                      identity will continue to be managed at its original scope.
                    </div>
                  </div>
                </motion.div>
--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx
@@ -1,8 +1,8 @@
-import { Controller, useFieldArray, useForm } from "react-hook-form";
 import { faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useNavigate } from "@tanstack/react-router";
+import { Controller, useFieldArray, useForm } from "react-hook-form";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -138,7 +138,7 @@ export const ProjectIdentityModal = ({ onClose, identity }: ContentProps) => {
      }

      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "created"} project identity`,
+        text: `Successfully ${isUpdate ? "updated" : "created"} project machine identity`,
        type: "success"
      });

@@ -148,7 +148,7 @@ export const ProjectIdentityModal = ({ onClose, identity }: ContentProps) => {
      const error = err as any;
      const text =
        error?.response?.data?.message ??
-        `Failed to ${isUpdate ? "update" : "create"} project identity`;
+        `Failed to ${isUpdate ? "update" : "create"} project machine identity`;

      createNotification({
        text,
--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectLinkIdentityModal.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectLinkIdentityModal.tsx
@@ -1,7 +1,7 @@
-import { useMemo } from "react";
-import { Controller, useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useQuery } from "@tanstack/react-query";
+import { useMemo } from "react";
+import { Controller, useForm } from "react-hook-form";
 import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
@@ -83,7 +83,7 @@ export const ProjectLinkIdentityModal = ({ handlePopUpToggle }: Props) => {
    });

    createNotification({
-      text: "Successfully added identity to project",
+      text: "Successfully added machine identity to project",
      type: "success"
    });

@@ -114,11 +114,11 @@ export const ProjectLinkIdentityModal = ({ handlePopUpToggle }: Props) => {
        control={control}
        name="identity"
        render={({ field: { onChange, value }, fieldState: { error } }) => (
-          <FormControl label="Identity" errorText={error?.message} isError={Boolean(error)}>
+          <FormControl label="Machine Identity" errorText={error?.message} isError={Boolean(error)}>
            <FilterableSelect
              value={value}
              onChange={onChange}
-              placeholder="Select identity..."
+              placeholder="Select machine identity..."
              // onInputChange={setSearchValue}
              options={filteredIdentityMembershipOrgs.map((membership) => ({
                name: membership.name,
--- a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
@@ -1,11 +1,11 @@
-import { Helmet } from "react-helmet";
-import { useTranslation } from "react-i18next";
 import { subject } from "@casl/ability";
 import { faChevronLeft } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useQuery } from "@tanstack/react-query";
 import { Link, useNavigate, useParams } from "@tanstack/react-router";
 import { formatRelative } from "date-fns";
+import { Helmet } from "react-helmet";
+import { useTranslation } from "react-i18next";

 import { createNotification } from "@app/components/notifications";
 import { OrgPermissionCan, ProjectPermissionCan } from "@app/components/permissions";
@@ -92,7 +92,7 @@ const Page = () => {
        onSuccess: () => {
          createNotification({
            type: "success",
-            text: "Identity privilege assumption has started"
+            text: "Machine identity privilege assumption has started"
          });
          const url = `${getProjectHomePage(currentProject.type, currentProject.environments)}${isSubOrganization && isNonScopedIdentity ? `?subOrganization=${currentOrg.slug}` : ""}`;
          window.location.assign(
@@ -109,7 +109,7 @@ const Page = () => {
      projectId
    });
    createNotification({
-      text: "Successfully removed identity from project",
+      text: "Successfully removed machine identity from project",
      type: "success"
    });
    handlePopUpClose("deleteIdentity");
@@ -149,12 +149,12 @@ const Page = () => {
            className="mb-4 flex items-center gap-x-2 text-sm text-mineshaft-400"
          >
            <FontAwesomeIcon icon={faChevronLeft} />
-            Identities
+            Machine Identities
          </Link>
          <PageHeader
            scope={currentProject.type}
            title={identityMembershipDetails?.identity?.name}
-            description={`Identity ${isProjectIdentity ? "created" : "added"} on ${identityMembershipDetails?.createdAt && formatRelative(new Date(identityMembershipDetails?.createdAt || ""), new Date())}`}
+            description={`Machine identity ${isProjectIdentity ? "created" : "added"} on ${identityMembershipDetails?.createdAt && formatRelative(new Date(identityMembershipDetails?.createdAt || ""), new Date())}`}
            className={!isProjectIdentity ? "mb-4" : undefined}
          >
            <div className="flex items-center gap-2">
@@ -177,7 +177,7 @@ const Page = () => {
                  identityId: identityMembershipDetails?.identity.id
                })}
                renderTooltip
-                allowedLabel="Assume privileges of the user"
+                allowedLabel="Assume privileges of the machine identity"
                passThrough={false}
              >
                {(isAllowed) => (
@@ -209,7 +209,7 @@ const Page = () => {
                      isLoading={isDeletingIdentity}
                      onClick={() => handlePopUpOpen("deleteIdentity")}
                    >
-                      Remove Identity
+                      Remove Machine Identity
                    </Button>
                  )}
                </ProjectPermissionCan>
@@ -219,7 +219,7 @@ const Page = () => {
          {!isProjectIdentity && (
            <Alert hideTitle iconClassName="text-info" className="mb-4 border-info/50 bg-info/10">
              <AlertDescription>
-                This identity is managed by your organization.{" "}
+                This machine identity is managed by your organization.{" "}
                <OrgPermissionCan
                  I={OrgPermissionIdentityActions.Read}
                  an={OrgPermissionSubjects.Identity}
@@ -234,7 +234,7 @@ const Page = () => {
                        }}
                      >
                        <span className="cursor-pointer text-info underline underline-offset-2">
-                          Click here to manage identity.
+                          Click here to manage machine identity.
                        </span>
                      </Link>
                    ) : null
@@ -286,15 +286,15 @@ const Page = () => {
          <ConfirmActionModal
            isOpen={popUp.assumePrivileges.isOpen}
            confirmKey="assume"
-            title="Do you want to assume privileges of this identity?"
-            subTitle="This will set your privileges to those of the identity for the next hour."
+            title="Do you want to assume privileges of this machine identity?"
+            subTitle="This will set your privileges to those of the machine identity for the next hour."
            onChange={(isOpen) => handlePopUpToggle("assumePrivileges", isOpen)}
            onConfirmed={handleAssumePrivileges}
            buttonText="Confirm"
          />
        </>
      ) : (
-        <EmptyState title="Error: Unable to find the identity." className="py-12" />
+        <EmptyState title="Error: Unable to find the machine identity." className="py-12" />
      )}
    </div>
  );
--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsx
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsx
@@ -235,7 +235,10 @@ export const IdentityProjectAdditionalPrivilegeSection = ({ identityMembershipDe
                  </TBody>
                </Table>
                {!isPending && !identityProjectPrivileges?.length && (
-                  <EmptyState title="This identity has no additional privileges" icon={faFolder} />
+                  <EmptyState
+                    title="This machine identity has no additional privileges"
+                    icon={faFolder}
+                  />
                )}
              </TableContainer>
            </div>
--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsx
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsx
@@ -69,7 +69,7 @@ export const ProjectIdentityDetailsSection = ({ identity, isOrgIdentity, members
    } catch {
      createNotification({
        type: "error",
-        text: "Failed to delete project identity"
+        text: "Failed to delete project machine identity"
      });
    }
  };
@@ -77,7 +77,7 @@ export const ProjectIdentityDetailsSection = ({ identity, isOrgIdentity, members
  return (
    <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
      <div className="flex items-center justify-between border-b border-mineshaft-400 pb-4">
-        <h3 className="text-lg font-medium text-mineshaft-100">Identity Details</h3>
+        <h3 className="text-lg font-medium text-mineshaft-100">Details</h3>
        <DropdownMenu>
          {!isOrgIdentity && (
            <DropdownMenuTrigger asChild>
@@ -114,7 +114,7 @@ export const ProjectIdentityDetailsSection = ({ identity, isOrgIdentity, members
                  }}
                  disabled={!isAllowed}
                >
-                  Edit Identity
+                  Edit Machine Identity
                </DropdownMenuItem>
              )}
            </ProjectPermissionCan>
@@ -137,7 +137,7 @@ export const ProjectIdentityDetailsSection = ({ identity, isOrgIdentity, members
                  icon={<FontAwesomeIcon icon={faTrash} />}
                  disabled={!isAllowed}
                >
-                  Delete Identity
+                  Delete Machine Identity
                </DropdownMenuItem>
              )}
            </ProjectPermissionCan>
@@ -146,7 +146,7 @@ export const ProjectIdentityDetailsSection = ({ identity, isOrgIdentity, members
      </div>
      <div className="pt-4">
        <div className="mb-4">
-          <p className="text-sm font-medium text-mineshaft-300">Identity ID</p>
+          <p className="text-sm font-medium text-mineshaft-300">Machine Identity ID</p>
          <div className="group flex align-top">
            <p className="text-sm break-all text-mineshaft-300">{identity.id}</p>
            <div className="opacity-0 transition-opacity duration-300 group-hover:opacity-100">