diff --git a/content/cfp.de.md b/content/cfp.de.md
index 2c4c19b..3bc71de 100644
--- a/content/cfp.de.md
+++ b/content/cfp.de.md
@@ -51,8 +51,8 @@ Zur Organisation von Beiträgen verwenden wir das
 Frab-Event-Organisationssystem des CCC. Deinen Beitrag kannst Du über
 [unsere Frab-Seite]({{< cosin "cfp_url" >}}) einreichen.
 
-Einreicheschluss ist am **{{<cosin_i18n "cfp_end_date_weekday" >}},
-{{< cosin "cfp_end_date_day" >}}. {{< cosin_i18n "cfp_end_date_month" >}} {{< cosin "date_year" >}}.**
+Einreicheschluss ist am **{{<cosin_i18n "date_cfp_end_weekday" >}},
+{{< cosin "date_cfp_end_day" >}}. {{< cosin_i18n "date_cfp_end_month" >}} {{< cosin "date_year" >}}.**
 
 ## Wuah: Ich habe noch Fragen!
 
diff --git a/content/cfp.en.md b/content/cfp.en.md
index b698ef7..6f005c1 100644
--- a/content/cfp.en.md
+++ b/content/cfp.en.md
@@ -46,8 +46,8 @@ discussions, have a drink and just have fun.
 For organizing contributions we use the Frab event organization system from the
 CCC. You can submit your entry at [our Frab page]({{< cosin "cfp_url" >}}).
 
-The deadline is **{{<cosin_i18n "cfp_end_date_weekday" >}},
-{{< cosin_humanize "cfp_end_date_day" >}} {{< cosin_i18n "cfp_end_date_month" >}} {{< cosin "date_year" >}}.**
+The deadline is **{{<cosin_i18n "date_cfp_end_weekday" >}},
+{{< cosin_humanize "date_cfp_end_day" >}} {{< cosin_i18n "date_cfp_end_month" >}} {{< cosin "date_year" >}}.**
 
 ## Whoa! I still have questions!
 
diff --git a/content/cfp.fr.md b/content/cfp.fr.md
index 00c4ab6..79c055e 100644
--- a/content/cfp.fr.md
+++ b/content/cfp.fr.md
@@ -49,8 +49,8 @@ Pour l’organisation du congrès, nous employons le frab - conference
 management system du CCC. Tu peux créer un compte et soumettre tes
 idées à l’adresse suivante: [Frab]({{< cosin "cfp_url" >}}).
 
-Einreicheschluss ist am **{{<cosin_i18n "cfp_end_date_weekday" >}},
-{{< cosin "cfp_end_date_day" >}}. {{< cosin_i18n "cfp_end_date_month" >}} {{< cosin "date_year" >}}.**
+Einreicheschluss ist am **{{<cosin_i18n "date_cfp_end_weekday" >}},
+{{< cosin "date_cfp_end_day" >}}. {{< cosin_i18n "date_cfp_end_month" >}} {{< cosin "date_year" >}}.**
 
 ## Wouah: J’ai encore des questions!
 
diff --git a/content/cfp.it.md b/content/cfp.it.md
index a82a60e..22ae302 100644
--- a/content/cfp.it.md
+++ b/content/cfp.it.md
@@ -46,8 +46,8 @@ Per l'organizzazione usiamo la nostra istanza svizzera del sistema di organizzaz
 per eventi del CCC (Frab). Chiediamo dunque gentilmente di registrare il tuo contributo
 [sul nostro Frab]({{< cosin "cfp_url" >}}).
 
-Einreicheschluss ist am **{{<cosin_i18n "cfp_end_date_weekday" >}},
-{{< cosin "cfp_end_date_day" >}}. {{< cosin_i18n "cfp_end_date_month" >}} {{< cosin "date_year" >}}.**
+Einreicheschluss ist am **{{<cosin_i18n "date_cfp_end_weekday" >}},
+{{< cosin "date_cfp_end_day" >}}. {{< cosin_i18n "date_cfp_end_month" >}} {{< cosin "date_year" >}}.**
 
 ## Eh ma... non avete risposto alla mia domanda!
 
diff --git a/data/cosin.toml b/data/cosin.toml
index aaf948a..ae15c04 100644
--- a/data/cosin.toml
+++ b/data/cosin.toml
@@ -37,9 +37,9 @@ flyer_path = "flyer_cosin2019.pdf"
 cfp_running = true
 cfp_url = "https://frab.ccczh.ch/en/cosin/cfp/session/new"
 
-cfp_end_date_weekday = "Freitag"
-cfp_end_date_day = 31
-cfp_end_date_month = "Mai"
+date_cfp_end_weekday = "Freitag"
+date_cfp_end_day = 31
+date_cfp_end_month = "Mai"
 
 
 schedule_available = false
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
index 4765a7f..740fb31 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.de.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
@@ -35,7 +35,7 @@
 
 {{ if .cfp_running }}
 <p><strong>Call for Participation:</strong> <a href="{{ .cfp_url | safeURL }}">Frab</a><br>
-Offen bis {{ .cfp_end_date_day }}. {{ i18n .cfp_end_date_month }} {{ .date_year }}.<br/>
+Offen bis {{ .date_cfp_end_day }}. {{ i18n .date_cfp_end_month }} {{ .date_year }}.<br/>
 </p>
 {{ end }}
 
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
index dbdc6da..4f76807 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.en.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
@@ -35,7 +35,7 @@
 
 {{ if .cfp_running }}
 <p><strong>Call for Participation:</strong> <a href="{{ .cfp_url | safeURL }}">Frab</a><br>
-Open until {{ .cfp_end_date_day }}. {{ i18n .cfp_end_date_month }} {{ .date_year }}.<br/>
+Open until {{ .date_cfp_end_day }}. {{ i18n .date_cfp_end_month }} {{ .date_year }}.<br/>
 </p>
 {{ end }}
 
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
index 633052e..605c8dc 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
@@ -35,7 +35,7 @@
 
 {{ if .cfp_running }}
 <p><strong>Call for Participation:</strong> <a href="{{ .cfp_url | safeURL }}">Frab</a><br>
-Offen bis {{ .cfp_end_date_day }}. {{ i18n .cfp_end_date_month }} {{ .date_year }}.<br/>
+Offen bis {{ .date_cfp_end_day }}. {{ i18n .date_cfp_end_month }} {{ .date_year }}.<br/>
 </p>
 {{ end }}
 
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
index a8d2304..e514943 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.it.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
@@ -35,7 +35,7 @@
 
 {{ if .cfp_running }}
 <p><strong>Call for Participation:</strong> <a href="{{ .cfp_url | safeURL }}">Frab</a><br>
-Offen bis {{ .cfp_end_date_day }}. {{ i18n .cfp_end_date_month }} {{ .date_year }}.<br/>
+Offen bis {{ .date_cfp_end_day }}. {{ i18n .date_cfp_end_month }} {{ .date_year }}.<br/>
 </p>
 {{ end }}