diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
index 81bf945a5..9720a9862 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
@@ -400,8 +400,8 @@ export default function ParameterComponent({
                 disabled={disabled}
                 value={data.node.template[name].value ?? ""}
                 onChange={handleOnNewValue}
-                id={"textarea-" + index}
-                data-testid={"textarea-" + index}
+                id={"textarea-" + data.node.template[name].name}
+                data-testid={"textarea-" + data.node.template[name].name}
               />
             ) : (
               <InputComponent
diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx
index 93e90a6d3..817f48ea2 100644
--- a/src/frontend/src/modals/EditNodeModal/index.tsx
+++ b/src/frontend/src/modals/EditNodeModal/index.tsx
@@ -216,8 +216,16 @@ const EditNodeModal = forwardRef(
                                     ) : myData.node.template[templateParam]
                                         .multiline ? (
                                       <TextAreaComponent
-                                        id={"textarea-edit-" + index}
-                                        data-testid={"textarea-edit-" + index}
+                                        id={
+                                          "textarea-edit-" +
+                                          myData.node.template[templateParam]
+                                            .name
+                                        }
+                                        data-testid={
+                                          "textarea-edit-" +
+                                          myData.node.template[templateParam]
+                                            .name
+                                        }
                                         disabled={disabled}
                                         editNode={true}
                                         value={
@@ -448,9 +456,13 @@ const EditNodeModal = forwardRef(
                                       onChange={(value: string | string[]) => {
                                         handleOnNewValue(value, templateParam);
                                       }}
-                                      id={"prompt-area-edit" + index}
+                                      id={
+                                        "prompt-area-edit-" +
+                                        myData.node.template[templateParam].name
+                                      }
                                       data-testid={
-                                        "modal-prompt-input-" + index
+                                        "modal-prompt-input-" +
+                                        myData.node.template[templateParam].name
                                       }
                                     />
                                   </div>
diff --git a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
index 56e3396a7..690ec2d05 100644
--- a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
@@ -44,7 +44,7 @@ test("PromptTemplateComponent", async ({ page }) => {
 
   await page.getByTestId("genericModalBtnSave").click();
 
-  await page.getByTestId("div-textarea-5").click();
+  await page.getByTestId("div-textarea-prompt").click();
   await page.getByTestId("text-area-modal").fill("prompt_value_!@#!@#");
 
   value = await page.getByTestId("text-area-modal").inputValue();
@@ -55,7 +55,7 @@ test("PromptTemplateComponent", async ({ page }) => {
 
   await page.getByTestId("genericModalBtnSave").click();
 
-  await page.getByTestId("div-textarea-6").click();
+  await page.getByTestId("div-textarea-prompt1").click();
   await page
     .getByTestId("text-area-modal")
     .fill("prompt_name_test_123123!@#!@#");
@@ -77,29 +77,31 @@ test("PromptTemplateComponent", async ({ page }) => {
   await page.getByTestId("more-options-modal").click();
   await page.getByTestId("edit-button-modal").click();
 
-  value = await page.locator('//*[@id="textarea-edit-1"]').inputValue();
+  value = await page.locator('//*[@id="textarea-edit-prompt"]').inputValue();
 
   if (value != "prompt_value_!@#!@#") {
     expect(false).toBeTruthy();
   }
 
-  value = await page.locator('//*[@id="textarea-edit-2"]').inputValue();
+  value = await page.locator('//*[@id="textarea-edit-prompt1"]').inputValue();
 
   if (value != "prompt_name_test_123123!@#!@#") {
     expect(false).toBeTruthy();
   }
 
-  value = await page.locator('//*[@id="prompt-area-edit0"]').innerText();
+  value = await page
+    .locator('//*[@id="prompt-area-edit-template"]')
+    .innerText();
 
   if (value != "{prompt} example {prompt1}") {
     expect(false).toBeTruthy();
   }
 
   await page
-    .locator('//*[@id="textarea-edit-2"]')
+    .locator('//*[@id="textarea-edit-prompt1"]')
     .fill("prompt_edit_test_12312312321!@#$");
   await page
-    .locator('//*[@id="textarea-edit-1"]')
+    .locator('//*[@id="textarea-edit-prompt"]')
     .fill("prompt_edit_test_44444444444!@#$");
 
   await page.locator('//*[@id="showtemplate"]').click();
@@ -141,35 +143,29 @@ test("PromptTemplateComponent", async ({ page }) => {
 
   await page.locator('//*[@id="saveChangesBtn"]').click();
 
-  const plusButtonLocator = page.locator('//*[@id="textarea-8"]');
-  const elementCount = await plusButtonLocator.count();
-  if (elementCount === 0) {
-    expect(true).toBeTruthy();
+  await page.getByTestId("more-options-modal").click();
+  await page.getByTestId("edit-button-modal").click();
 
-    await page.getByTestId("more-options-modal").click();
-    await page.getByTestId("edit-button-modal").click();
+  await page.locator('//*[@id="showprompt1"]').click();
+  expect(await page.locator('//*[@id="showprompt1"]').isChecked()).toBeTruthy();
 
-    await page.locator('//*[@id="showprompt1"]').click();
-    expect(
-      await page.locator('//*[@id="showprompt1"]').isChecked()
-    ).toBeTruthy();
+  value = await page.locator('//*[@id="textarea-edit-prompt"]').inputValue();
 
-    value = await page.locator('//*[@id="textarea-edit-1"]').inputValue();
+  if (value != "prompt_edit_test_44444444444!@#$") {
+    expect(false).toBeTruthy();
+  }
 
-    if (value != "prompt_edit_test_44444444444!@#$") {
-      expect(false).toBeTruthy();
-    }
+  value = await page.locator('//*[@id="textarea-edit-prompt1"]').inputValue();
 
-    value = await page.locator('//*[@id="textarea-edit-2"]').inputValue();
+  if (value != "prompt_edit_test_12312312321!@#$") {
+    expect(false).toBeTruthy();
+  }
 
-    if (value != "prompt_edit_test_12312312321!@#$") {
-      expect(false).toBeTruthy();
-    }
+  value = await page
+    .locator('//*[@id="prompt-area-edit-template"]')
+    .innerText();
 
-    value = await page.locator('//*[@id="prompt-area-edit0"]').innerText();
-
-    if (value != "{prompt} example {prompt1}") {
-      expect(false).toBeTruthy();
-    }
+  if (value != "{prompt} example {prompt1}") {
+    expect(false).toBeTruthy();
   }
 });
diff --git a/src/frontend/tests/onlyFront/group.spec.ts b/src/frontend/tests/onlyFront/group.spec.ts
index f4cbe8458..dcd557279 100644
--- a/src/frontend/tests/onlyFront/group.spec.ts
+++ b/src/frontend/tests/onlyFront/group.spec.ts
@@ -67,7 +67,7 @@ test.describe("group node test", () => {
 
     await page.getByRole("button", { name: "Group" }).click();
 
-    const textArea = page.getByTestId("div-textarea-2");
+    const textArea = page.getByTestId("div-textarea-description");
     const elementCountText = await textArea.count();
     if (elementCountText > 0) {
       expect(true).toBeTruthy();
diff --git a/src/frontend/tests/onlyFront/saveComponents.spec.ts b/src/frontend/tests/onlyFront/saveComponents.spec.ts
index a123a422e..10a0c9c77 100644
--- a/src/frontend/tests/onlyFront/saveComponents.spec.ts
+++ b/src/frontend/tests/onlyFront/saveComponents.spec.ts
@@ -74,7 +74,7 @@ test.describe("save component tests", () => {
 
     await page.getByRole("button", { name: "Group" }).click();
 
-    let textArea = page.getByTestId("div-textarea-2");
+    let textArea = page.getByTestId("div-textarea-description");
     let elementCountText = await textArea.count();
     if (elementCountText > 0) {
       expect(true).toBeTruthy();
@@ -102,7 +102,7 @@ test.describe("save component tests", () => {
     await page.mouse.up();
     await page.mouse.down();
 
-    textArea = page.getByTestId("div-textarea-2");
+    textArea = page.getByTestId("div-textarea-description");
     elementCountText = await textArea.count();
     if (elementCountText > 0) {
       expect(true).toBeTruthy();