From a6024eb0419964d7e391bf29e283192dd5e50c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rolf=20Christian=20J=C3=B8rgensen?=
 <114920418+rcj-siteimprove@users.noreply.github.com>
Date: Mon, 18 Dec 2023 15:24:52 +0100
Subject: [PATCH] Rename diagnostic `WithAccessibleName` to `WithName` and
 property `accessibleName` to `name` (#1537)

* Rename `accessibleName` to `name`

* Extract API

* Add changeset
---
 .changeset/few-ravens-shave.md                |  7 ++
 docs/review/api/alfa-rules.api.md             |  2 +-
 .../alfa-rules/src/common/act/diagnostic.ts   |  2 +-
 packages/alfa-rules/src/common/diagnostic.ts  |  2 +-
 .../common/diagnostic/with-accessible-name.ts | 71 --------------
 .../src/common/diagnostic/with-name.ts        | 62 +++++++++++++
 packages/alfa-rules/src/sia-r15/rule.ts       | 26 ++----
 packages/alfa-rules/src/sia-r39/rule.ts       | 21 ++---
 packages/alfa-rules/src/sia-r41/rule.ts       | 30 ++----
 packages/alfa-rules/src/sia-r81/rule.ts       | 30 ++----
 .../alfa-rules/test/sia-r15/rule.spec.tsx     | 92 ++++++++-----------
 .../alfa-rules/test/sia-r39/rule.spec.tsx     |  4 +-
 .../alfa-rules/test/sia-r41/rule.spec.tsx     |  4 +-
 .../alfa-rules/test/sia-r81/rule.spec.tsx     |  4 +-
 packages/alfa-rules/tsconfig.json             |  2 +-
 15 files changed, 158 insertions(+), 201 deletions(-)
 create mode 100644 .changeset/few-ravens-shave.md
 delete mode 100644 packages/alfa-rules/src/common/diagnostic/with-accessible-name.ts
 create mode 100644 packages/alfa-rules/src/common/diagnostic/with-name.ts

diff --git a/.changeset/few-ravens-shave.md b/.changeset/few-ravens-shave.md
new file mode 100644
index 0000000000..38df0d3cff
--- /dev/null
+++ b/.changeset/few-ravens-shave.md
@@ -0,0 +1,7 @@
+---
+"@siteimprove/alfa-rules": minor
+---
+
+**Breaking:** Diagnostic `WithAccessibleName` has been renamed to `WithName` and the property `accessibleName` to `name`.
+
+This is to conform to existing diagnostics that refer to accessible name as name and clients that are expecting this convention.
diff --git a/docs/review/api/alfa-rules.api.md b/docs/review/api/alfa-rules.api.md
index 1baff7a595..f90e5741c7 100644
--- a/docs/review/api/alfa-rules.api.md
+++ b/docs/review/api/alfa-rules.api.md
@@ -83,7 +83,7 @@ export namespace Diagnostic {
     import TextSpacing = diagnostic.TextSpacing;
     import WithBadElements = diagnostic.WithBadElements;
     import WithRole = diagnostic.WithRole;
-    import WithAccessibleName = diagnostic.WithAccessibleName;
+    import WithName = diagnostic.WithName;
     import WithOtherHeading = diagnostic.WithOtherHeading;
 }
 
diff --git a/packages/alfa-rules/src/common/act/diagnostic.ts b/packages/alfa-rules/src/common/act/diagnostic.ts
index 73efc55a2e..a04338cabd 100755
--- a/packages/alfa-rules/src/common/act/diagnostic.ts
+++ b/packages/alfa-rules/src/common/act/diagnostic.ts
@@ -36,6 +36,6 @@ export namespace Diagnostic {
   export import TextSpacing = diagnostic.TextSpacing;
   export import WithBadElements = diagnostic.WithBadElements;
   export import WithRole = diagnostic.WithRole;
-  export import WithAccessibleName = diagnostic.WithAccessibleName;
+  export import WithName = diagnostic.WithName;
   export import WithOtherHeading = diagnostic.WithOtherHeading;
 }
diff --git a/packages/alfa-rules/src/common/diagnostic.ts b/packages/alfa-rules/src/common/diagnostic.ts
index 731a8d70f5..8f989d49b3 100644
--- a/packages/alfa-rules/src/common/diagnostic.ts
+++ b/packages/alfa-rules/src/common/diagnostic.ts
@@ -5,5 +5,5 @@ export * from "./diagnostic/contrast";
 export * from "./diagnostic/text-spacing";
 export * from "./diagnostic/with-bad-elements";
 export * from "./diagnostic/with-role";
-export * from "./diagnostic/with-accessible-name";
+export * from "./diagnostic/with-name";
 export * from "./diagnostic/with-other-heading";
diff --git a/packages/alfa-rules/src/common/diagnostic/with-accessible-name.ts b/packages/alfa-rules/src/common/diagnostic/with-accessible-name.ts
deleted file mode 100644
index c9575da7d3..0000000000
--- a/packages/alfa-rules/src/common/diagnostic/with-accessible-name.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Diagnostic } from "@siteimprove/alfa-act";
-import { Device } from "@siteimprove/alfa-device";
-import { Node } from "@siteimprove/alfa-aria";
-import { Element } from "@siteimprove/alfa-dom";
-import { Option } from "@siteimprove/alfa-option";
-
-/**
- * @public
- */
-export class WithAccessibleName extends Diagnostic {
-  public static of(message: string): Diagnostic;
-
-  public static of(message: string, accessibleName: string): Diagnostic;
-
-  public static of(message: string, accessibleName?: string): Diagnostic {
-    return accessibleName === undefined
-      ? new Diagnostic(message)
-      : new WithAccessibleName(message, accessibleName);
-  }
-
-  private readonly _accessibleName: string;
-
-  protected constructor(message: string, accessibleName: string) {
-    super(message);
-    this._accessibleName = accessibleName;
-  }
-
-  public get accessibleName(): string {
-    return this._accessibleName;
-  }
-
-  public toJSON(): WithAccessibleName.JSON {
-    return {
-      ...super.toJSON(),
-      accessibleName: this._accessibleName,
-    };
-  }
-}
-
-/**
- * @public
- */
-export namespace WithAccessibleName {
-  export interface JSON extends Diagnostic.JSON {
-    accessibleName: string;
-  }
-
-  export function isWithAccessibleName(
-    value: Diagnostic,
-  ): value is WithAccessibleName;
-
-  export function isWithAccessibleName(
-    value: unknown,
-  ): value is WithAccessibleName;
-
-  /**
-   * @public
-   */
-  export function isWithAccessibleName(
-    value: unknown,
-  ): value is WithAccessibleName {
-    return value instanceof WithAccessibleName;
-  }
-
-  export function getAccessibleName(
-    element: Element,
-    device: Device,
-  ): Option<string> {
-    return Node.from(element, device).name.map((x) => x.value);
-  }
-}
diff --git a/packages/alfa-rules/src/common/diagnostic/with-name.ts b/packages/alfa-rules/src/common/diagnostic/with-name.ts
new file mode 100644
index 0000000000..d2179335b7
--- /dev/null
+++ b/packages/alfa-rules/src/common/diagnostic/with-name.ts
@@ -0,0 +1,62 @@
+import { Diagnostic } from "@siteimprove/alfa-act";
+import { Device } from "@siteimprove/alfa-device";
+import { Node } from "@siteimprove/alfa-aria";
+import { Element } from "@siteimprove/alfa-dom";
+import { Option } from "@siteimprove/alfa-option";
+
+/**
+ * @public
+ */
+export class WithName extends Diagnostic {
+  public static of(message: string): Diagnostic;
+
+  public static of(message: string, name: string): Diagnostic;
+
+  public static of(message: string, name?: string): Diagnostic {
+    return name === undefined
+      ? new Diagnostic(message)
+      : new WithName(message, name);
+  }
+
+  private readonly _name: string;
+
+  protected constructor(message: string, name: string) {
+    super(message);
+    this._name = name;
+  }
+
+  public get name(): string {
+    return this._name;
+  }
+
+  public toJSON(): WithName.JSON {
+    return {
+      ...super.toJSON(),
+      name: this._name,
+    };
+  }
+}
+
+/**
+ * @public
+ */
+export namespace WithName {
+  export interface JSON extends Diagnostic.JSON {
+    name: string;
+  }
+
+  export function isWithName(value: Diagnostic): value is WithName;
+
+  export function isWithName(value: unknown): value is WithName;
+
+  /**
+   * @public
+   */
+  export function isWithName(value: unknown): value is WithName {
+    return value instanceof WithName;
+  }
+
+  export function getName(element: Element, device: Device): Option<string> {
+    return Node.from(element, device).name.map((x) => x.value);
+  }
+}
diff --git a/packages/alfa-rules/src/sia-r15/rule.ts b/packages/alfa-rules/src/sia-r15/rule.ts
index 9195db3ca0..4be3ff76ca 100644
--- a/packages/alfa-rules/src/sia-r15/rule.ts
+++ b/packages/alfa-rules/src/sia-r15/rule.ts
@@ -16,7 +16,7 @@ import { Question } from "../common/act/question";
 import { referenceSameResource } from "../common/predicate";
 import { Scope, Stability } from "../tags";
 
