diff --git a/backend/package-lock.json b/backend/package-lock.json
index 1b7dc45..2601107 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "medassist-ng-backend",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "medassist-ng-backend",
-      "version": "1.15.1",
+      "version": "1.16.0",
       "dependencies": {
         "@fastify/cookie": "^11.0.2",
         "@fastify/cors": "^11.2.0",
diff --git a/backend/src/routes/medications.ts b/backend/src/routes/medications.ts
index 7d62f02..24e7f42 100644
--- a/backend/src/routes/medications.ts
+++ b/backend/src/routes/medications.ts
@@ -42,7 +42,7 @@ const medicationStartDateSchema = z
 
 const medicationSchema = z
 	.object({
-		name: z.string().trim().min(1).max(100),
+		name: z.string().trim().max(100).default(""),
 		genericName: z.string().trim().max(100).nullable().optional(),
 		takenBy: z.array(z.string().trim().max(100)).default([]), // Medication-level takenBy (fallback)
 		packageType: packageTypeSchema,
@@ -66,6 +66,10 @@ const medicationSchema = z
 		intakes: z.array(intakeSchema).min(1).max(12).optional(),
 		blisters: z.array(blisterSchema).min(1).max(12).optional(), // Legacy format
 	})
+	.refine(
+		(data) => (data.name && data.name.length > 0) || (data.genericName && data.genericName.length > 0),
+		{ message: "Either 'name' or 'genericName' must be provided", path: ["name"] }
+	)
 	.refine((data) => data.intakes || data.blisters, { message: "Either 'intakes' or 'blisters' must be provided" })
 	.refine(
 		(data) => {
diff --git a/backend/src/routes/planner.ts b/backend/src/routes/planner.ts
index 6876cf8..6be7d23 100644
--- a/backend/src/routes/planner.ts
+++ b/backend/src/routes/planner.ts
@@ -371,10 +371,10 @@ ${getFooterPlain(language)}`;
 		// Load user settings
 		const userId = await getUserId(request);
 		const activeMeds = await db
-			.select({ name: medications.name })
+			.select({ name: medications.name, genericName: medications.genericName })
 			.from(medications)
 			.where(and(eq(medications.userId, userId), eq(medications.isObsolete, false)));
-		const activeMedNames = new Set(activeMeds.map((med) => med.name));
+		const activeMedNames = new Set(activeMeds.map((med) => med.name || med.genericName || ""));
 		const filteredLowStock = lowStock.filter((item) => activeMedNames.has(item.name));
 		if (filteredLowStock.length === 0) {
 			return reply.status(400).send({ error: "No active medications to notify" });
@@ -641,10 +641,10 @@ ${getFooterPlain(language)}`;
 
 		const userId = await getUserId(request);
 		const activeMeds = await db
-			.select({ name: medications.name })
+			.select({ name: medications.name, genericName: medications.genericName })
 			.from(medications)
 			.where(and(eq(medications.userId, userId), eq(medications.isObsolete, false)));
-		const activeMedNames = new Set(activeMeds.map((med) => med.name));
+		const activeMedNames = new Set(activeMeds.map((med) => med.name || med.genericName || ""));
 		const filteredPrescriptionLow = prescriptionLow.filter((item) => activeMedNames.has(item.name));
 		if (filteredPrescriptionLow.length === 0) {
 			return reply.status(400).send({ error: "No active medications to notify" });
diff --git a/backend/src/services/intake-reminder-scheduler.ts b/backend/src/services/intake-reminder-scheduler.ts
index 7d8deaf..df06b78 100644
--- a/backend/src/services/intake-reminder-scheduler.ts
+++ b/backend/src/services/intake-reminder-scheduler.ts
@@ -106,8 +106,9 @@ async function autoMarkDueIntakesAsTaken(
 		}
 
 		const medicationTakenBy = parseTakenByJson(med.takenByJson);
+		const medDisplayName = med.name || med.genericName || "";
 		const todaysIntakes = getTodaysIntakes(
-			med.name,
+			medDisplayName,
 			intakes,
 			medicationTakenBy,
 			med.pillWeightMg,
@@ -415,9 +416,10 @@ async function checkAndSendIntakeRemindersForUser(
 		);
 		// Medication-level takenBy (for fallback/display purposes)
 		const medicationTakenBy = parseTakenByJson(med.takenByJson);
+		const medDisplayName = med.name || med.genericName || "";
 
 		logger.debug(
-			`[IntakeReminder] User ${settings.userId}: Processing medication "${med.name}" with ${intakes.length} intakes`
+			`[IntakeReminder] User ${settings.userId}: Processing medication "${medDisplayName}" with ${intakes.length} intakes`
 		);
 
 		// Filter intakes that have reminders enabled (per-intake setting or medication-level)
@@ -438,7 +440,7 @@ async function checkAndSendIntakeRemindersForUser(
 
 			// Always get upcoming intakes (15 min before) for first reminders
 			const upcomingIntakes = getUpcomingIntakes(
-				med.name,
+				medDisplayName,
 				[intake],
 				REMINDER_MINUTES_BEFORE,
 				medicationTakenBy,
@@ -465,7 +467,7 @@ async function checkAndSendIntakeRemindersForUser(
 			// If repeat reminders enabled, also check for missed intakes (past the intake time)
 			if (settings.repeatRemindersEnabled) {
 				const allTodaysIntakes = getTodaysIntakes(
-					med.name,
+					medDisplayName,
 					[intake],
 					medicationTakenBy,
 					med.pillWeightMg,
diff --git a/backend/src/services/reminder-scheduler.ts b/backend/src/services/reminder-scheduler.ts
index 32eee03..0a7dbb7 100644
--- a/backend/src/services/reminder-scheduler.ts
+++ b/backend/src/services/reminder-scheduler.ts
@@ -353,7 +353,7 @@ async function getMedicationsNeedingReminder(
 
 		if (isCritical || isLow) {
 			lowStock.push({
-				name: row.name,
+				name: row.name || row.genericName || "",
 				medsLeft: currentPills,
 				daysLeft,
 				depletionDate,
@@ -379,7 +379,7 @@ async function getMedicationsNeedingPrescriptionReminder(userId: number): Promis
 				(row.prescriptionRemainingRefills ?? 0) <= (row.prescriptionLowRefillThreshold ?? 1)
 		)
 		.map((row) => ({
-			name: row.name,
+			name: row.name || row.genericName || "",
 			remainingRefills: row.prescriptionRemainingRefills ?? 0,
 			lowThreshold: row.prescriptionLowRefillThreshold ?? 1,
 			expiryDate: row.prescriptionExpiryDate ?? null,
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 13a60e8..69dc297 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "medassist-ng-frontend",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "medassist-ng-frontend",
-      "version": "1.15.1",
+      "version": "1.16.0",
       "dependencies": {
         "i18next": "^25.8.13",
         "i18next-browser-languagedetector": "^8.2.1",
diff --git a/frontend/src/components/MedDetailModal.tsx b/frontend/src/components/MedDetailModal.tsx
index af8c08e..8639f21 100644
--- a/frontend/src/components/MedDetailModal.tsx
+++ b/frontend/src/components/MedDetailModal.tsx
@@ -15,7 +15,7 @@ import { useTranslation } from "react-i18next";
 import { Lightbox, MedicationAvatar } from "../components";
 import { useEscapeKey } from "../hooks";
 import type { Coverage, Medication, RefillEntry, StockThresholds } from "../types";
-import { getMedTotal, getPackageSize } from "../types";
+import { getMedDisplayName, getMedTotal, getPackageSize } from "../types";
 import { formatNumber, generateICS, getExpiryClass, getSystemLocale } from "../utils";
 import { getStockStatus } from "../utils/schedule";
 import { splitCurrentBlisterStock } from "../utils/stock";
@@ -193,7 +193,7 @@ export function MedDetailModal({
 
 	if (!selectedMed) return null;
 
-	const medCoverage = coverage.all.find((c) => c.name === selectedMed.name);
+	const medCoverage = coverage.all.find((c) => c.name === getMedDisplayName(selectedMed));
 	const packageSize = getPackageSize(selectedMed);
 	// Structural max = sealed package capacity only (excludes pre-existing looseTablets).
 	const structuralMax =
@@ -380,7 +380,7 @@ export function MedDetailModal({
 						<X size={18} aria-hidden="true" />
 					</button>
 					<h2>{t("editStock.title")}</h2>
-					<p className="edit-stock-med-name">{selectedMed.name}</p>
+					<p className="edit-stock-med-name">{getMedDisplayName(selectedMed)}</p>
 					<p className="edit-stock-hint">{t("editStock.hint")}</p>
 					{selectedMed.packageType === "blister" && (
 						<p className="edit-stock-cap-info edit-stock-live-breakdown">
@@ -667,12 +667,12 @@ export function MedDetailModal({
 								}
 							}}
 						>
-							<MedicationAvatar name={selectedMed.name} imageUrl={selectedMed.imageUrl} size="lg" />
+							<MedicationAvatar name={getMedDisplayName(selectedMed)} imageUrl={selectedMed.imageUrl} size="lg" />
 							{selectedMed.imageUrl && <span className="expand-icon">🔍</span>}
 						</div>
 						<div className="med-detail-titles">
-							<h2>{selectedMed.name}</h2>
-							{selectedMed.genericName && <span className="med-generic-name">{selectedMed.genericName}</span>}
+							<h2>{getMedDisplayName(selectedMed)}</h2>
+							{selectedMed.name && selectedMed.genericName && <span className="med-generic-name">{selectedMed.genericName}</span>}
 							{selectedMed.takenBy && (selectedMed.takenBy || []).length > 0 && (
 								<span className="med-taken-by">
 									{t("modal.for")}{" "}
@@ -1017,7 +1017,7 @@ export function MedDetailModal({
 
 			{/* Image Lightbox */}
 			{showImageLightbox && selectedMed.imageUrl && (
-				<Lightbox src={`/api/images/${selectedMed.imageUrl}`} alt={selectedMed.name} onClose={onCloseImageLightbox} />
+				<Lightbox src={`/api/images/${selectedMed.imageUrl}`} alt={getMedDisplayName(selectedMed)} onClose={onCloseImageLightbox} />
 			)}
 
 			{/* Refill Modal */}
@@ -1049,7 +1049,7 @@ export function MedDetailModal({
 							<X size={18} aria-hidden="true" />
 						</button>
 						<h2>{t("refill.title")}</h2>
-						<p className="refill-med-name">{selectedMed.name}</p>
+						<p className="refill-med-name">{getMedDisplayName(selectedMed)}</p>
 
 						<div className="refill-form">
 							{selectedMed.packageType === "blister" ? (
diff --git a/frontend/src/components/MobileEditModal.tsx b/frontend/src/components/MobileEditModal.tsx
index 651dad5..380f860 100644
--- a/frontend/src/components/MobileEditModal.tsx
+++ b/frontend/src/components/MobileEditModal.tsx
@@ -253,7 +253,7 @@ export function MobileEditModal({
 	const mobileTitle = (() => {
 		if (!editingId) return t("form.newEntry");
 		if (readOnlyMode) return t("form.viewEntry");
-		const medicationName = currentMed?.name?.trim() || form.name.trim();
+		const medicationName = (currentMed ? (currentMed.name?.trim() || currentMed.genericName?.trim()) : null) || form.name.trim() || form.genericName.trim();
 		if (!medicationName) return t("form.editEntry");
 		return t("form.editEntryWithName", { name: medicationName });
 	})();
@@ -361,21 +361,26 @@ export function MobileEditModal({
 												onBlur={() => setShowNameValidation(true)}
 												placeholder={t("form.placeholders.commercial")}
 												maxLength={FIELD_LIMITS.name.max}
-												required={!readOnlyMode}
 											/>
 											{!readOnlyMode && showNameValidation && fieldErrors.name && (
 												<span className="field-error">{fieldErrors.name}</span>
 											)}
 										</label>
-										<label className={`full ${fieldErrors.genericName ? "has-error" : ""}`}>
+										<label className={`full ${!readOnlyMode && showNameValidation && fieldErrors.genericName ? "has-error" : ""}`}>
 											{t("form.genericName")}
 											<input
 												value={form.genericName}
-												onChange={(e) => onFormChange({ ...form, genericName: e.target.value })}
+												onChange={(e) => {
+													setShowNameValidation(true);
+													onFormChange({ ...form, genericName: e.target.value });
+												}}
+												onBlur={() => setShowNameValidation(true)}
 												placeholder={t("form.placeholders.generic")}
 												maxLength={FIELD_LIMITS.genericName.max}
 											/>
-											{fieldErrors.genericName && <span className="field-error">{fieldErrors.genericName}</span>}
+											{!readOnlyMode && showNameValidation && fieldErrors.genericName && (
+												<span className="field-error">{fieldErrors.genericName}</span>
+											)}
 										</label>
 										<label className="full">
 											{t("form.medicationStartDate")}
diff --git a/frontend/src/components/ReportModal.tsx b/frontend/src/components/ReportModal.tsx
index 27eb460..d783df7 100644
--- a/frontend/src/components/ReportModal.tsx
+++ b/frontend/src/components/ReportModal.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import { useEscapeKey } from "../hooks/useEscapeKey";
 import { useScrollLock } from "../hooks/useScrollLock";
 import type { Medication } from "../types";
-import { getPackageSize } from "../types";
+import { getMedDisplayName, getPackageSize } from "../types";
 import { MedicationAvatar } from "./MedicationAvatar";
 
 type ReportFormat = "txt" | "md" | "pdf";
@@ -200,10 +200,10 @@ export function ReportModal({ isOpen, onClose, medications }: ReportModalProps)
 								{activeMeds.map((med) => (
 									<label key={med.id} className="report-med-item">
 										<input type="checkbox" checked={selectedIds.has(med.id)} onChange={() => toggleMed(med.id)} />
-										<MedicationAvatar name={med.name} imageUrl={med.imageUrl} size="sm" />
+										<MedicationAvatar name={getMedDisplayName(med)} imageUrl={med.imageUrl} size="sm" />
 										<span className="report-med-name">
-											{med.name}
-											{med.genericName && <span className="report-med-generic"> ({med.genericName})</span>}
+											{getMedDisplayName(med)}
+											{med.name && med.genericName && <span className="report-med-generic"> ({med.genericName})</span>}
 										</span>
 									</label>
 								))}
@@ -218,10 +218,10 @@ export function ReportModal({ isOpen, onClose, medications }: ReportModalProps)
 								{obsoleteMeds.map((med) => (
 									<label key={med.id} className="report-med-item">
 										<input type="checkbox" checked={selectedIds.has(med.id)} onChange={() => toggleMed(med.id)} />
-										<MedicationAvatar name={med.name} imageUrl={med.imageUrl} size="sm" />
+										<MedicationAvatar name={getMedDisplayName(med)} imageUrl={med.imageUrl} size="sm" />
 										<span className="report-med-name obsolete-name">
-											{med.name}
-											{med.genericName && <span className="report-med-generic"> ({med.genericName})</span>}
+											{getMedDisplayName(med)}
+											{med.name && med.genericName && <span className="report-med-generic"> ({med.genericName})</span>}
 										</span>
 									</label>
 								))}
@@ -320,13 +320,13 @@ function generateTextReport(
 	for (const med of meds) {
 		lines.push(sep);
 		lines.push("");
-		const title = med.isObsolete ? `${med.name} (${t("report.docStatusObsolete")})` : med.name;
+		const title = med.isObsolete ? `${getMedDisplayName(med)} (${t("report.docStatusObsolete")})` : getMedDisplayName(med);
 		lines.push(h2(title));
 		lines.push("");
 
 		// General
 		lines.push(h3(t("report.docGeneral")));
-		lines.push(item(t("report.docCommercialName"), med.name));
+		if (med.name) lines.push(item(t("report.docCommercialName"), med.name));
 		if (med.genericName) lines.push(item(t("report.docGenericName"), med.genericName));
 		if (med.takenBy?.length) lines.push(item(t("report.docTakenBy"), med.takenBy.join(", ")));
 		lines.push(
@@ -489,22 +489,24 @@ function buildPrintHtml(
 	for (const med of meds) {
 		const data = reportData[med.id];
 		const intakes = med.intakes ?? med.blisters;
+		const displayName = getMedDisplayName(med);
 		const title = med.isObsolete
-			? `${escHtml(med.name)} <span class="obsolete-badge">${escHtml(t("report.docStatusObsolete"))}</span>`
-			: escHtml(med.name);
+			? `${escHtml(displayName)} <span class="obsolete-badge">${escHtml(t("report.docStatusObsolete"))}</span>`
+			: escHtml(displayName);
 
 		let s = `<div class="med-section">`;
 		const imgDataUrl = imageMap[med.id];
 
 		// Title with generic name subtitle
 		s += `<h2>${title}</h2>`;
-		if (med.genericName) s += `<p class="generic-subtitle">${escHtml(med.genericName)}</p>`;
+		if (med.name && med.genericName) s += `<p class="generic-subtitle">${escHtml(med.genericName)}</p>`;
 
 		// Build general info table rows
 		const generalRows: string[] = [];
-		generalRows.push(
-			`<tr><td class="label">${escHtml(t("report.docCommercialName"))}</td><td>${escHtml(med.name)}</td></tr>`
-		);
+		if (med.name)
+			generalRows.push(
+				`<tr><td class="label">${escHtml(t("report.docCommercialName"))}</td><td>${escHtml(med.name)}</td></tr>`
+			);
 		if (med.genericName)
 			generalRows.push(
 				`<tr><td class="label">${escHtml(t("report.docGenericName"))}</td><td>${escHtml(med.genericName)}</td></tr>`
@@ -527,7 +529,7 @@ function buildPrintHtml(
 		const generalTable = `<h3>${escHtml(t("report.docGeneral"))}</h3><table><tbody>${generalRows.join("")}</tbody></table>`;
 
 		if (imgDataUrl) {
-			s += `<div class="med-overview"><img class="med-img" src="${imgDataUrl}" alt="${escHtml(med.name)}" /><div class="med-overview-info">${generalTable}</div></div>`;
+			s += `<div class="med-overview"><img class="med-img" src="${imgDataUrl}" alt="${escHtml(displayName)}" /><div class="med-overview-info">${generalTable}</div></div>`;
 		} else {
 			s += generalTable;
 		}
diff --git a/frontend/src/components/SharedSchedule.tsx b/frontend/src/components/SharedSchedule.tsx
index e0e27f3..ef91f46 100644
--- a/frontend/src/components/SharedSchedule.tsx
+++ b/frontend/src/components/SharedSchedule.tsx
@@ -9,7 +9,7 @@ import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
 import { useEscapeKey } from "../hooks";
 import type { ExpiredLinkData, SharedScheduleData } from "../types";
-import { getMedTotal } from "../types";
+import { getMedDisplayName, getMedTotal } from "../types";
 import { getSystemLocale } from "../utils/formatters";
 import { isDoseDismissed } from "../utils/schedule";
 import { loadCollapsedDaysFromStorage } from "../utils/storage";
@@ -343,7 +343,7 @@ export function SharedSchedule() {
 					doses.push({
 						id: doseId,
 						when: t,
-						medName: med.name,
+						medName: getMedDisplayName(med),
 						usage: intake.usage,
 						isPast,
 						takenBy: intake.takenBy, // Per-intake takenBy (string | null)
@@ -547,8 +547,8 @@ export function SharedSchedule() {
 			const daysLeft = rawDaysLeft !== null ? Math.max(0, Math.floor(rawDaysLeft)) : null;
 			const depletionMs = daysLeft !== null ? now + daysLeft * MS_PER_DAY : null;
 
-			coverage[med.name] = { daysLeft, medsLeft: Number(medsLeft.toFixed(1)), dailyUsage: dailyRate };
-			depletion[med.name] = depletionMs;
+			coverage[getMedDisplayName(med)] = { daysLeft, medsLeft: Number(medsLeft.toFixed(1)), dailyUsage: dailyRate };
+			depletion[getMedDisplayName(med)] = depletionMs;
 		}
 		return { coverageByMed: coverage, depletionByMed: depletion };
 	}, [data, takenDoses]);
@@ -746,7 +746,7 @@ export function SharedSchedule() {
 
 									// Count missed doses that are NOT dismissed (for warning icon)
 									const missedNotDismissedCount = day.meds.reduce((count, item) => {
-										const med = data.medications.find((m) => m.name === item.medName);
+										const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
 										const dismissedUntilDate = med?.dismissedUntil ?? undefined;
 										return (
 											count +
@@ -800,7 +800,7 @@ export function SharedSchedule() {
 											</div>
 											{!isCollapsed &&
 												day.meds.map((item) => {
-													const med = data.medications.find((m) => m.name === item.medName);
+													const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
 													const medCoverage = coverageByMed[item.medName];
 													const isEmpty = showStock && medCoverage ? medCoverage.medsLeft <= 0 : false;
 													const depletionTime = depletionByMed[item.medName];
@@ -825,10 +825,10 @@ export function SharedSchedule() {
 																<div className="med-name">
 																	<div
 																		className={med?.imageUrl ? "med-avatar clickable" : ""}
-																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, med.name)}
+																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))}
 																		onKeyDown={(e) => {
 																			if (e.key === "Enter" || e.key === " ") {
-																				if (med?.imageUrl) openLightbox(med.imageUrl, med.name);
+																				if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
 																			}
 																		}}
 																	>
@@ -984,7 +984,7 @@ export function SharedSchedule() {
 											</div>
 											{!isCollapsed &&
 												day.meds.map((item) => {
-													const med = data.medications.find((m) => m.name === item.medName);
+													const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
 													const medCoverage = coverageByMed[item.medName];
 													const isEmpty = showStock && medCoverage ? medCoverage.medsLeft <= 0 : false;
 													const depletionTime = depletionByMed[item.medName];
@@ -1008,10 +1008,10 @@ export function SharedSchedule() {
 																<div className="med-name">
 																	<div
 																		className={med?.imageUrl ? "med-avatar clickable" : ""}
-																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, med.name)}
+																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))}
 																		onKeyDown={(e) => {
 																			if (e.key === "Enter" || e.key === " ") {
-																				if (med?.imageUrl) openLightbox(med.imageUrl, med.name);
+																				if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
 																			}
 																		}}
 																	>
@@ -1161,7 +1161,7 @@ export function SharedSchedule() {
 											</div>
 											{!isCollapsed &&
 												day.meds.map((item) => {
-													const med = data.medications.find((m) => m.name === item.medName);
+													const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
 													const medCoverage = coverageByMed[item.medName];
 													const depletionTime = depletionByMed[item.medName];
 													const willBeOutOfStock = typeof depletionTime === "number" && item.lastWhen > depletionTime;
@@ -1184,10 +1184,10 @@ export function SharedSchedule() {
 																<div className="med-name">
 																	<div
 																		className={med?.imageUrl ? "med-avatar clickable" : ""}
-																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, med.name)}
+																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))}
 																		onKeyDown={(e) => {
 																			if (e.key === "Enter" || e.key === " ") {
-																				if (med?.imageUrl) openLightbox(med.imageUrl, med.name);
+																				if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
 																			}
 																		}}
 																	>
diff --git a/frontend/src/components/UserFilterModal.tsx b/frontend/src/components/UserFilterModal.tsx
index 62f1645..c2d7b0e 100644
--- a/frontend/src/components/UserFilterModal.tsx
+++ b/frontend/src/components/UserFilterModal.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { MedicationAvatar } from "../components";
 import { useEscapeKey } from "../hooks/useEscapeKey";
 import type { Coverage, Medication, StockThresholds } from "../types";
-import { getMedTotal, getPackageSize } from "../types";
+import { getMedDisplayName, getMedTotal, getPackageSize } from "../types";
 import { formatNumber } from "../utils";
 import { getSystemLocale } from "../utils/formatters";
 import { getStockStatus } from "../utils/schedule";
@@ -64,7 +64,7 @@ export function UserFilterModal({
 
 				<div className="user-meds-list">
 					{userMeds.map((med) => {
-						const medCoverage = coverage.all.find((c) => c.name === med.name);
+						const medCoverage = coverage.all.find((c) => c.name === getMedDisplayName(med));
 						// Fallback: if no coverage data (e.g. obsolete med), compute basic status from total pills
 						const status = medCoverage
 							? getStockStatus(medCoverage.daysLeft, medCoverage.medsLeft, settings)
@@ -97,10 +97,10 @@ export function UserFilterModal({
 									}
 								}}
 							>
-								<MedicationAvatar name={med.name} imageUrl={med.imageUrl} size="sm" />
+								<MedicationAvatar name={getMedDisplayName(med)} imageUrl={med.imageUrl} size="sm" />
 								<div className="user-med-info">
-									<span className="user-med-name">{med.name}</span>
-									{med.genericName && <span className="user-med-generic">{med.genericName}</span>}
+									<span className="user-med-name">{getMedDisplayName(med)}</span>
+									{med.name && med.genericName && <span className="user-med-generic">{med.genericName}</span>}
 									{personIntakes.length > 0 && (
 										<div className="user-med-intakes">
 											{personIntakes.map((intake) => {
diff --git a/frontend/src/hooks/useMedicationForm.ts b/frontend/src/hooks/useMedicationForm.ts
index 6b3df69..13f3f89 100644
--- a/frontend/src/hooks/useMedicationForm.ts
+++ b/frontend/src/hooks/useMedicationForm.ts
@@ -115,9 +115,6 @@ export function useMedicationForm(): UseMedicationFormReturn {
 			// Skip validation for takenBy array (individual items validated on add)
 			if (field === "takenBy") return undefined;
 			const strValue = typeof value === "string" ? value : "";
-			if (field === "name" && (!strValue || strValue.trim().length === 0)) {
-				return t("common.validation.required");
-			}
 			if ("max" in limits && strValue.length > limits.max) {
 				return t("common.validation.maxLength", { max: limits.max, current: strValue.length });
 			}
@@ -150,8 +147,16 @@ export function useMedicationForm(): UseMedicationFormReturn {
 			const error = validateField(f, form[f]);
 			if (error) errors[f] = error;
 		});
+		// Cross-field validation: at least one of name or genericName is required
+		const hasName = form.name && form.name.trim().length > 0;
+		const hasGenericName = form.genericName && form.genericName.trim().length > 0;
+		if (!hasName && !hasGenericName) {
+			const msg = t("common.validation.nameOrGenericRequired");
+			errors.name = errors.name || msg;
+			errors.genericName = errors.genericName || msg;
+		}
 		setFieldErrors(errors);
-	}, [form.name, form.genericName, form.notes, validateField, form]);
+	}, [form.name, form.genericName, form.notes, validateField, form, t]);
 
 	const setBlisterValue = useCallback((idx: number, field: keyof FormBlister, value: string) => {
 		setForm((prev) => {
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index db5ca3a..acfcb7a 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -192,7 +192,7 @@
     },
     "placeholders": {
       "commercial": "z.B. Ozempic",
-      "generic": "z.B. Semaglutid (optional)",
+      "generic": "z.B. Semaglutid",
       "takenBy": "Name eingeben und Enter drücken",
       "addPerson": "Weitere Person hinzufügen...",
       "weight": "z.B. 240",
@@ -436,6 +436,7 @@
     },
     "validation": {
       "required": "Dieses Feld ist erforderlich",
+      "nameOrGenericRequired": "Handelsname oder Wirkstoff ist erforderlich",
       "maxLength": "Maximal {{max}} Zeichen ({{current}}/{{max}})",
       "tooLong": "{{current}}/{{max}} Zeichen"
     },
diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
index 3373d51..b574b7e 100644
--- a/frontend/src/i18n/en.json
+++ b/frontend/src/i18n/en.json
@@ -192,7 +192,7 @@
     },
     "placeholders": {
       "commercial": "e.g. Ozempic",
-      "generic": "e.g. Semaglutide (optional)",
+      "generic": "e.g. Semaglutide",
       "takenBy": "Type name and press Enter",
       "addPerson": "Add another person...",
       "weight": "e.g. 240",
@@ -436,6 +436,7 @@
     },
     "validation": {
       "required": "This field is required",
+      "nameOrGenericRequired": "Either commercial name or generic name is required",
       "maxLength": "Maximum {{max}} characters ({{current}}/{{max}})",
       "tooLong": "{{current}}/{{max}} characters"
     },
diff --git a/frontend/src/pages/DashboardPage.tsx b/frontend/src/pages/DashboardPage.tsx
index aeb1bdd..ba9b526 100644
--- a/frontend/src/pages/DashboardPage.tsx
+++ b/frontend/src/pages/DashboardPage.tsx
@@ -8,6 +8,7 @@ import { useAppContext } from "../context";
 import { useModalHistory } from "../hooks";
 import { formatNumber, getExpiryClass, getSystemLocale } from "../utils/formatters";
 import { expandDoseIds, getStockStatus, isDoseDismissed } from "../utils/schedule";
+import { getMedDisplayName } from "../types";
 import {
 	formatFullBlisters,
 	formatOpenBlisterAndLoose,
@@ -118,7 +119,7 @@ export function DashboardPage() {
 		})
 		.map((med) => ({
 			id: med.id,
-			name: med.name,
+			name: getMedDisplayName(med),
 			remainingRefills: med.prescriptionRemainingRefills ?? 0,
 			threshold: med.prescriptionLowRefillThreshold ?? 1,
 		}))
@@ -250,7 +251,7 @@ export function DashboardPage() {
 									<span className="reminder-status-label">{t("dashboard.reminders.needsRefill")}:</span>
 									<span className="reminder-status-value">
 										{reminderData.lowStockMeds.map((med, idx) => {
-											const medication = meds.find((m) => m.name === med.name);
+											const medication = meds.find((m) => getMedDisplayName(m) === med.name);
 											const cov = coverage.all.find((c) => c.name === med.name);
 											const status = cov ? getStockStatus(cov.daysLeft, cov.medsLeft, stockThresholds) : null;
 											const textClass =
@@ -322,7 +323,7 @@ export function DashboardPage() {
 											(() => {
 												const names = reminderData.lastStockSent!.medNames!.split(", ");
 												return names.map((name, idx) => {
-													const medication = meds.find((m) => m.name === name);
+													const medication = meds.find((m) => getMedDisplayName(m) === name);
 													return (
 														<span key={name}>
 															{idx > 0 && ", "}
@@ -353,7 +354,7 @@ export function DashboardPage() {
 									<span className="reminder-status-value">
 										{reminderData.lastIntakeSent.medName &&
 											(() => {
-												const medication = meds.find((m) => m.name === reminderData.lastIntakeSent!.medName);
+												const medication = meds.find((m) => getMedDisplayName(m) === reminderData.lastIntakeSent!.medName);
 												return medication ? (
 													<span
 														className="med-link clickable"
@@ -428,7 +429,7 @@ export function DashboardPage() {
 								<p>
 									{t("dashboard.reorder.lowWarningPrefix")}{" "}
 									{lowStockMeds.map((c, idx) => {
-										const med = meds.find((m) => m.name === c.name);
+										const med = meds.find((m) => getMedDisplayName(m) === c.name);
 										const status = getStockStatus(c.daysLeft, c.medsLeft, stockThresholds);
 										const textClass =
 											status.className === "danger"
@@ -485,7 +486,7 @@ export function DashboardPage() {
 							</div>
 							{coverage.all.map((row) => {
 								const status = getStockStatus(row.daysLeft, row.medsLeft, stockThresholds);
-								const med = meds.find((m) => m.name === row.name);
+								const med = meds.find((m) => getMedDisplayName(m) === row.name);
 								const expiryClass = getExpiryClass(med?.expiryDate, settings.expiryWarningDays);
 								const textClass =
 									status.className === "danger"
@@ -673,7 +674,7 @@ export function DashboardPage() {
 
 									// Count missed doses that are NOT dismissed (for warning icon)
 									const missedNotDismissedCount = day.meds.reduce((count, item) => {
-										const med = meds.find((m) => m.name === item.medName);
+										const med = meds.find((m) => getMedDisplayName(m) === item.medName);
 										const dismissedUntilDate = med?.dismissedUntil ?? undefined;
 										return (
 											count +
@@ -729,7 +730,7 @@ export function DashboardPage() {
 											</div>
 											{!isCollapsed &&
 												day.meds.map((item) => {
-													const med = meds.find((m) => m.name === item.medName);
+													const med = meds.find((m) => getMedDisplayName(m) === item.medName);
 													const medCov = coverageByMed[item.medName];
 													const isEmpty = medCov ? medCov.medsLeft <= 0 : false;
 													const status = medCov
@@ -986,7 +987,7 @@ export function DashboardPage() {
 											{!isCollapsed &&
 												day.meds.map((item) => {
 													const medCoverage = coverageByMed[item.medName];
-													const med = meds.find((m) => m.name === item.medName);
+													const med = meds.find((m) => getMedDisplayName(m) === item.medName);
 													const depletionTime = depletionByMed[item.medName];
 													const isEmpty = medCoverage ? medCoverage.medsLeft <= 0 : false;
 													const willBeOutOfStock = typeof depletionTime === "number" && item.lastWhen > depletionTime;
@@ -1217,7 +1218,7 @@ export function DashboardPage() {
 											{!isCollapsed &&
 												day.meds.map((item) => {
 													const medCoverage = coverageByMed[item.medName];
-													const med = meds.find((m) => m.name === item.medName);
+													const med = meds.find((m) => getMedDisplayName(m) === item.medName);
 													const depletionTime = depletionByMed[item.medName];
 													const _isEmpty = medCoverage ? medCoverage.medsLeft <= 0 : false;
 													const willBeOutOfStock = typeof depletionTime === "number" && item.lastWhen > depletionTime;
diff --git a/frontend/src/pages/MedicationsPage.tsx b/frontend/src/pages/MedicationsPage.tsx
index 8900757..aa01e42 100644
--- a/frontend/src/pages/MedicationsPage.tsx
+++ b/frontend/src/pages/MedicationsPage.tsx
@@ -18,7 +18,7 @@ import { useAuth } from "../components/Auth";
 import { useAppContext, useUnsavedChanges } from "../context";
 import { useMedicationForm, useModalHistory, useUnsavedChangesWarning } from "../hooks";
 import type { DoseUnit, Medication } from "../types";
-import { DOSE_UNITS, FIELD_LIMITS, getPackageSize } from "../types";
+import { DOSE_UNITS, FIELD_LIMITS, getPackageSize, getMedDisplayName } from "../types";
 import { combineDateAndTime, formatDate, formatDateTime, formatNumber } from "../utils/formatters";
 import { MAX_IMAGE_UPLOAD_BYTES, resolveImageUploadError } from "../utils/image-upload";
 import { log } from "../utils/logger";
@@ -836,19 +836,19 @@ export function MedicationsPage() {
 												<span
 													className={med.imageUrl ? "med-avatar-clickable" : undefined}
 													onClick={() =>
-														med.imageUrl && setLightboxImage({ src: `/api/images/${med.imageUrl}`, alt: med.name })
+														med.imageUrl && setLightboxImage({ src: `/api/images/${med.imageUrl}`, alt: getMedDisplayName(med) })
 													}
 													onKeyDown={(e) => {
 														if (e.key === "Enter" || e.key === " ") {
-															if (med.imageUrl) setLightboxImage({ src: `/api/images/${med.imageUrl}`, alt: med.name });
+															if (med.imageUrl) setLightboxImage({ src: `/api/images/${med.imageUrl}`, alt: getMedDisplayName(med) });
 														}
 													}}
 												>
-													<MedicationAvatar name={med.name} imageUrl={med.imageUrl} size="lg" />
+													<MedicationAvatar name={getMedDisplayName(med)} imageUrl={med.imageUrl} size="lg" />
 												</span>
 												<div className="med-name-block">
-													<div className="med-name">{med.name}</div>
-													{med.genericName && <div className="med-generic-name">{med.genericName}</div>}
+													<div className="med-name">{getMedDisplayName(med)}</div>
+													{med.name && med.genericName && <div className="med-generic-name">{med.genericName}</div>}
 												</div>
 											</div>
 											<div className="med-actions">
@@ -910,10 +910,10 @@ export function MedicationsPage() {
 											)}
 											<div className="med-total">
 												{t("medications.details.stock")}:{" "}
-												{coverageByMed[med.name] ? Math.round(coverageByMed[med.name].medsLeft) : getPackageSize(med)} /{" "}
+												{coverageByMed[getMedDisplayName(med)] ? Math.round(coverageByMed[getMedDisplayName(med)].medsLeft) : getPackageSize(med)} /{" "}
 												{getPackageSize(med)} {getPackageSize(med) === 1 ? t("common.pill") : t("common.pills")}
-												{(coverageByMed[med.name]
-													? Math.round(coverageByMed[med.name].medsLeft)
+												{(coverageByMed[getMedDisplayName(med)]
+													? Math.round(coverageByMed[getMedDisplayName(med)].medsLeft)
 													: getPackageSize(med)) > getPackageSize(med) && (
 													<span
 														className="info-tooltip tooltip-align-left warning-text"
@@ -970,20 +970,20 @@ export function MedicationsPage() {
 														<span
 															className={med.imageUrl ? "med-avatar-clickable" : undefined}
 															onClick={() =>
-																med.imageUrl && setLightboxImage({ src: `/api/images/${med.imageUrl}`, alt: med.name })
+																med.imageUrl && setLightboxImage({ src: `/api/images/${med.imageUrl}`, alt: getMedDisplayName(med) })
 															}
 															onKeyDown={(e) => {
 																if (e.key === "Enter" || e.key === " ") {
 																	if (med.imageUrl)
-																		setLightboxImage({ src: `/api/images/${med.imageUrl}`, alt: med.name });
+																		setLightboxImage({ src: `/api/images/${med.imageUrl}`, alt: getMedDisplayName(med) });
 																}
 															}}
 														>
-															<MedicationAvatar name={med.name} imageUrl={med.imageUrl} size="lg" />
+															<MedicationAvatar name={getMedDisplayName(med)} imageUrl={med.imageUrl} size="lg" />
 														</span>
 														<div className="med-name-block">
-															<div className="med-name">{med.name}</div>
-															{med.genericName && <div className="med-generic-name">{med.genericName}</div>}
+															<div className="med-name">{getMedDisplayName(med)}</div>
+															{med.name && med.genericName && <div className="med-generic-name">{med.genericName}</div>}
 														</div>
 													</div>
 													<div className="med-actions">
@@ -1106,21 +1106,26 @@ export function MedicationsPage() {
 											onBlur={() => setShowNameValidation(true)}
 											placeholder={t("form.placeholders.commercial")}
 											maxLength={FIELD_LIMITS.name.max}
-											required={!readOnlyView}
 										/>
 										{!readOnlyView && showNameValidation && fieldErrors.name && (
 											<span className="field-error">{fieldErrors.name}</span>
 										)}
 									</label>
-									<label className={fieldErrors.genericName ? "has-error" : ""}>
+									<label className={!readOnlyView && showNameValidation && fieldErrors.genericName ? "has-error" : ""}>
 										{t("form.genericName")}
 										<input
 											value={form.genericName}
-											onChange={(e) => setForm({ ...form, genericName: e.target.value })}
+											onChange={(e) => {
+												setShowNameValidation(true);
+												setForm({ ...form, genericName: e.target.value });
+											}}
+											onBlur={() => setShowNameValidation(true)}
 											placeholder={t("form.placeholders.generic")}
 											maxLength={FIELD_LIMITS.genericName.max}
 										/>
-										{fieldErrors.genericName && <span className="field-error">{fieldErrors.genericName}</span>}
+										{!readOnlyView && showNameValidation && fieldErrors.genericName && (
+											<span className="field-error">{fieldErrors.genericName}</span>
+										)}
 									</label>
 									<label>
 										{t("form.medicationStartDate")}
diff --git a/frontend/src/pages/PlannerPage.tsx b/frontend/src/pages/PlannerPage.tsx
index 94402b0..8d7e195 100644
--- a/frontend/src/pages/PlannerPage.tsx
+++ b/frontend/src/pages/PlannerPage.tsx
@@ -5,6 +5,7 @@ import { DateTimeInput, MedicationAvatar } from "../components";
 import { useAuth } from "../components/Auth";
 import { useAppContext } from "../context";
 import type { PlannerRow } from "../types";
+import { getMedDisplayName } from "../types";
 import { toInputValue } from "../utils/formatters";
 
 // Date helpers
@@ -204,7 +205,7 @@ export function PlannerPage() {
 							</div>
 							{plannerRows.map((row) => {
 								const med =
-									meds.find((m) => m.id === row.medicationId) || meds.find((m) => m.name === row.medicationName);
+									meds.find((m) => m.id === row.medicationId) || meds.find((m) => getMedDisplayName(m) === row.medicationName);
 								const remainingRefills = med?.prescriptionEnabled ? (med.prescriptionRemainingRefills ?? 0) : null;
 								return (
 									<div
diff --git a/frontend/src/pages/SchedulePage.tsx b/frontend/src/pages/SchedulePage.tsx
index 49b50dd..f28cb39 100644
--- a/frontend/src/pages/SchedulePage.tsx
+++ b/frontend/src/pages/SchedulePage.tsx
@@ -5,6 +5,7 @@ import { MedicationAvatar } from "../components";
 import { useAuth } from "../components/Auth";
 import { useAppContext } from "../context";
 import type { Coverage } from "../types";
+import { getMedDisplayName } from "../types";
 import { expandDoseIds, isDoseDismissed } from "../utils/schedule";
 
 // Helper for user-specific localStorage keys
@@ -116,7 +117,7 @@ export function SchedulePage() {
 
 							// Count missed doses that are NOT dismissed (for warning icon)
 							const missedNotDismissedCount = day.meds.reduce((count, item) => {
-								const med = meds.find((m) => m.name === item.medName);
+								const med = meds.find((m) => getMedDisplayName(m) === item.medName);
 								const dismissedUntilDate = med?.dismissedUntil ?? undefined;
 								return (
 									count +
@@ -171,7 +172,7 @@ export function SchedulePage() {
 									</div>
 									{!isCollapsed &&
 										day.meds.map((item) => {
-											const med = meds.find((m) => m.name === item.medName);
+											const med = meds.find((m) => getMedDisplayName(m) === item.medName);
 											const medCov = coverageByMed[item.medName];
 											const isEmpty = medCov ? medCov.medsLeft <= 0 : false;
 											const itemDoseIds = expandDoseIds(item.doses);
@@ -333,7 +334,7 @@ export function SchedulePage() {
 								{day.meds.map((item) => {
 									const medCoverage = coverageByMed[item.medName];
 									const isEmpty = medCoverage ? medCoverage.medsLeft <= 0 : false;
-									const med = meds.find((m) => m.name === item.medName);
+									const med = meds.find((m) => getMedDisplayName(m) === item.medName);
 									const depletionTime = depletionByMed[item.medName];
 									// Check if this dose is scheduled after medication runs out
 									const willBeOutOfStock = typeof depletionTime === "number" && item.lastWhen > depletionTime;
diff --git a/frontend/src/test/hooks/useMedicationForm.test.ts b/frontend/src/test/hooks/useMedicationForm.test.ts
index d59b459..851ccaf 100644
--- a/frontend/src/test/hooks/useMedicationForm.test.ts
+++ b/frontend/src/test/hooks/useMedicationForm.test.ts
@@ -123,7 +123,7 @@ describe("useMedicationForm", () => {
 		expect(result.current.formChanged).toBe(false);
 
 		await waitFor(() => {
-			expect(result.current.fieldErrors.name).toBe("common.validation.required");
+			expect(result.current.fieldErrors.name).toBe("common.validation.nameOrGenericRequired");
 			expect(result.current.hasValidationErrors).toBe(true);
 		});
 	});
@@ -131,7 +131,8 @@ describe("useMedicationForm", () => {
 	it("validates name required and max length fields", () => {
 		const { result } = renderHook(() => useMedicationForm());
 
-		expect(result.current.validateField("name", "")).toBe("common.validation.required");
+		// Cross-field validation: empty name alone returns no per-field error
+		expect(result.current.validateField("name", "")).toBeUndefined();
 		expect(result.current.validateField("takenBy", ["Alice"])).toBeUndefined();
 
 		const tooLongGeneric = "a".repeat(101);
diff --git a/frontend/src/test/types.test.ts b/frontend/src/test/types.test.ts
index 768cb0e..4e051ba 100644
--- a/frontend/src/test/types.test.ts
+++ b/frontend/src/test/types.test.ts
@@ -152,7 +152,7 @@ describe("getPackageSize", () => {
 
 describe("FIELD_LIMITS", () => {
 	it("has correct limits for name field", () => {
-		expect(FIELD_LIMITS.name.min).toBe(1);
+		expect(FIELD_LIMITS.name.min).toBe(0);
 		expect(FIELD_LIMITS.name.max).toBe(100);
 	});
 
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 645ae46..871d210 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -230,12 +230,17 @@ export type ExpiredLinkData = {
 // Field Validation Limits (must match backend)
 // =============================================================================
 export const FIELD_LIMITS = {
-	name: { min: 1, max: 100 },
+	name: { min: 0, max: 100 },
 	genericName: { max: 100 },
 	takenBy: { max: 100 },
 	notes: { max: 2000 },
 } as const;
 
+/** Returns the best display name for a medication: commercial name, or generic name as fallback */
+export function getMedDisplayName(med: { name: string; genericName?: string | null }): string {
+	return med.name || med.genericName || "";
+}
+
 // =============================================================================
 // Helper Functions for Medication Calculations
 // =============================================================================
diff --git a/frontend/src/utils/ics.ts b/frontend/src/utils/ics.ts
index 2ab8fec..8018623 100644
--- a/frontend/src/utils/ics.ts
+++ b/frontend/src/utils/ics.ts
@@ -3,6 +3,7 @@
 // =============================================================================
 
 import type { Medication } from "../types";
+import { getMedDisplayName } from "../types";
 
 /**
  * Format a Date for ICS format (YYYYMMDDTHHMMSSZ)
@@ -18,6 +19,7 @@ function formatICSDate(date: Date): string {
  * Generate and download an ICS calendar file for a medication's schedule
  */
 export function generateICS(med: Medication): void {
+	const displayName = getMedDisplayName(med);
 	const events = med.blisters
 		.map((blister, idx) => {
 			const start = new Date(blister.start);
@@ -25,9 +27,9 @@ export function generateICS(med: Medication): void {
 			const interval = blister.every;
 
 			const pillInfo = `${blister.usage} pill${blister.usage !== 1 ? "s" : ""}${med.pillWeightMg ? ` (${blister.usage * med.pillWeightMg} mg)` : ""}`;
-			const summary = `💊 ${med.name} - ${pillInfo}`;
+			const summary = `💊 ${displayName} - ${pillInfo}`;
 			const description = [
-				`Medication: ${med.name}`,
+				`Medication: ${displayName}`,
 				med.genericName ? `Generic: ${med.genericName}` : "",
 				med.takenBy && med.takenBy.length > 0 ? `For: ${med.takenBy.join(", ")}` : "",
 				`Dosage: ${pillInfo}`,
@@ -48,7 +50,7 @@ DESCRIPTION:${description}
 BEGIN:VALARM
 TRIGGER:-PT5M
 ACTION:DISPLAY
-DESCRIPTION:Time to take ${med.name}
+DESCRIPTION:Time to take ${displayName}
 END:VALARM
 END:VEVENT`;
 		})
@@ -59,7 +61,7 @@ VERSION:2.0
 PRODID:-//MedAssist-ng//Medication Schedule//EN
 CALSCALE:GREGORIAN
 METHOD:PUBLISH
-X-WR-CALNAME:${med.name} Schedule
+X-WR-CALNAME:${displayName} Schedule
 ${events}
 END:VCALENDAR`;
 
@@ -67,7 +69,7 @@ END:VCALENDAR`;
 	const url = URL.createObjectURL(blob);
 	const link = document.createElement("a");
 	link.href = url;
-	link.download = `${med.name.replace(/[^a-zA-Z0-9]/g, "_")}_schedule.ics`;
+	link.download = `${displayName.replace(/[^a-zA-Z0-9]/g, "_")}_schedule.ics`;
 	document.body.appendChild(link);
 	link.click();
 	document.body.removeChild(link);
diff --git a/frontend/src/utils/schedule.ts b/frontend/src/utils/schedule.ts
index f3ab444..0ae6592 100644
--- a/frontend/src/utils/schedule.ts
+++ b/frontend/src/utils/schedule.ts
@@ -3,7 +3,7 @@
 // =============================================================================
 
 import type { Blister, Coverage, Intake, Medication, ScheduleEvent, StockStatus, StockThresholds } from "../types";
-import { getMedTotal } from "../types";
+import { getMedDisplayName, getMedTotal } from "../types";
 
 /**
  * Get intakes for a medication, preferring new intakes format over legacy blisters
@@ -63,7 +63,7 @@ export function buildSchedulePreview(
 				const dateOnlyMs = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
 				events.push({
 					id: `${med.id}-${idx}-${dateOnlyMs}`,
-					medName: med.name,
+					medName: getMedDisplayName(med),
 					takenBy: intake.takenBy, // Per-intake takenBy (string | null)
 					usage: intake.usage,
 					when: whenMs,
@@ -267,10 +267,11 @@ export function calculateCoverage(
 			depletionMs !== null
 				? new Date(depletionMs).toLocaleDateString(locale, { weekday: "short", day: "2-digit", month: "short" })
 				: null;
-		const nextEvent = events.find((e) => e.medName === m.name);
+		const displayName = getMedDisplayName(m);
+		const nextEvent = events.find((e) => e.medName === displayName);
 
 		return {
-			name: m.name,
+			name: displayName,
 			medsLeft: Number(medsLeft.toFixed(1)),
 			daysLeft,
 			depletionDate,