diff --git a/documentation/config/_default/languages.bn-bd.toml b/documentation/config/_default/languages.bn-bd.toml
index 6a5e8f9319..6ad4d5e7ff 100644
--- a/documentation/config/_default/languages.bn-bd.toml
+++ b/documentation/config/_default/languages.bn-bd.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/bn-bd"
-languageName = "বাংলা"
+label = "বাংলা"
 weight = 4
diff --git a/documentation/config/_default/languages.da.toml b/documentation/config/_default/languages.da.toml
index 70df8ff731..0bd9100942 100644
--- a/documentation/config/_default/languages.da.toml
+++ b/documentation/config/_default/languages.da.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/da"
-languageName = "Danish"
+label = "Danish"
 weight = 5
diff --git a/documentation/config/_default/languages.de.toml b/documentation/config/_default/languages.de.toml
index 9c910b8456..7c83579384 100644
--- a/documentation/config/_default/languages.de.toml
+++ b/documentation/config/_default/languages.de.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/de"
-languageName = "German"
+label = "German"
 weight = 6
diff --git a/documentation/config/_default/languages.el.toml b/documentation/config/_default/languages.el.toml
index 6ce926dc13..e8fe7d9eb0 100644
--- a/documentation/config/_default/languages.el.toml
+++ b/documentation/config/_default/languages.el.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/el"
-languageName = "Greek"
+label = "Greek"
 weight = 7
diff --git a/documentation/config/_default/languages.en.toml b/documentation/config/_default/languages.en.toml
index 8725a1cc67..e089629ef5 100644
--- a/documentation/config/_default/languages.en.toml
+++ b/documentation/config/_default/languages.en.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/en"
-languageName = "English"
+label = "English"
 weight = 1
diff --git a/documentation/config/_default/languages.es.toml b/documentation/config/_default/languages.es.toml
index 585a09172c..d7e8f66f9a 100644
--- a/documentation/config/_default/languages.es.toml
+++ b/documentation/config/_default/languages.es.toml
@@ -1,4 +1,4 @@
 title = "Portal de documentación de FreeBSD"
 contentDir = "content/es"
-languageName = "Spanish"
+label = "Spanish"
 weight = 2
diff --git a/documentation/config/_default/languages.fr.toml b/documentation/config/_default/languages.fr.toml
index 8005dd6f3c..1cb00bcd70 100644
--- a/documentation/config/_default/languages.fr.toml
+++ b/documentation/config/_default/languages.fr.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/fr"
-languageName = "French"
+label = "French"
 weight = 11
diff --git a/documentation/config/_default/languages.hu.toml b/documentation/config/_default/languages.hu.toml
index 289b08d718..ffb3200ef0 100644
--- a/documentation/config/_default/languages.hu.toml
+++ b/documentation/config/_default/languages.hu.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/hu"
-languageName = "Hungarian"
+label = "Hungarian"
 weight = 12
diff --git a/documentation/config/_default/languages.id.toml b/documentation/config/_default/languages.id.toml
index e576406cba..515a63c81d 100644
--- a/documentation/config/_default/languages.id.toml
+++ b/documentation/config/_default/languages.id.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/id"
-languageName = "Indonesian"
+label = "Indonesian"
 weight = 20
diff --git a/documentation/config/_default/languages.it.toml b/documentation/config/_default/languages.it.toml
index ea90dcadef..9e7d603e0e 100644
--- a/documentation/config/_default/languages.it.toml
+++ b/documentation/config/_default/languages.it.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/it"
-languageName = "Italian"
+label = "Italian"
 weight = 8
diff --git a/documentation/config/_default/languages.ja.toml b/documentation/config/_default/languages.ja.toml
index b6e6dd7f22..e27b920e21 100644
--- a/documentation/config/_default/languages.ja.toml
+++ b/documentation/config/_default/languages.ja.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/ja"
-languageName = "日本語"
+label = "日本語"
 weight = 3
