diff --git a/core/ui/SideBar.tid b/core/ui/SideBar.tid
index 16b25a8d9..89e8823b1 100644
--- a/core/ui/SideBar.tid
+++ b/core/ui/SideBar.tid
@@ -30,7 +30,7 @@ title: $:/core/ui/SideBar
 </div>
 <div class="tw-tab-content">
 <$reveal type="match" state=<<qualify "$:/state/sideBarTabSet">> text="openTab">
-<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" listview="pop" itemClass="tw-menu-list-item tw-open-tiddler-list">
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop" itemClass="tw-menu-list-item tw-open-tiddler-list">
 <$button message="tw-close-tiddler" class="btn-invisible btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
 </$list>
 <$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini">close all</$button>
diff --git a/core/ui/TagsEditor.tid b/core/ui/TagsEditor.tid
index d9e4fcb55..78fa338f0 100644
--- a/core/ui/TagsEditor.tid
+++ b/core/ui/TagsEditor.tid
@@ -3,7 +3,7 @@ title: $:/core/ui/TagsEditor
 \define tag-styles()
 background-color:$(backgroundColor)$;
 \end
-<$fieldmangler><div class="tw-edit-tags-list"><$list filter="[is[current]tags[]sort[title]]" listview="pop" itemClass="tw-tag-editor-label"><$setvariable name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text" /><$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button></span></$setvariable>
+<$fieldmangler><div class="tw-edit-tags-list"><$list filter="[is[current]tags[]sort[title]]" storyview="pop" itemClass="tw-tag-editor-label"><$setvariable name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text" /><$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button></span></$setvariable>
 </$list></div>
 
 <div class="tw-add-tag">Add a new tag: <span class="tw-add-tag-name"><$edit-text tiddler="$:/NewTagName" tag="input" default="" placeholder="tag name" focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/NewTagName}} set="$:/NewTagName" setTo="" class="">add</$button></span></div>
diff --git a/core/ui/ViewTemplate/tags.tid b/core/ui/ViewTemplate/tags.tid
index c98cd5b22..86dd64cf8 100644
--- a/core/ui/ViewTemplate/tags.tid
+++ b/core/ui/ViewTemplate/tags.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/ViewTemplate/tags
 tags: $:/tags/ViewTemplate
 
-<div class="tw-tags-wrapper"><$list filter="[is[current]tags[]]" template="$:/core/ui/TagTemplate" listview="pop" itemClass="tw-tag-list-item"/></div>
+<div class="tw-tags-wrapper"><$list filter="[is[current]tags[]]" template="$:/core/ui/TagTemplate" storyview="pop" itemClass="tw-tag-list-item"/></div>