diff --git a/approot/templates.xml b/approot/templates.xml
index 5be05553..82790cf2 100644
--- a/approot/templates.xml
+++ b/approot/templates.xml
@@ -14,7 +14,7 @@
 	</div>
 </message>
 
-<message id="firstConnectionForm-template">
+<message id="settings-first-connection">
 	<legend>${title}</legend>
 	<div class="form-horizontal">
 		<div class="form-group">
@@ -69,7 +69,7 @@
 </message>
 
 
-<message id="userForm-template">
+<message id="settings-new-user">
 	<legend>${title}</legend>
 	<div class="form-horizontal">
 		<div class="form-group">
@@ -169,7 +169,7 @@
 
 </message>
 
-<message id="userAccountForm-template">
+<message id="settings-account">
 	<legend>${title}</legend>
 	<div class="form-horizontal">
 		<div class="form-group">
@@ -225,7 +225,7 @@
 	</div>
 </message>
 
-<message id="audioForm-template">
+<message id="settings-audio">
 	<legend>${title}</legend>
 	<div class="form-horizontal">
 		<div class="form-group">
@@ -262,7 +262,7 @@
 	</div>
 </message>
 
-<message id="mediaDirectoryForm-template">
+<message id="settings-new-media-directory">
 	<legend>${title}</legend>
 	<div class="form-horizontal">
 		<div class="form-group">
@@ -296,7 +296,7 @@
 	</div>
 </message>
 
-<message id="databaseForm-template">
+<message id="settings-database">
 	<legend>${title}</legend>
 	<div class="form-horizontal">
 		<div class="form-group">
diff --git a/src/ui/settings/SettingsAccountFormView.cpp b/src/ui/settings/SettingsAccountFormView.cpp
index 4747bc37..c7f265e8 100644
--- a/src/ui/settings/SettingsAccountFormView.cpp
+++ b/src/ui/settings/SettingsAccountFormView.cpp
@@ -192,7 +192,7 @@ AccountFormView::AccountFormView(std::string userId, Wt::WContainerWidget *paren
 
 	_model = new AccountFormModel(userId, this);
 
-	setTemplateText(tr("userAccountForm-template"));
+	setTemplateText(tr("settings-account"));
 	addFunction("id", &WTemplate::Functions::id);
 	addFunction("block", &WTemplate::Functions::id);
 
diff --git a/src/ui/settings/SettingsAudioFormView.cpp b/src/ui/settings/SettingsAudioFormView.cpp
index 93475c48..e86e171d 100644
--- a/src/ui/settings/SettingsAudioFormView.cpp
+++ b/src/ui/settings/SettingsAudioFormView.cpp
@@ -175,7 +175,7 @@ AudioFormView::AudioFormView(Wt::WContainerWidget *parent)
 
 	_model = new AudioFormModel(this);
 
-	setTemplateText(tr("audioForm-template"));
+	setTemplateText(tr("settings-audio"));
 	addFunction("id", &WTemplate::Functions::id);
 	addFunction("block", &WTemplate::Functions::id);
 
diff --git a/src/ui/settings/SettingsDatabaseFormView.cpp b/src/ui/settings/SettingsDatabaseFormView.cpp
index d0c8cb16..f9ad0ccf 100644
--- a/src/ui/settings/SettingsDatabaseFormView.cpp
+++ b/src/ui/settings/SettingsDatabaseFormView.cpp
@@ -297,7 +297,7 @@ DatabaseFormView::DatabaseFormView(Wt::WContainerWidget *parent)
 {
 	_model = new DatabaseFormModel(this);
 
-	setTemplateText(tr("databaseForm-template"));
+	setTemplateText(tr("settings-database"));
 	addFunction("id", &WTemplate::Functions::id);
 	addFunction("block", &WTemplate::Functions::id);
 
diff --git a/src/ui/settings/SettingsFirstConnectionFormView.cpp b/src/ui/settings/SettingsFirstConnectionFormView.cpp
index fff6a398..7f0628a0 100644
--- a/src/ui/settings/SettingsFirstConnectionFormView.cpp
+++ b/src/ui/settings/SettingsFirstConnectionFormView.cpp
@@ -152,7 +152,7 @@ FirstConnectionFormView::FirstConnectionFormView(Wt::WContainerWidget *parent)
 
 	_model = new FirstConnectionFormModel(this);
 
-	setTemplateText(tr("firstConnectionForm-template"));
+	setTemplateText(tr("settings-first-connection"));
 	addFunction("id", &WTemplate::Functions::id);
 	addFunction("block", &WTemplate::Functions::id);
 
diff --git a/src/ui/settings/SettingsMediaDirectoryFormView.cpp b/src/ui/settings/SettingsMediaDirectoryFormView.cpp
index 650f75f3..8d9c485a 100644
--- a/src/ui/settings/SettingsMediaDirectoryFormView.cpp
+++ b/src/ui/settings/SettingsMediaDirectoryFormView.cpp
@@ -109,7 +109,7 @@ MediaDirectoryFormView::MediaDirectoryFormView(Wt::WContainerWidget *parent)
 
 	_model = new MediaDirectoryFormModel(this);
 
-	setTemplateText(tr("mediaDirectoryForm-template"));
+	setTemplateText(tr("settings-new-media-directory"));
 	addFunction("id", &WTemplate::Functions::id);
 	addFunction("block", &WTemplate::Functions::id);
 
diff --git a/src/ui/settings/SettingsUserFormView.cpp b/src/ui/settings/SettingsUserFormView.cpp
index f0d94cc5..f3c45b69 100644
--- a/src/ui/settings/SettingsUserFormView.cpp
+++ b/src/ui/settings/SettingsUserFormView.cpp
@@ -300,7 +300,7 @@ UserFormView::UserFormView(std::string userId, Wt::WContainerWidget *parent)
 
 	_model = new UserFormModel(userId, this);
 
-	setTemplateText(tr("userForm-template"));
+	setTemplateText(tr("settings-new-user"));
 	addFunction("id", &WTemplate::Functions::id);
 	addFunction("block", &WTemplate::Functions::id);