diff --git a/src/_config/shortcodes.js b/src/_config/shortcodes.js
index d983d403..0badaa91 100644
--- a/src/_config/shortcodes.js
+++ b/src/_config/shortcodes.js
@@ -32,17 +32,17 @@ export default function(eleventyConfig) {
         </figure>`;
     });
 
-    // Content accordion
-    eleventyConfig.addPairedShortcode('accordion', (content, summary) => {
+    // Content disclosure
+    eleventyConfig.addPairedShortcode('disclosure', (content, summary) => {
         const summaryMarkup = markdownLibrary.renderInline(summary);
         const contentMarkup = markdownLibrary.render(content);
-        return `<details class="content-accordion">
-            <summary class="content-accordion__summary">${summaryMarkup}</summary>
-            <div class="content-accordion__content">${contentMarkup}</div>
+        return `<details class="content-disclosure">
+            <summary class="content-disclosure__summary">${summaryMarkup}</summary>
+            <div class="content-disclosure__content">${contentMarkup}</div>
         </details>`;
     });
 
-    // Paired shorcode: Content warning accordion
+    // Paired shorcode: Content warning disclosure
     eleventyConfig.addPairedShortcode('contentWarning', (content, warning) => {
         const warningMarkup = markdownLibrary.renderInline(warning);
         const contentMarkup = markdownLibrary.render(content);
diff --git a/src/assets/css/components.css b/src/assets/css/components.css
index 0161a3e4..74b27a1d 100644
--- a/src/assets/css/components.css
+++ b/src/assets/css/components.css
@@ -103,20 +103,20 @@
 
 a.link-btn[href^="http"]:not([href*="leilukin.com"]) { padding-right: calc(var(--btn-right-padding) + var(--sz-external-link)); }
 
-/* Content Accordion */
-* + .content-accordion { margin-top: var(--sz-paragraph-margin); }
-.content-accordion__summary { font-weight: 700; }
-.content-accordion__content,
-.content-accordion__content p + p { margin-top: 1em; }
+/* Content Disclosure */
+* + .content-disclosure { margin-top: var(--sz-paragraph-margin); }
+.content-disclosure__summary { font-weight: 700; }
+.content-disclosure__content,
+.content-disclosure__content p + p { margin-top: 1em; }
 
-.content-accordion__content {
-    --bdr-accordion: 0.15em solid var(--clr-title-border);
+.content-disclosure__content {
+    --bdr-disclosure: 0.15em solid var(--clr-title-border);
     padding: 1em 0;
-    border-top: var(--bdr-accordion);
-    border-bottom: var(--bdr-accordion);
+    border-top: var(--bdr-disclosure);
+    border-bottom: var(--bdr-disclosure);
 }
 
-/* Content warning accordion */
+/* Content warning disclosure */
 * + .contnet-warning { margin-top: var(--sz-paragraph-margin); }
 
 .contnet-warning {
diff --git a/src/blog/posts/2024-06-24-cassette-beasts-fanlisting-approved.md b/src/blog/posts/2024-06-24-cassette-beasts-fanlisting-approved.md
index ed534823..0b2df69f 100644
--- a/src/blog/posts/2024-06-24-cassette-beasts-fanlisting-approved.md
+++ b/src/blog/posts/2024-06-24-cassette-beasts-fanlisting-approved.md
@@ -7,10 +7,10 @@ categories: ["cassette beasts", "site updates"]
 
 On 22 June 2024, I submitted an [application form](https://thefanlistings.org/start/apply.php) to [The Fanlistings Network](https://thefanlistings.org/), also known as TFL.org, to build and run a {% cite "Cassette Beasts" %} fanlisting, and now TFL.org has approved my application! {% cite "Cassette Beasts" %} is now on TFL.org's approved list under the Games category and the [Computer, Console, & Video Games subcategory](https://www.thefanlistings.org/browse.php?show=games&start=8) ([view the web archive version](https://web.archive.org/web/20240624045621/https%3A%2F%2Fwww.thefanlistings.org%2Fbrowse.php%3Fshow%3Dgames%26start%3D8)).
 
-{% accordion "What is a fanlisting?" %}
+{% disclosure "What is a fanlisting?" %}
 For those who do not know what a fanlisting is, TFL.org has defined fanslitings as below:
 > A fanlisting is simply an online listing of fans of a subject, such as a TV show, actor, or musician, that is created by an individual and open for fans from around the world to join. There are no costs, and the only requirements to join a fanlisting are your name and country. Fanlistings do not have to be large sites (although some are) - they are just a place where you can have your name listed along with other fans of the same subject. TheFanlistings.org is the original (but not only) web directory for fanlistings, dedicated to uniting fans across the globe.
-{% endaccordion %}
+{% enddisclosure %}
 
 This is a major moment for me as both a webmaster and a  {% cite "Cassette Beasts" %} fan. As a webmaster, I have been applying and joining fanlistings since I built my own website, as I have always found fanlistings a neat idea to gather and discover other people who share your interests across the world, as listing your country is a requirement when you apply to join a fanlisting. Recently, I have been considering building and running a fanlisting myself, with {% cite "Cassette Beasts" %} being my first choice since there is no fanlisting for {% cite "Cassette Beasts" %} yet. I began to dabble in PHP, so I can use a script like [BellaBuffs](https://www.jemjabella.co.uk/scripts/bellabuffs/) to build a fanlisting. With my application approved by The Fanlistings Network, the {% cite "Cassette Beasts" %}  fanlisting will be the first fanlisting I build and run.
 
diff --git a/src/shrines/cassettebeasts/articles/cassette-beasts-more-than-a-pokemon-clone.md b/src/shrines/cassettebeasts/articles/cassette-beasts-more-than-a-pokemon-clone.md
index 45aafd30..c2f13087 100644
--- a/src/shrines/cassettebeasts/articles/cassette-beasts-more-than-a-pokemon-clone.md
+++ b/src/shrines/cassettebeasts/articles/cassette-beasts-more-than-a-pokemon-clone.md
@@ -90,13 +90,13 @@ The protagonists of {% cite "Pokémon" %} games become the new Champion of their
 
 In addition, {% cite "Cassette Beasts" %}' story can get genuinely dark at times, most notably in the cosmic horror presented by the Archangels, the eldritch entities that you need to defeat in boss battles to gather clues about a way out of New Wirral and return home.
 
-{%- accordion 'Major Story Spoilers for <cite>Cassette Beasts</cite>' %}
+{%- disclosure 'Major Story Spoilers for <cite>Cassette Beasts</cite>' %}
 Towards the end of the main quest, it is revealed that Archangels are [egregores](https://en.wikipedia.org/wiki/Egregore) created from humanity's desires and ideas. Aleph, the main antagonist and final boss of the main story, is an Archangel that is an incarnation of conquest, and his goal is to leave New Wirral and cause chaos across reality.
 
 While {% cite "Pokémon" %} has its own fair share of sinister villains, the threat the main villain of {% cite "Cassette Beasts" %} poses is even greater in scope than any {% cite "Pokémon" %} villain, maybe except for Rainbow Rocket Giovanni from {% cite "Ultra Sun" %} and {% cite "Ultra Moon" %}, who shares the goal of ruling the multiverse.
 
 Moreover, even though the player character and their party are able to defeat the main villain in the end, the game makes it clear that since Archangels are not flesh and blood and born from human ideas, as long as humans are interested in conquest Aleph will return at some point. This reflects our world in that defeating a tyrant does not magically solve everything, especially when the system that enables tyrants' rise to power still exists.
-{% endaccordion %}
+{% enddisclosure %}
 
 ## Features {% cite "Cassette Beasts" %} Has But {% cite "Pokémon" %} Lacks
 
@@ -154,9 +154,9 @@ If the existence of the option to romance your human companion is not enough, in
 
 On the flip side, {% cite "Cassette Beasts" %} has canon LGBTQ+ characters. For characters who are attracted to the samge gender, the most notable ones are the human companions, who can be romanced by the player character regardless of gender, meaning they are canonically bisexual. Furthermore, the game also has a pair of NPCs who are revealed in-game to be a gay married couple.
 
-{%- accordion 'Minor Quest Spoilers for <cite>Cassette Beasts</cite>' %}
+{%- disclosure 'Minor Quest Spoilers for <cite>Cassette Beasts</cite>' %}
 To be specific, this pair of NPCs in question are Leader Ianthe and Ranger Wilma, members of the Ranger Guild. After you defeat all 12 Ranger Captains, and you challenge Ianthe to a battle, Ianthe will reveal that she will fight alongside her wife, who is none other than Ranger Wilma, the woman in charge of the Ranger Guild store. Yes, {% cite "Cassette Beasts" %} has a canon married lesbian couple.
-{%- endaccordion %}
+{%- enddisclosure %}
 
 As for transgender and non-binary representation, {% cite "Pokémon" %} has a few ambiguously canon ones, namely [Beauty Nova](https://lgbtqgamearchive.com/2016/05/25/beauty-nova-in-pokemon-xy/), a minor female NPC Trainer from {% cite "X" %} and {% cite "Y" %} who is heavily implied to be a trans woman, and [Blanche](https://bulbapedia.bulbagarden.net/wiki/Blanche) from {% cite "Pokémon GO" %}, who is not referred to by gendered pronouns in the English version of the game and official social media accounts. Some other human characters are also commonly interpreted or headcanonned as trans by LGBTQ+ fans, but none of them are officially confirmed to be trans or non-binary.