diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte
index 93f12af2..f2375b9c 100644
--- a/frontend/src/lib/components/Navbar.svelte
+++ b/frontend/src/lib/components/Navbar.svelte
@@ -118,7 +118,7 @@
 							href="/settings/"
 							class="px-4 py-2"
 							class:active={$page.url.pathname.startsWith('/settings')}
-							><Fa icon={faCog} />{$LL.settings.settings_title()}</a
+							><Fa icon={faCog} />{$LL.settings.page_title()}</a
 						>
 					</li>
 				{/if}
@@ -153,7 +153,7 @@
 				</li>
 				<li>
 					<a href="/settings/" class="p-2" class:active={$page.url.pathname.startsWith('/settings')}
-						><Fa icon={faCog} />{$LL.settings.settings_title()}</a
+						><Fa icon={faCog} />{$LL.settings.page_title()}</a
 					>
 				</li>
 			{/if}
diff --git a/frontend/src/lib/i18n/de/index.ts b/frontend/src/lib/i18n/de/index.ts
index 03f2d119..66fa8dc4 100644
--- a/frontend/src/lib/i18n/de/index.ts
+++ b/frontend/src/lib/i18n/de/index.ts
@@ -9,9 +9,9 @@ const de = {
 		order_name: 'Name',
 		order_ip: 'IP',
 		order_tooltip: 'Sortieren',
-		message_no_devices: 'Keine Geräte.',
-		message_add_first_device: 'Füge dein erstes Gerät hinzu',
-		message_grant_permissions:
+		no_devices: 'Keine Geräte.',
+		add_first_device: 'Füge dein erstes Gerät hinzu',
+		grant_permissions:
 			'Bitte frag den Administrator, dir Berechtigungen für bestehende Geräte zu erteilen oder neue Geräte zu erstellen.'
 	},
 	account: {
@@ -120,7 +120,7 @@ const de = {
 		btn_login: 'Login'
 	},
 	settings: {
-		settings_title: 'Einstellungen',
+		page_title: 'Einstellungen',
 		ping_interval_title: 'Ping Intervall',
 		ping_interval_desc1:
 			'Legt den Intervall fest, in dem Geräte gepingt werden. Leer lassen um den Standardwert von <span class="badge">@every 3s</span> zu verwenden.',
diff --git a/frontend/src/lib/i18n/en-US/index.ts b/frontend/src/lib/i18n/en-US/index.ts
index 2b40e74d..75ee3d90 100644
--- a/frontend/src/lib/i18n/en-US/index.ts
+++ b/frontend/src/lib/i18n/en-US/index.ts
@@ -7,9 +7,9 @@ const en_US = {
 		order_name: 'Name',
 		order_ip: 'IP',
 		order_tooltip: 'Order',
-		message_no_devices: 'No devices here.',
-		message_add_first_device: 'Add your first device',
-		message_grant_permissions:
+		no_devices: 'No devices here.',
+		add_first_device: 'Add your first device',
+		grant_permissions:
 			'Please ask the admin to grant you permissions to existing devices or to create new ones.'
 	},
 	account: {
@@ -117,7 +117,7 @@ const en_US = {
 		btn_login: 'Login'
 	},
 	settings: {
-		settings_title: 'Settings',
+		page_title: 'Settings',
 		ping_interval_title: 'Ping interval',
 		ping_interval_desc1:
 			'Sets the interval in which the devices are pinged. Leave blank to use default value of <span class="badge">@every 3s</span>.',
diff --git a/frontend/src/lib/i18n/i18n-types.ts b/frontend/src/lib/i18n/i18n-types.ts
index 439ea0f2..bb9e6f3f 100644
--- a/frontend/src/lib/i18n/i18n-types.ts
+++ b/frontend/src/lib/i18n/i18n-types.ts
@@ -38,15 +38,15 @@ type RootTranslation = {
 		/**
 		 * N​o​ ​d​e​v​i​c​e​s​ ​h​e​r​e​.
 		 */
-		message_no_devices: string
+		no_devices: string
 		/**
 		 * A​d​d​ ​y​o​u​r​ ​f​i​r​s​t​ ​d​e​v​i​c​e
 		 */
-		message_add_first_device: string
+		add_first_device: string
 		/**
 		 * P​l​e​a​s​e​ ​a​s​k​ ​t​h​e​ ​a​d​m​i​n​ ​t​o​ ​g​r​a​n​t​ ​y​o​u​ ​p​e​r​m​i​s​s​i​o​n​s​ ​t​o​ ​e​x​i​s​t​i​n​g​ ​d​e​v​i​c​e​s​ ​o​r​ ​t​o​ ​c​r​e​a​t​e​ ​n​e​w​ ​o​n​e​s​.
 		 */
-		message_grant_permissions: string
+		grant_permissions: string
 	}
 	account: {
 		/**
@@ -424,7 +424,7 @@ type RootTranslation = {
 		/**
 		 * S​e​t​t​i​n​g​s
 		 */
-		settings_title: string
+		page_title: string
 		/**
 		 * P​i​n​g​ ​i​n​t​e​r​v​a​l
 		 */
@@ -769,15 +769,15 @@ export type TranslationFunctions = {
 		/**
 		 * No devices here.
 		 */
-		message_no_devices: () => LocalizedString
+		no_devices: () => LocalizedString
 		/**
 		 * Add your first device
 		 */
-		message_add_first_device: () => LocalizedString
+		add_first_device: () => LocalizedString
 		/**
 		 * Please ask the admin to grant you permissions to existing devices or to create new ones.
 		 */
-		message_grant_permissions: () => LocalizedString
+		grant_permissions: () => LocalizedString
 	}
 	account: {
 		/**
@@ -1155,7 +1155,7 @@ export type TranslationFunctions = {
 		/**
 		 * Settings
 		 */
-		settings_title: () => LocalizedString
+		page_title: () => LocalizedString
 		/**
 		 * Ping interval
 		 */
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index d82f5587..59c52396 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -176,16 +176,16 @@
 	{/if}
 {:else}
 	<div class="container text-center">
-		<p>{$LL.home.message_no_devices()}</p>
+		<p>{$LL.home.no_devices()}</p>
 		{#if $pocketbase.authStore.isAdmin || $permission.create}
 			<p>
 				<a href="/device/new" class="btn btn-ghost"
-					><Fa icon={faPlus} class="ms-2" />{$LL.home.message_add_first_device()}
+					><Fa icon={faPlus} class="ms-2" />{$LL.home.add_first_device()}
 				</a>
 			</p>
 		{:else}
 			<p>
-				{$LL.home.message_grant_permissions()}
+				{$LL.home.grant_permissions()}
 			</p>
 		{/if}
 	</div>
diff --git a/frontend/src/routes/settings/+page.svelte b/frontend/src/routes/settings/+page.svelte
index b1e59476..617af28e 100644
--- a/frontend/src/routes/settings/+page.svelte
+++ b/frontend/src/routes/settings/+page.svelte
@@ -90,7 +90,7 @@
 {#if settingsPubClone === undefined || settingsPrivClone === undefined}
 	<PageLoading />
 {:else}
-	<h1 class="text-3xl font-bold mb-8">{$LL.settings.settings_title()}</h1>
+	<h1 class="text-3xl font-bold mb-8">{$LL.settings.page_title()}</h1>
 	<form on:submit|preventDefault={save}>
 		<div class="card w-full bg-base-300 shadow-xl mt-6">
 			<div class="card-body">
diff --git a/frontend/src/routes/users/+page.svelte b/frontend/src/routes/users/+page.svelte
index 379d40f8..a765b4b4 100644
--- a/frontend/src/routes/users/+page.svelte
+++ b/frontend/src/routes/users/+page.svelte
@@ -214,7 +214,7 @@
 						<div class="collapse-content">
 							{#if devices.length === 0}
 								<p>
-									{$LL.home.message_no_devices()}
+									{$LL.home.no_devices()}
 									<a href="/device/new" class="link">{$LL.users.create_new_device()}</a>
 								</p>
 							{:else}