diff --git a/packages/frontend/.storybook/generate.tsx b/packages/frontend/.storybook/generate.tsx
index e2bf4791c1..189e611f72 100644
--- a/packages/frontend/.storybook/generate.tsx
+++ b/packages/frontend/.storybook/generate.tsx
@@ -95,7 +95,7 @@ function toStories(component: string, location: string): string {
 												/>,
 												<property
 													key={<identifier name="template" />}
-													value={<literal value={`<${component.slice(0, -4)} />`} />}
+													value={<literal value={`<${identifier.name} />`} />}
 													kind="init"
 												/>,
 											]}
diff --git a/packages/frontend/src/components/MkCode.core.stories.ts b/packages/frontend/src/components/MkCode.core.stories.ts
index 7019a4fdaf..c6a55fe8c3 100644
--- a/packages/frontend/src/components/MkCode.core.stories.ts
+++ b/packages/frontend/src/components/MkCode.core.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkCode_core,
 	},
-	template: '<MkCode.core />',
+	template: '<MkCode_core />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/MkDrive.file.stories.ts b/packages/frontend/src/components/MkDrive.file.stories.ts
index e5752b898e..0942b1d7d4 100644
--- a/packages/frontend/src/components/MkDrive.file.stories.ts
+++ b/packages/frontend/src/components/MkDrive.file.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkDrive_file,
 	},
-	template: '<MkDrive.file />',
+	template: '<MkDrive_file />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/MkDrive.folder.stories.ts b/packages/frontend/src/components/MkDrive.folder.stories.ts
index cf39fa2e62..5565b08651 100644
--- a/packages/frontend/src/components/MkDrive.folder.stories.ts
+++ b/packages/frontend/src/components/MkDrive.folder.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkDrive_folder,
 	},
-	template: '<MkDrive.folder />',
+	template: '<MkDrive_folder />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/MkDrive.navFolder.stories.ts b/packages/frontend/src/components/MkDrive.navFolder.stories.ts
index 5b36fba351..4c489f7298 100644
--- a/packages/frontend/src/components/MkDrive.navFolder.stories.ts
+++ b/packages/frontend/src/components/MkDrive.navFolder.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkDrive_navFolder,
 	},
-	template: '<MkDrive.navFolder />',
+	template: '<MkDrive_navFolder />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/MkEmojiPicker.section.stories.ts b/packages/frontend/src/components/MkEmojiPicker.section.stories.ts
index af0210109d..6b8fb815ab 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.stories.ts
+++ b/packages/frontend/src/components/MkEmojiPicker.section.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkEmojiPicker_section,
 	},
-	template: '<MkEmojiPicker.section />',
+	template: '<MkEmojiPicker_section />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/MkMenu.child.stories.ts b/packages/frontend/src/components/MkMenu.child.stories.ts
index 05e3b94a88..079fbee3e2 100644
--- a/packages/frontend/src/components/MkMenu.child.stories.ts
+++ b/packages/frontend/src/components/MkMenu.child.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkMenu_child,
 	},
-	template: '<MkMenu.child />',
+	template: '<MkMenu_child />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/MkObjectView.value.stories.ts b/packages/frontend/src/components/MkObjectView.value.stories.ts
index 919b796be1..58a9e96a44 100644
--- a/packages/frontend/src/components/MkObjectView.value.stories.ts
+++ b/packages/frontend/src/components/MkObjectView.value.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkObjectView_value,
 	},
-	template: '<MkObjectView.value />',
+	template: '<MkObjectView_value />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/MkReactionsViewer.details.stories.ts b/packages/frontend/src/components/MkReactionsViewer.details.stories.ts
index f8bf55a7cd..3bab02b864 100644
--- a/packages/frontend/src/components/MkReactionsViewer.details.stories.ts
+++ b/packages/frontend/src/components/MkReactionsViewer.details.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkReactionsViewer_details,
 	},
-	template: '<MkReactionsViewer.details />',
+	template: '<MkReactionsViewer_details />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.stories.ts b/packages/frontend/src/components/MkReactionsViewer.reaction.stories.ts
index f044f6a8be..917c5459ad 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.stories.ts
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkReactionsViewer_reaction,
 	},
-	template: '<MkReactionsViewer.reaction />',
+	template: '<MkReactionsViewer_reaction />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/global/MkPageHeader.tabs.stories.ts b/packages/frontend/src/components/global/MkPageHeader.tabs.stories.ts
index bcd2eddc66..8f3af87802 100644
--- a/packages/frontend/src/components/global/MkPageHeader.tabs.stories.ts
+++ b/packages/frontend/src/components/global/MkPageHeader.tabs.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		MkPageHeader_tabs,
 	},
-	template: '<MkPageHeader.tabs />',
+	template: '<MkPageHeader_tabs />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.block.stories.ts b/packages/frontend/src/components/page/page.block.stories.ts
index 3e4b9cba6a..9e434e066c 100644
--- a/packages/frontend/src/components/page/page.block.stories.ts
+++ b/packages/frontend/src/components/page/page.block.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_block,
 	},
-	template: '<page.block />',
+	template: '<page_block />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.button.stories.ts b/packages/frontend/src/components/page/page.button.stories.ts
index 35140be3f8..0d536d7502 100644
--- a/packages/frontend/src/components/page/page.button.stories.ts
+++ b/packages/frontend/src/components/page/page.button.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_button,
 	},
-	template: '<page.button />',
+	template: '<page_button />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.canvas.stories.ts b/packages/frontend/src/components/page/page.canvas.stories.ts
index 7a0350b247..1a79be9bd0 100644
--- a/packages/frontend/src/components/page/page.canvas.stories.ts
+++ b/packages/frontend/src/components/page/page.canvas.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_canvas,
 	},
-	template: '<page.canvas />',
+	template: '<page_canvas />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.counter.stories.ts b/packages/frontend/src/components/page/page.counter.stories.ts
index 22289bb079..5e808012f3 100644
--- a/packages/frontend/src/components/page/page.counter.stories.ts
+++ b/packages/frontend/src/components/page/page.counter.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_counter,
 	},
-	template: '<page.counter />',
+	template: '<page_counter />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.if.stories.ts b/packages/frontend/src/components/page/page.if.stories.ts
index c286b9b100..a44906903b 100644
--- a/packages/frontend/src/components/page/page.if.stories.ts
+++ b/packages/frontend/src/components/page/page.if.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_if,
 	},
