diff --git a/app/(app)/employees/page.tsx b/app/(app)/employees/page.tsx
index ab4d4dd..d490a34 100644
--- a/app/(app)/employees/page.tsx
+++ b/app/(app)/employees/page.tsx
@@ -9,7 +9,7 @@ import { currentUserId } from "@/lib/auth/session";
 import { sql, withUser } from "@/lib/db";
 import { istPersonalnummer, suchMuster } from "@/lib/employee-search";
 import { derivedStatusFilter } from "@/lib/employee-status-filter";
-import { fmtDate, todayIso } from "@/lib/format";
+import { fmtDate, fmtName, todayIso } from "@/lib/format";
 import { breadcrumbLabel, divisionOf, loadOrgMaps, subtreeOf, unitOf } from "@/lib/org";
 import { loadPlacements } from "@/lib/placement";
 import type { EmploymentStatus } from "@/lib/supabase/types";
@@ -240,7 +240,7 @@ export default async function EmployeesPage({ searchParams }: EmployeesPageProps
                       <Avatar firstName={e.first_name} lastName={e.last_name} />
                       <div className="min-w-0">
                         <div className="truncate font-semibold text-ink">
-                          {e.first_name} {e.last_name}
+                          {fmtName(e.first_name, e.last_name)}
                         </div>
                         <div className="truncate text-xs text-ink-muted">{placement?.jobTitle ?? e.job_title}</div>
                       </div>
diff --git a/app/(app)/page.tsx b/app/(app)/page.tsx
index 55936ee..37d9e54 100644
--- a/app/(app)/page.tsx
+++ b/app/(app)/page.tsx
@@ -3,7 +3,7 @@ import Link from "next/link";
 import { DraftsCard } from "@/components/dashboard/DraftsCard";
 import { Card, CARD_CLASS, CardTitle } from "@/components/ui/Card";
 import { actionBadgeStyle } from "@/lib/colors";
-import { addDaysIso, fmtDate, todayIso } from "@/lib/format";
+import { addDaysIso, fmtDate, fmtName, todayIso } from "@/lib/format";
 import { divisionOf, loadOrgMaps } from "@/lib/org";
 import { loadPlacements } from "@/lib/placement";
 import { loadOpenPositions } from "@/lib/positions";
@@ -205,19 +205,19 @@ export default async function DashboardPage() {
   const upcoming: UpcomingItem[] = [
     ...(upcomingHires).map((e) => ({
       id: e.id,
-      label: `${e.first_name} ${e.last_name}`,
+      label: fmtName(e.first_name, e.last_name),
       date: e.entry_date,
       kind: "hire" as const,
     })),
     ...(upcomingExits).map((e) => ({
       id: e.id,
-      label: `${e.first_name} ${e.last_name}`,
+      label: fmtName(e.first_name, e.last_name),
       date: e.exit_date!,
       kind: "exit" as const,
     })),
     ...(upcomingReturns).map((e) => ({
       id: e.id,
-      label: `${e.first_name} ${e.last_name}`,
+      label: fmtName(e.first_name, e.last_name),
       date: e.karenz_return_date!,
       kind: "return" as const,
     })),
@@ -338,7 +338,7 @@ export default async function DashboardPage() {
                 <span className={`mt-1.5 h-2 w-2 shrink-0 rounded-full ${DOT_STYLES[h.event_type] ?? "bg-ink-muted"}`} aria-hidden />
                 <div className="min-w-0 flex-1">
                   <div className="flex flex-wrap items-center gap-x-2 gap-y-1">
-                    <span className="text-sm font-semibold text-ink">{h.first_name && h.last_name ? `${h.first_name} ${h.last_name}` : "Unbekannt"}</span>
+                    <span className="text-sm font-semibold text-ink">{h.first_name && h.last_name ? fmtName(h.first_name, h.last_name) : "Unbekannt"}</span>
                     <span className={`rounded-full px-2 py-0.5 text-[11px] font-semibold ${actionBadgeStyle(h.event_type)}`}>
                       {h.event_type}
                     </span>
diff --git a/app/api/export/employees/route.ts b/app/api/export/employees/route.ts
index 8c32f88..2e779d3 100644
--- a/app/api/export/employees/route.ts
+++ b/app/api/export/employees/route.ts
@@ -1,7 +1,7 @@
 import { NextResponse, type NextRequest } from "next/server";
 import { statusLabel } from "@/lib/absence";
 import { exportFilename, exportResponseHeaders, toCsv, toXlsx, type ExportColumn } from "@/lib/export";
-import { todayIso } from "@/lib/format";
+import { fmtName, todayIso } from "@/lib/format";
 import { subtreeOf } from "@/lib/org";
 import { loadPlacements, loadReportingLineMap } from "@/lib/placement";
 import { LEERE_CRITERIA, parseCriteria, passtImSpeicher } from "@/lib/report-criteria";
@@ -76,7 +76,7 @@ export async function GET(request: NextRequest) {
     }
   );
 
-  const managerName = new Map(allEmployees.map((e) => [e.id, `${e.first_name} ${e.last_name}`]));
+  const managerName = new Map(allEmployees.map((e) => [e.id, fmtName(e.first_name, e.last_name)]));
   // Der Einheitenfilter meint den ganzen Teilbaum — sonst enthielte ein
   // Export für "Produktion" nur die Bereichsleitung.
   const allowedUnits = filters.division ? new Set(subtreeOf(orgMaps, filters.division)) : null;
diff --git a/components/employees/panels/KarenzPanel.tsx b/components/employees/panels/KarenzPanel.tsx
index 3522ac2..6eb9d7f 100644
--- a/components/employees/panels/KarenzPanel.tsx
+++ b/components/employees/panels/KarenzPanel.tsx
@@ -9,7 +9,7 @@ import { SegmentedControl } from "@/components/ui/SegmentedControl";
 import { SlideOver } from "@/components/ui/SlideOver";
 import { useToast } from "@/components/ui/Toast";
 import { ABSENCE_TYPES, absenceLabel } from "@/lib/absence";
-import { fmtDate } from "@/lib/format";
+import { fmtDate, fmtName } from "@/lib/format";
 import type { Database } from "@/lib/supabase/types";
 
 type EmployeeRow = Database["public"]["Tables"]["employees"]["Row"];
@@ -127,7 +127,7 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
       open={open}
       onClose={onClose}
       title={isOnKarenz ? "Langzeitabwesenheit verwalten" : "Langzeitabwesenheit erfassen"}
-      subtitle={`${employee.first_name} ${employee.last_name} · ${employee.job_title}`}
+      subtitle={`${fmtName(employee.first_name, employee.last_name)} · ${employee.job_title}`}
       footer={
         <>
           <Button variant="ghost" onClick={onClose}>
diff --git a/components/employees/panels/PromotePanel.tsx b/components/employees/panels/PromotePanel.tsx
index d19dca5..67935c3 100644
--- a/components/employees/panels/PromotePanel.tsx
+++ b/components/employees/panels/PromotePanel.tsx
@@ -8,6 +8,7 @@ import { SelectField, TextField } from "@/components/ui/Field";
 import { SlideOver } from "@/components/ui/SlideOver";
 import { useToast } from "@/components/ui/Toast";
 import type { Database, PaygradeType } from "@/lib/supabase/types";
+import { fmtName } from "@/lib/format";
 
 type EmployeeRow = Database["public"]["Tables"]["employees"]["Row"];
 
@@ -55,7 +56,7 @@ export function PromotePanel({ open, onClose, employee }: { open: boolean; onClo
       open={open}
       onClose={onClose}
       title="Beförderung"
-      subtitle={`${employee.first_name} ${employee.last_name} · ${employee.job_title}`}
+      subtitle={`${fmtName(employee.first_name, employee.last_name)} · ${employee.job_title}`}
       footer={
         <>
           <Button variant="ghost" onClick={onClose}>
diff --git a/components/employees/panels/RehirePanel.tsx b/components/employees/panels/RehirePanel.tsx
index 887c425..683923c 100644
--- a/components/employees/panels/RehirePanel.tsx
+++ b/components/employees/panels/RehirePanel.tsx
@@ -7,7 +7,7 @@ import { Button } from "@/components/ui/Button";
 import { SelectField, TextField } from "@/components/ui/Field";
 import { SlideOver } from "@/components/ui/SlideOver";
 import { useToast } from "@/components/ui/Toast";
-import { fmtDate } from "@/lib/format";
+import { fmtDate, fmtName } from "@/lib/format";
 import type { OpenPositionResolved } from "@/lib/positions";
 import type { Database } from "@/lib/supabase/types";
 
@@ -87,7 +87,7 @@ export function RehirePanel({
       open={open}
       onClose={onClose}
       title="Wiedereinstellung"
-      subtitle={`${employee.first_name} ${employee.last_name}`}
+      subtitle={fmtName(employee.first_name, employee.last_name)}
       footer={
         <>
           <Button variant="ghost" onClick={onClose}>
diff --git a/components/employees/panels/TerminatePanel.tsx b/components/employees/panels/TerminatePanel.tsx
index 5946f97..933779c 100644
--- a/components/employees/panels/TerminatePanel.tsx
+++ b/components/employees/panels/TerminatePanel.tsx
@@ -8,6 +8,7 @@ import { SelectField, TextField, TextareaField } from "@/components/ui/Field";
 import { SlideOver } from "@/components/ui/SlideOver";
 import { useToast } from "@/components/ui/Toast";
 import type { Database } from "@/lib/supabase/types";
+import { fmtName } from "@/lib/format";
 
 type EmployeeRow = Database["public"]["Tables"]["employees"]["Row"];
 
@@ -52,7 +53,7 @@ export function TerminatePanel({ open, onClose, employee, directReportCount }: T
       open={open}
       onClose={onClose}
       title="Austritt"
-      subtitle={`${employee.first_name} ${employee.last_name} · ${employee.job_title}`}
+      subtitle={`${fmtName(employee.first_name, employee.last_name)} · ${employee.job_title}`}
       footer={
         <>
           <Button variant="ghost" onClick={onClose}>
diff --git a/components/employees/panels/TransferPanel.tsx b/components/employees/panels/TransferPanel.tsx
index abe56c0..d70b5a1 100644
--- a/components/employees/panels/TransferPanel.tsx
+++ b/components/employees/panels/TransferPanel.tsx
@@ -9,6 +9,7 @@ import { SlideOver } from "@/components/ui/SlideOver";
 import { useToast } from "@/components/ui/Toast";
 import type { OpenPositionResolved } from "@/lib/positions";
 import type { Database } from "@/lib/supabase/types";
+import { fmtName } from "@/lib/format";
 
 type EmployeeRow = Database["public"]["Tables"]["employees"]["Row"];
 
@@ -68,7 +69,7 @@ export function TransferPanel({ open, onClose, employee, openPositions }: Transf
       open={open}
       onClose={onClose}
       title="Versetzung"
-      subtitle={`${employee.first_name} ${employee.last_name} · ${employee.job_title}`}
+      subtitle={`${fmtName(employee.first_name, employee.last_name)} · ${employee.job_title}`}
       footer={
         <>
           <Button variant="ghost" onClick={onClose}>
diff --git a/components/employees/tabs/OrganisationTab.tsx b/components/employees/tabs/OrganisationTab.tsx
index 692cfd8..fcd4ae4 100644
--- a/components/employees/tabs/OrganisationTab.tsx
+++ b/components/employees/tabs/OrganisationTab.tsx
@@ -2,6 +2,7 @@ import { Network } from "lucide-react";
 import Link from "next/link";
 import { Avatar } from "@/components/ui/Avatar";
 import { LINK_BUTTON_CLASS } from "@/components/ui/Button";
+import { fmtName } from "@/lib/format";
 
 type MiniEmployee = { id: string; first_name: string; last_name: string; job_title: string; status?: string };
 
@@ -37,7 +38,7 @@ export function OrganisationTab({ employeeId, manager, formalManager, directRepo
         </h3>
         {formalManager && (
           <p className="mb-2 text-xs text-ink-muted">
-            Zuständig ist {formalManager.first_name} {formalManager.last_name}; während der Abwesenheit übernimmt die nächste
+            Zuständig ist {fmtName(formalManager.first_name, formalManager.last_name)}; während der Abwesenheit übernimmt die nächste
             besetzte Ebene.
           </p>
         )}
@@ -46,7 +47,7 @@ export function OrganisationTab({ employeeId, manager, formalManager, directRepo
             <Avatar firstName={manager.first_name} lastName={manager.last_name} />
             <div>
               <div className="text-sm font-semibold text-ink">
-                {manager.first_name} {manager.last_name}
+                {fmtName(manager.first_name, manager.last_name)}
               </div>
               <div className="text-xs text-ink-muted">{manager.job_title}</div>
             </div>
@@ -65,7 +66,7 @@ export function OrganisationTab({ employeeId, manager, formalManager, directRepo
                 <Avatar firstName={r.first_name} lastName={r.last_name} />
                 <div>
                   <div className="text-sm font-semibold text-ink">
-                    {r.first_name} {r.last_name}
+                    {fmtName(r.first_name, r.last_name)}
                   </div>
                   <div className="text-xs text-ink-muted">{r.job_title}</div>
                 </div>
diff --git a/components/orgchart/EmployeeTree.tsx b/components/orgchart/EmployeeTree.tsx
index 1ffcacb..0409f29 100644
--- a/components/orgchart/EmployeeTree.tsx
+++ b/components/orgchart/EmployeeTree.tsx
@@ -9,6 +9,7 @@ import { SearchInput } from "@/components/ui/SearchInput";
 import { SegmentedControl } from "@/components/ui/SegmentedControl";
 import { LazyGraphOrgChart } from "./LazyGraphOrgChart";
 import type { ChartNode, OrgEmployee } from "./types";
+import { fmtName } from "@/lib/format";
 
 type ViewMode = "list" | "graph";
 
@@ -53,7 +54,7 @@ export function EmployeeTree({ employees, focusId = null }: { employees: OrgEmpl
 
   // Both badges name a person by id, so the lookup is shared rather than
   // rebuilt per node.
-  const nameById = useMemo(() => new Map(employees.map((e) => [e.id, `${e.first_name} ${e.last_name}`])), [employees]);
+  const nameById = useMemo(() => new Map(employees.map((e) => [e.id, fmtName(e.first_name, e.last_name)])), [employees]);
   const nameOf = useCallback((id: string | null) => (id ? nameById.get(id) : undefined), [nameById]);
 
   const matchIds = useMemo(() => {
@@ -64,8 +65,17 @@ export function EmployeeTree({ employees, focusId = null }: { employees: OrgEmpl
     const q = query.trim().toLowerCase();
     const matches = new Set<string>();
     for (const e of employees) {
+      // Beide Reihenfolgen: angezeigt wird „Winkler, Hannah", im Kopf hat man
+      // aber je nach Anlass das eine oder das andere zuerst. Wer abtippt, was
+      // er sieht, soll ebenso fündig werden wie jemand, der „hannah winkler"
+      // eingibt.
+      const vorNach = `${e.first_name} ${e.last_name}`.toLowerCase();
+      const nachVor = fmtName(e.first_name, e.last_name).toLowerCase();
       if (
-        `${e.first_name} ${e.last_name}`.toLowerCase().includes(q) ||
+        vorNach.includes(q) ||
+        nachVor.includes(q) ||
+        // Ohne den Beistrich, falls jemand ihn beim Abtippen weglässt.
+        nachVor.replace(",", "").includes(q) ||
         e.job_title.toLowerCase().includes(q) ||
         String(e.personnel_number).includes(q)
       ) {
@@ -118,7 +128,7 @@ export function EmployeeTree({ employees, focusId = null }: { employees: OrgEmpl
       return {
         id: e.id,
         kind: "person",
-        label: `${e.first_name} ${e.last_name}`,
+        label: fmtName(e.first_name, e.last_name),
         sublabel: e.job_title,
         href: `/employees/${e.id}`,
         avatar: { firstName: e.first_name, lastName: e.last_name },
@@ -159,7 +169,7 @@ export function EmployeeTree({ employees, focusId = null }: { employees: OrgEmpl
           <Avatar firstName={e.first_name} lastName={e.last_name} size="sm" />
           <Link href={`/employees/${e.id}`} className="min-w-0 flex-1 hover:underline">
             <span className="text-sm font-semibold text-ink">
-              {e.first_name} {e.last_name}
+              {fmtName(e.first_name, e.last_name)}
             </span>
             <span className="ml-2 text-xs text-ink-muted">{e.job_title}</span>
           </Link>
diff --git a/components/orgchart/PositionTree.tsx b/components/orgchart/PositionTree.tsx
index dcd4f87..528bf8f 100644
--- a/components/orgchart/PositionTree.tsx
+++ b/components/orgchart/PositionTree.tsx
@@ -6,6 +6,7 @@ import { useCallback, useMemo, useState } from "react";
 import { SegmentedControl } from "@/components/ui/SegmentedControl";
 import { LazyGraphOrgChart } from "./LazyGraphOrgChart";
 import type { ChartNode, OrgEmployee, OrgUnitNode, OrgVacancy } from "./types";
+import { fmtName } from "@/lib/format";
 
 // Die Struktursicht. Sie folgt jetzt org_units.parent_id statt einer fest
 // verdrahteten Abfolge Bereich → Abteilung → Team: eine fünfte Ebene ist
@@ -178,7 +179,7 @@ export function buildUnitTree(units: OrgUnitNode[], employees: OrgEmployee[], va
           .map((p) => ({
             id: p.id,
             kind: "person" as const,
-            label: `${p.first_name} ${p.last_name}`,
+            label: fmtName(p.first_name, p.last_name),
             href: `/employees/${p.id}`,
             avatar: { firstName: p.first_name, lastName: p.last_name },
             absent: p.absent,
@@ -204,7 +205,7 @@ export function buildUnitTree(units: OrgUnitNode[], employees: OrgEmployee[], va
       kind: "role",
       label: `${unit.org_number} · ${unit.name}`,
       sublabel: chief
-        ? `Leitung: ${chief.first_name} ${chief.last_name}${chief.absent ? " (abwesend)" : ""}`
+        ? `Leitung: ${fmtName(chief.first_name, chief.last_name)}${chief.absent ? " (abwesend)" : ""}`
         : "Leitung vakant",
       vacant: !chief,
       children: [...subUnits, ...titleGroups, ...vacancyNodes],
diff --git a/lib/format.ts b/lib/format.ts
index a16228e..4fe62a8 100644
--- a/lib/format.ts
+++ b/lib/format.ts
@@ -56,8 +56,27 @@ export function initials(firstName: string, lastName: string): string {
   return `${a}${b}`;
 }
 
-// "Dr. Max Mustermann, MSc MBA" — prefix titles precede the name, suffix
-// titles follow after a comma, both space-joined in the stored order.
+// „Mustermann, Max" — der Nachname zuerst.
+//
+// So steht es in jeder Personalliste, und danach wird gesucht: wer jemanden
+// sucht, hat den Nachnamen im Kopf. Nebenbei stimmt die Anzeige damit auch
+// mit der Sortierung überein, die schon immer nach Nachnamen ging — vorher
+// las sich eine alphabetische Liste, als wäre sie ungeordnet.
+//
+// Eine Stelle für alle: der Name wurde an gut zwanzig Orten einzeln
+// zusammengesetzt, und eine Umstellung, die die Hälfte davon vergisst, ist
+// schlimmer als gar keine.
+export function fmtName(firstName: string, lastName: string): string {
+  const nach = lastName?.trim() ?? "";
+  const vor = firstName?.trim() ?? "";
+  if (!nach) return vor;
+  if (!vor) return nach;
+  return `${nach}, ${vor}`;
+}
+
+// "Mustermann, Dr. Max, MSc MBA" — vorangestellte Titel stehen beim
+// Vornamen, nachgestellte am Ende. Der Nachname bleibt vorne, damit auch die
+// Überschrift einer Personalakte so beginnt wie ihr Eintrag in der Liste.
 export function fmtFullName(
   firstName: string,
   lastName: string,
@@ -66,7 +85,7 @@ export function fmtFullName(
 ): string {
   const prefix = titlePrefix && titlePrefix.length > 0 ? `${titlePrefix.join(" ")} ` : "";
   const suffix = titleSuffix && titleSuffix.length > 0 ? `, ${titleSuffix.join(" ")}` : "";
-  return `${prefix}${firstName} ${lastName}${suffix}`;
+  return `${fmtName(`${prefix}${firstName}`, lastName)}${suffix}`;
 }
 
 // Whole years between two ISO dates. Compares the "MM-DD" tails as strings,
diff --git a/lib/notes.ts b/lib/notes.ts
index 794124a..4446b0a 100644
--- a/lib/notes.ts
+++ b/lib/notes.ts
@@ -1,5 +1,6 @@
 import type { Tx } from "./db";
 import type { Database } from "./supabase/types";
+import { fmtName } from "./format";
 
 export type OpenNote = Database["public"]["Tables"]["employee_notes"]["Row"] & {
   employeeName: string;
@@ -26,7 +27,7 @@ export async function loadOpenNotes(tx: Tx): Promise<OpenNote[]> {
     const { first_name, last_name, ...note } = row;
     return {
       ...(note as Database["public"]["Tables"]["employee_notes"]["Row"]),
-      employeeName: first_name && last_name ? `${first_name} ${last_name}` : "Unbekannt",
+      employeeName: first_name && last_name ? fmtName(first_name, last_name) : "Unbekannt",
     };
   });
 }
diff --git a/lib/orgchart-print.ts b/lib/orgchart-print.ts
index 0671886..a89d601 100644
--- a/lib/orgchart-print.ts
+++ b/lib/orgchart-print.ts
@@ -1,4 +1,5 @@
 import type { OrgEmployee, OrgUnitNode, OrgVacancy } from "@/components/orgchart/types";
+import { fmtName } from "@/lib/format";
 
 // Das Modell für den Druck.
 //
@@ -18,6 +19,8 @@ import type { OrgEmployee, OrgUnitNode, OrgVacancy } from "@/components/orgchart
 
 export type PrintPerson = {
   id: string;
+  /** Getrennt mitgeführt, weil danach sortiert wird — siehe nachName. */
+  lastName: string;
   name: string;
   jobTitle: string;
   personnelNumber: number;
@@ -52,7 +55,8 @@ export type PrintModel = {
 function personFrom(e: OrgEmployee): PrintPerson {
   return {
     id: e.id,
-    name: `${e.first_name} ${e.last_name}`,
+    lastName: e.last_name,
+    name: fmtName(e.first_name, e.last_name),
     jobTitle: e.job_title,
     personnelNumber: e.personnel_number,
     isChief: e.is_chief,
@@ -61,9 +65,16 @@ function personFrom(e: OrgEmployee): PrintPerson {
   };
 }
 
-/** Nachname, dann Vorname — wie in jeder Liste, die jemand durchsucht. */
+/**
+ * Nachname, dann Vorname — wie in jeder Liste, die jemand durchsucht.
+ *
+ * Der Nachname kommt aus dem eigenen Feld, nicht aus dem zusammengesetzten
+ * Namen. Vorher wurde das letzte Wort genommen, was bei „Hannah Winkler"
+ * zufällig stimmte; seit die Anzeige „Winkler, Hannah" lautet, wäre das
+ * letzte Wort der Vorname, und die Liste stünde nach Vornamen sortiert da.
+ */
 function nachName(a: PrintPerson, b: PrintPerson): number {
-  return a.name.split(" ").slice(-1)[0].localeCompare(b.name.split(" ").slice(-1)[0], "de") || a.name.localeCompare(b.name, "de");
+  return a.lastName.localeCompare(b.lastName, "de") || a.name.localeCompare(b.name, "de");
 }
 
 export function buildPrintModel(
diff --git a/lib/positions.ts b/lib/positions.ts
index 9eb13cd..c2f365c 100644
--- a/lib/positions.ts
+++ b/lib/positions.ts
@@ -1,5 +1,5 @@
 import type { Tx } from "./db";
-import { todayIso } from "./format";
+import { fmtName, todayIso } from "./format";
 import { breadcrumbLabel, loadOrgMaps, type OrgMaps } from "./org";
 
 // Eine offene Stelle ist keine eigene Sache mehr. Sie ist eine Planstelle
@@ -128,7 +128,7 @@ export async function loadOpenPositions(tx: Tx): Promise<OpenPositionResolved[]>
     const prev = lastEndByPosition.get(e.position_id);
     if (e.valid_to && (!prev || e.valid_to > prev)) lastEndByPosition.set(e.position_id, e.valid_to);
   }
-  const chiefNameByUnit = new Map(chiefs.map((c) => [c.org_unit_id, `${c.first_name} ${c.last_name}`]));
+  const chiefNameByUnit = new Map(chiefs.map((c) => [c.org_unit_id, fmtName(c.first_name, c.last_name)]));
 
   return open.map((p) => {
     const managerUnit = managerUnitFor(orgMaps, p.org_unit_id, p.is_chief);
diff --git a/lib/reports.ts b/lib/reports.ts
index 9d4c97b..a7ce044 100644
--- a/lib/reports.ts
+++ b/lib/reports.ts
@@ -1,4 +1,4 @@
-import { todayIso, yearsBetweenIso } from "./format";
+import { fmtName, todayIso, yearsBetweenIso } from "./format";
 import type { EmploymentStatus, HistoryEventType, Weekday } from "./supabase/types";
 
 export { todayIso };
@@ -266,7 +266,7 @@ export function aggregateReport(
     const value = measureValue(rowsForGroup, measure, asOf);
     const people: ReportPerson[] = rowsForGroup.map((e) => ({
       id: e.id,
-      name: `${e.first_name} ${e.last_name}`,
+      name: fmtName(e.first_name, e.last_name),
       title: e.job_title,
       team: e.org_unit_id ? (lookups.teamName.get(e.org_unit_id) ?? "–") : "–",
       entry_date: e.entry_date,
@@ -404,7 +404,7 @@ export function aggregateEvents(
     // code working unchanged for both report modes.
     const people: ReportPerson[] = rowsForGroup.map((e) => ({
       id: e.employee_id,
-      name: `${e.first_name} ${e.last_name}`,
+      name: fmtName(e.first_name, e.last_name),
       title: e.description,
       team: e.org_unit_id ? (lookups.teamName.get(e.org_unit_id) ?? "–") : "–",
       entry_date: e.event_date,
diff --git a/tests/components/PrintChart.test.tsx b/tests/components/PrintChart.test.tsx
index 1c02dfa..852266f 100644
--- a/tests/components/PrintChart.test.tsx
+++ b/tests/components/PrintChart.test.tsx
@@ -186,11 +186,11 @@ describe("PrintChart", () => {
     renderChart();
     await zurVorschau(user);
     // Führungskräfte stehen immer im Kasten, gewöhnliche Mitarbeitende nicht.
-    expect(screen.getAllByText("Test Steinbacher").length).toBeGreaterThan(0);
-    expect(screen.queryByText("Test Aigner")).not.toBeInTheDocument();
+    expect(screen.getAllByText("Steinbacher, Test").length).toBeGreaterThan(0);
+    expect(screen.queryByText("Aigner, Test")).not.toBeInTheDocument();
 
     await user.click(screen.getByRole("button", { name: /mit Personen/ }));
-    expect(screen.getByText("Test Aigner")).toBeInTheDocument();
+    expect(screen.getByText("Aigner, Test")).toBeInTheDocument();
     expect(screen.getByText(/offen · Disposition/)).toBeInTheDocument();
     // Mit Namen bekommt jede Abteilung ihr eigenes Blatt — ein ganzer Bereich
     // mit allen Namen wäre auf einem Blatt nicht mehr lesbar.
@@ -205,6 +205,6 @@ describe("PrintChart", () => {
     // Auf der Produktionsseite: Fertigung und Schicht A stehen ohne Leitung da.
     const seite = blaetter()[1];
     expect(within(seite).getAllByText("Leitung unbesetzt")).toHaveLength(2);
-    expect(within(seite).getByText("Test Steinbacher")).toBeInTheDocument();
+    expect(within(seite).getByText("Steinbacher, Test")).toBeInTheDocument();
   });
 });
diff --git a/tests/unit/format.test.ts b/tests/unit/format.test.ts
index c9cb592..c344564 100644
--- a/tests/unit/format.test.ts
+++ b/tests/unit/format.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { addDaysIso, daysBetweenIso, fmtAge, fmtDate, initials, tenure, toIsoDate, yearsBetweenIso } from "@/lib/format";
+import { addDaysIso, daysBetweenIso, fmtAge, fmtDate, fmtFullName, fmtName, initials, tenure, toIsoDate, yearsBetweenIso } from "@/lib/format";
 
 describe("fmtDate", () => {
   it("formats an ISO date string in de-AT order", () => {
@@ -125,3 +125,35 @@ describe("toIsoDate", () => {
     expect(toIsoDate("2026-03-05T23:30:00Z")).toBe("2026-03-06");
   });
 });
+
+// Die Anzeige wurde auf „Nachname, Vorname" umgestellt. Das ist die
+// Reihenfolge jeder Personalliste, und sie stimmt mit der Sortierung überein,
+// die schon immer nach Nachnamen ging.
+describe("fmtName", () => {
+  it("stellt den Nachnamen voran", () => {
+    expect(fmtName("Hannah", "Winkler")).toBe("Winkler, Hannah");
+  });
+
+  it("kommt ohne Vornamen aus, ohne einen Beistrich stehen zu lassen", () => {
+    expect(fmtName("", "Winkler")).toBe("Winkler");
+    expect(fmtName("   ", "Winkler")).toBe("Winkler");
+  });
+
+  it("kommt auch ohne Nachnamen aus", () => {
+    expect(fmtName("Hannah", "")).toBe("Hannah");
+  });
+
+  it("räumt Leerzeichen an den Rändern weg", () => {
+    expect(fmtName("  Hannah ", " Winkler  ")).toBe("Winkler, Hannah");
+  });
+});
+
+describe("fmtFullName", () => {
+  it("lässt den Nachnamen vorne und die Titel an ihrem Platz", () => {
+    expect(fmtFullName("Max", "Mustermann", ["Dr."], ["MSc", "MBA"])).toBe("Mustermann, Dr. Max, MSc MBA");
+  });
+
+  it("verträgt fehlende Titel", () => {
+    expect(fmtFullName("Max", "Mustermann", [], null)).toBe("Mustermann, Max");
+  });
+});