diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
index 441fd4463..f939759bb 100644
--- a/frontend/src/lib/utils/locales.ts
+++ b/frontend/src/lib/utils/locales.ts
@@ -336,7 +336,8 @@ export function localItems(languageTag: string): LocalItems {
 			languageTag: languageTag
 		}),
 		actionPlan: m.actionPlan({ languageTag: languageTag }),
-		matchingRequirements: m.matchingRequirements({ languageTag: languageTag })
+		matchingRequirements: m.matchingRequirements({ languageTag: languageTag }),
+		remediationPlan: m.remediationPlan({ languageTag: languageTag }),
 	};
 	return LOCAL_ITEMS;
 }
diff --git a/frontend/src/routes/(app)/analyses-registry/+page.svelte b/frontend/src/routes/(app)/analyses-registry/+page.svelte
index d16d60205..7658ab2d5 100644
--- a/frontend/src/routes/(app)/analyses-registry/+page.svelte
+++ b/frontend/src/routes/(app)/analyses-registry/+page.svelte
@@ -23,7 +23,7 @@
 		<ModelTable source={data.table} URLModel={data.URLModel}>
 			<span slot="actions" let:meta class="space-x-2 whitespace-nowrap">
 				<a
-					href="/risk-assessments/{meta.id}/plan"
+					href="/risk-assessments/{meta.id}/remediation-plan"
 					class="unstyled cursor-pointer text-xl text-slate-500 hover:text-indigo-700"
 					on:click={stopPropagation}><i class="fa-solid fa-heart-pulse" /></a
 				>
@@ -49,12 +49,12 @@
 					>
 					<p class="block px-4 py-2 text-sm text-gray-800">Treatment plan</p>
 					<a
-						href="/risk-assessments/{meta.id}/plan/export/pdf"
+						href="/risk-assessments/{meta.id}/remediation-plan/export/pdf"
 						class="block px-4 py-2 text-sm text-gray-800 hover:bg-gray-200"
 						on:click={stopPropagation}>... as PDF</a
 					>
 					<a
-						href="/risk-assessments/{meta.id}/plan/export/csv"
+						href="/risk-assessments/{meta.id}/remediation-plan/export/csv"
 						class="block px-4 py-2 text-sm text-gray-800 border-b hover:bg-gray-200"
 						on:click={stopPropagation}>... as csv</a
 					>
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/action-plan/+page.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/action-plan/+page.svelte
index c1cb4f90a..8efd5bde6 100644
--- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/action-plan/+page.svelte
+++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/action-plan/+page.svelte
@@ -3,9 +3,12 @@
 	import type { TableSource } from '$lib/components/ModelTable/types';
 	import { Tab, TabGroup, tableSourceMapper } from '@skeletonlabs/skeleton';
 	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
+	import { breadcrumbObject } from '$lib/utils/stores';
 
 	export let data;
 
+	breadcrumbObject.set(data.compliance_assessment);
+
 	let tabSet = 0;
 
 	const plannedAppliedControls: TableSource = {
diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
index 1241b287a..6607751af 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
@@ -161,7 +161,7 @@
 	<div>
 		<div class="card bg-white p-4 m-4 shadow flex space-x-2 relative">
 			<div class="absolute right-2 top-2 py-2 px-4">
-				<a href="/risk-assessments/{risk_assessment.id}/plan" class="btn variant-filled-primary"
+				<a href="/risk-assessments/{risk_assessment.id}/remediation-plan" class="btn variant-filled-primary"
 					><i class="fa-solid fa-heart-pulse mr-2" />{m.remediationPlan()}</a
 				>
 				<button class="btn variant-filled-primary" use:popup={popupDownload}
@@ -183,11 +183,11 @@
 					>
 					<p class="block px-4 py-2 text-sm text-gray-800">{m.treatmentPlan()}</p>
 					<a
-						href="/risk-assessments/{risk_assessment.id}/plan/export/pdf"
+						href="/risk-assessments/{risk_assessment.id}/remediation-plan/export/pdf"
 						class="block px-4 py-2 text-sm text-gray-800 hover:bg-gray-200">... {m.asPDF()}</a
 					>
 					<a
-						href="/risk-assessments/{risk_assessment.id}/plan/export/csv"
+						href="/risk-assessments/{risk_assessment.id}/remediation-plan/export/csv"
 						class="block px-4 py-2 text-sm text-gray-800 border-b hover:bg-gray-200"
 						>... {m.asCSV()}</a
 					>
diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/+page.server.ts b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/+page.server.ts
similarity index 100%
rename from frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/+page.server.ts
rename to frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/+page.server.ts
diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/+page.svelte
similarity index 97%
rename from frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/+page.svelte
rename to frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/+page.svelte
index ca86602ca..1511d32e7 100644
--- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/+page.svelte
+++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/+page.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import * as m from '$paraglide/messages.js';
+	import { breadcrumbObject } from '$lib/utils/stores';
 
 	export let data;
 
+	breadcrumbObject.set(data.risk_assessment);
+
 	const scenarioTreatmentColorMap = (status: string) => {
 		const map: Record<string, string> = {
 			open: 'bg-orange-200',
diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/export/csv/+server.ts b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/export/csv/+server.ts
similarity index 100%
rename from frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/export/csv/+server.ts
rename to frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/export/csv/+server.ts
diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/export/pdf/+server.ts b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/export/pdf/+server.ts
similarity index 100%
rename from frontend/src/routes/(app)/risk-assessments/[id=uuid]/plan/export/pdf/+server.ts
rename to frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/export/pdf/+server.ts