diff --git a/hugo.yaml b/hugo.yaml
index 60a0abe28..1391e3284 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -5,18 +5,18 @@ defaultContentLanguage: "en"
 defaultContentLanguageInSubdir: true
 languages:
   en:
-    languageName: "English"
-    languageCode: en
+    label: "English"
+    locale: "en"
     weight: 1
     title: "FIP Guide – Fast. Clear. Community-based."
   de:
-    languageName: "Deutsch"
-    languageCode: de
+    label: "Deutsch"
+    locale: "de"
     weight: 2
     title: "FIP Guide – Schnell. Übersichtlich. Community-basiert."
   fr:
-    languageName: "Français"
-    languageCode: fr
+    label: "Français"
+    locale: "fr"
     weight: 3
     title: "FIP Guide – Rapide. Clair. Basé sur le partage."
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 91f93cc74..a8e58f7c8 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html
-  lang="{{ site.Language.LanguageCode }}"
-  dir="{{ or site.Language.LanguageDirection `ltr` }}"
+  lang="{{ site.Language.Locale }}"
+  dir="{{ or site.Language.Direction `ltr` }}"
 >
   <head>
     {{ partial "head" . }}
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 028b1bcc9..ff05e6ed3 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -4,7 +4,7 @@
         <title>{{ .Site.Title }}</title>
         <link>{{ .Site.BaseURL }}</link>
         <description>{{ .Site.Params.description }}</description>
-        <language>{{ site.Language.LanguageCode }}</language>
+        <language>{{ site.Language.Locale }}</language>
         <image>{{ partial "header-logo" }}</image>
         {{ range where .Site.RegularPages "Section" "news" }}
         <item>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 268fb179a..2ea5ab766 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,7 +1,7 @@
 <div class="o-footer__line">
   <div
     aria-label="{{ T "footer-love.aria-label" }}"
-    {{ if and (ne site.Language.LanguageCode "fr") (ne site.Language.LanguageCode "en") }}
+    {{ if and (ne site.Language.Locale "fr") (ne site.Language.Locale "en") }}
       lang="en"
     {{ end }}
   >
@@ -57,7 +57,7 @@
       aria-label="{{ T "language-switcher.aria-label" }}"
     >
       {{ partial "icon" "translate" }}
-      <div>{{ $.Site.Language.LanguageName }}</div>
+      <div>{{ $.Site.Language.Label }}</div>
       <div class="o-dropdown__icon">
         {{ partial "icon" "keyboard_arrow_up" }}
       </div>
@@ -79,7 +79,7 @@
             href="{{ .Permalink }}"
             {{ if eq $.Site.Language .Language }}aria-current="page"{{ end }}
           >
-            {{ .Language.LanguageName }}
+            {{ .Language.Label }}
           </a>
         </li>
       {{ end }}
diff --git a/layouts/partials/structuredData.html b/layouts/partials/structuredData.html
index b874b563c..023f4d1e6 100644
--- a/layouts/partials/structuredData.html
+++ b/layouts/partials/structuredData.html
@@ -90,7 +90,7 @@
         "name": "FIP Guide",
         "email": "nextstop@fipguide.org"
       },
-      "inLanguage": "{{ site.Language.LanguageCode }}",
+      "inLanguage": "{{ site.Language.Locale }}",
       "isAccessibleForFree": true
     }
   ]
