--- a/src/main/webapp/WEB-INF/jsp/language.jsp	Wed Jan 06 15:39:56 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/language.jsp	Wed Jan 06 16:20:32 2021 +0100
@@ -38,11 +38,11 @@
                 ${l.displayLanguage}
             (${l.getDisplayLanguage(viewmodel.currentLanguage)}
             <c:if test="${not empty viewmodel.browserLanguage and l.language eq viewmodel.browserLanguage.language}"><c:set
-                    var="browserLanguagePresent" value="true"/>&nbsp;-&nbsp;<fmt:message key="browserLanguage"/></c:if>)
+                    var="browserLanguagePresent" value="true"/>&nbsp;-&nbsp;<fmt:message key="language.browser"/></c:if>)
         </label>
     </c:forEach>
     <c:if test="${not browserLanguagePresent}">
-        <span class="blNA"><fmt:message key="browserLanguageNotAvailable"/></span>
+        <span class="blNA"><fmt:message key="language.browser.unavailable"/></span>
     </c:if>
-    <input type="submit" value="<fmt:message key="submit" />"/>
+    <input type="submit" value="<fmt:message key="button.language.submit" />"/>
 </form>