diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 2ef028179f516701480add483394c3b23ee9010f..4ea65eab99bed53e7bb884beb234da1c8f3ac196 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -136,7 +136,7 @@ public class ConfigurationController extends AbstractController {
 	@Value("${session.demo-id:}")
 	private String demoSessionKey;
 
-	@Value("${optional.arsnova-slogan:}")
+	@Value("${ui.arsnova-slogan:}")
 	private String arsnovaSlogan;
 
 	@Value("${pp.session-levels.de}")
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index 8c43c2b650fe99caad4825007fcfb07e8c36940d..75ebbcfdc588f9540067a48cc8b2f948a66ae8b7 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -188,17 +188,17 @@ features.public-pool.enabled=false
 ################################################################################
 # Customization
 ################################################################################
-# minutes, after which the feedback is deleted
+# Minutes, after which the feedback is deleted
 feedback.cleanup=10
 
-# maximal filesize in bytes
+# Maximal filesize in bytes
 upload.filesize_b=1048576
 
-# maximal thumbnail size in pixels
+# Maximal thumbnail size in pixels
 imageupload.thumbnail.width=200
 imageupload.thumbnail.height=200
 
-# maximal number of answer options allowed for a skill question
+# Maximal number of answer options allowed for a skill question
 question.answer-option-limit=8
 
 # Enable Markdown and MathJax parsing in answer options. Formatting in answer
@@ -207,11 +207,11 @@ question.answer-option-limit=8
 # effect if neither MathJax nor Markdown are enabled.
 question.parse-answer-option-formatting=false
 
-# optional: demo session id to show above session login button
+# Demo session id to show above session login button
 session.demo-id=
 
-# label underneath ARSnova logo
-optional.arsnova-slogan=Audience Response System
+# Label underneath ARSnova logo
+ui.arsnova-slogan=Audience Response System
 
 # Links which are displayed in the frontend applications
 #
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 8c43c2b650fe99caad4825007fcfb07e8c36940d..75ebbcfdc588f9540067a48cc8b2f948a66ae8b7 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -188,17 +188,17 @@ features.public-pool.enabled=false
 ################################################################################
 # Customization
 ################################################################################
-# minutes, after which the feedback is deleted
+# Minutes, after which the feedback is deleted
 feedback.cleanup=10
 
-# maximal filesize in bytes
+# Maximal filesize in bytes
 upload.filesize_b=1048576
 
-# maximal thumbnail size in pixels
+# Maximal thumbnail size in pixels
 imageupload.thumbnail.width=200
 imageupload.thumbnail.height=200
 
-# maximal number of answer options allowed for a skill question
+# Maximal number of answer options allowed for a skill question
 question.answer-option-limit=8
 
 # Enable Markdown and MathJax parsing in answer options. Formatting in answer
@@ -207,11 +207,11 @@ question.answer-option-limit=8
 # effect if neither MathJax nor Markdown are enabled.
 question.parse-answer-option-formatting=false
 
-# optional: demo session id to show above session login button
+# Demo session id to show above session login button
 session.demo-id=
 
-# label underneath ARSnova logo
-optional.arsnova-slogan=Audience Response System
+# Label underneath ARSnova logo
+ui.arsnova-slogan=Audience Response System
 
 # Links which are displayed in the frontend applications
 #