diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsx
index 6db81f19e..d676d4c8b 100644
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthTemplateModal.tsx
@@ -154,7 +154,7 @@ export const IdentityAuthTemplateModal = ({ popUp, handlePopUpToggle }: Props) =
       onOpenChange={handleClose}
     >
       <ModalContent
-        title={isEdit ? "Edit Identity Auth Template" : "Create Identity Auth Template"}
+        title={isEdit ? "Edit Machine Identity Auth Template" : "Create Machine Identity Auth Template"}
         subTitle={
           isEdit ? "Update the authentication template" : "Create a new authentication template"
         }
diff --git a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
index 5c4dcd6dd..fb11c758e 100644
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
@@ -167,7 +167,7 @@ export const IdentityAddToProjectModal = ({ identityId, popUp, handlePopUpToggle
         handlePopUpToggle("addIdentityToProject", isOpen);
       }}
     >
-      <ModalContent bodyClassName="overflow-visible" title="Add Identity to Project">
+      <ModalContent bodyClassName="overflow-visible" title="Add Machine Identity to Project">
         <Content identityId={identityId} handlePopUpToggle={handlePopUpToggle} />
       </ModalContent>
     </Modal>
diff --git a/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliDeploymentMethod.tsx b/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliDeploymentMethod.tsx
index c44a89725..2d688ae95 100644
--- a/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliDeploymentMethod.tsx
@@ -55,10 +55,10 @@ const formSchemaWithIdentity = baseFormSchema.extend({
         id: z.string(),
         name: z.string()
       },
-      { required_error: "Identity is required" }
+      { required_error: "Machine identity is required" }
     )
     .nullable()
-    .refine((val) => val !== null, { message: "Identity is required" })
+    .refine((val) => val !== null, { message: "Machine identity is required" })
 });
 
 const formSchemaWithToken = baseFormSchema.extend({
@@ -307,7 +307,7 @@ export const GatewayCliDeploymentMethod = () => {
           <Input
             value={identityToken}
             onChange={(e) => setIdentityToken(e.target.value)}
-            placeholder="Enter identity token..."
+            placeholder="Enter machine identity token..."
             isError={Boolean(errors.identityToken)}
           />
           {errors.identityToken && <p className="mt-1 text-sm text-red">{errors.identityToken}</p>}
diff --git a/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliSystemdDeploymentMethod.tsx b/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliSystemdDeploymentMethod.tsx
index 1d4a7dfe5..fd316c08b 100644
--- a/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliSystemdDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/GatewayTab/components/GatewayCliSystemdDeploymentMethod.tsx
@@ -55,10 +55,10 @@ const formSchemaWithIdentity = baseFormSchema.extend({
         id: z.string(),
         name: z.string()
       },
-      { required_error: "Identity is required" }
+      { required_error: "Machine identity is required" }
     )
     .nullable()
-    .refine((val) => val !== null, { message: "Identity is required" })
+    .refine((val) => val !== null, { message: "Machine identity is required" })
 });
 
 const formSchemaWithToken = baseFormSchema.extend({
@@ -329,7 +329,7 @@ export const GatewayCliSystemdDeploymentMethod = () => {
           <Input
             value={identityToken}
             onChange={(e) => setIdentityToken(e.target.value)}
-            placeholder="Enter identity token..."
+            placeholder="Enter machine identity token..."
             isError={Boolean(errors.identityToken)}
           />
           {errors.identityToken && <p className="mt-1 text-sm text-red">{errors.identityToken}</p>}
diff --git a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliDeploymentMethod.tsx b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliDeploymentMethod.tsx
index 54b176861..48c09944a 100644
--- a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliDeploymentMethod.tsx
@@ -41,10 +41,10 @@ const formSchemaWithIdentity = baseFormSchema.extend({
         id: z.string(),
         name: z.string()
       },
-      { required_error: "Identity is required" }
+      { required_error: "Machine identity is required" }
     )
     .nullable()
-    .refine((val) => val !== null, { message: "Identity is required" })
+    .refine((val) => val !== null, { message: "Machine identity is required" })
 });
 
 const formSchemaWithToken = baseFormSchema.extend({
@@ -261,7 +261,7 @@ export const RelayCliDeploymentMethod = () => {
           <Input
             value={identityToken}
             onChange={(e) => setIdentityToken(e.target.value)}
-            placeholder="Enter identity token..."
+            placeholder="Enter machine identity token..."
             isError={Boolean(errors.identityToken)}
           />
           {errors.identityToken && <p className="mt-1 text-sm text-red">{errors.identityToken}</p>}
diff --git a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliSystemdDeploymentMethod.tsx b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliSystemdDeploymentMethod.tsx
index bc82ac4a0..cb2a9e0cd 100644
--- a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliSystemdDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayCliSystemdDeploymentMethod.tsx
@@ -41,10 +41,10 @@ const formSchemaWithIdentity = baseFormSchema.extend({
         id: z.string(),
         name: z.string()
       },
-      { required_error: "Identity is required" }
+      { required_error: "Machine identity is required" }
     )
     .nullable()
-    .refine((val) => val !== null, { message: "Identity is required" })
+    .refine((val) => val !== null, { message: "Machine identity is required" })
 });
 
 const formSchemaWithToken = baseFormSchema.extend({
@@ -302,7 +302,7 @@ export const RelayCliSystemdDeploymentMethod = () => {
           <Input
             value={identityToken}
             onChange={(e) => setIdentityToken(e.target.value)}
-            placeholder="Enter identity token..."
+            placeholder="Enter machine identity token..."
             isError={Boolean(errors.identityToken)}
           />
           {errors.identityToken && <p className="mt-1 text-sm text-red">{errors.identityToken}</p>}
diff --git a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayTerraformDeploymentMethod.tsx b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayTerraformDeploymentMethod.tsx
index 143952e22..550b52947 100644
--- a/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayTerraformDeploymentMethod.tsx
+++ b/frontend/src/pages/organization/NetworkingPage/components/RelayTab/components/RelayTerraformDeploymentMethod.tsx
@@ -42,10 +42,10 @@ const formSchemaWithIdentity = baseFormSchema.extend({
         id: z.string(),
         name: z.string()
       },
-      { required_error: "Identity is required" }
+      { required_error: "Machine identity is required" }
     )
     .nullable()
-    .refine((val) => val !== null, { message: "Identity is required" })
+    .refine((val) => val !== null, { message: "Machine identity is required" })
 });
 
 const formSchemaWithToken = baseFormSchema.extend({
@@ -381,7 +381,7 @@ resource "aws_eip_association" "eip_assoc" {
           <Input
             value={identityToken}
             onChange={(e) => setIdentityToken(e.target.value)}
-            placeholder="Enter identity token..."
+            placeholder="Enter machine identity token..."
             isError={Boolean(errors.identityToken)}
           />
           {errors.identityToken && <p className="mt-1 text-sm text-red">{errors.identityToken}</p>}