-	template: '<page.if />',
+	template: '<page_if />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.image.stories.ts b/packages/frontend/src/components/page/page.image.stories.ts
index 76c5f448fc..68bd435e1c 100644
--- a/packages/frontend/src/components/page/page.image.stories.ts
+++ b/packages/frontend/src/components/page/page.image.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_image,
 	},
-	template: '<page.image />',
+	template: '<page_image />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.note.stories.ts b/packages/frontend/src/components/page/page.note.stories.ts
index 7cd6253e11..00c036fad1 100644
--- a/packages/frontend/src/components/page/page.note.stories.ts
+++ b/packages/frontend/src/components/page/page.note.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_note,
 	},
-	template: '<page.note />',
+	template: '<page_note />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.number-input.stories.ts b/packages/frontend/src/components/page/page.number-input.stories.ts
index f114ea4f64..cd04c9c7ac 100644
--- a/packages/frontend/src/components/page/page.number-input.stories.ts
+++ b/packages/frontend/src/components/page/page.number-input.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_number_input,
 	},
-	template: '<page.number-input />',
+	template: '<page_number_input />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.post.stories.ts b/packages/frontend/src/components/page/page.post.stories.ts
index f3320c8e06..89bb72e178 100644
--- a/packages/frontend/src/components/page/page.post.stories.ts
+++ b/packages/frontend/src/components/page/page.post.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_post,
 	},
-	template: '<page.post />',
+	template: '<page_post />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.radio-button.stories.ts b/packages/frontend/src/components/page/page.radio-button.stories.ts
index 860cd5eb13..59dd32357e 100644
--- a/packages/frontend/src/components/page/page.radio-button.stories.ts
+++ b/packages/frontend/src/components/page/page.radio-button.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_radio_button,
 	},
-	template: '<page.radio-button />',
+	template: '<page_radio_button />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.section.stories.ts b/packages/frontend/src/components/page/page.section.stories.ts
index 992b9d5a42..e31b612db6 100644
--- a/packages/frontend/src/components/page/page.section.stories.ts
+++ b/packages/frontend/src/components/page/page.section.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_section,
 	},
-	template: '<page.section />',
+	template: '<page_section />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.switch.stories.ts b/packages/frontend/src/components/page/page.switch.stories.ts
index d90c74d761..05f5b14947 100644
--- a/packages/frontend/src/components/page/page.switch.stories.ts
+++ b/packages/frontend/src/components/page/page.switch.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_switch,
 	},
-	template: '<page.switch />',
+	template: '<page_switch />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.text-input.stories.ts b/packages/frontend/src/components/page/page.text-input.stories.ts
index 897c6ea2fd..2e063ed14c 100644
--- a/packages/frontend/src/components/page/page.text-input.stories.ts
+++ b/packages/frontend/src/components/page/page.text-input.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_text_input,
 	},
-	template: '<page.text-input />',
+	template: '<page_text_input />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.text.stories.ts b/packages/frontend/src/components/page/page.text.stories.ts
index cb88a35983..6eabcb3da8 100644
--- a/packages/frontend/src/components/page/page.text.stories.ts
+++ b/packages/frontend/src/components/page/page.text.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_text,
 	},
-	template: '<page.text />',
+	template: '<page_text />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.textarea-input.stories.ts b/packages/frontend/src/components/page/page.textarea-input.stories.ts
index 0dcef76a40..3c392ed6fe 100644
--- a/packages/frontend/src/components/page/page.textarea-input.stories.ts
+++ b/packages/frontend/src/components/page/page.textarea-input.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_textarea_input,
 	},
-	template: '<page.textarea-input />',
+	template: '<page_textarea_input />',
 };
 export default meta;
diff --git a/packages/frontend/src/components/page/page.textarea.stories.ts b/packages/frontend/src/components/page/page.textarea.stories.ts
index 148c48df02..a09b134031 100644
--- a/packages/frontend/src/components/page/page.textarea.stories.ts
+++ b/packages/frontend/src/components/page/page.textarea.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_textarea,
 	},
-	template: '<page.textarea />',
+	template: '<page_textarea />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/about-misskey.stories.ts b/packages/frontend/src/pages/about-misskey.stories.ts
index b37c88e75b..4cf759246c 100644
--- a/packages/frontend/src/pages/about-misskey.stories.ts
+++ b/packages/frontend/src/pages/about-misskey.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		about_misskey,
 	},
-	template: '<about-misskey />',
+	template: '<about_misskey />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/about.emojis.stories.ts b/packages/frontend/src/pages/about.emojis.stories.ts
index f5c0504864..88cae1d4de 100644
--- a/packages/frontend/src/pages/about.emojis.stories.ts
+++ b/packages/frontend/src/pages/about.emojis.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		about_emojis,
 	},
-	template: '<about.emojis />',
+	template: '<about_emojis />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/about.federation.stories.ts b/packages/frontend/src/pages/about.federation.stories.ts
index 697beb6a28..75875ce589 100644
--- a/packages/frontend/src/pages/about.federation.stories.ts
+++ b/packages/frontend/src/pages/about.federation.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		about_federation,
 	},
-	template: '<about.federation />',
+	template: '<about_federation />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin-file.stories.ts b/packages/frontend/src/pages/admin-file.stories.ts
index 8403abb5d4..3a59d5ba7b 100644
--- a/packages/frontend/src/pages/admin-file.stories.ts
+++ b/packages/frontend/src/pages/admin-file.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		admin_file,
 	},
-	template: '<admin-file />',
+	template: '<admin_file />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/bot-protection.stories.ts b/packages/frontend/src/pages/admin/bot-protection.stories.ts
index 5c02a7060c..d5369f1fa4 100644
--- a/packages/frontend/src/pages/admin/bot-protection.stories.ts
+++ b/packages/frontend/src/pages/admin/bot-protection.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		bot_protection,
 	},
-	template: '<bot-protection />',
+	template: '<bot_protection />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/email-settings.stories.ts b/packages/frontend/src/pages/admin/email-settings.stories.ts
index c89b2e4671..ad094e5140 100644
--- a/packages/frontend/src/pages/admin/email-settings.stories.ts
+++ b/packages/frontend/src/pages/admin/email-settings.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		email_settings,
 	},
-	template: '<email-settings />',
+	template: '<email_settings />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/instance-block.stories.ts b/packages/frontend/src/pages/admin/instance-block.stories.ts
index 4051f02919..5186eb4dfc 100644
--- a/packages/frontend/src/pages/admin/instance-block.stories.ts
+++ b/packages/frontend/src/pages/admin/instance-block.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		instance_block,
 	},
