diff --git a/packages/circuit-ui/components/Calendar/Calendar.mdx b/packages/circuit-ui/components/Calendar/Calendar.mdx
index d36b92485d..df15531a49 100644
--- a/packages/circuit-ui/components/Calendar/Calendar.mdx
+++ b/packages/circuit-ui/components/Calendar/Calendar.mdx
@@ -7,7 +7,7 @@ import * as Stories from './Calendar.stories';
 
 <Status variant="experimental" />
 
-The Calendar component displays a monthly date grid. This is a low-level component for advanced use cases; you likely want to use the [DateInput](Forms/Input/DateInput/Base) component instead.
+The Calendar component displays a monthly date grid. This is a low-level component for advanced use cases; you likely want to use the [DateInput](Forms/DateInput/Base) component instead.
 
 <Story of={Stories.Base} />
 <Props />
@@ -85,7 +85,7 @@ function App() {
 
 ## Related components
 
-- [DateInput](Forms/Input/DateInput/Base): The DateInput component allows user to select a specific date.
+- [DateInput](Forms/DateInput/Base): The DateInput component allows user to select a specific date.
 
 ## Accessibility
 
diff --git a/packages/circuit-ui/components/ColorInput/ColorInput.stories.tsx b/packages/circuit-ui/components/ColorInput/ColorInput.stories.tsx
index 00715861df..d852030f66 100644
--- a/packages/circuit-ui/components/ColorInput/ColorInput.stories.tsx
+++ b/packages/circuit-ui/components/ColorInput/ColorInput.stories.tsx
@@ -16,7 +16,7 @@
 import { ColorInput, type ColorInputProps } from './ColorInput.js';
 
 export default {
-  title: 'Forms/Input/ColorInput',
+  title: 'Forms/ColorInput',
   component: ColorInput,
 };
 
diff --git a/packages/circuit-ui/components/CurrencyInput/CurrencyInput.stories.tsx b/packages/circuit-ui/components/CurrencyInput/CurrencyInput.stories.tsx
index 94a2ab746c..0e601ff04f 100644
--- a/packages/circuit-ui/components/CurrencyInput/CurrencyInput.stories.tsx
+++ b/packages/circuit-ui/components/CurrencyInput/CurrencyInput.stories.tsx
@@ -18,7 +18,7 @@ import { Stack } from '../../../../.storybook/components/index.js';
 import { CurrencyInput, type CurrencyInputProps } from './CurrencyInput.js';
 
 export default {
-  title: 'Forms/Input/CurrencyInput',
+  title: 'Forms/CurrencyInput',
   component: CurrencyInput,
 };
 
diff --git a/packages/circuit-ui/components/DateInput/DateInput.stories.tsx b/packages/circuit-ui/components/DateInput/DateInput.stories.tsx
index 022a2ba45a..fe547ab9cb 100644
--- a/packages/circuit-ui/components/DateInput/DateInput.stories.tsx
+++ b/packages/circuit-ui/components/DateInput/DateInput.stories.tsx
@@ -16,7 +16,7 @@
 import { DateInput, type DateInputProps } from './DateInput.js';
 
 export default {
-  title: 'Forms/Input/DateInput',
+  title: 'Forms/DateInput',
   component: DateInput,
   argTypes: {
     disabled: { control: 'boolean' },
diff --git a/packages/circuit-ui/components/PercentageInput/PercentageInput.stories.tsx b/packages/circuit-ui/components/PercentageInput/PercentageInput.stories.tsx
index 86f685dc0b..6e6603d36a 100644
--- a/packages/circuit-ui/components/PercentageInput/PercentageInput.stories.tsx
+++ b/packages/circuit-ui/components/PercentageInput/PercentageInput.stories.tsx
@@ -21,7 +21,7 @@ import {
 } from './PercentageInput.js';
 
 export default {
-  title: 'Forms/Input/PercentageInput',
+  title: 'Forms/PercentageInput',
   component: PercentageInput,
 };
 
diff --git a/packages/circuit-ui/components/SearchInput/SearchInput.stories.tsx b/packages/circuit-ui/components/SearchInput/SearchInput.stories.tsx
index abaafde30c..6fb9df1a7c 100644
--- a/packages/circuit-ui/components/SearchInput/SearchInput.stories.tsx
+++ b/packages/circuit-ui/components/SearchInput/SearchInput.stories.tsx
@@ -20,7 +20,7 @@ import type { InputElement } from '../Input/index.js';
 import { SearchInput, type SearchInputProps } from './SearchInput.js';
 
 export default {
-  title: 'Forms/Input/SearchInput',
+  title: 'Forms/SearchInput',
   component: SearchInput,
   argTypes: {
     placeholder: { control: 'text' },