diff --git a/apps/registry/registry/default/ai-artifact/ai-artifact.tsx b/apps/registry/registry/default/ai-artifact/ai-artifact.tsx
index 784648c0..5e45699a 100644
--- a/apps/registry/registry/default/ai-artifact/ai-artifact.tsx
+++ b/apps/registry/registry/default/ai-artifact/ai-artifact.tsx
@@ -470,7 +470,7 @@ export const AIArtifactCopyButton = forwardRef<
   ToolbarButtonProps
 >(({ className, onClick, ...rest }, ref) => {
   const { copied, copy, labels } = useAIArtifact();
-  const handleClick = useCallback(
+  const handleCopyArtifact = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -482,7 +482,7 @@ export const AIArtifactCopyButton = forwardRef<
     <Button
       aria-label={copied ? labels.copied : labels.copy}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleCopyArtifact}
       ref={ref}
       size="icon"
       type="button"
@@ -510,7 +510,7 @@ export const AIArtifactEditButton = forwardRef<
   ToolbarButtonProps
 >(({ className, onClick, ...rest }, ref) => {
   const { hasOnEdit, labels, onEdit } = useAIArtifact();
-  const handleClick = useCallback(
+  const handleEditArtifact = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -523,7 +523,7 @@ export const AIArtifactEditButton = forwardRef<
     <Button
       aria-label={labels.edit}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleEditArtifact}
       ref={ref}
       size="icon"
       type="button"
@@ -547,7 +547,7 @@ export const AIArtifactDownloadButton = forwardRef<
   ToolbarButtonProps
 >(({ className, onClick, ...rest }, ref) => {
   const { download, labels } = useAIArtifact();
-  const handleClick = useCallback(
+  const handleDownloadArtifact = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -559,7 +559,7 @@ export const AIArtifactDownloadButton = forwardRef<
     <Button
       aria-label={labels.download}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleDownloadArtifact}
       ref={ref}
       size="icon"
       type="button"
@@ -584,7 +584,7 @@ export const AIArtifactFullscreenButton = forwardRef<
   ToolbarButtonProps
 >(({ className, onClick, ...rest }, ref) => {
   const { fullscreen, labels, toggleFullscreen } = useAIArtifact();
-  const handleClick = useCallback(
+  const handleToggleArtifactFullscreen = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -597,7 +597,7 @@ export const AIArtifactFullscreenButton = forwardRef<
       aria-label={fullscreen ? labels.exitFullscreen : labels.enterFullscreen}
       aria-pressed={fullscreen}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleToggleArtifactFullscreen}
       ref={ref}
       size="icon"
       type="button"
diff --git a/apps/registry/registry/default/ai-sidebar/ai-sidebar.tsx b/apps/registry/registry/default/ai-sidebar/ai-sidebar.tsx
index 5a6218c8..deb97427 100644
--- a/apps/registry/registry/default/ai-sidebar/ai-sidebar.tsx
+++ b/apps/registry/registry/default/ai-sidebar/ai-sidebar.tsx
@@ -328,7 +328,7 @@ export const AISidebarClose = forwardRef<
   Omit<ComponentPropsWithoutRef<"button">, "type">
 >(({ className, onClick, ...rest }, ref) => {
   const { close, labels } = useAISidebar();
-  const handleClick = useCallback(
+  const handleCloseSidebar = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -340,7 +340,7 @@ export const AISidebarClose = forwardRef<
     <Button
       aria-label={labels.close}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleCloseSidebar}
       ref={ref}
       size="icon"
       type="button"
@@ -413,7 +413,7 @@ export const AISidebarTrigger = forwardRef<
   AISidebarTriggerProps
 >(({ children, className, onClick, ...rest }, ref) => {
   const { labels, openState, toggle } = useAISidebar();
-  const handleClick = useCallback(
+  const handleToggleSidebar = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -427,7 +427,7 @@ export const AISidebarTrigger = forwardRef<
       aria-label={children ? undefined : labels.open}
       className={cn(className)}
       data-state={openState ? "open" : "closed"}
-      onClick={handleClick}
+      onClick={handleToggleSidebar}
       ref={ref}
       size={children ? "sm" : "icon"}
       type="button"
diff --git a/apps/registry/registry/default/bottom-activity-strip/bottom-activity-strip.tsx b/apps/registry/registry/default/bottom-activity-strip/bottom-activity-strip.tsx
index 1689c394..5e893a1d 100644
--- a/apps/registry/registry/default/bottom-activity-strip/bottom-activity-strip.tsx
+++ b/apps/registry/registry/default/bottom-activity-strip/bottom-activity-strip.tsx
@@ -98,7 +98,7 @@ const Chip = (props: { event: ActivityEvent }): React.ReactElement => {
   const { event } = props;
   const tone = event.tone ?? "neutral";
   if (event.onActivate) {
-    const handleClick = (): void => {
+    const handleActivateEvent = (): void => {
       event.onActivate?.();
     };
     return (
@@ -106,7 +106,7 @@ const Chip = (props: { event: ActivityEvent }): React.ReactElement => {
         className="flex items-center rounded-full border border-border bg-background px-2 py-1 text-[11px] transition-colors hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
         data-strip-event={event.id}
         data-strip-event-tone={tone}
-        onClick={handleClick}
+        onClick={handleActivateEvent}
         type="button"
       >
         <ChipBody event={event} />
diff --git a/apps/registry/registry/default/chronological-timeline/chronological-timeline.tsx b/apps/registry/registry/default/chronological-timeline/chronological-timeline.tsx
index cbb581d1..9cfc8ccc 100644
--- a/apps/registry/registry/default/chronological-timeline/chronological-timeline.tsx
+++ b/apps/registry/registry/default/chronological-timeline/chronological-timeline.tsx
@@ -314,7 +314,7 @@ export const ChronoEvent = forwardRef<HTMLElement, ChronoEventProps>(
       [eventId, forwardedRef, registerEvent],
     );
 
-    const handleFocus = useCallback(() => {
+    const handleFocusEvent = useCallback(() => {
       setActiveId(eventId);
     }, [eventId, setActiveId]);
 
@@ -328,7 +328,7 @@ export const ChronoEvent = forwardRef<HTMLElement, ChronoEventProps>(
         data-event-id={eventId}
         data-featured={featured ? "true" : undefined}
         id={eventId}
-        onFocus={handleFocus}
+        onFocus={handleFocusEvent}
         ref={refCallback}
         {...rest}
       >
diff --git a/apps/registry/registry/default/comment-pin/comment-pin.tsx b/apps/registry/registry/default/comment-pin/comment-pin.tsx
index c193dab1..3dca8edd 100644
--- a/apps/registry/registry/default/comment-pin/comment-pin.tsx
+++ b/apps/registry/registry/default/comment-pin/comment-pin.tsx
@@ -143,7 +143,7 @@ export const CommentPin = forwardRef<HTMLDivElement, CommentPinProps>(
     const ariaLabel = showBadge
       ? `${resolvedLabels.region}, ${unread} ${resolvedLabels.unreadSuffix}`
       : resolvedLabels.region;
-    const handleClick = (): void => {
+    const handleActivateComment = (): void => {
       onActivate?.();
     };
     const body = (
@@ -173,7 +173,7 @@ export const CommentPin = forwardRef<HTMLDivElement, CommentPinProps>(
             aria-label={ariaLabel}
             className="relative inline-flex rounded-full focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
             data-comment-pin-trigger
-            onClick={handleClick}
+            onClick={handleActivateComment}
             type="button"
           >
             {body}
diff --git a/apps/registry/registry/default/floating-toolbar/floating-toolbar.tsx b/apps/registry/registry/default/floating-toolbar/floating-toolbar.tsx
index 33d86f13..23a5f1c4 100644
--- a/apps/registry/registry/default/floating-toolbar/floating-toolbar.tsx
+++ b/apps/registry/registry/default/floating-toolbar/floating-toolbar.tsx
@@ -110,7 +110,7 @@ export const FloatingToolbar = forwardRef<HTMLDivElement, FloatingToolbarProps>(
       >
         {actions.map((action) => {
           const variant = action.variant ?? "ghost";
-          const handleClick = (): void => {
+          const handleActivateToolbarAction = (): void => {
             action.onActivate();
           };
           return (
@@ -125,7 +125,7 @@ export const FloatingToolbar = forwardRef<HTMLDivElement, FloatingToolbarProps>(
               data-variant={variant}
               disabled={action.disabled}
               key={action.id}
-              onClick={handleClick}
+              onClick={handleActivateToolbarAction}
               type="button"
             >
               {action.glyph ? (
diff --git a/apps/registry/registry/default/interactive-timeline/interactive-timeline.tsx b/apps/registry/registry/default/interactive-timeline/interactive-timeline.tsx
index 150b98d8..9e98d13e 100644
--- a/apps/registry/registry/default/interactive-timeline/interactive-timeline.tsx
+++ b/apps/registry/registry/default/interactive-timeline/interactive-timeline.tsx
@@ -414,7 +414,7 @@ function EventNode({
   const titleText = typeof event.title === "string" ? event.title : "Event";
   const tooltipId = `${event.id}-tooltip`;
 
-  const handleClick = (
+  const handleSelectTimelineEvent = (
     mouseEvent: ReactMouseEvent<HTMLButtonElement>,
   ): void => {
     mouseEvent.stopPropagation();
@@ -433,7 +433,7 @@ function EventNode({
       data-event-id={event.id}
       data-event-track={event.track ?? ""}
       data-selected={active ? "true" : undefined}
-      onClick={handleClick}
+      onClick={handleSelectTimelineEvent}
       style={{
         left: `${(left * 100).toString()}%`,
         width: isDuration ? `${(width * 100).toString()}%` : undefined,
diff --git a/apps/registry/registry/default/jarvis-dock/jarvis-dock.tsx b/apps/registry/registry/default/jarvis-dock/jarvis-dock.tsx
index faf8f070..86b44617 100644
--- a/apps/registry/registry/default/jarvis-dock/jarvis-dock.tsx
+++ b/apps/registry/registry/default/jarvis-dock/jarvis-dock.tsx
@@ -78,7 +78,7 @@ const ActionButton = (props: {
 }): React.ReactElement => {
   const { action } = props;
   const tone = action.tone ?? "neutral";
-  const handleClick = (): void => {
+  const handleActivateAction = (): void => {
     action.onActivate();
   };
   return (
@@ -86,7 +86,7 @@ const ActionButton = (props: {
       className="group relative flex size-12 flex-col items-center justify-center gap-0.5 rounded-md border border-transparent text-[10px] uppercase tracking-wide text-muted-foreground transition-colors hover:border-border hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
       data-jarvis-action={action.id}
       data-jarvis-tone={tone}
-      onClick={handleClick}
+      onClick={handleActivateAction}
       type="button"
     >
       <span
diff --git a/apps/registry/registry/default/knowledge-check/knowledge-check.tsx b/apps/registry/registry/default/knowledge-check/knowledge-check.tsx
index 420488ab..65f6b0f6 100644
--- a/apps/registry/registry/default/knowledge-check/knowledge-check.tsx
+++ b/apps/registry/registry/default/knowledge-check/knowledge-check.tsx
@@ -493,13 +493,13 @@ function FillBlankField({
   onChange,
   value,
 }: FillBlankFieldProps): ReactNode {
-  const handleChange = useCallback(
+  const handleBlankValueChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {
       onChange(event.target.value);
     },
     [onChange],
   );
-  return <Input id={inputId} onChange={handleChange} value={value} />;
+  return <Input id={inputId} onChange={handleBlankValueChange} value={value} />;
 }
 
 type QuestionFieldProps = {
diff --git a/apps/registry/registry/default/map-timeline/map-timeline.tsx b/apps/registry/registry/default/map-timeline/map-timeline.tsx
index d42f8e3d..1e91058a 100644
--- a/apps/registry/registry/default/map-timeline/map-timeline.tsx
+++ b/apps/registry/registry/default/map-timeline/map-timeline.tsx
@@ -368,7 +368,7 @@ export const MapTimelineSlider = forwardRef<
 >(({ className, ...rest }, ref) => {
   const { endYear, labels, setYear, startYear, year } = useTimelineContext();
   const sliderId = useId();
-  const handleChange = (event: ChangeEvent<HTMLInputElement>): void => {
+  const handleYearChange = (event: ChangeEvent<HTMLInputElement>): void => {
     setYear(Number.parseInt(event.target.value, 10));
   };
   return (
@@ -383,7 +383,7 @@ export const MapTimelineSlider = forwardRef<
         id={sliderId}
         max={endYear}
         min={startYear}
-        onChange={handleChange}
+        onChange={handleYearChange}
         ref={ref}
         type="range"
         value={year}
@@ -411,7 +411,7 @@ export const MapTimelinePlayButton = forwardRef<
   Omit<ComponentPropsWithoutRef<"button">, "aria-pressed" | "onClick" | "type">
 >(({ className, ...rest }, ref) => {
   const { isPlaying, labels, setIsPlaying } = useTimelineContext();
-  const handleClick = (): void => {
+  const handleTogglePlayback = (): void => {
     setIsPlaying(!isPlaying);
   };
   return (
@@ -423,7 +423,7 @@ export const MapTimelinePlayButton = forwardRef<
         className,
       )}
       data-playing={isPlaying ? "true" : undefined}
-      onClick={handleClick}
+      onClick={handleTogglePlayback}
       ref={ref}
       type="button"
       {...rest}
diff --git a/apps/registry/registry/default/policy-delivery-panel/policy-delivery-panel.tsx b/apps/registry/registry/default/policy-delivery-panel/policy-delivery-panel.tsx
index 9fcaa5f8..d1f106f9 100644
--- a/apps/registry/registry/default/policy-delivery-panel/policy-delivery-panel.tsx
+++ b/apps/registry/registry/default/policy-delivery-panel/policy-delivery-panel.tsx
@@ -107,7 +107,7 @@ const RowBody = (props: { policy: PolicyEntry }): React.ReactElement => {
 const Row = (props: { policy: PolicyEntry }): React.ReactElement => {
   const { policy } = props;
   if (policy.onToggle) {
-    const handleClick = (): void => {
+    const handleTogglePolicy = (): void => {
       policy.onToggle?.();
     };
     return (
@@ -115,7 +115,7 @@ const Row = (props: { policy: PolicyEntry }): React.ReactElement => {
         className="flex w-full items-center gap-2 rounded-md border border-transparent px-2 py-1.5 text-left transition-colors hover:border-border hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
         data-policy-row={policy.id}
         data-policy-status={policy.status}
-        onClick={handleClick}
+        onClick={handleTogglePolicy}
         type="button"
       >
         <RowBody policy={policy} />
diff --git a/apps/registry/registry/default/prompt-templates/prompt-templates.tsx b/apps/registry/registry/default/prompt-templates/prompt-templates.tsx
index 96e09498..333b3ac2 100644
--- a/apps/registry/registry/default/prompt-templates/prompt-templates.tsx
+++ b/apps/registry/registry/default/prompt-templates/prompt-templates.tsx
@@ -404,7 +404,7 @@ function VariableField({
   onValueChange,
   value,
 }: VariableFieldProps): ReactNode {
-  const handleChange = useCallback(
+  const handleVariableValueChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {
       onValueChange(name, event.target.value);
     },
@@ -417,7 +417,7 @@ function VariableField({
       </label>
       <Input
         id={fieldId}
-        onChange={handleChange}
+        onChange={handleVariableValueChange}
         placeholder={`Value for ${name}`}
         value={value}
       />
diff --git a/apps/registry/registry/default/relationship-inspector/relationship-inspector.tsx b/apps/registry/registry/default/relationship-inspector/relationship-inspector.tsx
index 98bdc85c..147753e4 100644
--- a/apps/registry/registry/default/relationship-inspector/relationship-inspector.tsx
+++ b/apps/registry/registry/default/relationship-inspector/relationship-inspector.tsx
@@ -102,7 +102,7 @@ const RowBody = (props: { edge: RelationshipEdge }): React.ReactElement => {
 const Row = (props: { edge: RelationshipEdge }): React.ReactElement => {
   const { edge } = props;
   if (edge.onActivate) {
-    const handleClick = (): void => {
+    const handleActivateRelationship = (): void => {
       edge.onActivate?.();
     };
     return (
@@ -110,7 +110,7 @@ const Row = (props: { edge: RelationshipEdge }): React.ReactElement => {
         className="flex w-full items-center gap-2 rounded-md border border-transparent px-2 py-1.5 text-left transition-colors hover:border-border hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
         data-relationship-direction={edge.direction}
         data-relationship-row
-        onClick={handleClick}
+        onClick={handleActivateRelationship}
         type="button"
       >
         <RowBody edge={edge} />
diff --git a/apps/registry/registry/default/routing-assignment-panel/routing-assignment-panel.tsx b/apps/registry/registry/default/routing-assignment-panel/routing-assignment-panel.tsx
index 54fa6726..06f83045 100644
--- a/apps/registry/registry/default/routing-assignment-panel/routing-assignment-panel.tsx
+++ b/apps/registry/registry/default/routing-assignment-panel/routing-assignment-panel.tsx
@@ -127,7 +127,7 @@ const RowBody = (props: {
 const Row = (props: { assignment: RoutingAssignment }): React.ReactElement => {
   const { assignment } = props;
   if (assignment.onActivate) {
-    const handleClick = (): void => {
+    const handleActivateAssignment = (): void => {
       assignment.onActivate?.();
     };
     return (
@@ -135,7 +135,7 @@ const Row = (props: { assignment: RoutingAssignment }): React.ReactElement => {
         className="flex w-full items-center gap-2 rounded-md border border-transparent px-2 py-1.5 text-left transition-colors hover:border-border hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
         data-routing-assignment={assignment.id}
         data-routing-role={assignment.role}
-        onClick={handleClick}
+        onClick={handleActivateAssignment}
         type="button"
       >
         <RowBody assignment={assignment} />
diff --git a/apps/registry/registry/default/run-timeline/run-timeline.tsx b/apps/registry/registry/default/run-timeline/run-timeline.tsx
index d6a708b4..15562d83 100644
--- a/apps/registry/registry/default/run-timeline/run-timeline.tsx
+++ b/apps/registry/registry/default/run-timeline/run-timeline.tsx
@@ -167,7 +167,7 @@ const PhaseBar = (props: {
   };
   const ariaLabel = `${STATE_LABEL[state]} ${phase.start} → ${phase.end}`;
   if (phase.onActivate) {
-    const handleClick = (): void => {
+    const handleActivatePhase = (): void => {
       phase.onActivate?.();
     };
     return (
@@ -179,7 +179,7 @@ const PhaseBar = (props: {
         )}
         data-run-phase={phase.id}
         data-run-phase-state={state}
-        onClick={handleClick}
+        onClick={handleActivatePhase}
         style={sharedStyle}
         type="button"
       >
diff --git a/apps/registry/registry/default/timeline-scrubber/timeline-scrubber.tsx b/apps/registry/registry/default/timeline-scrubber/timeline-scrubber.tsx
index 2fe1f903..cb8a0ca7 100644
--- a/apps/registry/registry/default/timeline-scrubber/timeline-scrubber.tsx
+++ b/apps/registry/registry/default/timeline-scrubber/timeline-scrubber.tsx
@@ -247,7 +247,9 @@ export const TimelineScrubber = forwardRef<
   const span = safeEnd - start;
   const clamped = clamp(value, start, safeEnd);
   const ratio = clamp((clamped - start) / span, 0, 1);
-  const handleChange = (event: ChangeEvent<HTMLInputElement>): void => {
+  const handleScrubberValueChange = (
+    event: ChangeEvent<HTMLInputElement>,
+  ): void => {
     onValueChange(clamp(Number(event.target.value), start, safeEnd));
   };
   return (
@@ -274,7 +276,7 @@ export const TimelineScrubber = forwardRef<
         inputId={inputId}
         max={safeEnd}
         min={start}
-        onChange={handleChange}
+        onChange={handleScrubberValueChange}
         ratio={ratio}
         scrubberId={inputId}
         span={span}
diff --git a/apps/registry/registry/default/viewport-bookmarks/viewport-bookmarks.tsx b/apps/registry/registry/default/viewport-bookmarks/viewport-bookmarks.tsx
index 6dad779f..a7b65215 100644
--- a/apps/registry/registry/default/viewport-bookmarks/viewport-bookmarks.tsx
+++ b/apps/registry/registry/default/viewport-bookmarks/viewport-bookmarks.tsx
@@ -65,7 +65,7 @@ const Row = (props: {
   onSelect?: (id: string) => void;
 }): React.ReactElement => {
   const { active, bookmark, onSelect } = props;
-  const handleClick = (): void => {
+  const handleSelectBookmark = (): void => {
     onSelect?.(bookmark.id);
   };
   const rowClass =
@@ -84,7 +84,7 @@ const Row = (props: {
         )}
         data-viewport-bookmark={bookmark.id}
         data-viewport-bookmark-active={active}
-        onClick={handleClick}
+        onClick={handleSelectBookmark}
         type="button"
       >
         <RowBody bookmark={bookmark} />
diff --git a/apps/registry/registry/default/world-breadcrumbs/world-breadcrumbs.tsx b/apps/registry/registry/default/world-breadcrumbs/world-breadcrumbs.tsx
index 0860db3a..11b59128 100644
--- a/apps/registry/registry/default/world-breadcrumbs/world-breadcrumbs.tsx
+++ b/apps/registry/registry/default/world-breadcrumbs/world-breadcrumbs.tsx
@@ -82,7 +82,7 @@ const Crumb = (props: {
 }): React.ReactElement => {
   const { crumb, isLast, onSelect } = props;
   const glyph = crumb.kind ? KIND_GLYPH[crumb.kind] : null;
-  const handleClick = (): void => {
+  const handleSelectCrumb = (): void => {
     onSelect?.(crumb.id);
   };
   const text = (
@@ -115,7 +115,7 @@ const Crumb = (props: {
       className="inline-flex items-center rounded-sm text-xs text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
       data-world-breadcrumb={crumb.id}
       data-world-breadcrumb-active="false"
-      onClick={handleClick}
+      onClick={handleSelectCrumb}
       type="button"
     >
       {text}
diff --git a/packages/ui/src/components/ai-artifact/ai-artifact.tsx b/packages/ui/src/components/ai-artifact/ai-artifact.tsx
index c20608bf..c280c103 100644
--- a/packages/ui/src/components/ai-artifact/ai-artifact.tsx
+++ b/packages/ui/src/components/ai-artifact/ai-artifact.tsx
@@ -470,7 +470,7 @@ export const AIArtifactCopyButton = forwardRef<
   ToolbarButtonProps
 >(({ className, onClick, ...rest }, ref) => {
   const { copied, copy, labels } = useAIArtifact();
-  const handleClick = useCallback(
+  const handleCopyArtifact = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -482,7 +482,7 @@ export const AIArtifactCopyButton = forwardRef<
     <Button
       aria-label={copied ? labels.copied : labels.copy}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleCopyArtifact}
       ref={ref}
       size="icon"
       type="button"
@@ -510,7 +510,7 @@ export const AIArtifactEditButton = forwardRef<
   ToolbarButtonProps
 >(({ className, onClick, ...rest }, ref) => {
   const { hasOnEdit, labels, onEdit } = useAIArtifact();
-  const handleClick = useCallback(
+  const handleEditArtifact = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -523,7 +523,7 @@ export const AIArtifactEditButton = forwardRef<
     <Button
       aria-label={labels.edit}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleEditArtifact}
       ref={ref}
       size="icon"
       type="button"
@@ -547,7 +547,7 @@ export const AIArtifactDownloadButton = forwardRef<
   ToolbarButtonProps
 >(({ className, onClick, ...rest }, ref) => {
   const { download, labels } = useAIArtifact();
-  const handleClick = useCallback(
+  const handleDownloadArtifact = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -559,7 +559,7 @@ export const AIArtifactDownloadButton = forwardRef<
     <Button
       aria-label={labels.download}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleDownloadArtifact}
       ref={ref}
       size="icon"
       type="button"
@@ -584,7 +584,7 @@ export const AIArtifactFullscreenButton = forwardRef<
   ToolbarButtonProps
 >(({ className, onClick, ...rest }, ref) => {
   const { fullscreen, labels, toggleFullscreen } = useAIArtifact();
-  const handleClick = useCallback(
+  const handleToggleArtifactFullscreen = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -597,7 +597,7 @@ export const AIArtifactFullscreenButton = forwardRef<
       aria-label={fullscreen ? labels.exitFullscreen : labels.enterFullscreen}
       aria-pressed={fullscreen}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleToggleArtifactFullscreen}
       ref={ref}
       size="icon"
       type="button"
diff --git a/packages/ui/src/components/ai-sidebar/ai-sidebar.tsx b/packages/ui/src/components/ai-sidebar/ai-sidebar.tsx
index 6ea54ecf..3e0f5c28 100644
--- a/packages/ui/src/components/ai-sidebar/ai-sidebar.tsx
+++ b/packages/ui/src/components/ai-sidebar/ai-sidebar.tsx
@@ -328,7 +328,7 @@ export const AISidebarClose = forwardRef<
   Omit<ComponentPropsWithoutRef<"button">, "type">
 >(({ className, onClick, ...rest }, ref) => {
   const { close, labels } = useAISidebar();
-  const handleClick = useCallback(
+  const handleCloseSidebar = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -340,7 +340,7 @@ export const AISidebarClose = forwardRef<
     <Button
       aria-label={labels.close}
       className={cn("size-8", className)}
-      onClick={handleClick}
+      onClick={handleCloseSidebar}
       ref={ref}
       size="icon"
       type="button"
@@ -413,7 +413,7 @@ export const AISidebarTrigger = forwardRef<
   AISidebarTriggerProps
 >(({ children, className, onClick, ...rest }, ref) => {
   const { labels, openState, toggle } = useAISidebar();
-  const handleClick = useCallback(
+  const handleToggleSidebar = useCallback(
     (event: React.MouseEvent<HTMLButtonElement>) => {
       onClick?.(event);
       if (event.defaultPrevented) return;
@@ -427,7 +427,7 @@ export const AISidebarTrigger = forwardRef<
       aria-label={children ? undefined : labels.open}
       className={cn(className)}
       data-state={openState ? "open" : "closed"}
-      onClick={handleClick}
+      onClick={handleToggleSidebar}
       ref={ref}
       size={children ? "sm" : "icon"}
       type="button"
diff --git a/packages/ui/src/components/bottom-activity-strip/bottom-activity-strip.tsx b/packages/ui/src/components/bottom-activity-strip/bottom-activity-strip.tsx
index 7df800d7..7eef051c 100644
--- a/packages/ui/src/components/bottom-activity-strip/bottom-activity-strip.tsx
+++ b/packages/ui/src/components/bottom-activity-strip/bottom-activity-strip.tsx
@@ -98,7 +98,7 @@ const Chip = (props: { event: ActivityEvent }): React.ReactElement => {
   const { event } = props;
   const tone = event.tone ?? "neutral";
   if (event.onActivate) {
-    const handleClick = (): void => {
+    const handleActivateEvent = (): void => {
       event.onActivate?.();
     };
     return (
@@ -106,7 +106,7 @@ const Chip = (props: { event: ActivityEvent }): React.ReactElement => {
         className="flex items-center rounded-full border border-border bg-background px-2 py-1 text-[11px] transition-colors hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
         data-strip-event={event.id}
         data-strip-event-tone={tone}
-        onClick={handleClick}
+        onClick={handleActivateEvent}
         type="button"
       >
         <ChipBody event={event} />
diff --git a/packages/ui/src/components/chronological-timeline/chronological-timeline.tsx b/packages/ui/src/components/chronological-timeline/chronological-timeline.tsx
index d8b8063d..6ad051ce 100644
--- a/packages/ui/src/components/chronological-timeline/chronological-timeline.tsx
+++ b/packages/ui/src/components/chronological-timeline/chronological-timeline.tsx
@@ -314,7 +314,7 @@ export const ChronoEvent = forwardRef<HTMLElement, ChronoEventProps>(
       [eventId, forwardedRef, registerEvent],
     );
 
-    const handleFocus = useCallback(() => {
+    const handleFocusEvent = useCallback(() => {
       setActiveId(eventId);
     }, [eventId, setActiveId]);
 
@@ -328,7 +328,7 @@ export const ChronoEvent = forwardRef<HTMLElement, ChronoEventProps>(
         data-event-id={eventId}
         data-featured={featured ? "true" : undefined}
         id={eventId}
-        onFocus={handleFocus}
+        onFocus={handleFocusEvent}
         ref={refCallback}
         {...rest}
       >
diff --git a/packages/ui/src/components/comment-pin/comment-pin.tsx b/packages/ui/src/components/comment-pin/comment-pin.tsx
index e9203b4d..60cdb675 100644
--- a/packages/ui/src/components/comment-pin/comment-pin.tsx
+++ b/packages/ui/src/components/comment-pin/comment-pin.tsx
@@ -143,7 +143,7 @@ export const CommentPin = forwardRef<HTMLDivElement, CommentPinProps>(
     const ariaLabel = showBadge
       ? `${resolvedLabels.region}, ${unread} ${resolvedLabels.unreadSuffix}`
       : resolvedLabels.region;
-    const handleClick = (): void => {
+    const handleActivateComment = (): void => {
       onActivate?.();
     };
     const body = (
@@ -173,7 +173,7 @@ export const CommentPin = forwardRef<HTMLDivElement, CommentPinProps>(
             aria-label={ariaLabel}
             className="relative inline-flex rounded-full focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
             data-comment-pin-trigger
-            onClick={handleClick}
+            onClick={handleActivateComment}
             type="button"
           >
             {body}
diff --git a/packages/ui/src/components/floating-toolbar/floating-toolbar.tsx b/packages/ui/src/components/floating-toolbar/floating-toolbar.tsx
index 8110dd0b..27c69ab7 100644
--- a/packages/ui/src/components/floating-toolbar/floating-toolbar.tsx
+++ b/packages/ui/src/components/floating-toolbar/floating-toolbar.tsx
@@ -110,7 +110,7 @@ export const FloatingToolbar = forwardRef<HTMLDivElement, FloatingToolbarProps>(
       >
         {actions.map((action) => {
           const variant = action.variant ?? "ghost";
-          const handleClick = (): void => {
+          const handleActivateToolbarAction = (): void => {
             action.onActivate();
           };
           return (
@@ -125,7 +125,7 @@ export const FloatingToolbar = forwardRef<HTMLDivElement, FloatingToolbarProps>(
               data-variant={variant}
               disabled={action.disabled}
               key={action.id}
-              onClick={handleClick}
+              onClick={handleActivateToolbarAction}
               type="button"
             >
               {action.glyph ? (
diff --git a/packages/ui/src/components/interactive-timeline/interactive-timeline.tsx b/packages/ui/src/components/interactive-timeline/interactive-timeline.tsx
index 4852b5b8..2dc579a5 100644
--- a/packages/ui/src/components/interactive-timeline/interactive-timeline.tsx
+++ b/packages/ui/src/components/interactive-timeline/interactive-timeline.tsx
@@ -414,7 +414,7 @@ function EventNode({
   const titleText = typeof event.title === "string" ? event.title : "Event";
   const tooltipId = `${event.id}-tooltip`;
 
-  const handleClick = (
+  const handleSelectTimelineEvent = (
     mouseEvent: ReactMouseEvent<HTMLButtonElement>,
   ): void => {
     mouseEvent.stopPropagation();
@@ -433,7 +433,7 @@ function EventNode({
       data-event-id={event.id}
       data-event-track={event.track ?? ""}
       data-selected={active ? "true" : undefined}
-      onClick={handleClick}
+      onClick={handleSelectTimelineEvent}
       style={{
         left: `${(left * 100).toString()}%`,
         width: isDuration ? `${(width * 100).toString()}%` : undefined,
diff --git a/packages/ui/src/components/jarvis-dock/jarvis-dock.tsx b/packages/ui/src/components/jarvis-dock/jarvis-dock.tsx
index 0c737cbe..8e23d910 100644
--- a/packages/ui/src/components/jarvis-dock/jarvis-dock.tsx
+++ b/packages/ui/src/components/jarvis-dock/jarvis-dock.tsx
@@ -78,7 +78,7 @@ const ActionButton = (props: {
 }): React.ReactElement => {
   const { action } = props;
   const tone = action.tone ?? "neutral";
-  const handleClick = (): void => {
+  const handleActivateAction = (): void => {
     action.onActivate();
   };
   return (
@@ -86,7 +86,7 @@ const ActionButton = (props: {
       className="group relative flex size-12 flex-col items-center justify-center gap-0.5 rounded-md border border-transparent text-[10px] uppercase tracking-wide text-muted-foreground transition-colors hover:border-border hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
       data-jarvis-action={action.id}
       data-jarvis-tone={tone}
-      onClick={handleClick}
+      onClick={handleActivateAction}
       type="button"
     >
       <span
diff --git a/packages/ui/src/components/knowledge-check/knowledge-check.tsx b/packages/ui/src/components/knowledge-check/knowledge-check.tsx
index 6d4da2aa..b4d02913 100644
--- a/packages/ui/src/components/knowledge-check/knowledge-check.tsx
+++ b/packages/ui/src/components/knowledge-check/knowledge-check.tsx
@@ -493,13 +493,13 @@ function FillBlankField({
   onChange,
   value,
 }: FillBlankFieldProps): ReactNode {
-  const handleChange = useCallback(
+  const handleBlankValueChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {
       onChange(event.target.value);
     },
     [onChange],
   );
-  return <Input id={inputId} onChange={handleChange} value={value} />;
+  return <Input id={inputId} onChange={handleBlankValueChange} value={value} />;
 }
 
 type QuestionFieldProps = {
diff --git a/packages/ui/src/components/map-timeline/map-timeline.tsx b/packages/ui/src/components/map-timeline/map-timeline.tsx
index 44873321..7e46bc6e 100644
--- a/packages/ui/src/components/map-timeline/map-timeline.tsx
+++ b/packages/ui/src/components/map-timeline/map-timeline.tsx
@@ -368,7 +368,7 @@ export const MapTimelineSlider = forwardRef<
 >(({ className, ...rest }, ref) => {
   const { endYear, labels, setYear, startYear, year } = useTimelineContext();
   const sliderId = useId();
-  const handleChange = (event: ChangeEvent<HTMLInputElement>): void => {
+  const handleYearChange = (event: ChangeEvent<HTMLInputElement>): void => {
     setYear(Number.parseInt(event.target.value, 10));
   };
   return (
@@ -383,7 +383,7 @@ export const MapTimelineSlider = forwardRef<
         id={sliderId}
         max={endYear}
         min={startYear}
-        onChange={handleChange}
+        onChange={handleYearChange}
         ref={ref}
         type="range"
         value={year}
@@ -411,7 +411,7 @@ export const MapTimelinePlayButton = forwardRef<
   Omit<ComponentPropsWithoutRef<"button">, "aria-pressed" | "onClick" | "type">
 >(({ className, ...rest }, ref) => {
   const { isPlaying, labels, setIsPlaying } = useTimelineContext();
-  const handleClick = (): void => {
+  const handleTogglePlayback = (): void => {
     setIsPlaying(!isPlaying);
   };
   return (
@@ -423,7 +423,7 @@ export const MapTimelinePlayButton = forwardRef<
         className,
       )}
       data-playing={isPlaying ? "true" : undefined}
-      onClick={handleClick}
+      onClick={handleTogglePlayback}
       ref={ref}
       type="button"
       {...rest}
diff --git a/packages/ui/src/components/policy-delivery-panel/policy-delivery-panel.tsx b/packages/ui/src/components/policy-delivery-panel/policy-delivery-panel.tsx
index 9225b560..0499f867 100644
--- a/packages/ui/src/components/policy-delivery-panel/policy-delivery-panel.tsx
+++ b/packages/ui/src/components/policy-delivery-panel/policy-delivery-panel.tsx
@@ -107,7 +107,7 @@ const RowBody = (props: { policy: PolicyEntry }): React.ReactElement => {
 const Row = (props: { policy: PolicyEntry }): React.ReactElement => {
   const { policy } = props;
   if (policy.onToggle) {
-    const handleClick = (): void => {
+    const handleTogglePolicy = (): void => {
       policy.onToggle?.();
     };
     return (
@@ -115,7 +115,7 @@ const Row = (props: { policy: PolicyEntry }): React.ReactElement => {
         className="flex w-full items-center gap-2 rounded-md border border-transparent px-2 py-1.5 text-left transition-colors hover:border-border hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
         data-policy-row={policy.id}
         data-policy-status={policy.status}
-        onClick={handleClick}
+        onClick={handleTogglePolicy}
         type="button"
       >
         <RowBody policy={policy} />
diff --git a/packages/ui/src/components/prompt-templates/prompt-templates.tsx b/packages/ui/src/components/prompt-templates/prompt-templates.tsx
index 0036744e..16cc75d0 100644
--- a/packages/ui/src/components/prompt-templates/prompt-templates.tsx
+++ b/packages/ui/src/components/prompt-templates/prompt-templates.tsx
@@ -404,7 +404,7 @@ function VariableField({
   onValueChange,
   value,
 }: VariableFieldProps): ReactNode {
-  const handleChange = useCallback(
+  const handleVariableValueChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {
       onValueChange(name, event.target.value);
     },
@@ -417,7 +417,7 @@ function VariableField({
       </label>
       <Input
         id={fieldId}
-        onChange={handleChange}
+        onChange={handleVariableValueChange}
         placeholder={`Value for ${name}`}
         value={value}
       />
diff --git a/packages/ui/src/components/relationship-inspector/relationship-inspector.tsx b/packages/ui/src/components/relationship-inspector/relationship-inspector.tsx
index a038331a..8a33d118 100644
--- a/packages/ui/src/components/relationship-inspector/relationship-inspector.tsx
+++ b/packages/ui/src/components/relationship-inspector/relationship-inspector.tsx
@@ -102,7 +102,7 @@ const RowBody = (props: { edge: RelationshipEdge }): React.ReactElement => {
 const Row = (props: { edge: RelationshipEdge }): React.ReactElement => {
   const { edge } = props;
   if (edge.onActivate) {
-    const handleClick = (): void => {
+    const handleActivateRelationship = (): void => {
       edge.onActivate?.();
     };
     return (
@@ -110,7 +110,7 @@ const Row = (props: { edge: RelationshipEdge }): React.ReactElement => {
         className="flex w-full items-center gap-2 rounded-md border border-transparent px-2 py-1.5 text-left transition-colors hover:border-border hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
         data-relationship-direction={edge.direction}
         data-relationship-row
-        onClick={handleClick}
+        onClick={handleActivateRelationship}
         type="button"
       >
         <RowBody edge={edge} />
diff --git a/packages/ui/src/components/routing-assignment-panel/routing-assignment-panel.tsx b/packages/ui/src/components/routing-assignment-panel/routing-assignment-panel.tsx
index df6eaaa6..6e4e8d1a 100644
--- a/packages/ui/src/components/routing-assignment-panel/routing-assignment-panel.tsx
+++ b/packages/ui/src/components/routing-assignment-panel/routing-assignment-panel.tsx
@@ -127,7 +127,7 @@ const RowBody = (props: {
 const Row = (props: { assignment: RoutingAssignment }): React.ReactElement => {
   const { assignment } = props;
   if (assignment.onActivate) {
-    const handleClick = (): void => {
+    const handleActivateAssignment = (): void => {
       assignment.onActivate?.();
     };
     return (
@@ -135,7 +135,7 @@ const Row = (props: { assignment: RoutingAssignment }): React.ReactElement => {
         className="flex w-full items-center gap-2 rounded-md border border-transparent px-2 py-1.5 text-left transition-colors hover:border-border hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
         data-routing-assignment={assignment.id}
         data-routing-role={assignment.role}
-        onClick={handleClick}
+        onClick={handleActivateAssignment}
         type="button"
       >
         <RowBody assignment={assignment} />
diff --git a/packages/ui/src/components/run-timeline/run-timeline.tsx b/packages/ui/src/components/run-timeline/run-timeline.tsx
index 1da9f9be..6665c6ee 100644
--- a/packages/ui/src/components/run-timeline/run-timeline.tsx
+++ b/packages/ui/src/components/run-timeline/run-timeline.tsx
@@ -167,7 +167,7 @@ const PhaseBar = (props: {
   };
   const ariaLabel = `${STATE_LABEL[state]} ${phase.start} → ${phase.end}`;
   if (phase.onActivate) {
-    const handleClick = (): void => {
+    const handleActivatePhase = (): void => {
       phase.onActivate?.();
     };
     return (
@@ -179,7 +179,7 @@ const PhaseBar = (props: {
         )}
         data-run-phase={phase.id}
         data-run-phase-state={state}
-        onClick={handleClick}
+        onClick={handleActivatePhase}
         style={sharedStyle}
         type="button"
       >
diff --git a/packages/ui/src/components/share-dialog/share-dialog.tsx b/packages/ui/src/components/share-dialog/share-dialog.tsx
index 520f24ed..88880326 100644
--- a/packages/ui/src/components/share-dialog/share-dialog.tsx
+++ b/packages/ui/src/components/share-dialog/share-dialog.tsx
@@ -42,7 +42,7 @@ function PlatformButton({
   onClick: (key: string) => void;
   platform: SharePlatform;
 }) {
-  const handleClick = () => {
+  const handleSelectPlatform = () => {
     onClick(platform.key);
   };
 
@@ -55,7 +55,7 @@ function PlatformButton({
         "hover:bg-accent hover:text-accent-foreground",
         "focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
       )}
-      onClick={handleClick}
+      onClick={handleSelectPlatform}
       type="button"
     >
       {platform.label}
diff --git a/packages/ui/src/components/social-fab/social-fab.tsx b/packages/ui/src/components/social-fab/social-fab.tsx
index a75382a4..e90b0063 100644
--- a/packages/ui/src/components/social-fab/social-fab.tsx
+++ b/packages/ui/src/components/social-fab/social-fab.tsx
@@ -50,14 +50,14 @@ function ShareMenu({
   return (
     <div className="flex flex-col gap-0.5 rounded-md border border-gray-300 bg-background p-1.5 shadow-md dark:border-gray-600">
       {platforms.map((p) => {
-        const handleClick = () => {
+        const handleSelectSharePlatform = () => {
           onPlatformSelect(p.key);
         };
         return (
           <button
             className="rounded px-3 py-1.5 text-left text-sm text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
             key={p.key}
-            onClick={handleClick}
+            onClick={handleSelectSharePlatform}
             type="button"
           >
             {p.label}
@@ -69,11 +69,11 @@ function ShareMenu({
 }
 
 function ActionButton({ action }: { action: SocialFabActionConfig }) {
-  const handleClick = action.onClick;
+  const handleRunAction = action.onClick;
   return (
     <button
       className="rounded px-3 py-1.5 text-left text-sm transition-colors hover:bg-accent"
-      onClick={handleClick}
+      onClick={handleRunAction}
       type="button"
     >
       {action.label}
@@ -133,7 +133,7 @@ function MainFabButton({
   mainText: string;
   onToggle: () => void;
 }) {
-  const handleClick = onToggle;
+  const handleToggleSharePanel = onToggle;
   return (
     <button
       aria-expanded={isExpanded}
@@ -144,7 +144,7 @@ function MainFabButton({
         "transition-all duration-200 ease-out",
         "hover:-translate-y-0.5 hover:border-gray-400 hover:shadow-md dark:hover:border-gray-500",
       )}
-      onClick={handleClick}
+      onClick={handleToggleSharePanel}
       type="button"
     >
       <span className="text-sm font-mono">
diff --git a/packages/ui/src/components/timeline-scrubber/timeline-scrubber.tsx b/packages/ui/src/components/timeline-scrubber/timeline-scrubber.tsx
index 37610740..1fbcb9c7 100644
--- a/packages/ui/src/components/timeline-scrubber/timeline-scrubber.tsx
+++ b/packages/ui/src/components/timeline-scrubber/timeline-scrubber.tsx
@@ -247,7 +247,9 @@ export const TimelineScrubber = forwardRef<
   const span = safeEnd - start;
   const clamped = clamp(value, start, safeEnd);
   const ratio = clamp((clamped - start) / span, 0, 1);
-  const handleChange = (event: ChangeEvent<HTMLInputElement>): void => {
+  const handleScrubberValueChange = (
+    event: ChangeEvent<HTMLInputElement>,
+  ): void => {
     onValueChange(clamp(Number(event.target.value), start, safeEnd));
   };
   return (
@@ -274,7 +276,7 @@ export const TimelineScrubber = forwardRef<
         inputId={inputId}
         max={safeEnd}
         min={start}
-        onChange={handleChange}
+        onChange={handleScrubberValueChange}
         ratio={ratio}
         scrubberId={inputId}
         span={span}
diff --git a/packages/ui/src/components/toast/toast.test.tsx b/packages/ui/src/components/toast/toast.test.tsx
index cd696d77..03115aef 100644
--- a/packages/ui/src/components/toast/toast.test.tsx
+++ b/packages/ui/src/components/toast/toast.test.tsx
@@ -65,14 +65,14 @@ describe("ToastClose", () => {
 
 describe("ToastAction", () => {
   it("renders children + invokes onClick", () => {
-    const handleClick = vi.fn();
+    const handleRetryAction = vi.fn();
     render(
-      <ToastAction altText="retry" onClick={handleClick}>
+      <ToastAction altText="retry" onClick={handleRetryAction}>
         Retry
       </ToastAction>,
     );
 
     fireEvent.click(screen.getByText("Retry"));
-    expect(handleClick).toHaveBeenCalledTimes(1);
+    expect(handleRetryAction).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/packages/ui/src/components/viewport-bookmarks/viewport-bookmarks.tsx b/packages/ui/src/components/viewport-bookmarks/viewport-bookmarks.tsx
index d4640ebf..da86b261 100644
--- a/packages/ui/src/components/viewport-bookmarks/viewport-bookmarks.tsx
+++ b/packages/ui/src/components/viewport-bookmarks/viewport-bookmarks.tsx
@@ -65,7 +65,7 @@ const Row = (props: {
   onSelect?: (id: string) => void;
 }): React.ReactElement => {
   const { active, bookmark, onSelect } = props;
-  const handleClick = (): void => {
+  const handleSelectBookmark = (): void => {
     onSelect?.(bookmark.id);
   };
   const rowClass =
@@ -84,7 +84,7 @@ const Row = (props: {
         )}
         data-viewport-bookmark={bookmark.id}
         data-viewport-bookmark-active={active}
-        onClick={handleClick}
+        onClick={handleSelectBookmark}
         type="button"
       >
         <RowBody bookmark={bookmark} />
diff --git a/packages/ui/src/components/world-breadcrumbs/world-breadcrumbs.tsx b/packages/ui/src/components/world-breadcrumbs/world-breadcrumbs.tsx
index d5ca1cdb..d85ab7ac 100644
--- a/packages/ui/src/components/world-breadcrumbs/world-breadcrumbs.tsx
+++ b/packages/ui/src/components/world-breadcrumbs/world-breadcrumbs.tsx
@@ -82,7 +82,7 @@ const Crumb = (props: {
 }): React.ReactElement => {
   const { crumb, isLast, onSelect } = props;
   const glyph = crumb.kind ? KIND_GLYPH[crumb.kind] : null;
-  const handleClick = (): void => {
+  const handleSelectCrumb = (): void => {
     onSelect?.(crumb.id);
   };
   const text = (
@@ -115,7 +115,7 @@ const Crumb = (props: {
       className="inline-flex items-center rounded-sm text-xs text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
       data-world-breadcrumb={crumb.id}
       data-world-breadcrumb-active="false"
-      onClick={handleClick}
+      onClick={handleSelectCrumb}
       type="button"
     >
       {text}