-	template: '<instance-block />',
+	template: '<instance_block />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/object-storage.stories.ts b/packages/frontend/src/pages/admin/object-storage.stories.ts
index c85f0a3b28..ab971197e9 100644
--- a/packages/frontend/src/pages/admin/object-storage.stories.ts
+++ b/packages/frontend/src/pages/admin/object-storage.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		object_storage,
 	},
-	template: '<object-storage />',
+	template: '<object_storage />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/other-settings.stories.ts b/packages/frontend/src/pages/admin/other-settings.stories.ts
index 44f4fb2e7a..20c422c58a 100644
--- a/packages/frontend/src/pages/admin/other-settings.stories.ts
+++ b/packages/frontend/src/pages/admin/other-settings.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		other_settings,
 	},
-	template: '<other-settings />',
+	template: '<other_settings />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.active-users.stories.ts b/packages/frontend/src/pages/admin/overview.active-users.stories.ts
index e8921b87be..ac1628f3d2 100644
--- a/packages/frontend/src/pages/admin/overview.active-users.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.active-users.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_active_users,
 	},
-	template: '<overview.active-users />',
+	template: '<overview_active_users />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.ap-requests.stories.ts b/packages/frontend/src/pages/admin/overview.ap-requests.stories.ts
index a5749b5229..ed74ab698e 100644
--- a/packages/frontend/src/pages/admin/overview.ap-requests.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.ap-requests.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_ap_requests,
 	},
-	template: '<overview.ap-requests />',
+	template: '<overview_ap_requests />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.federation.stories.ts b/packages/frontend/src/pages/admin/overview.federation.stories.ts
index f41761150f..e3c6d7d64b 100644
--- a/packages/frontend/src/pages/admin/overview.federation.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.federation.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_federation,
 	},
-	template: '<overview.federation />',
+	template: '<overview_federation />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.heatmap.stories.ts b/packages/frontend/src/pages/admin/overview.heatmap.stories.ts
index 51f0ce2348..106f78fb28 100644
--- a/packages/frontend/src/pages/admin/overview.heatmap.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.heatmap.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_heatmap,
 	},
-	template: '<overview.heatmap />',
+	template: '<overview_heatmap />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.instances.stories.ts b/packages/frontend/src/pages/admin/overview.instances.stories.ts
index 410c3350bb..77830053dd 100644
--- a/packages/frontend/src/pages/admin/overview.instances.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.instances.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_instances,
 	},
-	template: '<overview.instances />',
+	template: '<overview_instances />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.moderators.stories.ts b/packages/frontend/src/pages/admin/overview.moderators.stories.ts
index 2998373fe0..973b8e4a07 100644
--- a/packages/frontend/src/pages/admin/overview.moderators.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.moderators.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_moderators,
 	},
-	template: '<overview.moderators />',
+	template: '<overview_moderators />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.pie.stories.ts b/packages/frontend/src/pages/admin/overview.pie.stories.ts
index 94571e9c7f..20dcddea66 100644
--- a/packages/frontend/src/pages/admin/overview.pie.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.pie.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_pie,
 	},
-	template: '<overview.pie />',
+	template: '<overview_pie />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.queue.chart.stories.ts b/packages/frontend/src/pages/admin/overview.queue.chart.stories.ts
index 31e1f728be..322588f294 100644
--- a/packages/frontend/src/pages/admin/overview.queue.chart.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.queue.chart.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_queue_chart,
 	},
-	template: '<overview.queue.chart />',
+	template: '<overview_queue_chart />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.queue.stories.ts b/packages/frontend/src/pages/admin/overview.queue.stories.ts
index 21c4d204ba..4906cef135 100644
--- a/packages/frontend/src/pages/admin/overview.queue.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.queue.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_queue,
 	},
-	template: '<overview.queue />',
+	template: '<overview_queue />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.retention.stories.ts b/packages/frontend/src/pages/admin/overview.retention.stories.ts
index 5200769a1c..74157b991c 100644
--- a/packages/frontend/src/pages/admin/overview.retention.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.retention.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_retention,
 	},
-	template: '<overview.retention />',
+	template: '<overview_retention />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.stats.stories.ts b/packages/frontend/src/pages/admin/overview.stats.stories.ts
index 3113e5043b..4042b7ae90 100644
--- a/packages/frontend/src/pages/admin/overview.stats.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.stats.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_stats,
 	},
-	template: '<overview.stats />',
+	template: '<overview_stats />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/overview.users.stories.ts b/packages/frontend/src/pages/admin/overview.users.stories.ts
index 4f43cf79d2..05fb8e1318 100644
--- a/packages/frontend/src/pages/admin/overview.users.stories.ts
+++ b/packages/frontend/src/pages/admin/overview.users.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		overview_users,
 	},
-	template: '<overview.users />',
+	template: '<overview_users />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/proxy-account.stories.ts b/packages/frontend/src/pages/admin/proxy-account.stories.ts
index 71edbea071..00a645b0ec 100644
--- a/packages/frontend/src/pages/admin/proxy-account.stories.ts
+++ b/packages/frontend/src/pages/admin/proxy-account.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		proxy_account,
 	},
-	template: '<proxy-account />',
+	template: '<proxy_account />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/queue.chart.chart.stories.ts b/packages/frontend/src/pages/admin/queue.chart.chart.stories.ts
index 691f032689..0a853bd7f5 100644
--- a/packages/frontend/src/pages/admin/queue.chart.chart.stories.ts
+++ b/packages/frontend/src/pages/admin/queue.chart.chart.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		queue_chart_chart,
 	},
-	template: '<queue.chart.chart />',
+	template: '<queue_chart_chart />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/queue.chart.stories.ts b/packages/frontend/src/pages/admin/queue.chart.stories.ts
index d9c71790ea..e1523a1cab 100644
--- a/packages/frontend/src/pages/admin/queue.chart.stories.ts
+++ b/packages/frontend/src/pages/admin/queue.chart.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		queue_chart,
 	},
-	template: '<queue.chart />',
+	template: '<queue_chart />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/roles.edit.stories.ts b/packages/frontend/src/pages/admin/roles.edit.stories.ts
index e562a223d5..7a17ea360e 100644
--- a/packages/frontend/src/pages/admin/roles.edit.stories.ts
+++ b/packages/frontend/src/pages/admin/roles.edit.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		roles_edit,
 	},
-	template: '<roles.edit />',
+	template: '<roles_edit />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/roles.editor.stories.ts b/packages/frontend/src/pages/admin/roles.editor.stories.ts
index 4a3ed50157..fdba287e01 100644
--- a/packages/frontend/src/pages/admin/roles.editor.stories.ts
+++ b/packages/frontend/src/pages/admin/roles.editor.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		roles_editor,
 	},