diff --git a/documentation/config/_default/languages.ko.toml b/documentation/config/_default/languages.ko.toml
index ceda7f9c8b..a74788a656 100644
--- a/documentation/config/_default/languages.ko.toml
+++ b/documentation/config/_default/languages.ko.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/ko"
-languageName = "한국어"
+label = "한국어"
 weight = 9
diff --git a/documentation/config/_default/languages.mn.toml b/documentation/config/_default/languages.mn.toml
index be9a502ff9..ddd34c02c3 100644
--- a/documentation/config/_default/languages.mn.toml
+++ b/documentation/config/_default/languages.mn.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/mn"
-languageName = "монгол хэл mongol khel"
+label = "монгол хэл mongol khel"
 weight = 19
diff --git a/documentation/config/_default/languages.nl.toml b/documentation/config/_default/languages.nl.toml
index b78b5984d8..ee35ec9221 100644
--- a/documentation/config/_default/languages.nl.toml
+++ b/documentation/config/_default/languages.nl.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/nl"
-languageName = "Dutch"
+label = "Dutch"
 weight = 16
diff --git a/documentation/config/_default/languages.pl.toml b/documentation/config/_default/languages.pl.toml
index dee531f558..5bd0d4bd3d 100644
--- a/documentation/config/_default/languages.pl.toml
+++ b/documentation/config/_default/languages.pl.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/pl"
-languageName = "Polish"
+label = "Polish"
 weight = 15
diff --git a/documentation/config/_default/languages.pt-br.toml b/documentation/config/_default/languages.pt-br.toml
index 3aebca78c0..bdd94d16fb 100644
--- a/documentation/config/_default/languages.pt-br.toml
+++ b/documentation/config/_default/languages.pt-br.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/pt-br"
-languageName = "Brazilian Portuguese"
+label = "Brazilian Portuguese"
 weight = 10
diff --git a/documentation/config/_default/languages.ru.toml b/documentation/config/_default/languages.ru.toml
index ff4c52d76b..a757c17a3e 100644
--- a/documentation/config/_default/languages.ru.toml
+++ b/documentation/config/_default/languages.ru.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/ru"
-languageName = "Русский"
+label = "Русский"
 weight = 13
diff --git a/documentation/config/_default/languages.tr.toml b/documentation/config/_default/languages.tr.toml
index b27472e573..b11a4a11b0 100644
--- a/documentation/config/_default/languages.tr.toml
+++ b/documentation/config/_default/languages.tr.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/tr"
-languageName = "Turkish"
+label = "Turkish"
 weight = 14
diff --git a/documentation/config/_default/languages.zh-cn.toml b/documentation/config/_default/languages.zh-cn.toml
index 03862a200c..fa939cff88 100644
--- a/documentation/config/_default/languages.zh-cn.toml
+++ b/documentation/config/_default/languages.zh-cn.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/zh-cn"
-languageName = "简体中文"
+label = "简体中文"
 weight = 17
diff --git a/documentation/config/_default/languages.zh-tw.toml b/documentation/config/_default/languages.zh-tw.toml
index 39b370ef17..89e40936df 100644
--- a/documentation/config/_default/languages.zh-tw.toml
+++ b/documentation/config/_default/languages.zh-tw.toml
@@ -1,4 +1,4 @@
 title = "FreeBSD Documentation Portal"
 contentDir = "content/zh-tw"
-languageName = "繁體中文"
+label = "繁體中文"
 weight = 18
