diff --git a/content/cfp.de.md b/content/cfp.de.md
index 074da11..d214d91 100644
--- a/content/cfp.de.md
+++ b/content/cfp.de.md
@@ -23,7 +23,7 @@ voneinander zu lernen und Spass zu haben — nicht nur am Gerät.
 Die CoSin findet dieses Jahr vom
 {{< cosin_i18n "date_start_weekday" >}}, den {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} bis
 {{< cosin_i18n "date_end_weekday" >}}, den {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}}
-{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}}
+{{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}}
 statt.
 
 ## Wie kann ich mich beteiligen?
diff --git a/content/cfp.en.md b/content/cfp.en.md
index 79ee47f..afde62d 100644
--- a/content/cfp.en.md
+++ b/content/cfp.en.md
@@ -23,7 +23,7 @@ voneinander zu lernen und Spass zu haben — nicht nur am Gerät.
 Die CoSin findet dieses Jahr vom
 {{< cosin_i18n "date_start_weekday" >}}, den {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} bis
 {{< cosin_i18n "date_end_weekday" >}}, den {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}}
-{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}}
+{{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) in {{< cosin_i18n "location_city" >}}
 statt.
 
 ## Wie kann ich mich beteiligen?
diff --git a/content/cfp.fr.md b/content/cfp.fr.md
index 1e7a165..65a6613 100644
--- a/content/cfp.fr.md
+++ b/content/cfp.fr.md
@@ -22,7 +22,7 @@ seulement sur leur machines !
 Cette année le CoSin aura lieu du
 {{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}} {{< cosin_i18n "date_start_month" >}} au
 {{< cosin_i18n "date_end_weekday" >}} {{< cosin "date_end_day" >}} {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}}