-	template: '<roles.editor />',
+	template: '<roles_editor />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/admin/roles.role.stories.ts b/packages/frontend/src/pages/admin/roles.role.stories.ts
index b2a28736b7..6be5d3261d 100644
--- a/packages/frontend/src/pages/admin/roles.role.stories.ts
+++ b/packages/frontend/src/pages/admin/roles.role.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		roles_role,
 	},
-	template: '<roles.role />',
+	template: '<roles_role />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/antenna-timeline.stories.ts b/packages/frontend/src/pages/antenna-timeline.stories.ts
index 39fba9b1bc..31e417bb25 100644
--- a/packages/frontend/src/pages/antenna-timeline.stories.ts
+++ b/packages/frontend/src/pages/antenna-timeline.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		antenna_timeline,
 	},
-	template: '<antenna-timeline />',
+	template: '<antenna_timeline />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/api-console.stories.ts b/packages/frontend/src/pages/api-console.stories.ts
index adb6440050..bf0fdc8120 100644
--- a/packages/frontend/src/pages/api-console.stories.ts
+++ b/packages/frontend/src/pages/api-console.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		api_console,
 	},
-	template: '<api-console />',
+	template: '<api_console />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/auth.form.stories.ts b/packages/frontend/src/pages/auth.form.stories.ts
index 19134f4539..041ad69a92 100644
--- a/packages/frontend/src/pages/auth.form.stories.ts
+++ b/packages/frontend/src/pages/auth.form.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		auth_form,
 	},
-	template: '<auth.form />',
+	template: '<auth_form />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/channel-editor.stories.ts b/packages/frontend/src/pages/channel-editor.stories.ts
index 4df2f4c0f1..7e383b18b3 100644
--- a/packages/frontend/src/pages/channel-editor.stories.ts
+++ b/packages/frontend/src/pages/channel-editor.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		channel_editor,
 	},
-	template: '<channel-editor />',
+	template: '<channel_editor />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/custom-emojis-manager.stories.ts b/packages/frontend/src/pages/custom-emojis-manager.stories.ts
index 89017a590b..3b78a49aa7 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.stories.ts
+++ b/packages/frontend/src/pages/custom-emojis-manager.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		custom_emojis_manager,
 	},
-	template: '<custom-emojis-manager />',
+	template: '<custom_emojis_manager />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.stories.ts b/packages/frontend/src/pages/emoji-edit-dialog.stories.ts
index 8dae3f3f56..d56a698269 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.stories.ts
+++ b/packages/frontend/src/pages/emoji-edit-dialog.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		emoji_edit_dialog,
 	},
-	template: '<emoji-edit-dialog />',
+	template: '<emoji_edit_dialog />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/emojis.emoji.stories.ts b/packages/frontend/src/pages/emojis.emoji.stories.ts
index bd3644d079..54fa1569b6 100644
--- a/packages/frontend/src/pages/emojis.emoji.stories.ts
+++ b/packages/frontend/src/pages/emojis.emoji.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		emojis_emoji,
 	},
-	template: '<emojis.emoji />',
+	template: '<emojis_emoji />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/explore.featured.stories.ts b/packages/frontend/src/pages/explore.featured.stories.ts
index 4626c861df..1c44df5703 100644
--- a/packages/frontend/src/pages/explore.featured.stories.ts
+++ b/packages/frontend/src/pages/explore.featured.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		explore_featured,
 	},
-	template: '<explore.featured />',
+	template: '<explore_featured />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/explore.roles.stories.ts b/packages/frontend/src/pages/explore.roles.stories.ts
index e00f33b935..0039f0f6ce 100644
--- a/packages/frontend/src/pages/explore.roles.stories.ts
+++ b/packages/frontend/src/pages/explore.roles.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		explore_roles,
 	},
-	template: '<explore.roles />',
+	template: '<explore_roles />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/explore.users.stories.ts b/packages/frontend/src/pages/explore.users.stories.ts
index 75b5457092..c50ff656e7 100644
--- a/packages/frontend/src/pages/explore.users.stories.ts
+++ b/packages/frontend/src/pages/explore.users.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		explore_users,
 	},
-	template: '<explore.users />',
+	template: '<explore_users />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/flash/flash-edit.stories.ts b/packages/frontend/src/pages/flash/flash-edit.stories.ts
index 60449be06e..eabf25fb74 100644
--- a/packages/frontend/src/pages/flash/flash-edit.stories.ts
+++ b/packages/frontend/src/pages/flash/flash-edit.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		flash_edit,
 	},
-	template: '<flash-edit />',
+	template: '<flash_edit />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/flash/flash-index.stories.ts b/packages/frontend/src/pages/flash/flash-index.stories.ts
index 0ac5152247..93cfd5ce79 100644
--- a/packages/frontend/src/pages/flash/flash-index.stories.ts
+++ b/packages/frontend/src/pages/flash/flash-index.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		flash_index,
 	},
-	template: '<flash-index />',
+	template: '<flash_index />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/follow-requests.stories.ts b/packages/frontend/src/pages/follow-requests.stories.ts
index 3d88533133..c7def2cbdf 100644
--- a/packages/frontend/src/pages/follow-requests.stories.ts
+++ b/packages/frontend/src/pages/follow-requests.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		follow_requests,
 	},
-	template: '<follow-requests />',
+	template: '<follow_requests />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/instance-info.stories.ts b/packages/frontend/src/pages/instance-info.stories.ts
index 82f9806560..43ccada6bf 100644
--- a/packages/frontend/src/pages/instance-info.stories.ts
+++ b/packages/frontend/src/pages/instance-info.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		instance_info,
 	},
-	template: '<instance-info />',
+	template: '<instance_info />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/not-found.stories.ts b/packages/frontend/src/pages/not-found.stories.ts
index 5c8a643694..a7f237b530 100644
--- a/packages/frontend/src/pages/not-found.stories.ts
+++ b/packages/frontend/src/pages/not-found.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		not_found,
 	},
-	template: '<not-found />',
+	template: '<not_found />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.image.stories.ts b/packages/frontend/src/pages/page-editor/els/page-editor.el.image.stories.ts
index 1f62bdc2ce..420dbf528a 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.image.stories.ts
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.image.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_editor_el_image,
 	},
-	template: '<page-editor.el.image />',
+	template: '<page_editor_el_image />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.stories.ts b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.stories.ts
index 363bc343be..7a5f6fc3f7 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.stories.ts
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_editor_el_note,
 	},
