diff --git a/src/frontend/src/lib/i18n/en.json b/src/frontend/src/lib/i18n/en.json
index 1b8229a3e..9376600c1 100644
--- a/src/frontend/src/lib/i18n/en.json
+++ b/src/frontend/src/lib/i18n/en.json
@@ -19,8 +19,7 @@
 		"changelog": "Changelog",
 		"controllers": "Access Keys",
 		"settings": "Settings",
-		"setup": "Configuration",
-		"service": "Service",
+		"setup": "Setup",
 		"continue": "Continue",
 		"not_logged_in": "Developer not logged in.",
 		"ready": "Ready",
diff --git a/src/frontend/src/lib/i18n/zh-cn.json b/src/frontend/src/lib/i18n/zh-cn.json
index 337e059a1..56174bca5 100644
--- a/src/frontend/src/lib/i18n/zh-cn.json
+++ b/src/frontend/src/lib/i18n/zh-cn.json
@@ -19,7 +19,7 @@
 		"changelog": "版本日志",
 		"controllers": "访问密钥",
 		"settings": "系统设置",
-		"setup": "配置",
+		"setup": "设置",
 		"service": "服务",
 		"continue": "继续",
 		"not_logged_in": "开发者未登录",
diff --git a/src/frontend/src/lib/types/i18n.d.ts b/src/frontend/src/lib/types/i18n.d.ts
index ebfb0fa65..f9d4b24cf 100644
--- a/src/frontend/src/lib/types/i18n.d.ts
+++ b/src/frontend/src/lib/types/i18n.d.ts
@@ -23,7 +23,6 @@ interface I18nCore {
 	controllers: string;
 	settings: string;
 	setup: string;
-	service: string;
 	continue: string;
 	not_logged_in: string;
 	ready: string;
diff --git a/src/frontend/src/routes/(split)/analytics/+page.svelte b/src/frontend/src/routes/(split)/analytics/+page.svelte
index d3af39ea3..0b7ed199d 100644
--- a/src/frontend/src/routes/(split)/analytics/+page.svelte
+++ b/src/frontend/src/routes/(split)/analytics/+page.svelte
@@ -33,11 +33,11 @@
 			? [
 					{
 						id: Symbol('2'),
-						labelKey: 'core.setup'
+						labelKey: 'core.config'
 					},
 					{
 						id: Symbol('3'),
-						labelKey: 'core.service'
+						labelKey: 'analytics.orbiter'
 					}
 				]
 			: [])
diff --git a/src/frontend/src/routes/(split)/monitoring/+page.svelte b/src/frontend/src/routes/(split)/monitoring/+page.svelte
index f6630cb6f..12471370a 100644
--- a/src/frontend/src/routes/(split)/monitoring/+page.svelte
+++ b/src/frontend/src/routes/(split)/monitoring/+page.svelte
@@ -32,13 +32,13 @@
 			? [
 					{
 						id: Symbol('2'),
-						labelKey: 'core.setup'
+						labelKey: 'core.config'
 					}
 				]
 			: []),
 		{
 			id: Symbol('3'),
-			labelKey: 'core.service'
+			labelKey: 'mission_control.title'
 		}
 	]);
 
diff --git a/src/frontend/src/routes/(split)/satellite/+page.svelte b/src/frontend/src/routes/(split)/satellite/+page.svelte
index 28d74f2b6..82facf389 100644
--- a/src/frontend/src/routes/(split)/satellite/+page.svelte
+++ b/src/frontend/src/routes/(split)/satellite/+page.svelte
@@ -21,7 +21,11 @@
 	const tabs: Tab[] = [
 		{
 			id: Symbol('1'),
-			labelKey: 'core.service'
+			labelKey: 'satellites.satellite'
+		},
+		{
+			id: Symbol('2'),
+			labelKey: 'core.setup'
 		}
 	];
 
@@ -48,7 +52,7 @@
 				{#if nonNullish($satelliteStore)}
 					{#if $store.tabId === $store.tabs[0].id}
 						<SatelliteOverview satellite={$satelliteStore} />
-
+					{:else if $store.tabId === $store.tabs[1].id}
 						<SatelliteSettings satellite={$satelliteStore} />
 					{/if}
 				{/if}