diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 7d1223530..cc6cea25a 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -1,8 +1,11 @@
 template(name="boardHeaderBar")
   h1.header-board-menu
     with currentBoard
-      +viewer
-        = title
+      if $eq title 'Templates'
+        | {{_ 'templates'}}
+      else
+        +viewer
+          = title
 
   .board-header-btns.left
     unless isMiniScreen
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 5ab409756..05415222f 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -225,7 +225,8 @@ const CreateBoard = BlazeComponent.extendComponent({
 
       this.boardId.set(
         Boards.insert({
-            title: TAPi18n.__('templates'),
+            // title: TAPi18n.__('templates'),
+            title: title,
             permission: 'private',
             type: 'template-container',
           }),
@@ -233,7 +234,8 @@ const CreateBoard = BlazeComponent.extendComponent({
 
       // Insert the card templates swimlane
       Swimlanes.insert({
-          title: TAPi18n.__('card-templates-swimlane'),
+          // title: TAPi18n.__('card-templates-swimlane'),
+          title: 'Card Templates',
           boardId: this.boardId.get(),
           sort: 1,
           type: 'template-container',
@@ -242,7 +244,8 @@ const CreateBoard = BlazeComponent.extendComponent({
       // Insert the list templates swimlane
       Swimlanes.insert(
         {
-          title: TAPi18n.__('list-templates-swimlane'),
+          // title: TAPi18n.__('list-templates-swimlane'),
+          title: 'List Templates',
           boardId: this.boardId.get(),
           sort: 2,
           type: 'template-container',
@@ -252,7 +255,8 @@ const CreateBoard = BlazeComponent.extendComponent({
       // Insert the board templates swimlane
       Swimlanes.insert(
         {
-          title: TAPi18n.__('board-templates-swimlane'),
+          //title: TAPi18n.__('board-templates-swimlane'),
+          title: 'Board Templates',
           boardId: this.boardId.get(),
           sort: 3,
           type: 'template-container',
diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade
index bd0349dd9..5319402c2 100644
--- a/client/components/swimlanes/swimlaneHeader.jade
+++ b/client/components/swimlanes/swimlaneHeader.jade
@@ -11,8 +11,15 @@ template(name="swimlaneHeader")
 template(name="swimlaneFixedHeader")
   .swimlane-header(
     class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-      +viewer
-        = title
+      if $eq title 'Card Templates'
+        | {{_ 'card-templates-swimlane'}}
+      else if $eq title 'List Templates'
+        | {{_ 'list-templates-swimlane'}}
+      else if $eq title 'Board Templates'
+        | {{_ 'board-templates-swimlane'}}
+      else
+        +viewer
+          = title
   .swimlane-header-menu
     unless currentUser.isCommentOnly
       if currentUser.isBoardAdmin