diff --git a/packages/carbon-react/.storybook/preview.js b/packages/carbon-react/.storybook/preview.js
index 25319807bd36..0e28a0c5e790 100644
--- a/packages/carbon-react/.storybook/preview.js
+++ b/packages/carbon-react/.storybook/preview.js
@@ -11,7 +11,7 @@ import { configureActions } from '@storybook/addon-actions';
 import { white, g10, g90, g100 } from '@carbon/themes';
 import React from 'react';
 import { breakpoints } from '@carbon/layout';
-import { unstable_ThemeContext as ThemeContext } from '../src';
+import { ThemeContext } from '../src';
 import { addParameters } from '@storybook/react';
 
 export const globalTypes = {
diff --git a/packages/react/src/components/IconButton/next/IconButton.stories.js b/packages/react/src/components/IconButton/next/IconButton.stories.js
index b5d5466e5149..fef8a3757d4d 100644
--- a/packages/react/src/components/IconButton/next/IconButton.stories.js
+++ b/packages/react/src/components/IconButton/next/IconButton.stories.js
@@ -10,7 +10,7 @@ import React from 'react';
 import { IconButton } from '../';
 
 export default {
-  title: 'IconButton',
+  title: 'Components/IconButton',
   component: IconButton,
   parameters: {
     controls: {
diff --git a/packages/react/src/components/Popover/next/Popover.stories.js b/packages/react/src/components/Popover/next/Popover.stories.js
index 54fb17ca2c42..454365dca0d5 100644
--- a/packages/react/src/components/Popover/next/Popover.stories.js
+++ b/packages/react/src/components/Popover/next/Popover.stories.js
@@ -12,7 +12,7 @@ import { Popover, PopoverContent } from '../../Popover';
 import mdx from './Popover.mdx';
 
 export default {
-  title: 'Popover',
+  title: 'Components/Popover',
   component: Popover,
   subcomponents: {
     PopoverContent,
diff --git a/packages/react/src/components/ProgressBar/next/ProgressBar.stories.js b/packages/react/src/components/ProgressBar/next/ProgressBar.stories.js
index ab6215462ff4..3a421b8b5d94 100644
--- a/packages/react/src/components/ProgressBar/next/ProgressBar.stories.js
+++ b/packages/react/src/components/ProgressBar/next/ProgressBar.stories.js
@@ -10,7 +10,7 @@ import React, { useState, useEffect } from 'react';
 import ProgressBar from '../';
 
 export default {
-  title: 'ProgressBar',
+  title: 'Components/ProgressBar',
   component: ProgressBar,
 };
 
diff --git a/packages/react/src/components/Tooltip/next/Tooltip.stories.js b/packages/react/src/components/Tooltip/next/Tooltip.stories.js
index ac18da3c683e..0369d4d3a7c0 100644
--- a/packages/react/src/components/Tooltip/next/Tooltip.stories.js
+++ b/packages/react/src/components/Tooltip/next/Tooltip.stories.js
@@ -13,7 +13,7 @@ import { Tooltip } from '../next';
 import { DefinitionTooltip } from './DefinitionTooltip.js';
 
 export default {
-  title: 'Tooltip',
+  title: 'Components/Tooltip',
   component: Tooltip,
   parameters: {
     controls: {