diff --git a/includes/templates/legacy/Menu.mustache b/includes/templates/LegacyMenu.mustache
similarity index 100%
rename from includes/templates/legacy/Menu.mustache
rename to includes/templates/LegacyMenu.mustache
diff --git a/includes/templates/LegacySidebar.mustache b/includes/templates/LegacySidebar.mustache
new file mode 100644
index 00000000..066f6b4a
--- /dev/null
+++ b/includes/templates/LegacySidebar.mustache
@@ -0,0 +1,13 @@
+{{!
+	See @typedef SidebarData
+}}
+
+<div id="mw-panel">
+	<div id="p-logo" role="banner">
+		<a class="mw-wiki-logo" href="{{link-mainpage}}"
+			title="{{msg-tooltip-p-logo}}"></a>
+	</div>
+	{{#data-portlets-first}}{{>LegacyMenu}}{{/data-portlets-first}}
+	{{#array-portlets-rest}}{{>LegacyMenu}}{{/array-portlets-rest}}
+	{{#data-portlets.data-languages}}{{>LegacyMenu}}{{/data-portlets.data-languages}}
+</div>
diff --git a/includes/templates/LegacyUserLinks.mustache b/includes/templates/LegacyUserLinks.mustache
new file mode 100644
index 00000000..30a4531b
--- /dev/null
+++ b/includes/templates/LegacyUserLinks.mustache
@@ -0,0 +1 @@
+{{#data-personal}}{{>LegacyMenu}}{{/data-personal}}
diff --git a/includes/templates/legacy/Sidebar.mustache b/includes/templates/legacy/Sidebar.mustache
deleted file mode 100644
index 9556f910..00000000
--- a/includes/templates/legacy/Sidebar.mustache
+++ /dev/null
@@ -1,13 +0,0 @@
-{{!
-	See @typedef SidebarData
-}}
-
-<div id="mw-panel">
-	<div id="p-logo" role="banner">
-		<a class="mw-wiki-logo" href="{{link-mainpage}}"
-			title="{{msg-tooltip-p-logo}}"></a>
-	</div>
-	{{#data-portlets-first}}{{>Menu}}{{/data-portlets-first}}
-	{{#array-portlets-rest}}{{>Menu}}{{/array-portlets-rest}}
-	{{#data-portlets.data-languages}}{{>Menu}}{{/data-portlets.data-languages}}
-</div>
diff --git a/includes/templates/legacy/UserLinks.mustache b/includes/templates/legacy/UserLinks.mustache
deleted file mode 100644
index a3745fc9..00000000
--- a/includes/templates/legacy/UserLinks.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{#data-personal}}{{>legacy/Menu}}{{/data-personal}}
diff --git a/includes/templates/skin-legacy.mustache b/includes/templates/skin-legacy.mustache
index ddd2f5de..c688775c 100644
--- a/includes/templates/skin-legacy.mustache
+++ b/includes/templates/skin-legacy.mustache
@@ -52,18 +52,18 @@
 	<h2>{{msg-navigation-heading}}</h2>
 	<div id="mw-head">
 		{{#data-portlets}}
-		{{>legacy/UserLinks}}
+		{{>LegacyUserLinks}}
 		<div id="left-navigation">
-			{{#data-namespaces}}{{>legacy/Menu}}{{/data-namespaces}}
-			{{#data-variants}}{{>legacy/Menu}}{{/data-variants}}
+			{{#data-namespaces}}{{>LegacyMenu}}{{/data-namespaces}}
+			{{#data-variants}}{{>LegacyMenu}}{{/data-variants}}
 		</div>
 		<div id="right-navigation">
-			{{#data-views}}{{>legacy/Menu}}{{/data-views}}
-			{{#data-actions}}{{>legacy/Menu}}{{/data-actions}}
+			{{#data-views}}{{>LegacyMenu}}{{/data-views}}
+			{{#data-actions}}{{>LegacyMenu}}{{/data-actions}}
 			{{#data-search-box}}{{>SearchBox}}{{/data-search-box}}
 		</div>
 		{{/data-portlets}}
 	</div>
-	{{#data-portlets-sidebar}}{{>legacy/Sidebar}}{{/data-portlets-sidebar}}
+	{{#data-portlets-sidebar}}{{>LegacySidebar}}{{/data-portlets-sidebar}}
 </div>
 {{#data-footer}}{{>Footer}}{{/data-footer}}
diff --git a/stories/Menu.stories.data.js b/stories/Menu.stories.data.js
index 847e92de..321a9db6 100644
--- a/stories/Menu.stories.data.js
+++ b/stories/Menu.stories.data.js
@@ -1,4 +1,5 @@
 import menuTemplate from '!!raw-loader!../includes/templates/Menu.mustache';
+import legacyMenuTemplate from '!!raw-loader!../includes/templates/LegacyMenu.mustache';
 import { helperMakeMenuData } from './utils';
 
 /**
@@ -11,4 +12,4 @@ const defaultMenu = helperMakeMenuData(
 <li><a href='#'>Item 3</a></li>`
 );
 
-export { menuTemplate, defaultMenu };
+export { menuTemplate, legacyMenuTemplate, defaultMenu };
diff --git a/stories/Sidebar.stories.data.js b/stories/Sidebar.stories.data.js
index 4efc214b..f983698e 100644
--- a/stories/Sidebar.stories.data.js
+++ b/stories/Sidebar.stories.data.js
@@ -1,5 +1,5 @@
 import sidebarTemplate from '!!raw-loader!../includes/templates/Sidebar.mustache';
-import sidebarLegacyTemplate from '!!raw-loader!../includes/templates/legacy/Sidebar.mustache';
+import sidebarLegacyTemplate from '!!raw-loader!../includes/templates/LegacySidebar.mustache';
 import { vectorMenuTemplate } from './MenuDropdown.stories.data';
 import { PORTALS } from './MenuPortal.stories.data';
 
diff --git a/stories/UserLinks.stories.data.js b/stories/UserLinks.stories.data.js
index 87fc7855..4d3f1c83 100644
--- a/stories/UserLinks.stories.data.js
+++ b/stories/UserLinks.stories.data.js
@@ -1,7 +1,7 @@
 import msgs from '../i18n/en.json';
 import mustache from 'mustache';
 import { menuTemplate } from './Menu.stories.data';
-import userLinksTemplateLegacy from '!!raw-loader!../includes/templates/legacy/UserLinks.mustache';
+import userLinksTemplateLegacy from '!!raw-loader!../includes/templates/LegacyUserLinks.mustache';
 import userLinksTemplate from '!!raw-loader!../includes/templates/UserLinks.mustache';
 import userLinksMoreTemplate from '!!raw-loader!../includes/templates/UserLinks__more.mustache';
 import userLinksLogoutTemplate from '!!raw-loader!../includes/templates/UserLinks__logout.mustache';
diff --git a/stories/skin.stories.data.js b/stories/skin.stories.data.js
index 086c87f2..95178483 100644
--- a/stories/skin.stories.data.js
+++ b/stories/skin.stories.data.js
@@ -2,7 +2,7 @@ import { htmlUserLanguageAttributes } from './utils';
 import { placeholder } from './utils';
 
 import { userLinksTemplateLegacy } from './UserLinks.stories.data';
-import { menuTemplate } from './Menu.stories.data';
+import { menuTemplate, legacyMenuTemplate } from './Menu.stories.data';
 import { PERSONAL_MENU_TEMPLATE_DATA } from './UserLinks.stories.data';
 import { pageActionsData, namespaceTabsData } from './MenuTabs.stories.data';
 import { vectorMenuTemplate, moreData, variantsData } from './MenuDropdown.stories.data';
@@ -55,11 +55,12 @@ export const NAVIGATION_TEMPLATE_DATA = {
 export const TEMPLATE_PARTIALS = Object.assign( {}, SIDEBAR_TEMPLATE_PARTIALS, {
 	Logo: logoTemplate,
 	SearchBox: searchBoxTemplate,
-	'legacy/Sidebar': sidebarLegacyTemplate,
+	LegacySidebar: sidebarLegacyTemplate,
 	Sidebar: sidebarTemplate,
+	LegacyMenu: legacyMenuTemplate,
 	VectorMenu: vectorMenuTemplate,
 	Menu: menuTemplate,
-	'legacy/UserLinks': userLinksTemplateLegacy,
+	LegacyUserLinks: userLinksTemplateLegacy,
 	Footer: footerTemplate
 }, FOOTER_TEMPLATE_PARTIALS, SEARCH_TEMPLATE_PARTIALS );