diff --git a/ui/src/stories/autocomplete/autocomplete.stories.mdx b/ui/src/stories/autocomplete/autocomplete.stories.mdx
index d0ccfed65..2fa653105 100644
--- a/ui/src/stories/autocomplete/autocomplete.stories.mdx
+++ b/ui/src/stories/autocomplete/autocomplete.stories.mdx
@@ -15,7 +15,7 @@ import {
   OuiAutocompleteGroupStorybook,
 } from './autocomplete.component';
 
-<Meta title="MDX FORM FIELD/Autocomplete" />
+<Meta title="FORM FIELD/Autocomplete" />
 
 # Autocomplete
 
diff --git a/ui/src/stories/button/button.stories.mdx b/ui/src/stories/button/button.stories.mdx
index 3edbf08bf..7b63d795f 100644
--- a/ui/src/stories/button/button.stories.mdx
+++ b/ui/src/stories/button/button.stories.mdx
@@ -5,7 +5,7 @@ import { select, text, number, boolean } from '@storybook/addon-knobs';
 import { COLORS } from '../const';
 import { OuiIconButtonStorybook } from './button.component';
 
-<Meta title="MDX/Button" />
+<Meta title="Button" />
 
 # Button
 
diff --git a/ui/src/stories/checkbox/checkbox.stories.mdx b/ui/src/stories/checkbox/checkbox.stories.mdx
index d734f7b9f..e511a4abd 100644
--- a/ui/src/stories/checkbox/checkbox.stories.mdx
+++ b/ui/src/stories/checkbox/checkbox.stories.mdx
@@ -4,7 +4,7 @@ import { action } from '@storybook/addon-actions';
 import { select, boolean } from '@storybook/addon-knobs';
 import { LABELPOSITION, COLORS } from '../const';
 
-<Meta title="MDX/Checkbox" />
+<Meta title="Checkbox" />
 
 # Checkbox
 
diff --git a/ui/src/stories/dialog/dialog.stories.mdx b/ui/src/stories/dialog/dialog.stories.mdx
index 15fc7104b..b67e78dc2 100644
--- a/ui/src/stories/dialog/dialog.stories.mdx
+++ b/ui/src/stories/dialog/dialog.stories.mdx
@@ -4,7 +4,7 @@ import { action } from '@storybook/addon-actions';
 import { boolean } from '@storybook/addon-knobs';
 import { OuiDialogStorybook } from './dialog.component';
 
-<Meta title="MDX/Dialog" />
+<Meta title="Dialog" />
 
 # Dialog
 
diff --git a/ui/src/stories/form-field/form-field.stories.mdx b/ui/src/stories/form-field/form-field.stories.mdx
index c5e626cf2..aef56baf6 100644
--- a/ui/src/stories/form-field/form-field.stories.mdx
+++ b/ui/src/stories/form-field/form-field.stories.mdx
@@ -5,7 +5,7 @@ import { action } from '@storybook/addon-actions';
 import { text, select, boolean } from '@storybook/addon-knobs';
 import { APPEARANCE } from '../const';
 
-<Meta title="MDX FORM FIELD/Input" />
+<Meta title="FORM FIELD/Input" />
 
 # Input
 
diff --git a/ui/src/stories/icon/icon.stories.mdx b/ui/src/stories/icon/icon.stories.mdx
index 51d3bee2b..d21a65db3 100644
--- a/ui/src/stories/icon/icon.stories.mdx
+++ b/ui/src/stories/icon/icon.stories.mdx
@@ -5,7 +5,7 @@ import { select, text, number } from '@storybook/addon-knobs';
 import { LABELPOSITION, COLORS, ICON_COLORS } from '../const';
 import { OuiiconStorybook } from './icon.component';
 
-<Meta title="MDX/Icon" />
+<Meta title="Icon" />
 
 # Icon
 
diff --git a/ui/src/stories/menu/menu.stories.mdx b/ui/src/stories/menu/menu.stories.mdx
index 8e33fcce4..f03b4e563 100644
--- a/ui/src/stories/menu/menu.stories.mdx
+++ b/ui/src/stories/menu/menu.stories.mdx
@@ -11,7 +11,7 @@ import { select, boolean } from '@storybook/addon-knobs';
 import { LABELPOSITION, COLORS, ICON_COLORS } from '../const';
 import { OuiMenuStorybook, OuiNestedMenuStorybook } from './menu.component';
 
