diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
index d15a7d46b9..dbacb5073b 100644
--- a/client/public/locales/en/translation.json
+++ b/client/public/locales/en/translation.json
@@ -103,7 +103,8 @@
       "applicationsBulkDelete": "The selected application(s) will be deleted.",
 
       "delete": "This action cannot be undone.",
-      "discardAssessment": "The assessment for <1>{{applicationName}}</1> will be discarded, as well as the review result. Do you wish to continue?",
+      "discardAssessment": "The assessment(s) for <1>{{applicationName}}</1> will be discarded. Do you wish to continue?",
+      "discardReview": "The review for <1>{{applicationName}}</1> will be discarded. Do you wish to continue?",
       "leavePage": "Are you sure you want to leave this page? Be sure to save your changes, or they will be lost.",
       "pageError": "Oops! Something went wrong.",
       "refreshPage": "Try to refresh your page or contact your admin.",
@@ -186,7 +187,7 @@
     "overrideAssessmentConfirmation": "Do you want to create a dedicated assessment for this application and override the inherited archetype assessment(s)?",
     "overrideArchetypeReviewDescription": "The application {{name}} already is associated with archetypes: {{what}}.",
     "overrideArchetypeReviewConfirmation": "Do you want to create a dedicated review for this application and override the inherited archetype review?",
-    "overrideReviewConfirmation": "This archetype has already been reviewed. Do you want to continue?",
+    "editArchetypeReviewConfirmation": "This archetype has already been reviewed. Do you want to continue?",
     "reasonForError": "The reported reason for the error:",
     "reviewInstructions": "Use this section to provide your assessment of the possible migration/modernization plan and effort estimation.",
     "savingSelection": "Saving selection",
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
index 5e6546020b..df49e40fb1 100644
--- a/client/src/app/pages/applications/applications-table/applications-table.tsx
+++ b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -686,6 +686,9 @@ export const ApplicationsTable: React.FC = () => {
       );
     }
   };
+
+  const applicationName = assessmentToDiscard?.name || "Application name";
+
   return (
     <ConditionalRender
       when={isFetchingApplications && !(applications || applicationsFetchError)}
@@ -1150,13 +1153,10 @@ export const ApplicationsTable: React.FC = () => {
             <span>
               <Trans
                 i18nKey="dialog.message.discardAssessment"
-                values={{
-                  applicationName: assessmentToDiscard?.name,
-                }}
+                values={{ applicationName }}
               >
-                The assessment(s) for{" "}
-                <strong>{assessmentToDiscard?.name}</strong> will be discarded.
-                Do you wish to continue?
+                The assessment(s) for <strong>{applicationName}</strong> will be
+                discarded. Do you wish to continue?
               </Trans>
             </span>
           }
diff --git a/client/src/app/pages/archetypes/archetypes-page.tsx b/client/src/app/pages/archetypes/archetypes-page.tsx
index ba53891879..170e7e30bc 100644
--- a/client/src/app/pages/archetypes/archetypes-page.tsx
+++ b/client/src/app/pages/archetypes/archetypes-page.tsx
@@ -583,7 +583,7 @@ const Archetypes: React.FC = () => {
         })}
         titleIconVariant={"warning"}
         isOpen={reviewToEdit !== null}
-        message={t("message.overrideArchetypeReviewConfirmation")}
+        message={t("message.editArchetypeReviewConfirmation")}
         confirmBtnVariant={ButtonVariant.primary}
         confirmBtnLabel={t("actions.continue")}
         cancelBtnLabel={t("actions.cancel")}