-	template: '<page-editor.el.note />',
+	template: '<page_editor_el_note />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.section.stories.ts b/packages/frontend/src/pages/page-editor/els/page-editor.el.section.stories.ts
index 77bd89228a..51be8d07d6 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.section.stories.ts
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.section.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_editor_el_section,
 	},
-	template: '<page-editor.el.section />',
+	template: '<page_editor_el_section />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.text.stories.ts b/packages/frontend/src/pages/page-editor/els/page-editor.el.text.stories.ts
index ec795bf13c..b6dc3a76e4 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.text.stories.ts
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.text.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_editor_el_text,
 	},
-	template: '<page-editor.el.text />',
+	template: '<page_editor_el_text />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/page-editor/page-editor.blocks.stories.ts b/packages/frontend/src/pages/page-editor/page-editor.blocks.stories.ts
index 9bc66bfa36..ddfc0a3f45 100644
--- a/packages/frontend/src/pages/page-editor/page-editor.blocks.stories.ts
+++ b/packages/frontend/src/pages/page-editor/page-editor.blocks.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_editor_blocks,
 	},
-	template: '<page-editor.blocks />',
+	template: '<page_editor_blocks />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/page-editor/page-editor.container.stories.ts b/packages/frontend/src/pages/page-editor/page-editor.container.stories.ts
index 32a0ca5026..35aeb5747c 100644
--- a/packages/frontend/src/pages/page-editor/page-editor.container.stories.ts
+++ b/packages/frontend/src/pages/page-editor/page-editor.container.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_editor_container,
 	},
-	template: '<page-editor.container />',
+	template: '<page_editor_container />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/page-editor/page-editor.stories.ts b/packages/frontend/src/pages/page-editor/page-editor.stories.ts
index facfd7ba2a..be9c62c03c 100644
--- a/packages/frontend/src/pages/page-editor/page-editor.stories.ts
+++ b/packages/frontend/src/pages/page-editor/page-editor.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		page_editor,
 	},
-	template: '<page-editor />',
+	template: '<page_editor />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/registry.keys.stories.ts b/packages/frontend/src/pages/registry.keys.stories.ts
index 14097653dc..436de31edf 100644
--- a/packages/frontend/src/pages/registry.keys.stories.ts
+++ b/packages/frontend/src/pages/registry.keys.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		registry_keys,
 	},
-	template: '<registry.keys />',
+	template: '<registry_keys />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/registry.value.stories.ts b/packages/frontend/src/pages/registry.value.stories.ts
index 6d5b3c4bb5..667ddab8d4 100644
--- a/packages/frontend/src/pages/registry.value.stories.ts
+++ b/packages/frontend/src/pages/registry.value.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		registry_value,
 	},
-	template: '<registry.value />',
+	template: '<registry_value />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/reset-password.stories.ts b/packages/frontend/src/pages/reset-password.stories.ts
index a5cd75de4a..cc8fd62bc7 100644
--- a/packages/frontend/src/pages/reset-password.stories.ts
+++ b/packages/frontend/src/pages/reset-password.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		reset_password,
 	},
-	template: '<reset-password />',
+	template: '<reset_password />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/2fa.qrdialog.stories.ts b/packages/frontend/src/pages/settings/2fa.qrdialog.stories.ts
index 0e37c0bcb2..2d7f50c1bd 100644
--- a/packages/frontend/src/pages/settings/2fa.qrdialog.stories.ts
+++ b/packages/frontend/src/pages/settings/2fa.qrdialog.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		_2fa_qrdialog,
 	},
-	template: '<2fa.qrdialog />',
+	template: '<_2fa_qrdialog />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/2fa.stories.ts b/packages/frontend/src/pages/settings/2fa.stories.ts
index 583dddd6d9..5543b40262 100644
--- a/packages/frontend/src/pages/settings/2fa.stories.ts
+++ b/packages/frontend/src/pages/settings/2fa.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		_2fa,
 	},
-	template: '<2fa />',
+	template: '<_2fa />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/account-info.stories.ts b/packages/frontend/src/pages/settings/account-info.stories.ts
index 87abcbc836..79b43f9efb 100644
--- a/packages/frontend/src/pages/settings/account-info.stories.ts
+++ b/packages/frontend/src/pages/settings/account-info.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		account_info,
 	},
-	template: '<account-info />',
+	template: '<account_info />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/custom-css.stories.ts b/packages/frontend/src/pages/settings/custom-css.stories.ts
index 6feb108af4..60f876ecd4 100644
--- a/packages/frontend/src/pages/settings/custom-css.stories.ts
+++ b/packages/frontend/src/pages/settings/custom-css.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		custom_css,
 	},
-	template: '<custom-css />',
+	template: '<custom_css />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/delete-account.stories.ts b/packages/frontend/src/pages/settings/delete-account.stories.ts
index 330c2ef631..5f56fb7689 100644
--- a/packages/frontend/src/pages/settings/delete-account.stories.ts
+++ b/packages/frontend/src/pages/settings/delete-account.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		delete_account,
 	},
-	template: '<delete-account />',
+	template: '<delete_account />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/import-export.stories.ts b/packages/frontend/src/pages/settings/import-export.stories.ts
index c8a2715d20..75ad8eb1bd 100644
--- a/packages/frontend/src/pages/settings/import-export.stories.ts
+++ b/packages/frontend/src/pages/settings/import-export.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		import_export,
 	},
-	template: '<import-export />',
+	template: '<import_export />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/instance-mute.stories.ts b/packages/frontend/src/pages/settings/instance-mute.stories.ts
index 4d8d007948..c0ef252ccd 100644
--- a/packages/frontend/src/pages/settings/instance-mute.stories.ts
+++ b/packages/frontend/src/pages/settings/instance-mute.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		instance_mute,
 	},
-	template: '<instance-mute />',
+	template: '<instance_mute />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/mute-block.stories.ts b/packages/frontend/src/pages/settings/mute-block.stories.ts
index 4f5fae2517..9001b89604 100644
--- a/packages/frontend/src/pages/settings/mute-block.stories.ts
+++ b/packages/frontend/src/pages/settings/mute-block.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		mute_block,
 	},
-	template: '<mute-block />',
+	template: '<mute_block />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/plugin.install.stories.ts b/packages/frontend/src/pages/settings/plugin.install.stories.ts
index 3d477a3b64..851bc85a8b 100644
--- a/packages/frontend/src/pages/settings/plugin.install.stories.ts
+++ b/packages/frontend/src/pages/settings/plugin.install.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		plugin_install,
 	},
