diff --git a/components/shared/activate-product-button.tsx b/components/shared/activate-product-button.tsx
index c8ab186..76e59d7 100644
--- a/components/shared/activate-product-button.tsx
+++ b/components/shared/activate-product-button.tsx
@@ -29,7 +29,7 @@ export function ActivateProductButton({ productId, isDemo, redirectTo, label = '
   }
 
   return (
-    <span {...debugProps('activate-product-button', 'ActivateProductButton', 'shared/activate-product-button.tsx')}>
+    <span {...debugProps('activate-product-button')}>
     <DemoTooltip show={isDemo}>
       <button
         onClick={() => !isDemo && handleActivate()}
diff --git a/components/shared/alert-toast.tsx b/components/shared/alert-toast.tsx
index c2baad7..7d666d1 100644
--- a/components/shared/alert-toast.tsx
+++ b/components/shared/alert-toast.tsx
@@ -25,5 +25,5 @@ export function AlertToast() {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [alert])
 
-  return <span {...debugProps('alert-toast', 'AlertToast', 'shared/alert-toast.tsx')} hidden />
+  return <span {...debugProps('alert-toast')} hidden />
 }
diff --git a/components/shared/app-icon.tsx b/components/shared/app-icon.tsx
index 1d9cdaa..a37c290 100644
--- a/components/shared/app-icon.tsx
+++ b/components/shared/app-icon.tsx
@@ -15,7 +15,7 @@ export function AppIcon({ size = 32, className }: AppIconProps) {
       xmlns="http://www.w3.org/2000/svg"
       className={className}
       aria-label="Scrum4Me"
-      {...debugProps('app-icon', 'AppIcon', 'shared/app-icon.tsx')}
+      {...debugProps('app-icon')}
     >
       <defs>
         <linearGradient id="s4m-bg" x1="0" y1="0" x2="512" y2="512" gradientUnits="userSpaceOnUse">
diff --git a/components/shared/code-badge.tsx b/components/shared/code-badge.tsx
index 7b1fd9a..7c319dd 100644
--- a/components/shared/code-badge.tsx
+++ b/components/shared/code-badge.tsx
@@ -10,7 +10,7 @@ export function CodeBadge({ code, className }: CodeBadgeProps) {
   if (!code) return null
   return (
     <span
-      {...debugProps('code-badge', 'CodeBadge', 'shared/code-badge.tsx')}
+      {...debugProps('code-badge')}
       className={cn(
         'inline-flex items-center rounded-md border border-border bg-surface-container px-1.5 py-0.5 font-mono text-[11px] leading-none text-muted-foreground',
         className,
diff --git a/components/shared/demo-tooltip.tsx b/components/shared/demo-tooltip.tsx
index 19562bd..c1ae3ef 100644
--- a/components/shared/demo-tooltip.tsx
+++ b/components/shared/demo-tooltip.tsx
@@ -11,10 +11,10 @@ interface DemoTooltipProps {
 // Wraps children with a "Niet beschikbaar in demo-modus" tooltip when show=true.
 // Uses a span trigger so tooltip works on disabled elements.
 export function DemoTooltip({ show, children }: DemoTooltipProps) {
-  if (!show) return <span {...debugProps('demo-tooltip', 'DemoTooltip', 'shared/demo-tooltip.tsx')}>{children}</span>
+  if (!show) return <span {...debugProps('demo-tooltip')}>{children}</span>
 
   return (
-    <span {...debugProps('demo-tooltip', 'DemoTooltip', 'shared/demo-tooltip.tsx')}>
+    <span {...debugProps('demo-tooltip')}>
       <TooltipProvider>
         <Tooltip>
           <TooltipTrigger render={<span className="inline-flex" />}>
diff --git a/components/shared/min-width-banner.tsx b/components/shared/min-width-banner.tsx
index 46353a1..4083d4f 100644
--- a/components/shared/min-width-banner.tsx
+++ b/components/shared/min-width-banner.tsx
@@ -6,7 +6,7 @@ import { debugProps } from '@/lib/debug'
 export function MinWidthBanner() {
   return (
     <div
-      {...debugProps('min-width-banner', 'MinWidthBanner', 'shared/min-width-banner.tsx')}
+      {...debugProps('min-width-banner')}
       className="lg:hidden bg-warning/10 border-b border-warning/30 px-4 py-2 text-center text-xs text-warning"
     >
       Scrum4Me is ontworpen voor schermen van minimaal 1024px breed. Sommige functies zijn mogelijk niet goed bruikbaar op dit scherm.
diff --git a/components/shared/nav-bar.tsx b/components/shared/nav-bar.tsx
index a9091e3..f3780c2 100644
--- a/components/shared/nav-bar.tsx
+++ b/components/shared/nav-bar.tsx
@@ -113,7 +113,7 @@ export function NavBar({
 
   return (
     <header
-      {...debugProps('nav-bar', 'NavBar', 'shared/nav-bar.tsx')}
+      {...debugProps('nav-bar')}
       className="bg-surface-container-low border-b border-border h-14 flex items-center px-4 shrink-0"
     >
       {/* Links: logo + nav */}
diff --git a/components/shared/notifications-bell.tsx b/components/shared/notifications-bell.tsx
index 3c87c58..75405ea 100644
--- a/components/shared/notifications-bell.tsx
+++ b/components/shared/notifications-bell.tsx
@@ -28,7 +28,7 @@ export function NotificationsBell({ currentUserId, isDemo }: NotificationsBellPr
   )
 
   return (
-    <span {...debugProps('notifications-bell', 'NotificationsBell', 'shared/notifications-bell.tsx')}>
+    <span {...debugProps('notifications-bell')}>
     <NotificationsSheet
       currentUserId={currentUserId}
       isDemo={isDemo}
diff --git a/components/shared/panel-nav-bar.tsx b/components/shared/panel-nav-bar.tsx
index 10fe2bc..8cf367f 100644
--- a/components/shared/panel-nav-bar.tsx
+++ b/components/shared/panel-nav-bar.tsx
@@ -10,7 +10,7 @@ interface PanelNavBarProps {
 export function PanelNavBar({ title, actions, className }: PanelNavBarProps) {
   return (
     <div
-      {...debugProps('panel-nav-bar', 'PanelNavBar', 'shared/panel-nav-bar.tsx')}
+      {...debugProps('panel-nav-bar')}
       className={cn('flex items-center justify-between px-4 py-2 border-b border-border bg-surface-container-low shrink-0', className)}
     >
       <span className="text-sm font-medium text-foreground">{title}</span>
diff --git a/components/shared/pbi-status-select.tsx b/components/shared/pbi-status-select.tsx
index ba10e90..92daa21 100644
--- a/components/shared/pbi-status-select.tsx
+++ b/components/shared/pbi-status-select.tsx
@@ -27,7 +27,7 @@ interface PbiStatusSelectProps {
 
 export function PbiStatusSelect({ value, onChange, className }: PbiStatusSelectProps) {
   return (
-    <span {...debugProps('pbi-status-select', 'PbiStatusSelect', 'shared/pbi-status-select.tsx')}>
+    <span {...debugProps('pbi-status-select')}>
     <Select
       value={value}
       onValueChange={(v) => { if (v) onChange(v as PbiStatusApi) }}
diff --git a/components/shared/priority-select.tsx b/components/shared/priority-select.tsx
index 21b38cf..13efd87 100644
--- a/components/shared/priority-select.tsx
+++ b/components/shared/priority-select.tsx
@@ -26,7 +26,7 @@ interface PrioritySelectProps {
 
 export function PrioritySelect({ value, onChange, className }: PrioritySelectProps) {
   return (
-    <span {...debugProps('priority-select', 'PrioritySelect', 'shared/priority-select.tsx')}>
+    <span {...debugProps('priority-select')}>
     <Select
       value={String(value)}
       onValueChange={(v) => { if (v) onChange(parseInt(v)) }}
diff --git a/components/shared/set-current-product.tsx b/components/shared/set-current-product.tsx
index e0e9288..1ff4684 100644
--- a/components/shared/set-current-product.tsx
+++ b/components/shared/set-current-product.tsx
@@ -12,5 +12,5 @@ export function SetCurrentProduct({ id, name }: { id: string; name: string }) {
     return () => clearCurrentProduct()
   }, [id, name, setCurrentProduct, clearCurrentProduct])
 
-  return <span {...debugProps('set-current-product', 'SetCurrentProduct', 'shared/set-current-product.tsx')} hidden />
+  return <span {...debugProps('set-current-product')} hidden />
 }
diff --git a/components/shared/sprint-switcher.tsx b/components/shared/sprint-switcher.tsx
index ee9879d..e960371 100644
--- a/components/shared/sprint-switcher.tsx
+++ b/components/shared/sprint-switcher.tsx
@@ -69,7 +69,7 @@ export function SprintSwitcher({
 
   if (sprints.length === 0) {
     return (
-      <span {...debugProps('sprint-switcher', 'SprintSwitcher', 'shared/sprint-switcher.tsx')}>
+      <span {...debugProps('sprint-switcher')}>
         <TooltipProvider>
           <Tooltip>
             <TooltipTrigger
@@ -86,7 +86,7 @@ export function SprintSwitcher({
   }
 
   return (
-    <span {...debugProps('sprint-switcher', 'SprintSwitcher', 'shared/sprint-switcher.tsx')}>
+    <span {...debugProps('sprint-switcher')}>
     <DropdownMenu>
       <DropdownMenuTrigger
         disabled={isPending}
diff --git a/components/shared/status-bar.tsx b/components/shared/status-bar.tsx
index c25f7c1..c8702a4 100644
--- a/components/shared/status-bar.tsx
+++ b/components/shared/status-bar.tsx
@@ -18,7 +18,7 @@ export function StatusBar() {
   return (
     <footer
       className="shrink-0 border-t border-border bg-surface-container-low h-14 px-4 flex items-center justify-between text-sm text-muted-foreground select-none"
-      {...debugProps('status-bar', 'StatusBar', 'shared/status-bar.tsx')}
+      {...debugProps('status-bar')}
     >
       <span>© {new Date().getFullYear()} Scrum4Me</span>
       <span>v{version} · gebouwd op {buildDate}{isDev && <DebugToggle />}</span>
diff --git a/components/shared/story-log.tsx b/components/shared/story-log.tsx
index fd645c1..e368954 100644
--- a/components/shared/story-log.tsx
+++ b/components/shared/story-log.tsx
@@ -37,7 +37,7 @@ export function StoryLog({ logs, repoUrl }: StoryLogProps) {
   if (logs.length === 0) {
     return (
       <p
-        {...debugProps('story-log', 'StoryLog', 'shared/story-log.tsx')}
+        {...debugProps('story-log')}
         className="text-sm text-muted-foreground text-center py-4"
       >
         Nog geen activiteit. Gebruik de REST API om logs toe te voegen.
@@ -47,7 +47,7 @@ export function StoryLog({ logs, repoUrl }: StoryLogProps) {
 
   return (
     <div
-      {...debugProps('story-log', 'StoryLog', 'shared/story-log.tsx')}
+      {...debugProps('story-log')}
       className="space-y-3"
     >
       {logs.map(log => {
diff --git a/components/shared/user-avatar.tsx b/components/shared/user-avatar.tsx
index 0d2b9cb..05e242b 100644
--- a/components/shared/user-avatar.tsx
+++ b/components/shared/user-avatar.tsx
@@ -24,7 +24,7 @@ export function UserAvatar({ userId, username, size = 'md', className }: UserAva
   const initials = username.slice(0, 2).toUpperCase()
 
   return (
-    <span {...debugProps('user-avatar', 'UserAvatar', 'shared/user-avatar.tsx')}>
+    <span {...debugProps('user-avatar')}>
       <Avatar className={cn(SIZE_CLASSES[size], className)}>
         <AvatarImage src={`/api/users/${userId}/avatar`} alt={username} />
         <AvatarFallback className="bg-primary-container text-primary-container-foreground font-medium">
diff --git a/components/shared/user-menu.tsx b/components/shared/user-menu.tsx
index 7c2be3e..a834318 100644
--- a/components/shared/user-menu.tsx
+++ b/components/shared/user-menu.tsx
@@ -47,7 +47,7 @@ export function UserMenu({ userId, username, email, roles }: UserMenuProps) {
   }
 
   return (
-    <span {...debugProps('user-menu', 'UserMenu', 'shared/user-menu.tsx')}>
+    <span {...debugProps('user-menu')}>
     <DropdownMenu>
         <DropdownMenuTrigger
         className="rounded-full focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 focus-visible:ring-offset-background"