2 files changed, 6 insertions, 25 deletions
diff --git a/src/data/checks.js b/src/data/checks.js
index 6909f011..f8a04178 100644
--- a/src/data/checks.js
+++ b/src/data/checks.js
@@ -4,6 +4,7 @@ import {inspect as nodeInspect} from 'node:util';
 import {colors, ENABLE_COLOR} from '#cli';
 
 import CacheableObject from '#cacheable-object';
+import {nativeGetMatchableDirectories} from '#find';
 import {replacerSpec, parseContentNodes} from '#replacer';
 import {compareArrays, cut, cutStart, empty, getNestedProp, iterateMultiline}
   from '#sugar';
@@ -56,7 +57,7 @@ export function reportDirectoryErrors(wikiData, {
 
       const directories =
         (findSpec.getMatchableDirectories
-          ? findSpec.getMatchableDirectories(thing)
+          ? findSpec.getMatchableDirectories(thing, nativeGetMatchableDirectories)
           : [thing.directory]);
 
       for (const directory of directories) {
diff --git a/src/data/things/Track.js b/src/data/things/Track.js
index 6fc38e5d..a368a15b 100644
--- a/src/data/things/Track.js
+++ b/src/data/things/Track.js
@@ -1273,13 +1273,7 @@ export class Track extends Thing {
   static [Thing.findSpecs] = {
     track: {
       referenceTypes: ['track'],
-
       bindTo: 'trackData',
-
-      getMatchableNames: track =>
-        (track.nameForReferencingAcrossWiki
-          ? [track.nameForReferencingAcrossWiki]
-          : []),
     },
 
     trackMainReleasesOnly: {
@@ -1288,11 +1282,6 @@ export class Track extends Thing {
 
       include: track =>
         !CacheableObject.getUpdateValue(track, 'mainRelease'),
-
-      getMatchableNames: track =>
-        (track.nameForReferencingAcrossWiki
-          ? [track.nameForReferencingAcrossWiki]
-          : []),
     },
 
     trackReference: {
@@ -1350,12 +1339,6 @@ export class Track extends Thing {
 
       include: track =>
         track.hasUniqueCoverArt,
-
-      // This is an acontextual reference.
-      getMatchableNames: track =>
-        (track.referenceByDirectory === 'normally'
-          ? [track.name]
-          : []),
     },
 
     trackPrimaryArtwork: {
@@ -1374,14 +1357,11 @@ export class Track extends Thing {
         artwork.thing.isTrack &&
         artwork === artwork.thing.trackArtworks[0],
 
-      // This is an acontextual reference.
-      getMatchableNames: ({thing: track}) =>
-        (track.referenceByDirectory === 'normally'
-          ? [track.name]
-          : []),
+      getMatchableNames: (artwork, nativeGetMatchableNames) =>
+        nativeGetMatchableNames(artwork.thing),
 
-      getMatchableDirectories: ({thing: track}) =>
-        [track.directory],
+      getMatchableDirectories: (artwork, nativeGetMatchableDirectory) =>
+        nativeGetMatchableDirectory(artwork.thing),
     },
   };