diff --git a/README.md b/README.md
index d4e79cb..cc41702 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,7 @@ The site will work without setting any of the podcast parameters but your podcas
 
 English and Swedish translations are included and you can easily add more to the `i18n` site directory.
 
-A language selector will be included on sites with more than one language. Add a `LanguageName` parameter to your language configuration, this is what will be displayed in the selector.
+A language selector will be included on sites with more than one language. Add `languageName` to your language configuration, this is what will be displayed in the selector.
 
 The language selector will link to a translation of the current page if it exist and to the front page if it does not.
 
@@ -173,12 +173,10 @@ The language selector will link to a translation of the current page if it exist
 languages:
   sv:
     weight: 1
-    params:
-      LanguageName: "Svenska"
+    languageName: "Svenska"
   en:
     weight: 2
-    params:
-      LanguageName: "English"
+    languageName: "English"
 ```
 
 
diff --git a/layouts/partials/language-selector.html b/layouts/partials/language-selector.html
index b9a9e4d..3d4c1e0 100644
--- a/layouts/partials/language-selector.html
+++ b/layouts/partials/language-selector.html
@@ -3,12 +3,12 @@
 <ul class="navbar">
 {{ if .IsTranslated -}}
 {{ range .Translations }}
-<li><a rel="alternate" href="{{ .RelPermalink }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .Site.Language.Params.LanguageName }}</a></li>
+<li><a rel="alternate" href="{{ .RelPermalink }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .Language.LanguageName }}</a></li>
 {{ end -}}
 {{ else -}}
 {{ range .Site.Languages -}}
 {{ if ne $.Site.Language.Lang .Lang }}
-<li><a rel="alternate" href="/{{ .Lang }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .Params.LanguageName }}</a></li>
+<li><a rel="alternate" href="{{ .Lang | relURL }}" hreflang="{{ .Lang }}" lang="{{ .Lang }}">{{ .LanguageName }}</a></li>
 {{ end -}}
 {{ end -}}
 {{ end -}}