-	template: '<plugin.install />',
+	template: '<plugin_install />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/preferences-backups.stories.ts b/packages/frontend/src/pages/settings/preferences-backups.stories.ts
index 724e0f0041..69921e6e8e 100644
--- a/packages/frontend/src/pages/settings/preferences-backups.stories.ts
+++ b/packages/frontend/src/pages/settings/preferences-backups.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		preferences_backups,
 	},
-	template: '<preferences-backups />',
+	template: '<preferences_backups />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/sounds.sound.stories.ts b/packages/frontend/src/pages/settings/sounds.sound.stories.ts
index 1e47a2c37c..4302450ff9 100644
--- a/packages/frontend/src/pages/settings/sounds.sound.stories.ts
+++ b/packages/frontend/src/pages/settings/sounds.sound.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		sounds_sound,
 	},
-	template: '<sounds.sound />',
+	template: '<sounds_sound />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/statusbar.statusbar.stories.ts b/packages/frontend/src/pages/settings/statusbar.statusbar.stories.ts
index 0f9e159fee..83e18810cc 100644
--- a/packages/frontend/src/pages/settings/statusbar.statusbar.stories.ts
+++ b/packages/frontend/src/pages/settings/statusbar.statusbar.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		statusbar_statusbar,
 	},
-	template: '<statusbar.statusbar />',
+	template: '<statusbar_statusbar />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/theme.install.stories.ts b/packages/frontend/src/pages/settings/theme.install.stories.ts
index 8762c63536..0fc3e81fc6 100644
--- a/packages/frontend/src/pages/settings/theme.install.stories.ts
+++ b/packages/frontend/src/pages/settings/theme.install.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		theme_install,
 	},
-	template: '<theme.install />',
+	template: '<theme_install />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/theme.manage.stories.ts b/packages/frontend/src/pages/settings/theme.manage.stories.ts
index 65659036ab..ea163f7c37 100644
--- a/packages/frontend/src/pages/settings/theme.manage.stories.ts
+++ b/packages/frontend/src/pages/settings/theme.manage.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		theme_manage,
 	},
-	template: '<theme.manage />',
+	template: '<theme_manage />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/webhook.edit.stories.ts b/packages/frontend/src/pages/settings/webhook.edit.stories.ts
index 0d584b77d2..932d9f4b73 100644
--- a/packages/frontend/src/pages/settings/webhook.edit.stories.ts
+++ b/packages/frontend/src/pages/settings/webhook.edit.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		webhook_edit,
 	},
-	template: '<webhook.edit />',
+	template: '<webhook_edit />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/webhook.new.stories.ts b/packages/frontend/src/pages/settings/webhook.new.stories.ts
index 483e64cbfa..bbd081c58f 100644
--- a/packages/frontend/src/pages/settings/webhook.new.stories.ts
+++ b/packages/frontend/src/pages/settings/webhook.new.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		webhook_new,
 	},
-	template: '<webhook.new />',
+	template: '<webhook_new />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/settings/word-mute.stories.ts b/packages/frontend/src/pages/settings/word-mute.stories.ts
index 26fc2edd94..0fd4012c9c 100644
--- a/packages/frontend/src/pages/settings/word-mute.stories.ts
+++ b/packages/frontend/src/pages/settings/word-mute.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		word_mute,
 	},
-	template: '<word-mute />',
+	template: '<word_mute />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/signup-complete.stories.ts b/packages/frontend/src/pages/signup-complete.stories.ts
index 2af4fa8801..32b1aaa25c 100644
--- a/packages/frontend/src/pages/signup-complete.stories.ts
+++ b/packages/frontend/src/pages/signup-complete.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		signup_complete,
 	},
-	template: '<signup-complete />',
+	template: '<signup_complete />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/theme-editor.stories.ts b/packages/frontend/src/pages/theme-editor.stories.ts
index 9f71a22d21..a506382368 100644
--- a/packages/frontend/src/pages/theme-editor.stories.ts
+++ b/packages/frontend/src/pages/theme-editor.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		theme_editor,
 	},
-	template: '<theme-editor />',
+	template: '<theme_editor />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/timeline.tutorial.stories.ts b/packages/frontend/src/pages/timeline.tutorial.stories.ts
index 7c8f5caaaf..97f2bcfe43 100644
--- a/packages/frontend/src/pages/timeline.tutorial.stories.ts
+++ b/packages/frontend/src/pages/timeline.tutorial.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		timeline_tutorial,
 	},
-	template: '<timeline.tutorial />',
+	template: '<timeline_tutorial />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user-info.stories.ts b/packages/frontend/src/pages/user-info.stories.ts
index 79c6ecd18d..e4c45fcfee 100644
--- a/packages/frontend/src/pages/user-info.stories.ts
+++ b/packages/frontend/src/pages/user-info.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		user_info,
 	},
-	template: '<user-info />',
+	template: '<user_info />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user-list-timeline.stories.ts b/packages/frontend/src/pages/user-list-timeline.stories.ts
index 89cc0f6978..9750e3ef7d 100644
--- a/packages/frontend/src/pages/user-list-timeline.stories.ts
+++ b/packages/frontend/src/pages/user-list-timeline.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		user_list_timeline,
 	},
-	template: '<user-list-timeline />',
+	template: '<user_list_timeline />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user-tag.stories.ts b/packages/frontend/src/pages/user-tag.stories.ts
index 4aa1cb2e89..9054c27c37 100644
--- a/packages/frontend/src/pages/user-tag.stories.ts
+++ b/packages/frontend/src/pages/user-tag.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		user_tag,
 	},
-	template: '<user-tag />',
+	template: '<user_tag />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user/activity.following.stories.ts b/packages/frontend/src/pages/user/activity.following.stories.ts
index ee472fd466..ce54eae0d6 100644
--- a/packages/frontend/src/pages/user/activity.following.stories.ts
+++ b/packages/frontend/src/pages/user/activity.following.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		activity_following,
 	},
-	template: '<activity.following />',
+	template: '<activity_following />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user/activity.heatmap.stories.ts b/packages/frontend/src/pages/user/activity.heatmap.stories.ts
index 13ffbe9b57..42609d780b 100644
--- a/packages/frontend/src/pages/user/activity.heatmap.stories.ts
+++ b/packages/frontend/src/pages/user/activity.heatmap.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		activity_heatmap,
 	},
-	template: '<activity.heatmap />',
+	template: '<activity_heatmap />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user/activity.notes.stories.ts b/packages/frontend/src/pages/user/activity.notes.stories.ts
index 5a4dde42e5..7e36c3e090 100644
--- a/packages/frontend/src/pages/user/activity.notes.stories.ts
+++ b/packages/frontend/src/pages/user/activity.notes.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		activity_notes,
 	},
