diff --git a/adminfront/tests/tenants.spec.ts b/adminfront/tests/tenants.spec.ts
index e2fbb624..d9c567f3 100644
--- a/adminfront/tests/tenants.spec.ts
+++ b/adminfront/tests/tenants.spec.ts
@@ -51,7 +51,7 @@ test.describe("Tenants Management", () => {
     });
 
     await page.goto("/tenants");
-    await expect(page.locator("h2")).toContainText("테넌트 목록");
+    await expect(page.locator("h2")).toContainText("테넌트 레지스트리");
     await expect(page.locator("table")).toContainText("Tenant A");
   });
 
diff --git a/locales/en.toml b/locales/en.toml
index f8680473..3ee69959 100644
--- a/locales/en.toml
+++ b/locales/en.toml
@@ -806,8 +806,8 @@ tenant_admin = "TENANT ADMIN"
 tenant_member = "TENANT MEMBER"
 
 [ui.admin.tenants]
-add = "Tenant Add"
-title = "Tenant List"
+add = "Add Tenant"
+title = "Tenant Registry"
 
 [ui.admin.tenants.admins]
 add_button = "Add Button"
@@ -1067,6 +1067,8 @@ theme_light = "Light"
 theme_toggle = "Theme Toggle"
 unknown = "Unknown"
 view = "View"
+manage = "Manage"
+remove = "Remove"
 
 [ui.common.badge]
 admin_only = "Admin only"
@@ -1086,6 +1088,12 @@ ok = "Ok"
 pending = "Pending"
 success = "Success"
 
+[test]
+key = "Test"
+
+[non.existent]
+key = "Non-existent key"
+
 [ui.dev]
 brand = "Brand"
 console_title = "Developer Console"
@@ -1547,13 +1555,3 @@ members = "Members"
 email = "Email"
 name = "Name"
 role = "Role"
-
-[ui.common]
-manage = "Manage"
-remove = "Remove"
-
-[test]
-key = "Test"
-
-[non.existent]
-key = "Non-existent key"
diff --git a/locales/ko.toml b/locales/ko.toml
index 95c5c10d..3fdab991 100644
--- a/locales/ko.toml
+++ b/locales/ko.toml
@@ -807,7 +807,7 @@ tenant_member = "TENANT MEMBER"
 
 [ui.admin.tenants]
 add = "테넌트 추가"
-title = "테넌트 목록"
+title = "테넌트 레지스트리"
 
 [ui.admin.tenants.admins]
 add_button = "관리자 추가"
@@ -1067,6 +1067,8 @@ theme_light = "Light"
 theme_toggle = "테마 전환"
 unknown = "Unknown"
 view = "보기"
+manage = "관리"
+remove = "제외"
 
 [ui.common.badge]
 admin_only = "Admin only"
@@ -1086,6 +1088,12 @@ ok = "정상"
 pending = "준비 중"
 success = "성공"
 
+[test]
+key = "테스트"
+
+[non.existent]
+key = "존재하지 않는 키"
+
 [ui.dev]
 brand = "Baron 로그인"
 console_title = "Developer Console"
@@ -1547,13 +1555,3 @@ members = "멤버수"
 email = "이메일"
 name = "이름"
 role = "역할"
-
-[ui.common]
-manage = "관리"
-remove = "제외"
-
-[test]
-key = "테스트"
-
-[non.existent]
-key = "존재하지 않는 키"
diff --git a/locales/template.toml b/locales/template.toml
index 5f4fa1b3..0481ac57 100644
--- a/locales/template.toml
+++ b/locales/template.toml
@@ -910,6 +910,8 @@ role = ""
 
 [ui.common]
 add = ""
+admin_only = ""
+assign = ""
 back = ""
 cancel = ""
 close = ""
@@ -926,6 +928,7 @@ manage = ""
 na = ""
 never = ""
 next = ""
+none = ""
 page_of = ""
 prev = ""
 previous = ""
@@ -939,6 +942,8 @@ resend = ""
 retry = ""
 save = ""
 search = ""
+select = ""
+select_placeholder = ""
 show_more = ""
 language = ""
 language_ko = ""
@@ -1531,10 +1536,3 @@ position_placeholder = ""
 
 [ui.admin.users.list.table]
 position_job = ""
-
-[ui.common]
-admin_only = ""
-assign = ""
-none = ""
-select = ""
-select_placeholder = ""
diff --git a/userfront/assets/translations/en.toml b/userfront/assets/translations/en.toml
index db6738c6..76911a46 100644
--- a/userfront/assets/translations/en.toml
+++ b/userfront/assets/translations/en.toml
@@ -336,6 +336,8 @@ theme_light = "Light"
 theme_toggle = "Theme Toggle"
 unknown = "Unknown"
 view = "View"
+manage = "Manage"
+remove = "Remove"
 
 [ui.common.badge]
 admin_only = "Admin only"
@@ -567,3 +569,4 @@ verify = "Verify"
 
 [ui.userfront.signup.success]
 action = "Action"
+
diff --git a/userfront/assets/translations/ko.toml b/userfront/assets/translations/ko.toml
index ec26fe14..c655ad51 100644
--- a/userfront/assets/translations/ko.toml
+++ b/userfront/assets/translations/ko.toml
@@ -336,6 +336,8 @@ theme_light = "Light"
 theme_toggle = "테마 전환"
 unknown = "Unknown"
 view = "보기"
+manage = "관리"
+remove = "제외"
 
 [ui.common.badge]
 admin_only = "Admin only"
@@ -567,3 +569,4 @@ verify = "본인인증"
 
 [ui.userfront.signup.success]
 action = "로그인하기"
+
diff --git a/userfront/assets/translations/template.toml b/userfront/assets/translations/template.toml
index 0a335640..6ae3319d 100644
--- a/userfront/assets/translations/template.toml
+++ b/userfront/assets/translations/template.toml
@@ -305,6 +305,7 @@ details = ""
 edit = ""
 view = ""
 hyphen = ""
+manage = ""
 na = ""
 never = ""
 next = ""
@@ -315,6 +316,8 @@ qr = ""
 reset = ""
 read_only = ""
 refresh = ""
+remove = ""
+requesting = ""
 resend = ""
 retry = ""
 save = ""
@@ -557,9 +560,3 @@ action = ""
 
 # Auto-added missing keys
 
-[ui.common]
-admin_only = ""
-assign = ""
-none = ""
-select = ""
-select_placeholder = ""