diff --git a/app/components/nouns/NounsClassSelectTable.vue b/app/components/nouns/NounsClassSelectTable.vue
index f1eeb74b3..da3d7a0f1 100644
--- a/app/components/nouns/NounsClassSelectTable.vue
+++ b/app/components/nouns/NounsClassSelectTable.vue
@@ -16,7 +16,7 @@ const config = useConfig();
 const nounsData = await loadNounsData();
 
 const nouns = computed((): Noun[] => {
-    return withKey(nounsData.classes ?? {})
+    return entriesWithKeys(nounsData.classes ?? {})
         .map((nounClass): NounClassInstance => ({ classKey: nounClass.key, stems: props.stemValues }))
         .map((classInstance, i): NounRawWithLoadedWords => ({
             id: `template-${i}`,
diff --git a/app/components/nouns/NounsConventionsIndex.vue b/app/components/nouns/NounsConventionsIndex.vue
index 1d1edf757..059c43dcc 100644
--- a/app/components/nouns/NounsConventionsIndex.vue
+++ b/app/components/nouns/NounsConventionsIndex.vue
@@ -7,7 +7,7 @@ const nounsData = await loadNounsData();
 <template>
     <ul v-if="nounsData.groups" class="list-group mt-4">
         <li
-            v-for="nounConventionGroup of withKey(nounsData.groups)"
+            v-for="nounConventionGroup of entriesWithKeys(nounsData.groups)"
             :key="nounConventionGroup.key"
             class="list-group-item"
         >
diff --git a/app/components/nouns/NounsConventionsIndexGroup.vue b/app/components/nouns/NounsConventionsIndexGroup.vue
index 300a3bf4d..b414aeb12 100644
--- a/app/components/nouns/NounsConventionsIndexGroup.vue
+++ b/app/components/nouns/NounsConventionsIndexGroup.vue
@@ -11,7 +11,7 @@ if (nounsData === undefined) {
     throw new Error('nounsData is undefined');
 }
 const visibleNounConventions = computed(() => {
-    return withKey(nounsData.conventions ?? {}).filter((nounConvention) => {
+    return entriesWithKeys(nounsData.conventions ?? {}).filter((nounConvention) => {
         return props.nounConventionGroup.conventions.includes(nounConvention.key);
     });
 });
diff --git a/app/components/nouns/NounsRegularWordsSubform.vue b/app/components/nouns/NounsRegularWordsSubform.vue
index 67db40b6c..c354abe6b 100644
--- a/app/components/nouns/NounsRegularWordsSubform.vue
+++ b/app/components/nouns/NounsRegularWordsSubform.vue
@@ -30,7 +30,7 @@ const id = useId();
 <template>
     <h5><T>nouns.submit.regular.stems.header</T></h5>
     <p><T>nouns.submit.regular.stems.description</T></p>
-    <template v-for="stem of withKey(nounsData.stems ?? {})" :key="stem.key">
+    <template v-for="stem of entriesWithKeys(nounsData.stems ?? {})" :key="stem.key">
         <label :for="`${id}-stem-${stem.key}`">{{ stem.name }}</label>
         <input
             :id="`${id}-stem-${stem.key}`"
diff --git a/app/middleware/languageItemFromPath.ts b/app/middleware/languageItemFromPath.ts
index e5fff0f18..a4de9bb8f 100644
--- a/app/middleware/languageItemFromPath.ts
+++ b/app/middleware/languageItemFromPath.ts
@@ -25,7 +25,7 @@ const findNounConvention = async (path: string, config: Config) => {
 
     const nounsData = await loadNounsData();
 
-    return withKey(nounsData.conventions ?? {})
+    return entriesWithKeys(nounsData.conventions ?? {})
         .find((nounConvention) => nounConvention.key === path);
 };
 
diff --git a/shared/classes.ts b/shared/classes.ts
index 723958ec2..ec1316776 100644
--- a/shared/classes.ts
+++ b/shared/classes.ts
@@ -16,6 +16,7 @@ import type {
     Gender,
     Numerus,
 } from '~~/shared/nouns.ts';
+import type { WithKey } from '~~/shared/utils/entriesWithKeys.ts';
 
 export class PronounExample {
     singular: Example;
diff --git a/app/utils/withKey.ts b/shared/utils/entriesWithKeys.ts
similarity index 100%
rename from app/utils/withKey.ts
rename to shared/utils/entriesWithKeys.ts
diff --git a/app/utils/getWithKey.ts b/shared/utils/getWithKey.ts
similarity index 78%
rename from app/utils/getWithKey.ts
rename to shared/utils/getWithKey.ts
index 52813a019..38e4a5c64 100644
--- a/app/utils/getWithKey.ts
+++ b/shared/utils/getWithKey.ts
@@ -1,4 +1,4 @@
-import type { WithKey } from '~/utils/withKey.ts';
+import type { WithKey } from '~~/shared/utils/entriesWithKeys.ts';
 
 export default <T>(record: Record<string, T> | undefined, key: string | undefined): WithKey<T> | undefined => {
     if (key === undefined || record?.[key] === undefined) {