diff --git a/cmd/web/frontend/src/features/issues/components/card/pending-badge/index.stories.tsx b/cmd/web/frontend/src/features/issues/components/card/pending-badge/index.stories.tsx
index 3c0234a1..3c1e9b3a 100644
--- a/cmd/web/frontend/src/features/issues/components/card/pending-badge/index.stories.tsx
+++ b/cmd/web/frontend/src/features/issues/components/card/pending-badge/index.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import { PendingBadge } from "./index";
 
 const meta = {
-  title: "Features/Issues/Card/PendingBadge",
+  title: "Features/Badge/PendingBadge",
   component: PendingBadge,
   decorators: [
     (Story) => (
diff --git a/cmd/web/frontend/src/features/issues/components/change-request-status-badge/index.stories.tsx b/cmd/web/frontend/src/features/issues/components/change-request-status-badge/index.stories.tsx
index cb82bfdf..c8979906 100644
--- a/cmd/web/frontend/src/features/issues/components/change-request-status-badge/index.stories.tsx
+++ b/cmd/web/frontend/src/features/issues/components/change-request-status-badge/index.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import { ChangeRequestStatusBadge, changeRequestStatuses } from "./index";
 
 const meta = {
-  title: "Features/Issues/ChangeRequestStatusBadge",
+  title: "Features/Badge/ChangeRequestStatusBadge",
   component: ChangeRequestStatusBadge,
   decorators: [
     (Story) => (
diff --git a/cmd/web/frontend/src/features/issues/components/comment-type-badge/index.stories.tsx b/cmd/web/frontend/src/features/issues/components/comment-type-badge/index.stories.tsx
index 2a3f5a1d..0a9c41a9 100644
--- a/cmd/web/frontend/src/features/issues/components/comment-type-badge/index.stories.tsx
+++ b/cmd/web/frontend/src/features/issues/components/comment-type-badge/index.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import { CommentTypeBadge, commentTypes } from "./index";
 
 const meta = {
-  title: "Features/Issues/CommentTypeBadge",
+  title: "Features/Badge/CommentTypeBadge",
   component: CommentTypeBadge,
   decorators: [
     (Story) => (
diff --git a/cmd/web/frontend/src/features/issues/components/priority-badge/index.stories.tsx b/cmd/web/frontend/src/features/issues/components/priority-badge/index.stories.tsx
index a0cc9335..0bdf14ac 100644
--- a/cmd/web/frontend/src/features/issues/components/priority-badge/index.stories.tsx
+++ b/cmd/web/frontend/src/features/issues/components/priority-badge/index.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import { PriorityBadge } from "./index";
 
 const meta = {
-  title: "Features/Issues/PriorityBadge",
+  title: "Features/Badge/PriorityBadge",
   component: PriorityBadge,
   decorators: [
     (Story) => (
diff --git a/cmd/web/frontend/src/features/issues/components/project-badge/index.stories.tsx b/cmd/web/frontend/src/features/issues/components/project-badge/index.stories.tsx
index 9d02b6a4..11ec744d 100644
--- a/cmd/web/frontend/src/features/issues/components/project-badge/index.stories.tsx
+++ b/cmd/web/frontend/src/features/issues/components/project-badge/index.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import { ProjectBadge } from "./index";
 
 const meta = {
-  title: "Features/Issues/ProjectBadge",
+  title: "Features/Badge/ProjectBadge",
   component: ProjectBadge,
   decorators: [
     (Story) => (
diff --git a/cmd/web/frontend/src/features/issues/components/status-badge/index.stories.tsx b/cmd/web/frontend/src/features/issues/components/status-badge/index.stories.tsx
index 960da7b7..5b7d4459 100644
--- a/cmd/web/frontend/src/features/issues/components/status-badge/index.stories.tsx
+++ b/cmd/web/frontend/src/features/issues/components/status-badge/index.stories.tsx
@@ -3,7 +3,7 @@ import { issueStatuses } from "@/lib/types";
 import { StatusBadge } from "./index";
 
 const meta = {
-  title: "Features/Issues/StatusBadge",
+  title: "Features/Badge/StatusBadge",
   component: StatusBadge,
   decorators: [
     (Story) => (