diff --git a/core/ui/EditTemplate/body/default.tid b/core/ui/EditTemplate/body/default.tid
index 801f9e12b..504d6f2a0 100644
--- a/core/ui/EditTemplate/body/default.tid
+++ b/core/ui/EditTemplate/body/default.tid
@@ -1,14 +1,14 @@
 title: $:/core/ui/EditTemplate/body/default
 
-\function edit-preview-state()
+\function get.edit-preview-state()
 [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualified-preview-state>] +[get[text]] :else[[no]]
 \end
 
-\function get.tc-edit-texteditor.class() tc-edit-texteditor tc-edit-texteditor-body [<edit-preview-state>match[yes]then<identifier>addprefix[tc-edit-texteditor-identified-]] +[join[ ]]
+\function get.tc-edit-texteditor.class() tc-edit-texteditor tc-edit-texteditor-body [<get.edit-preview-state>match[yes]then<identifier>addprefix[tc-edit-texteditor-identified-]] +[join[ ]]
 
 \function get.tc-tiddler-preview-preview.class() tc-tiddler-preview-preview [<identifier>addprefix[tc-tiddler-preview-preview-identified-]] +[join[ ]]
 
-\function get.slider.condition() [<edit-preview-state>match[yes]] :else[[no]]
+\function get.slider.condition() [<get.edit-preview-state>match[yes]] :else[[no]]
 
 \function resizer.state.tiddler() [[$:/state/resizing/editor-preview-]addsuffix<identifier>]
 
@@ -24,7 +24,7 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 \procedure tp-tiddler-editor-preview()
 <div
-	class={{{ [<edit-preview-state>match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [<edit-preview-state>match[yes]then[tc-tiddler-preview-identified-]addsuffix<identifier>] [[tc-tiddler-editor]] +[join[ ]] }}}>
+	class={{{ [<get.edit-preview-state>match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [<get.edit-preview-state>match[yes]then[tc-tiddler-preview-identified-]addsuffix<identifier>] [[tc-tiddler-editor]] +[join[ ]] }}}>
 
 	<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
 
diff --git a/core/ui/EditorToolbar/preview.tid b/core/ui/EditorToolbar/preview.tid
index d5c63eb5f..890b7dd78 100644
--- a/core/ui/EditorToolbar/preview.tid
+++ b/core/ui/EditorToolbar/preview.tid
@@ -10,7 +10,7 @@ shortcuts: ((preview))
 
 \whitespace trim
 <span>
-	<$transclude $tiddler={{{ [<edit-preview-state>match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
+	<$transclude $tiddler={{{ [<get.edit-preview-state>match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
 </span>
 <$action-setfield $tiddler=<<editPreviewStateTiddler>> $value={{{ [<editPreviewStateTiddler>get[text]toggle[yes],[no]] }}} />
 <$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>