-import { WithAccessibleName } from "../common/diagnostic";
+import { WithName } from "../common/diagnostic";
 import { normalize } from "../common/normalize";
 
 const { hasNonEmptyAccessibleName, isIncludedInTheAccessibilityTree } = DOM;
@@ -58,7 +58,7 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
             referenceSameResource(response.url)(element, elements[i - 1]),
         );
 
-        const name = WithAccessibleName.getAccessibleName(
+        const name = WithName.getName(
           Iterable.first(target).getUnsafe(), // Existence of first element is guaranteed by applicability
           device,
         ).getUnsafe(); // Existence of accessible name is guaranteed by applicability
@@ -73,7 +73,7 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
                 target,
                 "Do the <iframe> elements embed equivalent resources?",
                 {
-                  diagnostic: WithAccessibleName.of(
+                  diagnostic: WithName.of(
                     "Do the <iframe> elements embed equivalent resources?",
                     name,
                   ),
@@ -96,27 +96,21 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
  * @public
  */
 export namespace Outcomes {
-  export const EmbedSameResources = (accessibleName: string) =>
+  export const EmbedSameResources = (name: string) =>
     Ok.of(
-      WithAccessibleName.of(
-        `The \`<iframe>\` elements embed the same resource`,
-        accessibleName,
-      ),
+      WithName.of(`The \`<iframe>\` elements embed the same resource`, name),
     );
 
-  export const EmbedEquivalentResources = (accessibleName: string) =>
+  export const EmbedEquivalentResources = (name: string) =>
     Ok.of(
-      WithAccessibleName.of(
-        `The \`<iframe>\` elements embed equivalent resources`,
-        accessibleName,
-      ),
+      WithName.of(`The \`<iframe>\` elements embed equivalent resources`, name),
     );
 
-  export const EmbedDifferentResources = (accessibleName: string) =>
+  export const EmbedDifferentResources = (name: string) =>
     Err.of(
-      WithAccessibleName.of(
+      WithName.of(
         `The \`<iframe>\` elements do not embed the same or equivalent resources`,
-        accessibleName,
+        name,
       ),
     );
 }
diff --git a/packages/alfa-rules/src/sia-r39/rule.ts b/packages/alfa-rules/src/sia-r39/rule.ts
index 29b9884406..efdd16b560 100644
--- a/packages/alfa-rules/src/sia-r39/rule.ts
+++ b/packages/alfa-rules/src/sia-r39/rule.ts
@@ -9,7 +9,7 @@ import { Page } from "@siteimprove/alfa-web";
 import { expectation } from "../common/act/expectation";
 import { Question } from "../common/act/question";
 
-import { WithAccessibleName } from "../common/diagnostic";
+import { WithName } from "../common/diagnostic";
 import { Scope, Stability } from "../tags";
 
 const { hasAccessibleName, isIncludedInTheAccessibilityTree } = DOM;
@@ -52,10 +52,7 @@ export default Rule.Atomic.of<Page, Element, Question.Metadata>({
       },
 
       expectations(target) {
-        const accName = WithAccessibleName.getAccessibleName(
-          target,
-          device,
-        ).getUnsafe(); // Existence of accessible name is guaranteed by applicability
+        const accName = WithName.getName(target, device).getUnsafe(); // Existence of accessible name is guaranteed by applicability
 
         return {
           1: Question.of(
@@ -63,7 +60,7 @@ export default Rule.Atomic.of<Page, Element, Question.Metadata>({
             target,
             `Does the accessible name of the \`<${target.name}>\` element describe its purpose?`,
             {
-              diagnostic: WithAccessibleName.of(
+              diagnostic: WithName.of(
                 `Does the accessible name of the \`<${target.name}>\` element describe its purpose?`,
                 accName,
               ),
@@ -96,19 +93,19 @@ function getFilename(path: string): string {
  * @public
  */
 export namespace Outcomes {
-  export const NameIsDescriptive = (name: string, accessibleName: string) =>
+  export const NameIsDescriptive = (name: string, accName: string) =>
     Ok.of(
-      WithAccessibleName.of(
+      WithName.of(
         `The accessible name of the \`<${name}>\` element describes its purpose`,
-        accessibleName,
+        accName,
       ),
     );
 
-  export const NameIsNotDescriptive = (name: string, accessibleName: string) =>
+  export const NameIsNotDescriptive = (name: string, accName: string) =>
     Err.of(
-      WithAccessibleName.of(
+      WithName.of(
         `The accessible name of the \`<${name}>\` element does not describe its purpose`,
-        accessibleName,
+        accName,
       ),
     );
 }
diff --git a/packages/alfa-rules/src/sia-r41/rule.ts b/packages/alfa-rules/src/sia-r41/rule.ts
index 04cc305640..3cb0cb09da 100644
--- a/packages/alfa-rules/src/sia-r41/rule.ts
+++ b/packages/alfa-rules/src/sia-r41/rule.ts
@@ -17,7 +17,7 @@ import { referenceSameResource } from "../common/predicate";
 
 import { normalize } from "../common/normalize";
 
-import { WithAccessibleName } from "../common/diagnostic";
+import { WithName } from "../common/diagnostic";
 import { Scope, Stability } from "../tags";
 
 const { hasNonEmptyAccessibleName, hasRole, isIncludedInTheAccessibilityTree } =
@@ -53,7 +53,7 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
       },
 
       expectations(target) {
-        const name = WithAccessibleName.getAccessibleName(
+        const name = WithName.getName(
           Iterable.first(target).getUnsafe(), // Existence of first element is guaranteed by applicability
           device,
         ).getUnsafe(); // Existence of accessible name is guaranteed by applicability
@@ -78,7 +78,7 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
                 target,
                 `Do the links resolve to equivalent resources?`,
                 {
-                  diagnostic: WithAccessibleName.of(
+                  diagnostic: WithName.of(
                     `Do the links resolve to equivalent resources?`,
                     name,
                   ),
@@ -101,27 +101,17 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
  * @public
  */
 export namespace Outcomes {
-  export const ResolveSameResource = (accessibleName: string) =>
-    Ok.of(
-      WithAccessibleName.of(
-        `The links resolve to the same resource`,
-        accessibleName,
-      ),
-    );
+  export const ResolveSameResource = (name: string) =>
+    Ok.of(WithName.of(`The links resolve to the same resource`, name));
 
-  export const ResolveEquivalentResource = (accessibleName: string) =>
-    Ok.of(
-      WithAccessibleName.of(
-        `The links resolve to equivalent resources`,
-        accessibleName,
-      ),
-    );
+  export const ResolveEquivalentResource = (name: string) =>
+    Ok.of(WithName.of(`The links resolve to equivalent resources`, name));
 
-  export const ResolveDifferentResource = (accessibleName: string) =>
+  export const ResolveDifferentResource = (name: string) =>
     Err.of(
-      WithAccessibleName.of(
+      WithName.of(
         `The links do not resolve to the same or equivalent resources`,
-        accessibleName,
+        name,
       ),
     );
 }
diff --git a/packages/alfa-rules/src/sia-r81/rule.ts b/packages/alfa-rules/src/sia-r81/rule.ts
index 470cce0226..7f36ff20f9 100644
--- a/packages/alfa-rules/src/sia-r81/rule.ts
+++ b/packages/alfa-rules/src/sia-r81/rule.ts
@@ -20,7 +20,7 @@ import { referenceSameResource } from "../common/predicate";
 
 import { normalize } from "../common/normalize";
 
-import { WithAccessibleName } from "../common/diagnostic";
+import { WithName } from "../common/diagnostic";
 import { Scope, Stability } from "../tags";
 
 const { hasNonEmptyAccessibleName, hasRole, isIncludedInTheAccessibilityTree } =
@@ -69,7 +69,7 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
       },
 
       expectations(target) {
-        const name = WithAccessibleName.getAccessibleName(
+        const name = WithName.getName(
           Iterable.first(target).getUnsafe(), // Existence of first element is guaranteed by applicability
           device,
         ).getUnsafe(); // Existence of accessible name is guaranteed by applicability
@@ -93,7 +93,7 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
                 target,
                 `Do the links resolve to equivalent resources?`,
                 {
-                  diagnostic: WithAccessibleName.of(
+                  diagnostic: WithName.of(
                     `Do the links resolve to equivalent resources?`,
                     name,
                   ),
@@ -116,27 +116,17 @@ export default Rule.Atomic.of<Page, Group<Element>, Question.Metadata>({
  * @public
  */
 export namespace Outcomes {
-  export const ResolveSameResource = (accessibleName: string) =>
-    Ok.of(
-      WithAccessibleName.of(
-        `The links resolve to the same resource`,
-        accessibleName,
-      ),
-    );
+  export const ResolveSameResource = (name: string) =>
+    Ok.of(WithName.of(`The links resolve to the same resource`, name));
 
-  export const ResolveEquivalentResource = (accessibleName: string) =>
-    Ok.of(
-      WithAccessibleName.of(
-        `The links resolve to equivalent resources`,
-        accessibleName,
-      ),
-    );
+  export const ResolveEquivalentResource = (name: string) =>
+    Ok.of(WithName.of(`The links resolve to equivalent resources`, name));
 
-  export const ResolveDifferentResource = (accessibleName: string) =>
+  export const ResolveDifferentResource = (name: string) =>
     Err.of(
-      WithAccessibleName.of(
+      WithName.of(
         `The links do not resolve to the same or equivalent resources`,
-        accessibleName,
+        name,
       ),
     );
 }
diff --git a/packages/alfa-rules/test/sia-r15/rule.spec.tsx b/packages/alfa-rules/test/sia-r15/rule.spec.tsx
index b84bf847a7..a86cb3922f 100644
--- a/packages/alfa-rules/test/sia-r15/rule.spec.tsx
+++ b/packages/alfa-rules/test/sia-r15/rule.spec.tsx
@@ -9,54 +9,51 @@ import R15, { Outcomes } from "../../src/sia-r15/rule";
 
 import { Group } from "../../src/common/act/group";
 
-import { WithAccessibleName } from "../../src/common/diagnostic";
+import { WithName } from "../../src/common/diagnostic";
 import { evaluate } from "../common/evaluate";
 import { oracle } from "../common/oracle";
 import { cantTell, failed, inapplicable, passed } from "../common/outcome";
 
 test("evaluate() passes when two iframes embed the exact same resource", async (t) => {
-  const accessibleName = "Foo";
+  const name = "Foo";
 
   const target = [
-    <iframe title={accessibleName} src="https://somewhere.com/foo.html" />,
-    <iframe aria-label={accessibleName} src="https://somewhere.com/foo.html" />,
+    <iframe title={name} src="https://somewhere.com/foo.html" />,
+    <iframe aria-label={name} src="https://somewhere.com/foo.html" />,
   ];
 
   const document = h.document(target);
 
   t.deepEqual(await evaluate(R15, { document }), [
     passed(R15, Group.of(target), {
-      1: Outcomes.EmbedSameResources(accessibleName),
+      1: Outcomes.EmbedSameResources(name),
     }),
   ]);
 });
 
 test("evaluate() passes when two iframes embed the exact same resource via srcdoc", async (t) => {
-  const accessibleName = "Foo";
+  const name = "Foo";
 
   const target = [
-    <iframe title={accessibleName} srcdoc="<span>foo</span>" />,
-    <iframe aria-label={accessibleName} srcdoc="<span>foo</span>" />,
+    <iframe title={name} srcdoc="<span>foo</span>" />,
+    <iframe aria-label={name} srcdoc="<span>foo</span>" />,
   ];
 
   const document = h.document(target);
 
   t.deepEqual(await evaluate(R15, { document }), [
     passed(R15, Group.of(target), {
-      1: Outcomes.EmbedSameResources(accessibleName),
+      1: Outcomes.EmbedSameResources(name),
     }),
   ]);
 });
 
 test("evaluate() passes when two iframes embed equivalent resources", async (t) => {
-  const accessibleName = "Foo";
+  const name = "Foo";
 
   const target = [
-    <iframe title={accessibleName} src="https://somewhere.com/foo1.html" />,
-    <iframe
-      aria-label={accessibleName}
-      src="https://somewhere.com/foo2.html"
-    />,
+    <iframe title={name} src="https://somewhere.com/foo1.html" />,
+    <iframe aria-label={name} src="https://somewhere.com/foo2.html" />,
   ];
 
   const document = h.document(target);
@@ -72,7 +69,7 @@ test("evaluate() passes when two iframes embed equivalent resources", async (t)
         R15,
         Group.of(target),
         {
-          1: Outcomes.EmbedEquivalentResources(accessibleName),
+          1: Outcomes.EmbedEquivalentResources(name),
         },
         Outcome.Mode.SemiAuto,
       ),
@@ -81,11 +78,11 @@ test("evaluate() passes when two iframes embed equivalent resources", async (t)
 });
 
 test("evaluate() passes when toplevel and nested iframe embed the same resource", async (t) => {
-  const accessibleName = "Foo";
+  const name = "Foo";
 
   const target = [
-    <iframe title={accessibleName} src="https://somewhere.com/foo.html" />,
-    <iframe aria-label={accessibleName} src="https://somewhere.com/foo.html" />,
+    <iframe title={name} src="https://somewhere.com/foo.html" />,
+    <iframe aria-label={name} src="https://somewhere.com/foo.html" />,
   ];
 
   const document = h.document([
@@ -95,17 +92,17 @@ test("evaluate() passes when toplevel and nested iframe embed the same resource"
 
   t.deepEqual(await evaluate(R15, { document }), [
     passed(R15, Group.of(target), {
-      1: Outcomes.EmbedSameResources(accessibleName),
+      1: Outcomes.EmbedSameResources(name),
     }),
   ]);
 });
 
 test("evaluate() fails when two iframes embed different resources", async (t) => {
-  const accessibleName = "Foobar";
+  const name = "Foobar";
 
   const target = [
-    <iframe title={accessibleName} src="https://somewhere.com/foo.html" />,
-    <iframe aria-label={accessibleName} src="https://somewhere.com/bar.html" />,
+    <iframe title={name} src="https://somewhere.com/foo.html" />,
+    <iframe aria-label={name} src="https://somewhere.com/bar.html" />,
   ];
 
   const document = h.document(target);
@@ -121,7 +118,7 @@ test("evaluate() fails when two iframes embed different resources", async (t) =>
         R15,
         Group.of(target),
         {
-          1: Outcomes.EmbedDifferentResources(accessibleName),
+          1: Outcomes.EmbedDifferentResources(name),
         },
         Outcome.Mode.SemiAuto,
       ),
@@ -139,11 +136,11 @@ test("evaluate() is inapplicable when there is no two iframe with the same name"
 });
 
 test("evaluate() can't tell if URLs are identical but invalid", async (t) => {
-  const accName = "Foo";
+  const name = "Foo";
 
   const target = [
-    <iframe title={accName} src="https:////////@@@" />,
-    <iframe aria-label={accName} src="https:////////@@@" />,
+    <iframe title={name} src="https:////////@@@" />,
+    <iframe aria-label={name} src="https:////////@@@" />,
   ];
 
   const document = h.document(target);
@@ -152,17 +149,14 @@ test("evaluate() can't tell if URLs are identical but invalid", async (t) => {
     cantTell(
       R15,
       Group.of(target),
-      WithAccessibleName.of(
-        "Do the <iframe> elements embed equivalent resources?",
-        accName,
-      ),
+      WithName.of("Do the <iframe> elements embed equivalent resources?", name),
     ),
   ]);
 });
 
 test("evaluate() can't tell if there is no source", async (t) => {
-  const accName = "Foo";
-  const target = [<iframe title={accName} />, <iframe aria-label={accName} />];
+  const name = "Foo";
+  const target = [<iframe title={name} />, <iframe aria-label={name} />];
 
   const document = h.document(target);
 
@@ -170,44 +164,38 @@ test("evaluate() can't tell if there is no source", async (t) => {
     cantTell(
       R15,
       Group.of(target),
-      WithAccessibleName.of(
-        "Do the <iframe> elements embed equivalent resources?",
-        accName,
-      ),
+      WithName.of("Do the <iframe> elements embed equivalent resources?", name),
     ),
   ]);
 });
 
 test("evaluate() passes when two iframes embed the same resource up to trailing slash", async (t) => {
-  const accessibleName = "Foo";
+  const name = "Foo";
 
   const target = [
-    <iframe title={accessibleName} src="https://somewhere.com/" />,
-    <iframe aria-label={accessibleName} src="https://somewhere.com" />,
+    <iframe title={name} src="https://somewhere.com/" />,
+    <iframe aria-label={name} src="https://somewhere.com" />,
   ];
 
   const document = h.document(target);
 
   t.deepEqual(await evaluate(R15, { document }), [
     passed(R15, Group.of(target), {
-      1: Outcomes.EmbedSameResources(accessibleName),
+      1: Outcomes.EmbedSameResources(name),
     }),
   ]);
 });
 
 test("evaluate() correctly resolves relative URLs", async (t) => {
-  const accessibleName = "Foo";
+  const name = "Foo";
 
   const target = [
-    <iframe
-      title={accessibleName}
-      src="https://somewhere.com/path/to/foo.html"
-    />,
-    <iframe title={accessibleName} src="foo.html" />,
-    <iframe title={accessibleName} src="./foo.html" />,
-    <iframe title={accessibleName} src="/path/to/foo.html" />,
-    <iframe title={accessibleName} src="down/../foo.html" />,
-    <iframe title={accessibleName} src="../to/foo.html" />,
+    <iframe title={name} src="https://somewhere.com/path/to/foo.html" />,
+    <iframe title={name} src="foo.html" />,
+    <iframe title={name} src="./foo.html" />,
+    <iframe title={name} src="/path/to/foo.html" />,
+    <iframe title={name} src="down/../foo.html" />,
+    <iframe title={name} src="../to/foo.html" />,
   ];
 
   const document = h.document(target);
@@ -222,7 +210,7 @@ test("evaluate() correctly resolves relative URLs", async (t) => {
     }),
     [
       passed(R15, Group.of(target), {
-        1: Outcomes.EmbedSameResources(accessibleName),
+        1: Outcomes.EmbedSameResources(name),
       }),
     ],
   );
diff --git a/packages/alfa-rules/test/sia-r39/rule.spec.tsx b/packages/alfa-rules/test/sia-r39/rule.spec.tsx
index f866f03cbe..db93089cae 100755
--- a/packages/alfa-rules/test/sia-r39/rule.spec.tsx
+++ b/packages/alfa-rules/test/sia-r39/rule.spec.tsx
@@ -4,7 +4,7 @@ import { test } from "@siteimprove/alfa-test";
 
 import R39, { Outcomes } from "../../src/sia-r39/rule";
 
-import { WithAccessibleName } from "../../src/common/diagnostic";
+import { WithName } from "../../src/common/diagnostic";
 import { evaluate } from "../common/evaluate";
 import { oracle } from "../common/oracle";
 import { cantTell, failed, inapplicable, passed } from "../common/outcome";
@@ -76,7 +76,7 @@ test("evaluate() can't tell that name is descriptive", async (t) => {
     cantTell(
       R39,
       target,
-      WithAccessibleName.of(
+      WithName.of(
         "Does the accessible name of the `<img>` element describe its purpose?",
         "Placeholder",
       ),
diff --git a/packages/alfa-rules/test/sia-r41/rule.spec.tsx b/packages/alfa-rules/test/sia-r41/rule.spec.tsx
index cc4254d5ed..c4da67d78f 100644
--- a/packages/alfa-rules/test/sia-r41/rule.spec.tsx
+++ b/packages/alfa-rules/test/sia-r41/rule.spec.tsx
@@ -8,7 +8,7 @@ import { Group } from "../../src/common/act/group";
 
 import { Response } from "@siteimprove/alfa-http";
 import { URL } from "@siteimprove/alfa-url";
-import { WithAccessibleName } from "../../src/common/diagnostic";
+import { WithName } from "../../src/common/diagnostic";
 import { evaluate } from "../common/evaluate";
 import { oracle } from "../common/oracle";
 import { cantTell, failed, inapplicable, passed } from "../common/outcome";
@@ -164,7 +164,7 @@ test(`evaluate() can't tell if two links that have the same name references
     cantTell(
       R41,
       Group.of(target),
-      WithAccessibleName.of(
+      WithName.of(
         "Do the links resolve to equivalent resources?",
         accessibleName,
       ),
diff --git a/packages/alfa-rules/test/sia-r81/rule.spec.tsx b/packages/alfa-rules/test/sia-r81/rule.spec.tsx
index 29f4b2ec40..893b228752 100644
--- a/packages/alfa-rules/test/sia-r81/rule.spec.tsx
+++ b/packages/alfa-rules/test/sia-r81/rule.spec.tsx
@@ -8,7 +8,7 @@ import { Group } from "../../src/common/act/group";
 
 import { Response } from "@siteimprove/alfa-http";
 import { URL } from "@siteimprove/alfa-url";
-import { WithAccessibleName } from "../../src/common/diagnostic";
+import { WithName } from "../../src/common/diagnostic";
 import { evaluate } from "../common/evaluate";
 import { oracle } from "../common/oracle";
 import { cantTell, failed, inapplicable, passed } from "../common/outcome";
@@ -246,7 +246,7 @@ test(`evaluate() can't tell if two links that have the same name references
     cantTell(
       R81,
       Group.of(target),
-      WithAccessibleName.of(
+      WithName.of(
         "Do the links resolve to equivalent resources?",
         accessibleName,
       ),
diff --git a/packages/alfa-rules/tsconfig.json b/packages/alfa-rules/tsconfig.json
index 08ddb1a5cb..b0040c6ac1 100644
--- a/packages/alfa-rules/tsconfig.json
+++ b/packages/alfa-rules/tsconfig.json
@@ -19,7 +19,7 @@
     "src/common/applicability/video.ts",
     "src/common/diagnostic/contrast.ts",
     "src/common/diagnostic/text-spacing.ts",
-    "src/common/diagnostic/with-accessible-name.ts",
+    "src/common/diagnostic/with-name.ts",
     "src/common/diagnostic/with-bad-elements.ts",
     "src/common/diagnostic/with-other-heading.ts",
     "src/common/diagnostic/with-role.ts",