-{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) à {{< cosin_i18n "location_city" >}}.
+{{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) à {{< cosin_i18n "location_city" >}}.
 
 ## Comment est-ce que je participe ?
 
diff --git a/content/cfp.it.md b/content/cfp.it.md
index b90e811..f78b8da 100644
--- a/content/cfp.it.md
+++ b/content/cfp.it.md
@@ -22,7 +22,7 @@ solo al computer.
 Quest'anno la CoSin si svolge da
 {{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} fino a
 {{< cosin_i18n "date_end_weekday" >}} {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}} {{< cosin "date_year" >}},
-{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}.
+{{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}.
 
 ## Come posso contribuire?
 
diff --git a/content/infos.it.md b/content/infos.it.md
index 59855da..3b29683 100644
--- a/content/infos.it.md
+++ b/content/infos.it.md
@@ -13,7 +13,7 @@ Quest'anno la CoSin si svolge da
 {{< cosin_i18n "date_start_weekday" >}} {{< cosin "date_start_day" >}}. {{< cosin_i18n "date_start_month" >}} fino a
 {{< cosin_i18n "date_end_weekday" >}} {{< cosin "date_end_day" >}}. {{< cosin_i18n "date_end_month" >}}
 {{< cosin "date_year" >}},
-{{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}.
+{{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin_i18n "location_city" >}}.
 
 ## Costi
 
diff --git a/content/ort.de.md b/content/ort.de.md
index e1274ff..e8d3634 100644
--- a/content/ort.de.md
+++ b/content/ort.de.md
@@ -9,7 +9,7 @@ menu:
 
 ## Ort
 
-Das CoSin findet {{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}][1] in {{< cosin_i18n "location_city" >}} statt.
+Das CoSin findet {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}][1] in {{< cosin_i18n "location_city" >}} statt.
 
 ## Photos
 
diff --git a/content/ort.en.md b/content/ort.en.md
index b8de2d7..39a952d 100644
--- a/content/ort.en.md
+++ b/content/ort.en.md
@@ -9,7 +9,7 @@ menu:
 
 ## Location
 
-This year's CoSin takes place {{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}][1] in {{< cosin_i18n "location_city" >}}.
+This year's CoSin takes place {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}][1] in {{< cosin_i18n "location_city" >}}.
 
 ## Photos
 
diff --git a/content/ort.fr.md b/content/ort.fr.md
index 98c85db..a018077 100644
--- a/content/ort.fr.md
+++ b/content/ort.fr.md
@@ -9,7 +9,7 @@ menu:
 
 ## Lieu
 
-Le CoSin se déroule {{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}][1] à {{< cosin_i18n "location_city" >}}.
+Le CoSin se déroule {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}][1] à {{< cosin_i18n "location_city" >}}.
 
 ## Photos
 
diff --git a/content/ort.it.md b/content/ort.it.md
index b4233e2..5a7d3a3 100644
--- a/content/ort.it.md
+++ b/content/ort.it.md
@@ -9,7 +9,7 @@ menu:
 
 ## Luogo
 
-La CoSin si svolge {{< cosin_i18n "location_name_preposition" >}} [{{< cosin "location_name" >}}][1] a {{< cosin_i18n "location_city" >}}.
+La CoSin si svolge {{< cosin_i18n "location_name_preposition" >}} [{{< cosin_i18n "location_name" >}}][1] a {{< cosin_i18n "location_city" >}}.
 
 ## Foto
 
diff --git a/data/cosin.toml b/data/cosin.toml
index bc6ad16..519de08 100644
--- a/data/cosin.toml
+++ b/data/cosin.toml
@@ -18,8 +18,8 @@ date_end_month = "Juni"
 
 location_known = true
 
-location_name_preposition = "PrepositionLocationF"
-location_name = "Villa Ritter"
+location_name = "LocationVillaRitter"
+location_name_preposition = "PrepositionAndArticleForLocationVillaRitter"
 location_url = "http://www.villa-ritter.ch/"
 location_city = "Biel"
 
diff --git a/i18n/de.toml b/i18n/de.toml
index 8afe874..4486fe4 100644
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -11,5 +11,7 @@ other = "Sonntag"
 [Biel]
 other = "Biel"
 
-[PrepositionLocationF]
+[LocationVillaRitter]
+other = "Villa Ritter"
+[PrepositionAndArticleForLocationVillaRitter]
 other = "in der"
diff --git a/i18n/en.toml b/i18n/en.toml
index 5144754..ab165b7 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -11,5 +11,7 @@ other = "Sunday"
 [Biel]
 other = "Biel"
 
-[PrepositionLocationF]
+[LocationVillaRitter]
+other = "Villa Ritter"
+[PrepositionAndArticleForLocationVillaRitter]
 other = "at the"
diff --git a/i18n/fr.toml b/i18n/fr.toml
index 625501c..220a4b2 100644
--- a/i18n/fr.toml
+++ b/i18n/fr.toml
@@ -11,5 +11,7 @@ other = "dimanche"
 [Biel]
 other = "Bienne"
 
-[PrepositionLocationF]
+[LocationVillaRitter]
+other = "Villa Ritter"
+[PrepositionAndArticleForLocationVillaRitter]
 other = "à la"
diff --git a/i18n/it.toml b/i18n/it.toml
index 5f37d9b..928ef41 100644
--- a/i18n/it.toml
+++ b/i18n/it.toml
@@ -11,5 +11,7 @@ other = "domenica"
 [Biel]
 other = "Bienna"
 
-[PrepositionLocationF]
+[LocationVillaRitter]
+other = "Villa Ritter"
+[PrepositionAndArticleForLocationVillaRitter]
 other = "nella"
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
index 191b992..00806c7 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.de.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
@@ -14,7 +14,7 @@
   {{ end }}
 
   {{ if .location_known }}
-  <strong>Ort:</strong> {{ .location_name }} in <strong>{{ i18n .location_city }}</strong><br/>
+  <strong>Ort:</strong> {{ i18n .location_name }} in <strong>{{ i18n .location_city }}</strong><br/>
   {{ end }}
 
   {{ if .registration_open }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
index e321b03..1af1509 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.en.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
@@ -14,7 +14,7 @@
   {{ end }}
 
   {{ if .location_known }}
-  <strong>Location:</strong> {{ .location_name }} in <strong>{{ i18n .location_city }}</strong><br/>
+  <strong>Location:</strong> {{ i18n .location_name }} in <strong>{{ i18n .location_city }}</strong><br/>
   {{ end }}
 
   {{ if .registration_open }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
index 5fcc0b4..187ff66 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
@@ -14,7 +14,7 @@
   {{ end }}
 
   {{ if .location_known }}
-  <strong>Lieu:</strong> {{ .location_name }} à <strong>{{ i18n .location_city }}</strong><br/>
+  <strong>Lieu:</strong> {{ i18n .location_name }} à <strong>{{ i18n .location_city }}</strong><br/>
   {{ end }}
 
   {{ if .registration_open }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
index a4f7151..09e2bf1 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.it.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
@@ -14,7 +14,7 @@
   {{ end }}
 
   {{ if .location_known }}
-  <strong>Luogo:</strong> {{ .location_name }} a <strong>{{ i18n .location_city }}</strong><br/>
+  <strong>Luogo:</strong> {{ i18n .location_name }} a <strong>{{ i18n .location_city }}</strong><br/>
   {{ end }}
 
   {{ if .registration_open }}