diff --git a/src/CqlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.test.tsx b/src/CqlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.test.tsx
index 086e1433..a4b6b3d4 100644
--- a/src/CqlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.test.tsx
+++ b/src/CqlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.test.tsx
@@ -144,7 +144,7 @@ describe("Saved Codes section component", () => {
     const editButton = getByTestId(`edit-code-0`);
     expect(editButton).toBeInTheDocument();
 
-    const removeButton = getByTestId(`remove-code-0`);
+    const removeButton = getByTestId(`delete-code-0`);
     expect(removeButton).toBeInTheDocument();
 
     userEvent.click(editButton);
@@ -218,7 +218,7 @@ describe("Saved Codes section component", () => {
     const editButton = getByTestId(`edit-code-0`);
     expect(editButton).toBeInTheDocument();
 
-    const removeButton = getByTestId(`remove-code-0`);
+    const removeButton = getByTestId(`delete-code-0`);
     expect(removeButton).toBeInTheDocument();
 
     userEvent.click(removeButton);
@@ -251,7 +251,7 @@ describe("Saved Codes section component", () => {
     );
     await checkRows(2);
 
-    const removeButton = getByTestId(`remove-code-0`);
+    const removeButton = getByTestId(`delete-code-0`);
     expect(removeButton).toBeInTheDocument();
 
     userEvent.click(removeButton);
@@ -279,7 +279,7 @@ describe("Saved Codes section component", () => {
     );
     await checkRows(2);
 
-    const removeButton = getByTestId(`remove-code-0`);
+    const removeButton = getByTestId(`delete-code-0`);
     expect(removeButton).toBeInTheDocument();
 
     userEvent.click(removeButton);
@@ -313,7 +313,7 @@ describe("Saved Codes section component", () => {
     );
     await checkRows(2);
 
-    const removeButton = getByTestId(`remove-code-0`);
+    const removeButton = getByTestId(`delete-code-0`);
     expect(removeButton).toBeInTheDocument();
 
     userEvent.click(removeButton);
diff --git a/src/CqlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.tsx b/src/CqlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.tsx
index 1d954530..64f99ec1 100644
--- a/src/CqlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.tsx
+++ b/src/CqlBuilderPanel/codesSection/codesSubSection/savedCodesSubSection/SavedCodesSubSection.tsx
@@ -223,10 +223,10 @@ export default function SavedCodesSubSection({
             {canEdit ? (
               <>
                 <ToolTippedIcon
-                  tooltipMessage="Remove"
+                  tooltipMessage="Delete"
                   buttonProps={{
-                    "data-testid": `remove-code-${row.cell.row.id}`,
-                    "aria-label": `remove-code-${row.cell.row.id}`,
+                    "data-testid": `delete-code-${row.cell.row.id}`,
+                    "aria-label": `delete-code-${row.cell.row.id}`,
                     size: "small",
                     onClick: (e) => {
                       setSelectedCodeDetails(