diff --git a/packages/forms/stories/JSONConcepts.stories.tsx b/packages/forms/stories/JSONConcepts.stories.tsx
index f36c5243a69..5c7bbac2747 100644
--- a/packages/forms/stories/JSONConcepts.stories.tsx
+++ b/packages/forms/stories/JSONConcepts.stories.tsx
@@ -3,7 +3,7 @@ import { UIForm } from '../src';
 import { concepts } from './json';
 
 export default {
-	title: 'Forms/Core concepts',
+	title: 'Forms/Schema/Core',
 	component: UIForm,
 	parameters: {
 		formStoryDisplayMode: {
diff --git a/packages/forms/stories/JSONFields.stories.tsx b/packages/forms/stories/JSONFields.stories.tsx
index aff8f212fa2..092464e4ec5 100644
--- a/packages/forms/stories/JSONFields.stories.tsx
+++ b/packages/forms/stories/JSONFields.stories.tsx
@@ -3,7 +3,7 @@ import { UIForm } from '../src';
 import { fields } from './json';
 
 export default {
-	title: 'Forms/Fields',
+	title: 'Forms/Schema/Fields',
 	component: UIForm,
 	parameters: {
 		formStoryDisplayMode: {
diff --git a/packages/forms/stories/JSONFieldsets.stories.tsx b/packages/forms/stories/JSONFieldsets.stories.tsx
index c1e391c65b4..a95aec40358 100644
--- a/packages/forms/stories/JSONFieldsets.stories.tsx
+++ b/packages/forms/stories/JSONFieldsets.stories.tsx
@@ -3,7 +3,7 @@ import { UIForm } from '../src';
 import { fieldsets } from './json';
 
 export default {
-	title: 'Forms/Fieldsets',
+	title: 'Forms/Schema/Fieldsets',
 	component: UIForm,
 	parameters: {
 		formStoryDisplayMode: {
diff --git a/packages/forms/stories/Form.stories.tsx b/packages/forms/stories/Layout.stories.tsx
similarity index 98%
rename from packages/forms/stories/Form.stories.tsx
rename to packages/forms/stories/Layout.stories.tsx
index 8900dbdb3fe..a69f0b141b6 100644
--- a/packages/forms/stories/Form.stories.tsx
+++ b/packages/forms/stories/Layout.stories.tsx
@@ -6,7 +6,7 @@ import Form from '../src';
 const simple = require('./json/concepts/simple.json');
 
 const meta: Meta<typeof Form> = {
-	title: 'Forms/Form',
+	title: 'Forms/Schema/Layout',
 	component: Form,
 	parameters: {
 		centeredLayout: true,
diff --git a/packages/forms/stories/Playground.stories.tsx b/packages/forms/stories/Playground.stories.tsx
index 03eeab2caa6..ab6bf8e713f 100644
--- a/packages/forms/stories/Playground.stories.tsx
+++ b/packages/forms/stories/Playground.stories.tsx
@@ -59,7 +59,7 @@ function Playground({ data }: { data: FormDefinition }) {
 }
 
 const meta: Meta<typeof Playground> = {
-	title: 'Forms/Playground',
+	title: 'Forms/Schema/Playground',
 	component: Playground,
 	parameters: {
 		centeredLayout: true,
diff --git a/packages/forms/stories/UIForm.stories.tsx b/packages/forms/stories/State.stories.tsx
similarity index 99%
rename from packages/forms/stories/UIForm.stories.tsx
rename to packages/forms/stories/State.stories.tsx
index d26ab32e41b..57db84c9a4e 100644
--- a/packages/forms/stories/UIForm.stories.tsx
+++ b/packages/forms/stories/State.stories.tsx
@@ -14,7 +14,7 @@ import { customWidgetSchema } from './UIFormStoriesSchemas/customWidget.schema';
 import { CustomArrayTemplate } from './CustomArrayTemplate.component';
 
 const meta: Meta<typeof UIForm> = {
-	title: 'Forms/UIForm',
+	title: 'Forms/Schema/State',
 	component: UIForm,
 	args: {
 		onChange: action('Change'),