diff --git a/apps/server/src/assets/translations/en/server.json b/apps/server/src/assets/translations/en/server.json
index 972f45154..92d9b8b0b 100644
--- a/apps/server/src/assets/translations/en/server.json
+++ b/apps/server/src/assets/translations/en/server.json
@@ -417,7 +417,7 @@
     "end-time": "End Time",
     "geolocation": "Geolocation",
     "built-in-templates": "Built-in templates",
-    "board": "Board",
+    "board": "Kanban Board",
     "status": "Status",
     "board_note_first": "First note",
     "board_note_second": "Second note",
diff --git a/apps/server/src/services/hidden_subtree.spec.ts b/apps/server/src/services/hidden_subtree.spec.ts
index 86b5fc344..e329176e6 100644
--- a/apps/server/src/services/hidden_subtree.spec.ts
+++ b/apps/server/src/services/hidden_subtree.spec.ts
@@ -83,6 +83,21 @@ describe("Hidden Subtree", () => {
             expect(updatedJumpToNote?.title).not.toBe("Renamed");
         });
 
+        it("enforces renames of templates", () => {
+            const boardTemplate = becca.getNote("_template_board");
+            expect(boardTemplate).toBeDefined();
+            boardTemplate!.title = "My renamed board";
+
+            cls.init(() => {
+                boardTemplate!.save();
+                hiddenSubtreeService.checkHiddenSubtree(true);
+            });
+
+            const updatedBoardTemplate = becca.getNote("_template_board");
+            expect(updatedBoardTemplate).toBeDefined();
+            expect(updatedBoardTemplate?.title).not.toBe("My renamed board");
+        });
+
         it("maintains launchers hidden, if they were shown by default but moved by the user", () => {
             const launcher = becca.getNote("_lbLlmChat");
             const branch = launcher?.getParentBranches()[0];
diff --git a/apps/server/src/services/hidden_subtree.ts b/apps/server/src/services/hidden_subtree.ts
index 1013d16fc..d1efdcbda 100644
--- a/apps/server/src/services/hidden_subtree.ts
+++ b/apps/server/src/services/hidden_subtree.ts
@@ -422,7 +422,7 @@ function checkHiddenSubtreeRecursively(parentNoteId: string, item: HiddenSubtree
         }
     }
 
-    const shouldRestoreNames = extraOpts.restoreNames || note.noteId.startsWith("_help") || item.id.startsWith("_lb");
+    const shouldRestoreNames = extraOpts.restoreNames || note.noteId.startsWith("_help") || item.id.startsWith("_lb") || item.id.startsWith("_template");
     if (shouldRestoreNames && note.title !== item.title) {
         note.title = item.title;
         note.save();