diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid
index f2cfd6692..98247ff17 100644
--- a/core/ui/EditTemplate/controls.tid
+++ b/core/ui/EditTemplate/controls.tid
@@ -6,6 +6,6 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$
 \end
 <div class="tw-tiddler-title">
 <$view field="title"/>
-<span class="tw-tiddler-controls titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>
+<span class="tw-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>
 <div style="clear: both;"></div>
 </div>
diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid
index 6953ae072..271de8cfd 100644
--- a/core/ui/EditTemplate/title.tid
+++ b/core/ui/EditTemplate/title.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/EditTemplate/title
 tags: $:/tags/EditTemplate
 
-<$edit-text field="draft.title" class="titlebar tw-edit-texteditor"/>
+<$edit-text field="draft.title" class="tc-titlebar tw-edit-texteditor"/>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index 492eb248c..25e746b41 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -8,7 +8,7 @@ fill:$(foregroundColor)$;
 $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
 <div class="tw-tiddler-title">
-<h2 class="titlebar">
+<h2 class="tc-titlebar">
 <span class="tw-tiddler-controls">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
 </span>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 9a0701138..c3c27f9e6 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -594,7 +594,7 @@ button.tw-tag-label, span.tw-tag-label {
 }
 
 .tw-site-title,
-.titlebar {
+.tc-titlebar {
 	font-weight: 300;
 	font-size: 2.35em;
 	line-height: 1.2em;
@@ -606,7 +606,7 @@ button.tw-tag-label, span.tw-tag-label {
 	color: <<colour muted-foreground>>;
 }
 
-.titlebar img {
+.tc-titlebar img {
 	height: 1em;
 }