diff --git a/layouts/_default/list.json.json b/layouts/_default/list.json.json
index 5cd74d8..1eb70e0 100644
--- a/layouts/_default/list.json.json
+++ b/layouts/_default/list.json.json
@@ -19,7 +19,7 @@
     {{ with .OutputFormats.Get "JSON" -}}
     "feed_url": "{{ .Permalink }}",
     {{ end -}}
-    {{ with site.LanguageCode -}}
+    {{ with site.Language.LanguageCode -}}
     "language": "{{ . }}",
     {{ end -}}
     {{ with $.Param "icon" -}}
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 77c3e5a..d009885 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -17,7 +17,7 @@
     <link>{{ .Permalink }}</link>
     <description>{{ i18n "string_recent_content" }} {{ if ne .Title site.Title }}{{ with .Title }}{{ i18n "string_in" }} {{ . }} {{ end }}{{ end }}{{ i18n "string_on" }} {{ site.Title }}</description>
     <generator>Hugo</generator>
-    {{- with site.LanguageCode }}
+    {{- with site.Language.LanguageCode }}
     <language>{{ . }}</language>
     {{- end }}
     {{- with site.Params.author.email }}
diff --git a/layouts/micro/rss.xml b/layouts/micro/rss.xml
index 9013692..02e3c3c 100644
--- a/layouts/micro/rss.xml
+++ b/layouts/micro/rss.xml
@@ -4,7 +4,7 @@
     <link>{{ .Permalink }}</link>
     <description>Micro blog {{ i18n "string_by" }} {{ with site.Params.author.name }}{{ . }}{{ end }}, {{ i18n "string_follow" }} @{{ with $.Param "microusername" }}{{ . }}{{ end }} {{ i18n "string_at" }} https://micro.blog/{{ with $.Param "microusername" }}{{ . }}{{ end }}</description>
     <generator>Hugo -- gohugo.io</generator>
-    {{ with site.LanguageCode -}}
+    {{ with site.Language.LanguageCode -}}
     <language>{{ . }}</language>
     {{ end -}}
     {{ with site.Params.author.email -}}
diff --git a/layouts/partials/language-selector.html b/layouts/partials/language-selector.html
index 85157b3..980f159 100644
--- a/layouts/partials/language-selector.html
+++ b/layouts/partials/language-selector.html
@@ -6,7 +6,7 @@
 <ul class="navbar">
 {{ if .IsTranslated -}}
 {{ range .Translations -}}
-<li><a rel="alternate" href="{{ .RelPermalink }}" hreflang="{{ .Site.LanguageCode | default .Lang }}" lang="{{ .Site.LanguageCode | default .Lang }}">{{ .Language.LanguageName }}</a></li>
+<li><a rel="alternate" href="{{ .RelPermalink }}" hreflang="{{ .Site.Language.LanguageCode | default .Lang }}" lang="{{ .Site.Language.LanguageCode | default .Lang }}">{{ .Language.LanguageName }}</a></li>
 {{ end -}}
 {{ else -}}
 {{ range site.Languages -}}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 9569274..4d156d8 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -23,6 +23,6 @@
 <link rel="canonical" href="{{ .Permalink }}">
 {{ if .IsTranslated -}}
 {{ range .Translations -}}
-<link rel="alternate" hreflang="{{ .Site.LanguageCode | default .Lang }}" href="{{ .Permalink }}">
+<link rel="alternate" hreflang="{{ .Site.Language.LanguageCode | default .Lang }}" href="{{ .Permalink }}">
 {{ end -}}
 {{ end -}}
diff --git a/layouts/podcast/rss.xml b/layouts/podcast/rss.xml
index 67b8d78..c6a0560 100644
--- a/layouts/podcast/rss.xml
+++ b/layouts/podcast/rss.xml
@@ -5,7 +5,7 @@
     <link>{{ .Permalink }}</link>
     <description>{{ site.Params.Podcast.Description | default site.Params.Description }}</description>
     <generator>Hugo -- gohugo.io</generator>
-    <language>{{ site.Params.Podcast.Lang | default site.LanguageCode }}</language>
+    <language>{{ site.Params.Podcast.Lang | default site.Language.LanguageCode }}</language>
     {{ with site.Params.author.email -}}
     <managingEditor>{{ . }}{{ with site.Params.author.name }} ({{ . }}){{ end }}</managingEditor>
     {{ end -}}