diff --git a/documentation/themes/beastie/layouts/_partials/site-footer.html b/documentation/themes/beastie/layouts/_partials/site-footer.html
index aab2506f36..1eecc33af4 100755
--- a/documentation/themes/beastie/layouts/_partials/site-footer.html
+++ b/documentation/themes/beastie/layouts/_partials/site-footer.html
@@ -1,114 +1,114 @@
 <footer>
   <div class="footer-container">
     <section class="logo-column">
         {{ if $.Site.Params.isOnline }}
           <img src="{{ absLangURL ($.Site.BaseURL) }}images/FreeBSD-colors.svg" width="160" height="50" alt="FreeBSD logo" />
         {{ else }}
           <img src="/images/FreeBSD-colors.svg" width="160" height="50" alt="FreeBSD logo" />
         {{ end }}
         <div class="options-container">
           {{ if $.Site.Params.isOnline }}
             <div class="language-container">
               <a id="languages" href="{{ "languages" | absLangURL }}">
                 <img src="{{ absLangURL ($.Site.BaseURL ) }}images/language.png" class="language-image" alt="{{ i18n "choose-language" }}">
-                <span>{{ .Site.Language.LanguageName }}</span>
+                <span>{{ .Site.Language.Label }}</span>
               </a>
             </div>
           {{ end }}
           <div class="theme-container">
             <select id="theme-chooser">
 	      <option value="theme-system">{{ i18n "system" }}</option>
               <option value="theme-light">{{ i18n "light" }}</option>
               <option value="theme-dark">{{ i18n "dark" }}</option>
               <option value="theme-high-contrast">{{ i18n "high-contrast" }}</option>
             </select>
           </div>
         </div>
       </section>
       <section class="about-column">
         <h3 class="column-title">{{ i18n "f-about" }}</h3>
         <ul class="column-elements-container">
           <li>
             <a href="https://www.freebsd.org/about/" target="_blank" class="column-element">{{ i18n "f-freebsd" }}</a>
           </li>
           <li>
             <a href="https://freebsdfoundation.org/" target="_blank" class="column-element">{{ i18n "f-freebsd-foundation" }}</a>
           </li>
           <li>
             <a href="https://www.freebsd.org/where/" target="_blank" class="column-element">{{ i18n "f-get-freebsd" }}</a>
           </li>
           <li>
             <a href="https://www.freebsd.org/internal/code-of-conduct" target="_blank" class="column-element">{{ i18n "f-code-of-conduct" }}</a>
           </li>
           <li>
             <a href="https://www.freebsd.org/security/" target="_blank" class="column-element">{{ i18n "f-security-advisories" }}</a>
           </li>
         </ul>
       </section>
       <section class="documentation-column">
         <h3 class="column-title">{{ i18n "f-documentation" }}</h3>
         <ul class="column-elements-container">
           <li>
             <a href="{{ .Site.BaseURL | relLangURL }}" class="column-element">{{ i18n "f-documentation-portal" }}</a>
           </li>
           <li>
             <a href="https://man.FreeBSD.org" target="_blank" class="column-element">{{ i18n "f-manual-pages" }}</a>
           </li>
           <li>
             <a href="https://papers.FreeBSD.org" target="_blank" class="column-element">{{ i18n "f-presentation-and-papers" }}</a>
           </li>
           <li>
             <a href="https://docs-archive.freebsd.org/doc/" target="_blank" class="column-element">{{ i18n "f-previous-versions" }}</a>
           </li>
           <li>
             <a href="https://docs-archive.freebsd.org/44doc/" target="_blank" class="column-element">{{ i18n "f-44bsd-documents" }}</a>
           </li>
           <li>
             <a href="https://wiki.freebsd.org/" target="_blank" class="column-element">{{ i18n "f-wiki" }}</a>
           </li>
         </ul>
       </section>
       <section class="community-column">
         <h3 class="column-title">{{ i18n "f-community" }}</h3>
         <ul class="column-elements-container">
           <li>
             <a href={{ "articles/contributing" | absLangURL }} class="column-element">{{ i18n "f-get-involved" }}</a>
           </li>
           <li>
             <a href="https://forums.freebsd.org/" target="_blank" class="column-element">{{ i18n "f-community-forum" }}</a>
           </li>
           <li>
             <a href="https://lists.freebsd.org/" target="_blank" class="column-element">{{ i18n "f-mailing-lists" }}</a>
           </li>
           <li>
             <a href="https://wiki.freebsd.org/IRC/Channels" target="_blank" class="column-element">{{ i18n "f-irc-channels" }}</a>
           </li>
           <li>
             <a href="https://bugs.freebsd.org/bugzilla/" target="_blank" class="column-element">{{ i18n "f-bug-tracker" }}</a>
           </li>
         </ul>
       </section>
       <section class="legal-column">
         <h3 class="column-title">{{ i18n "f-legal" }}</h3>
         <ul class="column-elements-container">
           <li>
             <a href="https://freebsdfoundation.org/donate/" target="_blank" class="column-element">{{ i18n "f-donations" }}</a>
           </li>
           <li>
             <a href="https://www.freebsd.org/copyright/freebsd-license/" target="_blank"
               class="column-element">{{ i18n "f-licensing" }}</a>
           </li>
           <li>
             <a href="https://www.freebsd.org/privacy/" target="_blank" class="column-element">{{ i18n "f-privacy-policy" }}</a>
           </li>
           <li>
             <a href="https://www.freebsd.org/copyright/" target="_blank" class="column-element">{{ i18n "f-legal-notices" }}</a>
           </li>
         </ul>
       </section>
       <section class="copyright-column">
         <p>&copy; 1994-{{ now.Format "2006" }} {{ i18n "f-all-rights-reserved" }}</p>
         <span>{{ i18n "f-made-with" }} <span class="heart">♥</span> {{ i18n "f-by-freebsd-community" }}</span>
       </section>
   </div>
 </footer>