-	template: '<activity.notes />',
+	template: '<activity_notes />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user/activity.pv.stories.ts b/packages/frontend/src/pages/user/activity.pv.stories.ts
index c74d62ce2b..c28ff429f4 100644
--- a/packages/frontend/src/pages/user/activity.pv.stories.ts
+++ b/packages/frontend/src/pages/user/activity.pv.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		activity_pv,
 	},
-	template: '<activity.pv />',
+	template: '<activity_pv />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user/follow-list.stories.ts b/packages/frontend/src/pages/user/follow-list.stories.ts
index 48cfbe9cad..3f915228fe 100644
--- a/packages/frontend/src/pages/user/follow-list.stories.ts
+++ b/packages/frontend/src/pages/user/follow-list.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		follow_list,
 	},
-	template: '<follow-list />',
+	template: '<follow_list />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user/index.activity.stories.ts b/packages/frontend/src/pages/user/index.activity.stories.ts
index 7426040d5b..8739405b1d 100644
--- a/packages/frontend/src/pages/user/index.activity.stories.ts
+++ b/packages/frontend/src/pages/user/index.activity.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		index_activity,
 	},
-	template: '<index.activity />',
+	template: '<index_activity />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user/index.photos.stories.ts b/packages/frontend/src/pages/user/index.photos.stories.ts
index 26debd437d..1457d03ca5 100644
--- a/packages/frontend/src/pages/user/index.photos.stories.ts
+++ b/packages/frontend/src/pages/user/index.photos.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		index_photos,
 	},
-	template: '<index.photos />',
+	template: '<index_photos />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/user/index.timeline.stories.ts b/packages/frontend/src/pages/user/index.timeline.stories.ts
index 580f98f183..e22b0ba9dd 100644
--- a/packages/frontend/src/pages/user/index.timeline.stories.ts
+++ b/packages/frontend/src/pages/user/index.timeline.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		index_timeline,
 	},
-	template: '<index.timeline />',
+	template: '<index_timeline />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/welcome.entrance.a.stories.ts b/packages/frontend/src/pages/welcome.entrance.a.stories.ts
index 41b134bba6..81a558152c 100644
--- a/packages/frontend/src/pages/welcome.entrance.a.stories.ts
+++ b/packages/frontend/src/pages/welcome.entrance.a.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		welcome_entrance_a,
 	},
-	template: '<welcome.entrance.a />',
+	template: '<welcome_entrance_a />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/welcome.entrance.b.stories.ts b/packages/frontend/src/pages/welcome.entrance.b.stories.ts
index 9a8fbe5420..ce78d27580 100644
--- a/packages/frontend/src/pages/welcome.entrance.b.stories.ts
+++ b/packages/frontend/src/pages/welcome.entrance.b.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		welcome_entrance_b,
 	},
-	template: '<welcome.entrance.b />',
+	template: '<welcome_entrance_b />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/welcome.entrance.c.stories.ts b/packages/frontend/src/pages/welcome.entrance.c.stories.ts
index fb54919cd6..c9574fbd22 100644
--- a/packages/frontend/src/pages/welcome.entrance.c.stories.ts
+++ b/packages/frontend/src/pages/welcome.entrance.c.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		welcome_entrance_c,
 	},
-	template: '<welcome.entrance.c />',
+	template: '<welcome_entrance_c />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/welcome.setup.stories.ts b/packages/frontend/src/pages/welcome.setup.stories.ts
index 5e50f1670c..d47ceee59f 100644
--- a/packages/frontend/src/pages/welcome.setup.stories.ts
+++ b/packages/frontend/src/pages/welcome.setup.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		welcome_setup,
 	},
-	template: '<welcome.setup />',
+	template: '<welcome_setup />',
 };
 export default meta;
diff --git a/packages/frontend/src/pages/welcome.timeline.stories.ts b/packages/frontend/src/pages/welcome.timeline.stories.ts
index b9ec527a7b..f7bc3c5772 100644
--- a/packages/frontend/src/pages/welcome.timeline.stories.ts
+++ b/packages/frontend/src/pages/welcome.timeline.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		welcome_timeline,
 	},
-	template: '<welcome.timeline />',
+	template: '<welcome_timeline />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.stories.ts b/packages/frontend/src/ui/_common_/navbar-for-mobile.stories.ts
index 722b1fb7b4..b3e3e54ebe 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.stories.ts
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		navbar_for_mobile,
 	},
-	template: '<navbar-for-mobile />',
+	template: '<navbar_for_mobile />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/_common_/statusbar-federation.stories.ts b/packages/frontend/src/ui/_common_/statusbar-federation.stories.ts
index c918bcf0a3..c23271862b 100644
--- a/packages/frontend/src/ui/_common_/statusbar-federation.stories.ts
+++ b/packages/frontend/src/ui/_common_/statusbar-federation.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		statusbar_federation,
 	},
-	template: '<statusbar-federation />',
+	template: '<statusbar_federation />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/_common_/statusbar-rss.stories.ts b/packages/frontend/src/ui/_common_/statusbar-rss.stories.ts
index 5366e645e7..bc6e39c7ba 100644
--- a/packages/frontend/src/ui/_common_/statusbar-rss.stories.ts
+++ b/packages/frontend/src/ui/_common_/statusbar-rss.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		statusbar_rss,
 	},
-	template: '<statusbar-rss />',
+	template: '<statusbar_rss />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/_common_/statusbar-user-list.stories.ts b/packages/frontend/src/ui/_common_/statusbar-user-list.stories.ts
index e3fe7370d1..c051f20e15 100644
--- a/packages/frontend/src/ui/_common_/statusbar-user-list.stories.ts
+++ b/packages/frontend/src/ui/_common_/statusbar-user-list.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		statusbar_user_list,
 	},
-	template: '<statusbar-user-list />',
+	template: '<statusbar_user_list />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/_common_/stream-indicator.stories.ts b/packages/frontend/src/ui/_common_/stream-indicator.stories.ts
index e1dec78486..f1461098cd 100644
--- a/packages/frontend/src/ui/_common_/stream-indicator.stories.ts
+++ b/packages/frontend/src/ui/_common_/stream-indicator.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		stream_indicator,
 	},
-	template: '<stream-indicator />',
+	template: '<stream_indicator />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/classic.header.stories.ts b/packages/frontend/src/ui/classic.header.stories.ts
index 7e3e6f9006..899bcb27c0 100644
--- a/packages/frontend/src/ui/classic.header.stories.ts
+++ b/packages/frontend/src/ui/classic.header.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		classic_header,
 	},
