diff --git a/src/App.svelte b/src/App.svelte
index 94b8d08..b266a99 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,8 +1,8 @@
 <script>
  import SpTitle from './SpTitle.svelte'
- import SpHasTiers from './SpHasTiers.svelte'
- import SpHasWhat from './SpHasWhat.svelte'
- import SpHasCandidates from './SpHasCandidates.svelte'
+ import SpTiers from './SpTiers.svelte'
+ import SpKeys from './SpKeys.svelte'
+ import SpCandidates from './SpCandidates.svelte'
  import { onMount } from 'svelte';
  let v = "loading...";
  let relpath = "";
@@ -114,9 +114,9 @@
     {#each Object.entries(frontmatter) as fmItems}
       {#if ['ascriptions', 'triad'].includes(fmItems[0])}
         {#each fmItems[1] as fmItem, i}
-          <SpHasWhat index={i} fmKeyType={fmItems[0]} fmItem={fmItem} hases={hases} hasesCandidates={hasesCandidates} on:hasTiersSelected={newHasTiers}  />
-          <SpHasTiers on:addToCandidatesRemoveFromTiers={addToCandidatesRemoveFromTiers} index={i} fmKeyType={fmItems[0]} fmItem={fmItem} />
-          <SpHasCandidates on:addToTiersRemoveFromCandidates={addToTiersRemoveFromCandidates} index={i} fmKeyType={fmItems[0]} fmItem={fmItem} />
+          <SpKeys index={i} fmKeyType={fmItems[0]} fmItem={fmItem} hases={hases} hasesCandidates={hasesCandidates} on:hasTiersSelected={newHasTiers}  />
+          <SpTiers on:addToCandidatesRemoveFromTiers={addToCandidatesRemoveFromTiers} index={i} fmKeyType={fmItems[0]} fmItem={fmItem} />
+          <SpCandidates on:addToTiersRemoveFromCandidates={addToTiersRemoveFromCandidates} index={i} fmKeyType={fmItems[0]} fmItem={fmItem} />
         {/each}
       {/if}
     {/each}
diff --git a/src/SpHasCandidates.svelte b/src/SpCandidates.svelte
similarity index 100%
rename from src/SpHasCandidates.svelte
rename to src/SpCandidates.svelte
diff --git a/src/SpHasWhat.svelte b/src/SpKeys.svelte
similarity index 100%
rename from src/SpHasWhat.svelte
rename to src/SpKeys.svelte
diff --git a/src/SpHasTiers.svelte b/src/SpTiers.svelte
similarity index 100%
rename from src/SpHasTiers.svelte
rename to src/SpTiers.svelte