diff --git a/documentation/themes/beastie/layouts/_shortcodes/languages-selection.html b/documentation/themes/beastie/layouts/_shortcodes/languages-selection.html
index bbfff53f3d..df9fd9ca6c 100644
--- a/documentation/themes/beastie/layouts/_shortcodes/languages-selection.html
+++ b/documentation/themes/beastie/layouts/_shortcodes/languages-selection.html
@@ -1,7 +1,7 @@
 <ul class="language-list">
   {{ range $.Site.Home.AllTranslations }}
     <li>
-      <a href="{{ .RelPermalink }}" lang="{{ .Language.Params.languageCode }}">{{.Language.LanguageName }}</a>
+      <a href="{{ .RelPermalink }}" lang="{{ .Language.Params.languageCode }}">{{.Language.Label }}</a>
     </li>
   {{ end }}
 </ul>
\ No newline at end of file
diff --git a/documentation/themes/beastie/layouts/languages.html b/documentation/themes/beastie/layouts/languages.html
index 8743c86312..463112d4ab 100644
--- a/documentation/themes/beastie/layouts/languages.html
+++ b/documentation/themes/beastie/layouts/languages.html
@@ -1,23 +1,23 @@
 <!DOCTYPE html>
 <html lang="{{ $.Site.Language.Lang | default "en" }}">
   {{ partial "site-head.html" . }}
   <body>
     {{ block "header" . }}{{ partial "site-header.html" .}}{{ end }}
     <main class="main-wrapper">
       <div class="document">
         {{ $home := .Site.Home }}
         <h1>{{ i18n "select-language" }}</h1>
-        <p>{{ i18n "current-selection" }} {{ .Site.Language.LanguageName }}</p>
+        <p>{{ i18n "current-selection" }} {{ .Site.Language.Label }}</p>
         <ul class="language-list">
           {{ range $.Site.Home.AllTranslations }}
           {{ $isCurrentLang := eq $home.Language .Language }}
             <li {{ if $isCurrentLang}} class="selected" {{ end }}>
-              <a href="{{ .RelPermalink }}" lang="{{ .Language.Params.languageCode }}">{{.Language.LanguageName }}</a>
+              <a href="{{ .RelPermalink }}" lang="{{ .Language.Params.languageCode }}">{{.Language.Label }}</a>
             </li>
           {{ end }}
         </ul>
       </div>
     </main>
     {{ block "footer" . }}{{ partial "site-footer.html" .}}{{ end }}
   </body>
 </html>