-<Meta title="MDX/Menu" />
+<Meta title="Menu" />
 
 # Menu
 
diff --git a/ui/src/stories/panel/panel.stories.mdx b/ui/src/stories/panel/panel.stories.mdx
index 00a536e77..bac0d8f26 100644
--- a/ui/src/stories/panel/panel.stories.mdx
+++ b/ui/src/stories/panel/panel.stories.mdx
@@ -10,7 +10,7 @@ import { OverlayModule } from '@angular/cdk/overlay';
 import { OuiPanelStorybook } from './panel.component';
 import { OuiPanelWithImageStorybook } from './panel.component';
 
-<Meta title="MDX/Panel" />
+<Meta title="Panel" />
 
 # Panel
 
diff --git a/ui/src/stories/progress-bar/progress-bar.stories.mdx b/ui/src/stories/progress-bar/progress-bar.stories.mdx
index 135df38ee..ddf5dc133 100644
--- a/ui/src/stories/progress-bar/progress-bar.stories.mdx
+++ b/ui/src/stories/progress-bar/progress-bar.stories.mdx
@@ -3,7 +3,7 @@ import { select, number, text } from '@storybook/addon-knobs';
 import { OuiProgressBar } from '../../components/progress-bar/progress-bar';
 import { COLORS } from '../const';
 
-<Meta title="MDX/ProgressBar" />
+<Meta title="ProgressBar" />
 
 # ProgressBar
 
diff --git a/ui/src/stories/progress-spinner/progress-spinner.stories.mdx b/ui/src/stories/progress-spinner/progress-spinner.stories.mdx
index 50e5b92c3..d672d37a7 100644
--- a/ui/src/stories/progress-spinner/progress-spinner.stories.mdx
+++ b/ui/src/stories/progress-spinner/progress-spinner.stories.mdx
@@ -3,7 +3,7 @@ import { select, number, text } from '@storybook/addon-knobs';
 import { OuiProgressSpinner } from '../../components/progress-spinner/progress-spinner';
 import { COLORS } from '../const';
 
-<Meta title="MDX/ProgressSpinner" />
+<Meta title="ProgressSpinner" />
 
 # ProgressSpinner
 
diff --git a/ui/src/stories/radio/radio.stories.mdx b/ui/src/stories/radio/radio.stories.mdx
index 132a13724..a8eb98071 100644
--- a/ui/src/stories/radio/radio.stories.mdx
+++ b/ui/src/stories/radio/radio.stories.mdx
@@ -4,7 +4,7 @@ import { action } from '@storybook/addon-actions';
 import { select, boolean } from '@storybook/addon-knobs';
 import { LABELPOSITION, COLORS } from '../const';
 
-<Meta title="MDX/Radio" />
+<Meta title="Radio" />
 
 # Radio
 
diff --git a/ui/src/stories/scrollbar/index.stories.ts b/ui/src/stories/scrollbar/index.stories.ts
deleted file mode 100644
index f81fb0466..000000000
--- a/ui/src/stories/scrollbar/index.stories.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { OuiScrollbarModule } from '../../components/scrollbar/scrollbar-module';
-import { text, boolean, number, array } from '@storybook/addon-knobs';
-import { DUMMY_TEXT, COUNTRY_LIST } from '../const';
-import { OuiScrollbar } from '../../components/scrollbar/scrollbar';
-import {
-  OuiScrollbarTextStorybook,
-  OuiScrollbarListStorybook,
-} from './scrollbar.component';
-
-const valueOptions = {
-  range: true,
-  min: 100,
-  max: 500,
-  step: 1,
-};
-
-export default {
-  title: 'Scrollbar',
-  component: OuiScrollbar,
-};
-
-export const Text = () => ({
-  moduleMetadata: {
-    imports: [OuiScrollbarModule],
-    schemas: [],
-    declarations: [OuiScrollbarTextStorybook],
-  },
-  template: `<oui-scrollbar-text-storybook
-  [large]="large"
-  [height]="height"
-  [text]="text"></oui-scrollbar-text-storybook>`,
-  props: {
-    large: boolean('large', false),
-    height: number('height', 350, valueOptions),
-    text: text('text', DUMMY_TEXT),
-  },
-});
-
-export const List = () => ({
-  moduleMetadata: {
-    imports: [OuiScrollbarModule],
-    schemas: [],
-    declarations: [OuiScrollbarListStorybook],
-  },
-  template: `<oui-scrollbar-list-storybook
-  [large]="large"
-  [height]="height"
-  [items]="items"></oui-scrollbar-list-storybook>`,
-  props: {
-    large: boolean('large', false),
-    height: number('height', 350, valueOptions),
-    items: array('items', COUNTRY_LIST),
-  },
-});
diff --git a/ui/src/stories/scrollbar/scrollbar.stories.mdx b/ui/src/stories/scrollbar/scrollbar.stories.mdx
index cf4d6faeb..6440cad24 100644
--- a/ui/src/stories/scrollbar/scrollbar.stories.mdx
+++ b/ui/src/stories/scrollbar/scrollbar.stories.mdx
@@ -5,7 +5,7 @@ import { DUMMY_TEXT, COUNTRY_LIST } from '../const';
 import { OuiScrollbarTextStorybook } from './scrollbar.component';
 import { OuiScrollbarListStorybook } from './scrollbar.component';
 