-	template: '<classic.header />',
+	template: '<classic_header />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/classic.sidebar.stories.ts b/packages/frontend/src/ui/classic.sidebar.stories.ts
index 479dfb7396..c4a231b895 100644
--- a/packages/frontend/src/ui/classic.sidebar.stories.ts
+++ b/packages/frontend/src/ui/classic.sidebar.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		classic_sidebar,
 	},
-	template: '<classic.sidebar />',
+	template: '<classic_sidebar />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/antenna-column.stories.ts b/packages/frontend/src/ui/deck/antenna-column.stories.ts
index 02d469cd5e..b26c68a78d 100644
--- a/packages/frontend/src/ui/deck/antenna-column.stories.ts
+++ b/packages/frontend/src/ui/deck/antenna-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		antenna_column,
 	},
-	template: '<antenna-column />',
+	template: '<antenna_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/channel-column.stories.ts b/packages/frontend/src/ui/deck/channel-column.stories.ts
index 8cef29f1d7..5c0074a8f3 100644
--- a/packages/frontend/src/ui/deck/channel-column.stories.ts
+++ b/packages/frontend/src/ui/deck/channel-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		channel_column,
 	},
-	template: '<channel-column />',
+	template: '<channel_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/column-core.stories.ts b/packages/frontend/src/ui/deck/column-core.stories.ts
index f374d8adaf..09fe6da4c9 100644
--- a/packages/frontend/src/ui/deck/column-core.stories.ts
+++ b/packages/frontend/src/ui/deck/column-core.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		column_core,
 	},
-	template: '<column-core />',
+	template: '<column_core />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/direct-column.stories.ts b/packages/frontend/src/ui/deck/direct-column.stories.ts
index b90fdef443..6566a55ead 100644
--- a/packages/frontend/src/ui/deck/direct-column.stories.ts
+++ b/packages/frontend/src/ui/deck/direct-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		direct_column,
 	},
-	template: '<direct-column />',
+	template: '<direct_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/list-column.stories.ts b/packages/frontend/src/ui/deck/list-column.stories.ts
index f8874cae80..5edbb759e1 100644
--- a/packages/frontend/src/ui/deck/list-column.stories.ts
+++ b/packages/frontend/src/ui/deck/list-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		list_column,
 	},
-	template: '<list-column />',
+	template: '<list_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/main-column.stories.ts b/packages/frontend/src/ui/deck/main-column.stories.ts
index 0667fd8bfc..19eb912fb5 100644
--- a/packages/frontend/src/ui/deck/main-column.stories.ts
+++ b/packages/frontend/src/ui/deck/main-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		main_column,
 	},
-	template: '<main-column />',
+	template: '<main_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/mentions-column.stories.ts b/packages/frontend/src/ui/deck/mentions-column.stories.ts
index 3b44a28323..5f5db72f0c 100644
--- a/packages/frontend/src/ui/deck/mentions-column.stories.ts
+++ b/packages/frontend/src/ui/deck/mentions-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		mentions_column,
 	},
-	template: '<mentions-column />',
+	template: '<mentions_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/notifications-column.stories.ts b/packages/frontend/src/ui/deck/notifications-column.stories.ts
index 07bb499e97..10c3c67dac 100644
--- a/packages/frontend/src/ui/deck/notifications-column.stories.ts
+++ b/packages/frontend/src/ui/deck/notifications-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		notifications_column,
 	},
-	template: '<notifications-column />',
+	template: '<notifications_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/tl-column.stories.ts b/packages/frontend/src/ui/deck/tl-column.stories.ts
index 44a03581e1..b4167ea4b7 100644
--- a/packages/frontend/src/ui/deck/tl-column.stories.ts
+++ b/packages/frontend/src/ui/deck/tl-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		tl_column,
 	},
-	template: '<tl-column />',
+	template: '<tl_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/deck/widgets-column.stories.ts b/packages/frontend/src/ui/deck/widgets-column.stories.ts
index 8848e1fe5f..1b04f81ced 100644
--- a/packages/frontend/src/ui/deck/widgets-column.stories.ts
+++ b/packages/frontend/src/ui/deck/widgets-column.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		widgets_column,
 	},
-	template: '<widgets-column />',
+	template: '<widgets_column />',
 };
 export default meta;
diff --git a/packages/frontend/src/ui/universal.widgets.stories.ts b/packages/frontend/src/ui/universal.widgets.stories.ts
index 4c024e5362..fc8062d5cd 100644
--- a/packages/frontend/src/ui/universal.widgets.stories.ts
+++ b/packages/frontend/src/ui/universal.widgets.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		universal_widgets,
 	},
-	template: '<universal.widgets />',
+	template: '<universal_widgets />',
 };
 export default meta;
diff --git a/packages/frontend/src/widgets/WidgetActivity.calendar.stories.ts b/packages/frontend/src/widgets/WidgetActivity.calendar.stories.ts
index fc25eab6d8..5509f1261b 100644
--- a/packages/frontend/src/widgets/WidgetActivity.calendar.stories.ts
+++ b/packages/frontend/src/widgets/WidgetActivity.calendar.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		WidgetActivity_calendar,
 	},
-	template: '<WidgetActivity.calendar />',
+	template: '<WidgetActivity_calendar />',
 };
 export default meta;
diff --git a/packages/frontend/src/widgets/WidgetActivity.chart.stories.ts b/packages/frontend/src/widgets/WidgetActivity.chart.stories.ts
index 2923613159..f9739b636d 100644
--- a/packages/frontend/src/widgets/WidgetActivity.chart.stories.ts
+++ b/packages/frontend/src/widgets/WidgetActivity.chart.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		WidgetActivity_chart,
 	},
-	template: '<WidgetActivity.chart />',
+	template: '<WidgetActivity_chart />',
 };
 export default meta;
diff --git a/packages/frontend/src/widgets/server-metric/cpu-mem.stories.ts b/packages/frontend/src/widgets/server-metric/cpu-mem.stories.ts
index 8150e38a0a..67906eaece 100644
--- a/packages/frontend/src/widgets/server-metric/cpu-mem.stories.ts
+++ b/packages/frontend/src/widgets/server-metric/cpu-mem.stories.ts
@@ -8,6 +8,6 @@ export const Default = {
 	components: {
 		cpu_mem,
 	},
-	template: '<cpu-mem />',
+	template: '<cpu_mem />',
 };
 export default meta;