-<Meta title="MDX/Scrollbar" component={Scrollbar} />
+<Meta title="Scrollbar" component={Scrollbar} />
 
 # Scrollbar
 
diff --git a/ui/src/stories/select/select.stories.mdx b/ui/src/stories/select/select.stories.mdx
index f78340428..dc754db6f 100644
--- a/ui/src/stories/select/select.stories.mdx
+++ b/ui/src/stories/select/select.stories.mdx
@@ -10,7 +10,7 @@ import { array, boolean, text, object, select } from '@storybook/addon-knobs';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { APPEARANCE } from '../const';
 
-<Meta title="MDX FORM FIELD/Select" />
+<Meta title="FORM FIELD/Select" />
 
 # Select
 
diff --git a/ui/src/stories/slide-toggle/slide-toggle.stories.mdx b/ui/src/stories/slide-toggle/slide-toggle.stories.mdx
index bcdcdc944..0c9b85af3 100644
--- a/ui/src/stories/slide-toggle/slide-toggle.stories.mdx
+++ b/ui/src/stories/slide-toggle/slide-toggle.stories.mdx
@@ -4,7 +4,7 @@ import { action } from '@storybook/addon-actions';
 import { select, boolean } from '@storybook/addon-knobs';
 import { COLORS } from '../const';
 
-<Meta title="MDX/SlideToggle" />
+<Meta title="SlideToggle" />
 
 # SlideToggle
 
diff --git a/ui/src/stories/table/table.stories.mdx b/ui/src/stories/table/table.stories.mdx
index cab2bff04..65e51c739 100644
--- a/ui/src/stories/table/table.stories.mdx
+++ b/ui/src/stories/table/table.stories.mdx
@@ -18,7 +18,7 @@ import {
   userData,
 } from './table.component';
 
-<Meta title="MDX/Table" />
+<Meta title="Table" />
 
 # Table
 
diff --git a/ui/src/stories/textarea/textarea.stories.mdx b/ui/src/stories/textarea/textarea.stories.mdx
index dba12ba79..90a6a477c 100644
--- a/ui/src/stories/textarea/textarea.stories.mdx
+++ b/ui/src/stories/textarea/textarea.stories.mdx
@@ -7,7 +7,7 @@ import {
 import { action } from '@storybook/addon-actions';
 import { text, boolean, number } from '@storybook/addon-knobs';
 
-<Meta title="MDX FORM FIELD/Textarea" />
+<Meta title="FORM FIELD/Textarea" />
 
 # Textarea
 
diff --git a/ui/src/stories/tooltip/tooltip.stories.mdx b/ui/src/stories/tooltip/tooltip.stories.mdx
index 029d2d20c..e82e1dbea 100644
--- a/ui/src/stories/tooltip/tooltip.stories.mdx
+++ b/ui/src/stories/tooltip/tooltip.stories.mdx
@@ -10,7 +10,7 @@ import { select, text, boolean } from '@storybook/addon-knobs';
 import { TOOLTIPPOSITION } from '../const';
 import { OuiTooltipStorybook } from './tooltip.component';
 
-<Meta title="MDX/Tooltip" />
+<Meta title="Tooltip" />
 
 # Tooltip